Ports: Remove some config.sub patches and download a fresh one if needed

All of these patches did the same thing, which is already in upstream config.sub. With this change, we need only add `use_fresh_config_sub=true` to the package.sh file. Note that this is not done automatically in case the port has a modified config.sub file.
2024-07-05 20:34:56 +00:00 · 2022-01-08 17:02:29 +03:30 · 2022-01-08 17:02:29 +03:30 · cdd6d68b2a
commit cdd6d68b2a
parent 87630c5fd5
135 changed files with 128 additions and 816 deletions
--- a/Ports/.port_include.sh
+++ b/Ports/.port_include.sh
@ -62,6 +62,8 @@ installopts=()
 configscript=configure
 configopts=()
 useconfigure=false
+config_sub_path=config.sub
+use_fresh_config_sub=false
 depends=()
 patchlevel=1
 auth_type=
@ -79,7 +81,7 @@ shift
 : "${workdir:=$port-$version}"

 run_nocd() {
-    echo "+ $@ (nocd)"
+    echo "+ $@ (nocd)" >&2
    ("$@")
 }

@ -92,6 +94,17 @@ run_replace_in_file() {
    run perl -p -i -e "$1" $2
 }

+get_new_config_sub() {
+    config_sub="${1:-config.sub}"
+    if ! run grep -q serenity "$config_sub"; then
+        run do_download_file "https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub" "${1:-config.sub}" false
+    fi
+}
+
+ensure_new_config_sub() {
+    get_new_config_sub "$config_sub_path"
+}
+
 ensure_build() {
    # Sanity check.
    if [ ! -f "${DESTDIR}/usr/lib/libc.so" ]; then
@ -193,6 +206,31 @@ func_defined pre_fetch || pre_fetch() {
 func_defined post_fetch || post_fetch() {
    :
 }
+
+do_download_file() {
+    local url="$1"
+    local filename="$2"
+    local accept_existing="${3:-true}"
+
+    echo "Downloading URL: ${url}"
+
+    # FIXME: Serenity's curl port does not support https, even with openssl installed.
+    if which curl >/dev/null 2>&1 && ! curl https://example.com -so /dev/null; then
+        url=$(echo "$url" | sed "s/^https:\/\//http:\/\//")
+    fi
+
+    # download files
+    if $accept_existing && [ -f "$filename" ]; then
+        echo "$filename already exists"
+    else
+        if which curl; then
+            run_nocd curl ${curlopts:-} "$url" -L -o "$filename"
+        else
+            run_nocd pro "$url" > "$filename"
+        fi
+    fi
+}
+
 fetch() {
    pre_fetch

@ -211,23 +249,7 @@ fetch() {
        for f in $files; do
            IFS=$OLDIFS
            read url filename auth_sum<<< $(echo "$f")
-            echo "Downloading URL: ${url}"
-
-            # FIXME: Serenity's curl port does not support https, even with openssl installed.
-            if which curl >/dev/null 2>&1 && ! curl https://example.com -so /dev/null; then
-                url=$(echo "$url" | sed "s/^https:\/\//http:\/\//")
-            fi
-
-            # download files
-            if [ -f "$filename" ]; then
-                echo "$filename already exists"
-            else
-                if which curl; then
-                    run_nocd curl ${curlopts:-} "$url" -L -o "$filename"
-                else
-                    run_nocd pro "$url" > "$filename"
-                fi
-            fi
+            do_download_file "$url" "$filename"
        done

        verification_failed=0
@ -343,7 +365,9 @@ func_defined patch_internal || patch_internal() {
    fi
 }
 func_defined pre_configure || pre_configure() {
-    :
+    if "$use_fresh_config_sub"; then
+        ensure_new_config_sub
+    fi
 }
 func_defined configure || configure() {
    chmod +x "${workdir}"/"$configscript"
--- a/Ports/SDL2_gfx/package.sh
+++ b/Ports/SDL2_gfx/package.sh
@ -6,6 +6,7 @@ files="https://downloads.sourceforge.net/project/sdl2gfx/SDL2_gfx-${version}.tar
 auth_type=sha256
 depends=("SDL2")
 useconfigure=true
+use_fresh_config_sub=true
 configopts=("--with-sdl-prefix=${SERENITY_INSTALL_ROOT}/usr/local")

 install() {
--- a/Ports/SDL2_gfx/patches/fix-autoconf.patch
+++ b/Ports/SDL2_gfx/patches/fix-autoconf.patch
@ -1,11 +0,0 @@
--- SDL2_gfx-1.0.4/config.sub	2021-04-04 18:40:50.418255684 +0200
-+++ SDL2_gfx-1.0.4/config.sub	2021-04-04 18:42:32.801888295 +0200
-@@ -1355,7 +1355,7 @@
- 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
- 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
- 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
-+	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -serenity*)
- 	# Remember, each alternative MUST END IN *, to match a version number.
- 		;;
- 	-qnx*)
--- a/Ports/SDL2_image/package.sh
+++ b/Ports/SDL2_image/package.sh
@ -1,6 +1,7 @@
 #!/usr/bin/env -S bash ../.port_include.sh
 port=SDL2_image
 useconfigure=true
+use_fresh_config_sub=true
 version=2.0.5
 depends=("SDL2" "libpng" "libjpeg" "libtiff")
 files="https://www.libsdl.org/projects/SDL_image/release/SDL2_image-${version}.tar.gz SDL_image-${version}.tar.gz bdd5f6e026682f7d7e1be0b6051b209da2f402a2dd8bd1c4bd9c25ad263108d0"
--- a/Ports/SDL2_image/patches/configure.patch
+++ b/Ports/SDL2_image/patches/configure.patch
@ -1,11 +0,0 @@
--- SDL2_image-2.0.5/config.sub	2019-06-30 06:52:03.000000000 +0200
-+++ /home/baitinq/serenity/Ports/SDL2_image-2.0.5/config.sub	2021-04-01 01:55:57.769997556 +0200
-@@ -1363,7 +1363,7 @@
- 	# The portable systems comes first.
- 	# Each alternative MUST end in a * to match a version number.
- 	# -sysv* is not here because it comes later, after sysvr4.
-	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
-+	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -serenity* | -irix* \
- 	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
- 	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
- 	      | -sym* | -kopensolaris* | -plan9* \
--- a/Ports/SDL2_mixer/package.sh
+++ b/Ports/SDL2_mixer/package.sh
@ -2,6 +2,7 @@
 port=SDL2_mixer
 version=2.0.4
 useconfigure=true
+use_fresh_config_sub=true
 files="https://www.libsdl.org/projects/SDL_mixer/release/SDL2_mixer-${version}.tar.gz SDL2_mixer-${version}.tar.gz b4cf5a382c061cd75081cf246c2aa2f9df8db04bdda8dcdc6b6cca55bede2419"
 auth_type=sha256
 depends=("libmodplug" "libvorbis" "SDL2")
--- a/Ports/SDL2_mixer/patches/configure.patch
+++ b/Ports/SDL2_mixer/patches/configure.patch
@ -1,12 +0,0 @@
-diff -ru SDL2_mixer-2.0.4/build-scripts/config.sub SDL2_mixer-2.0.4-patched/build-scripts/config.sub
--- SDL2_mixer-2.0.4/build-scripts/config.sub	2018-10-31 15:59:00.000000000 +0100
-+++ SDL2_mixer-2.0.4-patched/build-scripts/config.sub	2021-03-07 17:50:05.149501049 +0100
-@@ -1408,7 +1408,7 @@
- 	# The portable systems comes first.
- 	# Each alternative MUST END IN A *, to match a version number.
- 	# -sysv* is not here because it comes later, after sysvr4.
-	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
-+	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -serenity* | -irix* \
- 	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
- 	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
- 	      | -sym* | -kopensolaris* | -plan9* \
--- a/Ports/SDL2_net/package.sh
+++ b/Ports/SDL2_net/package.sh
@ -2,6 +2,7 @@
 port=SDL2_net
 version=2.0.1
 useconfigure=true
+use_fresh_config_sub=true
 configopts=("--with-sdl-prefix=${SERENITY_INSTALL_ROOT}/usr/local")
 files="https://www.libsdl.org/projects/SDL_net/release/SDL2_net-${version}.tar.gz SDL2_net-${version}.tar.gz 15ce8a7e5a23dafe8177c8df6e6c79b6749a03fff1e8196742d3571657609d21"
 auth_type=sha256
--- a/Ports/SDL2_net/patches/configure.patch
+++ b/Ports/SDL2_net/patches/configure.patch
@ -1,12 +0,0 @@
-diff -Naur SDL2_net-2.0.1/config.sub SDL2_net-2.0.1.serenity/config.sub
--- SDL2_net-2.0.1/config.sub	2016-01-03 08:57:09.000000000 +0100
-+++ SDL2_net-2.0.1.serenity/config.sub	2021-06-16 10:40:58.771380293 +0200
-@@ -1364,7 +1364,7 @@
- 	# The portable systems comes first.
- 	# Each alternative MUST END IN A *, to match a version number.
- 	# -sysv* is not here because it comes later, after sysvr4.
-	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
-+	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* | -serenity* \
- 	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
- 	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
- 	      | -sym* | -kopensolaris* \
--- a/Ports/SDL2_ttf/package.sh
+++ b/Ports/SDL2_ttf/package.sh
@ -2,6 +2,7 @@
 port=SDL2_ttf
 version=2.0.15
 useconfigure=true
+use_fresh_config_sub=true
 files="https://www.libsdl.org/projects/SDL_ttf/release/SDL2_ttf-${version}.tar.gz SDL2_ttf-${version}.tar.gz a9eceb1ad88c1f1545cd7bd28e7cbc0b2c14191d40238f531a15b01b1b22cd33"
 auth_type=sha256
 depends=("SDL2" "freetype")
--- a/Ports/SDL2_ttf/patches/configure.patch
+++ b/Ports/SDL2_ttf/patches/configure.patch
@ -1,12 +0,0 @@
-diff -ru SDL2_ttf-2.0.15/config.sub SDL2_ttf-2.0.15-patched/config.sub
--- SDL2_ttf-2.0.15/config.sub	2021-03-05 22:11:27.518384348 +0100
-+++ SDL2_ttf-2.0.15-patched/config.sub	2019-01-12 20:44:11.000000000 +0100
-@@ -1408,7 +1408,7 @@
- 	# The portable systems comes first.
- 	# Each alternative MUST END IN A *, to match a version number.
- 	# -sysv* is not here because it comes later, after sysvr4.
-	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
-+	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* | -serenity* \
- 	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
- 	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
- 	      | -sym* | -kopensolaris* | -plan9* \
--- a/Ports/angband/package.sh
+++ b/Ports/angband/package.sh
@ -3,6 +3,7 @@ port=angband
 version=4.2.3
 workdir="Angband-${version}"
 useconfigure=true
+use_fresh_config_sub=true
 files="https://github.com/angband/angband/releases/download/${version}/Angband-${version}.tar.gz Angband-${version}.tar.gz 833c4f8cff2aee61ad015f9346fceaa4a8c739fe2dbe5bd1acd580c91818e6bb"
 auth_type=sha256
 depends=("ncurses" "SDL2" "SDL2_image" "SDL2_ttf" "SDL2_mixer")
--- a/Ports/angband/patches/config-sub.patch
+++ b/Ports/angband/patches/config-sub.patch
@ -1,12 +0,0 @@
-diff -ur Angband-4.2.3-orig/config.sub Angband-4.2.3/config.sub
--- Angband-4.2.3-orig/config.sub	2021-08-01 01:29:20.000000000 +0200
-+++ Angband-4.2.3/config.sub	2021-09-04 19:01:55.625519348 +0200
-@@ -1337,7 +1337,7 @@
- 	# The portable systems comes first.
- 	# Each alternative MUST END IN A *, to match a version number.
- 	# -sysv* is not here because it comes later, after sysvr4.
-	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
-+	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -serenity* | -irix* \
- 	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
- 	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
- 	      | -sym* | -kopensolaris* \
--- a/Ports/bash/package.sh
+++ b/Ports/bash/package.sh
@ -2,6 +2,8 @@
 port=bash
 version=5.1.16
 useconfigure=true
+use_fresh_config_sub=true
+config_sub_path=support/config.sub
 configopts=("--disable-nls" "--without-bash-malloc")
 files="https://ftpmirror.gnu.org/gnu/bash/bash-${version}.tar.gz bash-${version}.tar.gz 5bac17218d3911834520dad13cd1f85ab944e1c09ae1aba55906be1f8192f558"
 auth_type="sha256"
--- a/Ports/bash/patches/config.sub.patch
+++ b/Ports/bash/patches/config.sub.patch
@ -1,10 +0,0 @@
--- bash-5.1.8/support/config.sub	2020-11-18 19:40:12.000000000 +0000
-+++ bash-5.1.8.serenity/support/config.sub	2021-07-29 15:33:03.347306019 +0100
-@@ -1691,6 +1691,7 @@
- 	# The portable systems comes first.
- 	# Each alternative MUST end in a * to match a version number.
- 	gnu* | android* | bsd* | mach* | minix* | genix* | ultrix* | irix* \
-+	     | serenity* \
- 	     | *vms* | esix* | aix* | cnk* | sunos | sunos[34]* \
- 	     | hpux* | unos* | osf* | luna* | dgux* | auroraux* | solaris* \
- 	     | sym* |  plan9* | psp* | sim* | xray* | os68k* | v88r* \
--- a/Ports/binutils/package.sh
+++ b/Ports/binutils/package.sh
@ -2,6 +2,7 @@
 port=binutils
 version=2.37
 useconfigure=true
+use_fresh_config_sub=true
 configopts=("--target=${SERENITY_ARCH}-pc-serenity" "--with-sysroot=/" "--with-build-sysroot=${SERENITY_INSTALL_ROOT}" "--disable-werror" "--disable-gdb" "--disable-nls")
 files="https://ftpmirror.gnu.org/gnu/binutils/binutils-${version}.tar.xz binutils-${version}.tar.xz 820d9724f020a3e69cb337893a0b63c2db161dadcb0e06fc11dc29eb1e84a32c"
 auth_type="sha256"
--- a/Ports/binutils/patches/binutils.patch
+++ b/Ports/binutils/patches/binutils.patch
@ -26,17 +26,6 @@ diff -Naur binutils-2.37/bfd/config.bfd binutils-2.37.serenity/bfd/config.bfd
   aarch64-*-darwin*)
     targ_defvec=aarch64_mach_o_vec
     targ_selvecs="arm_mach_o_vec mach_o_le_vec mach_o_be_vec mach_o_fat_vec"
-diff -Naur binutils-2.37/config.sub binutils-2.37.serenity/config.sub
--- binutils-2.37/config.sub	2021-07-08 13:37:19.000000000 +0200
-+++ binutils-2.37.serenity/config.sub	2021-07-28 18:03:58.972705458 +0200
-@@ -1700,6 +1700,7 @@
- 	# The portable systems comes first.
- 	# Each alternative MUST end in a * to match a version number.
- 	gnu* | android* | bsd* | mach* | minix* | genix* | ultrix* | irix* \
-+	     | serenity* \
- 	     | *vms* | esix* | aix* | cnk* | sunos | sunos[34]* \
- 	     | hpux* | unos* | osf* | luna* | dgux* | auroraux* | solaris* \
- 	     | sym* |  plan9* | psp* | sim* | xray* | os68k* | v88r* \
 diff -Naur binutils-2.37/gas/configure.tgt binutils-2.37.serenity/gas/configure.tgt
 --- binutils-2.37/gas/configure.tgt	2021-07-08 13:37:19.000000000 +0200
 +++ binutils-2.37.serenity/gas/configure.tgt	2021-07-28 18:03:58.972705458 +0200
--- a/Ports/dialog/package.sh
+++ b/Ports/dialog/package.sh
@ -8,4 +8,5 @@ auth_type="sig"
 auth_import_key="C52048C0C0748FEE227D47A2702353E0F7E48EDB"
 auth_opts=("dialog-${version}.tgz.asc" "dialog-${version}.tgz")
 useconfigure=true
+use_fresh_config_sub=true
 configopts=("--prefix=/usr/local" "--with-ncurses" "--with-curses-dir=${SERENITY_INSTALL_ROOT}/usr/local/include/ncurses")
--- a/Ports/dialog/patches/config.sub.patch
+++ b/Ports/dialog/patches/config.sub.patch
@ -1,10 +0,0 @@
--- dialog-1.3-20210324/config.sub	2020-08-16 20:36:41.000000000 -0700
-+++ dialog-1.3-20210324/config.sub	2021-04-11 20:15:18.580516177 -0700
-@@ -1693,6 +1693,7 @@
- 	# The portable systems comes first.
- 	# Each alternative MUST end in a * to match a version number.
- 	gnu* | android* | bsd* | mach* | minix* | genix* | ultrix* | irix* \
-+	     | serenity* \
- 	     | *vms* | esix* | aix* | cnk* | sunos | sunos[34]* \
- 	     | hpux* | unos* | osf* | luna* | dgux* | auroraux* | solaris* \
- 	     | sym* |  plan9* | psp* | sim* | xray* | os68k* | v88r* \
--- a/Ports/diffutils/package.sh
+++ b/Ports/diffutils/package.sh
@ -4,4 +4,5 @@ version=3.7
 files="https://ftpmirror.gnu.org/gnu/diffutils/diffutils-${version}.tar.xz diffutils-${version}.tar.xz b3a7a6221c3dc916085f0d205abf6b8e1ba443d4dd965118da364a1dc1cb3a26"
 auth_type=sha256
 useconfigure=true
+use_fresh_config_sub=true
 depends=("libiconv")
--- a/Ports/diffutils/patches/config.sub.patch
+++ b/Ports/diffutils/patches/config.sub.patch
@ -1,11 +0,0 @@
--- diffutils-3.7/build-aux/config.sub	2018-12-24 02:21:56.000000000 +0100
-+++ diffutils-3.7-patched/build-aux/config.sub	2021-06-13 16:00:32.864108734 +0200
-@@ -1337,7 +1337,7 @@
- 	gnu* | bsd* | mach* | minix* | genix* | ultrix* | irix* \
- 	     | *vms* | esix* | aix* | cnk* | sunos | sunos[34]*\
- 	     | hpux* | unos* | osf* | luna* | dgux* | auroraux* | solaris* \
-	     | sym* | kopensolaris* | plan9* \
-+	     | sym* | kopensolaris* | plan9* | serenity* \
- 	     | amigaos* | amigados* | msdos* | newsos* | unicos* | aof* \
- 	     | aos* | aros* | cloudabi* | sortix* \
- 	     | nindy* | vxsim* | vxworks* | ebmon* | hms* | mvs* \
--- a/Ports/dropbear/package.sh
+++ b/Ports/dropbear/package.sh
@ -8,6 +8,7 @@ https://mirror.dropbear.nl/mirror/releases/dropbear-key-2015.asc dropbear-key-20
 auth_type="sig"
 auth_opts=("--keyring" "./dropbear-key-2015.asc" "dropbear-${version}.tar.bz2.asc")
 useconfigure=true
+use_fresh_config_sub=true
 # don't care about zlib, less deps is better
 configopts=("--disable-zlib")
 # Serenity's utmp is not fully compatible with what dropbear expects.
--- a/Ports/dropbear/patches/fix-autoconf.patch
+++ b/Ports/dropbear/patches/fix-autoconf.patch
@ -1,10 +0,0 @@
--- a/config.sub.orig
-+++ b/config.sub
-@@ -1339,6 +1339,7 @@
- 	# Each alternative MUST end in a * to match a version number.
- 	# sysv* is not here because it comes later, after sysvr4.
- 	gnu* | bsd* | mach* | minix* | genix* | ultrix* | irix* \
-+	     | serenity* \
- 	     | *vms* | esix* | aix* | cnk* | sunos | sunos[34]*\
- 	     | hpux* | unos* | osf* | luna* | dgux* | auroraux* | solaris* \
- 	     | sym* | kopensolaris* | plan9* \
--- a/Ports/flex/package.sh
+++ b/Ports/flex/package.sh
@ -4,6 +4,7 @@ version=2.6.4
 files="https://github.com/westes/flex/releases/download/v${version}/flex-${version}.tar.gz flex-${version}.tar.gz
 https://github.com/westes/flex/releases/download/v${version}/flex-${version}.tar.gz.sig flex-${version}.tar.gz.sig"
 useconfigure=true
+use_fresh_config_sub=true
 configopts=("--disable-bootstrap")
 depends=("m4" "pcre2")
 auth_type="sig"
--- a/Ports/flex/patches/fix-autoconf.patch
+++ b/Ports/flex/patches/fix-autoconf.patch
@ -1,10 +0,0 @@
--- flex-2.6.4/build-aux/config.sub.orig	Thu Jan 23 22:05:46 2020
-+++ flex-2.6.4/build-aux/config.sub	Thu Jan 23 22:05:59 2020
-@@ -1375,6 +1375,7 @@
- 	# Each alternative MUST END IN A *, to match a version number.
- 	# -sysv* is not here because it comes later, after sysvr4.
- 	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
-+	      | -serenity* \
- 	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
- 	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
- 	      | -sym* | -kopensolaris* | -plan9* \
--- a/Ports/fontconfig/package.sh
+++ b/Ports/fontconfig/package.sh
@ -2,6 +2,7 @@
 port=fontconfig
 version=2.13.94
 useconfigure="true"
+use_fresh_config_sub="true"
 depends=("libxml2")
 files="https://www.freedesktop.org/software/fontconfig/release/fontconfig-${version}.tar.xz fontconfig-${version}.tar.xz a5f052cb73fd479ffb7b697980510903b563bbb55b8f7a2b001fcfb94026003c"
 auth_type="sha256"
--- a/Ports/fontconfig/patches/config.sub.patch
+++ b/Ports/fontconfig/patches/config.sub.patch
@ -1,10 +0,0 @@
--- fontconfig-2.13.94/config.sub.orig	2021-10-24 19:47:39.283922896 -0700
-+++ fontconfig-2.13.94/config.sub	2021-10-24 19:47:56.679967977 -0700
-@@ -1334,6 +1334,7 @@
- 	# Each alternative MUST end in a * to match a version number.
- 	# sysv* is not here because it comes later, after sysvr4.
- 	gnu* | bsd* | mach* | minix* | genix* | ultrix* | irix* \
-+	     | serenity* \
- 	     | *vms* | esix* | aix* | cnk* | sunos | sunos[34]*\
- 	     | hpux* | unos* | osf* | luna* | dgux* | auroraux* | solaris* \
- 	     | sym* | kopensolaris* | plan9* \
--- a/Ports/freeciv/package.sh
+++ b/Ports/freeciv/package.sh
@ -2,6 +2,7 @@
 port=freeciv
 version=3.0.0-beta2
 useconfigure=true
+use_fresh_config_sub=true
 configopts=("--enable-client=sdl2" "--enable-fcmp=no")
 files="http://files.freeciv.org/beta/freeciv-${version}.tar.xz freeciv-${version}.tar.xz 9f44dc28068b239c18bda68192ddb27622030880f8ab9c17f777eac28391269e"
 auth_type=sha256
--- a/Ports/freeciv/patches/configure.patch
+++ b/Ports/freeciv/patches/configure.patch
@ -1,12 +0,0 @@
-diff -Naur freeciv-3.0.0-beta2/bootstrap/config.sub freeciv-3.0.0-beta2.serenity/bootstrap/config.sub
--- freeciv-3.0.0-beta2/bootstrap/config.sub	2021-05-14 12:38:07.000000000 +0200
-+++ freeciv-3.0.0-beta2.serenity/bootstrap/config.sub	2021-06-04 23:07:31.952596066 +0200
-@@ -1363,7 +1363,7 @@
- 	# The portable systems comes first.
- 	# Each alternative MUST end in a * to match a version number.
- 	# -sysv* is not here because it comes later, after sysvr4.
-	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
-+	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* | -serenity* \
- 	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
- 	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
- 	      | -sym* | -kopensolaris* | -plan9* \
--- a/Ports/freedink/package.sh
+++ b/Ports/freedink/package.sh
@ -2,12 +2,13 @@
 port=FreeDink
 version=109.6
 useconfigure="true"
+use_fresh_config_sub="true"
 depends=("SDL2" "SDL2_image" "SDL2_mixer" "SDL2_ttf" "SDL2_gfx" "gettext" "fontconfig" "glm")
 workdir="freedink-${version}"
 freedink_data="freedink-data-1.08.20190120"
 files="https://ftpmirror.gnu.org/gnu/freedink/freedink-${version}.tar.gz freedink-${version}.tar.gz
 https://ftpmirror.gnu.org/gnu/freedink/freedink-${version}.tar.gz.sig freedink-${version}.tar.gz.sig
-https://ftpmirror.gnu.org/gnu/freedink/${freedink_data}.tar.gz ${freedink_data}.tar.gz 715f44773b05b73a9ec9b62b0e152f3f281be1a1512fbaaa386176da94cffb9d 
+https://ftpmirror.gnu.org/gnu/freedink/${freedink_data}.tar.gz ${freedink_data}.tar.gz 715f44773b05b73a9ec9b62b0e152f3f281be1a1512fbaaa386176da94cffb9d
 https://ftpmirror.gnu.org/gnu/gnu-keyring.gpg gnu-keyring.gpg"
 auth_type="sig"
 auth_opts=("--keyring" "./gnu-keyring.gpg" "freedink-${version}.tar.gz.sig")
--- a/Ports/freedink/patches/config.sub.patch
+++ b/Ports/freedink/patches/config.sub.patch
@ -1,10 +0,0 @@
--- freedink-109.6/autotools/config.sub	2018-03-01 08:34:41.000000000 -0800
-+++ freedink-109.6/autotools/config.sub	2021-04-09 10:52:45.687169960 -0700
-@@ -1409,6 +1409,7 @@
- 	# Each alternative MUST END IN A *, to match a version number.
- 	# -sysv* is not here because it comes later, after sysvr4.
- 	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
-+	      | -serenity* \
- 	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
- 	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
- 	      | -sym* | -kopensolaris* | -plan9* \
--- a/Ports/freetype/package.sh
+++ b/Ports/freetype/package.sh
@ -2,6 +2,7 @@
 port=freetype
 version=2.10.4
 useconfigure=true
+use_fresh_config_sub=true
 files="https://download.savannah.gnu.org/releases/freetype/freetype-${version}.tar.gz freetype-${version}.tar.gz 5eab795ebb23ac77001cfb68b7d4d50b5d6c7469247b0b01b2c953269f658dac"
 auth_type=sha256
 configopts=("--with-brotli=no" "--with-bzip2=no" "--with-zlib=no" "--with-harfbuzz=no" "--with-png=no")
--- a/Ports/freetype/patches/configure.patch
+++ b/Ports/freetype/patches/configure.patch
@ -1,12 +0,0 @@
-diff -ru freetype-2.10.4/builds/unix/config.sub freetype-2.10.4-patched/builds/unix/config.sub
--- freetype-2.10.4/builds/unix/config.sub	2020-10-20 07:15:01.000000000 +0200
-+++ freetype-2.10.4-patched/builds/unix/config.sub	2021-03-05 21:50:35.776894354 +0100
-@@ -1690,7 +1690,7 @@
- 	# Now accept the basic system types.
- 	# The portable systems comes first.
- 	# Each alternative MUST end in a * to match a version number.
-	gnu* | android* | bsd* | mach* | minix* | genix* | ultrix* | irix* \
-+	gnu* | android* | bsd* | mach* | minix* | genix* | ultrix* | serenity* | irix* \
- 	     | *vms* | esix* | aix* | cnk* | sunos | sunos[34]* \
- 	     | hpux* | unos* | osf* | luna* | dgux* | auroraux* | solaris* \
- 	     | sym* |  plan9* | psp* | sim* | xray* | os68k* | v88r* \
--- a/Ports/gawk/package.sh
+++ b/Ports/gawk/package.sh
@ -2,6 +2,7 @@
 port=gawk
 version=5.1.0
 useconfigure="true"
+use_fresh_config_sub=true
 files="https://ftpmirror.gnu.org/gnu/gawk/gawk-${version}.tar.gz gawk-${version}.tar.gz
 https://ftpmirror.gnu.org/gnu/gawk/gawk-${version}.tar.gz.sig gawk-${version}.tar.gz.sig
 https://ftpmirror.gnu.org/gnu/gnu-keyring.gpg gnu-keyring.gpg"
--- a/Ports/gawk/patches/configure.patch
+++ b/Ports/gawk/patches/configure.patch
@ -1,15 +1,3 @@
-diff -ur a/config.sub b/config.sub
--- a/config.sub	2020-04-13 08:44:50.000000000 +0200
-+++ b/config.sub	2021-06-02 14:46:39.331046420 +0200
-@@ -1338,7 +1338,7 @@
- 	# The portable systems comes first.
- 	# Each alternative MUST end in a * to match a version number.
- 	# sysv* is not here because it comes later, after sysvr4.
-	gnu* | bsd* | mach* | minix* | genix* | ultrix* | irix* \
-+	gnu* | bsd* | mach* | minix* | genix* | ultrix* | serenity* | irix* \
- 	     | *vms* | esix* | aix* | cnk* | sunos | sunos[34]*\
- 	     | hpux* | unos* | osf* | luna* | dgux* | auroraux* | solaris* \
- 	     | sym* | kopensolaris* | plan9* \
 diff -ur a/extension/build-aux/config.sub b/extension/build-aux/config.sub
 --- a/extension/build-aux/config.sub	2020-04-13 08:44:50.000000000 +0200
 +++ b/extension/build-aux/config.sub	2021-06-02 14:46:39.331046420 +0200
--- a/Ports/gltron/package.sh
+++ b/Ports/gltron/package.sh
@ -1,6 +1,7 @@
 #!/usr/bin/env -S bash ../.port_include.sh
 port=gltron
 useconfigure="true"
+use_fresh_config_sub=true
 version="0.70"
 files="http://mirror.sobukus.de/files/grimoire/games-arcade-2d/gltron-${version}-source.tar.gz gltron-${version}-source.tar.gz e0c8ebb41a18a1f8d7302a9c2cb466f5b1dd63e9a9966c769075e6b6bdad8bb0"
 auth_type=sha256
--- a/Ports/gltron/patches/config.sub.patch
+++ b/Ports/gltron/patches/config.sub.patch
@ -1,11 +0,0 @@
--- gltron-0.70/config.sub	2002-03-23 17:40:17.000000000 +0000
-+++ gltron-0.70-patched/config.sub	2022-01-09 23:05:14.342418312 +0000
-@@ -1070,7 +1070,7 @@
- 	      | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \
- 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
- 	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
-	      | -os2* | -vos*)
-+	      | -os2* | -vos* | -serenity*)
- 	# Remember, each alternative MUST END IN *, to match a version number.
- 		;;
- 	-qnx*)
--- a/Ports/gnucobol/package.sh
+++ b/Ports/gnucobol/package.sh
@ -2,6 +2,7 @@
 port=gnucobol
 version=3.1.2
 useconfigure="true"
