On Tue, May 19, 2020 at 12:26:45PM +0100, Stuart Henderson wrote:
> This adds the runstatedir patch from autoconf git. It was added upstream
> in 2013 but there hasn't been a newer release; some Linux distros have been
> patching it in their 2.69 packages for years.
>
> I don't _really_ like doing this but it's causing a problem for people
> who want to make distfiles on OpenBSD that are usable on Linux (portable
> openbgpd etc) and it's a simple diff - the changes in the produced files
> are small so it's still easy to verify nothing malicious has been added
> for people who are verifying autoconf-generated configure files in ports
> etc.
>
> Any big objections? OKs? (if it is acceptable I'll put it through a bulk
> build before commit).
Okay for me.
Did we ping upstream ?...
>
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/devel/autoconf/2.69/Makefile,v
> retrieving revision 1.5
> diff -u -p -r1.5 Makefile
> --- Makefile 29 Jun 2016 16:14:40 -0000 1.5
> +++ Makefile 19 May 2020 11:16:41 -0000
> @@ -1,7 +1,7 @@
> # $OpenBSD: Makefile,v 1.5 2016/06/29 16:14:40 espie Exp $
>
> VERSION = 2.69
> -REVISION = 2
> +REVISION = 3
>
> BUILD_DEPENDS = devel/help2man
>
> Index: patches/patch-lib_autoconf_general_m4
> ===================================================================
> RCS file: patches/patch-lib_autoconf_general_m4
> diff -N patches/patch-lib_autoconf_general_m4
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-lib_autoconf_general_m4 19 May 2020 11:16:41 -0000
> @@ -0,0 +1,51 @@
> +$OpenBSD$
> +
> +From a197431414088a417b407b9b20583b2e8f7363bd Mon Sep 17 00:00:00 2001
> +From: Eric Blake <ebl...@redhat.com>
> +Date: Thu, 12 Sep 2013 15:11:29 -0600
> +Subject: AC_INIT: add --runstatedir option to configure
> +
> +Index: lib/autoconf/general.m4
> +--- lib/autoconf/general.m4.orig
> ++++ lib/autoconf/general.m4
> +@@ -586,6 +586,7 @@ AC_SUBST([datadir], ['${datarootdir}'])dnl
> + AC_SUBST([sysconfdir], ['${prefix}/etc'])dnl
> + AC_SUBST([sharedstatedir], ['${prefix}/com'])dnl
> + AC_SUBST([localstatedir], ['${prefix}/var'])dnl
> ++AC_SUBST([runstatedir], ['${localstatedir}/run'])dnl
> + AC_SUBST([includedir], ['${prefix}/include'])dnl
> + AC_SUBST([oldincludedir], ['/usr/include'])dnl
> + AC_SUBST([docdir], [m4_ifset([AC_PACKAGE_TARNAME],
> +@@ -812,6 +813,15 @@ do
> + | -silent | --silent | --silen | --sile | --sil)
> + silent=yes ;;
> +
> ++ -runstatedir | --runstatedir | --runstatedi | --runstated \
> ++ | --runstate | --runstat | --runsta | --runst | --runs \
> ++ | --run | --ru | --r)
> ++ ac_prev=runstatedir ;;
> ++ -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
> ++ | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
> ++ | --run=* | --ru=* | --r=*)
> ++ runstatedir=$ac_optarg ;;
> ++
> + -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
> + ac_prev=sbindir ;;
> + -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
> +@@ -921,7 +931,7 @@ fi
> + for ac_var in exec_prefix prefix bindir sbindir libexecdir
> datarootdir \
> + datadir sysconfdir sharedstatedir localstatedir includedir \
> + oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
> +- libdir localedir mandir
> ++ libdir localedir mandir runstatedir
> + do
> + eval ac_val=\$$ac_var
> + # Remove trailing slashes.
> +@@ -1058,6 +1068,7 @@ Fine tuning of the installation directories:
> + --sysconfdir=DIR read-only single-machine data [PREFIX/etc]
> + --sharedstatedir=DIR modifiable architecture-independent data
> [PREFIX/com]
> + --localstatedir=DIR modifiable single-machine data [PREFIX/var]
> ++ --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run]
> + --libdir=DIR object code libraries [EPREFIX/lib]
> + --includedir=DIR C header files [PREFIX/include]
> + --oldincludedir=DIR C header files for non-gcc [/usr/include]
>
>
