On Wed, 29 May 2024 09:14:43 +0100,
Stuart Henderson <s...@spacehopper.org> wrote:
>
> Reattached to make it easier for anyone who wants to look.
>
> I'm not familiar enough with m4 to know if the changes in
> patch-configure make sense.
>
To make it easy for review I made diff between 2.71 and 2.72.
It seems trivial and srigthforward with expection of two hunks, both of them
seems to related to remove check for GNU M4, and the code which is removed
as updated to with code base which requires at least M4 1.4.8.
> diff --git devel/autoconf/2.72/patches/patch-configure
> devel/autoconf/2.72/patches/patch-configure
> index 6d4e8792109..633cae551b2 100644
> --- devel/autoconf/2.72/patches/patch-configure
> +++ devel/autoconf/2.72/patches/patch-configure
> @@ -1,7 +1,7 @@
> Index: configure
> --- configure.orig
> +++ configure
> -@@ -2824,19 +2824,7 @@ do
> +@@ -2846,29 +2846,7 @@ do
> for ac_exec_ext in '' $ac_executable_extensions; do
> ac_path_M4="$as_dir$ac_prog$ac_exec_ext"
> as_fn_executable_p "$ac_path_M4" || continue
> @@ -13,16 +13,26 @@ Index: configure
> - ac_snippet=${ac_snippet}pat'subst(a,\(b\)\|\(a\),\1)d'nl
> - ac_snippet=${ac_snippet}${as_nl}if'else(in''dex(..wi.d.,.d.),-1,bug)'
> -
> ac_snippet=${ac_snippet}${as_nl}if'else(in''dex(;:11-:12-:12-:12-:12-:12-:12-:12-:12.:12.:12.:12.:12.:12.:12.:12.:12-,:12-:12-:12-:12-:12-:12-:12-:12-),-1,,strstr-bug2)'
> +- # Root out M4 1.4.6 and 1.4.7, which do not implement --debug=aflq
> +- # correctly for macros invoked from m4wrap.
> +- ac_snip2=change'quote(<,>)def''ine(<T>,<>)d'nl
> +- ac_snip2=${ac_snip2}${as_nl}def'ine(<F>,<T(<traced>)>)d'nl
> +- ac_snip2=${ac_snip2}${as_nl}m4'wrap(<F>)d'nl
> +- printf "%s\n" "$as_me:${as_lineno-$LINENO}: trying $ac_path_M4" \
> +- >&5
> - test -z "`$ac_path_M4 -F conftest.m4f </dev/null 2>&1`" \
> -- && test -z "`printf "%s\n" $ac_snippet | $ac_path_M4 --trace=mac
> 2>&1`" \
> +- && test -z "`printf "%s\n" "$ac_snippet" | $ac_path_M4 --trace=mac
> 2>&1`" \
> - && test -f conftest.m4f \
> +- && test x"`printf "%s\n" "$ac_snip2" | \
> +- $ac_path_M4 --trace=T --debug=aflq 2>&1`" = \
> +- x'm4trace:stdin:3: -1- T(<traced>)' \
> - && ac_cv_path_M4=$ac_path_M4 ac_path_M4_found=:
> - rm -f conftest.m4f
> + ac_cv_path_M4=$ac_path_M4 ac_path_M4_found=:
> $ac_path_M4_found && break 3
> done
> done
> -@@ -2884,20 +2872,7 @@ printf "%s\n" "$as_me: WARNING: the version of M4 that
> +@@ -2918,21 +2896,7 @@ printf "%s\n" "$as_me: WARNING: the version of M4 that
> printf "%s\n" "$as_me: WARNING: using it with POSIXLY_CORRECT set may cause
> problems" >&2;}
> fi
> fi
> @@ -31,11 +41,12 @@ Index: configure
> -if test ${ac_cv_prog_gnu_m4_debugfile+y}
> -then :
> - printf %s "(cached) " >&6
> --else $as_nop
> -- case `$M4 --help < /dev/null 2>&1` in
> +-else case e in #(
> +- e) case `$M4 --help < /dev/null 2>&1` in
> - *debugfile*) ac_cv_prog_gnu_m4_debugfile=--debugfile ;;
> - *) ac_cv_prog_gnu_m4_debugfile=--error-output ;;
> -- esac
> +- esac ;;
> +-esac
> -fi
> -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result:
> $ac_cv_prog_gnu_m4_debugfile" >&5
> -printf "%s\n" "$ac_cv_prog_gnu_m4_debugfile" >&6; }
So, as far as I understand it (compiled output of m4 is quite difficult to
understand BTW) everything is legitim and fine.
Thus, I had brifly tested in ot -current/amd64 and confirm that it works.
Here the full diff between 2.71 and 2.72 which I've used as base for review:
diff --git devel/autoconf/2.72/Makefile devel/autoconf/2.72/Makefile
index 0da6aff6e9f..6dc179d65ea 100644
--- devel/autoconf/2.72/Makefile
+++ devel/autoconf/2.72/Makefile
@@ -1,4 +1,4 @@
-VERSION = 2.71
+VERSION = 2.72
BUILD_DEPENDS = devel/help2man
diff --git devel/autoconf/2.72/distinfo devel/autoconf/2.72/distinfo
index b9dc7224e77..05dad205ff0 100644
--- devel/autoconf/2.72/distinfo
+++ devel/autoconf/2.72/distinfo
@@ -1,2 +1,2 @@
-SHA256 (autoconf-2.71.tar.gz) = QxB1rQv1Ke8Ty0HpBCxUI4EQPoABVoYiK4qdSr70Khw=
-SIZE (autoconf-2.71.tar.gz) = 2003781
+SHA256 (autoconf-2.72.tar.gz) = r7GBp24e5ygy9lgcDt343wMrg+LgI573nr7cRGfZLW4=
+SIZE (autoconf-2.72.tar.gz) = 2143794
diff --git devel/autoconf/2.72/patches/patch-Makefile_in
devel/autoconf/2.72/patches/patch-Makefile_in
index e788017afb6..3c7310be79d 100644
--- devel/autoconf/2.72/patches/patch-Makefile_in
+++ devel/autoconf/2.72/patches/patch-Makefile_in
@@ -1,7 +1,7 @@
Index: Makefile.in
--- Makefile.in.orig
+++ Makefile.in
-@@ -738,7 +738,7 @@ dist_autoconflib_DATA = \
+@@ -734,7 +734,7 @@ dist_autoconflib_DATA = \
lib/autoconf/programs.m4 \
lib/autoconf/trailer.m4
@@ -10,18 +10,18 @@ Index: Makefile.in
autoscanlibdir = $(pkgdatadir)/autoscan
nodist_autoscanlib_DATA = lib/autoscan/autoscan.list
m4sugarlibdir = $(pkgdatadir)/m4sugar
-@@ -748,9 +748,7 @@ dist_m4sugarlib_DATA = \
+@@ -743,9 +743,7 @@ dist_m4sugarlib_DATA = \
+ lib/m4sugar/foreach.m4 \
lib/m4sugar/m4sh.m4
- nodist_m4sugarlib_DATA = \
-- lib/m4sugar/version.m4 \
+-nodist_m4sugarlib_DATA = \
- lib/m4sugar/m4sugar.m4f \
- lib/m4sugar/m4sh.m4f
-+ lib/m4sugar/version.m4
++nodist_m4sugarlib_DATA =
autotestlibdir = $(pkgdatadir)/autotest
dist_autotestlib_DATA = \
-@@ -758,7 +756,7 @@ dist_autotestlib_DATA = \
+@@ -753,7 +751,7 @@ dist_autotestlib_DATA = \
lib/autotest/general.m4 \
lib/autotest/specific.m4
@@ -30,7 +30,7 @@ Index: Makefile.in
# These are declared as _DATA so that they are not subject to
# --program-transform-name; $(pkgdatadir) is sufficient to keep
-@@ -1201,6 +1199,10 @@ dist-info: $(INFO_DEPS)
+@@ -1198,6 +1196,10 @@ dist-info: $(INFO_DEPS)
for file in $$d/$$base $$d/$$base-[0-9] $$d/$$base-[0-9][0-9]
$$d/$$base_i[0-9] $$d/$$base_i[0-9][0-9]; do \
if test -f $$file; then \
relfile=`expr "$$file" : "$$d/\(.*\)"`; \
@@ -41,7 +41,7 @@ Index: Makefile.in
test -f "$(distdir)/$$relfile" || \
cp -p $$file "$(distdir)/$$relfile"; \
else :; fi; \
-@@ -1532,6 +1534,7 @@ install-pkgdataDATA: $(pkgdata_DATA)
+@@ -1529,6 +1531,7 @@ install-pkgdataDATA: $(pkgdata_DATA)
$(MKDIR_P) "$(DESTDIR)$(pkgdatadir)" || exit 1; \
fi; \
for p in $$list; do \
@@ -49,7 +49,7 @@ Index: Makefile.in
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
done | $(am__base_list) | \
-@@ -1924,18 +1927,25 @@ install-info-am: $(INFO_DEPS)
+@@ -1920,18 +1923,25 @@ install-info-am: $(INFO_DEPS)
for ifile in $$d/$$file $$d/$$file-[0-9] $$d/$$file-[0-9][0-9] \
$$d/$$file_i[0-9] $$d/$$file_i[0-9][0-9] ; do \
if test -f $$ifile; then \
@@ -80,7 +80,7 @@ Index: Makefile.in
echo " install-info --info-dir='$(DESTDIR)$(infodir)'
'$(DESTDIR)$(infodir)/$$relfile'";\
install-info --info-dir="$(DESTDIR)$(infodir)"
"$(DESTDIR)$(infodir)/$$relfile" || :;\
done; \
-@@ -2267,8 +2277,7 @@ $(wrappers): tests/wrapper.in
+@@ -2235,8 +2245,7 @@ $(wrappers): tests/wrapper.in
mv -f $@.tmp $@
$(TESTSUITE): tests/package.m4 \
tests/local.at \
diff --git devel/autoconf/2.72/patches/patch-bin_autom4te_in
devel/autoconf/2.72/patches/patch-bin_autom4te_in
index 447ecd7d41a..476796b0e40 100644
--- devel/autoconf/2.72/patches/patch-bin_autom4te_in
+++ devel/autoconf/2.72/patches/patch-bin_autom4te_in
@@ -19,7 +19,7 @@ Index: bin/autom4te.in
# @M4_BUILTIN -- M4 builtins and a useful comment.
my @m4_builtin = `echo dumpdef | $m4 2>&1 >/dev/null`;
map { s/:.*//;s/\W// } @m4_builtin;
-@@ -470,11 +463,11 @@ sub handle_m4 ($@)
+@@ -520,11 +513,11 @@ sub handle_m4 ($@)
# We don't output directly to the cache files, to avoid problems
# when we are interrupted (that leaves corrupted files).
xsystem ("$m4 @M4_GNU@"
diff --git devel/autoconf/2.72/patches/patch-bin_autoupdate_in
devel/autoconf/2.72/patches/patch-bin_autoupdate_in
index 7ae4ac6f12d..9b4540fd9d3 100644
--- devel/autoconf/2.72/patches/patch-bin_autoupdate_in
+++ devel/autoconf/2.72/patches/patch-bin_autoupdate_in
@@ -9,7 +9,7 @@ Index: bin/autoupdate.in
# $HELP
-@@ -407,9 +408,9 @@ EOF
+@@ -408,9 +409,9 @@ EOF
or error "cannot close $tmp/input.m4: $!";
# Now ask m4 to perform the update.
diff --git devel/autoconf/2.72/patches/patch-configure
devel/autoconf/2.72/patches/patch-configure
index 6d4e8792109..633cae551b2 100644
--- devel/autoconf/2.72/patches/patch-configure
+++ devel/autoconf/2.72/patches/patch-configure
@@ -1,7 +1,7 @@
Index: configure
--- configure.orig
+++ configure
-@@ -2824,19 +2824,7 @@ do
+@@ -2846,29 +2846,7 @@ do
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_M4="$as_dir$ac_prog$ac_exec_ext"
as_fn_executable_p "$ac_path_M4" || continue
@@ -13,16 +13,26 @@ Index: configure
- ac_snippet=${ac_snippet}pat'subst(a,\(b\)\|\(a\),\1)d'nl
- ac_snippet=${ac_snippet}${as_nl}if'else(in''dex(..wi.d.,.d.),-1,bug)'
-
ac_snippet=${ac_snippet}${as_nl}if'else(in''dex(;:11-:12-:12-:12-:12-:12-:12-:12-:12.:12.:12.:12.:12.:12.:12.:12.:12-,:12-:12-:12-:12-:12-:12-:12-:12-),-1,,strstr-bug2)'
+- # Root out M4 1.4.6 and 1.4.7, which do not implement --debug=aflq
+- # correctly for macros invoked from m4wrap.
+- ac_snip2=change'quote(<,>)def''ine(<T>,<>)d'nl
+- ac_snip2=${ac_snip2}${as_nl}def'ine(<F>,<T(<traced>)>)d'nl
+- ac_snip2=${ac_snip2}${as_nl}m4'wrap(<F>)d'nl
+- printf "%s\n" "$as_me:${as_lineno-$LINENO}: trying $ac_path_M4" \
+- >&5
- test -z "`$ac_path_M4 -F conftest.m4f </dev/null 2>&1`" \
-- && test -z "`printf "%s\n" $ac_snippet | $ac_path_M4 --trace=mac 2>&1`"
\
+- && test -z "`printf "%s\n" "$ac_snippet" | $ac_path_M4 --trace=mac
2>&1`" \
- && test -f conftest.m4f \
+- && test x"`printf "%s\n" "$ac_snip2" | \
+- $ac_path_M4 --trace=T --debug=aflq 2>&1`" = \
+- x'm4trace:stdin:3: -1- T(<traced>)' \
- && ac_cv_path_M4=$ac_path_M4 ac_path_M4_found=:
- rm -f conftest.m4f
+ ac_cv_path_M4=$ac_path_M4 ac_path_M4_found=:
$ac_path_M4_found && break 3
done
done
-@@ -2884,20 +2872,7 @@ printf "%s\n" "$as_me: WARNING: the version of M4 that
+@@ -2918,21 +2896,7 @@ printf "%s\n" "$as_me: WARNING: the version of M4 that
printf "%s\n" "$as_me: WARNING: using it with POSIXLY_CORRECT set may cause
problems" >&2;}
fi
fi
@@ -31,11 +41,12 @@ Index: configure
-if test ${ac_cv_prog_gnu_m4_debugfile+y}
-then :
- printf %s "(cached) " >&6
--else $as_nop
-- case `$M4 --help < /dev/null 2>&1` in
+-else case e in #(
+- e) case `$M4 --help < /dev/null 2>&1` in
- *debugfile*) ac_cv_prog_gnu_m4_debugfile=--debugfile ;;
- *) ac_cv_prog_gnu_m4_debugfile=--error-output ;;
-- esac
+- esac ;;
+-esac
-fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result:
$ac_cv_prog_gnu_m4_debugfile" >&5
-printf "%s\n" "$ac_cv_prog_gnu_m4_debugfile" >&6; }
diff --git devel/autoconf/2.72/patches/patch-doc_autoconf_texi
devel/autoconf/2.72/patches/patch-doc_autoconf_texi
index 1d7a3b33c05..c052e2294f9 100644
--- devel/autoconf/2.72/patches/patch-doc_autoconf_texi
+++ devel/autoconf/2.72/patches/patch-doc_autoconf_texi
@@ -6,37 +6,37 @@ Index: doc/autoconf.texi
@dircategory Software development
@direntry
-* Autoconf: (autoconf). Create source code configuration scripts.
-+* Autoconf-2.71: (autoconf-2.71). Create source code configuration
scripts.
++* Autoconf-2.72: (autoconf-2.72). Create source code configuration
scripts.
@end direntry
@dircategory Individual utilities
@direntry
-* autoscan: (autoconf)autoscan Invocation.
-+* autoscan-2.71: (autoconf-2.71)autoscan Invocation.
++* autoscan-2.72: (autoconf-2.72)autoscan Invocation.
Semi-automatic @file{configure.ac} writing
-* ifnames: (autoconf)ifnames Invocation. Listing conditionals in
source.
-* autoconf-invocation: (autoconf)autoconf Invocation.
-+* ifnames-2.71: (autoconf-2.71)ifnames Invocation. Listing
conditionals in source.
-+* autoconf-invocation-2.71: (autoconf-2.71)autoconf Invocation.
++* ifnames-2.72: (autoconf-2.72)ifnames Invocation. Listing
conditionals in source.
++* autoconf-invocation-2.72: (autoconf-2.72)autoconf Invocation.
How to create configuration scripts
-* autoreconf: (autoconf)autoreconf Invocation.
-+* autoreconf-2.71: (autoconf-2.71)autoreconf Invocation.
++* autoreconf-2.72: (autoconf-2.72)autoreconf Invocation.
Remaking multiple @command{configure} scripts
-* autoheader: (autoconf)autoheader Invocation.
-+* autoheader-2.71: (autoconf-2.71)autoheader Invocation.
++* autoheader-2.72: (autoconf-2.72)autoheader Invocation.
How to create configuration templates
-* autom4te: (autoconf)autom4te Invocation.
-+* autom4te-2.71: (autoconf-2.71)autom4te Invocation.
++* autom4te-2.72: (autoconf-2.72)autom4te Invocation.
The Autoconf executables backbone
-* configure: (autoconf)configure Invocation. Configuring a package.
-* autoupdate: (autoconf)autoupdate Invocation.
-+* configure-2.71: (autoconf-2.71)configure Invocation. Configuring a
package.
-+* autoupdate-2.71: (autoconf-2.71)autoupdate Invocation.
++* configure-2.72: (autoconf-2.72)configure Invocation. Configuring a
package.
++* autoupdate-2.72: (autoconf-2.72)autoupdate Invocation.
Automatic update of @file{configure.ac}
-* config.status: (autoconf)config.status Invocation. Recreating
configurations.
-* testsuite: (autoconf)testsuite Invocation. Running an Autotest test
suite.
-+* config.status-2.71: (autoconf-2.71)config.status Invocation. Recreating
configurations.
-+* testsuite-2.71: (autoconf-2.71)testsuite Invocation. Running an Autotest
test suite.
++* config.status-2.72: (autoconf-2.72)config.status Invocation. Recreating
configurations.
++* testsuite-2.72: (autoconf-2.72)testsuite Invocation. Running an Autotest
test suite.
@end direntry
@titlepage
diff --git devel/autoconf/2.72/patches/patch-lib_m4sugar_m4sugar_m4
devel/autoconf/2.72/patches/patch-lib_m4sugar_m4sugar_m4
index 7d0a2936d95..278f8612b85 100644
--- devel/autoconf/2.72/patches/patch-lib_m4sugar_m4sugar_m4
+++ devel/autoconf/2.72/patches/patch-lib_m4sugar_m4sugar_m4
@@ -9,7 +9,7 @@ Index: lib/m4sugar/m4sugar.m4
# m4_provide_if(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
-@@ -3306,13 +3307,10 @@ m4_pattern_forbid([^dnl$])
+@@ -3284,13 +3285,10 @@ m4_pattern_forbid([^dnl$])
#
# Use the raw builtin to avoid tripping up include tracing.
# Meanwhile, avoid m4_copy, since it temporarily undefines m4_defn.
diff --git devel/autoconf/2.72/patches/patch-tests_local_at
devel/autoconf/2.72/patches/patch-tests_local_at
index 14f3d4eba84..cc122435be5 100644
--- devel/autoconf/2.72/patches/patch-tests_local_at
+++ devel/autoconf/2.72/patches/patch-tests_local_at
@@ -1,11 +1,11 @@
Index: tests/local.at
--- tests/local.at.orig
+++ tests/local.at
-@@ -166,6 +166,7 @@ m4_case([$4], [], [], [ignore], [],
+@@ -371,6 +371,7 @@ m4_case([$4], [], [], [ignore], [],
s!^.*/\([^/][^/]*\)\.m4: *[0-9][0-9]*: *!\1.m4: !
s!^.*/\([^/][^/]*\)\.m4: *[0-9][0-9]*: *[0-9][0-9]*: *!\1.m4: !
- s/ (E[A-Z]*)$//
-+ s/: \(.*\) at line \([0-9]*\): include(\(.*\)):/:\1:\2: cannot open
`\3'\'':/
+ s/ (E[A-Z]*)$//
++ s/: \(.*\) at line \([0-9]*\): include(\(.*\)):/:\1:\2: cannot open
`\3'\'':/
' stderr-raw >&2]], [0], [], [$4])])
])
diff --git devel/autoconf/2.72/pkg/PLIST devel/autoconf/2.72/pkg/PLIST
index 766a57871f6..a19d896da2d 100644
--- devel/autoconf/2.72/pkg/PLIST
+++ devel/autoconf/2.72/pkg/PLIST
@@ -65,4 +65,4 @@ share/autoconf${SUFFIX}/m4sugar/
share/autoconf${SUFFIX}/m4sugar/foreach.m4
share/autoconf${SUFFIX}/m4sugar/m4sh.m4
share/autoconf${SUFFIX}/m4sugar/m4sugar.m4
-share/autoconf${SUFFIX}/m4sugar/version.m4
+share/autoconf${SUFFIX}/version.m4
--
wbr, Kirill
