From 9846533ce4ca8d60562ec2e13ecce18f460f0914 Mon Sep 17 00:00:00 2001 From: EWouters <6179932+EWouters@users.noreply.github.com> Date: Fri, 3 Jun 2022 17:59:09 +0200 Subject: [PATCH] Ports/m4: Update m4 to version 1.4.19 --- Ports/AvailablePorts.md | 2 +- Ports/m4/package.sh | 9 +++---- .../patches/0001-Don-t-build-misc-stuff.patch | 24 +++++++++---------- 3 files changed, 18 insertions(+), 17 deletions(-) diff --git a/Ports/AvailablePorts.md b/Ports/AvailablePorts.md index 3859b6039c..5b4444c727 100644 --- a/Ports/AvailablePorts.md +++ b/Ports/AvailablePorts.md @@ -134,7 +134,7 @@ This list is also available at [ports.serenityos.net](https://ports.serenityos.n | [`luajit`](luajit/) | LuaJIT | 2.1.0-beta3 | https://luajit.org/luajit.html | | [`luarocks`](luarocks/) | LuaRocks | 3.8.0 | https://luarocks.org/ | | [`lure`](lure/) | Lure of the Temptress | 1.1 | https://www.scummvm.org/games/#games-lure | -| [`m4`](m4/) | GNU M4 | 1.4.9 | https://www.gnu.org/software/m4/ | +| [`m4`](m4/) | GNU M4 | 1.4.19 | https://www.gnu.org/software/m4/ | | [`make`](make/) | GNU make | 4.3 | https://www.gnu.org/software/make/ | | [`mandoc`](mandoc/) | mandoc | 1.14.5 | https://mandoc.bsd.lv/ | | [`mawk`](mawk/) | mawk | 1.3.4-20200120 | https://invisible-island.net/mawk/ | diff --git a/Ports/m4/package.sh b/Ports/m4/package.sh index 1d114b849b..4f68243430 100755 --- a/Ports/m4/package.sh +++ b/Ports/m4/package.sh @@ -1,8 +1,9 @@ #!/usr/bin/env -S bash ../.port_include.sh -port=m4 -version=1.4.9 -useconfigure=true -use_fresh_config_sub=true +port='m4' +version='1.4.19' +useconfigure='true' +use_fresh_config_sub='true' +config_sub_paths=("build-aux/config.sub") files="https://ftpmirror.gnu.org/gnu/m4/m4-${version}.tar.gz m4-${version}.tar.gz https://ftpmirror.gnu.org/gnu/m4/m4-${version}.tar.gz.sig m4-${version}.tar.gz.sig https://ftpmirror.gnu.org/gnu/gnu-keyring.gpg gnu-keyring.gpg" diff --git a/Ports/m4/patches/0001-Don-t-build-misc-stuff.patch b/Ports/m4/patches/0001-Don-t-build-misc-stuff.patch index 6f54253526..61b343d8eb 100644 --- a/Ports/m4/patches/0001-Don-t-build-misc-stuff.patch +++ b/Ports/m4/patches/0001-Don-t-build-misc-stuff.patch @@ -10,30 +10,30 @@ Skip building the examples, docs and avoid the checks. 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am -index 22781f5..4f4317d 100644 +index d54ace4..d121df1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -20,7 +20,7 @@ ## ## Written by Gary V. Vaughan --SUBDIRS = . examples lib src doc checks -+SUBDIRS = . lib src - EXTRA_DIST = bootstrap c-boxes.el gendocs.sh GNUmakefile Makefile.maint \ - m4/gnulib-cache.m4 - DISTCLEANFILES = stamp-h +-SUBDIRS = . examples lib src doc checks po tests ++SUBDIRS = . lib src + + EXTRA_DIST = bootstrap c-boxes.el cfg.mk maint.mk \ + .prev-version .version m4/gnulib-cache.m4 ChangeLog-2014 diff --git a/Makefile.in b/Makefile.in -index 261472b..57164a4 100644 +index 746b38c..85cb645 100644 --- a/Makefile.in +++ b/Makefile.in -@@ -267,7 +267,7 @@ sysconfdir = @sysconfdir@ - target_alias = @target_alias@ +@@ -1952,7 +1952,7 @@ target_alias = @target_alias@ + top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ --SUBDIRS = . examples lib src doc checks +-SUBDIRS = . examples lib src doc checks po tests +SUBDIRS = . lib src - EXTRA_DIST = bootstrap c-boxes.el gendocs.sh GNUmakefile Makefile.maint \ - m4/gnulib-cache.m4 + EXTRA_DIST = bootstrap c-boxes.el cfg.mk maint.mk \ + .prev-version .version m4/gnulib-cache.m4 ChangeLog-2014 -- 2.36.1