+use_fresh_config_sub="true"
 depends=("gmp" "gcc" "bash" "ncurses")
 files="https://ftpmirror.gnu.org/gnu/gnucobol/gnucobol-${version}.tar.bz2 gnucobol-${version}.tar.bz2
 https://ftpmirror.gnu.org/gnu/gnucobol/gnucobol-${version}.tar.bz2.sig gnucobol-${version}.tar.bz2.sig
--- a/Ports/gnucobol/patches/config.sub.patch
+++ b/Ports/gnucobol/patches/config.sub.patch
@ -1,10 +0,0 @@
--- gnucobol-3.1.2/build_aux/config.sub	2021-04-08 02:49:20.863867201 -0700
-+++ gnucobol-3.1.2/build_aux/config.sub	2021-04-08 02:49:22.715869376 -0700
-@@ -1339,6 +1339,7 @@
- 	# Each alternative MUST end in a * to match a version number.
- 	# sysv* is not here because it comes later, after sysvr4.
- 	gnu* | bsd* | mach* | minix* | genix* | ultrix* | irix* \
-+	     | serenity* \
- 	     | *vms* | esix* | aix* | cnk* | sunos | sunos[34]*\
- 	     | hpux* | unos* | osf* | luna* | dgux* | auroraux* | solaris* \
- 	     | sym* | kopensolaris* | plan9* \
--- a/Ports/gnupg/package.sh
+++ b/Ports/gnupg/package.sh
@ -2,6 +2,8 @@
 port=gnupg
 version=2.3.0
 useconfigure=true
