I would like to remove the CONFIGURE_STYLE=autoupdate setting.
"Autoupdate? What?"
Straight from the gnu's mouth:
| The autoupdate program updates a configure.ac file that calls
| Autoconf macros by their old names to use the current macro names.
Why would you use this in a port? You wouldn't. No port uses this.
In fact, it appears no port has EVER used this.
infrastructure/mk and man/man/man5 diffs attached.
ok?
--
Christian "naddy" Weisgerber na...@mips.inka.de
Index: infrastructure/mk/bsd.port.mk
===================================================================
RCS file: /cvs/ports/infrastructure/mk/bsd.port.mk,v
retrieving revision 1.1461
diff -u -p -r1.1461 bsd.port.mk
--- infrastructure/mk/bsd.port.mk 3 Apr 2019 02:17:48 -0000 1.1461
+++ infrastructure/mk/bsd.port.mk 3 Apr 2019 02:52:01 -0000
@@ -280,7 +280,7 @@ _ARCH_DEFINES_INCLUDED = Done
. include "${PORTSDIR}/infrastructure/mk/arch-defines.mk"
.endif
-.if ${CONFIGURE_STYLE:L:Mautoconf} || ${CONFIGURE_STYLE:L:Mautoupdate}
+.if ${CONFIGURE_STYLE:L:Mautoconf}
. 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.59
diff -u -p -r1.59 gnu.port.mk
--- infrastructure/mk/gnu.port.mk 3 Apr 2019 02:17:48 -0000 1.59
+++ infrastructure/mk/gnu.port.mk 3 Apr 2019 02:54:22 -0000
@@ -18,7 +18,6 @@ MAKE_ENV += AUTOMAKE_VERSION=${AUTOMAKE_
.if ${CONFIGURE_STYLE:L:Mautoconf}
BUILD_DEPENDS += ${MODGNU_AUTOCONF_DEPENDS}
AUTOCONF ?= autoconf
-AUTOUPDATE ?= autoupdate
AUTOHEADER ?= autoheader
AUTOCONF_DIR ?= ${WRKSRC}
. if !${CONFIGURE_STYLE:L:Mno-autoheader}
@@ -109,10 +108,6 @@ _MODGNU_loop =
PATCH_CHECK_ONLY ?= No
.if ${PATCH_CHECK_ONLY:L} != "yes"
-. if ${CONFIGURE_STYLE:L:Mautoupdate}
-_MODGNU_loop += echo "Running autoupdate-${AUTOCONF_VERSION} in $$d";
-_MODGNU_loop += ${SETENV} ${AUTOCONF_ENV} ${AUTOUPDATE};
-. endif
. if ${CONFIGURE_STYLE:L:Mautoconf}
_MODGNU_loop += if test -f $$d/configure; then \
grep -iq 'Generated by.*autoconf.*${AUTOCONF_VERSION}' $$d/configure || { \
Index: share/man/man5/bsd.port.mk.5
===================================================================
RCS file: /cvs/src/share/man/man5/bsd.port.mk.5,v
retrieving revision 1.507
diff -u -p -r1.507 bsd.port.mk.5
--- share/man/man5/bsd.port.mk.5 3 Apr 2019 02:18:03 -0000 1.507
+++ share/man/man5/bsd.port.mk.5 3 Apr 2019 03:00:46 -0000
@@ -951,9 +951,6 @@ Several versions of automake may coexist
.Ev AUTOMAKE_VERSION
must be set before trying to run automake.
Defaults to 1.4.
-.It Ev AUTOUPDATE
-Location of the autoupdate binary.
-Defaults to autoupdate.
.It Ev BASE_PKGPATH
Full
.Xr pkgpath 7
Index: share/man/man5/port-modules.5
===================================================================
RCS file: /cvs/src/share/man/man5/port-modules.5,v
retrieving revision 1.237
diff -u -p -r1.237 port-modules.5
--- share/man/man5/port-modules.5 3 Apr 2019 02:18:03 -0000 1.237
+++ share/man/man5/port-modules.5 3 Apr 2019 02:58:48 -0000
@@ -200,7 +200,7 @@ will do nothing.
.Pp
Some
.Ev CONFIGURE_STYLE
-values, namely perl, gnu, imake, autoconf, and autoupdate
+values, namely perl, gnu, imake, and autoconf,
will automatically import the correct module.
User-defined modules must both add to
.Ev CONFIGURE_STYLE
