Ports: Allow selecting multiple `config_{sub,guess}_path`s

Some ports may have more than one `config.sub` that is in use (vendored
dependencies, etc.). Instead of fiddling about with space-delimited
strings, let's just make that setting into an array right away.

38 files changed, 49 insertions, 45 deletions

diff --git a/Ports/.port_include.sh b/Ports/.port_include.sh
index 9cf4dcaed3..18ac265c4e 100755
--- a/Ports/.port_include.sh
+++ b/Ports/.port_include.sh
@@ -65,8 +65,8 @@ installopts=()
 configscript=configure
 configopts=()
 useconfigure=false
-config_sub_path=config.sub
-config_guess_path=config.guess
+config_sub_paths=("config.sub")
+config_guess_paths=("config.guess")
 use_fresh_config_sub=false
 use_fresh_config_guess=false
 depends=()
@@ -141,11 +141,15 @@ get_new_config_guess() {
 }
 
 ensure_new_config_sub() {
-    get_new_config_sub "$config_sub_path"
+    for path in "${config_sub_paths[@]}"; do
+        get_new_config_sub "${path}"
+    done
 }
 
 ensure_new_config_guess() {
-    get_new_config_guess "$config_guess_path"
+    for path in "${config_guess_paths[@]}"; do
+        get_new_config_guess "${path}"
+    done
 }
 
 ensure_build() {
diff --git a/Ports/README.md b/Ports/README.md
index 5c3dea8021..7898c48415 100644
--- a/Ports/README.md
+++ b/Ports/README.md
@@ -177,10 +177,10 @@ if that's undesirable.
 Boolean option (`false` by default), will replace the `config.sub` pointed to by
 `config_sub_path` as part of the patching process if set to true.
 
-#### `config_sub_path`
+#### `config_sub_paths`
 
-Path to the `config.sub` file used by autoconf, starting at `$workdir`.
-This is set to `config.sub` by default.
+Paths to the `config.sub` files used by autoconf, starting at `$workdir`.
+This is set to `(config.sub)` by default.
 
 #### `configscript`
 
diff --git a/Ports/SDL2_mixer/package.sh b/Ports/SDL2_mixer/package.sh
index c600b6ab2d..3ec868f228 100755
--- a/Ports/SDL2_mixer/package.sh
+++ b/Ports/SDL2_mixer/package.sh
@@ -3,7 +3,7 @@ port=SDL2_mixer
 version=2.0.4
 useconfigure=true
 use_fresh_config_sub=true
-config_sub_path=build-scripts/config.sub
+config_sub_paths=("build-scripts/config.sub")
 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" "libmpg123" "libvorbis" "SDL2")
diff --git a/Ports/bash/package.sh b/Ports/bash/package.sh
index 6272bc70fb..c7d1af0e9b 100755
--- a/Ports/bash/package.sh
+++ b/Ports/bash/package.sh
@@ -4,8 +4,8 @@ version=5.1.16
 useconfigure=true
 use_fresh_config_sub=true
 use_fresh_config_guess=true
-config_sub_path=support/config.sub
-config_guess_path=support/config.guess
+config_sub_paths=("support/config.sub")
+config_guess_paths=("support/config.guess")
 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"
diff --git a/Ports/coreutils/package.sh b/Ports/coreutils/package.sh
index ca4b3fdebc..710ac2f4b5 100755
--- a/Ports/coreutils/package.sh
+++ b/Ports/coreutils/package.sh
@@ -3,7 +3,7 @@ port=coreutils
 version=9.1
 useconfigure="true"
 use_fresh_config_sub="true"
-config_sub_path=build-aux/config.sub
+config_sub_paths=("build-aux/config.sub")
 files="https://ftpmirror.gnu.org/gnu/coreutils/coreutils-${version}.tar.gz coreutils-${version}.tar.gz
 https://ftpmirror.gnu.org/gnu/coreutils/coreutils-${version}.tar.gz.sig coreutils-${version}.tar.gz.sig
 https://ftpmirror.gnu.org/gnu/gnu-keyring.gpg gnu-keyring.gpg"
diff --git a/Ports/diffutils/package.sh b/Ports/diffutils/package.sh
index c8e5230bbf..f3a929ad48 100755
--- a/Ports/diffutils/package.sh
+++ b/Ports/diffutils/package.sh
@@ -5,5 +5,5 @@ files="https://ftpmirror.gnu.org/gnu/diffutils/diffutils-${version}.tar.xz diffu
 auth_type=sha256
 useconfigure=true
 use_fresh_config_sub=true
-config_sub_path=build-aux/config.sub
+config_sub_paths=("build-aux/config.sub")
 depends=("libiconv")
diff --git a/Ports/flex/package.sh b/Ports/flex/package.sh
index 2b28ea5dcb..6bfc4b3e9c 100755
--- a/Ports/flex/package.sh
+++ b/Ports/flex/package.sh
@@ -5,7 +5,7 @@ files="https://github.com/westes/flex/releases/download/v${version}/flex-${versi
 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
-config_sub_path=build-aux/config.sub
+config_sub_paths=("build-aux/config.sub")
 configopts=("--disable-bootstrap")
 depends=("m4" "pcre2")
 auth_type="sig"
diff --git a/Ports/freeciv/package.sh b/Ports/freeciv/package.sh
index 403ba2cbaa..2a433b74a6 100755
--- a/Ports/freeciv/package.sh
+++ b/Ports/freeciv/package.sh
@@ -3,7 +3,7 @@ port=freeciv
 version=3.0.0-beta2
 useconfigure=true
 use_fresh_config_sub=true
-config_sub_path=bootstrap/config.sub
+config_sub_paths=("bootstrap/config.sub")
 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
diff --git a/Ports/freedink/package.sh b/Ports/freedink/package.sh
index 87363d640a..ad8bd9cb52 100755
--- a/Ports/freedink/package.sh
+++ b/Ports/freedink/package.sh
@@ -3,7 +3,7 @@ port=freedink
 version=109.6
 useconfigure="true"
 use_fresh_config_sub="true"
-config_sub_path=autotools/config.sub
+config_sub_paths=("autotools/config.sub")
 depends=("SDL2" "SDL2_image" "SDL2_mixer" "SDL2_ttf" "SDL2_gfx" "gettext" "fontconfig" "glm")
 freedink_data="freedink-data-1.08.20190120"
 files="https://ftpmirror.gnu.org/gnu/freedink/freedink-${version}.tar.gz freedink-${version}.tar.gz
diff --git a/Ports/freetype/package.sh b/Ports/freetype/package.sh
index 8852d85791..7b6423ae39 100755
--- a/Ports/freetype/package.sh
+++ b/Ports/freetype/package.sh
@@ -3,11 +3,11 @@ port=freetype
 version=2.12.0
 useconfigure=true
 use_fresh_config_sub=true
-config_sub_path=builds/unix/config.sub
+config_sub_paths=("builds/unix/config.sub")
 files="https://download.savannah.gnu.org/releases/freetype/freetype-${version}.tar.gz freetype-${version}.tar.gz 7940a46eeb0255baaa87c553d72778c4f8daa2b8888c8e2a05766a2a8686740c"
 auth_type=sha256
 configopts=("--with-brotli=no" "--with-bzip2=no" "--with-zlib=no" "--with-harfbuzz=no" "--with-png=no")
-config_sub_path="builds/unix/config.sub"
+config_sub_paths=("builds/unix/config.sub")
 
 install() {
     run make DESTDIR=${SERENITY_INSTALL_ROOT} "${installopts[@]}" install
diff --git a/Ports/gnucobol/package.sh b/Ports/gnucobol/package.sh
index ec28f4448f..0596c094f7 100755
--- a/Ports/gnucobol/package.sh
+++ b/Ports/gnucobol/package.sh
@@ -3,7 +3,7 @@ port=gnucobol
 version=3.1.2
 useconfigure="true"
 use_fresh_config_sub="true"
-config_sub_path=build_aux/config.sub
+config_sub_paths=("build_aux/config.sub")
 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
diff --git a/Ports/gnupg/package.sh b/Ports/gnupg/package.sh
index 9900ba93ef..5f1c677685 100755
--- a/Ports/gnupg/package.sh
+++ b/Ports/gnupg/package.sh
@@ -3,7 +3,7 @@ port=gnupg
 version=2.3.0
 useconfigure=true
 use_fresh_config_sub=true
-config_sub_path=build-aux/config.sub
+config_sub_paths=("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"
diff --git a/Ports/guile/package.sh b/Ports/guile/package.sh
index 2b57e3145c..cfe4a757e5 100755
--- a/Ports/guile/package.sh
+++ b/Ports/guile/package.sh
@@ -7,7 +7,7 @@ auth_type=sha256
 
 useconfigure=true
 use_fresh_config_sub=true
-config_sub_path="build-aux/config.sub"
+config_sub_paths=("build-aux/config.sub")
 configopts=("--disable-lto" "--disable-jit")
 pre_configure() {
     run autoreconf
diff --git a/Ports/indent/package.sh b/Ports/indent/package.sh
index 5f58bc8fb4..8fb93dfed5 100755
--- a/Ports/indent/package.sh
+++ b/Ports/indent/package.sh
@@ -6,7 +6,7 @@ https://ftpmirror.gnu.org/gnu/indent/indent-${version}.tar.gz.sig indent-${versi
 https://ftpmirror.gnu.org/gnu/gnu-keyring.gpg gnu-keyring.gpg"
 useconfigure=true
 use_fresh_config_sub=true
-config_sub_path=config/config.sub
+config_sub_paths=("config/config.sub")
 auth_type="sig"
 auth_opts=("--keyring" "./gnu-keyring.gpg" "indent-${version}.tar.gz.sig")
 
diff --git a/Ports/libarchive/package.sh b/Ports/libarchive/package.sh
index a45cfe460f..239178b781 100755
--- a/Ports/libarchive/package.sh
+++ b/Ports/libarchive/package.sh
@@ -3,7 +3,7 @@ port=libarchive
 version=3.6.1
 useconfigure=true
 use_fresh_config_sub=true
-config_sub_path=build/autoconf/config.sub
+config_sub_paths=("build/autoconf/config.sub")
 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"
diff --git a/Ports/libassuan/package.sh b/Ports/libassuan/package.sh
index b9d57f78a8..7874c62046 100755
--- a/Ports/libassuan/package.sh
+++ b/Ports/libassuan/package.sh
@@ -3,7 +3,7 @@ port=libassuan
 version=2.5.5
 useconfigure=true
 use_fresh_config_sub=true
-config_sub_path=build-aux/config.sub
+config_sub_paths=("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
diff --git a/Ports/libexpat/package.sh b/Ports/libexpat/package.sh
index 779e2bf64f..83a33530e1 100755
--- a/Ports/libexpat/package.sh
+++ b/Ports/libexpat/package.sh
@@ -3,7 +3,7 @@ port=libexpat
 version=2.4.8
 useconfigure=true
 use_fresh_config_sub=true
-config_sub_path=conftools/config.sub
+config_sub_paths=("conftools/config.sub")
 files="https://github.com/libexpat/libexpat/releases/download/R_${version//./_}/expat-${version}.tar.xz expat-${version}.tar.xz
 https://github.com/libexpat/libexpat/releases/download/R_${version//./_}/expat-${version}.tar.xz.asc expat-${version}.tar.xz.asc"
 workdir=expat-${version}
diff --git a/Ports/libgcrypt/package.sh b/Ports/libgcrypt/package.sh
index 082222ef19..0072f8f03f 100755
--- a/Ports/libgcrypt/package.sh
+++ b/Ports/libgcrypt/package.sh
@@ -3,7 +3,7 @@ port=libgcrypt
 version=1.10.1
 useconfigure=true
 use_fresh_config_sub=true
-config_sub_path=build-aux/config.sub
+config_sub_paths=("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 ef14ae546b0084cd84259f61a55e07a38c3b53afc0f546bffcef2f01baffe9de"
diff --git a/Ports/libgd/package.sh b/Ports/libgd/package.sh
index a585c7d2e3..f513c94a84 100755
--- a/Ports/libgd/package.sh
+++ b/Ports/libgd/package.sh
@@ -3,7 +3,7 @@ port=libgd
 version=2.3.3
 useconfigure=true
 use_fresh_config_sub=true
-config_sub_path=config/config.sub
+config_sub_paths=("config/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")
diff --git a/Ports/libgpg-error/package.sh b/Ports/libgpg-error/package.sh
index ae0f4f1c26..ad79bf7ba0 100755
--- a/Ports/libgpg-error/package.sh
+++ b/Ports/libgpg-error/package.sh
@@ -3,7 +3,7 @@ port=libgpg-error
 version=1.44
 useconfigure=true
 use_fresh_config_sub=true
-config_sub_path=build-aux/config.sub
+config_sub_paths=("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 8e3d2da7a8b9a104dd8e9212ebe8e0daf86aa838cc1314ba6bc4de8f2d8a1ff9"
diff --git a/Ports/libksba/package.sh b/Ports/libksba/package.sh
index 5ace159851..307515d981 100755
--- a/Ports/libksba/package.sh
+++ b/Ports/libksba/package.sh
@@ -3,7 +3,7 @@ port=libksba
 version=1.5.1
 useconfigure=true
 use_fresh_config_sub=true
-config_sub_path=build-aux/config.sub
+config_sub_paths=("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
diff --git a/Ports/libmpeg2/package.sh b/Ports/libmpeg2/package.sh
index 4b15ca135c..28c7169908 100755
--- a/Ports/libmpeg2/package.sh
+++ b/Ports/libmpeg2/package.sh
@@ -3,7 +3,7 @@ port=libmpeg2
 version=0.5.1
 useconfigure=true
 use_fresh_config_sub=true
-config_sub_path=.auto/config.sub
+config_sub_paths=(".auto/config.sub")
 configopts=("--disable-sdl")
 files="https://libmpeg2.sourceforge.io/files/libmpeg2-${version}.tar.gz libmpeg2-${version}.tar.gz dee22e893cb5fc2b2b6ebd60b88478ab8556cb3b93f9a0d7ce8f3b61851871d4"
 auth_type=sha256
diff --git a/Ports/libmpg123/package.sh b/Ports/libmpg123/package.sh
index a4b780ae8f..03879e1513 100755
--- a/Ports/libmpg123/package.sh
+++ b/Ports/libmpg123/package.sh
@@ -4,7 +4,7 @@ version=1.29.3
 useconfigure=true
 workdir=mpg123-${version}
 use_fresh_config_sub=true
-config_sub_path=build/config.sub
+config_sub_paths=("build/config.sub")
 files="https://download.sourceforge.net/project/mpg123/mpg123/${version}/mpg123-${version}.tar.bz2 mpg123-${version}.tar.bz2
 https://download.sourceforge.net/project/mpg123/mpg123/${version}/mpg123-${version}.tar.bz2.sig mpg123-${version}.tar.bz2.sig"
 
diff --git a/Ports/libsodium/package.sh b/Ports/libsodium/package.sh
index 115531e206..fecf020f21 100755
--- a/Ports/libsodium/package.sh
+++ b/Ports/libsodium/package.sh
@@ -3,7 +3,7 @@ port=libsodium
 version=1.0.18
 useconfigure=true
 use_fresh_config_sub=true
-config_sub_path=build-aux/config.sub
+config_sub_paths=("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
diff --git a/Ports/libtool/package.sh b/Ports/libtool/package.sh
index a596b3bbd4..b2b1cd2ad4 100755
--- a/Ports/libtool/package.sh
+++ b/Ports/libtool/package.sh
@@ -3,7 +3,7 @@ port=libtool
 version=2.4.7
 useconfigure=true
 use_fresh_config_sub=true
-config_sub_path=build-aux/config.sub
+config_sub_paths=("build-aux/config.sub")
 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
diff --git a/Ports/make/package.sh b/Ports/make/package.sh
index 94f395056f..444b7ccba7 100755
--- a/Ports/make/package.sh
+++ b/Ports/make/package.sh
@@ -3,7 +3,7 @@ port=make
 version=4.3
 useconfigure=true
 use_fresh_config_sub=true
-config_sub_path=build-aux/config.sub
+config_sub_paths=("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"
diff --git a/Ports/mc/package.sh b/Ports/mc/package.sh
index 93c1fe3259..1a75faeb21 100755
--- a/Ports/mc/package.sh
+++ b/Ports/mc/package.sh
@@ -16,4 +16,4 @@ configopts=(
     "--with-ncurses-libs=$SERENITY_BUILD_DIR/Root/usr/local/lib"
 )
 use_fresh_config_sub=true
-config_sub_path=config/config.sub
+config_sub_paths=("config/config.sub")
diff --git a/Ports/mpc/package.sh b/Ports/mpc/package.sh
index c9a67d0f49..26a12771f9 100755
--- a/Ports/mpc/package.sh
+++ b/Ports/mpc/package.sh
@@ -3,7 +3,7 @@ port=mpc
 version=1.2.1
 useconfigure=true
 use_fresh_config_sub=true
-config_sub_path=build-aux/config.sub
+config_sub_paths=("build-aux/config.sub")
 configopts=("--target=${SERENITY_ARCH}-pc-serenity" "--with-sysroot=${SERENITY_INSTALL_ROOT}")
 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
diff --git a/Ports/nasm/package.sh b/Ports/nasm/package.sh
index 10c8bbcebd..7f868696e7 100755
--- a/Ports/nasm/package.sh
+++ b/Ports/nasm/package.sh
@@ -5,5 +5,5 @@ files="https://www.nasm.us/pub/nasm/releasebuilds/${version}/nasm-${version}.tar
 auth_type=sha256
 useconfigure=true
 use_fresh_config_sub=true
-config_sub_path=autoconf/helpers/config.sub
+config_sub_paths=("autoconf/helpers/config.sub")
 makeopts=()
diff --git a/Ports/npth/package.sh b/Ports/npth/package.sh
index d116fd2b02..771902d331 100755
--- a/Ports/npth/package.sh
+++ b/Ports/npth/package.sh
@@ -3,7 +3,7 @@ port=npth
 version=1.6
 useconfigure=true
 use_fresh_config_sub=true
-config_sub_path=build-aux/config.sub
+config_sub_paths=("build-aux/config.sub")
 files="https://gnupg.org/ftp/gcrypt/npth/npth-${version}.tar.bz2 npth-${version}.tar.bz2 1393abd9adcf0762d34798dc34fdcf4d0d22a8410721e76f1e3afcd1daa4e2d1"
 auth_type=sha256
 
diff --git a/Ports/ntbtls/package.sh b/Ports/ntbtls/package.sh
index b7358c8296..e0c557bd89 100755
--- a/Ports/ntbtls/package.sh
+++ b/Ports/ntbtls/package.sh
@@ -3,7 +3,7 @@ port=ntbtls
 version=0.2.0
 useconfigure=true
 use_fresh_config_sub=true
-config_sub_path=build-aux/config.sub
+config_sub_paths=("build-aux/config.sub")
 depends=("libgpg-error" "libksba" "libgcrypt" "zlib")
 files="https://gnupg.org/ftp/gcrypt/ntbtls/ntbtls-${version}.tar.bz2 ntbtls-${version}.tar.bz2 649fe74a311d13e43b16b26ebaa91665ddb632925b73902592eac3ed30519e17"
 auth_type=sha256
diff --git a/Ports/patch/package.sh b/Ports/patch/package.sh
index f8cf440d8d..fa1b0c2ef0 100755
--- a/Ports/patch/package.sh
+++ b/Ports/patch/package.sh
@@ -3,6 +3,6 @@ port=patch
 version=2.7.6
 useconfigure=true
 use_fresh_config_sub=true
-config_sub_path=build-aux/config.sub
+config_sub_paths=("build-aux/config.sub")
 files="https://ftp.gnu.org/gnu/patch/patch-${version}.tar.gz patch-${version}.tar.gz 8cf86e00ad3aaa6d26aca30640e86b0e3e1f395ed99f189b06d4c9f74bc58a4e"
 auth_type=sha256
diff --git a/Ports/readline/package.sh b/Ports/readline/package.sh
index a8101bda4a..9a971739dc 100755
--- a/Ports/readline/package.sh
+++ b/Ports/readline/package.sh
@@ -3,7 +3,7 @@
 port=readline
 version=8.1.2
 useconfigure=true
-config_sub_path=support/config.sub
+config_sub_paths=("support/config.sub")
 use_fresh_config_sub=true
 files="https://ftpmirror.gnu.org/gnu/readline/readline-${version}.tar.gz readline-${version}.tar.gz 7589a2381a8419e68654a47623ce7dfcb756815c8fee726b98f90bf668af7bc6"
 auth_type=sha256
diff --git a/Ports/ruby/package.sh b/Ports/ruby/package.sh
index 9b5a5e57ba..33c3340154 100755
--- a/Ports/ruby/package.sh
+++ b/Ports/ruby/package.sh
@@ -6,7 +6,7 @@ port=ruby
 version=${RUBY_VERSION}
 useconfigure="true"
 use_fresh_config_sub=true
-config_sub_path=tool/config.sub
+config_sub_paths=("tool/config.sub")
 files="${RUBY_ARCHIVE_URL} ${RUBY_ARCHIVE} ${RUBY_ARCHIVE_SHA256SUM}
 https://cache.ruby-lang.org/pub/misc/logo/ruby-logo-kit.zip ruby-logo-kit.zip 7f0a980e09874d35d80b958949dc2460e683957de3d2494a1499aea9d9989055"
 auth_type="sha256"
diff --git a/Ports/sed/package.sh b/Ports/sed/package.sh
index 2214b335d0..299ef168c0 100755
--- a/Ports/sed/package.sh
+++ b/Ports/sed/package.sh
@@ -3,7 +3,7 @@ port=sed
 version=4.8
 useconfigure="true"
 use_fresh_config_sub="true"
-config_sub_path=build-aux/config.sub
+config_sub_paths=("build-aux/config.sub")
 files="https://ftpmirror.gnu.org/gnu/sed/sed-${version}.tar.gz sed-${version}.tar.gz
 https://ftpmirror.gnu.org/gnu/sed/sed-${version}.tar.gz.sig sed-${version}.tar.gz.sig
 https://ftpmirror.gnu.org/gnu/gnu-keyring.gpg gnu-keyring.gpg"
diff --git a/Ports/wget/package.sh b/Ports/wget/package.sh
index ff58eab2b7..34389eacc2 100755
--- a/Ports/wget/package.sh
+++ b/Ports/wget/package.sh
@@ -3,7 +3,7 @@ port=wget
 version=1.21.3
 useconfigure="true"
 use_fresh_config_sub=true
-config_sub_path=build-aux/config.sub
+config_sub_paths=("build-aux/config.sub")
 depends=("openssl")
 files="https://ftpmirror.gnu.org/gnu/wget/wget-${version}.tar.gz wget-${version}.tar.gz
 https://ftpmirror.gnu.org/gnu/wget/wget-${version}.tar.gz.sig wget-${version}.tar.gz.sig
diff --git a/Ports/xz/package.sh b/Ports/xz/package.sh
index 42cf5378d9..fe104ce36b 100755
--- a/Ports/xz/package.sh
+++ b/Ports/xz/package.sh
@@ -3,7 +3,7 @@ port=xz
 version=5.2.5
 useconfigure=true
 use_fresh_config_sub=true
-config_sub_path=build-aux/config.sub
+config_sub_paths=("build-aux/config.sub")
 files="https://tukaani.org/xz/xz-${version}.tar.gz xz-${version}.tar.gz f6f4910fd033078738bd82bfba4f49219d03b17eb0794eb91efbae419f4aba10"
 auth_type=sha256
 depends=("zlib" "libiconv")
diff --git a/Ports/yasm/package.sh b/Ports/yasm/package.sh
index 23afb7dbfb..3661039176 100755
--- a/Ports/yasm/package.sh
+++ b/Ports/yasm/package.sh
@@ -5,5 +5,5 @@ files="https://www.tortall.net/projects/yasm/releases/yasm-${version}.tar.gz yas
 auth_type="sha256"
 useconfigure=true
 use_fresh_config_sub=true
-config_sub_path=config/config.sub
+config_sub_paths=("config/config.sub")
 makeopts=()