+use_fresh_config_sub=true
+config_sub_path=build-aux/config.sub
 configopts=("--with-libgpg-error-prefix=${SERENITY_INSTALL_ROOT}/usr/local"
  "--with-libgcrypt-prefix=${SERENITY_INSTALL_ROOT}/usr/local"
  "--with-libassuan-prefix=${SERENITY_INSTALL_ROOT}/usr/local"
--- a/Ports/gnupg/patches/configure.patch
+++ b/Ports/gnupg/patches/configure.patch
@ -1,12 +0,0 @@
-diff -Naur gnupg-2.3.0/build-aux/config.sub gnupg-2.3.0.serenity/build-aux/config.sub
--- gnupg-2.3.0/build-aux/config.sub	2017-03-17 09:34:37.000000000 +0100
-+++ gnupg-2.3.0.serenity/build-aux/config.sub	2021-04-14 01:12:00.264606451 +0200
-@@ -1381,7 +1381,7 @@
- 	# The portable systems comes first.
- 	# Each alternative MUST END IN A *, to match a version number.
- 	# -sysv* is not here because it comes later, after sysvr4.
-	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
-+	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* | -serenity* \
- 	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
- 	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
- 	      | -sym* | -kopensolaris* | -plan9* \
--- a/Ports/grep/package.sh
+++ b/Ports/grep/package.sh
@ -6,6 +6,7 @@ https://ftpmirror.gnu.org/gnu/grep/grep-${version}.tar.gz.sig grep-${version}.ta
 https://ftpmirror.gnu.org/gnu/gnu-keyring.gpg gnu-keyring.gpg"

 useconfigure=true
+use_fresh_config_sub=true
 configopts=("--disable-perl-regexp")
 auth_type="sig"
 auth_opts=("--keyring" "./gnu-keyring.gpg" "grep-${version}.tar.gz.sig")
--- a/Ports/grep/patches/fix-autoconf.patch
+++ b/Ports/grep/patches/fix-autoconf.patch
@ -1,10 +0,0 @@
--- grep-2.5.4/config.sub.orig	Sat Jan 25 11:56:17 2020
-+++ grep-2.5.4/config.sub	Sat Jan 25 11:56:28 2020
-@@ -1204,6 +1204,7 @@
- 	# Each alternative MUST END IN A *, to match a version number.
- 	# -sysv* is not here because it comes later, after sysvr4.
- 	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
-+	      | -serenity* \
- 	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
- 	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
- 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
--- a/Ports/indent/package.sh
+++ b/Ports/indent/package.sh
@ -5,6 +5,7 @@ files="https://ftpmirror.gnu.org/gnu/indent/indent-${version}.tar.gz indent-${ve
 https://ftpmirror.gnu.org/gnu/indent/indent-${version}.tar.gz.sig indent-${version}.tar.gz.sig
 https://ftpmirror.gnu.org/gnu/gnu-keyring.gpg gnu-keyring.gpg"
 useconfigure=true
+use_fresh_config_sub=true
 auth_type="sig"
 auth_opts=("--keyring" "./gnu-keyring.gpg" "indent-${version}.tar.gz.sig")

--- a/Ports/indent/patches/fix-autoconf.patch
+++ b/Ports/indent/patches/fix-autoconf.patch
@ -1,10 +0,0 @@
--- indent-2.2.11/config/config.sub.orig	2020-11-08 23:19:24.782365611 -0800
-+++ indent-2.2.11/config/config.sub	2020-11-08 23:19:36.510304136 -0800
-@@ -1236,6 +1236,7 @@
- 	# Each alternative MUST END IN A *, to match a version number.
- 	# -sysv* is not here because it comes later, after sysvr4.
- 	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
-+	      | -serenity* \
- 	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
- 	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
- 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
--- a/Ports/libarchive/package.sh
+++ b/Ports/libarchive/package.sh
@ -2,6 +2,7 @@
 port=libarchive
 version=3.5.2
 useconfigure=true
+use_fresh_config_sub=true
 configopts=("--without-xml2")
 files="https://libarchive.org/downloads/libarchive-${version}.tar.gz libarchive-${version}.tar.gz
 https://libarchive.org/downloads/libarchive-${version}.tar.gz.asc libarchive-${version}.tar.gz.asc"
--- a/Ports/libarchive/patches/fix-autoconf.patch
+++ b/Ports/libarchive/patches/fix-autoconf.patch
@ -1,13 +0,0 @@
-diff --git a/build/autoconf/config.sub.orig b/build/autoconf/config.sub
-index 1d8e98bce..e1d397a3c 100755
--- a/build/autoconf/config.sub.orig
-+++ b/build/autoconf/config.sub
-@@ -1390,7 +1390,7 @@ case $os in
-	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \
-	      | -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox* | -bme* \
-	      | -midnightbsd*)
-+	      | -midnightbsd* | -serenity*)
-	# Remember, each alternative MUST END IN *, to match a version number.
-		;;
-	-qnx*)
--- a/Ports/libassuan/package.sh
+++ b/Ports/libassuan/package.sh
@ -2,6 +2,8 @@
 port=libassuan
 version=2.5.5
 useconfigure=true
