[Midnightbsd-cvs] mports [18351] trunk/Mk/extensions: add compat shims
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Thu Mar 26 22:19:36 EDT 2015
Revision: 18351
http://svnweb.midnightbsd.org/mports/?rev=18351
Author: laffer1
Date: 2015-03-26 22:19:35 -0400 (Thu, 26 Mar 2015)
Log Message:
-----------
add compat shims
Modified Paths:
--------------
trunk/Mk/extensions/autotools.mk
Added Paths:
-----------
trunk/Mk/extensions/aclocal.mk
trunk/Mk/extensions/autoconf.mk
trunk/Mk/extensions/automake.mk
trunk/Mk/extensions/libtoolize.mk
Added: trunk/Mk/extensions/aclocal.mk
===================================================================
--- trunk/Mk/extensions/aclocal.mk (rev 0)
+++ trunk/Mk/extensions/aclocal.mk 2015-03-27 02:19:35 UTC (rev 18351)
@@ -0,0 +1 @@
+.include "autotools.mk"
Property changes on: trunk/Mk/extensions/aclocal.mk
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/Mk/extensions/autoconf.mk
===================================================================
--- trunk/Mk/extensions/autoconf.mk (rev 0)
+++ trunk/Mk/extensions/autoconf.mk 2015-03-27 02:19:35 UTC (rev 18351)
@@ -0,0 +1 @@
+.include "autotools.mk"
Property changes on: trunk/Mk/extensions/autoconf.mk
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/Mk/extensions/automake.mk
===================================================================
--- trunk/Mk/extensions/automake.mk (rev 0)
+++ trunk/Mk/extensions/automake.mk 2015-03-27 02:19:35 UTC (rev 18351)
@@ -0,0 +1 @@
+.include "autotools.mk"
Property changes on: trunk/Mk/extensions/automake.mk
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: trunk/Mk/extensions/autotools.mk
===================================================================
--- trunk/Mk/extensions/autotools.mk 2015-03-27 02:16:03 UTC (rev 18350)
+++ trunk/Mk/extensions/autotools.mk 2015-03-27 02:19:35 UTC (rev 18351)
@@ -1,27 +1,11 @@
-#-*- mode: makefile; tab-width: 4; -*-
-# ex:ts=4
-#
# $MidnightBSD$
-# $FreeBSD: ports/Mk/bsd.autotools.mk,v 1.28 2007/03/27 01:23:56 linimon Exp $
-#
-# Please view me with 4 column tabs!
-#
-# Please make sure all changes to this file are passed either through
-# the maintainer, or portmgr at MidnightBSD.org
-.if defined(_POSTMKINCLUDED) && !defined(Autotools_Post_Include)
-
-Autotools_Post_Include= autotools.mk
-Autotools_Include_MAINTAINER= luke at MidnightBSD.org
-
#---------------------------------------------------------------------------
# USE_AUTOTOOLS= tool[:env] ...
#
# '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
@@ -46,10 +30,6 @@
# LIBTOOLIZE_ARGS=...
# - Extra arguments passed to libtoolize during configure step
#
-# AUTOTOOLSFILES=<list-of-files>
-# - A list of files to further patch with derived information
-# post-patching to reduce churn during component updates
-#
#---------------------------------------------------------------------------
#---------------------------------------------------------------------------
@@ -57,20 +37,10 @@
#---------------------------------------------------------------------------
# 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
@@ -114,20 +84,6 @@
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
#---------------------------------------------------------------------------
@@ -139,8 +95,8 @@
.endif
.if defined(_AUTOTOOL_automake)
-AUTOMAKE_VERSION= 1.14
-AUTOMAKE_APIVER= 1.14
+AUTOMAKE_VERSION= 1.15
+AUTOMAKE_APIVER= 1.15
AUTOMAKE_PORT= devel/automake
. if ${_AUTOTOOL_automake} == "yes"
@@ -149,24 +105,6 @@
. 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}
@@ -176,9 +114,6 @@
. 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} \
@@ -211,23 +146,6 @@
. 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}
@@ -361,24 +279,3 @@
@${DO_NADA}
. endif
.endif
-
-#---------------------------------------------------------------------------
-# Reduce patch churn by auto-substituting data from AUTOTOOLS_VARS
-# into the correct places. Code shamelessly stolen from PLIST_SUB.
-
-AUTOTOOLSFILES?= # default to empty
-AUTOTOOLS_VARS?= # empty if not already set
-
-.if !target(configure-autotools)
-configure-autotools::
-. if ${AUTOTOOLS_VARS}!="" && ${AUTOTOOLSFILES} != ""
- @for file in ${AUTOTOOLSFILES}; do \
- ${REINPLACE_CMD} ${AUTOTOOLS_VARS:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
- ${WRKSRC}/$${file} ; \
- done
-. else
- @${DO_NADA}
-. endif
-.endif
-
-.endif #!defined(_POSTMKINCLUDED) && !defined(Autotools_Pre_Include)
Added: trunk/Mk/extensions/libtoolize.mk
===================================================================
--- trunk/Mk/extensions/libtoolize.mk (rev 0)
+++ trunk/Mk/extensions/libtoolize.mk 2015-03-27 02:19:35 UTC (rev 18351)
@@ -0,0 +1 @@
+.include "autotools.mk"
Property changes on: trunk/Mk/extensions/libtoolize.mk
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
More information about the Midnightbsd-cvs
mailing list