I would like to remove CONFIGURE_STYLE="automake". This is a very
confusing setting. Crucially, it does not actually run automake.
Nobody I've talked to understands it or what its point is. Today
I have removed the few remaining uses in the tree.
There are two patches attached. One removes "automake" from
ports/infrastructure/mk, the other one deletes the corresponding
mentions in the man pages.
ok?
--
Christian "naddy" Weisgerber [email protected]
Index: infrastructure/mk/bsd.port.mk
===================================================================
RCS file: /cvs/ports/infrastructure/mk/bsd.port.mk,v
retrieving revision 1.1460
diff -u -p -r1.1460 bsd.port.mk
--- infrastructure/mk/bsd.port.mk 4 Jan 2019 16:58:42 -0000 1.1460
+++ infrastructure/mk/bsd.port.mk 2 Apr 2019 13:00:29 -0000
@@ -280,8 +280,7 @@ _ARCH_DEFINES_INCLUDED = Done
. include "${PORTSDIR}/infrastructure/mk/arch-defines.mk"
.endif
-.if ${CONFIGURE_STYLE:L:Mautomake} || ${CONFIGURE_STYLE:L:Mautoconf} || \
- ${CONFIGURE_STYLE:L:Mautoupdate}
+.if ${CONFIGURE_STYLE:L:Mautoconf} || ${CONFIGURE_STYLE:L:Mautoupdate}
. if !${CONFIGURE_STYLE:L:Mgnu}
CONFIGURE_STYLE += gnu
. endif
Index: infrastructure/mk/gnu.port.mk
===================================================================
RCS file: /cvs/ports/infrastructure/mk/gnu.port.mk,v
retrieving revision 1.58
diff -u -p -r1.58 gnu.port.mk
--- infrastructure/mk/gnu.port.mk 5 Nov 2018 15:59:17 -0000 1.58
+++ infrastructure/mk/gnu.port.mk 2 Apr 2019 13:01:51 -0000
@@ -15,13 +15,6 @@ AUTOCONF_VERSION ?= 2.13
AUTOCONF_ENV = PATH=${PORTPATH} AUTOCONF_VERSION=${AUTOCONF_VERSION} AUTOMAKE_VERSION=${AUTOMAKE_VERSION}
MAKE_ENV += AUTOMAKE_VERSION=${AUTOMAKE_VERSION} AUTOCONF_VERSION=${AUTOCONF_VERSION}
-.if ${CONFIGURE_STYLE:L:Mautomake}
-BUILD_DEPENDS += ${MODGNU_AUTOMAKE_DEPENDS}
-. if ${CONFIGURE_STYLE:L:Mautoupdate}
-CONFIGURE_STYLE += autoconf
-. endif
-.endif
-
.if ${CONFIGURE_STYLE:L:Mautoconf}
BUILD_DEPENDS += ${MODGNU_AUTOCONF_DEPENDS}
AUTOCONF ?= autoconf
@@ -132,9 +125,7 @@ _MODGNU_loop += ${SETENV} ${AUTOCONF_ENV
_MODGNU_loop += echo "Running autoheader-${AUTOCONF_VERSION} in $$d";
_MODGNU_loop += ${SETENV} ${AUTOCONF_ENV} ${AUTOHEADER};
. endif
-. if !${CONFIGURE_STYLE:L:Mautomake}
REORDER_DEPENDENCIES += ${PORTSDIR}/infrastructure/mk/automake.dep
-. endif
. endif
.endif
Index: share/man/man5/bsd.port.mk.5
===================================================================
RCS file: /cvs/src/share/man/man5/bsd.port.mk.5,v
retrieving revision 1.506
diff -u -p -r1.506 bsd.port.mk.5
--- share/man/man5/bsd.port.mk.5 10 Mar 2019 21:31:49 -0000 1.506
+++ share/man/man5/bsd.port.mk.5 2 Apr 2019 13:07:51 -0000
@@ -951,12 +951,6 @@ Several versions of automake may coexist
.Ev AUTOMAKE_VERSION
must be set before trying to run automake.
Defaults to 1.4.
-Note that even if
-.Ev CONFIGURE_STYLE
-includes automake,
-automake should still be run manually during the right
-.Cm configure
-stage.
.It Ev AUTOUPDATE
Location of the autoupdate binary.
Defaults to autoupdate.
@@ -1453,18 +1447,6 @@ if autoconf needs to be rerun first,
but set
.Sq no-autoheader
to prevent autoheader from running.
-Add
-.Sq automake
-if automake may need to be rerun.
-Otherwise, automake will be explicitly disabled.
-Note that automake is never run automatically.
-In order to use it,
-.Ev CONFIGURE_STYLE
-should include
-.Sq automake
-and there should be a
-.Cm {pre,do}-configure
-target running automake.
.Pp
If
.Sq imake ,
Index: share/man/man5/port-modules.5
===================================================================
RCS file: /cvs/src/share/man/man5/port-modules.5,v
retrieving revision 1.235
diff -u -p -r1.235 port-modules.5
--- share/man/man5/port-modules.5 20 Mar 2019 22:32:37 -0000 1.235
+++ share/man/man5/port-modules.5 2 Apr 2019 13:04:24 -0000
@@ -200,7 +200,7 @@ will do nothing.
.Pp
Some
.Ev CONFIGURE_STYLE
-values, namely perl, gnu, imake, automake, autoconf, and autoupdate
+values, namely perl, gnu, imake, autoconf, and autoupdate
will automatically import the correct module.
User-defined modules must both add to
.Ev CONFIGURE_STYLE