+use_fresh_config_sub=true
+config_sub_path=build-aux/config.sub
 depends=("libgpg-error")
 files="https://gnupg.org/ftp/gcrypt/libassuan/libassuan-${version}.tar.bz2 libassuan-${version}.tar.bz2 8e8c2fcc982f9ca67dcbb1d95e2dc746b1739a4668bc20b3a3c5be632edb34e4"
 auth_type=sha256
--- a/Ports/libassuan/patches/configure.patch
+++ b/Ports/libassuan/patches/configure.patch
@ -1,12 +0,0 @@
-diff -Naur libassuan-2.5.5/build-aux/config.sub libassuan-2.5.5.serenity/build-aux/config.sub
--- libassuan-2.5.5/build-aux/config.sub	2016-07-13 19:01:14.000000000 +0200
-+++ libassuan-2.5.5.serenity/build-aux/config.sub	2021-04-14 02:35:26.315797397 +0200
-@@ -1381,7 +1381,7 @@
- 	# The portable systems comes first.
- 	# Each alternative MUST END IN A *, to match a version number.
- 	# -sysv* is not here because it comes later, after sysvr4.
-	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
-+	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* | -serenity* \
- 	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
- 	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
- 	      | -sym* | -kopensolaris* | -plan9* \
--- a/Ports/libatomic_ops/package.sh
+++ b/Ports/libatomic_ops/package.sh
@ -3,5 +3,6 @@
 port=libatomic_ops
 version=7.6.10
 useconfigure=true
