On 2019/04/02 15:33, Christian Weisgerber wrote:
> 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?
Yes please.
> 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
I had been reading this wrongly for ages, I was convinced it was doing the
REORDER_DEPENDENCIES step for ports which *do* have CONFIGURE_STYLE=automake
rather than those which *don't*.
