Ports: Make array-like settings actual arrays

We may need entries with spaces in makeopts, installopts, and configopts, and at that point we should also convert depends and auth_opts to avoid confusion.
Author: https://github.com/timschumi Commit: https://github.com/SerenityOS/serenity/commit/c07f91474de Pull-request: https://github.com/SerenityOS/serenity/pull/10222
2024-12-24 19:54:53 +03:00 · 2021-09-27 00:16:18 +02:00 · 2021-09-27 00:16:18 +02:00 · c07f91474d · 2024-07-18 03:03:19 +09:00
commit c07f91474d
parent e507cfcdb0
149 changed files with 352 additions and 345 deletions
--- a/Ports/.port_include.sh
+++ b/Ports/.port_include.sh
@ -54,16 +54,16 @@ host_env() {

 packagesdb="${DESTDIR}/usr/Ports/packages.db"

-makeopts=-j$(nproc)
-installopts=
+makeopts=("-j$(nproc)")
+installopts=()
 configscript=configure
-configopts=
+configopts=()
 useconfigure=false
-depends=
+depends=()
 patchlevel=1
 auth_type=
 auth_import_key=
-auth_opts=
+auth_opts=()
 launcher_name=
 launcher_category=
 launcher_command=
@ -260,7 +260,7 @@ fetch() {
            if $NO_GPG; then
                echo "WARNING: gpg signature check was disabled by --no-gpg-verification"
            else
-                if $(gpg --verify $auth_opts); then
+                if $(gpg --verify "${auth_opts[@]}"); then
                    echo "- Signature check OK."
                else
                    echo "- Signature check NOT OK"
@ -344,16 +344,16 @@ func_defined pre_configure || pre_configure() {
 }
 func_defined configure || configure() {
    chmod +x "${workdir}"/"$configscript"
-    run ./"$configscript" --host="${SERENITY_ARCH}-pc-serenity" $configopts
+    run ./"$configscript" --host="${SERENITY_ARCH}-pc-serenity" "${configopts[@]}"
 }
 func_defined post_configure || post_configure() {
    :
 }
 func_defined build || build() {
-    run make $makeopts
+    run make "${makeopts[@]}"
 }
 func_defined install || install() {
-    run make DESTDIR=$DESTDIR $installopts install
+    run make DESTDIR=$DESTDIR "${installopts[@]}" install
 }
 func_defined post_install || post_install() {
    echo
@ -402,10 +402,10 @@ addtodb() {
    fi
 }
 installdepends() {
-    for depend in $depends; do
+    for depend in "${depends[@]}"; do
        dependlist="${dependlist:-} $depend"
    done
-    for depend in $depends; do
+    for depend in "${depends[@]}"; do
        if ! grep "$depend" "$packagesdb" > /dev/null; then
            (cd "../$depend" && ./package.sh --auto)
        fi
@ -489,11 +489,18 @@ do_uninstall() {
    uninstall
 }
 do_showproperty() {
-    if [ -z ${!1+x} ]; then
+    if ! declare -p "${1}" > /dev/null 2>&1; then
        echo "Property '$1' is not set." >&2
        exit 1
    fi
-    echo ${!1}
+    property_declaration="$(declare -p "${1}")"
+    if [[ "$property_declaration" =~ "declare -a" ]]; then
+        prop_array="${1}[@]"
+        # Some magic to avoid empty arrays being considered unset.
+        echo "${!prop_array+"${!prop_array}"}"
+    else
+        echo ${!1}
+    fi
 }
 do_all() {
    do_installdepends
--- a/Ports/Another-World/package.sh
+++ b/Ports/Another-World/package.sh
@ -2,9 +2,9 @@
 port=Another-World
 useconfigure=true
 version=git
-depends="SDL2 zlib"
+depends=("SDL2" "zlib")
 workdir=Another-World-Bytecode-Interpreter-master
-configopts="-DCMAKE_TOOLCHAIN_FILE=${SERENITY_BUILD_DIR}/CMakeToolchain.txt -DSDL2_INCLUDE_DIR=${SERENITY_INSTALL_ROOT}/usr/local/include/SDL2"
+configopts=("-DCMAKE_TOOLCHAIN_FILE=${SERENITY_BUILD_DIR}/CMakeToolchain.txt" "-DSDL2_INCLUDE_DIR=${SERENITY_INSTALL_ROOT}/usr/local/include/SDL2")
 files="https://github.com/fabiensanglard/Another-World-Bytecode-Interpreter/archive/refs/heads/master.zip master.zip 326de7622e5f83a83fce76e6032240157a9dde83c0d65319095c7e0b312af317"
 auth_type=sha256
 launcher_name="Another World"
@ -12,7 +12,7 @@ launcher_category=Games
 launcher_command="/opt/Another-World/raw --datapath=/opt/Another-World"

 configure() {
-    run cmake $configopts
+    run cmake "${configopts[@]}"
 }

 install() {
--- a/Ports/SDL2-GNUBoy/package.sh
+++ b/Ports/SDL2-GNUBoy/package.sh
@ -5,4 +5,4 @@ version=1.2
 useconfigure=false
 files="https://github.com/AlexOberhofer/SDL2-GNUBoy/archive/refs/tags/v${version}.tar.gz SDL2-GNUBoy-${version}.tar.gz 7d00a80e4b6bbb4c388b1ea0a34daca5f90fba574f09915c5135431f81091c8a"
 auth_type=sha256
-depends="SDL2"
+depends=("SDL2")
--- a/Ports/SDL2/package.sh
+++ b/Ports/SDL2/package.sh
@ -4,10 +4,10 @@ version=git
 workdir=SDL-main-serenity
 useconfigure=true
 files="https://github.com/SerenityPorts/SDL/archive/main-serenity.tar.gz SDL2-git.tar.gz"
-configopts="-DCMAKE_TOOLCHAIN_FILE=${SERENITY_BUILD_DIR}/CMakeToolchain.txt -DPULSEAUDIO=OFF -DJACK=OFF"
+configopts=("-DCMAKE_TOOLCHAIN_FILE=${SERENITY_BUILD_DIR}/CMakeToolchain.txt" "-DPULSEAUDIO=OFF" "-DJACK=OFF")

 configure() {
-    run cmake $configopts
+    run cmake "${configopts[@]}"
 }

 install() {
--- a/Ports/SDL2_gfx/package.sh
+++ b/Ports/SDL2_gfx/package.sh
@ -4,11 +4,11 @@ port=SDL2_gfx
 version=1.0.4
 files="https://downloads.sourceforge.net/project/sdl2gfx/SDL2_gfx-${version}.tar.gz SDL2_gfx-${version}.tar.gz 63e0e01addedc9df2f85b93a248f06e8a04affa014a835c2ea34bfe34e576262"
 auth_type=sha256
-depends="SDL2"
+depends=("SDL2")
 useconfigure=true
-configopts="--with-sdl-prefix=${SERENITY_INSTALL_ROOT}/usr/local"
+configopts=("--with-sdl-prefix=${SERENITY_INSTALL_ROOT}/usr/local")

 install() {
-    run make install DESTDIR=${SERENITY_INSTALL_ROOT} $installopts
+    run make install DESTDIR=${SERENITY_INSTALL_ROOT} "${installopts[@]}"
    run ${CC} -shared -o ${SERENITY_INSTALL_ROOT}/usr/local/lib/libSDL2_gfx.so -Wl,-soname,libSDL2_gfx.so -Wl,--whole-archive ${SERENITY_INSTALL_ROOT}/usr/local/lib/libSDL2_gfx.a -Wl,--no-whole-archive
 }
--- a/Ports/SDL2_image/package.sh
+++ b/Ports/SDL2_image/package.sh
@ -2,7 +2,7 @@
 port=SDL2_image
 useconfigure=true
 version=2.0.5
-depends="SDL2 libpng libjpeg libtiff"
+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"
 auth_type=sha256

--- a/Ports/SDL2_mixer/package.sh
+++ b/Ports/SDL2_mixer/package.sh
@ -4,7 +4,7 @@ version=2.0.4
 useconfigure=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="SDL2 libvorbis"
+depends=("SDL2" "libvorbis")

 configure() {
    run ./configure \
--- a/Ports/SDL2_net/package.sh
+++ b/Ports/SDL2_net/package.sh
@ -2,10 +2,10 @@
 port=SDL2_net
 version=2.0.1
 useconfigure=true
-configopts=--with-sdl-prefix="${SERENITY_INSTALL_ROOT}/usr/local"
+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
-depends="SDL2"
+depends=("SDL2")

 post_install() {
    run ${CC} -shared -o ${SERENITY_INSTALL_ROOT}/usr/local/lib/libSDL2_net.so -Wl,-soname,libSDL2_net.so -Wl,--whole-archive ${SERENITY_INSTALL_ROOT}/usr/local/lib/libSDL2_net.a -Wl,--no-whole-archive
--- a/Ports/SDL2_ttf/package.sh
+++ b/Ports/SDL2_ttf/package.sh
@ -4,7 +4,7 @@ version=2.0.15
 useconfigure=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"
+depends=("SDL2" "freetype")

 configure() {
    run ./configure \
@ -16,6 +16,6 @@ configure() {
 }

 install() {
-    run make install DESTDIR=${SERENITY_INSTALL_ROOT} $installopts
+    run make install DESTDIR=${SERENITY_INSTALL_ROOT} "${installopts[@]}"
    run ${CC} -shared -o ${SERENITY_INSTALL_ROOT}/usr/local/lib/libSDL2_ttf.so -Wl,-soname,libSDL2_ttf.so -Wl,--whole-archive ${SERENITY_INSTALL_ROOT}/usr/local/lib/libSDL2_ttf.a -Wl,--no-whole-archive -lfreetype
 }
--- a/Ports/SDLPoP/package.sh
+++ b/Ports/SDLPoP/package.sh
@ -2,9 +2,9 @@
 port=PrinceOfPersia
 useconfigure=true
 version=git
-depends="SDL2 SDL2_image"
+depends=("SDL2" "SDL2_image")
 workdir=SDLPoP-86988c668eeaa10f218e1d4938fc5b4e42314d68
-configopts="-DCMAKE_TOOLCHAIN_FILE=${SERENITY_BUILD_DIR}/CMakeToolchain.txt"
+configopts=("-DCMAKE_TOOLCHAIN_FILE=${SERENITY_BUILD_DIR}/CMakeToolchain.txt")
 files="https://github.com/NagyD/SDLPoP/archive/86988c668eeaa10f218e1d4938fc5b4e42314d68.zip PoP.zip d18cae8541fb8cbcc374fd998316993d561429a83f92061bc0754337ada774c5"
 auth_type=sha256
 launcher_name="Prince of Persia"
@ -12,7 +12,7 @@ launcher_category=Games
 launcher_command=/opt/PrinceOfPersia/prince

 configure() {
-    run cmake $configopts ./src
+    run cmake "${configopts[@]}" ./src
 }

 install() {
--- a/Ports/Super-Mario/package.sh
+++ b/Ports/Super-Mario/package.sh
@ -2,9 +2,9 @@
 port=Super-Mario
 useconfigure=true
 version=git
-depends="SDL2 SDL2_mixer SDL2_image"
+depends=("SDL2" "SDL2_mixer" "SDL2_image")
 workdir=Super-Mario-Clone-Cpp-master
-configopts="-DCMAKE_TOOLCHAIN_FILE=${SERENITY_BUILD_DIR}/CMakeToolchain.txt"
+configopts=("-DCMAKE_TOOLCHAIN_FILE=${SERENITY_BUILD_DIR}/CMakeToolchain.txt")
 files="https://github.com/Bennyhwanggggg/Super-Mario-Clone-Cpp/archive/refs/heads/master.zip master.zip fcacc15d3b5afccb3227f982d3e05f2cfeb198f0fffd008fdcda005cb7f87f91"
 auth_type=sha256
 launcher_name="Super Mario"
@ -12,7 +12,7 @@ launcher_category=Games
 launcher_command=/opt/Super_Mario/uMario

 configure() {
-    run cmake $configopts
+    run cmake "${configopts[@]}"
 }

 install() {
--- a/Ports/bash/package.sh
+++ b/Ports/bash/package.sh
@ -2,14 +2,14 @@
 port=bash
 version=5.1.8
 useconfigure=true
-configopts="--disable-nls --without-bash-malloc"
+configopts=("--disable-nls" "--without-bash-malloc")
 files="https://ftpmirror.gnu.org/gnu/bash/bash-${version}.tar.gz bash-${version}.tar.gz 0cfb5c9bb1a29f800a97bd242d19511c997a1013815b805e0fdd32214113d6be"
 auth_type="sha256"

 build() {
    run_replace_in_file "s/define GETCWD_BROKEN 1/undef GETCWD_BROKEN/" config.h
    run_replace_in_file "s/define CAN_REDEFINE_GETENV 1/undef CAN_REDEFINE_GETENV/" config.h
-    run make $makeopts
+    run make "${makeopts[@]}"
 }

 post_install() {
--- a/Ports/bass/package.sh
+++ b/Ports/bass/package.sh
@ -3,7 +3,7 @@ port=bass
 version="cd-1.2"
 files="https://downloads.scummvm.org/frs/extras/Beneath%20a%20Steel%20Sky/bass-${version}.zip bass-${version}.zip 53209b9400eab6fd7fa71518b2f357c8de75cfeaa5ba57024575ab79cc974593"
 auth_type=sha256
-depends="scummvm"
+depends=("scummvm")

 bass_resource_path="/usr/local/share/games/${port}-${version}"

--- a/Ports/bc/package.sh
+++ b/Ports/bc/package.sh
@ -7,7 +7,7 @@ useconfigure=true
 configscript=configure.sh
 auth_type="sig"
 auth_import_key="E2A30324A4465A4D5882692EC08038BDF280D33E"
-auth_opts="bc-${version}.tar.xz.sig"
+auth_opts=("bc-${version}.tar.xz.sig")

 configure() {
    # NLS needs many things, none of which we support.
--- a/Ports/binutils/package.sh
+++ b/Ports/binutils/package.sh
@ -2,8 +2,8 @@
 port=binutils
 version=2.37
 useconfigure=true
-configopts="--target=${SERENITY_ARCH}-pc-serenity --with-sysroot=/ --with-build-sysroot=${SERENITY_INSTALL_ROOT} --disable-werror --disable-gdb --disable-nls"
+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"
-auth_opts="--keyring ./gnu-keyring.gpg binutils-${version}.tar.xz.sig"
+auth_opts=("--keyring" "./gnu-keyring.gpg" "binutils-${version}.tar.xz.sig")
 export ac_cv_func_getrusage=no
--- a/Ports/bison/package.sh
+++ b/Ports/bison/package.sh
@ -2,6 +2,6 @@
 port=bison
 version=1.25
 useconfigure=true
-configopts="--prefix=${SERENITY_INSTALL_ROOT}/usr/local"
+configopts=("--prefix=${SERENITY_INSTALL_ROOT}/usr/local")
 files="https://ftpmirror.gnu.org/gnu/bison/bison-${version}.tar.gz bison-${version}.tar.gz 356bff0a058ca3d59528e0c49e68b90cdeb09779e0d626fc78a94270beed93a6"
 auth_type=sha256
--- a/Ports/brogue/package.sh
+++ b/Ports/brogue/package.sh
@ -1,11 +1,11 @@
 #!/usr/bin/env -S bash ../.port_include.sh
 port=brogue
-depends="SDL2 SDL2_image"
+depends=("SDL2" "SDL2_image")
 version=1.9.3
 workdir="BrogueCE-${version}"
 files="https://github.com/tmewett/BrogueCE/archive/refs/tags/v${version}.tar.gz brogue.tar.gz 441182916a16114bedfee614b09a198b4877a25db2544c5e087c86038aae2452"
 auth_type=sha256
-makeopts="bin/brogue"
+makeopts=("bin/brogue")

 install() {
    datadir="$SERENITY_INSTALL_ROOT/usr/local/share/games/brogue/assets"
--- a/Ports/byacc/package.sh
+++ b/Ports/byacc/package.sh
@ -6,4 +6,4 @@ https://invisible-mirror.net/archives/byacc/byacc-${version}.tgz.asc byacc-${ver
 useconfigure=true
 auth_type="sig"
 auth_import_key="C52048C0C0748FEE227D47A2702353E0F7E48EDB"
-auth_opts="byacc-${version}.tgz.asc byacc-${version}.tgz"
+auth_opts=("byacc-${version}.tgz.asc byacc-${version}.tgz")
--- a/Ports/bzip2/package.sh
+++ b/Ports/bzip2/package.sh
@ -3,13 +3,13 @@ port=bzip2
 version=1.0.8
 files="https://sourceware.org/pub/bzip2/bzip2-${version}.tar.gz bzip2-${version}.tar.gz ab5a03176ee106d3f0fa90e381da478ddae405918153cca248e682cd0c4a2269"
 auth_type=sha256
-makeopts=bzip2
-installopts="PREFIX=${SERENITY_INSTALL_ROOT}/usr/local"
+makeopts=("bzip2")
+installopts=("PREFIX=${SERENITY_INSTALL_ROOT}/usr/local")

 build() {
-    run make CC="${CC}" $makeopts bzip2
+    run make CC="${CC}" "${makeopts[@]}" bzip2
 }

 install() {
-    run make DESTDIR=${SERENITY_INSTALL_ROOT} CC="${CC}" $installopts install
+    run make DESTDIR=${SERENITY_INSTALL_ROOT} CC="${CC}" "${installopts[@]}" install
 }
--- a/Ports/c-ray/package.sh
+++ b/Ports/c-ray/package.sh
@ -4,12 +4,12 @@ version=c094d64570c30c70f4003e9428d31a2a0d9d3d41
 useconfigure=true
 files="https://github.com/vkoskiv/c-ray/archive/${version}.tar.gz ${version}.tar.gz 1e0663a1d83e8a9984aced33b9307471f3302c8a5ea7ec47954854d60902a747"
 auth_type=sha256
-configopts="-DCMAKE_TOOLCHAIN_FILE=${SERENITY_BUILD_DIR}/CMakeToolchain.txt"
-depends="SDL2"
+configopts=("-DCMAKE_TOOLCHAIN_FILE=${SERENITY_BUILD_DIR}/CMakeToolchain.txt")
+depends=("SDL2")
 workdir="${port}-${version}"

 configure() {
-    run cmake $configopts
+    run cmake "${configopts[@]}"
 }

 install() {
--- a/Ports/chester/package.sh
+++ b/Ports/chester/package.sh
@ -2,14 +2,14 @@
 port=chester
 useconfigure=true
 version=git
-depends="SDL2"
+depends=("SDL2")
 workdir=chester-public
-configopts="-DCMAKE_TOOLCHAIN_FILE=${SERENITY_BUILD_DIR}/CMakeToolchain.txt"
+configopts=("-DCMAKE_TOOLCHAIN_FILE=${SERENITY_BUILD_DIR}/CMakeToolchain.txt")
 files="https://github.com/veikkos/chester/archive/public.tar.gz chester.tar.gz b3ea7ad40608e1050fa434258f5c69b93e7bad10523c4c4a86fe08d1442a907b"
 auth_type=sha256

 configure() {
-    run cmake $configopts
+    run cmake "${configopts[@]}"
 }

 install() {
--- a/Ports/cmake/package.sh
+++ b/Ports/cmake/package.sh
@ -4,11 +4,11 @@ version=3.19.4
 useconfigure=true
 files="https://github.com/Kitware/CMake/releases/download/v$version/cmake-$version.tar.gz cmake-$version.tar.gz 7d0232b9f1c57e8de81f38071ef8203e6820fe7eec8ae46a1df125d88dbcc2e1"
 auth_type=sha256
-depends="bash make sed ncurses libuv"
-configopts="-DCMAKE_TOOLCHAIN_FILE=${SERENITY_BUILD_DIR}/CMakeToolchain.txt -DCMAKE_USE_SYSTEM_LIBRARY_LIBUV=1 -GNinja"
+depends=("bash" "make" "sed" "ncurses" "libuv")
+configopts=("-DCMAKE_TOOLCHAIN_FILE=${SERENITY_BUILD_DIR}/CMakeToolchain.txt" "-DCMAKE_USE_SYSTEM_LIBRARY_LIBUV=1" "GNinja")

 configure() {
-    run cmake $configopts .
+    run cmake "${configopts[@]}" .
 }

 build() {
--- a/Ports/cmatrix/package.sh
+++ b/Ports/cmatrix/package.sh
@ -2,9 +2,9 @@
 port=cmatrix
 useconfigure=true
 version=git
-depends="ncurses"
+depends=("ncurses")
 workdir=cmatrix-master
-configopts="-DCMAKE_TOOLCHAIN_FILE=${SERENITY_BUILD_DIR}/CMakeToolchain.txt"
+configopts=("-DCMAKE_TOOLCHAIN_FILE=${SERENITY_BUILD_DIR}/CMakeToolchain.txt")
 files="https://github.com/abishekvashok/cmatrix/archive/refs/heads/master.zip cmatrix.zip c32ca7562e58fb1fd7a96ebdfbe51c5de060709d39b67fce3c0bc42547e0ccb2"
 auth_type=sha256
 launcher_name=cmatrix
@ -13,7 +13,7 @@ launcher_command=cmatrix
 launcher_run_in_terminal=true

 configure() {
-    run cmake $configopts
+    run cmake "${configopts[@]}"
 }

 install() {
--- a/Ports/composer/package.sh
+++ b/Ports/composer/package.sh
@ -3,7 +3,7 @@ port=composer
 version="2.1.3"
 files="https://getcomposer.org/download/${version}/composer.phar composer.phar f8a72e98dec8da736d8dac66761ca0a8fbde913753e9a43f34112367f5174d11"
 auth_type=sha256
-depends="php"
+depends=("php")

 build() {
    :
--- a/Ports/curl/package.sh
+++ b/Ports/curl/package.sh
@ -4,11 +4,11 @@ version=7.78.0
 useconfigure=true
 files="https://curl.se/download/curl-${version}.tar.bz2 curl-${version}.tar.bz2 98530b317dc95ccb324bbe4f834f07bb642fbc393b794ddf3434f246a71ea44a"
 auth_type=sha256
-depends="openssl zlib zstd"
-configopts="--disable-ntlm-wb --with-openssl=${SERENITY_INSTALL_ROOT}/usr/local --disable-symbol-hiding"
+depends=("openssl" "zlib" "zstd")
+configopts=("--disable-ntlm-wb" "--with-openssl=${SERENITY_INSTALL_ROOT}/usr/local" "--disable-symbol-hiding")

 install() {
-    run make DESTDIR=${SERENITY_INSTALL_ROOT} $installopts install
+    run make DESTDIR=${SERENITY_INSTALL_ROOT} "${installopts[@]}" install
    ${CC} -shared -o ${SERENITY_INSTALL_ROOT}/usr/local/lib/libcurl.so -Wl,-soname,libcurl.so -Wl,--whole-archive ${SERENITY_INSTALL_ROOT}/usr/local/lib/libcurl.a -Wl,--no-whole-archive -lzstd
    rm -f ${SERENITY_INSTALL_ROOT}/usr/local/lib/libcurl.la
 }
--- a/Ports/dash/package.sh
+++ b/Ports/dash/package.sh
@ -12,20 +12,20 @@ configure() {
    run aclocal
    run automake --add-missing
    run mkdir -p host-build
-    run sh -c "cd host-build && ../configure $configopts CFLAGS=-I."
+    run sh -c "cd host-build && ../configure ${configopts[@]} CFLAGS=-I."
    target_env
    run mkdir -p target-build
-    run sh -c "cd target-build && ../configure --host="${SERENITY_ARCH}-pc-serenity" --disable-helpers $configopts CFLAGS=-I."
+    run sh -c "cd target-build && ../configure --host="${SERENITY_ARCH}-pc-serenity" --disable-helpers ${configopts[@]} CFLAGS=-I."
 }

 build() {
    host_env
-    run sh -c "cd host-build && make $makeopts"
+    run sh -c "cd host-build && make ${makeopts[@]}"
    run cp host-build/src/{mkinit,mksyntax,mknodes,mksignames} src
    target_env
-    run sh -c "cd target-build && make $makeopts"
+    run sh -c "cd target-build && make ${makeopts[@]}"
 }

 install() {
-    run sh -c "cd target-build && make DESTDIR="${SERENITY_INSTALL_ROOT}" $installopts install"
+    run sh -c "cd target-build && make DESTDIR="${SERENITY_INSTALL_ROOT}" ${installopts[@]} install"
 }
--- a/Ports/dialog/package.sh
+++ b/Ports/dialog/package.sh
@ -1,11 +1,11 @@
 #!/usr/bin/env -S bash ../.port_include.sh
 port=dialog
 version=1.3-20210324
-depends="ncurses"
+depends=("ncurses")
 files="https://invisible-mirror.net/archives/dialog/dialog-${version}.tgz dialog-${version}.tgz
 https://invisible-mirror.net/archives/dialog/dialog-${version}.tgz.asc dialog-${version}.tgz.asc"
 auth_type="sig"
 auth_import_key="C52048C0C0748FEE227D47A2702353E0F7E48EDB"
-auth_opts="dialog-${version}.tgz.asc dialog-${version}.tgz"
+auth_opts=("dialog-${version}.tgz.asc" "dialog-${version}.tgz")
 useconfigure=true
-configopts="--prefix=/usr/local --with-ncurses --with-curses-dir=${SERENITY_INSTALL_ROOT}/usr/local/include/ncurses"
+configopts=("--prefix=/usr/local" "--with-ncurses" "--with-curses-dir=${SERENITY_INSTALL_ROOT}/usr/local/include/ncurses")
--- a/Ports/diffutils/package.sh
+++ b/Ports/diffutils/package.sh
@ -4,4 +4,4 @@ version=3.7
 files="https://ftpmirror.gnu.org/gnu/diffutils/diffutils-${version}.tar.xz diffutils-${version}.tar.xz b3a7a6221c3dc916085f0d205abf6b8e1ba443d4dd965118da364a1dc1cb3a26"
 auth_type=sha256
 useconfigure=true
-depends="libiconv"
+depends=("libiconv")
--- a/Ports/dmidecode/package.sh
+++ b/Ports/dmidecode/package.sh
@ -7,7 +7,7 @@ https://download.savannah.gnu.org/releases/dmidecode/dmidecode-${version}.tar.xz
 https://ftpmirror.gnu.org/gnu/gnu-keyring.gpg gnu-keyring.gpg"
 auth_type="sig"
 auth_import_key="90DFD6523C57373D81F63D19865688D038F02FC8"
-auth_opts="--keyring ./gnu-keyring.gpg dmidecode-${version}.tar.xz.sig"
+auth_opts=("--keyring" "./gnu-keyring.gpg" "dmidecode-${version}.tar.xz.sig")

 install() {
    run make clean
--- a/Ports/doom/package.sh
+++ b/Ports/doom/package.sh
@ -3,8 +3,8 @@ port=doom
 workdir=SerenityDOOM-master
 version=git
 files="https://github.com/SerenityPorts/SerenityDOOM/archive/master.tar.gz doom-git.tar.gz"
-makeopts="-C doomgeneric/"
-installopts="-C doomgeneric/"
+makeopts=("-C" "doomgeneric/")
+installopts=("-C" "doomgeneric/")
 launcher_name=Doom
 launcher_category=Games
 launcher_command=doom
--- a/Ports/dosbox-staging/package.sh
+++ b/Ports/dosbox-staging/package.sh
@ -2,10 +2,10 @@
 port=dosbox-staging
 version=0.76.0
 useconfigure=true
-configopts='--disable-opus-cdda --disable-fluidsynth --disable-dynamic-core'
+configopts=("--disable-opus-cdda" "--disable-fluidsynth" "--disable-dynamic-core")
 files="https://github.com/dosbox-staging/dosbox-staging/archive/refs/tags/v${version}.tar.gz v${version}.tar.gz 7df53c22f7ce78c70afb60b26b06742b90193b56c510219979bf12e0bb2dc6c7"
 auth_type=sha256
-depends="SDL2 libpng"
+depends=("SDL2" "libpng")
 launcher_name=DOSBox
 launcher_category=Games
 launcher_command=/usr/local/bin/dosbox
--- a/Ports/drascula/package.sh
+++ b/Ports/drascula/package.sh
@ -3,7 +3,7 @@ port=drascula
 version="1.0"
 files="https://downloads.scummvm.org/frs/extras/Drascula_%20The%20Vampire%20Strikes%20Back/drascula-1.0.zip ${port}-${version}.zip b731f6cb5a22ba8b4c3b3362f570b9a10a67b6cb0b395394b19a94b36e4e42de"
 auth_type=sha256
-depends="scummvm"
+depends=("scummvm")

 resource_path="/usr/local/share/games/${port}-${version}"

--- a/Ports/dreamweb/package.sh
+++ b/Ports/dreamweb/package.sh
@ -3,7 +3,7 @@ port=dreamweb
 version="1.1"
 files="https://downloads.scummvm.org/frs/extras/Dreamweb/dreamweb-cd-uk-1.1.zip ${port}-${version}.zip 4a6f13911ce67d62c526e41048ec067b279f1b378c9210f39e0ce8d3f2b80142"
 auth_type=sha256
-depends="scummvm"
+depends=("scummvm")

 resource_path="/usr/local/share/games/${port}-${version}"

--- a/Ports/dropbear/package.sh
+++ b/Ports/dropbear/package.sh
@ -6,9 +6,9 @@ https://mirror.dropbear.nl/mirror/releases/dropbear-${version}.tar.bz2.asc dropb
 https://mirror.dropbear.nl/mirror/releases/dropbear-key-2015.asc dropbear-key-2015.asc"

 auth_type="sig"
-auth_opts="--keyring ./dropbear-key-2015.asc dropbear-${version}.tar.bz2.asc"
+auth_opts=("--keyring" "./dropbear-key-2015.asc" "dropbear-${version}.tar.bz2.asc")
 useconfigure=true
 # don't care about zlib, less deps is better
-configopts="--disable-zlib "
+configopts=("--disable-zlib")
 # Serenity's utmp is not fully compatible with what dropbear expects.
-configopts+="--disable-utmp --disable-wtmp --disable-login --disable-lastlog "
+configopts+=("--disable-utmp" "--disable-wtmp" "--disable-login" "--disable-lastlog")
--- a/Ports/dungeonrush/package.sh
+++ b/Ports/dungeonrush/package.sh
@ -4,15 +4,15 @@ version=1.1-beta
 useconfigure=true
 files="https://github.com/Rapiz1/DungeonRush/archive/refs/tags/v${version}.tar.gz v${version}.tar.gz 295b83cb023bf5d21318992daee125399892bdf16a87c835dfc90b841c929eda"
 auth_type=sha256
-configopts="-DCMAKE_TOOLCHAIN_FILE=${SERENITY_BUILD_DIR}/CMakeToolchain.txt"
-depends="SDL2 SDL2_image SDL2_mixer SDL2_ttf SDL2_net"
+configopts=("-DCMAKE_TOOLCHAIN_FILE=${SERENITY_BUILD_DIR}/CMakeToolchain.txt")
+depends=("SDL2" "SDL2_image" "SDL2_mixer" "SDL2_ttf" "SDL2_net")
 launcher_name="DungeonRush"
 launcher_category=Games
 launcher_command=/opt/DungeonRush/dungeon_rush
 icon_file=dungeonrush.png

 configure() {
-    run cmake $configopts
+    run cmake "${configopts[@]}"
 }

 install() {
--- a/Ports/ed/package.sh
+++ b/Ports/ed/package.sh
@ -5,9 +5,9 @@ files="https://ftpmirror.gnu.org/gnu/ed/ed-${version}.tar.lz ed-${version}.tar.l
 https://ftpmirror.gnu.org/gnu/ed/ed-${version}.tar.lz.sig ed-${version}.tar.lz.sig
 https://ftpmirror.gnu.org/gnu/gnu-keyring.gpg gnu-keyring.gpg"
 auth_type="sig"
-auth_opts="--keyring ./gnu-keyring.gpg ed-${version}.tar.lz.sig"
+auth_opts=("--keyring" "./gnu-keyring.gpg" "ed-${version}.tar.lz.sig")
 useconfigure=true
-depends=pcre2
+depends=("pcre2")

 configure() {
    run ./"$configscript"
--- a/Ports/emu2/package.sh
+++ b/Ports/emu2/package.sh
@ -6,5 +6,5 @@ auth_type=sha256

 build() {
    export CC="${SERENITY_SOURCE_DIR}/Toolchain/Local/${SERENITY_ARCH}/bin/${SERENITY_ARCH}-pc-serenity-gcc"
-    run make DESTDIR="${SERENITY_INSTALL_ROOT}" CC="${CC}" $installopts
+    run make DESTDIR="${SERENITY_INSTALL_ROOT}" CC="${CC}" "${installopts[@]}"
 }
--- a/Ports/epsilon/package.sh
+++ b/Ports/epsilon/package.sh
@ -3,8 +3,8 @@ port=epsilon
 version=15.5.0
 files="https://github.com/numworks/epsilon/archive/refs/tags/${version}.tar.gz ${port}-${version}.tar.gz 38c3b6baaf00863bbd179bce5e9cc42bbdbd0cd485b5bf3bbf4473383591bf83"
 auth_type=sha256
-makeopts="PLATFORM=simulator TARGET=serenity SERENITY_INSTALL_ROOT=${SERENITY_INSTALL_ROOT}"
-depends="SDL2 libpng libjpeg freetype"
+makeopts=("PLATFORM=simulator" "TARGET=serenity" "SERENITY_INSTALL_ROOT=${SERENITY_INSTALL_ROOT}")
+depends=("SDL2" "libpng" "libjpeg" "freetype")
 launcher_name=Epsilon
 launcher_category=Utilities
 launcher_command=/usr/local/bin/epsilon.elf
--- a/Ports/ffmpeg/package.sh
+++ b/Ports/ffmpeg/package.sh
@ -2,11 +2,11 @@
 port=ffmpeg
 version=4.4
 useconfigure=true
-depends="libiconv libtiff xz bzip"
+depends=("libiconv" "libtiff" "xz" "bzip")
 files="https://ffmpeg.org/releases/ffmpeg-${version}.tar.gz ffmpeg-${version}.tar.gz a4abede145de22eaf233baa1726e38e137f5698d9edd61b5763cd02b883f3c7c"
 auth_type="sha256"
-installopts="INSTALL_TOP=${SERENITY_INSTALL_ROOT}/usr/local"
-configopts="SRC_PATH=."
+installopts=("INSTALL_TOP=${SERENITY_INSTALL_ROOT}/usr/local")
+configopts=("SRC_PATH=.")

 configure() {
    run ./configure \
@ -18,7 +18,7 @@ configure() {
 }

 install() {
-    run make DESTDIR=${SERENITY_INSTALL_ROOT} $installopts install
+    run make DESTDIR=${SERENITY_INSTALL_ROOT} "${installopts[@]}" install
    for lib in libavcodec libavdevice libavfilter libavformat libavutil; do
        ${CC} -shared -o ${SERENITY_INSTALL_ROOT}/usr/local/lib/${lib}.so -Wl,-soname,${lib}.so -Wl,--whole-archive ${SERENITY_INSTALL_ROOT}/usr/local/lib/${lib}.a -Wl,--no-whole-archive -liconv -ltiff -llzma -lbz2
        rm -f ${SERENITY_INSTALL_ROOT}/usr/local/lib/$lib.la
--- a/Ports/figlet/package.sh
+++ b/Ports/figlet/package.sh
@ -5,5 +5,5 @@ files="http://ftp.figlet.org/pub/figlet/program/unix/figlet-${version}.tar.gz fi
 auth_type=sha256

 build() {
-    run make CC="${CC}" LD="${CC}" $makeopts
+    run make CC="${CC}" LD="${CC}" "${makeopts[@]}"
 }
--- a/Ports/flatbuffers/package.sh
+++ b/Ports/flatbuffers/package.sh
@ -7,10 +7,10 @@ files="https://github.com/google/flatbuffers/archive/refs/tags/v${version}.tar.g
 useconfigure=true
 # Since we are cross-compiling, we cannot build the tests, because we need
 # the flatbuffers compiler to build them
-configopts="-DCMAKE_TOOLCHAIN_FILE=${SERENITY_BUILD_DIR}/CMakeToolchain.txt -DFLATBUFFERS_BUILD_TESTS=off"
+configopts=("-DCMAKE_TOOLCHAIN_FILE=${SERENITY_BUILD_DIR}/CMakeToolchain.txt" "-DFLATBUFFERS_BUILD_TESTS=off")

 configure() {
-    run cmake $configopts
+    run cmake "${configopts[@]}"
 }

 install() {
--- a/Ports/flex/package.sh
+++ b/Ports/flex/package.sh
@ -4,8 +4,8 @@ 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
-configopts=--disable-bootstrap
-depends="m4 pcre2"
+configopts=("--disable-bootstrap")
+depends=("m4" "pcre2")
 auth_type="sig"
 auth_import_key="E4B29C8D64885307"
-auth_opts="flex-${version}.tar.gz.sig"
+auth_opts=("flex-${version}.tar.gz.sig")
--- a/Ports/fotaq/package.sh
+++ b/Ports/fotaq/package.sh
@ -3,7 +3,7 @@ port=fotaq
 version="1.0"
 files="https://downloads.scummvm.org/frs/extras/Flight%20of%20the%20Amazon%20Queen/FOTAQ_Talkie-original.zip ${port}-${version}.zip a298e68243f18a741d4816ef636a5a77a1593816fb2c9e23a09124c35a95dfec"
 auth_type=sha256
-depends="scummvm"
+depends=("scummvm")

 resource_path="/usr/local/share/games/${port}-${version}"

--- a/Ports/freeciv/package.sh
+++ b/Ports/freeciv/package.sh
@ -2,10 +2,10 @@
 port=freeciv
 version=3.0.0-beta2
 useconfigure=true
-configopts="--enable-client=sdl2 --enable-fcmp=no"
+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
-depends="SDL2 SDL2_image SDL2_mixer SDL2_ttf SDL2_gfx zstd libicu xz gettext curl"
+depends=("SDL2" "SDL2_image" "SDL2_mixer" "SDL2_ttf" "SDL2_gfx" "zstd" "libicu" "xz" "gettext" "curl")
 launcher_name=Freeciv
 launcher_category=Games
 launcher_command=/usr/local/bin/freeciv-sdl2
--- a/Ports/freetype/package.sh
+++ b/Ports/freetype/package.sh
@ -4,10 +4,10 @@ version=2.10.4
 useconfigure=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"
+configopts=("--with-brotli=no" "--with-bzip2=no" "--with-zlib=no" "--with-harfbuzz=no" "--with-png=no")

 install() {
-    run make DESTDIR=${SERENITY_INSTALL_ROOT} $installopts install
+    run make DESTDIR=${SERENITY_INSTALL_ROOT} "${installopts[@]}" install
    ${CC} -shared -o ${SERENITY_INSTALL_ROOT}/usr/local/lib/libfreetype.so -Wl,-soname,libfreetype.so -Wl,--whole-archive ${SERENITY_INSTALL_ROOT}/usr/local/lib/libfreetype.a -Wl,--no-whole-archive
    rm -f ${SERENITY_INSTALL_ROOT}/usr/local/lib/libfreetype.la
 }
--- a/Ports/frotz/package.sh
+++ b/Ports/frotz/package.sh
@ -3,7 +3,7 @@ port=frotz
 version=2.53
 files="https://gitlab.com/DavidGriffith/frotz/-/archive/${version}/frotz-${version}.tar.bz2 frotz-${version}.tar.bz2 8da558828dd74d6d6ee30483bb32276ef918b8b72b7f6e89b4f7cb27e7abf58b"
 auth_type=sha256
-depends="ncurses"
+depends=("ncurses")

 build() {
    run make \
--- a/Ports/gawk/package.sh
+++ b/Ports/gawk/package.sh
@ -6,4 +6,4 @@ files="https://ftpmirror.gnu.org/gnu/gawk/gawk-${version}.tar.gz gawk-${version}
 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"
 auth_type="sig"
-auth_opts="--keyring ./gnu-keyring.gpg gawk-${version}.tar.gz.sig"
+auth_opts=("--keyring" "./gnu-keyring.gpg" "gawk-${version}.tar.gz.sig")
--- a/Ports/gcc/package.sh
+++ b/Ports/gcc/package.sh
@ -2,11 +2,11 @@
 port=gcc
 version=11.2.0
 useconfigure=true
-configopts="--target=${SERENITY_ARCH}-pc-serenity --with-sysroot=/ --with-build-sysroot=${SERENITY_INSTALL_ROOT} --with-newlib --enable-languages=c,c++ --disable-lto --disable-nls --enable-shared --enable-default-pie --enable-host-shared --enable-threads=posix"
+configopts=("--target=${SERENITY_ARCH}-pc-serenity" "--with-sysroot=/" "--with-build-sysroot=${SERENITY_INSTALL_ROOT}" "--with-newlib" "--enable-languages=c,c++" "--disable-lto" "--disable-nls" "--enable-shared" "--enable-default-pie" "--enable-host-shared" "--enable-threads=posix")
 files="https://ftpmirror.gnu.org/gnu/gcc/gcc-${version}/gcc-${version}.tar.xz gcc-${version}.tar.xz d08edc536b54c372a1010ff6619dd274c0f1603aa49212ba20f7aa2cda36fa8b"
-makeopts="all-gcc all-target-libgcc all-target-libstdc++-v3 -j $(nproc)"
-installopts="DESTDIR=${SERENITY_INSTALL_ROOT} install-gcc install-target-libgcc install-target-libstdc++-v3"
-depends="binutils"
+makeopts=("all-gcc" "all-target-libgcc" "all-target-libstdc++-v3" "-j$(nproc)")
+installopts=("DESTDIR=${SERENITY_INSTALL_ROOT}" "install-gcc" "install-target-libgcc" "install-target-libstdc++-v3")
+depends=("binutils")
 auth_type="sha256"

 post_fetch() {
@ -14,11 +14,11 @@ post_fetch() {
 }

 build() {
-    run make $makeopts
+    run make "${makeopts[@]}"
    run find "./host-${SERENITY_ARCH}-pc-serenity/gcc/" -maxdepth 1 -type f -executable -exec strip --strip-debug {} \; || echo
 }

 install() {
-    run make $installopts
+    run make "${installopts[@]}"
    run ln -sf gcc "${SERENITY_INSTALL_ROOT}/usr/local/bin/cc"
 }
--- a/Ports/genemu/package.sh
+++ b/Ports/genemu/package.sh
@ -4,11 +4,11 @@ version=3bf6f7cd893db3451019d6e18a2d9ad1de0e7c8c
 useconfigure=true
 files="https://github.com/rasky/genemu/archive/${version}.tar.gz genemu-${version}.tar.gz 07e4f6aba1778143796bc0a571dfc7a693a2cbc5cf303a31df19d74e12f8cf54"
 auth_type=sha256
-configopts="-DCMAKE_TOOLCHAIN_FILE=${SERENITY_BUILD_DIR}/CMakeToolchain.txt"
-depends="SDL2"
+configopts=("-DCMAKE_TOOLCHAIN_FILE=${SERENITY_BUILD_DIR}/CMakeToolchain.txt")
+depends=("SDL2")

 configure() {
-    run cmake ${configopts}
+    run cmake "${configopts[@]}"
 }

 install() {
--- a/Ports/gettext/package.sh
+++ b/Ports/gettext/package.sh
@ -4,10 +4,10 @@ version=0.21
 useconfigure=true
 files="https://ftp.gnu.org/pub/gnu/gettext/gettext-${version}.tar.gz gettext-${version}.tar.gz c77d0da3102aec9c07f43671e60611ebff89a996ef159497ce8e59d075786b12"
 auth_type=sha256
-depends="libiconv"
+depends=("libiconv")

 install() {
-    run make DESTDIR=${SERENITY_INSTALL_ROOT} $installopts install
+    run make DESTDIR=${SERENITY_INSTALL_ROOT} "${installopts[@]}" install
    ${CC} -shared -pthread -o ${SERENITY_INSTALL_ROOT}/usr/local/lib/libintl.so -Wl,-soname,libintl.so -Wl,--whole-archive ${SERENITY_INSTALL_ROOT}/usr/local/lib/libintl.a -Wl,--no-whole-archive -liconv
    rm -f ${SERENITY_INSTALL_ROOT}/usr/local/lib/libintl.la
 }
--- a/Ports/git/package.sh
+++ b/Ports/git/package.sh
@ -4,11 +4,11 @@ version=2.33.0
 useconfigure="true"
 files="https://mirrors.edge.kernel.org/pub/software/scm/git/git-${version}.tar.xz git-${version}.tar.xz bf3c6ab5f82e072aad4768f647cfb1ef60aece39855f83f080f9c0222dd20c4f"
 auth_type=sha256
-configopts="--target=${SERENITY_ARCH}-pc-serenity --with-lib=${SERENITY_INSTALL_ROOT}/usr/local CFLAGS=-DNO_IPV6 LDFLAGS=-L${SERENITY_INSTALL_ROOT}/usr/local/lib"
-depends="zlib curl"
+configopts=("--target=${SERENITY_ARCH}-pc-serenity" "--with-lib=${SERENITY_INSTALL_ROOT}/usr/local" "CFLAGS=-DNO_IPV6" "LDFLAGS=-L${SERENITY_INSTALL_ROOT}/usr/local/lib")
+depends=("zlib" "curl")

 build() {
-    run make $makeopts CURL_LDFLAGS="-lcurl -lssl -lcrypto -lz"
+    run make "${makeopts[@]}" CURL_LDFLAGS="-lcurl -lssl -lcrypto -lz"
    run make strip
 }

--- a/Ports/glib/package.sh
+++ b/Ports/glib/package.sh
@ -1,14 +1,14 @@
 #!/usr/bin/env -S bash ../.port_include.sh
 port=glib
 version=2.70.0
-depends="libiconv libffi zlib gettext"
+depends=("libiconv" "libffi" "zlib" "gettext")
 useconfigure=true
-configopts="--cross-file ../cross_file-$SERENITY_ARCH.txt"
+configopts=("--cross-file" "../cross_file-$SERENITY_ARCH.txt")
 files="https://gitlab.gnome.org/GNOME/glib/-/archive/${version}/glib-${version}.tar.gz glib-${version}.tar.gz aadf815ed908d4cc14ac3976f325b986b4ab2b65ad85bc214ddf2e200648bd1c"
 auth_type=sha256

 configure() {
-    run meson _build $configopts
+    run meson _build "${configopts[@]}"
 }

 build() {
--- a/Ports/gmp/package.sh
+++ b/Ports/gmp/package.sh
@ -6,4 +6,4 @@ files="https://ftpmirror.gnu.org/gnu/gmp/gmp-${version}.tar.bz2 gmp-${version}.t
 https://ftpmirror.gnu.org/gnu/gmp/gmp-${version}.tar.bz2.sig gmp-${version}.tar.bz2.sig
 https://ftpmirror.gnu.org/gnu/gnu-keyring.gpg gnu-keyring.gpg"
 auth_type="sig"
-auth_opts="--keyring ./gnu-keyring.gpg gmp-${version}.tar.bz2.sig"
+auth_opts=("--keyring" "./gnu-keyring.gpg gmp-${version}.tar.bz2.sig")
--- a/Ports/gnucobol/package.sh
+++ b/Ports/gnucobol/package.sh
@ -2,10 +2,10 @@
 port=gnucobol
 version=3.1.2
 useconfigure="true"
-depends="gmp gcc bash"
+depends=("gmp" "gcc" "bash")
 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
 https://ftpmirror.gnu.org/gnu/gnu-keyring.gpg gnu-keyring.gpg"
 auth_type="sig"
-auth_opts="--keyring ./gnu-keyring.gpg gnucobol-${version}.tar.bz2.sig"
-configopts="--prefix=/usr/local --enable-hardening --disable-rpath --with-gnu-ld --with-dl --with-math=gmp --with-db=no --with-json=no --with-curses=curses"
+auth_opts=("--keyring" "./gnu-keyring.gpg" "gnucobol-${version}.tar.bz2.sig")
+configopts=("--prefix=/usr/local" "--enable-hardening" "--disable-rpath" "--with-gnu-ld" "--with-dl" "--with-math=gmp" "--with-db=no" "--with-json=no" "--with-curses=curses")
--- a/Ports/gnupg/package.sh
+++ b/Ports/gnupg/package.sh
@ -2,15 +2,15 @@
 port=gnupg
 version=2.3.0
 useconfigure=true
-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 \
-  --with-ntbtls-prefix=${SERENITY_INSTALL_ROOT}/usr/local \
-  --with-npth-prefix=${SERENITY_INSTALL_ROOT}/usr/local \
-  --disable-dirmngr"
+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"
+  "--with-ntbtls-prefix=${SERENITY_INSTALL_ROOT}/usr/local"
+  "--with-npth-prefix=${SERENITY_INSTALL_ROOT}/usr/local"
+  "--disable-dirmngr")
 files="https://gnupg.org/ftp/gcrypt/gnupg/gnupg-${version}.tar.bz2 gnupg-${version}.tar.bz2 84c1ef39e8621cfb70f31463a5d1d8edeab44332bc1e0e1af9b78b6f9ed05bb4"
 auth_type=sha256
-depends="libiconv libgpg-error libgcrypt libksba libassuan npth ntbtls"
+depends=("libiconv" "libgpg-error" "libgcrypt" "libksba" "libassuan" "npth" "ntbtls")

 pre_configure() {
    export GPGRT_CONFIG="${SERENITY_INSTALL_ROOT}/usr/local/bin/gpgrt-config"
@ -19,5 +19,5 @@ pre_configure() {
 }

 configure() {
-    run ./configure --host="${SERENITY_ARCH}-pc-serenity" --build="$($workdir/build-aux/config.guess)" $configopts
+    run ./configure --host="${SERENITY_ARCH}-pc-serenity" --build="$($workdir/build-aux/config.guess)" "${configopts[@]}"
 }
--- a/Ports/gnuplot/package.sh
+++ b/Ports/gnuplot/package.sh
@ -5,7 +5,7 @@ useconfigure=true
 # Note: gnuplot's source code is hosted on SourceForge, but using the GitHub mirror makes downloading a versioned .tar.gz easier.
 files="https://github.com/gnuplot/gnuplot/archive/${version}.tar.gz gnuplot-${version}.tar.gz b55f591e2ad9d01ffca821f2f91ce781b481bb5dd602ce5188bfad3140f44ac0"
 auth_type=sha256
-configopts="--prefix=${SERENITY_INSTALL_ROOT}/usr/local --with-readline=builtin --without-latex"
+configopts=("--prefix=${SERENITY_INSTALL_ROOT}/usr/local" "--with-readline=builtin" "--without-latex")

 pre_configure() {
    run ./prepare
--- a/Ports/grep/package.sh
+++ b/Ports/grep/package.sh
@ -6,6 +6,6 @@ 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
-configopts=--disable-perl-regexp
+configopts=("--disable-perl-regexp")
 auth_type="sig"
-auth_opts="--keyring ./gnu-keyring.gpg grep-${version}.tar.gz.sig"
+auth_opts=("--keyring" "./gnu-keyring.gpg" "grep-${version}.tar.gz.sig")
--- a/Ports/griffon/package.sh
+++ b/Ports/griffon/package.sh
@ -3,7 +3,7 @@ port=griffon
 version="1.0"
 files="https://downloads.scummvm.org/frs/extras/Griffon%20Legend/${port}-${version}.zip ${port}-${version}.zip 0aad5fb10f51afb5c121cf04cc86539a6f0d89db85809f9e1767dfdc8d3191a4"
 auth_type=sha256
-depends="scummvm"
+depends=("scummvm")

 resource_path="/usr/local/share/games/${port}-${version}"

--- a/Ports/gsl/package.sh
+++ b/Ports/gsl/package.sh
@ -7,4 +7,4 @@ files="https://mirror.freedif.org/GNU/gsl/gsl-${version}.tar.gz gsl-${version}.t
 https://mirror.freedif.org/GNU/gsl/gsl-${version}.tar.gz.sig gsl-${version}.tar.gz.sig
 https://ftpmirror.gnu.org/gnu/gnu-keyring.gpg gnu-keyring.gpg"
 auth_type=sig
-auth_opts="--keyring ./gnu-keyring.gpg gsl-${version}.tar.gz.sig"
+auth_opts=("--keyring" "./gnu-keyring.gpg" "gsl-${version}.tar.gz.sig")
--- a/Ports/harfbuzz/package.sh
+++ b/Ports/harfbuzz/package.sh
@ -2,18 +2,18 @@
 port=harfbuzz
 useconfigure=true
 version=2.8.1
-depends="freetype libicu"
-configopts="-DCMAKE_TOOLCHAIN_FILE=${SERENITY_BUILD_DIR}/CMakeToolchain.txt -DHB_HAVE_FREETYPE=ON -DHB_HAVE_ICU=ON"
+depends=("freetype" "libicu")
+configopts=("-DCMAKE_TOOLCHAIN_FILE=${SERENITY_BUILD_DIR}/CMakeToolchain.txt" "-DHB_HAVE_FREETYPE=ON" "-DHB_HAVE_ICU=ON")
 files="https://github.com/harfbuzz/harfbuzz/releases/download/${version}/harfbuzz-${version}.tar.xz harfbuzz-${version}.tar.xz 4124f663ec4bf4e294d9cf230668370b4249a48ff34deaf0f06e8fc82d891300"
 auth_type=sha256

 configure() {
    run mkdir -p build
-    run sh -c "cd build && cmake $configopts .."
+    run sh -c "cd build && cmake ${configopts[@]} .."
 }

 build() {
-    run sh -c "cd build && make $makeopts"
+    run sh -c "cd build && make ${makeopts[@]}"
 }

 install() {
--- a/Ports/hatari/package.sh
+++ b/Ports/hatari/package.sh
@ -2,10 +2,10 @@
 port=hatari
 useconfigure=true
 version=2.4.0-devel
-depends="SDL2 zlib"
+depends=("SDL2" "zlib")
 commit=353379e1f8a847cc0e284541d2b40fd49d175d22
 workdir="${port}-${commit}"
-configopts="-DCMAKE_TOOLCHAIN_FILE=${SERENITY_BUILD_DIR}/CMakeToolchain.txt"
+configopts=("-DCMAKE_TOOLCHAIN_FILE=${SERENITY_BUILD_DIR}/CMakeToolchain.txt")
 files="https://github.com/hatari/hatari/archive/${commit}.tar.gz ${commit}.tar.gz 617f95b30c4e590bb61ddcc1dafc22f4bf270377caa7aa5867f3f7413250b538"
 auth_type=sha256
 launcher_name=Hatari
@ -13,7 +13,7 @@ launcher_category=Games
 launcher_command=hatari

 configure() {
-    run cmake $configopts
+    run cmake "${configopts[@]}"
 }

 install() {
--- a/Ports/imgcat/package.sh
+++ b/Ports/imgcat/package.sh
@ -1,7 +1,7 @@
 #!/usr/bin/env -S bash ../.port_include.sh
 port=imgcat
 version=2.5.0
-depends="ncurses"
+depends=("ncurses")
 files="https://github.com/eddieantonio/imgcat/releases/download/v${version}/imgcat-${version}.tar.gz imgcat-v${version}.tar.gz 8f18e10464ed1426b29a5b11aee766a43db92be17ba0a17fd127dd9cf9fb544b"
 auth_type=sha256

--- 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
 auth_type="sig"
-auth_opts="--keyring ./gnu-keyring.gpg indent-${version}.tar.gz.sig"
+auth_opts=("--keyring" "./gnu-keyring.gpg" "indent-${version}.tar.gz.sig")

 post_install() {
    man_dir="${SERENITY_INSTALL_ROOT}/usr/local/share/man/man1/"
--- a/Ports/jot/package.sh
+++ b/Ports/jot/package.sh
@ -3,4 +3,4 @@ port=jot
 version=6.6
 files="https://github.com/ibara/libpuffy/releases/download/libpuffy-1.0/jot-${version}.tar.gz jot-${version}.tar.gz ad7d955e6a22b5c71d32479703cdac6f2c009765e7bf1bb860775f05b1e1d303"
 auth_type=sha256
-depends=libpuffy
+depends=("libpuffy")
--- a/Ports/jq/package.sh
+++ b/Ports/jq/package.sh
@ -2,10 +2,10 @@
 port=jq
 version=1.6
 useconfigure=true
-configopts="--with-oniguruma=builtin --disable-maintainer-mode"
+configopts=("--with-oniguruma=builtin" "--disable-maintainer-mode")
 files="https://github.com/stedolan/jq/releases/download/jq-${version}/jq-${version}.tar.gz jq-${version}.tar.gz 5de8c8e29aaa3fb9cc6b47bb27299f271354ebb72514e3accadc7d38b5bbaa72"
 auth_type=sha256
-makeopts="LDFLAGS=-all-static"
+makeopts=("LDFLAGS=-all-static")

 pre_configure() {
    pushd $workdir/modules/oniguruma
--- a/Ports/less/package.sh
+++ b/Ports/less/package.sh
@ -6,9 +6,9 @@ files="https://ftpmirror.gnu.org/gnu/less/less-${version}.tar.gz less-${version}
 https://ftpmirror.gnu.org/gnu/less/less-${version}.tar.gz.sig less-${version}.tar.gz.sig
 https://ftpmirror.gnu.org/gnu/gnu-keyring.gpg gnu-keyring.gpg"

-depends="ncurses"
+depends=("ncurses")
 auth_type="sig"
-auth_opts="--keyring ./gnu-keyring.gpg less-${version}.tar.gz.sig"
+auth_opts=("--keyring" "./gnu-keyring.gpg" "less-${version}.tar.gz.sig")

 post_configure() {
    run_replace_in_file "s/#define HAVE_WCTYPE 1/\/* #undef HAVE_WCTYPE *\//" defines.h
--- a/Ports/libarchive/package.sh
+++ b/Ports/libarchive/package.sh
@ -2,12 +2,12 @@
 port=libarchive
 version=3.5.2
 useconfigure=true
-configopts="--without-xml2"
+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"
-depends="zlib pcre"
+depends=("zlib" "pcre")
 auth_type="sig"
 auth_import_key="A5A45B12AD92D964B89EEE2DEC560C81CEC2276E"
-auth_opts="libarchive-${version}.tar.gz.asc libarchive-${version}.tar.gz"
+auth_opts=("libarchive-${version}.tar.gz.asc" "libarchive-${version}.tar.gz")

 export ac_cv_header_regex_h=no
--- a/Ports/libassuan/package.sh
+++ b/Ports/libassuan/package.sh
@ -2,7 +2,7 @@
 port=libassuan
 version=2.5.5
 useconfigure=true
-depends="libgpg-error"
+depends=("libgpg-error")
 files="https://gnupg.org/ftp/gcrypt/libassuan/libassuan-${version}.tar.bz2 libassuan-${version}.tar.bz2 8e8c2fcc982f9ca67dcbb1d95e2dc746b1739a4668bc20b3a3c5be632edb34e4"
 auth_type=sha256

@ -11,11 +11,11 @@ pre_configure() {
 }

 configure() {
-    run ./configure --host="${SERENITY_ARCH}-pc-serenity" --build="$($workdir/build-aux/config.guess)" $configopts
+    run ./configure --host="${SERENITY_ARCH}-pc-serenity" --build="$($workdir/build-aux/config.guess)" "${configopts[@]}"
 }

 install() {
-    run make DESTDIR=${SERENITY_INSTALL_ROOT} $installopts install
+    run make DESTDIR=${SERENITY_INSTALL_ROOT} "${installopts[@]}" install
    ${CC} -shared -o ${SERENITY_INSTALL_ROOT}/usr/local/lib/libassuan.so -Wl,-soname,libassuan.so -Wl,--whole-archive ${SERENITY_INSTALL_ROOT}/usr/local/lib/libassuan.a -Wl,--no-whole-archive -lgpg-error
    rm -f ${SERENITY_INSTALL_ROOT}/usr/local/lib/libassuan.la
 }
--- a/Ports/libexpat/package.sh
+++ b/Ports/libexpat/package.sh
@ -7,4 +7,4 @@ https://github.com/libexpat/libexpat/releases/download/R_2_2_9/expat-${version}.
 workdir=expat-${version}
 auth_type="sig"
 auth_import_key="CB8DE70A90CFBF6C3BF5CC5696262ACFFBD3AEC6"
-auth_opts="expat-${version}.tar.xz.asc expat-${version}.tar.xz"
+auth_opts=("expat-${version}.tar.xz.asc" "expat-${version}.tar.xz")
--- a/Ports/libgcrypt/package.sh
+++ b/Ports/libgcrypt/package.sh
@ -2,8 +2,8 @@
 port=libgcrypt
 version=1.9.2
 useconfigure=true
-configopts="--with-libgpg-error-prefix=${SERENITY_INSTALL_ROOT}/usr/local"
-depends=libgpg-error
+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"
 auth_type=sha256

@ -12,11 +12,11 @@ pre_configure() {
 }

 configure() {
-    run ./configure --host="${SERENITY_ARCH}-pc-serenity" --build="$($workdir/build-aux/config.guess)" $configopts
+    run ./configure --host="${SERENITY_ARCH}-pc-serenity" --build="$($workdir/build-aux/config.guess)" "${configopts[@]}"
 }

 install() {
-    run make DESTDIR=${SERENITY_INSTALL_ROOT} $installopts install
+    run make DESTDIR=${SERENITY_INSTALL_ROOT} "${installopts[@]}" install
    ${CC} -shared -o ${SERENITY_INSTALL_ROOT}/usr/local/lib/libgcrypt.so -Wl,-soname,libgcrypt.so -Wl,--whole-archive ${SERENITY_INSTALL_ROOT}/usr/local/lib/libgcrypt.a -Wl,--no-whole-archive -lgpg-error
    rm -f ${SERENITY_INSTALL_ROOT}/usr/local/lib/libgcrypt.la
 }
--- a/Ports/libgpg-error/package.sh
+++ b/Ports/libgpg-error/package.sh
@ -2,17 +2,17 @@
 port=libgpg-error
 version=1.42
 useconfigure=true
-depends="gettext"
-configopts="--disable-tests --disable-threads"
+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"
 auth_type=sha256

 configure() {
-    run ./configure --host="${SERENITY_ARCH}-pc-serenity" --build="$($workdir/build-aux/config.guess)" $configopts
+    run ./configure --host="${SERENITY_ARCH}-pc-serenity" --build="$($workdir/build-aux/config.guess)" "${configopts[@]}"
 }

 install() {
-    run make DESTDIR=${SERENITY_INSTALL_ROOT} $installopts install
+    run make DESTDIR=${SERENITY_INSTALL_ROOT} "${installopts[@]}" install
    ${CC} -shared -o ${SERENITY_INSTALL_ROOT}/usr/local/lib/libgpg-error.so -Wl,-soname,libgpg-error.so -Wl,--whole-archive ${SERENITY_INSTALL_ROOT}/usr/local/lib/libgpg-error.a -Wl,--no-whole-archive -lintl
    rm -f ${SERENITY_INSTALL_ROOT}/usr/local/lib/libgpg-error.la
 }
--- a/Ports/libiconv/package.sh
+++ b/Ports/libiconv/package.sh
@ -2,12 +2,12 @@
 port=libiconv
 version=1.16
 useconfigure=true
-configopts="--enable-shared --disable-nls"
+configopts=("--enable-shared" "--disable-nls")
 files="https://ftpmirror.gnu.org/gnu/libiconv/libiconv-${version}.tar.gz libiconv-${version}.tar.gz e6a1b1b589654277ee790cce3734f07876ac4ccfaecbee8afa0b649cf529cc04"
 auth_type="sha256"

 install() {
-    run make DESTDIR=${SERENITY_INSTALL_ROOT} $installopts install
+    run make DESTDIR=${SERENITY_INSTALL_ROOT} "${installopts[@]}" install
    run ${SERENITY_ARCH}-pc-serenity-gcc -shared -o ${SERENITY_INSTALL_ROOT}/usr/local/lib/libiconv.so -Wl,-soname,libiconv.so -Wl,--whole-archive ${SERENITY_INSTALL_ROOT}/usr/local/lib/libiconv.a -Wl,--no-whole-archive
    rm -f ${SERENITY_INSTALL_ROOT}/usr/local/lib/libiconv.la
 }
--- a/Ports/libicu/package.sh
+++ b/Ports/libicu/package.sh
@ -3,16 +3,16 @@ port=libicu
 version=69.1
 useconfigure=true
 workdir=icu/source
-configopts=--with-cross-build=$(pwd)/${workdir}/../host-build
+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"
 auth_type=sha256

 configure() {
    host_env
    run mkdir -p ../host-build
-    run sh -c "cd ../host-build && ../source/configure && make $makeopts"
+    run sh -c "cd ../host-build && ../source/configure && make ${makeopts[@]}"
    target_env
-    run ./configure --host="${SERENITY_ARCH}-pc-serenity" $configopts
+    run ./configure --host="${SERENITY_ARCH}-pc-serenity" "${configopts[@]}"
 }

 export CFLAGS="-DU_HAVE_NL_LANGINFO_CODESET=0"
--- a/Ports/libjpeg/package.sh
+++ b/Ports/libjpeg/package.sh
@ -7,7 +7,7 @@ auth_type=sha256
 workdir="jpeg-$version"

 install() {
-    run make DESTDIR=${SERENITY_INSTALL_ROOT} $installopts install
+    run make DESTDIR=${SERENITY_INSTALL_ROOT} "${installopts[@]}" install
    ${CC} -shared -o ${SERENITY_INSTALL_ROOT}/usr/local/lib/libjpeg.so -Wl,-soname,libjpeg.so -Wl,--whole-archive ${SERENITY_INSTALL_ROOT}/usr/local/lib/libjpeg.a -Wl,--no-whole-archive
    rm -f ${SERENITY_INSTALL_ROOT}/usr/local/lib/libjpeg.la
 }
--- a/Ports/libksba/package.sh
+++ b/Ports/libksba/package.sh
@ -2,7 +2,7 @@
 port=libksba
 version=1.5.1
 useconfigure=true
-depends=libgpg-error
+depends=("libgpg-error")
 files="https://gnupg.org/ftp/gcrypt/libksba/libksba-${version}.tar.bz2 libksba-${version}.tar.bz2 b0f4c65e4e447d9a2349f6b8c0e77a28be9531e4548ba02c545d1f46dc7bf921"
 auth_type=sha256

@ -11,11 +11,11 @@ pre_configure() {
 }

 configure() {
-    run ./configure --host="${SERENITY_ARCH}-pc-serenity" --build="$($workdir/build-aux/config.guess)" $configopts
+    run ./configure --host="${SERENITY_ARCH}-pc-serenity" --build="$($workdir/build-aux/config.guess)" "${configopts[@]}"
 }

 install() {
-    run make DESTDIR=${SERENITY_INSTALL_ROOT} $installopts install
+    run make DESTDIR=${SERENITY_INSTALL_ROOT} "${installopts[@]}" install
    ${CC} -shared -o ${SERENITY_INSTALL_ROOT}/usr/local/lib/libksba.so -Wl,-soname,libksba.so -Wl,--whole-archive ${SERENITY_INSTALL_ROOT}/usr/local/lib/libksba.a -Wl,--no-whole-archive -lgpg-error
    rm -f ${SERENITY_INSTALL_ROOT}/usr/local/lib/libksba.la
 }
--- a/Ports/libogg/package.sh
+++ b/Ports/libogg/package.sh
@ -6,7 +6,7 @@ files="https://github.com/xiph/ogg/releases/download/v${version}/libogg-${versio
 auth_type=sha256

 install() {
-    run make DESTDIR=${SERENITY_INSTALL_ROOT} $installopts install
+    run make DESTDIR=${SERENITY_INSTALL_ROOT} "${installopts[@]}" install
    ${CC} -shared -o ${SERENITY_INSTALL_ROOT}/usr/local/lib/libogg.so -Wl,-soname,libogg.so -Wl,--whole-archive ${SERENITY_INSTALL_ROOT}/usr/local/lib/libogg.a -Wl,--no-whole-archive
    rm -f ${SERENITY_INSTALL_ROOT}/usr/local/lib/libogg.la
 }
--- a/Ports/libopenal/package.sh
+++ b/Ports/libopenal/package.sh
@ -3,13 +3,13 @@ port=libopenal
 useconfigure=true
 version=1.21.1
 workdir="openal-soft-${version}"
-depends=ffmpeg
-configopts="-DCMAKE_TOOLCHAIN_FILE=${SERENITY_BUILD_DIR}/CMakeToolchain.txt"
+depends=("ffmpeg")
+configopts=("-DCMAKE_TOOLCHAIN_FILE=${SERENITY_BUILD_DIR}/CMakeToolchain.txt")
 files="https://openal-soft.org/openal-releases/openal-soft-${version}.tar.bz2 openal-soft-${version}.tar.bz2 c8ad767e9a3230df66756a21cc8ebf218a9d47288f2514014832204e666af5d8"
 auth_type=sha256

 configure() {
-    run cmake $configopts
+    run cmake "${configopts[@]}"
 }

 install() {
--- a/Ports/libphysfs/package.sh
+++ b/Ports/libphysfs/package.sh
@ -3,12 +3,12 @@ port=libphysfs
 useconfigure=true
 version=3.0.2
 workdir="physfs-${version}"
-configopts="-DCMAKE_TOOLCHAIN_FILE=${SERENITY_BUILD_DIR}/CMakeToolchain.txt"
+configopts=("-DCMAKE_TOOLCHAIN_FILE=${SERENITY_BUILD_DIR}/CMakeToolchain.txt")
 files="https://icculus.org/physfs/downloads/physfs-${version}.tar.bz2 physfs-${version}.tar.bz2 304df76206d633df5360e738b138c94e82ccf086e50ba84f456d3f8432f9f863"
 auth_type=sha256

 configure() {
-    run cmake $configopts
+    run cmake "${configopts[@]}"
 }

 install() {
--- a/Ports/libpng/package.sh
+++ b/Ports/libpng/package.sh
@ -4,10 +4,10 @@ version=1.6.37
 useconfigure=true
 files="https://download.sourceforge.net/libpng/libpng-${version}.tar.gz libpng-${version}.tar.gz daeb2620d829575513e35fecc83f0d3791a620b9b93d800b763542ece9390fb4"
 auth_type=sha256
-depends="zlib"
+depends=("zlib")

 install() {
-    run make DESTDIR=${SERENITY_INSTALL_ROOT} $installopts install
+    run make DESTDIR=${SERENITY_INSTALL_ROOT} "${installopts[@]}" install
    ${CC} -shared -o ${SERENITY_INSTALL_ROOT}/usr/local/lib/libpng16.so -Wl,-soname,libpng16.so -Wl,--whole-archive ${SERENITY_INSTALL_ROOT}/usr/local/lib/libpng16.a -Wl,--no-whole-archive -lz
    ln -sf libpng16.so ${SERENITY_INSTALL_ROOT}/usr/local/lib/libpng.so
    rm -f ${SERENITY_INSTALL_ROOT}/usr/local/lib/libpng16.la ${SERENITY_INSTALL_ROOT}/usr/local/lib/libpng.la
--- a/Ports/libsixel/package.sh
+++ b/Ports/libsixel/package.sh
@ -4,7 +4,7 @@ version=1.8.6
 files="https://github.com/saitoha/libsixel/archive/refs/tags/v${version}.tar.gz ${port}-${version}.tar.gz 37611d60c7dbcee701346967336dbf135fdd5041024d5f650d52fae14c731ab9"
 useconfigure=true
 auth_type=sha256
-configopts="--prefix=${SERENITY_INSTALL_ROOT}/usr/local"
+configopts=("--prefix=${SERENITY_INSTALL_ROOT}/usr/local")

 install() {
    run make install
--- a/Ports/libsodium/package.sh
+++ b/Ports/libsodium/package.sh
@ -7,7 +7,7 @@ files="https://download.libsodium.org/libsodium/releases/libsodium-${version}.ta
 auth_type=sha256

 install() {
-    run make DESTDIR=${SERENITY_INSTALL_ROOT} $installopts install
+    run make DESTDIR=${SERENITY_INSTALL_ROOT} "${installopts[@]}" install
    ${CC} -shared -pthread -o ${SERENITY_INSTALL_ROOT}/usr/local/lib/libsodium.so -Wl,-soname,libsodium.so -Wl,--whole-archive ${SERENITY_INSTALL_ROOT}/usr/local/lib/libsodium.a -Wl,--no-whole-archive
    rm -f ${SERENITY_INSTALL_ROOT}/usr/local/lib/libsodium.la
 }
--- a/Ports/libtheora/package.sh
+++ b/Ports/libtheora/package.sh
@ -4,8 +4,8 @@ version=1.1.1
 useconfigure=true
 files="https://downloads.xiph.org/releases/theora/libtheora-${version}.tar.bz2 libtheora-${version}.tar.bz2 b6ae1ee2fa3d42ac489287d3ec34c5885730b1296f0801ae577a35193d3affbc"
 auth_type="sha256"
-depends="libvorbis"
-configopts="--disable-examples"
+depends=("libvorbis")
+configopts=("--disable-examples")

 build_shared() {
    local name=$1
@ -14,7 +14,7 @@ build_shared() {
 }

 install() {
-    run make DESTDIR=${SERENITY_INSTALL_ROOT} $installopts install
+    run make DESTDIR=${SERENITY_INSTALL_ROOT} "${installopts[@]}" install
    build_shared libtheora
    build_shared libtheoradec
    build_shared libtheoraenc
--- a/Ports/libtiff/package.sh
+++ b/Ports/libtiff/package.sh
@ -6,11 +6,11 @@ files="http://download.osgeo.org/libtiff/tiff-${version}.tar.gz tiff-${version}.
 http://download.osgeo.org/libtiff/tiff-${version}.tar.gz.sig tiff-${version}.tar.gz.sig"
 auth_type="sig"
 auth_import_key="EBDFDB21B020EE8FD151A88DE301047DE1198975"
-auth_opts="tiff-${version}.tar.gz.sig tiff-${version}.tar.gz"
-depends="libjpeg zstd xz"
+auth_opts=("tiff-${version}.tar.gz.sig" "tiff-${version}.tar.gz")
+depends=("libjpeg" "zstd" "xz")

 install() {
-    run make DESTDIR=${SERENITY_INSTALL_ROOT} $installopts install
+    run make DESTDIR=${SERENITY_INSTALL_ROOT} "${installopts[@]}" install
    ${CC} -shared -o ${SERENITY_INSTALL_ROOT}/usr/local/lib/libtiff.so -Wl,-soname,libtiff.so -Wl,--whole-archive ${SERENITY_INSTALL_ROOT}/usr/local/lib/libtiff.a -Wl,--no-whole-archive -lzstd -llzma -ljpeg
    ${CC} -shared -o ${SERENITY_INSTALL_ROOT}/usr/local/lib/libtiffxx.so -Wl,-soname,libtiffxx.so -Wl,--whole-archive ${SERENITY_INSTALL_ROOT}/usr/local/lib/libtiffxx.a -Wl,--no-whole-archive -lzstd -llzma -ljpeg
    rm -f ${SERENITY_INSTALL_ROOT}/usr/local/lib/libtiff.la ${SERENITY_INSTALL_ROOT}/usr/local/lib/libtiffxx.la
--- a/Ports/libtool/package.sh
+++ b/Ports/libtool/package.sh
@ -2,13 +2,13 @@
 port=libtool
 version=2.4
 useconfigure="true"
-depends="bash sed"
+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
 https://ftpmirror.gnu.org/gnu/gnu-keyring.gpg gnu-keyring.gpg"
 auth_type="sig"
-auth_opts="--keyring ./gnu-keyring.gpg libtool-${version}.tar.xz.sig"
-configopts="--prefix=/usr/local"
+auth_opts=("--keyring" "./gnu-keyring.gpg" "libtool-${version}.tar.xz.sig")
+configopts=("--prefix=/usr/local")

 post_install() {
    mkdir -p "${SERENITY_INSTALL_ROOT}/usr/bin"
--- a/Ports/libuuid/package.sh
+++ b/Ports/libuuid/package.sh
@ -4,7 +4,7 @@ port=libuuid
 version=2.37.2
 workdir="util-linux-${version}"
 useconfigure=true
-configopts="--prefix=/usr/local --disable-all-programs --enable-libuuid"
+configopts=("--prefix=/usr/local" "--disable-all-programs" "--enable-libuuid")
 files="https://github.com/karelzak/util-linux/archive/refs/tags/v${version}.tar.gz util-linux-${version}.tar.gz 74e725802a6355bba7288caeca171e0e25d9da2aa570162efbc1397ed924dfa2
 https://git.savannah.gnu.org/cgit/config.git/plain/config.sub?id=2707e389a5c8ec14db468cdc4979864cd57b53f5 config.sub 698198944a59f5915b3f68dc9d642f573aeb8960307493a5693e6b148d5bb4c6"
 auth_type=sha256
--- a/Ports/libuv/package.sh
+++ b/Ports/libuv/package.sh
@ -4,10 +4,10 @@ version=b12699b1efabfd241324f4ab6cfd6ce576db491e
 useconfigure=true
 files="https://github.com/libuv/libuv/archive/$version.tar.gz $port-$version.tar.gz bbbfa2bb50437047efc8fb29c243c914ae0de94107d7cc641c2f84e292904eb5"
 auth_type=sha256
-configopts="-DCMAKE_TOOLCHAIN_FILE=${SERENITY_BUILD_DIR}/CMakeToolchain.txt -GNinja"
+configopts=("-DCMAKE_TOOLCHAIN_FILE=${SERENITY_BUILD_DIR}/CMakeToolchain.txt" "-GNinja")

 configure() {
-    run cmake $configopts .
+    run cmake "${configopts[@]}" .
 }

 build() {
--- a/Ports/libvorbis/package.sh
+++ b/Ports/libvorbis/package.sh
@ -4,10 +4,10 @@ version=1.3.7
 useconfigure=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
+depends=("libogg")

 install() {
-    run make DESTDIR=${SERENITY_INSTALL_ROOT} $installopts install
+    run make DESTDIR=${SERENITY_INSTALL_ROOT} "${installopts[@]}" install
    ${CC} -shared -o ${SERENITY_INSTALL_ROOT}/usr/local/lib/libvorbis.so -Wl,-soname,libvorbis.so -Wl,--whole-archive ${SERENITY_INSTALL_ROOT}/usr/local/lib/libvorbis.a -Wl,--no-whole-archive -logg
    rm -f ${SERENITY_INSTALL_ROOT}/usr/local/lib/libvorbis.la
    ${CC} -shared -o ${SERENITY_INSTALL_ROOT}/usr/local/lib/libvorbisenc.so -Wl,-soname,libvorbisenc.so -Wl,--whole-archive ${SERENITY_INSTALL_ROOT}/usr/local/lib/libvorbisenc.a -Wl,--no-whole-archive -lvorbis
--- a/Ports/libxml2/package.sh
+++ b/Ports/libxml2/package.sh
@ -4,8 +4,8 @@ useconfigure="true"
 version="2.9.12"
 files="ftp://xmlsoft.org/libxml2/libxml2-${version}.tar.gz libxml2-${version}.tar.gz c8d6681e38c56f172892c85ddc0852e1fd4b53b4209e7f4ebf17f7e2eae71d92"
 auth_type=sha256
-depends="libiconv xz"
-configopts="--prefix=${SERENITY_INSTALL_ROOT}/usr/local --without-python"
+depends=("libiconv" "xz")
+configopts=("--prefix=${SERENITY_INSTALL_ROOT}/usr/local" "--without-python")

 install() {
    # Leave out DESTDIR - otherwise the prefix breaks
--- a/Ports/libzip/package.sh
+++ b/Ports/libzip/package.sh
@ -2,14 +2,14 @@
 port=libzip
 useconfigure=true
 version=1.7.3
-depends="zlib"
+depends=("zlib")
 workdir=libzip-${version}
-configopts="-DCMAKE_TOOLCHAIN_FILE=${SERENITY_BUILD_DIR}/CMakeToolchain.txt"
+configopts=("-DCMAKE_TOOLCHAIN_FILE=${SERENITY_BUILD_DIR}/CMakeToolchain.txt")
 files="https://libzip.org/download/libzip-${version}.tar.gz libzip-${version}.tar.gz 0e2276c550c5a310d4ebf3a2c3dfc43fb3b4602a072ff625842ad4f3238cb9cc"
 auth_type=sha256

 configure() {
-    run cmake $configopts
+    run cmake "${configopts[@]}"
 }

 install() {
--- a/Ports/llvm/package.sh
+++ b/Ports/llvm/package.sh
@ -3,7 +3,7 @@ port=llvm
 useconfigure=true
 version=12.0.0
 workdir=llvm-project-llvmorg-${version}
-configopts="-DCMAKE_TOOLCHAIN_FILE=${SERENITY_BUILD_DIR}/CMakeToolchain.txt"
+configopts=("-DCMAKE_TOOLCHAIN_FILE=${SERENITY_BUILD_DIR}/CMakeToolchain.txt")
 files="https://github.com/llvm/llvm-project/archive/refs/tags/llvmorg-${version}.zip llvm.zip f77723b70a5d4ab14899feda87d6cf601612165899abb2f6c7b670e517f45e2d"
 auth_type=sha256

@ -20,7 +20,7 @@ pre_patch() {
 configure() {
    mkdir -p llvm-build
    cmake ${workdir}/llvm \
-    -B llvm-build $configopts \
+    -B llvm-build "${configopts[@]}" \
    -DCMAKE_BUILD_TYPE=MinSizeRel \
    -DLLVM_TARGETS_TO_BUILD=X86 \
    -DLLVM_ENABLE_PROJECTS="clang;lld;compiler-rt" \
--- a/Ports/lua/package.sh
+++ b/Ports/lua/package.sh
@ -3,5 +3,5 @@ port=lua
 version=5.3.5
 files="http://www.lua.org/ftp/lua-${version}.tar.gz lua-${version}.tar.gz 0c2eed3f960446e1a3e4b9a1ca2f3ff893b6ce41942cf54d5dd59ab4b3b058ac"
 auth_type=sha256
-makeopts="-j$(nproc) serenity"
-installopts="INSTALL_TOP=${SERENITY_INSTALL_ROOT}/usr/local"
+makeopts=("-j$(nproc)" "serenity")
+installopts=("INSTALL_TOP=${SERENITY_INSTALL_ROOT}/usr/local")
--- a/Ports/lure/package.sh
+++ b/Ports/lure/package.sh
@ -3,7 +3,7 @@ port=lure
 version="1.1"
 files="https://downloads.scummvm.org/frs/extras/Lure%20of%20the%20Temptress/lure-1.1.zip ${port}-${version}.zip f3178245a1483da1168c3a11e70b65d33c389f1f5df63d4f3a356886c1890108"
 auth_type=sha256
-depends="scummvm"
+depends=("scummvm")
 workdir="lure"

 resource_path="/usr/local/share/games/${port}-${version}"
--- a/Ports/m4/package.sh
+++ b/Ports/m4/package.sh
@ -6,4 +6,4 @@ files="https://ftpmirror.gnu.org/gnu/m4/m4-${version}.tar.gz m4-${version}.tar.g
 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"
 auth_type="sig"
-auth_opts="--keyring ./gnu-keyring.gpg m4-${version}.tar.gz.sig"
+auth_opts=("--keyring" "./gnu-keyring.gpg m4-${version}.tar.gz.sig")
--- a/Ports/make/package.sh
+++ b/Ports/make/package.sh
@ -6,5 +6,5 @@ files="https://ftpmirror.gnu.org/gnu/make/make-${version}.tar.gz make-${version}
 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"
 auth_type="sig"
-auth_opts="--keyring ./gnu-keyring.gpg make-${version}.tar.gz.sig"
-configopts="--target=${SERENITY_ARCH}-pc-serenity --with-sysroot=/ --without-guile"
+auth_opts=("--keyring" "./gnu-keyring.gpg" "make-${version}.tar.gz.sig")
+configopts=("--target=${SERENITY_ARCH}-pc-serenity" "--with-sysroot=/" "--without-guile")
--- a/Ports/mandoc/package.sh
+++ b/Ports/mandoc/package.sh
@ -3,5 +3,5 @@ port=mandoc
 version=1.14.5
 useconfigure=true
 files="https://mandoc.bsd.lv/snapshots/mandoc-${version}.tar.gz mandoc-${version}.tar.gz 8219b42cb56fc07b2aa660574e6211ac38eefdbf21f41b698d3348793ba5d8f7"
-depends="less pcre2 zlib"
+depends=("less" "pcre2" "zlib")
 auth_type="sha256"
--- a/Ports/mawk/package.sh
+++ b/Ports/mawk/package.sh
@ -6,7 +6,7 @@ https://invisible-mirror.net/archives/mawk/mawk-${version}.tgz.asc mawk-${versio
 useconfigure=true
 auth_type="sig"
 auth_import_key="C52048C0C0748FEE227D47A2702353E0F7E48EDB"
-auth_opts="mawk-${version}.tgz.asc mawk-${version}.tgz"
+auth_opts=("mawk-${version}.tgz.asc" "mawk-${version}.tgz")

 post_install() {
    ln -sf mawk "${SERENITY_INSTALL_ROOT}/usr/local/bin/awk"
--- a/Ports/mbedtls/package.sh
+++ b/Ports/mbedtls/package.sh
@ -2,11 +2,11 @@
 port=mbedtls
 version=2.16.2
 files="https://tls.mbed.org/download/mbedtls-${version}-apache.tgz mbedtls-${version}-apache.tgz a6834fcd7b7e64b83dfaaa6ee695198cb5019a929b2806cb0162e049f98206a4"
-makeopts="CFLAGS=-DPLATFORM_UTIL_USE_GMTIME"
+makeopts=("CFLAGS=-DPLATFORM_UTIL_USE_GMTIME")
 auth_type=sha256

 install() {
-    run make DESTDIR="${SERENITY_INSTALL_ROOT}/usr/local" $installopts install
+    run make DESTDIR="${SERENITY_INSTALL_ROOT}/usr/local" "${installopts[@]}" install
    ${CC} -shared -o ${SERENITY_INSTALL_ROOT}/usr/local/lib/libmbedcrypto.so -Wl,-soname,libmbedcrypto.so -Wl,--whole-archive ${SERENITY_INSTALL_ROOT}/usr/local/lib/libmbedcrypto.a -Wl,--no-whole-archive
    ${CC} -shared -o ${SERENITY_INSTALL_ROOT}/usr/local/lib/libmbedx509.so -Wl,-soname,libmbedx509.so -Wl,--whole-archive ${SERENITY_INSTALL_ROOT}/usr/local/lib/libmbedx509.a -Wl,--no-whole-archive -lmbedcrypto
    ${CC} -shared -o ${SERENITY_INSTALL_ROOT}/usr/local/lib/libmbedtls.so -Wl,-soname,libmbedtls.so -Wl,--whole-archive ${SERENITY_INSTALL_ROOT}/usr/local/lib/libmbedtls.a -Wl,--no-whole-archive -lmbedcrypto -lmbedx509
--- a/Ports/milkytracker/package.sh
+++ b/Ports/milkytracker/package.sh
@ -5,14 +5,14 @@ workdir=MilkyTracker-$version
 useconfigure=true
 files="https://github.com/milkytracker/MilkyTracker/archive/v$version.tar.gz MilkyTracker-$version.tar.gz 72d5357e303380b52383b66b51f944a77cd77e2b3bfeb227d87cc0e72ab292f7"
 auth_type=sha256
-configopts="-DCMAKE_TOOLCHAIN_FILE=${SERENITY_BUILD_DIR}/CMakeToolchain.txt"
-depends="SDL2 zlib"
+configopts=("-DCMAKE_TOOLCHAIN_FILE=${SERENITY_BUILD_DIR}/CMakeToolchain.txt")
+depends=("SDL2" "zlib")
 launcher_name="MilkyTracker"
 launcher_category=Sound
 launcher_command=/usr/local/bin/milkytracker

 configure() {
-    run cmake $configopts
+    run cmake "${configopts[@]}"
 }

 install() {
--- a/Ports/mpc/package.sh
+++ b/Ports/mpc/package.sh
@ -2,10 +2,10 @@
 port=mpc
 version=1.2.1
 useconfigure=true
-configopts="--target=${SERENITY_ARCH}-pc-serenity --with-sysroot=/"
+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
 https://ftpmirror.gnu.org/gnu/gnu-keyring.gpg gnu-keyring.gpg"
 auth_type="sig"
-auth_opts="--keyring ./gnu-keyring.gpg mpc-${version}.tar.gz.sig"
-depends="gmp mpfr"
+auth_opts=("--keyring" "./gnu-keyring.gpg" "mpc-${version}.tar.gz.sig")
+depends=("gmp" "mpfr")
--- a/Ports/mpfr/package.sh
+++ b/Ports/mpfr/package.sh
@ -2,10 +2,10 @@
 port=mpfr
 version=4.1.0
 useconfigure=true
-configopts="--target=${SERENITY_ARCH}-pc-serenity --with-sysroot=/"
+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
 https://ftpmirror.gnu.org/gnu/gnu-keyring.gpg gnu-keyring.gpg"
 auth_type="sig"
-auth_opts="--keyring ./gnu-keyring.gpg mpfr-${version}.tar.xz.sig"
-depends="gmp"
+auth_opts=("--keyring" "./gnu-keyring.gpg" "mpfr-${version}.tar.xz.sig")
+depends=("gmp")
--- a/Show More
+++ b/Show More