+use_fresh_config_sub=true
 files="https://www.hboehm.info/gc/gc_source/libatomic_ops-${version}.tar.gz libatomic_ops-${version}.tar.gz 587edf60817f56daf1e1ab38a4b3c729b8e846ff67b4f62a6157183708f099af"
 auth_type=sha256
--- a/Ports/libatomic_ops/patches/fix-autoconf.patch
+++ b/Ports/libatomic_ops/patches/fix-autoconf.patch
@ -1,12 +0,0 @@
--- libatomic_ops-7.6.10/config.sub	2021-07-18 14:24:53.950762337 +0100
-+++ libatomic_ops-7.6.10/config.sub	2021-07-18 14:25:19.341651925 +0100
-@@ -1393,7 +1393,8 @@
- 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
- 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
- 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -tirtos*)
-+	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -tirtos* \
-+	      | -serenity* )
- 	# Remember, each alternative MUST END IN *, to match a version number.
- 		;;
- 	-qnx*)
--- a/Ports/libexpat/package.sh
+++ b/Ports/libexpat/package.sh
@ -2,6 +2,7 @@
 port=libexpat
 version=2.2.9
 useconfigure=true
+use_fresh_config_sub=true
 files="https://github.com/libexpat/libexpat/releases/download/R_2_2_9/expat-${version}.tar.xz expat-${version}.tar.xz
 https://github.com/libexpat/libexpat/releases/download/R_2_2_9/expat-${version}.tar.xz.asc expat-${version}.tar.xz.asc"
 workdir=expat-${version}
--- a/Ports/libexpat/patches/fix-autoconf.patch
+++ b/Ports/libexpat/patches/fix-autoconf.patch
@ -1,22 +0,0 @@
--- a/conftools/config.sub
-+++ b/conftools/config.sub
-@@ -2,7 +2,7 @@
- # Configuration validation subroutine script.
- #   Copyright 1992-2018 Free Software Foundation, Inc.
-
-timestamp='2018-01-01'
-+timestamp='2019-10-03'
-
- # This file is free software; you can redistribute it and/or modify it
- # under the terms of the GNU General Public License as published by
-@@ -1409,6 +1409,7 @@ case $os in
- 	# Each alternative MUST end in a * to match a version number.
- 	# -sysv* is not here because it comes later, after sysvr4.
- 	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
-+	      | -serenity* \
- 	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
- 	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
- 	      | -sym* | -kopensolaris* | -plan9* \
--
-2.17.1
-
--- a/Ports/libffi/package.sh
+++ b/Ports/libffi/package.sh
@ -2,5 +2,6 @@
 port=libffi
 version=3.4.2
 useconfigure=true
+use_fresh_config_sub=true
 files="https://github.com/libffi/libffi/releases/download/v${version}/libffi-${version}.tar.gz libffi-${version}.tar.gz 540fb721619a6aba3bdeef7d940d8e9e0e6d2c193595bc243241b77ff9e93620"
 auth_type=sha256
--- a/Ports/libffi/patches/fix-autoconf.patch
+++ b/Ports/libffi/patches/fix-autoconf.patch
@ -1,13 +0,0 @@
-diff --git a/config.sub b/config.sub
-index 14b5150..b541768 100644
--- a/config.sub
-+++ b/config.sub
-@@ -1722,7 +1722,7 @@ case $os in
- 	     | skyos* | haiku* | rdos* | toppers* | drops* | es* \
- 	     | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \
- 	     | midnightbsd* | amdhsa* | unleashed* | emscripten* | wasi* \
-	     | nsk* | powerunix* | genode* | zvmoe* )
-+	     | nsk* | powerunix* | genode* | zvmoe* | serenity* )
- 		;;
- 	# This one is extra strict with allowed versions
- 	sco3.2v2 | sco3.2v[4-9]* | sco5v6*)
--- a/Ports/libgcrypt/package.sh
+++ b/Ports/libgcrypt/package.sh
@ -2,6 +2,8 @@
 port=libgcrypt
 version=1.9.2
 useconfigure=true
+use_fresh_config_sub=true
+config_sub_path=build-aux/config.sub
 configopts=("--with-libgpg-error-prefix=${SERENITY_INSTALL_ROOT}/usr/local")
 depends=("libgpg-error")
 files="https://gnupg.org/ftp/gcrypt/libgcrypt/libgcrypt-${version}.tar.bz2 libgcrypt-${version}.tar.bz2 b2c10d091513b271e47177274607b1ffba3d95b188bbfa8797f948aec9053c5a"
--- a/Ports/libgcrypt/patches/configure.patch
+++ b/Ports/libgcrypt/patches/configure.patch
@ -1,12 +0,0 @@
-diff -Naur libgcrypt-1.9.2/build-aux/config.sub libgcrypt-1.9.2.serenity/build-aux/config.sub
--- libgcrypt-1.9.2/build-aux/config.sub	2019-06-23 17:35:08.000000000 +0200
-+++ libgcrypt-1.9.2.serenity/build-aux/config.sub	2021-04-14 01:14:04.895316310 +0200
-@@ -1381,7 +1381,7 @@
- 	# The portable systems comes first.
- 	# Each alternative MUST END IN A *, to match a version number.
- 	# -sysv* is not here because it comes later, after sysvr4.
-	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
-+	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* | -serenity* \
- 	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
- 	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
- 	      | -sym* | -kopensolaris* | -plan9* \
--- a/Ports/libgd/package.sh
+++ b/Ports/libgd/package.sh
@ -2,6 +2,8 @@
 port=libgd
 version=2.3.3
 useconfigure=true
+use_fresh_config_sub=true
+config_sub_path=build-aux/config.sub
 files="https://github.com/libgd/libgd/releases/download/gd-${version}/libgd-${version}.tar.gz libgd-${version}.tar.gz dd3f1f0bb016edcc0b2d082e8229c822ad1d02223511997c80461481759b1ed2"
 auth_type=sha256
 depends=("libpng")
--- a/Ports/libgd/patches/configure.patch
+++ b/Ports/libgd/patches/configure.patch
@ -1,12 +0,0 @@
-diff -ruN libgd-2.3.3/config/config.sub libgd-2.3.3.patched/config/config.sub
--- libgd-2.3.3/config/config.sub	2021-09-11 01:12:11.000000000 -0400
-+++ libgd-2.3.3.patched/config/config.sub	2022-01-05 15:38:17.115307773 -0500
-@@ -1390,7 +1390,7 @@
- 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
- 	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \
- 	      | -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox* | -bme* \
-	      | -midnightbsd*)
-+	      | -midnightbsd* | -serenity*)
- 	# Remember, each alternative MUST END IN *, to match a version number.
- 		;;
- 	-qnx*)
--- a/Ports/libgpg-error/package.sh
+++ b/Ports/libgpg-error/package.sh
@ -2,6 +2,8 @@
 port=libgpg-error
 version=1.42
 useconfigure=true
