diff --git a/Ports/.port_include.sh b/Ports/.port_include.sh index bf953a5a8cce5a..d2fe8cc4ffdeff 100755 --- 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 diff --git a/Ports/Another-World/package.sh b/Ports/Another-World/package.sh index 8e74a656d3fbeb..d4b0995ee345a9 100755 --- 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() { diff --git a/Ports/SDL2-GNUBoy/package.sh b/Ports/SDL2-GNUBoy/package.sh index 6abc7c99fdf501..0560389ec661aa 100755 --- 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") diff --git a/Ports/SDL2/package.sh b/Ports/SDL2/package.sh index 4c4abce749396e..34522f109dbe8a 100755 --- 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() { diff --git a/Ports/SDL2_gfx/package.sh b/Ports/SDL2_gfx/package.sh index e76ff1582e290e..f9abb950ea5f8e 100755 --- 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 } diff --git a/Ports/SDL2_image/package.sh b/Ports/SDL2_image/package.sh index 910a863faab473..97e96c1bf72592 100755 --- 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 diff --git a/Ports/SDL2_mixer/package.sh b/Ports/SDL2_mixer/package.sh index f689b81db8136f..9783f71117164b 100755 --- 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 \ diff --git a/Ports/SDL2_net/package.sh b/Ports/SDL2_net/package.sh index ef94c43b907d89..9305f1fb590223 100755 --- 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 diff --git a/Ports/SDL2_ttf/package.sh b/Ports/SDL2_ttf/package.sh index 748d355263eaa7..26f1afedb862bd 100755 --- 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 } diff --git a/Ports/SDLPoP/package.sh b/Ports/SDLPoP/package.sh index c1abf5510becd5..f4f0862a906ca2 100755 --- 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() { diff --git a/Ports/Super-Mario/package.sh b/Ports/Super-Mario/package.sh index 9e881434d1ad9e..67ec01e94314a7 100755 --- 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() { diff --git a/Ports/bash/package.sh b/Ports/bash/package.sh index b20b9ff6853df7..33b0a081c4db0e 100755 --- 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() { diff --git a/Ports/bass/package.sh b/Ports/bass/package.sh index db3ed6784e398d..2cfdd52bdab335 100755 --- 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}" diff --git a/Ports/bc/package.sh b/Ports/bc/package.sh index 483918be1f5026..b1809718a53e10 100755 --- 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. diff --git a/Ports/binutils/package.sh b/Ports/binutils/package.sh index eb1adab851317e..fdff73824ee53e 100755 --- 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 diff --git a/Ports/bison/package.sh b/Ports/bison/package.sh index 88754ad7456b08..c1fafeb49830ab 100755 --- 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 diff --git a/Ports/brogue/package.sh b/Ports/brogue/package.sh index 553c39337560db..1cff670fe22272 100755 --- 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" diff --git a/Ports/byacc/package.sh b/Ports/byacc/package.sh index 0a98aaa13a8eee..75e0d2405bd2cd 100755 --- 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") diff --git a/Ports/bzip2/package.sh b/Ports/bzip2/package.sh index 08bc24c02b1cb8..7a93db319bd2d5 100755 --- 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 } diff --git a/Ports/c-ray/package.sh b/Ports/c-ray/package.sh index 3278649fc5a068..c8428f102d4a55 100755 --- 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() { diff --git a/Ports/chester/package.sh b/Ports/chester/package.sh index b43674343dd188..145537be7a051e 100755 --- 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() { diff --git a/Ports/cmake/package.sh b/Ports/cmake/package.sh index 1b7d7fd4a2c6c9..0dcff7e1519c12 100755 --- 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() { diff --git a/Ports/cmatrix/package.sh b/Ports/cmatrix/package.sh index 3a01a2418e5a5b..0e2a91d7801f23 100755 --- 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() { diff --git a/Ports/composer/package.sh b/Ports/composer/package.sh index 436f8fbe8c7dd8..f4d2fef9538e8a 100755 --- 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() { : diff --git a/Ports/curl/package.sh b/Ports/curl/package.sh index a20dd87cc2502a..48afe7ae6a989a 100755 --- 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 } diff --git a/Ports/dash/package.sh b/Ports/dash/package.sh index 4a7df559f19455..ba1ca74ca17b11 100755 --- 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" } diff --git a/Ports/dialog/package.sh b/Ports/dialog/package.sh index a20618390417f8..f306b8098f4f41 100755 --- 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") diff --git a/Ports/diffutils/package.sh b/Ports/diffutils/package.sh index 70dd8bfb078734..4a233f2662aea4 100755 --- 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") diff --git a/Ports/dmidecode/package.sh b/Ports/dmidecode/package.sh index 257fd5feb89f63..7a72181edf8cfe 100755 --- 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 diff --git a/Ports/doom/package.sh b/Ports/doom/package.sh index 5298647a9a59a8..3144c5159022b5 100755 --- 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 diff --git a/Ports/dosbox-staging/package.sh b/Ports/dosbox-staging/package.sh index e1467bcf703e00..e0b424156efec5 100755 --- 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 diff --git a/Ports/drascula/package.sh b/Ports/drascula/package.sh index 036889df8e94bb..cf4d7893e5b40e 100755 --- 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}" diff --git a/Ports/dreamweb/package.sh b/Ports/dreamweb/package.sh index 26dc898b9652a9..ce68da147b1c7a 100755 --- 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}" diff --git a/Ports/dropbear/package.sh b/Ports/dropbear/package.sh index 33b6e78336438c..7c26a22adde85d 100755 --- 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") diff --git a/Ports/dungeonrush/package.sh b/Ports/dungeonrush/package.sh index 6d3976f51287fb..88a4ee5fcd0361 100755 --- 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() { diff --git a/Ports/ed/package.sh b/Ports/ed/package.sh index c1dbf691e02e8d..5eabd352a9e850 100755 --- 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" diff --git a/Ports/emu2/package.sh b/Ports/emu2/package.sh index 7f2a62b5c904cc..04d371f425d105 100755 --- 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[@]}" } diff --git a/Ports/epsilon/package.sh b/Ports/epsilon/package.sh index 827d7dadec38f6..36d4b59421113d 100755 --- 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 diff --git a/Ports/ffmpeg/package.sh b/Ports/ffmpeg/package.sh index 5d23064ad328fa..6febe952415eac 100755 --- 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 diff --git a/Ports/figlet/package.sh b/Ports/figlet/package.sh index c6a04900bd338a..80634636952e1a 100755 --- 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[@]}" } diff --git a/Ports/flatbuffers/package.sh b/Ports/flatbuffers/package.sh index 5d1bd3ff01ae17..7398cee76f1b34 100755 --- 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() { diff --git a/Ports/flex/package.sh b/Ports/flex/package.sh index 42be0f59dc29d7..bee27148df9eee 100755 --- 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") diff --git a/Ports/fotaq/package.sh b/Ports/fotaq/package.sh index 83edfbea34ffaa..02d256a03becc9 100755 --- 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}" diff --git a/Ports/freeciv/package.sh b/Ports/freeciv/package.sh index ec3790daf9a8a6..83813dc3dc081c 100755 --- 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 diff --git a/Ports/freetype/package.sh b/Ports/freetype/package.sh index 192ddfef676066..682200ca58399b 100755 --- 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 } diff --git a/Ports/frotz/package.sh b/Ports/frotz/package.sh index d808c2ee26fdca..7d18f962c8c06c 100755 --- 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 \ diff --git a/Ports/gawk/package.sh b/Ports/gawk/package.sh index 0f69de02deb3cd..aba484aa71a3da 100755 --- 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") diff --git a/Ports/gcc/package.sh b/Ports/gcc/package.sh index 23596aeaf1b8ff..49c33ba6489f66 100755 --- 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" } diff --git a/Ports/genemu/package.sh b/Ports/genemu/package.sh index 734b46702d4279..0f5fd8caa2cbc3 100755 --- 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() { diff --git a/Ports/gettext/package.sh b/Ports/gettext/package.sh index 204fcdfa3d1290..12738bd1aac8f8 100755 --- 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 } diff --git a/Ports/git/package.sh b/Ports/git/package.sh index ce55cf2cea5bef..3373f068c0ef91 100755 --- 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 } diff --git a/Ports/glib/package.sh b/Ports/glib/package.sh index 827d518e67372f..ec25aaacba8d47 100755 --- 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() { diff --git a/Ports/gmp/package.sh b/Ports/gmp/package.sh index 74b0e14365a274..c06df43e04bf20 100755 --- 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") diff --git a/Ports/gnucobol/package.sh b/Ports/gnucobol/package.sh index 8b96b33f126ff2..a9c77df7ba78a2 100755 --- 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") diff --git a/Ports/gnupg/package.sh b/Ports/gnupg/package.sh index 3dd7a9111255b4..d468b16c06c1b2 100755 --- 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[@]}" } diff --git a/Ports/gnuplot/package.sh b/Ports/gnuplot/package.sh index c29c17a9bda49b..a7d3d7fa71752d 100755 --- 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 diff --git a/Ports/grep/package.sh b/Ports/grep/package.sh index 4b7d3f3449e88f..e3be6447d8e112 100755 --- 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") diff --git a/Ports/griffon/package.sh b/Ports/griffon/package.sh index adb310e43f4aa2..3d5d7a6ab9d4d5 100755 --- 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}" diff --git a/Ports/gsl/package.sh b/Ports/gsl/package.sh index d13b762feb51c1..26053b44c83d5b 100755 --- 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") diff --git a/Ports/harfbuzz/package.sh b/Ports/harfbuzz/package.sh index 2afab3439564b2..bc0c8451adce23 100755 --- 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() { diff --git a/Ports/hatari/package.sh b/Ports/hatari/package.sh index 98e65bb45e1e6b..c0e9cf86cd3f55 100755 --- 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() { diff --git a/Ports/imgcat/package.sh b/Ports/imgcat/package.sh index 5b285e84647c93..fe81879d48f176 100755 --- 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 diff --git a/Ports/indent/package.sh b/Ports/indent/package.sh index 90549265ade029..79788c43e5ad38 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 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/" diff --git a/Ports/jot/package.sh b/Ports/jot/package.sh index e19f46a92ea8d0..8162aabb8ecfc0 100755 --- 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") diff --git a/Ports/jq/package.sh b/Ports/jq/package.sh index 8cf537312bf748..9a59ca13c158ce 100755 --- 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 diff --git a/Ports/less/package.sh b/Ports/less/package.sh index 59664655dfe161..93c4a5f081b90d 100755 --- 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 diff --git a/Ports/libarchive/package.sh b/Ports/libarchive/package.sh index bb0b94523857b7..11fd50ae3fecfe 100755 --- 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 diff --git a/Ports/libassuan/package.sh b/Ports/libassuan/package.sh index adb309306bf7e8..ab92104dd8f7f0 100755 --- 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 } diff --git a/Ports/libexpat/package.sh b/Ports/libexpat/package.sh index 72c78495eba31f..d9354c8f3dfcb4 100755 --- 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") diff --git a/Ports/libgcrypt/package.sh b/Ports/libgcrypt/package.sh index b91a6ceadae410..3a4a3a2453b680 100755 --- 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 } diff --git a/Ports/libgpg-error/package.sh b/Ports/libgpg-error/package.sh index b3ce313a5361cb..bd1fad02b9995d 100755 --- 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 } diff --git a/Ports/libiconv/package.sh b/Ports/libiconv/package.sh index cc11396f448778..1250a70f2190d3 100755 --- 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 } diff --git a/Ports/libicu/package.sh b/Ports/libicu/package.sh index 8a85bc786b2618..d27455de441525 100755 --- 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" diff --git a/Ports/libjpeg/package.sh b/Ports/libjpeg/package.sh index 12c3216999ce8a..5e11e91bd3edcf 100755 --- 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 } diff --git a/Ports/libksba/package.sh b/Ports/libksba/package.sh index 72a998578990e4..1f99b83283065b 100755 --- 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 } diff --git a/Ports/libogg/package.sh b/Ports/libogg/package.sh index 57c038c675727b..e5105fe695c43b 100755 --- 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 } diff --git a/Ports/libopenal/package.sh b/Ports/libopenal/package.sh index 3fc438f65cd49b..99428651044266 100755 --- 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() { diff --git a/Ports/libphysfs/package.sh b/Ports/libphysfs/package.sh index 647ceb725f28dd..ffdfb57c3dd963 100755 --- 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() { diff --git a/Ports/libpng/package.sh b/Ports/libpng/package.sh index 04b7376150f783..3668095fc16bcc 100755 --- 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 diff --git a/Ports/libsixel/package.sh b/Ports/libsixel/package.sh index f0396e5e04b4e9..d35a1670ae61b8 100755 --- 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 diff --git a/Ports/libsodium/package.sh b/Ports/libsodium/package.sh index 126550d907ed76..a3a2abb0e0ae8c 100755 --- 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 } diff --git a/Ports/libtheora/package.sh b/Ports/libtheora/package.sh index 85f704d917a5e3..cc5d0e203e2bdd 100755 --- 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 diff --git a/Ports/libtiff/package.sh b/Ports/libtiff/package.sh index 61745d200f1e80..79ab1a9d958492 100755 --- 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 diff --git a/Ports/libtool/package.sh b/Ports/libtool/package.sh index 233917b72c5f1a..50467598d93f37 100755 --- 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" diff --git a/Ports/libuuid/package.sh b/Ports/libuuid/package.sh index c2fd981d8c3ec5..ec484e61441639 100755 --- 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 diff --git a/Ports/libuv/package.sh b/Ports/libuv/package.sh index 617c9abde80706..f804c9153cb583 100755 --- 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() { diff --git a/Ports/libvorbis/package.sh b/Ports/libvorbis/package.sh index 18308ebb2ba6d0..cab7cf821eb5de 100755 --- 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 diff --git a/Ports/libxml2/package.sh b/Ports/libxml2/package.sh index 86163569523652..b9fb04b3959dae 100755 --- 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 diff --git a/Ports/libzip/package.sh b/Ports/libzip/package.sh index 21e69d057fb4a6..c203bca86a9688 100755 --- 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() { diff --git a/Ports/llvm/package.sh b/Ports/llvm/package.sh index d7e009f747ee2e..a537f060aa157a 100755 --- 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" \ diff --git a/Ports/lua/package.sh b/Ports/lua/package.sh index 2cfc3412347db8..931d1d95ed10dd 100755 --- 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") diff --git a/Ports/lure/package.sh b/Ports/lure/package.sh index 01a19dce3b0498..97f492ff753bf3 100755 --- 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}" diff --git a/Ports/m4/package.sh b/Ports/m4/package.sh index 35111c5110451e..b5eb8be6a59e00 100755 --- 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") diff --git a/Ports/make/package.sh b/Ports/make/package.sh index 62bf2eb4be92e1..8da9bfc56022f1 100755 --- 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") diff --git a/Ports/mandoc/package.sh b/Ports/mandoc/package.sh index de055d35615cf5..3135074c8c4b67 100755 --- 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" diff --git a/Ports/mawk/package.sh b/Ports/mawk/package.sh index edd4420909fb53..bd637a5b7ebc04 100755 --- 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" diff --git a/Ports/mbedtls/package.sh b/Ports/mbedtls/package.sh index b7790b9dcb3e39..cd2fc4f4328f0d 100755 --- 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 diff --git a/Ports/milkytracker/package.sh b/Ports/milkytracker/package.sh index d1b23414a926a7..9ba2f2d70a7f33 100755 --- 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() { diff --git a/Ports/mpc/package.sh b/Ports/mpc/package.sh index f76abcb0629d00..e4f809771b1064 100755 --- 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") diff --git a/Ports/mpfr/package.sh b/Ports/mpfr/package.sh index 9e6cc116f285f6..247bed37edd9df 100755 --- 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") diff --git a/Ports/mrsh/package.sh b/Ports/mrsh/package.sh index d491c49565760e..4820c608b0eae1 100755 --- a/Ports/mrsh/package.sh +++ b/Ports/mrsh/package.sh @@ -4,7 +4,7 @@ version=d9763a32e7da572677d1681bb1fc67f117d641f3 files="https://codeload.github.com/emersion/mrsh/legacy.tar.gz/${version} emersion-mrsh-d9763a3.tar.gz 6896493a1020774715ccca28e8d8f4ec722af63a93543fb6dd2762f7b1de9c8a" auth_type=sha256 useconfigure=true -makeopts= +makeopts=() workdir=emersion-mrsh-d9763a3 export CFLAGS=-Wno-deprecated-declarations diff --git a/Ports/mysthous/package.sh b/Ports/mysthous/package.sh index bf8af352756336..ab13ccaa449c96 100755 --- a/Ports/mysthous/package.sh +++ b/Ports/mysthous/package.sh @@ -3,7 +3,7 @@ port=mysthous version="1.0" files="https://downloads.scummvm.org/frs/extras/Mystery%20House/MYSTHOUS.zip ${port}-${version}.zip ada412228a149394489b28c6c7f9ebab0722b52e04732fd0aa22949673cfa3a0" auth_type=sha256 -depends="scummvm" +depends=("scummvm") resource_path="/usr/local/share/games/${port}-${version}" diff --git a/Ports/nano/package.sh b/Ports/nano/package.sh index 1b2b450e3cd66d..ef8e4d2056e7c8 100755 --- a/Ports/nano/package.sh +++ b/Ports/nano/package.sh @@ -4,11 +4,11 @@ version=5.8 useconfigure="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" -depends="ncurses" +configopts=("--target=${SERENITY_ARCH}-pc-serenity" "--disable-browser" "--disable-utf8") +depends=("ncurses") auth_type="sig" auth_import_key="BFD009061E535052AD0DF2150D28D4D2A0ACE884" -auth_opts="nano-${version}.tar.xz.asc nano-${version}.tar.xz" +auth_opts=("nano-${version}.tar.xz.asc nano-${version}.tar.xz") export CPPFLAGS="-I${SERENITY_INSTALL_ROOT}/usr/local/include/ncurses" export PKG_CONFIG_PATH="${SERENITY_INSTALL_ROOT}/usr/local/lib/pkgconfig" diff --git a/Ports/nasm/package.sh b/Ports/nasm/package.sh index 545a30df19f969..69691a62c9b022 100755 --- a/Ports/nasm/package.sh +++ b/Ports/nasm/package.sh @@ -4,4 +4,4 @@ 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 -makeopts= +makeopts=() diff --git a/Ports/ncdu/package.sh b/Ports/ncdu/package.sh index 03019a20fb4b25..51a4d127092ac9 100755 --- a/Ports/ncdu/package.sh +++ b/Ports/ncdu/package.sh @@ -4,6 +4,6 @@ useconfigure="true" version="1.16" files="https://dev.yorhel.nl/download/ncdu-${version}.tar.gz ncdu-${version}.tar.gz 2b915752a183fae014b5e5b1f0a135b4b408de7488c716e325217c2513980fd4" auth_type=sha256 -depends="ncurses" +depends=("ncurses") export CFLAGS="-I${SERENITY_INSTALL_ROOT}/usr/local/include/ncurses" diff --git a/Ports/ncurses/package.sh b/Ports/ncurses/package.sh index a47ad0bf464964..c95b66974532cc 100755 --- a/Ports/ncurses/package.sh +++ b/Ports/ncurses/package.sh @@ -2,15 +2,15 @@ port=ncurses version=6.2 useconfigure=true -configopts=" - --enable-pc-files - --enable-sigwinch - --enable-term-driver - --with-pkg-config=/usr/local/lib/pkgconfig - --with-pkg-config-libdir=/usr/local/lib/pkgconfig - --with-shared - --without-ada -" +configopts=( + "--enable-pc-files" + "--enable-sigwinch" + "--enable-term-driver" + "--with-pkg-config=/usr/local/lib/pkgconfig" + "--with-pkg-config-libdir=/usr/local/lib/pkgconfig" + "--with-shared" + "--without-ada" +) files="https://ftpmirror.gnu.org/gnu/ncurses/ncurses-${version}.tar.gz ncurses-${version}.tar.gz 30306e0c76e0f9f1f0de987cf1c82a5c21e1ce6568b9227f7da5b71cbea86c9d" auth_type="sha256" diff --git a/Ports/neofetch/package.sh b/Ports/neofetch/package.sh index bba137e7bc6846..3e79f33225879c 100755 --- a/Ports/neofetch/package.sh +++ b/Ports/neofetch/package.sh @@ -3,10 +3,10 @@ port=neofetch version=7.1.0 useconfigure=false -depends="bash jq" +depends=("bash" "jq") files="https://github.com/dylanaraps/neofetch/archive/${version}.tar.gz neofetch-${version}.tar.gz 58a95e6b714e41efc804eca389a223309169b2def35e57fa934482a6b47c27e7" auth_type=sha256 install() { - run make DESTDIR=${SERENITY_INSTALL_ROOT} PREFIX=/usr/local $installopts install + run make DESTDIR=${SERENITY_INSTALL_ROOT} PREFIX=/usr/local "${installopts[@]}" install } diff --git a/Ports/nesalizer/package.sh b/Ports/nesalizer/package.sh index daac71fa979b50..4a2075e69f9395 100755 --- a/Ports/nesalizer/package.sh +++ b/Ports/nesalizer/package.sh @@ -2,6 +2,6 @@ port=nesalizer version=git workdir=${port}-master -makeopts="CONF=release EXTRA=-I${SERENITY_INSTALL_ROOT}/usr/local/include/SDL2" +makeopts=("CONF=release" "EXTRA=-I${SERENITY_INSTALL_ROOT}/usr/local/include/SDL2") files="https://github.com/SerenityPorts/nesalizer/archive/master.zip nesalizer-master.zip" -depends=SDL2 +depends=("SDL2") diff --git a/Ports/nethack/package.sh b/Ports/nethack/package.sh index 3b6975dcc7b019..4dd844a7e7ed36 100755 --- a/Ports/nethack/package.sh +++ b/Ports/nethack/package.sh @@ -4,22 +4,22 @@ version=3.6.6 workdir=NetHack-NetHack-${version}_Released files="https://www.nethack.org/download/${version}/nethack-${version//.}-src.tgz nethack-${version//.}-src.tgz cfde0c3ab6dd7c22ae82e1e5a59ab80152304eb23fb06e3129439271e5643ed2" auth_type=sha256 -depends="ncurses bash" +depends=("ncurses" "bash") build() { run sys/unix/setup.sh sys/unix/hints/serenity if [ ! -f ${workdir}/util/makedefs.host ]; then host_env - run make -C util makedefs $makeopts + run make -C util makedefs "${makeopts[@]}" run cp util/makedefs util/makedefs.host - run make -C util dgn_comp $makeopts + run make -C util dgn_comp "${makeopts[@]}" run cp util/dgn_comp util/dgn_comp.host - run make -C util lev_comp $makeopts + run make -C util lev_comp "${makeopts[@]}" run cp util/lev_comp util/lev_comp.host - run make -C util dlb $makeopts + run make -C util dlb "${makeopts[@]}" run cp util/dlb util/dlb.host target_env run make clean fi - run make $makeopts + run make "${makeopts[@]}" } diff --git a/Ports/nippon/package.sh b/Ports/nippon/package.sh index 9b4e06431a4990..cb5290d8f0e2cb 100755 --- a/Ports/nippon/package.sh +++ b/Ports/nippon/package.sh @@ -3,7 +3,7 @@ port=nippon version="1.0" files="https://downloads.scummvm.org/frs/extras/Nippon%20Safes/nippon-1.0.zip ${port}-${version}.zip 53e7e2c60065e4aed193169bbcdcfd1113fa68d3efe1c8240ba073c0e20d613f" auth_type=sha256 -depends="scummvm" +depends=("scummvm") resource_path="/usr/local/share/games/${port}-${version}" diff --git a/Ports/npth/package.sh b/Ports/npth/package.sh index 3c50226ea41bd9..5a837921ac35b7 100755 --- a/Ports/npth/package.sh +++ b/Ports/npth/package.sh @@ -6,11 +6,11 @@ files="https://gnupg.org/ftp/gcrypt/npth/npth-${version}.tar.bz2 npth-${version} 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 -pthread -o ${SERENITY_INSTALL_ROOT}/usr/local/lib/libnpth.so -Wl,-soname,libnpth.so -Wl,--whole-archive ${SERENITY_INSTALL_ROOT}/usr/local/lib/libnpth.a -Wl,--no-whole-archive rm -f ${SERENITY_INSTALL_ROOT}/usr/local/lib/libnpth.la } diff --git a/Ports/ntbtls/package.sh b/Ports/ntbtls/package.sh index 1b300260fae415..9e1f4f55f0e918 100755 --- a/Ports/ntbtls/package.sh +++ b/Ports/ntbtls/package.sh @@ -2,7 +2,7 @@ port=ntbtls version=0.2.0 useconfigure=true -depends="libgpg-error libksba libgcrypt" +depends=("libgpg-error" "libksba" "libgcrypt") files="https://gnupg.org/ftp/gcrypt/ntbtls/ntbtls-${version}.tar.bz2 ntbtls-${version}.tar.bz2 649fe74a311d13e43b16b26ebaa91665ddb632925b73902592eac3ed30519e17" 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/libntbtls.so -Wl,-soname,libntbtls.so -Wl,--whole-archive ${SERENITY_INSTALL_ROOT}/usr/local/lib/libntbtls.a -Wl,--no-whole-archive -lgpg-error -lksba -lgcrypt rm -f ${SERENITY_INSTALL_ROOT}/usr/local/lib/libntbtls.la } diff --git a/Ports/oksh/package.sh b/Ports/oksh/package.sh index 7f7d3a089e6bb4..808a12979e4518 100755 --- a/Ports/oksh/package.sh +++ b/Ports/oksh/package.sh @@ -2,7 +2,7 @@ port=oksh useconfigure=true version=6.8.1 -depends="ncurses" +depends=("ncurses") workdir=oksh-${version} files="https://github.com/ibara/oksh/releases/download/oksh-${version}/oksh-${version}.tar.gz oksh-${version}.tar.gz ddd2b27b99009a4ee58ddf58da73edf83962018066ccf33b2fe1f570a00917b0" auth_type=sha256 diff --git a/Ports/openssh/package.sh b/Ports/openssh/package.sh index b5eda60759126a..455126a2dd8cb4 100755 --- a/Ports/openssh/package.sh +++ b/Ports/openssh/package.sh @@ -4,9 +4,9 @@ workdir=openssh-portable-9ca7e9c861775dd6c6312bc8aaab687403d24676 version=8.3-9ca7e9c files="https://github.com/openssh/openssh-portable/archive/9ca7e9c861775dd6c6312bc8aaab687403d24676.tar.gz openssh-8.3-9ca7e9c.tar.gz 78e3051cd76e505b1c9ea4fdcc108f47c64d4db058dad4f776908ed0229f6234" auth_type=sha256 -depends="zlib openssl" +depends=("zlib" "openssl") useconfigure=true -configopts="--prefix=/usr/local --disable-utmp --disable-strip --sysconfdir=/etc/ssh --with-ssl-dir=${SERENITY_INSTALL_ROOT}/usr/local/lib" +configopts=("--prefix=/usr/local" "--disable-utmp" "--disable-strip" "--sysconfdir=/etc/ssh" "--with-ssl-dir=${SERENITY_INSTALL_ROOT}/usr/local/lib") export LDFLAGS="-lcrypt -lcore" @@ -16,7 +16,7 @@ pre_configure() { install() { # Can't make keys outside of Serenity since ssh-keygen is built for Serenity. - run make DESTDIR="${SERENITY_INSTALL_ROOT}" $installopts install-nokeys + run make DESTDIR="${SERENITY_INSTALL_ROOT}" "${installopts[@]}" install-nokeys if command -v ssh-keygen &>/dev/null; then mkdir -p "${SERENITY_INSTALL_ROOT}/etc/ssh" diff --git a/Ports/openssl/package.sh b/Ports/openssl/package.sh index f15a407cbc57aa..8b48fe78369628 100755 --- a/Ports/openssl/package.sh +++ b/Ports/openssl/package.sh @@ -7,15 +7,15 @@ configscript=Configure files="https://ftp.nluug.nl/security/openssl/openssl-${version}.tar.gz openssl-${version}.tar.gz 892a0875b9872acd04a9fde79b1f943075d5ea162415de3047c327df33fbaee5" auth_type=sha256 -depends="zlib" -configopts="--prefix=/usr/local -DOPENSSL_SYS_SERENITY=1 -DOPENSSL_USE_IPV6=0 gcc zlib no-tests no-threads no-asm" +depends=("zlib") +configopts=("--prefix=/usr/local" "-DOPENSSL_SYS_SERENITY=1" "-DOPENSSL_USE_IPV6=0" "gcc" "zlib" "no-tests" "no-threads" "no-asm") configure() { - run ./"$configscript" $configopts + run ./"$configscript" "${configopts[@]}" } install() { # The default "install" also installs docs, which we don't want. - run make DESTDIR=$DESTDIR install_sw $installopts - run make DESTDIR=$DESTDIR install_ssldirs $installopts + run make DESTDIR=$DESTDIR install_sw "${installopts[@]}" + run make DESTDIR=$DESTDIR install_ssldirs "${installopts[@]}" } diff --git a/Ports/openttd/package.sh b/Ports/openttd/package.sh index 8cf3face42a4b0..6ff232987c9d83 100755 --- a/Ports/openttd/package.sh +++ b/Ports/openttd/package.sh @@ -2,10 +2,10 @@ port=openttd version=1.11.0 auth_type=sha256 -depends="freetype SDL2 libicu libpng zlib xz openttd-opengfx openttd-opensfx" +depends=("freetype" "SDL2" "libicu" "libpng" "zlib" "xz" "openttd-opengfx" "openttd-opensfx") files="https://cdn.openttd.org/openttd-releases/${version}/openttd-${version}-source.tar.xz openttd-${version}.tar.xz 5e65184e07368ba1afa62dbb3e35abaee6c4da6730ff4bc9eb4447d53363c7a8" useconfigure=true -configopts="-DCMAKE_TOOLCHAIN_FILE=${SERENITY_BUILD_DIR}/CMakeToolchain.txt" +configopts=("-DCMAKE_TOOLCHAIN_FILE=${SERENITY_BUILD_DIR}/CMakeToolchain.txt") launcher_name=OpenTTD launcher_category=Games launcher_command=/usr/local/games/openttd @@ -22,7 +22,7 @@ configure() { mkdir -p $workdir/build ( cd $workdir/build - cmake .. $configopts -DHOST_BINARY_DIR=$(pwd)/../host-build + cmake .. "${configopts[@]}" -DHOST_BINARY_DIR=$(pwd)/../host-build ) } @@ -30,13 +30,13 @@ build() { host_env ( cd $workdir/host-build - make $makeopts + make "${makeopts[@]}" ) target_env ( cd $workdir/build - make $makeopts + make "${makeopts[@]}" ) } diff --git a/Ports/opentyrian/package.sh b/Ports/opentyrian/package.sh index 6f03f7eb534145..05c7394a31821b 100755 --- a/Ports/opentyrian/package.sh +++ b/Ports/opentyrian/package.sh @@ -4,15 +4,15 @@ version=84b820f852f3f6b812b4d00d6b3906adbbf3bbdb useconfigure=true files="https://github.com/opentyrian/opentyrian/archive/${version}.tar.gz ${version}.tar.gz 7429cc8e3468e3462b886cb99fe6cc0f5d232c193b68a94dc427493107c30dec" auth_type=sha256 -configopts="-DCMAKE_TOOLCHAIN_FILE=${SERENITY_BUILD_DIR}/CMakeToolchain.txt" -depends="SDL2 opentyrian-data" +configopts=("-DCMAKE_TOOLCHAIN_FILE=${SERENITY_BUILD_DIR}/CMakeToolchain.txt") +depends=("SDL2" "opentyrian-data") launcher_name=OpenTyrian launcher_category=Games launcher_command=/usr/local/bin/tyrian configure() { - run cmake $configopts + run cmake "${configopts[@]}" } install() { diff --git a/Ports/p7zip/package.sh b/Ports/p7zip/package.sh index 502b578f135ba3..a8d9f66152bbe0 100755 --- a/Ports/p7zip/package.sh +++ b/Ports/p7zip/package.sh @@ -5,7 +5,7 @@ version="17.04" useconfigure=true auth_type=sha256 files="https://github.com/jinfeihan57/p7zip/archive/refs/tags/v${version}.tar.gz p7zip-${version}.tar.gz ea029a2e21d2d6ad0a156f6679bd66836204aa78148a4c5e498fe682e77127ef" -configopts="-DCMAKE_TOOLCHAIN_FILE=${SERENITY_BUILD_DIR}/CMakeToolchain.txt" +configopts=("-DCMAKE_TOOLCHAIN_FILE=${SERENITY_BUILD_DIR}/CMakeToolchain.txt") workdir=$port-$version/CPP post_fetch() { @@ -13,11 +13,11 @@ post_fetch() { } configure() { - run cmake 7zip/CMAKE $configopts + run cmake 7zip/CMAKE "${configopts[@]}" } build() { - run make $makeopts + run make "${makeopts[@]}" } install() { diff --git a/Ports/patch/package.sh b/Ports/patch/package.sh index 01f73a58459e89..dc6ca91d1599b4 100755 --- a/Ports/patch/package.sh +++ b/Ports/patch/package.sh @@ -3,4 +3,4 @@ port=patch version=6.6 files="https://github.com/ibara/libpuffy/releases/download/libpuffy-1.0/patch-${version}.tar.gz patch-${version}.tar.gz b82ba726d9bdb683534839673f0c845d4f97c8d08490fa53dbef502665fee637" auth_type=sha256 -depends=libpuffy +depends=("libpuffy") diff --git a/Ports/pcre/package.sh b/Ports/pcre/package.sh index 798580f4d0018f..d4768c88744636 100755 --- a/Ports/pcre/package.sh +++ b/Ports/pcre/package.sh @@ -7,4 +7,4 @@ https://ftp.pcre.org/pub/pcre/pcre-${version}.tar.gz.sig pcre-${version}.tar.gz. auth_type="sig" auth_import_key="45F68D54BBE23FB3039B46E59766E084FB0F43D8" -auth_opts="pcre-${version}.tar.gz.sig" +auth_opts=("pcre-${version}.tar.gz.sig") diff --git a/Ports/pcre2/package.sh b/Ports/pcre2/package.sh index c390352c24a36c..3afb666a646199 100755 --- a/Ports/pcre2/package.sh +++ b/Ports/pcre2/package.sh @@ -7,4 +7,4 @@ https://ftp.pcre.org/pub/pcre/pcre2-${version}.tar.gz.sig pcre2-${version}.tar.g auth_type="sig" auth_import_key="45F68D54BBE23FB3039B46E59766E084FB0F43D8" -auth_opts="pcre2-${version}.tar.gz.sig" +auth_opts=("pcre2-${version}.tar.gz.sig") diff --git a/Ports/php/package.sh b/Ports/php/package.sh index bfbfa78102536a..133202e6809efa 100755 --- a/Ports/php/package.sh +++ b/Ports/php/package.sh @@ -4,18 +4,18 @@ useconfigure="true" version="8.0.10" files="https://www.php.net/distributions/php-${version}.tar.xz php-${version}.tar.xz 66dc4d1bc86d9c1bc255b51b79d337ed1a7a035cf71230daabbf9a4ca35795eb" auth_type=sha256 -depends="libiconv libxml2 openssl readline sqlite zlib" -configopts=" - --disable-cgi - --disable-opcache - --enable-fpm - --prefix=${SERENITY_INSTALL_ROOT}/usr/local - --with-iconv=${SERENITY_INSTALL_ROOT}/usr/local - --with-openssl - --with-readline=${SERENITY_INSTALL_ROOT}/usr/local - --with-zlib - --without-pcre-jit -" +depends=("libiconv" "libxml2" "openssl" "readline" "sqlite" "zlib") +configopts=( + "--disable-cgi" + "--disable-opcache" + "--enable-fpm" + "--prefix=${SERENITY_INSTALL_ROOT}/usr/local" + "--with-iconv=${SERENITY_INSTALL_ROOT}/usr/local" + "--with-openssl" + "--with-readline=${SERENITY_INSTALL_ROOT}/usr/local" + "--with-zlib" + "--without-pcre-jit" +) launcher_name="PHP" launcher_category="Development" launcher_command="/usr/local/bin/php -a" diff --git a/Ports/pkgconf/package.sh b/Ports/pkgconf/package.sh index b1ef576fa257a9..a2b2c2c922a9d8 100755 --- a/Ports/pkgconf/package.sh +++ b/Ports/pkgconf/package.sh @@ -5,7 +5,7 @@ files="https://distfiles.dereferenced.org/pkgconf/pkgconf-${version}.tar.xz pkgc auth_type=sha256 useconfigure=true # FIXME: This looks suspiciously host-y... -configopts="--prefix=/usr/local --with-pkg-config-dir=/usr/local/lib/pkgconfig" +configopts=("--prefix=/usr/local" "--with-pkg-config-dir=/usr/local/lib/pkgconfig") post_install() { run mkdir -p "${SERENITY_INSTALL_ROOT}/bin" diff --git a/Ports/printf/package.sh b/Ports/printf/package.sh index e11ac0d07a64fb..540a5a62585dea 100755 --- a/Ports/printf/package.sh +++ b/Ports/printf/package.sh @@ -3,4 +3,4 @@ port=printf version=6.6 files="https://github.com/ibara/libpuffy/releases/download/libpuffy-1.0/printf-${version}.tar.gz printf-${version}.tar.gz 44b68af9795a3cde7dfc73a588fd2b12054dd84d1ab520106713d49935d791a8" auth_type=sha256 -depends=libpuffy +depends=("libpuffy") diff --git a/Ports/pt2-clone/package.sh b/Ports/pt2-clone/package.sh index 89cf107ad92b12..542e77a577bed3 100755 --- a/Ports/pt2-clone/package.sh +++ b/Ports/pt2-clone/package.sh @@ -4,11 +4,11 @@ version=1.28 useconfigure=true files="https://github.com/8bitbubsy/pt2-clone/archive/v${version}.tar.gz v${version}.tar.gz a3ce83e326d94f1abf6dd75fb788fe508922818c08e6f988155df9ed288f180e" 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() { diff --git a/Ports/python3/package.sh b/Ports/python3/package.sh index b65be8b122e41d..51354ced57f5d9 100755 --- a/Ports/python3/package.sh +++ b/Ports/python3/package.sh @@ -16,16 +16,16 @@ launcher_run_in_terminal="true" icon_file="../launcher.ico" # This is an older icon that's downloaded separately, so we need to go outside of $workdir # We could also add `openssl` here, but the _ssl modules doesn't build at the moment -depends="bzip2 libffi libuuid ncurses readline sqlite termcap zlib" +depends=("bzip2" "libffi" "libuuid" "ncurses" "readline" "sqlite" "termcap" "zlib") -configopts="--enable-optimizations --disable-ipv6 --without-ensurepip ac_cv_file__dev_ptmx=no ac_cv_file__dev_ptc=no" +configopts=("--enable-optimizations" "--disable-ipv6" "--without-ensurepip" "ac_cv_file__dev_ptmx=no" "ac_cv_file__dev_ptc=no") export CC="${CC} --sysroot=${SERENITY_INSTALL_ROOT}" export BLDSHARED="${CC} -shared" pre_configure() { build="$("${workdir}/config.guess")" # e.g. 'x86_64-pc-linux-gnu' - configopts="${configopts} --build=${build}" + configopts+=("--build=${build}") } # Note: The showproperty command is used when linting ports, we don't actually need python at this time. diff --git a/Ports/quake/package.sh b/Ports/quake/package.sh index 2a1dfbe6918def..6b507efe6c2dea 100755 --- a/Ports/quake/package.sh +++ b/Ports/quake/package.sh @@ -4,8 +4,8 @@ version=0.65 workdir=SerenityQuake-master useconfigure=false files="https://github.com/SerenityPorts/SerenityQuake/archive/master.tar.gz quake.tar.gz" -makeopts="V=1 SYMBOLS_ON=Y " -depends=SDL2 +makeopts=("V=1" "SYMBOLS_ON=Y") +depends=("SDL2") launcher_name=Quake launcher_category=Games launcher_command=quake diff --git a/Ports/quake2/package.sh b/Ports/quake2/package.sh index 4d4d18dc86a92c..06c1821c7e06ac 100755 --- a/Ports/quake2/package.sh +++ b/Ports/quake2/package.sh @@ -4,15 +4,15 @@ version=0.1 workdir=SerenityQuakeII-master useconfigure=true files="https://github.com/SerenityPorts/SerenityQuakeII/archive/master.tar.gz quake2.tar.gz" -makeopts="" -configopts="-DCMAKE_TOOLCHAIN_FILE=${SERENITY_BUILD_DIR}/CMakeToolchain.txt" -depends=SDL2 +makeopts=() +configopts=("-DCMAKE_TOOLCHAIN_FILE=${SERENITY_BUILD_DIR}/CMakeToolchain.txt") +depends=("SDL2") launcher_name=QuakeII launcher_category=Games launcher_command=quake2 configure() { - run cmake $configopts + run cmake "${configopts[@]}" } install() { diff --git a/Ports/r0/package.sh b/Ports/r0/package.sh index d0b0d4141c4b73..adca19a3efac8a 100755 --- a/Ports/r0/package.sh +++ b/Ports/r0/package.sh @@ -5,4 +5,4 @@ useconfigure=false workdir=$port-$version files="https://codeload.github.com/radareorg/r0/tar.gz/refs/tags/$version r0-$version.tar.gz a31722838a21cd3391c41bbb2e63f60552544244362b21f6d9a30d6c24c43bbe" auth_type=sha256 -depends="" +depends=() diff --git a/Ports/radare2/package.sh b/Ports/radare2/package.sh index afc2b0cce0632f..d08e6188b6379a 100755 --- a/Ports/radare2/package.sh +++ b/Ports/radare2/package.sh @@ -5,7 +5,7 @@ useconfigure=true workdir=$port-$version files="https://codeload.github.com/radareorg/radare2/tar.gz/refs/tags/$version radare2-$version.tar.gz c5e98cd4ea011dde2f08e68144e98e85e82fe45eef92a17dedc06e9404da117e" auth_type=sha256 -configopts="--disable-debugger --with-ostype=serenityos --host=i686-serenityos" +configopts=("--disable-debugger" "--with-ostype=serenityos" "--host=i686-serenityos") pre_configure() { cp -f "$workdir/dist/plugins-cfg/plugins.tiny.cfg" "$workdir/plugins.cfg" diff --git a/Ports/rsync/package.sh b/Ports/rsync/package.sh index fd684f92bac359..8b9c68210b483b 100755 --- a/Ports/rsync/package.sh +++ b/Ports/rsync/package.sh @@ -4,4 +4,4 @@ version=3.1.3 useconfigure="true" files="https://download.samba.org/pub/rsync/src/rsync-${version}.tar.gz rsync-${version}.tar.gz 55cc554efec5fdaad70de921cd5a5eeb6c29a95524c715f3bbf849235b0800c0" auth_type=sha256 -configopts="--target=${SERENITY_ARCH}-pc-serenity" +configopts=("--target=${SERENITY_ARCH}-pc-serenity") diff --git a/Ports/ruby/package.sh b/Ports/ruby/package.sh index 5aee03051aa522..658ea527daf3a3 100755 --- a/Ports/ruby/package.sh +++ b/Ports/ruby/package.sh @@ -14,7 +14,7 @@ launcher_command="/usr/local/bin/ruby /usr/local/bin/irb --nomultiline --nosingl launcher_run_in_terminal="true" icon_file="../ruby-kit/ruby.png" -configopts="--with-coroutine=x86 --disable-install-doc" +configopts=("--with-coroutine=x86" "--disable-install-doc") export CFLAGS="-DNGROUPS_MAX=65536" diff --git a/Ports/sam/package.sh b/Ports/sam/package.sh index 8d57e91e105942..3bcfdb51566a6e 100755 --- a/Ports/sam/package.sh +++ b/Ports/sam/package.sh @@ -3,7 +3,7 @@ port=SAM version=c86ea395743b8ea4ad071c2167fd1f7f96648f7b files="https://github.com/vidarh/SAM/archive/${version}.tar.gz ${version}.tar.gz 1f534245e2c7a096de5f886fd96ea1ad966c4e674c1ed91e0c6a59662e8d6c11" auth_type=sha256 -depends="SDL2" +depends=("SDL2") build() { run make CC="${CC}" diff --git a/Ports/scummvm/package.sh b/Ports/scummvm/package.sh index 3dbca4fb45e461..a1f9c8e3b408c4 100755 --- a/Ports/scummvm/package.sh +++ b/Ports/scummvm/package.sh @@ -4,14 +4,14 @@ useconfigure="true" version="2.2.0" files="https://downloads.scummvm.org/frs/scummvm/${version}/scummvm-${version}.tar.gz scummvm-${version}.tar.gz 6ec5bd63b73861c10ca9869f27a74989a9ad6013bad30a1ef70de6ec146c2cb5" auth_type=sha256 -depends="freetype libiconv libjpeg libpng libtheora SDL2" -configopts=" - --enable-c++11 - --enable-release-mode - --enable-optimizations - --opengl-mode=none - --with-sdl-prefix=${SERENITY_INSTALL_ROOT}/usr/local -" +depends=("freetype" "libiconv" "libjpeg" "libpng" "libtheora" "SDL2") +configopts=( + "--enable-c++11" + "--enable-release-mode" + "--enable-optimizations" + "--opengl-mode=none" + "--with-sdl-prefix=${SERENITY_INSTALL_ROOT}/usr/local" +) launcher_name=ScummVM launcher_category=Games launcher_command=/usr/local/bin/scummvm diff --git a/Ports/sed/package.sh b/Ports/sed/package.sh index 2bd04f7b4df46d..f66d1bc09c5c09 100755 --- a/Ports/sed/package.sh +++ b/Ports/sed/package.sh @@ -6,4 +6,4 @@ files="https://ftpmirror.gnu.org/gnu/sed/sed-${version}.tar.bz2 sed-${version}.t https://ftpmirror.gnu.org/gnu/sed/sed-${version}.tar.bz2.sig sed-${version}.tar.bz2.sig https://ftpmirror.gnu.org/gnu/gnu-keyring.gpg gnu-keyring.gpg" auth_type="sig" -auth_opts="--keyring ./gnu-keyring.gpg sed-${version}.tar.bz2.sig" +auth_opts=("--keyring" "./gnu-keyring.gpg" "sed-${version}.tar.bz2.sig") diff --git a/Ports/sfinx/package.sh b/Ports/sfinx/package.sh index 6ee2d4c4e64141..78e41b919f0819 100755 --- a/Ports/sfinx/package.sh +++ b/Ports/sfinx/package.sh @@ -3,7 +3,7 @@ port=sfinx version="1.1" files="https://downloads.scummvm.org/frs/extras/Sfinx/sfinx-en-v1.1.zip ${port}-en-v${version}.zip f516b30a046526f78cbc923d8f907d267ab964ccd9b770afc72350e8d467ec4d" auth_type=sha256 -depends="scummvm" +depends=("scummvm") workdir="${port}-en-v${version}" resource_path="/usr/local/share/games/${port}-${version}" diff --git a/Ports/sl/package.sh b/Ports/sl/package.sh index 6af92843869cce..4d42b270e9b057 100755 --- a/Ports/sl/package.sh +++ b/Ports/sl/package.sh @@ -4,7 +4,7 @@ version=git workdir=sl-master files="https://github.com/mtoyoda/sl/archive/master.tar.gz sl-git.tar.gz 3270434e28c4f4e15b8e98de60ea98508a7486485f52356a61f36ac5430fbc80" auth_type=sha256 -depends="ncurses" +depends=("ncurses") build() { run ${CC} -I${SERENITY_INSTALL_ROOT}/usr/local/include/ncurses -L${SERENITY_INSTALL_ROOT}/usr/local/lib -o sl sl.c -lncurses -ltinfo diff --git a/Ports/soltys/package.sh b/Ports/soltys/package.sh index d5566e2b6e8a63..cd3a5b6e266f4c 100755 --- a/Ports/soltys/package.sh +++ b/Ports/soltys/package.sh @@ -3,7 +3,7 @@ port=soltys version="1.0" files="https://downloads.scummvm.org/frs/extras/Soltys/soltys-en-v1.0.zip ${port}-en-v${version}.zip 87b89e654b8a5b8ebe342cb4c5c6049ab9a43a5efb474d9c49bafb77dcce48f6" auth_type=sha256 -depends="scummvm" +depends=("scummvm") resource_path="/usr/local/share/games/${port}-${version}" diff --git a/Ports/stpuzzles/package.sh b/Ports/stpuzzles/package.sh index 6b9d5a509e8d42..909521cddd4e20 100755 --- a/Ports/stpuzzles/package.sh +++ b/Ports/stpuzzles/package.sh @@ -3,11 +3,11 @@ port=SimonTathamsPuzzles useconfigure=true version=git workdir=stpuzzles-main -configopts="-DCMAKE_TOOLCHAIN_FILE=${SERENITY_BUILD_DIR}/CMakeToolchain.txt" +configopts=("-DCMAKE_TOOLCHAIN_FILE=${SERENITY_BUILD_DIR}/CMakeToolchain.txt") files="https://github.com/SerenityPorts/stpuzzles/archive/refs/heads/main.zip stpuzzles.zip" configure() { - run cmake $configopts -DCMAKE_CXX_FLAGS="-std=c++2a -O2" + run cmake "${configopts[@]}" -DCMAKE_CXX_FLAGS="-std=c++2a -O2" } install() { diff --git a/Ports/stress-ng/package.sh b/Ports/stress-ng/package.sh index 203c8ea034b334..2724f24bfb6a28 100755 --- a/Ports/stress-ng/package.sh +++ b/Ports/stress-ng/package.sh @@ -3,7 +3,7 @@ port=stress-ng version=0.11.23 files="https://github.com/ColinIanKing/stress-ng/archive/V${version}.tar.gz stress-ng-${version}.tar.gz ffa1c516e3098a1d7ae6a4fd48c6fb41b8dfaabda22aaeebb569d24875870216" auth_type=sha256 -depends=zlib +depends=("zlib") pre_configure() { export CFLAGS="-I${SERENITY_INSTALL_ROOT}/usr/local/include" diff --git a/Ports/termcap/package.sh b/Ports/termcap/package.sh index e4d00aa517e4fe..a02551ba08bb6f 100755 --- a/Ports/termcap/package.sh +++ b/Ports/termcap/package.sh @@ -2,6 +2,6 @@ port=termcap version=1.3.1 useconfigure=true -configopts="--prefix=${SERENITY_INSTALL_ROOT}/usr/local" +configopts=("--prefix=${SERENITY_INSTALL_ROOT}/usr/local") files="https://ftpmirror.gnu.org/gnu/termcap/termcap-${version}.tar.gz termcap-${version}.tar.gz 91a0e22e5387ca4467b5bcb18edf1c51b930262fd466d5fda396dd9d26719100" auth_type=sha256 diff --git a/Ports/tinycc/package.sh b/Ports/tinycc/package.sh index 867facc6726b9e..7b3c17e8cad6d3 100755 --- a/Ports/tinycc/package.sh +++ b/Ports/tinycc/package.sh @@ -4,7 +4,7 @@ version=dev files="https://github.com/TinyCC/tinycc/archive/dev.tar.gz tinycc-dev.tar.gz 1e16fd9926e8e2662a35c790b7c56e8e7e8769c6a8a86a59a534c26046d0d83e" auth_type=sha256 useconfigure=true -makeopts=tcc +makeopts=("tcc") configure() { run ./configure \ diff --git a/Ports/tr/package.sh b/Ports/tr/package.sh index a127e83f13a024..d092cccf35203e 100755 --- a/Ports/tr/package.sh +++ b/Ports/tr/package.sh @@ -3,4 +3,4 @@ port=tr version=6.7 files="https://github.com/ibara/libpuffy/releases/download/libpuffy-1.0/tr-${version}.tar.gz tr-${version}.tar.gz 6390b9f90baf097c7ee660e3d1f107161dd422e3048ce7b7bea65043b916d416" auth_type=sha256 -depends=libpuffy +depends=("libpuffy") diff --git a/Ports/vim/package.sh b/Ports/vim/package.sh index 27eccdc4846388..9e91d2fb93c92e 100755 --- a/Ports/vim/package.sh +++ b/Ports/vim/package.sh @@ -5,8 +5,8 @@ workdir="${port}-${version}" useconfigure="true" files="https://github.com/vim/vim/archive/refs/tags/v${version}.tar.gz vim-v${version}.tar.gz 47613400943bbf3e110c38e8c4923b9e51c1d63d9774313820e1d9b4c4bb9e11" auth_type=sha256 -configopts="--with-tlib=tinfo --with-features=normal" -depends="ncurses gettext" +configopts=("--with-tlib=tinfo" "--with-features=normal") +depends=("ncurses" "gettext") export vim_cv_getcwd_broken=no export vim_cv_memmove_handles_overlap=yes diff --git a/Ports/vitetris/package.sh b/Ports/vitetris/package.sh index 4b1672820513bb..b1b1bd5cc3b937 100755 --- a/Ports/vitetris/package.sh +++ b/Ports/vitetris/package.sh @@ -3,7 +3,7 @@ port=vitetris useconfigure="true" version="0.59.1" files="https://github.com/vicgeralds/vitetris/archive/refs/tags/v${version}.tar.gz vitetris.tar.gz 699443df03c8d4bf2051838c1015da72039bbbdd0ab0eede891c59c840bdf58d" -configopts="--without-xlib --without-joystick --without-network" +configopts=("--without-xlib" "--without-joystick" "--without-network") auth_type=sha256 launcher_name=vitetris launcher_category=Games @@ -12,5 +12,5 @@ launcher_run_in_terminal=true configure() { run chmod +x "$configscript" - run ./"$configscript" $configopts + run ./"$configscript" "${configopts[@]}" } diff --git a/Ports/wget/package.sh b/Ports/wget/package.sh index 6234966c3e4a06..d0d58e5e4e6dc0 100755 --- a/Ports/wget/package.sh +++ b/Ports/wget/package.sh @@ -2,12 +2,12 @@ port=wget version=1.21.1 useconfigure="true" -depends="openssl" +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 https://ftpmirror.gnu.org/gnu/gnu-keyring.gpg gnu-keyring.gpg" auth_type="sig" -auth_opts="--keyring ./gnu-keyring.gpg wget-${version}.tar.gz.sig" -configopts="--with-ssl=openssl --disable-ipv6" +auth_opts=("--keyring" "./gnu-keyring.gpg" "wget-${version}.tar.gz.sig") +configopts=("--with-ssl=openssl" "--disable-ipv6") export OPENSSL_LIBS="-lssl -lcrypto -ldl" diff --git a/Ports/xz/package.sh b/Ports/xz/package.sh index cb6f56b7121912..95f4ff521fcf68 100755 --- a/Ports/xz/package.sh +++ b/Ports/xz/package.sh @@ -4,10 +4,10 @@ version=5.2.5 useconfigure=true files="https://tukaani.org/xz/xz-${version}.tar.gz xz-${version}.tar.gz f6f4910fd033078738bd82bfba4f49219d03b17eb0794eb91efbae419f4aba10" auth_type=sha256 -depends="zlib libiconv" +depends=("zlib" "libiconv") install() { - run make DESTDIR=${SERENITY_INSTALL_ROOT} $installopts install + run make DESTDIR=${SERENITY_INSTALL_ROOT} "${installopts[@]}" install ${CC} -pthread -shared -o ${SERENITY_INSTALL_ROOT}/usr/local/lib/liblzma.so -Wl,-soname,liblzma.so -Wl,--whole-archive ${SERENITY_INSTALL_ROOT}/usr/local/lib/liblzma.a -Wl,--no-whole-archive -lz -liconv rm -f ${SERENITY_INSTALL_ROOT}/usr/local/lib/liblzma.la } diff --git a/Ports/yasm/package.sh b/Ports/yasm/package.sh index 95ca322f932294..6839fff858975c 100755 --- a/Ports/yasm/package.sh +++ b/Ports/yasm/package.sh @@ -4,4 +4,4 @@ version=1.3.0 files="https://www.tortall.net/projects/yasm/releases/yasm-${version}.tar.gz yasm-${version}.tar.gz 3dce6601b495f5b3d45b59f7d2492a340ee7e84b5beca17e48f862502bd5603f" auth_type="sha256" useconfigure=true -makeopts= +makeopts=() diff --git a/Ports/zlib/package.sh b/Ports/zlib/package.sh index aaad451c82f911..6ef8ed2589bc10 100755 --- a/Ports/zlib/package.sh +++ b/Ports/zlib/package.sh @@ -11,7 +11,7 @@ configure() { } 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/libz.so -Wl,-soname,libz.so -Wl,--whole-archive ${SERENITY_INSTALL_ROOT}/usr/local/lib/libz.a -Wl,--no-whole-archive rm -f ${SERENITY_INSTALL_ROOT}/usr/local/lib/libz.la }