Date: Wed, 18 Jun 2014 07:26:26 +0000 (UTC) From: Baptiste Daroussin <bapt@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r358218 - head/Mk Message-ID: <201406180726.s5I7QQfY088487@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bapt Date: Wed Jun 18 07:26:25 2014 New Revision: 358218 URL: http://svnweb.freebsd.org/changeset/ports/358218 QAT: https://qat.redports.org/buildarchive/r358218/ Log: tabspace: 8 Modified: head/Mk/bsd.autotools.mk Modified: head/Mk/bsd.autotools.mk ============================================================================== --- head/Mk/bsd.autotools.mk Wed Jun 18 07:20:29 2014 (r358217) +++ head/Mk/bsd.autotools.mk Wed Jun 18 07:26:25 2014 (r358218) @@ -1,10 +1,5 @@ -#-*- tab-width: 4; -*- -# ex:ts=4 -# # $FreeBSD$ # -# Please view me with 4 column tabs! -# # IMPORTANT NOTE: # Before making any changes to this file, contact portmgr to arrange # for an experimental ports run. @@ -18,15 +13,15 @@ Autotools_Include_MAINTAINER= autotools@ # USE_AUTOTOOLS= tool[:env] ... # # 'tool' can currently be one of the following: -# autoconf, autoheader -# autoconf213, autoheader213 (legacy version) -# automake, aclocal -# automake14, aclocal14 (legacy version) -# libtool, libtoolize, libltdl +# autoconf, autoheader +# autoconf213, autoheader213 (legacy version) +# automake, aclocal +# automake14, aclocal14 (legacy version) +# libtool, libtoolize, libltdl # # ':env' is used to specify that the environmental variables are needed -# but the relevant tool should NOT be run as part of the -# 'run-autotools' target +# but the relevant tool should NOT be run as part of the +# 'run-autotools' target # # In addition, these variables can be set in the port Makefile to be # passed to the relevant tools: @@ -64,18 +59,18 @@ Autotools_Include_MAINTAINER= autotools@ # Known autotools components _AUTOTOOLS_ALL= autoconf autoheader autoconf213 autoheader213 \ - automake aclocal automake14 aclocal14 \ - libtool libtoolize libltdl + automake aclocal automake14 aclocal14 \ + libtool libtoolize libltdl # Incompatible autotools mixing -_AUTOTOOLS_IGN_autoconf= autoconf213 autoheader213 -_AUTOTOOLS_IGN_autoheader= autoconf213 autoheader213 -_AUTOTOOLS_IGN_autoconf213= autoconf autoheader +_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 +_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 @@ -139,9 +134,9 @@ IGNORE+= Incompatible autotools: ${_AUTO #--------------------------------------------------------------------------- .if defined(_AUTOTOOL_aclocal) && ${_AUTOTOOL_aclocal} == "yes" -_AUTOTOOL_automake?= env -_AUTOTOOL_rule_aclocal= yes -GNU_CONFIGURE= yes +_AUTOTOOL_automake?= env +_AUTOTOOL_rule_aclocal= yes +GNU_CONFIGURE= yes .endif .if defined(_AUTOTOOL_automake) @@ -151,14 +146,14 @@ AUTOMAKE_PORT= devel/automake . if ${_AUTOTOOL_automake} == "yes" _AUTOTOOL_rule_automake= yes -GNU_CONFIGURE?= yes +GNU_CONFIGURE?= yes . endif .endif .if defined(_AUTOTOOL_aclocal14) && ${_AUTOTOOL_aclocal14} == "yes" _AUTOTOOL_automake14?= env _AUTOTOOL_rule_aclocal14= yes -GNU_CONFIGURE?= yes +GNU_CONFIGURE?= yes .endif .if defined(_AUTOTOOL_automake14) @@ -169,14 +164,14 @@ AUTOMAKE_ARGS+= -i # backwards compati . if ${_AUTOTOOL_automake14} == "yes" _AUTOTOOL_rule_automake= yes -GNU_CONFIGURE?= yes +GNU_CONFIGURE?= yes . endif .endif .if defined(AUTOMAKE_VERSION) -AUTOMAKE= ${LOCALBASE}/bin/automake-${AUTOMAKE_VERSION} +AUTOMAKE= ${LOCALBASE}/bin/automake-${AUTOMAKE_VERSION} AUTOMAKE_DIR= ${LOCALBASE}/share/automake-${AUTOMAKE_VERSION} -ACLOCAL= ${LOCALBASE}/bin/aclocal-${AUTOMAKE_VERSION} +ACLOCAL= ${LOCALBASE}/bin/aclocal-${AUTOMAKE_VERSION} ACLOCAL_DIR= ${LOCALBASE}/share/aclocal-${AUTOMAKE_VERSION} . if defined(_AUTOTOOL_aclocal) @@ -187,11 +182,11 @@ ACLOCAL_ARGS?= --acdir=${ACLOCAL_DIR} . endif AUTOMAKE_VARS= AUTOMAKE=${AUTOMAKE} \ - AUTOMAKE_DIR=${AUTOMAKE_DIR} \ - AUTOMAKE_VERSION=${AUTOMAKE_VERSION} \ - AUTOMAKE_APIVER=${AUTOMAKE_APIVER} \ - ACLOCAL=${ACLOCAL} \ - ACLOCAL_DIR=${ACLOCAL_DIR} + AUTOMAKE_DIR=${AUTOMAKE_DIR} \ + AUTOMAKE_VERSION=${AUTOMAKE_VERSION} \ + AUTOMAKE_APIVER=${AUTOMAKE_APIVER} \ + ACLOCAL=${ACLOCAL} \ + ACLOCAL_DIR=${ACLOCAL_DIR} AUTOMAKE_DEPENDS= ${AUTOMAKE}:${PORTSDIR}/${AUTOMAKE_PORT} BUILD_DEPENDS+= ${AUTOMAKE_DEPENDS} @@ -202,9 +197,9 @@ BUILD_DEPENDS+= ${AUTOMAKE_DEPENDS} #--------------------------------------------------------------------------- .if defined(_AUTOTOOL_autoheader) && ${_AUTOTOOL_autoheader} == "yes" -_AUTOTOOL_autoconf= yes +_AUTOTOOL_autoconf= yes _AUTOTOOL_rule_autoheader= yes -GNU_CONFIGURE?= yes +GNU_CONFIGURE?= yes .endif .if defined(_AUTOTOOL_autoconf) @@ -213,46 +208,46 @@ AUTOCONF_PORT= devel/autoconf . if ${_AUTOTOOL_autoconf} == "yes" _AUTOTOOL_rule_autoconf= yes -GNU_CONFIGURE?= yes +GNU_CONFIGURE?= yes . endif .endif .if defined(_AUTOTOOL_autoheader213) && ${_AUTOTOOL_autoheader213} == "yes" _AUTOTOOL_autoconf213= yes _AUTOTOOL_rule_autoheader= yes -GNU_CONFIGURE?= yes +GNU_CONFIGURE?= yes .endif .if defined(_AUTOTOOL_autoconf213) AUTOCONF_VERSION= 2.13 AUTOCONF_PORT= devel/autoconf213 -AUTOM4TE= ${FALSE} # doesn't exist here +AUTOM4TE= ${FALSE} # doesn't exist here . if ${_AUTOTOOL_autoconf213} == "yes" _AUTOTOOL_rule_autoconf= yes -GNU_CONFIGURE?= yes +GNU_CONFIGURE?= yes . endif .endif .if defined(AUTOCONF_VERSION) -AUTOCONF= ${LOCALBASE}/bin/autoconf-${AUTOCONF_VERSION} +AUTOCONF= ${LOCALBASE}/bin/autoconf-${AUTOCONF_VERSION} AUTOCONF_DIR= ${LOCALBASE}/share/autoconf-${AUTOCONF_VERSION} -AUTOHEADER= ${LOCALBASE}/bin/autoheader-${AUTOCONF_VERSION} +AUTOHEADER= ${LOCALBASE}/bin/autoheader-${AUTOCONF_VERSION} AUTOIFNAMES= ${LOCALBASE}/bin/ifnames-${AUTOCONF_VERSION} -AUTOM4TE?= ${LOCALBASE}/bin/autom4te-${AUTOCONF_VERSION} -AUTORECONF= ${LOCALBASE}/bin/autoreconf-${AUTOCONF_VERSION} -AUTOSCAN= ${LOCALBASE}/bin/autoscan-${AUTOCONF_VERSION} -AUTOUPDATE= ${LOCALBASE}/bin/autoupdate-${AUTOCONF_VERSION} +AUTOM4TE?= ${LOCALBASE}/bin/autom4te-${AUTOCONF_VERSION} +AUTORECONF= ${LOCALBASE}/bin/autoreconf-${AUTOCONF_VERSION} +AUTOSCAN= ${LOCALBASE}/bin/autoscan-${AUTOCONF_VERSION} +AUTOUPDATE= ${LOCALBASE}/bin/autoupdate-${AUTOCONF_VERSION} AUTOCONF_VARS= AUTOCONF=${AUTOCONF} \ - AUTOCONF_DIR=${AUTOCONF_DIR} \ - AUTOHEADER=${AUTOHEADER} \ - AUTOIFNAMES=${AUTOIFNAMES} \ - AUTOM4TE=${AUTOM4TE} \ - AUTORECONF=${AUTORECONF} \ - AUTOSCAN=${AUTOSCAN} \ - AUTOUPDATE=${AUTOUPDATE} \ - AUTOCONF_VERSION=${AUTOCONF_VERSION} + AUTOCONF_DIR=${AUTOCONF_DIR} \ + AUTOHEADER=${AUTOHEADER} \ + AUTOIFNAMES=${AUTOIFNAMES} \ + AUTOM4TE=${AUTOM4TE} \ + AUTORECONF=${AUTORECONF} \ + AUTOSCAN=${AUTOSCAN} \ + AUTOUPDATE=${AUTOUPDATE} \ + AUTOCONF_VERSION=${AUTOCONF_VERSION} AUTOCONF_DEPENDS= ${AUTOCONF}:${PORTSDIR}/${AUTOCONF_PORT} BUILD_DEPENDS+= ${AUTOCONF_DEPENDS} @@ -276,29 +271,29 @@ LIBTOOL_PORT= devel/libtool . if defined(_AUTOTOOL_libtool) && ${_AUTOTOOL_libtool} == "yes" _AUTOTOOL_rule_libtool= yes -GNU_CONFIGURE?= yes +GNU_CONFIGURE?= yes . endif . if defined(_AUTOTOOL_libtoolize) && ${_AUTOTOOL_libtoolize} == "yes" _AUTOTOOL_rule_libtoolize= yes -GNU_CONFIGURE?= yes +GNU_CONFIGURE?= yes . endif .endif .if defined(LIBTOOL_VERSION) -LIBTOOL= ${LOCALBASE}/bin/libtool -LIBTOOLIZE= ${LOCALBASE}/bin/libtoolize +LIBTOOL= ${LOCALBASE}/bin/libtool +LIBTOOLIZE= ${LOCALBASE}/bin/libtoolize LIBTOOL_LIBEXECDIR= ${LOCALBASE}/libexec/libtool LIBTOOL_SHAREDIR= ${LOCALBASE}/share/libtool -LIBTOOL_M4= ${LOCALBASE}/share/aclocal/libtool.m4 -LTMAIN= ${LOCALBASE}/share/libtool/config/ltmain.sh +LIBTOOL_M4= ${LOCALBASE}/share/aclocal/libtool.m4 +LTMAIN= ${LOCALBASE}/share/libtool/config/ltmain.sh LIBTOOL_VARS= LIBTOOL=${LIBTOOL} \ - LIBTOOLIZE=${LIBTOOLIZE} \ - LIBTOOL_LIBEXECDIR=${LIBTOOL_LIBEXECDIR} \ - LIBTOOL_SHAREDIR=${LIBTOOL_SHAREDIR} \ - LIBTOOL_M4=${LIBTOOL_M4} \ - LTMAIN=${LTMAIN} + LIBTOOLIZE=${LIBTOOLIZE} \ + LIBTOOL_LIBEXECDIR=${LIBTOOL_LIBEXECDIR} \ + LIBTOOL_SHAREDIR=${LIBTOOL_SHAREDIR} \ + LIBTOOL_M4=${LIBTOOL_M4} \ + LTMAIN=${LTMAIN} LIBTOOLFLAGS?= # default to empty @@ -331,13 +326,13 @@ ${var:tu}_ENV+= ${AUTOTOOLS_VARS} #--------------------------------------------------------------------------- .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 +.ORDER: run-autotools run-autotools-libtoolize run-autotools-aclocal \ + patch-autotools-libtool 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 + patch-autotools-libtool run-autotools-autoconf \ + run-autotools-autoheader run-autotools-automake .endif .if !target(run-autotools-aclocal)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201406180726.s5I7QQfY088487>