+use_fresh_config_sub=true
+config_sub_path=build-aux/config.sub
 depends=("gettext")
 configopts=("--disable-tests" "--disable-threads")
 files="https://gnupg.org/ftp/gcrypt/libgpg-error/libgpg-error-${version}.tar.bz2 libgpg-error-${version}.tar.bz2 fc07e70f6c615f8c4f590a8e37a9b8dd2e2ca1e9408f8e60459c67452b925e23"
--- a/Ports/libgpg-error/patches/configure.patch
+++ b/Ports/libgpg-error/patches/configure.patch
@ -1,12 +0,0 @@
-diff -Naur libgpg-error-1.42/build-aux/config.sub libgpg-error-1.42.serenity/build-aux/config.sub
--- libgpg-error-1.42/build-aux/config.sub	2018-10-24 10:00:20.000000000 +0200
-+++ libgpg-error-1.42.serenity/build-aux/config.sub	2021-04-14 01:15:34.040231143 +0200
-@@ -1333,7 +1333,7 @@
- 	# The portable systems comes first.
- 	# Each alternative MUST end in a * to match a version number.
- 	# sysv* is not here because it comes later, after sysvr4.
-	gnu* | bsd* | mach* | minix* | genix* | ultrix* | irix* \
-+	gnu* | bsd* | mach* | minix* | genix* | ultrix* | irix* | serenity* \
- 	     | *vms* | esix* | aix* | cnk* | sunos | sunos[34]*\
- 	     | hpux* | unos* | osf* | luna* | dgux* | auroraux* | solaris* \
- 	     | sym* | kopensolaris* | plan9* \
--- a/Ports/libicu/package.sh
+++ b/Ports/libicu/package.sh
@ -2,6 +2,7 @@
 port=libicu
 version=69.1
 useconfigure=true
+use_fresh_config_sub=true
 workdir=icu/source
 configopts=("--with-cross-build=$(pwd)/${workdir}/../host-build")
 files="https://github.com/unicode-org/icu/releases/download/release-${version//./-}/icu4c-${version//./_}-src.tgz icu4c-${version//./_}-src.tgz 4cba7b7acd1d3c42c44bb0c14be6637098c7faf2b330ce876bc5f3b915d09745"
--- a/Ports/libicu/patches/icu.patch
+++ b/Ports/libicu/patches/icu.patch
@ -89,18 +89,6 @@ diff -ur source/config/mh-serenity source.serenity/config/mh-serenity
 +
 +## End Linux-specific setup
 +
-diff -ur source/config.sub source.serenity/config.sub
--- source/config.sub	2021-04-08 02:10:27.000000000 +0200
-+++ source.serenity/config.sub	2021-04-11 07:59:52.531086431 +0200
-@@ -1416,7 +1416,7 @@
- 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
- 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
- 	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \
-	      | -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox*)
-+	      | -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox* | -serenity*)
- 	# Remember, each alternative MUST END IN *, to match a version number.
- 		;;
- 	-qnx*)
 diff -ur source/configure source.serenity/configure
 --- source/configure	2021-04-08 02:10:27.000000000 +0200
 +++ source.serenity/configure	2021-04-11 09:24:04.971314734 +0200
--- a/Ports/libjpeg/package.sh
+++ b/Ports/libjpeg/package.sh
@ -2,6 +2,7 @@
 port=libjpeg
 version=9d
 useconfigure=true
+use_fresh_config_sub=true
 files="https://ijg.org/files/jpegsrc.v${version}.tar.gz jpeg-${version}.tar.gz 2303a6acfb6cc533e0e86e8a9d29f7e6079e118b9de3f96e07a71a11c082fa6a"
 auth_type=sha256
 workdir="jpeg-$version"
--- a/Ports/libjpeg/patches/system-detect.patch
+++ b/Ports/libjpeg/patches/system-detect.patch
@ -1,11 +0,0 @@
--- jpeg-9d/config.sub.orig	2021-02-17 23:18:21.463855433 +0000
-+++ jpeg-9d/config.sub	2021-02-17 23:18:42.043804955 +0000
-@@ -1390,7 +1390,7 @@
- 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
- 	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \
- 	      | -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox* | -bme* \
-	      | -midnightbsd*)
-+	      | -midnightbsd* | -serenity* )
- 	# Remember, each alternative MUST END IN *, to match a version number.
- 		;;
- 	-qnx*)
--- a/Ports/libksba/package.sh
+++ b/Ports/libksba/package.sh
@ -2,6 +2,8 @@
 port=libksba
 version=1.5.1
 useconfigure=true
+use_fresh_config_sub=true
+config_sub_path=build-aux/config.sub
 depends=("libgpg-error")
 files="https://gnupg.org/ftp/gcrypt/libksba/libksba-${version}.tar.bz2 libksba-${version}.tar.bz2 b0f4c65e4e447d9a2349f6b8c0e77a28be9531e4548ba02c545d1f46dc7bf921"
 auth_type=sha256
--- a/Ports/libksba/patches/configure.patch
+++ b/Ports/libksba/patches/configure.patch
@ -1,12 +0,0 @@
-diff -Naur libksba-1.5.1/build-aux/config.sub libksba-1.5.1.serenity/build-aux/config.sub
--- libksba-1.5.1/build-aux/config.sub	2016-08-22 10:40:58.000000000 +0200
-+++ libksba-1.5.1.serenity/build-aux/config.sub	2021-04-14 02:31:15.924387614 +0200
-@@ -1381,7 +1381,7 @@
- 	# The portable systems comes first.
- 	# Each alternative MUST END IN A *, to match a version number.
- 	# -sysv* is not here because it comes later, after sysvr4.
-	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
-+	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* | -serenity* \
- 	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
- 	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
- 	      | -sym* | -kopensolaris* | -plan9* \
--- a/Ports/libmodplug/package.sh
+++ b/Ports/libmodplug/package.sh
@ -2,6 +2,7 @@
 port=libmodplug
 version=0.8.8.5
 useconfigure=true
+use_fresh_config_sub=true
 configopts=("ac_cv_c_bigendian=no")
 files="https://download.sourceforge.net/modplug-xmms/libmodplug-${version}.tar.gz libmodplug-${version}.tar.gz 77462d12ee99476c8645cb5511363e3906b88b33a6b54362b4dbc0f39aa2daad"
 auth_type=sha256
--- a/Ports/libmodplug/patches/config.sub.patch
+++ b/Ports/libmodplug/patches/config.sub.patch
@ -1,12 +0,0 @@
-diff -Naur libmodplug-0.8.8.5/config.sub libmodplug-0.8.8.5.serenity/config.sub
--- libmodplug-0.8.8.5/config.sub	2017-03-17 09:34:37.000000000 +0100
-+++ libmodplug-0.8.8.5.serenity/config.sub	2021-04-14 01:12:00.264606451 +0200
-@@ -1381,7 +1381,7 @@
- 	# The portable systems comes first.
- 	# Each alternative MUST END IN A *, to match a version number.
- 	# -sysv* is not here because it comes later, after sysvr4.
-	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
-+	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* | -serenity* \
- 	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
- 	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
- 	      | -sym* | -kopensolaris* | -plan9* \
--- a/Ports/libogg/package.sh
+++ b/Ports/libogg/package.sh
@ -2,6 +2,7 @@
 port=libogg
 version=1.3.5
 useconfigure=true
+use_fresh_config_sub=true
 files="https://github.com/xiph/ogg/releases/download/v${version}/libogg-${version}.tar.gz libogg-${version}.tar.gz 0eb4b4b9420a0f51db142ba3f9c64b333f826532dc0f48c6410ae51f4799b664"
 auth_type=sha256

--- a/Ports/libogg/patches/config.sub.patch
+++ b/Ports/libogg/patches/config.sub.patch
@ -1,11 +0,0 @@
--- libogg-1.3.5/config.sub	2021-06-04 01:15:56.000000000 +0200
-+++ libogg-1.3.5-patched/config.sub	2022-01-08 00:05:41.813876348 +0100
-@@ -1363,7 +1363,7 @@
- 	# The portable systems comes first.
- 	# Each alternative MUST end in a * to match a version number.
- 	# -sysv* is not here because it comes later, after sysvr4.
-	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
-+	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -serenity* | -irix* \
- 	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
- 	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
- 	      | -sym* | -kopensolaris* | -plan9* \
--- a/Ports/liboggz/package.sh
+++ b/Ports/liboggz/package.sh
@ -2,6 +2,7 @@
 port=liboggz
 version=1.1.1
 useconfigure=true
+use_fresh_config_sub=true
 files="https://downloads.xiph.org/releases/liboggz/liboggz-${version}.tar.gz liboggz-${version}.tar.gz 6bafadb1e0a9ae4ac83304f38621a5621b8e8e32927889e65a98706d213d415a"
 auth_type=sha256
 depends=("libogg")
--- a/Ports/liboggz/patches/configure.patch
+++ b/Ports/liboggz/patches/configure.patch
@ -1,11 +0,0 @@
--- liboggz-1.1.1/config.sub.orig	2022-01-05 23:56:43.372206851 +0100
-+++ liboggz-1.1.1/config.sub	2022-01-05 23:57:54.265540213 +0100
-@@ -1266,7 +1266,7 @@
- 	# The portable systems comes first.
- 	# Each alternative MUST END IN A *, to match a version number.
- 	# -sysv* is not here because it comes later, after sysvr4.
-	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
-+	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -serenity* | -irix* \
- 	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
- 	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
- 	      | -kopensolaris* \
--- a/Ports/libpng/package.sh
+++ b/Ports/libpng/package.sh
@ -2,6 +2,7 @@
 port=libpng
 version=1.6.37
 useconfigure=true
+use_fresh_config_sub=true
 files="https://download.sourceforge.net/libpng/libpng-${version}.tar.gz libpng-${version}.tar.gz daeb2620d829575513e35fecc83f0d3791a620b9b93d800b763542ece9390fb4"
 auth_type=sha256
 depends=("zlib")
--- a/Ports/libpng/patches/detect.patch
+++ b/Ports/libpng/patches/detect.patch
@ -1,11 +0,0 @@
--- config.sub	2021-03-03 22:42:25.065684142 +0100
-+++ libpng-1.6.37/config.sub	2021-03-03 22:43:50.611720741 +0100
-@@ -1390,7 +1390,7 @@
- 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
- 	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \
- 	      | -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox* | -bme* \
-	      | -midnightbsd*)
-+	      | -midnightbsd* | -serenity*)
- 	# Remember, each alternative MUST END IN *, to match a version number.
- 		;;
- 	-qnx*)
--- a/Ports/libsixel/package.sh
+++ b/Ports/libsixel/package.sh
@ -3,6 +3,7 @@ port=libsixel
 version=1.8.6
 files="https://github.com/saitoha/libsixel/archive/refs/tags/v${version}.tar.gz ${port}-${version}.tar.gz 37611d60c7dbcee701346967336dbf135fdd5041024d5f650d52fae14c731ab9"
 useconfigure=true
+use_fresh_config_sub=true
 auth_type=sha256
 configopts=("--prefix=${SERENITY_INSTALL_ROOT}/usr/local")

--- a/Ports/libsixel/patches/config.sub.patch
+++ b/Ports/libsixel/patches/config.sub.patch
@ -1,13 +0,0 @@
-diff --git a/config.sub b/config.sub
-index 9ccf09a..3f638ab 100755
--- a/config.sub
-+++ b/config.sub
-@@ -1390,7 +1390,7 @@ case $os in
- 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
- 	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \
- 	      | -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox* | -bme* \
-	      | -midnightbsd*)
-+	      | -midnightbsd* | -serenity*)
- 	# Remember, each alternative MUST END IN *, to match a version number.
- 		;;
- 	-qnx*)
--- a/Ports/libsodium/package.sh
+++ b/Ports/libsodium/package.sh
@ -2,6 +2,8 @@
 port=libsodium
 version=1.0.18
 useconfigure=true
+use_fresh_config_sub=true
+config_sub_path=build-aux/config.sub
 workdir=libsodium-${version}
 files="https://download.libsodium.org/libsodium/releases/libsodium-${version}.tar.gz libsodium-${version}.tar.gz 6f504490b342a4f8a4c4a02fc9b866cbef8622d5df4e5452b46be121e46636c1"
 auth_type=sha256
--- a/Ports/libsodium/patches/fix-config-sub.patch
+++ b/Ports/libsodium/patches/fix-config-sub.patch
@ -1,12 +0,0 @@
-diff -ur a/build-aux/config.sub b/build-aux/config.sub
--- a/build-aux/config.sub	2019-05-30 22:20:06.000000000 +0200
-+++ b/build-aux/config.sub	2021-11-01 10:53:11.568353185 +0100
-@@ -1341,7 +1341,7 @@
- 	# The portable systems comes first.
- 	# Each alternative MUST end in a * to match a version number.
- 	# sysv* is not here because it comes later, after sysvr4.
-	gnu* | bsd* | mach* | minix* | genix* | ultrix* | irix* \
-+	gnu* | bsd* | mach* | minix* | genix* | ultrix* | serenity* | irix* \
- 	     | *vms* | esix* | aix* | cnk* | sunos | sunos[34]*\
- 	     | hpux* | unos* | osf* | luna* | dgux* | auroraux* | solaris* \
- 	     | sym* | kopensolaris* | plan9* \
--- a/Ports/libtheora/package.sh
+++ b/Ports/libtheora/package.sh
@ -2,6 +2,7 @@
 port=libtheora
 version=1.1.1
 useconfigure=true
+use_fresh_config_sub=true
 files="https://ftp.osuosl.org/pub/xiph/releases/theora/libtheora-${version}.tar.bz2 libtheora-${version}.tar.bz2 b6ae1ee2fa3d42ac489287d3ec34c5885730b1296f0801ae577a35193d3affbc"
 auth_type="sha256"
 depends=("libvorbis")
--- a/Ports/libtheora/patches/config.sub.patch
+++ b/Ports/libtheora/patches/config.sub.patch
@ -1,11 +0,0 @@
--- libtheora-1.1.1/config.sub	2009-02-24 04:50:50.000000000 +0100
-+++ libtheora-1.1.1-patched/config.sub	2021-04-27 21:07:46.414544609 +0200
-@@ -1093,7 +1093,7 @@
- 	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
- 	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
- 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
-	      | -aos* \
-+	      | -aos* | -serenity* \
- 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
- 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
- 	      | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
--- a/Ports/libtool/package.sh
+++ b/Ports/libtool/package.sh
@ -2,6 +2,7 @@
 port=libtool
 version=2.4
 useconfigure="true"
+use_fresh_config_sub="true"
 depends=("bash" "sed")
 files="https://ftpmirror.gnu.org/gnu/libtool/libtool-${version}.tar.xz libtool-${version}.tar.xz
 https://ftpmirror.gnu.org/gnu/libtool/libtool-${version}.tar.xz.sig libtool-${version}.tar.xz.sig
--- a/Ports/libtool/patches/config.sub.patch
+++ b/Ports/libtool/patches/config.sub.patch
@ -1,10 +0,0 @@
--- libtool-2.4.6/libltdl/config/config.sub	2010-09-22 07:46:09.000000000 -0700
-+++ libtool-2.4.6/libltdl/config/config.sub	2021-04-11 18:46:03.374661972 -0700
-@@ -1301,6 +1301,7 @@
- 	# Each alternative MUST END IN A *, to match a version number.
- 	# -sysv* is not here because it comes later, after sysvr4.
- 	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
-+	      | -serenity* \
- 	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
- 	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
- 	      | -sym* | -kopensolaris* \
--- a/Ports/libvorbis/package.sh
+++ b/Ports/libvorbis/package.sh
@ -2,6 +2,7 @@
 port=libvorbis
 version=1.3.7
 useconfigure=true
+use_fresh_config_sub=true
 files="https://github.com/xiph/vorbis/releases/download/v${version}/libvorbis-${version}.tar.gz libvorbis-${version}.tar.gz 0e982409a9c3fc82ee06e08205b1355e5c6aa4c36bca58146ef399621b0ce5ab"
 auth_type=sha256
 depends=("libogg")
--- a/Ports/libvorbis/patches/01-add-serenity-system.patch
+++ b/Ports/libvorbis/patches/01-add-serenity-system.patch
@ -1,11 +0,0 @@
--- libvorbis-1.3.7/config.sub	2020-07-04 08:20:15.000000000 +0200
-+++ libvorbis-1.3.7.patched/config.sub	2021-03-30 18:28:04.784175977 +0200
-@@ -1390,7 +1390,7 @@
- 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
- 	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \
- 	      | -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox* | -bme* \
-	      | -midnightbsd*)
-+	      | -midnightbsd* | -serenity*)
- 	# Remember, each alternative MUST END IN *, to match a version number.
- 		;;
- 	-qnx*)
--- a/Ports/libxml2/package.sh
+++ b/Ports/libxml2/package.sh
@ -1,6 +1,7 @@
 #!/usr/bin/env -S bash ../.port_include.sh
 port=libxml2
 useconfigure="true"
+use_fresh_config_sub="true"
 version="2.9.12"
 files="ftp://xmlsoft.org/libxml2/libxml2-${version}.tar.gz libxml2-${version}.tar.gz c8d6681e38c56f172892c85ddc0852e1fd4b53b4209e7f4ebf17f7e2eae71d92"
 auth_type=sha256
--- a/Ports/libxml2/patches/config.sub.patch
+++ b/Ports/libxml2/patches/config.sub.patch
@ -1,11 +0,0 @@
--- libxml2-2.9.12/config.sub	2021-05-13 20:54:55.000000000 +0200
-+++ libxml2-2.9.12-patched/config.sub	2021-06-04 14:55:35.184278060 +0200
-@@ -1360,7 +1360,7 @@
- 	     | powermax* | dnix* | nx6 | nx7 | sei* | dragonfly* \
- 	     | skyos* | haiku* | rdos* | toppers* | drops* | es* \
- 	     | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \
-	     | midnightbsd*)
-+	     | midnightbsd* | serenity*)
- 	# Remember, each alternative MUST END IN *, to match a version number.
- 		;;
- 	qnx*)
--- a/Ports/m4/package.sh
+++ b/Ports/m4/package.sh
@ -2,6 +2,7 @@
 port=m4
 version=1.4.9
 useconfigure=true
+use_fresh_config_sub=true
 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"
--- a/Ports/m4/patches/configure.patch
+++ b/Ports/m4/patches/configure.patch
@ -1,14 +0,0 @@
-diff --git a/config.sub b/config.sub
-index 5defff6..040fb4b 100755
--- a/config.sub
-+++ b/config.sub
-@@ -1222,7 +1222,8 @@ case $os in
- 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
- 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
- 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
-+	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* \
-+             | -serenity*)
- 	# Remember, each alternative MUST END IN *, to match a version number.
- 		;;
- 	-qnx*)
--- a/Ports/make/package.sh
+++ b/Ports/make/package.sh
@ -2,6 +2,8 @@
 port=make
 version=4.3
 useconfigure=true
+use_fresh_config_sub=true
+config_sub_path=build-aux/config.sub
 files="https://ftpmirror.gnu.org/gnu/make/make-${version}.tar.gz make-${version}.tar.gz
 https://ftpmirror.gnu.org/gnu/make/make-${version}.tar.gz.sig make-${version}.tar.gz.sig
 https://ftpmirror.gnu.org/gnu/gnu-keyring.gpg gnu-keyring.gpg"
--- a/Ports/make/patches/make-4.3-serenity.patch
+++ b/Ports/make/patches/make-4.3-serenity.patch
@ -1,15 +1,3 @@
-diff -ru make-4.3-clean/build-aux/config.sub make-4.3/build-aux/config.sub
--- make-4.3-clean/build-aux/config.sub	2019-09-15 20:23:28.000000000 +0200
-+++ make-4.3/build-aux/config.sub	2020-12-15 00:51:50.738132015 +0100
-@@ -1343,7 +1343,7 @@
- 	     | hpux* | unos* | osf* | luna* | dgux* | auroraux* | solaris* \
- 	     | sym* | kopensolaris* | plan9* \
- 	     | amigaos* | amigados* | msdos* | newsos* | unicos* | aof* \
-	     | aos* | aros* | cloudabi* | sortix* | twizzler* \
-+	     | aos* | aros* | cloudabi* | sortix* | twizzler* | serenity* \
- 	     | nindy* | vxsim* | vxworks* | ebmon* | hms* | mvs* \
- 	     | clix* | riscos* | uniplus* | iris* | isc* | rtu* | xenix* \
- 	     | knetbsd* | mirbsd* | netbsd* \
 diff -ru make-4.3-clean/lib/getdtablesize.c make-4.3/lib/getdtablesize.c
 --- make-4.3-clean/lib/getdtablesize.c	2020-01-19 21:34:01.000000000 +0100
 +++ make-4.3/lib/getdtablesize.c	2020-12-15 00:53:49.661168383 +0100
--- a/Ports/mawk/package.sh
+++ b/Ports/mawk/package.sh
@ -4,6 +4,7 @@ version=1.3.4-20200120
 files="https://invisible-mirror.net/archives/mawk/mawk-${version}.tgz mawk-${version}.tgz
 https://invisible-mirror.net/archives/mawk/mawk-${version}.tgz.asc mawk-${version}.tgz.asc"
 useconfigure=true
+use_fresh_config_sub=true
 auth_type="sig"
 auth_import_key="C52048C0C0748FEE227D47A2702353E0F7E48EDB"
 auth_opts=("mawk-${version}.tgz.asc" "mawk-${version}.tgz")
--- a/Ports/mawk/patches/fix-autoconf.patch
+++ b/Ports/mawk/patches/fix-autoconf.patch
@ -1,10 +0,0 @@
--- mawk-1.3.4-20200120/config.sub.orig	Wed Jan 22 22:00:37 2020
-+++ mawk-1.3.4-20200120/config.sub	Wed Jan 22 22:00:46 2020
-@@ -1339,6 +1339,7 @@
- 	# Each alternative MUST end in a * to match a version number.
- 	# sysv* is not here because it comes later, after sysvr4.
- 	gnu* | bsd* | mach* | minix* | genix* | ultrix* | irix* \
-+	     | serenity* \
- 	     | *vms* | esix* | aix* | cnk* | sunos | sunos[34]*\
- 	     | hpux* | unos* | osf* | luna* | dgux* | auroraux* | solaris* \
- 	     | sym* | kopensolaris* | plan9* \
--- a/Ports/mpc/package.sh
+++ b/Ports/mpc/package.sh
@ -2,6 +2,7 @@
 port=mpc
 version=1.2.1
 useconfigure=true
+use_fresh_config_sub=true
 configopts=("--target=${SERENITY_ARCH}-pc-serenity" "--with-sysroot=/")
 files="https://ftpmirror.gnu.org/gnu/mpc/mpc-${version}.tar.gz mpc-${version}.tar.gz
 https://ftpmirror.gnu.org/gnu/mpc/mpc-${version}.tar.gz.sig mpc-${version}.tar.gz.sig
--- a/Ports/mpc/patches/config.sub.patch
+++ b/Ports/mpc/patches/config.sub.patch
@ -1,10 +0,0 @@
--- mpc-1.2.1/build-aux/config.sub	2020-10-20 17:26:31.000000000 +0100
-+++ mpc-1.2.1.serenity/build-aux/config.sub	2021-07-28 18:13:47.269493423 +0100
-@@ -1339,6 +1339,7 @@
- 	# Each alternative MUST end in a * to match a version number.
- 	# sysv* is not here because it comes later, after sysvr4.
- 	gnu* | bsd* | mach* | minix* | genix* | ultrix* | irix* \
-+	     | serenity* \
- 	     | *vms* | esix* | aix* | cnk* | sunos | sunos[34]*\
- 	     | hpux* | unos* | osf* | luna* | dgux* | auroraux* | solaris* \
- 	     | sym* | kopensolaris* | plan9* \
--- a/Ports/mpfr/package.sh
+++ b/Ports/mpfr/package.sh
@ -2,6 +2,7 @@
 port=mpfr
 version=4.1.0
 useconfigure=true
+use_fresh_config_sub=true
 configopts=("--target=${SERENITY_ARCH}-pc-serenity" "--with-sysroot=/")
 files="https://ftpmirror.gnu.org/gnu/mpfr/mpfr-${version}.tar.xz mpfr-${version}.tar.xz
 https://ftpmirror.gnu.org/gnu/mpfr/mpfr-${version}.tar.xz.sig mpfr-${version}.tar.xz.sig
--- a/Ports/mpfr/patches/config.sub.patch
+++ b/Ports/mpfr/patches/config.sub.patch
@ -1,11 +0,0 @@
--- mpfr-4.1.0/config.sub	2020-07-10 12:59:02.000000000 +0100
-+++ mpfr-4.1.0.serenity/config.sub	2021-07-28 18:05:59.462525103 +0100
-@@ -1390,7 +1390,7 @@
- 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
- 	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \
- 	      | -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox* | -bme* \
-	      | -midnightbsd*)
-+	      | -midnightbsd* | -serenity*)
- 	# Remember, each alternative MUST END IN *, to match a version number.
- 		;;
- 	-qnx*)
--- a/Ports/nano/package.sh
+++ b/Ports/nano/package.sh
@ -2,6 +2,7 @@
 port=nano
 version=5.8
 useconfigure="true"
+use_fresh_config_sub=true
 files="https://www.nano-editor.org/dist/v5/nano-${version}.tar.xz nano-${version}.tar.xz
 https://www.nano-editor.org/dist/v5/nano-${version}.tar.xz.asc nano-${version}.tar.xz.asc"
 configopts=("--target=${SERENITY_ARCH}-pc-serenity" "--disable-browser" "--disable-utf8")
--- a/Ports/nano/patches/fix-autoconf.patch
+++ b/Ports/nano/patches/fix-autoconf.patch
@ -1,12 +0,0 @@
-diff --git a/config.sub.orig b/config.sub
-index 63c1f1c8b..f14d29e3d 100755
--- a/config.sub.orig
-+++ b/config.sub
-@@ -1696,6 +1696,7 @@ case $os in
- 	# The portable systems comes first.
- 	# Each alternative MUST end in a * to match a version number.
- 	gnu* | android* | bsd* | mach* | minix* | genix* | ultrix* | irix* \
-+	     | serenity* \
- 	     | *vms* | esix* | aix* | cnk* | sunos | sunos[34]* \
- 	     | hpux* | unos* | osf* | luna* | dgux* | auroraux* | solaris* \
- 	     | sym* |  plan9* | psp* | sim* | xray* | os68k* | v88r* \
--- a/Ports/nasm/package.sh
+++ b/Ports/nasm/package.sh
@ -4,4 +4,5 @@ version=2.15.05
 files="https://www.nasm.us/pub/nasm/releasebuilds/${version}/nasm-${version}.tar.gz nasm-${version}.tar.gz 9182a118244b058651c576baa9d0366ee05983c4d4ae1d9ddd3236a9f2304997"
 auth_type=sha256
 useconfigure=true
+use_fresh_config_sub=true
 makeopts=()
--- a/Show More
+++ b/Show More