diff --git a/Ports/AvailablePorts.md b/Ports/AvailablePorts.md index 4db1537dc0f..50460aa724e 100644 --- a/Ports/AvailablePorts.md +++ b/Ports/AvailablePorts.md @@ -230,7 +230,7 @@ This list is also available at [ports.serenityos.net](https://ports.serenityos.n | [`npth`](npth/) | New GNU Portable Threads Library | 1.6 | https://gnupg.org/software/npth/index.html | | [`ntbtls`](ntbtls/) | The Not Too Bad TLS Library | 0.2.0 | https://gnupg.org/software/ntbtls/index.html | | [`nyancat`](nyancat/) | Nyancat | | https://github.com/klange/nyancat | -| [`ObjFW`](ObjFW/) | ObjFW | master | https://objfw.nil.im/ | +| [`ObjFW`](ObjFW/) | ObjFW | 2903ecd | https://objfw.nil.im/ | | [`oksh`](oksh/) | oksh | 7.1 | https://github.com/ibara/oksh | | [`OpenJDK`](OpenJDK/) | OpenJDK | 17.0.6 | https://openjdk.java.net/ | | [`openrct2`](openrct2/) | OpenRCT2 | 0.4.4 | https://openrct2.org/ | diff --git a/Ports/ObjFW/package.sh b/Ports/ObjFW/package.sh index 6426248b387..91715ca40db 100755 --- a/Ports/ObjFW/package.sh +++ b/Ports/ObjFW/package.sh @@ -1,16 +1,17 @@ #!/usr/bin/env -S bash ../.port_include.sh - -port="ObjFW" -version="master" -commit="2903ecda7767a9563b6d3c74581b3920d32e6576" -useconfigure="true" +port='ObjFW' +version='2903ecda7767a9563b6d3c74581b3920d32e6576' +useconfigure='true' files=( - "https://github.com/ObjFW/ObjFW/archive/${commit}.tar.gz#ef5e3158e898415a9458f2c9a620b47f111b9a2af0bc8c48bcde4e13ae2b7727" + "https://github.com/ObjFW/ObjFW/archive/${version}.tar.gz#ef5e3158e898415a9458f2c9a620b47f111b9a2af0bc8c48bcde4e13ae2b7727" ) -workdir="ObjFW-${commit}" use_fresh_config_sub='true' -config_sub_paths=("build-aux/config.sub") -depends=("openssl") +config_sub_paths=( + 'build-aux/config.sub' +) +depends=( + 'openssl' +) # Only required for non-releases. pre_configure() { diff --git a/Ports/SDL2_image/package.sh b/Ports/SDL2_image/package.sh index c11f2510816..4d26d2ad9fc 100755 --- a/Ports/SDL2_image/package.sh +++ b/Ports/SDL2_image/package.sh @@ -1,20 +1,25 @@ #!/usr/bin/env -S bash ../.port_include.sh port='SDL2_image' -useconfigure='true' version='2.6.2' -depends=("SDL2" "libpng" "libjpeg" "libtiff") +useconfigure='true' +depends=( + 'libjpeg' + 'libpng' + 'libtiff' + 'SDL2' +) files=( "https://github.com/libsdl-org/SDL_image/releases/download/release-${version}/SDL2_image-${version}.tar.gz#48355fb4d8d00bac639cd1c4f4a7661c4afef2c212af60b340e06b7059814777" ) - configure() { run ./configure \ --host="${SERENITY_ARCH}-pc-serenity" \ --with-sdl-prefix="${SERENITY_INSTALL_ROOT}/usr/local" \ - --enable-webp=false --enable-webp-shared=false \ + --enable-webp='false' \ + --enable-webp-shared='false' \ --disable-static \ --enable-shared \ - LDFLAGS="-lgui -lgfx -lipc -lcore -lm" + LDFLAGS='-lgui -lgfx -lipc -lcore -lm' } build() { diff --git a/Ports/SDL2_mixer/package.sh b/Ports/SDL2_mixer/package.sh index b46e747a4a5..e2d47df1640 100755 --- a/Ports/SDL2_mixer/package.sh +++ b/Ports/SDL2_mixer/package.sh @@ -5,18 +5,24 @@ useconfigure='true' files=( "https://github.com/libsdl-org/SDL_mixer/releases/download/release-${version}/SDL2_mixer-${version}.tar.gz#8cdea810366decba3c33d32b8071bccd1c309b2499a54946d92b48e6922aa371" ) -depends=("libmodplug" "libmpg123" "libvorbis" "SDL2" "timidity") +depends=( + 'libmodplug' + 'libmpg123' + 'libvorbis' + 'SDL2' + 'timidity' +) configure() { export LIBS="-L${SERENITY_INSTALL_ROOT}/usr/local/lib" run ./configure \ --host="${SERENITY_ARCH}-pc-serenity" \ --with-sdl-prefix="${SERENITY_INSTALL_ROOT}/usr/local" \ - --enable-music-opus=false \ - --enable-music-opus-shared=false \ + --enable-music-opus='false' \ + --enable-music-opus-shared='false' \ --disable-static \ --enable-shared \ - EXTRA_LDFLAGS="-lgui -lgfx -lipc -lcore -lcompression" + EXTRA_LDFLAGS='-lgui -lgfx -lipc -lcore -lcompression' } post_configure() { diff --git a/Ports/SDL2_ttf/package.sh b/Ports/SDL2_ttf/package.sh index 6a66efd9cc5..98fd41f176b 100755 --- a/Ports/SDL2_ttf/package.sh +++ b/Ports/SDL2_ttf/package.sh @@ -5,15 +5,18 @@ useconfigure='true' files=( "https://github.com/libsdl-org/SDL_ttf/releases/download/release-${version}/SDL2_ttf-${version}.tar.gz#78cdad51f3cc3ada6932b1bb6e914b33798ab970a1e817763f22ddbfd97d0c57" ) -depends=("SDL2" "freetype") +depends=( + 'freetype' + 'SDL2' +) configure() { run ./configure \ --host="${SERENITY_ARCH}-pc-serenity" \ --with-sdl-prefix="${SERENITY_INSTALL_ROOT}/usr/local" \ - --with-x=no \ + --with-x='no' \ --disable-static \ --enable-shared \ FT2_CFLAGS="-I${SERENITY_INSTALL_ROOT}/usr/local/include/freetype2" \ - LIBS="-lgui -lgfx -lipc -lcore -lcompress" + LIBS='-lgui -lgfx -lipc -lcore -lcompress' } diff --git a/Ports/bdwgc/package.sh b/Ports/bdwgc/package.sh index 6a74910eb56..dafda53a296 100755 --- a/Ports/bdwgc/package.sh +++ b/Ports/bdwgc/package.sh @@ -1,16 +1,19 @@ #!/usr/bin/env -S bash ../.port_include.sh - port='bdwgc' version='8.2.2' use_fresh_config_sub='true' files=( - "https://github.com/ivmai/bdwgc/releases/download/v$version/gc-$version.tar.gz#f30107bcb062e0920a790ffffa56d9512348546859364c23a14be264b38836a0" + "https://github.com/ivmai/bdwgc/releases/download/v${version}/gc-${version}.tar.gz#f30107bcb062e0920a790ffffa56d9512348546859364c23a14be264b38836a0" ) -depends=("libatomic_ops") -workdir="gc-$version" - +depends=( + 'libatomic_ops' +) +workdir="gc-${version}" useconfigure='true' -configopts=("--enable-threads=posix") +configopts=( + '--enable-threads=posix' +) + pre_configure() { run ./autogen.sh } diff --git a/Ports/boost/package.sh b/Ports/boost/package.sh index ee6e8ab0514..584331a9c66 100755 --- a/Ports/boost/package.sh +++ b/Ports/boost/package.sh @@ -20,8 +20,11 @@ bjamopts=( ) configure() { - run ./bootstrap.sh --with-icu=${DESTDIR}/usr/local --prefix=${DESTDIR}/usr/local --without-libraries=python - echo "using gcc : : $CXX ;" >$workdir/user-config.jam + run ./bootstrap.sh \ + --with-icu="${DESTDIR}/usr/local" \ + --prefix="${DESTDIR}/usr/local" \ + --without-libraries='python' + echo "using gcc : : ${CXX} ;" > "${workdir}/user-config.jam" } build() { diff --git a/Ports/bzip3/package.sh b/Ports/bzip3/package.sh index bb41c848265..44effdd0a2e 100755 --- a/Ports/bzip3/package.sh +++ b/Ports/bzip3/package.sh @@ -5,7 +5,9 @@ files=( "https://github.com/kspalaiologos/bzip3/releases/download/${version}/bzip3-${version}.tar.gz#19e8d379f48610f945a04a988fd0c330ff6613b3df96405d56bed35a7d216dee" ) useconfigure='true' -installopts=("PREFIX=${SERENITY_INSTALL_ROOT}/usr/local") -configopts=( - "--disable-arch-native" +installopts=( + "PREFIX=${SERENITY_INSTALL_ROOT}/usr/local" +) +configopts=( + '--disable-arch-native' ) diff --git a/Ports/ca-certificates/package.sh b/Ports/ca-certificates/package.sh index 0432e35deb8..f1a0adb3c15 100755 --- a/Ports/ca-certificates/package.sh +++ b/Ports/ca-certificates/package.sh @@ -1,17 +1,17 @@ #!/usr/bin/env -S bash ../.port_include.sh -port=ca-certificates +port='ca-certificates' version=2022-04-26 files=( "https://curl.se/ca/cacert-${version}.pem#08df40e8f528ed283b0e480ba4bcdbfdd2fdcf695a7ada1668243072d80f8b6f" ) -workdir="." +workdir='.' configure() { - return + : } build() { - return + : } install() { diff --git a/Ports/ccache/package.sh b/Ports/ccache/package.sh index 20c0c6e49c6..6606c2c0fa3 100755 --- a/Ports/ccache/package.sh +++ b/Ports/ccache/package.sh @@ -5,12 +5,14 @@ useconfigure='true' files=( "https://github.com/ccache/ccache/releases/download/v${version}/ccache-${version}.tar.gz#f46ba3706ad80c30d4d5874dee2bf9227a7fcd0ccaac31b51919a3053d84bd05" ) -depends=('zstd') +depends=( + 'zstd' +) configopts=( "-DCMAKE_TOOLCHAIN_FILE=${SERENITY_BUILD_DIR}/CMakeToolchain.txt" - "-DCMAKE_BUILD_TYPE=Release" - "-DREDIS_STORAGE_BACKEND=OFF" - "-GNinja" + '-DCMAKE_BUILD_TYPE=Release' + '-DREDIS_STORAGE_BACKEND=OFF' + '-GNinja' ) configure() { diff --git a/Ports/composer/package.sh b/Ports/composer/package.sh index 80a75ac6703..9608ba62426 100755 --- a/Ports/composer/package.sh +++ b/Ports/composer/package.sh @@ -4,7 +4,9 @@ version='2.4.3' files=( "https://getcomposer.org/download/${version}/composer.phar#26d72f2790502bc9b22209e1cec1e0e43d33b368606ad227d327cccb388b609a" ) -depends=('php') +depends=( + 'php' +) build() { : diff --git a/Ports/coreutils/package.sh b/Ports/coreutils/package.sh index 988287b6d06..4517152a1ca 100755 --- a/Ports/coreutils/package.sh +++ b/Ports/coreutils/package.sh @@ -1,9 +1,11 @@ #!/usr/bin/env -S bash ../.port_include.sh -port=coreutils -version=9.1 -useconfigure="true" -use_fresh_config_sub="true" -config_sub_paths=("build-aux/config.sub") +port='coreutils' +version='9.1' +useconfigure='true' +use_fresh_config_sub='true' +config_sub_paths=( + 'build-aux/config.sub' +) files=( "https://ftpmirror.gnu.org/gnu/coreutils/coreutils-${version}.tar.gz#6055df9268603e8239a5c9c1d64cb25b9a992530df66e33b8d78a660edb37b35" ) @@ -14,4 +16,6 @@ files=( # - df requires one of the read_file_system_list implementations in gnulib/lib/mountlist.c # - pinky, users, and who require utmp # - nice is just something that doesn't exist -configopts+=("--enable-no-install-program=arch,coreutils,hostname,chcon,runcon,df,pinky,users,who,nice") +configopts+=( + '--enable-no-install-program=arch,coreutils,hostname,chcon,runcon,df,pinky,users,who,nice' +) diff --git a/Ports/curl/package.sh b/Ports/curl/package.sh index c766d7673a9..fce0dbb6f07 100755 --- a/Ports/curl/package.sh +++ b/Ports/curl/package.sh @@ -6,27 +6,27 @@ files=( "https://curl.se/download/curl-${version}.tar.bz2#080aaa5bef29ab3f592101e7a95f32ddbe88b92125cb28dde479d5a104928ea4" ) depends=( - 'ca-certificates' - 'openssl' - 'zlib' - 'zstd' + 'ca-certificates' + 'openssl' + 'zlib' + 'zstd' ) -configopts=("-DCMAKE_TOOLCHAIN_FILE=${SERENITY_BUILD_DIR}/CMakeToolchain.txt") configure() { mkdir -p curl-build - cmake -G Ninja \ - -S curl-${version} \ - -B curl-build \ - "${configopts[@]}" \ - -DCURL_USE_OPENSSL=ON \ - -DCURL_ZSTD=ON \ - -DCURL_CA_BUNDLE=/etc/ssl/certs/ca-certificates.crt \ - -DCURL_CA_PATH=none \ - -DCURL_DISABLE_NTLM=ON \ - -DCURL_DISABLE_SOCKETPAIR=ON \ - -DCURL_DISABLE_TESTS=ON \ - -DCURL_HIDDEN_SYMBOLS=OFF + cmake \ + -G Ninja \ + -S "curl-${version}" \ + -B curl-build \ + -DCMAKE_TOOLCHAIN_FILE="${SERENITY_BUILD_DIR}/CMakeToolchain.txt" \ + -DCURL_USE_OPENSSL='ON' \ + -DCURL_ZSTD='ON' \ + -DCURL_CA_BUNDLE='/etc/ssl/certs/ca-certificates.crt' \ + -DCURL_CA_PATH='none' \ + -DCURL_DISABLE_NTLM='ON' \ + -DCURL_DISABLE_SOCKETPAIR='ON' \ + -DCURL_DISABLE_TESTS='ON' \ + -DCURL_HIDDEN_SYMBOLS='OFF' } build() { diff --git a/Ports/diffutils/package.sh b/Ports/diffutils/package.sh index 9722168927c..6ca824839be 100755 --- a/Ports/diffutils/package.sh +++ b/Ports/diffutils/package.sh @@ -1,10 +1,14 @@ #!/usr/bin/env -S bash ../.port_include.sh -port=diffutils -version=3.8 +port='diffutils' +version='3.8' +depends=( + 'libiconv' +) files=( "https://ftpmirror.gnu.org/gnu/diffutils/diffutils-${version}.tar.xz#a6bdd7d1b31266d11c4f4de6c1b748d4607ab0231af5188fc2533d0ae2438fec" ) -useconfigure=true -use_fresh_config_sub=true -config_sub_paths=("build-aux/config.sub") -depends=("libiconv") +useconfigure='true' +use_fresh_config_sub='true' +config_sub_paths=( + 'build-aux/config.sub' +) diff --git a/Ports/ed/package.sh b/Ports/ed/package.sh index 97a222e94f5..9edf2ab34a3 100755 --- a/Ports/ed/package.sh +++ b/Ports/ed/package.sh @@ -1,12 +1,14 @@ #!/usr/bin/env -S bash ../.port_include.sh -port=ed -version=1.18 +port='ed' +version='1.18' files=( "https://ftpmirror.gnu.org/gnu/ed/ed-${version}.tar.lz#aca8efad9800c587724a20b97aa8fc47e6b5a47df81606feaba831b074462b4f" ) -useconfigure=true -depends=("pcre2") +useconfigure='true' +depends=( + 'pcre2' +) configure() { - run ./"$configscript" + run ./"${configscript}" } diff --git a/Ports/file/package.sh b/Ports/file/package.sh index 0d7878801a6..76b610a22ff 100755 --- a/Ports/file/package.sh +++ b/Ports/file/package.sh @@ -3,7 +3,6 @@ port='file' version='5.44' useconfigure='true' use_fresh_config_sub='true' -config_sub_paths=('config.sub') files=( "http://ftp.astron.com/pub/file/file-${version}.tar.gz#3751c7fba8dbc831cb8d7cc8aff21035459b8ce5155ef8b0880a27d028475f3b" ) diff --git a/Ports/flac/package.sh b/Ports/flac/package.sh index 856a73a1172..c32bf4f402a 100755 --- a/Ports/flac/package.sh +++ b/Ports/flac/package.sh @@ -2,7 +2,9 @@ port='flac' version='1.4.2' useconfigure='true' -depends=('libogg') +depends=( + 'libogg' +) files=( "https://downloads.xiph.org/releases/flac/flac-${version}.tar.xz#e322d58a1f48d23d9dd38f432672865f6f79e73a6f9cc5a5f57fcaa83eb5a8e4" ) diff --git a/Ports/fontconfig/package.sh b/Ports/fontconfig/package.sh index 23fbdacd308..5b5b0b2c024 100755 --- a/Ports/fontconfig/package.sh +++ b/Ports/fontconfig/package.sh @@ -1,21 +1,24 @@ #!/usr/bin/env -S bash ../.port_include.sh -port=fontconfig -version=2.14.0 -useconfigure="true" -use_fresh_config_sub="true" -depends=("libxml2" "freetype") +port='fontconfig' +version='2.14.0' +depends=( + 'freetype' + 'libxml2' +) files=( "https://www.freedesktop.org/software/fontconfig/release/fontconfig-${version}.tar.xz#dcbeb84c9c74bbfdb133d535fe1c7bedc9f2221a8daf3914b984c44c520e9bac" ) +useconfigure='true' +use_fresh_config_sub='true' configopts=( "--with-sysroot=${SERENITY_INSTALL_ROOT}" - "--prefix=/usr/local" - "--disable-static" - "--enable-shared" - "--enable-libxml2" - "LDFLAGS=-ldl -lxml2" + '--prefix=/usr/local' + '--disable-static' + '--enable-shared' + '--enable-libxml2' + 'LDFLAGS=-ldl -lxml2' ) export CFLAGS="-I${SERENITY_INSTALL_ROOT}/usr/local/include/libxml2" export LIBXML2_CFLAGS="-I${SERENITY_INSTALL_ROOT}/usr/local/include/libxml2/" -export LIBXML2_LIBS="-lxml2" +export LIBXML2_LIBS='-lxml2' diff --git a/Ports/freetype/package.sh b/Ports/freetype/package.sh index 268cfd70e05..5544af5def7 100755 --- a/Ports/freetype/package.sh +++ b/Ports/freetype/package.sh @@ -6,12 +6,14 @@ files=( ) useconfigure='true' use_fresh_config_sub='true' -config_sub_paths=("builds/unix/config.sub") +config_sub_paths=( + 'builds/unix/config.sub' +) configopts=( "--with-sysroot=${SERENITY_INSTALL_ROOT}" - "--with-brotli=no" - "--with-bzip2=no" - "--with-zlib=no" - "--with-harfbuzz=no" - "--with-png=no" + '--with-brotli=no' + '--with-bzip2=no' + '--with-zlib=no' + '--with-harfbuzz=no' + '--with-png=no' ) diff --git a/Ports/gawk/package.sh b/Ports/gawk/package.sh index 837368acf66..1d7b596c344 100755 --- a/Ports/gawk/package.sh +++ b/Ports/gawk/package.sh @@ -1,7 +1,7 @@ #!/usr/bin/env -S bash ../.port_include.sh -port=gawk -version=5.2.1 -useconfigure="true" +port='gawk' +version='5.2.1' +useconfigure='true' files=( "https://ftpmirror.gnu.org/gnu/gawk/gawk-${version}.tar.gz#529e7c8c6acf21ff3a6183f4d763c632810908989c24675c77995d51ac37b79c" ) diff --git a/Ports/git/package.sh b/Ports/git/package.sh index f8201a3d9e8..5eb638e91ba 100755 --- a/Ports/git/package.sh +++ b/Ports/git/package.sh @@ -5,11 +5,21 @@ files=( "https://mirrors.edge.kernel.org/pub/software/scm/git/git-${version}.tar.xz#b17a598fbf58729ef13b577465eb93b2d484df1201518b708b5044ff623bf46d" ) useconfigure='true' -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=( + 'curl' + 'zlib' +) build() { - run make "${makeopts[@]}" CURL_LDFLAGS="-lcurl -lssl -lcrypto -lz" + run make \ + "${makeopts[@]}" \ + CURL_LDFLAGS='-lcurl -lssl -lcrypto -lz' run make strip } @@ -26,11 +36,11 @@ post_install() { EOF } -export NO_PERL=YesPlease -export NO_PYTHON=YesPlease -export NO_EXPAT=YesPlease -export NO_TCLTK=YesPlease -export ac_cv_fread_reads_directories=no -export ac_cv_snprintf_returns_bogus=no -export ac_cv_iconv_omits_bom=no -export ac_cv_lib_curl_curl_global_init=yes +export NO_PERL='YesPlease' +export NO_PYTHON='YesPlease' +export NO_EXPAT='YesPlease' +export NO_TCLTK='YesPlease' +export ac_cv_fread_reads_directories='no' +export ac_cv_snprintf_returns_bogus='no' +export ac_cv_iconv_omits_bom='no' +export ac_cv_lib_curl_curl_global_init='yes' diff --git a/Ports/glib/package.sh b/Ports/glib/package.sh index 5017eefdcbd..f3156218a42 100755 --- a/Ports/glib/package.sh +++ b/Ports/glib/package.sh @@ -6,7 +6,8 @@ files=( ) useconfigure='true' configopts=( - '--cross-file' "${SERENITY_BUILD_DIR}/meson-cross-file.txt" + '--cross-file' + "${SERENITY_BUILD_DIR}/meson-cross-file.txt" ) depends=( 'gettext' @@ -18,8 +19,8 @@ depends=( configure() { # TODO: Figure out why GCC doesn't autodetect that libgcc_s is needed. - if [ "${SERENITY_TOOLCHAIN}" = "GNU" ]; then - export LDFLAGS="-lgcc_s" + if [ "${SERENITY_TOOLCHAIN}" = 'GNU' ]; then + export LDFLAGS='-lgcc_s' fi run meson _build "${configopts[@]}" diff --git a/Ports/gmp/package.sh b/Ports/gmp/package.sh index d9fd35d2486..bc8ae78c547 100755 --- a/Ports/gmp/package.sh +++ b/Ports/gmp/package.sh @@ -1,7 +1,7 @@ #!/usr/bin/env -S bash ../.port_include.sh -port=gmp -version=6.2.1 -useconfigure="true" +port='gmp' +version='6.2.1' +useconfigure='true' files=( "https://ftpmirror.gnu.org/gnu/gmp/gmp-${version}.tar.bz2#eae9326beb4158c386e39a356818031bd28f3124cf915f8c5b1dc4c7a36b4d7c" ) diff --git a/Ports/gnupg/package.sh b/Ports/gnupg/package.sh index 60ebd72e6c4..55fd8f687e0 100755 --- a/Ports/gnupg/package.sh +++ b/Ports/gnupg/package.sh @@ -1,19 +1,23 @@ #!/usr/bin/env -S bash ../.port_include.sh -port=gnupg -version=2.3.0 -useconfigure=true -use_fresh_config_sub=true -config_sub_paths=("build-aux/config.sub") -configopts=("--with-libgpg-error-prefix=${SERENITY_INSTALL_ROOT}/usr/local" - "--with-libgcrypt-prefix=${SERENITY_INSTALL_ROOT}/usr/local" - "--with-libassuan-prefix=${SERENITY_INSTALL_ROOT}/usr/local" - "--with-ntbtls-prefix=${SERENITY_INSTALL_ROOT}/usr/local" - "--with-npth-prefix=${SERENITY_INSTALL_ROOT}/usr/local" - "--disable-dirmngr") +port='gnupg' +version='2.3.0' +useconfigure='true' +use_fresh_config_sub='true' +config_sub_paths=( + 'build-aux/config.sub' +) files=( "https://gnupg.org/ftp/gcrypt/gnupg/gnupg-${version}.tar.bz2#84c1ef39e8621cfb70f31463a5d1d8edeab44332bc1e0e1af9b78b6f9ed05bb4" ) -depends=("libiconv" "libgpg-error" "libgcrypt" "libksba" "libassuan" "npth" "ntbtls") +depends=( + 'libassuan' + 'libgcrypt' + 'libgpg-error' + 'libiconv' + 'libksba' + 'npth' + 'ntbtls' +) pre_configure() { export GPGRT_CONFIG="${SERENITY_INSTALL_ROOT}/usr/local/bin/gpgrt-config" @@ -22,5 +26,13 @@ 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")" \ + --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 } diff --git a/Ports/grep/package.sh b/Ports/grep/package.sh index 5d7870676cb..d3f27f6cf4c 100755 --- a/Ports/grep/package.sh +++ b/Ports/grep/package.sh @@ -5,4 +5,6 @@ files=( "https://ftpmirror.gnu.org/gnu/grep/grep-${version}.tar.gz#de7b21d8e3348ea6569c6fd5734e90a31169ef62429ea3dce48a6fc1dd85d260" ) useconfigure='true' -configopts=("--disable-perl-regexp") +configopts=( + '--disable-perl-regexp' +) diff --git a/Ports/gzip/package.sh b/Ports/gzip/package.sh index 37be70f2923..1169a0d63b0 100755 --- a/Ports/gzip/package.sh +++ b/Ports/gzip/package.sh @@ -3,7 +3,9 @@ port='gzip' version='1.12' useconfigure='true' use_fresh_config_sub='true' -config_sub_paths=('build-aux/config.sub') +config_sub_paths=( + 'build-aux/config.sub' +) files=( "https://ftpmirror.gnu.org/gnu/gzip/gzip-${version}.tar.gz#5b4fb14d38314e09f2fc8a1c510e7cd540a3ea0e3eb9b0420046b82c3bf41085" ) diff --git a/Ports/imagemagick/package.sh b/Ports/imagemagick/package.sh index f0aa23d3fe7..0edd7be18e9 100755 --- a/Ports/imagemagick/package.sh +++ b/Ports/imagemagick/package.sh @@ -2,9 +2,15 @@ port='imagemagick' version='7.1.1-5' workdir="ImageMagick-${version}" -useconfigure="true" +useconfigure='true' files=( "https://github.com/ImageMagick/ImageMagick/archive/refs/tags/${version}.tar.gz#dd23689304b8cf41572c3af6b0ddccfe21c5b9d9abddaf978f314696408d0750" ) -configopts=("--with-sysroot=${SERENITY_INSTALL_ROOT}") -depends=("libpng" "libtiff" "libjpeg") +configopts=( + "--with-sysroot=${SERENITY_INSTALL_ROOT}" +) +depends=( + 'libjpeg' + 'libpng' + 'libtiff' +) diff --git a/Ports/isl/package.sh b/Ports/isl/package.sh index 799f5fa506d..7a52a1ad162 100755 --- a/Ports/isl/package.sh +++ b/Ports/isl/package.sh @@ -1,14 +1,16 @@ #!/usr/bin/env -S bash ../.port_include.sh -port=isl -version=0.24 -useconfigure=true -use_fresh_config_sub=true +port='isl' +version='0.24' +useconfigure='true' +use_fresh_config_sub='true' files=( "https://libisl.sourceforge.io/isl-${version}.tar.xz#043105cc544f416b48736fff8caf077fb0663a717d06b1113f16e391ac99ebad" ) -depends=("gmp") +depends=( + 'gmp' +) -if [ "$SERENITY_TOOLCHAIN" = "Clang" ]; then +if [ "$SERENITY_TOOLCHAIN" = 'Clang' ]; then # This test fails with Clang because it doesn't let you take the address of compiler intrinsics. - export ac_cv_have_decl___builtin_ffs=yes + export ac_cv_have_decl___builtin_ffs='yes' fi diff --git a/Ports/jdupes/package.sh b/Ports/jdupes/package.sh index a93991f20f7..7ec459abef9 100755 --- a/Ports/jdupes/package.sh +++ b/Ports/jdupes/package.sh @@ -4,9 +4,14 @@ version='1.26.1' files=( "https://github.com/jbruchon/jdupes/archive/refs/tags/v${version}.tar.gz#09153824320c65ad529f8f97cd3b7e792c50e9f9018192ea1a76f2e33a196225" ) -auth_type='sha256' -workdir="jdupes-${version}" -depends=('libjodycode') -makeopts+=("UNAME_S=serenity") -installopts+=('DISABLE_DEDUPE=1') -export LDFLAGS="-z noexecstack" +depends=( + 'libjodycode' +) +makeopts+=( + 'UNAME_S=serenity' +) +installopts+=( + 'DISABLE_DEDUPE=1' +) + +export LDFLAGS='-z noexecstack' diff --git a/Ports/kakoune/package.sh b/Ports/kakoune/package.sh index 874b561b52b..c5fec0bee4c 100755 --- a/Ports/kakoune/package.sh +++ b/Ports/kakoune/package.sh @@ -4,7 +4,10 @@ version='24d6072353f7c7e7cac84b4eb085036a8c852f96' files=( "https://github.com/mawww/kakoune/archive/${version}.tar.gz#16440b204770972f318e24e4e178ada474b7cfeb029cefa69e9ff035700a129e" ) -depends=("bash" "sed") +depends=( + 'bash' + 'sed' +) makeopts+=( "LDFLAGS=-L${DESTDIR}/usr/local/lib" ) diff --git a/Ports/less/package.sh b/Ports/less/package.sh index 245047afd03..285725a6ab5 100755 --- a/Ports/less/package.sh +++ b/Ports/less/package.sh @@ -1,13 +1,15 @@ #!/usr/bin/env -S bash ../.port_include.sh -port=less -version=590 -useconfigure="true" +port='less' +version='590' +useconfigure='true' files=( "https://ftpmirror.gnu.org/gnu/less/less-${version}.tar.gz#6aadf54be8bf57d0e2999a3c5d67b1de63808bb90deb8f77b028eafae3a08e10" ) -depends=("ncurses") +depends=( + 'ncurses' +) post_configure() { - run_replace_in_file "s/#define HAVE_WCTYPE 1/\/* #undef HAVE_WCTYPE *\//" defines.h + run_replace_in_file 's/#define HAVE_WCTYPE 1/\/* #undef HAVE_WCTYPE *\//' defines.h run touch stamp-h # prevent config.status from overwriting our changes } diff --git a/Ports/libarchive/package.sh b/Ports/libarchive/package.sh index 209ff0acf73..7f098833b59 100755 --- a/Ports/libarchive/package.sh +++ b/Ports/libarchive/package.sh @@ -1,13 +1,20 @@ #!/usr/bin/env -S bash ../.port_include.sh -port=libarchive -version=3.6.1 -useconfigure=true -use_fresh_config_sub=true -config_sub_paths=("build/autoconf/config.sub") -configopts=("--without-xml2") +port='libarchive' +version='3.6.1' +useconfigure='true' +use_fresh_config_sub='true' +config_sub_paths=( + 'build/autoconf/config.sub' +) +configopts=( + '--without-xml2' +) files=( "https://libarchive.org/downloads/libarchive-${version}.tar.gz#c676146577d989189940f1959d9e3980d28513d74eedfbc6b7f15ea45fe54ee2" ) -depends=("zlib" "pcre") +depends=( + 'pcre' + 'zlib' +) -export ac_cv_header_regex_h=no +export ac_cv_header_regex_h='no' diff --git a/Ports/libassuan/package.sh b/Ports/libassuan/package.sh index b2eff85b991..668bac960f3 100755 --- a/Ports/libassuan/package.sh +++ b/Ports/libassuan/package.sh @@ -1,21 +1,27 @@ #!/usr/bin/env -S bash ../.port_include.sh -port=libassuan -version=2.5.5 -useconfigure=true -use_fresh_config_sub=true -config_sub_paths=("build-aux/config.sub") -depends=("libgpg-error") +port='libassuan' +version='2.5.5' +useconfigure='true' +use_fresh_config_sub='true' +config_sub_paths=( + 'build-aux/config.sub' +) +depends=( + 'libgpg-error' +) files=( "https://gnupg.org/ftp/gcrypt/libassuan/libassuan-${version}.tar.bz2#8e8c2fcc982f9ca67dcbb1d95e2dc746b1739a4668bc20b3a3c5be632edb34e4" ) -configopts=( - "--with-libgpg-error-prefix=${SERENITY_INSTALL_ROOT}/usr/local" -) pre_configure() { - export ac_cv_lib_pthread_pthread_create=no + export ac_cv_lib_pthread_pthread_create='no' } configure() { - run ./configure --host="${SERENITY_ARCH}-pc-serenity" --build="$($workdir/build-aux/config.guess)" --disable-static --enable-shared "${configopts[@]}" + run ./configure \ + --host="${SERENITY_ARCH}-pc-serenity" \ + --build="$("${workdir}/build-aux/config.guess")" \ + --disable-static \ + --enable-shared \ + --with-libgpg-error-prefix="${SERENITY_INSTALL_ROOT}/usr/local" } diff --git a/Ports/libatomic_ops/package.sh b/Ports/libatomic_ops/package.sh index f7d0d2cd429..e8d3c3f216f 100755 --- a/Ports/libatomic_ops/package.sh +++ b/Ports/libatomic_ops/package.sh @@ -1,9 +1,8 @@ #!/usr/bin/env -S bash ../.port_include.sh - -port=libatomic_ops -version=7.6.12 -useconfigure=true -use_fresh_config_sub=true +port='libatomic_ops' +version='7.6.12' +useconfigure='true' +use_fresh_config_sub='true' files=( "https://www.hboehm.info/gc/gc_source/libatomic_ops-${version}.tar.gz#f0ab566e25fce08b560e1feab6a3db01db4a38e5bc687804334ef3920c549f3e" ) diff --git a/Ports/libexpat/package.sh b/Ports/libexpat/package.sh index fdfd17f9b85..1897300578d 100755 --- a/Ports/libexpat/package.sh +++ b/Ports/libexpat/package.sh @@ -1,10 +1,12 @@ #!/usr/bin/env -S bash ../.port_include.sh -port=libexpat -version=2.4.8 -useconfigure=true -use_fresh_config_sub=true -config_sub_paths=("conftools/config.sub") +port='libexpat' +version='2.4.8' +useconfigure='true' +use_fresh_config_sub='true' +config_sub_paths=( + 'conftools/config.sub' +) files=( "https://github.com/libexpat/libexpat/releases/download/R_${version//./_}/expat-${version}.tar.xz#f79b8f904b749e3e0d20afeadecf8249c55b2e32d4ebb089ae378df479dcaf25" ) -workdir=expat-${version} +workdir="expat-${version}" diff --git a/Ports/libffi/package.sh b/Ports/libffi/package.sh index 5f7f87ab34e..f4ad6cd531b 100755 --- a/Ports/libffi/package.sh +++ b/Ports/libffi/package.sh @@ -1,8 +1,8 @@ #!/usr/bin/env -S bash ../.port_include.sh -port=libffi -version=3.4.2 -useconfigure=true -use_fresh_config_sub=true +port='libffi' +version='3.4.2' +useconfigure='true' +use_fresh_config_sub='true' files=( "https://github.com/libffi/libffi/releases/download/v${version}/libffi-${version}.tar.gz#540fb721619a6aba3bdeef7d940d8e9e0e6d2c193595bc243241b77ff9e93620" ) diff --git a/Ports/libgcrypt/package.sh b/Ports/libgcrypt/package.sh index 60fc7a33c56..a98c9ee5c52 100755 --- a/Ports/libgcrypt/package.sh +++ b/Ports/libgcrypt/package.sh @@ -1,19 +1,25 @@ #!/usr/bin/env -S bash ../.port_include.sh -port=libgcrypt -version=1.10.1 -useconfigure=true -use_fresh_config_sub=true -config_sub_paths=("build-aux/config.sub") -configopts=("--with-libgpg-error-prefix=${SERENITY_INSTALL_ROOT}/usr/local") -depends=("libgpg-error") +port='libgcrypt' +version='1.10.1' +useconfigure='true' +use_fresh_config_sub='true' +config_sub_paths=( + 'build-aux/config.sub' +) +depends=( + 'libgpg-error' +) files=( "https://gnupg.org/ftp/gcrypt/libgcrypt/libgcrypt-${version}.tar.bz2#ef14ae546b0084cd84259f61a55e07a38c3b53afc0f546bffcef2f01baffe9de" ) pre_configure() { - export ac_cv_lib_pthread_pthread_create=no + export ac_cv_lib_pthread_pthread_create='no' } 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")" \ + --with-libgpg-error-prefix="${SERENITY_INSTALL_ROOT}/usr/local" } diff --git a/Ports/libgpg-error/package.sh b/Ports/libgpg-error/package.sh index 8b70a6bf111..35240b7b460 100755 --- a/Ports/libgpg-error/package.sh +++ b/Ports/libgpg-error/package.sh @@ -6,10 +6,17 @@ files=( ) useconfigure='true' use_fresh_config_sub='true' -config_sub_paths=("build-aux/config.sub") -depends=("gettext") -configopts=("--disable-tests" "--disable-threads") +config_sub_paths=( + 'build-aux/config.sub' +) +depends=( + 'gettext' +) 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")" \ + --disable-tests \ + --disable-threads } diff --git a/Ports/libicu/package.sh b/Ports/libicu/package.sh index 19749195d63..88c2693bba4 100755 --- a/Ports/libicu/package.sh +++ b/Ports/libicu/package.sh @@ -1,9 +1,9 @@ #!/usr/bin/env -S bash ../.port_include.sh -port=libicu -version=69.1 -useconfigure=true -use_fresh_config_sub=true -workdir=icu/source +port='libicu' +version='69.1' +useconfigure='true' +use_fresh_config_sub='true' +workdir='icu/source' files=( "https://github.com/unicode-org/icu/releases/download/release-${version//./-}/icu4c-${version//./_}-src.tgz#4cba7b7acd1d3c42c44bb0c14be6637098c7faf2b330ce876bc5f3b915d09745" ) @@ -11,10 +11,12 @@ files=( 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" "--with-cross-build=$(pwd)/${workdir}/../host-build" + run ./configure \ + --host="${SERENITY_ARCH}-pc-serenity" \ + --with-cross-build="$(pwd)/${workdir}/../host-build" } -export CFLAGS="-DU_HAVE_NL_LANGINFO_CODESET=0" -export CXXFLAGS="-DU_HAVE_NL_LANGINFO_CODESET=0" +export CFLAGS='-DU_HAVE_NL_LANGINFO_CODESET=0' +export CXXFLAGS='-DU_HAVE_NL_LANGINFO_CODESET=0' diff --git a/Ports/libksba/package.sh b/Ports/libksba/package.sh index 09997a3d0ec..21607bcdfb2 100755 --- a/Ports/libksba/package.sh +++ b/Ports/libksba/package.sh @@ -1,21 +1,25 @@ #!/usr/bin/env -S bash ../.port_include.sh -port=libksba -version=1.5.1 -useconfigure=true -use_fresh_config_sub=true -config_sub_paths=("build-aux/config.sub") -depends=("libgpg-error") +port='libksba' +version='1.5.1' +useconfigure='true' +use_fresh_config_sub='true' +config_sub_paths=( + 'build-aux/config.sub' +) +depends=( + 'libgpg-error' +) files=( "https://gnupg.org/ftp/gcrypt/libksba/libksba-${version}.tar.bz2#b0f4c65e4e447d9a2349f6b8c0e77a28be9531e4548ba02c545d1f46dc7bf921" ) -configopts=( - "--with-libgpg-error-prefix=${SERENITY_INSTALL_ROOT}/usr/local" -) pre_configure() { - export ksba_cv_gcc_has_f_visibility=no + export ksba_cv_gcc_has_f_visibility='no' } 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")" \ + --with-libgpg-error-prefix="${SERENITY_INSTALL_ROOT}/usr/local" } diff --git a/Ports/libmpg123/package.sh b/Ports/libmpg123/package.sh index 1604c39644a..701f1bb7ef6 100755 --- a/Ports/libmpg123/package.sh +++ b/Ports/libmpg123/package.sh @@ -1,10 +1,12 @@ #!/usr/bin/env -S bash ../.port_include.sh -port=libmpg123 -version=1.29.3 -useconfigure=true -workdir=mpg123-${version} -use_fresh_config_sub=true -config_sub_paths=("build/config.sub") +port='libmpg123' +version='1.29.3' +useconfigure='true' +workdir="mpg123-${version}" +use_fresh_config_sub='true' +config_sub_paths=( + 'build/config.sub' +) files=( "https://download.sourceforge.net/project/mpg123/mpg123/${version}/mpg123-${version}.tar.bz2#963885d8cc77262f28b77187c7d189e32195e64244de2530b798ddf32183e847" ) diff --git a/Ports/libopenal/package.sh b/Ports/libopenal/package.sh index 472186b908f..5e0500cb9c6 100755 --- a/Ports/libopenal/package.sh +++ b/Ports/libopenal/package.sh @@ -1,9 +1,11 @@ #!/usr/bin/env -S bash ../.port_include.sh -port=libopenal -useconfigure=true -version=1.21.1 +port='libopenal' +version='1.21.1' workdir="openal-soft-${version}" -depends=('SDL2') +depends=( + 'SDL2' +) +useconfigure='true' configopts=( "-DCMAKE_TOOLCHAIN_FILE=${SERENITY_BUILD_DIR}/CMakeToolchain.txt" '-DALSOFT_NO_CONFIG_UTIL=ON' diff --git a/Ports/libpng/package.sh b/Ports/libpng/package.sh index b2c88095f57..95caad4cca3 100755 --- a/Ports/libpng/package.sh +++ b/Ports/libpng/package.sh @@ -2,9 +2,14 @@ port='libpng' version='1.6.39' useconfigure='true' -configopts=("--disable-static" "--enable-shared") +configopts=( + '--disable-static' + '--enable-shared' +) use_fresh_config_sub='true' files=( "https://download.sourceforge.net/libpng/libpng-${version}.tar.gz#af4fb7f260f839919e5958e5ab01a275d4fe436d45442a36ee62f73e5beb75ba" ) -depends=("zlib") +depends=( + 'zlib' +) diff --git a/Ports/libtiff/package.sh b/Ports/libtiff/package.sh index 0540ec99b7c..d1b66aa7ed5 100755 --- a/Ports/libtiff/package.sh +++ b/Ports/libtiff/package.sh @@ -7,9 +7,13 @@ files=( useconfigure='true' configopts=( "--with-sysroot=${SERENITY_INSTALL_ROOT}" - "--prefix=/usr/local" - "--disable-static" - "--enable-shared" + '--prefix=/usr/local' + '--disable-static' + '--enable-shared' ) workdir="tiff-${version}" -depends=("libjpeg" "zstd" "xz") +depends=( + 'libjpeg' + 'xz' + 'zstd' +) diff --git a/Ports/libunistring/package.sh b/Ports/libunistring/package.sh index c2349a6b884..cdd03416287 100755 --- a/Ports/libunistring/package.sh +++ b/Ports/libunistring/package.sh @@ -1,8 +1,7 @@ #!/usr/bin/env -S bash ../.port_include.sh -port=libunistring -version=1.0 +port='libunistring' +version='1.0' files=( "https://ftpmirror.gnu.org/gnu/libunistring/libunistring-${version}.tar.gz#3c0184c0e492d7c208ce31d25dd1d2c58f0c3ed6cbbe032c5b248cddad318544" ) - -useconfigure=true +useconfigure='true' diff --git a/Ports/libuuid/package.sh b/Ports/libuuid/package.sh index 29fac41b449..a44158c6612 100755 --- a/Ports/libuuid/package.sh +++ b/Ports/libuuid/package.sh @@ -1,5 +1,4 @@ #!/usr/bin/env -S bash ../.port_include.sh - port='libuuid' version='2.38' workdir="util-linux-${version}" diff --git a/Ports/libxml2/package.sh b/Ports/libxml2/package.sh index c50be23da2e..c2647b3f952 100755 --- a/Ports/libxml2/package.sh +++ b/Ports/libxml2/package.sh @@ -6,5 +6,14 @@ files=( ) useconfigure='true' use_fresh_config_sub='true' -configopts=("--with-sysroot=${SERENITY_INSTALL_ROOT}" "--prefix=/usr/local" "--without-python" "--disable-static" "--enable-shared") -depends=("libiconv" "xz") +configopts=( + "--with-sysroot=${SERENITY_INSTALL_ROOT}" + '--prefix=/usr/local' + '--without-python' + '--disable-static' + '--enable-shared' +) +depends=( + 'libiconv' + 'xz' +) diff --git a/Ports/libzip/package.sh b/Ports/libzip/package.sh index 5f53f92f148..14cf60d0740 100755 --- a/Ports/libzip/package.sh +++ b/Ports/libzip/package.sh @@ -5,12 +5,13 @@ files=( "https://libzip.org/download/libzip-${version}.tar.gz#30ee55868c0a698d3c600492f2bea4eb62c53849bcf696d21af5eb65f3f3839e" ) useconfigure='true' -configopts=("-DCMAKE_TOOLCHAIN_FILE=${SERENITY_BUILD_DIR}/CMakeToolchain.txt") -depends=("zlib") -workdir="libzip-${version}" +depends=( + 'zlib' +) configure() { - run cmake "${configopts[@]}" + run cmake \ + -DCMAKE_TOOLCHAIN_FILE="${SERENITY_BUILD_DIR}/CMakeToolchain.txt" } install() { diff --git a/Ports/lua/package.sh b/Ports/lua/package.sh index 41b6672a9cd..41cc96b7a12 100755 --- a/Ports/lua/package.sh +++ b/Ports/lua/package.sh @@ -4,11 +4,12 @@ version='5.4.4' files=( "http://www.lua.org/ftp/lua-${version}.tar.gz#164c7849653b80ae67bec4b7473b884bf5cc8d2dca05653475ec2ed27b9ebf61" ) -depends=("readline") -makeopts=( - "-Csrc/" - "-j$(nproc)" - "serenity" +depends=( + 'readline' +) +makeopts+=( + '-Csrc/' + 'serenity' "CC=${CC}" "AR=${AR}" "RANLIB=${RANLIB}" diff --git a/Ports/mawk/package.sh b/Ports/mawk/package.sh index f54555ef6fc..872fa709fa1 100755 --- a/Ports/mawk/package.sh +++ b/Ports/mawk/package.sh @@ -1,11 +1,11 @@ #!/usr/bin/env -S bash ../.port_include.sh -port=mawk -version=1.3.4-20200120 +port='mawk' +version='1.3.4-20200120' files=( "https://invisible-mirror.net/archives/mawk/mawk-${version}.tgz#7fd4cd1e1fae9290fe089171181bbc6291dfd9bca939ca804f0ddb851c8b8237" ) -useconfigure=true -use_fresh_config_sub=true +useconfigure='true' +use_fresh_config_sub='true' 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 262d5d193c4..f2e9a4b63d8 100755 --- a/Ports/mbedtls/package.sh +++ b/Ports/mbedtls/package.sh @@ -5,9 +5,12 @@ files=( "https://github.com/Mbed-TLS/mbedtls/archive/refs/tags/v${version}.tar.gz#b02df6f68dd1537e115a8497d5c173dc71edc55ad084756e57a30f951b725acd" ) makeopts=( - "SHARED=1" + 'SHARED=1' ) install() { - run make DESTDIR="${SERENITY_INSTALL_ROOT}/usr/local" "${installopts[@]}" install + run make \ + DESTDIR="${SERENITY_INSTALL_ROOT}/usr/local" \ + "${installopts[@]}" \ + install } diff --git a/Ports/mpc/package.sh b/Ports/mpc/package.sh index c9097e6cba9..c070b77cc33 100755 --- a/Ports/mpc/package.sh +++ b/Ports/mpc/package.sh @@ -1,11 +1,19 @@ #!/usr/bin/env -S bash ../.port_include.sh -port=mpc -version=1.2.1 -useconfigure=true -use_fresh_config_sub=true -config_sub_paths=("build-aux/config.sub") -configopts=("--target=${SERENITY_ARCH}-pc-serenity" "--with-sysroot=${SERENITY_INSTALL_ROOT}") +port='mpc' +version='1.2.1' +useconfigure='true' +use_fresh_config_sub='true' +config_sub_paths=( + 'build-aux/config.sub' +) +configopts=( + "--target=${SERENITY_ARCH}-pc-serenity" + "--with-sysroot=${SERENITY_INSTALL_ROOT}" +) files=( "https://ftpmirror.gnu.org/gnu/mpc/mpc-${version}.tar.gz#17503d2c395dfcf106b622dc142683c1199431d095367c6aacba6eec30340459" ) -depends=("gmp" "mpfr") +depends=( + 'gmp' + 'mpfr' +) diff --git a/Ports/mpfr/package.sh b/Ports/mpfr/package.sh index a304d200112..1df494532a0 100755 --- a/Ports/mpfr/package.sh +++ b/Ports/mpfr/package.sh @@ -1,10 +1,15 @@ #!/usr/bin/env -S bash ../.port_include.sh -port=mpfr -version=4.1.0 -useconfigure=true -use_fresh_config_sub=true -configopts=("--target=${SERENITY_ARCH}-pc-serenity" "--with-sysroot=/") +port='mpfr' +version='4.1.0' +useconfigure='true' +use_fresh_config_sub='true' +configopts=( + "--target=${SERENITY_ARCH}-pc-serenity" + '--with-sysroot=/' +) files=( "https://ftpmirror.gnu.org/gnu/mpfr/mpfr-${version}.tar.xz#0c98a3f1732ff6ca4ea690552079da9c597872d30e96ec28414ee23c95558a7f" ) -depends=("gmp") +depends=( + 'gmp' +) diff --git a/Ports/ncurses/package.sh b/Ports/ncurses/package.sh index b0c6112c42f..094cd92086e 100755 --- a/Ports/ncurses/package.sh +++ b/Ports/ncurses/package.sh @@ -1,16 +1,16 @@ #!/usr/bin/env -S bash ../.port_include.sh -port=ncurses -version=6.3 -useconfigure=true +port='ncurses' +version='6.3' +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" - "--enable-widec" + '--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' + '--enable-widec' ) files=( "https://invisible-mirror.net/archives/ncurses/ncurses-${version}.tar.gz#97fc51ac2b085d4cde31ef4d2c3122c21abc217e9090a43a30fc5ec21684e059" @@ -20,7 +20,7 @@ check_tic_version() { local tic_path="$1" # "ncurses A.B.C" -> "A.B.C" -> "A" - local major_version="$($tic_path -V | cut -d ' ' -f2 | cut -d '.' -f1)" + local major_version="$("${tic_path}" -V | cut -d ' ' -f2 | cut -d '.' -f1)" [ "$major_version" -ge 6 ] } @@ -35,18 +35,18 @@ get_tic_path() { # and https://lists.gnu.org/archive/html/bug-ncurses/2019-07/msg00020.html. if command -v tic >/dev/null; then - if check_tic_version "tic"; then - echo "tic" + if check_tic_version 'tic'; then + echo 'tic' return 0 else # Check for Homebrew installation. if command -v brew >/dev/null; then - local cellar_path=$(brew --cellar ncurses) - local highest_version=$(ls "$cellar_path" | head -1) - local tic_path="$cellar_path/$highest_version/bin/tic" + local cellar_path="$(brew --cellar ncurses)" + local highest_version="$(ls "${cellar_path}" | head -1)" + local tic_path="${cellar_path}/${highest_version}/bin/tic" - if check_tic_version "$tic_path"; then - echo "$tic_path" + if check_tic_version "${tic_path}"; then + echo "${tic_path}" return 0 fi fi @@ -57,20 +57,20 @@ get_tic_path() { } pre_configure() { - export CPPFLAGS="-P" + export CPPFLAGS='-P' } install() { - local tic_path=$(get_tic_path) + local tic_path="$(get_tic_path)" if [ ! $? ]; then - echo "Error: installing cross-compiled ncurses requires locally installed ncurses >= 6.0" + echo 'Error: installing cross-compiled ncurses requires locally installed ncurses >= 6.0' exit 1 fi - echo "Using $tic_path from $($tic_path -V)" + echo "Using ${tic_path} from $(${tic_path} -V)" - export TIC_PATH="$tic_path" - run make DESTDIR=$DESTDIR "${installopts[@]}" install + export TIC_PATH="${tic_path}" + run make DESTDIR="${DESTDIR}" "${installopts[@]}" install } post_install() { @@ -81,7 +81,7 @@ post_install() { # Compatibility symlinks for non-w libraries. for lib in form menu ncurses ncurses++ panel tinfo tic curses; do - ln -svf lib${lib}w.so "${SERENITY_INSTALL_ROOT}/usr/local/lib/lib${lib}.so" + ln -svf "lib${lib}w.so" "${SERENITY_INSTALL_ROOT}/usr/local/lib/lib${lib}.so" done # Compatibility symlink for the include folder. @@ -92,6 +92,6 @@ post_install() { # Compatibility symlink for ports that expect `/usr/local/include/curses.h` and friends. # FIXME: Is there a logical explanation for all of this? If so, we should clean it up at some point. for file in $(ls "${SERENITY_INSTALL_ROOT}/usr/local/include/ncursesw"); do - ln -svf ncursesw/${file} "${SERENITY_INSTALL_ROOT}/usr/local/include/${file}" + ln -svf "ncursesw/${file}" "${SERENITY_INSTALL_ROOT}/usr/local/include/${file}" done } diff --git a/Ports/ntbtls/package.sh b/Ports/ntbtls/package.sh index ba55ad463f0..c0d385e4224 100755 --- a/Ports/ntbtls/package.sh +++ b/Ports/ntbtls/package.sh @@ -1,26 +1,33 @@ #!/usr/bin/env -S bash ../.port_include.sh -port=ntbtls -version=0.2.0 -useconfigure=true -use_fresh_config_sub=true -config_sub_paths=("build-aux/config.sub") -depends=("libgpg-error" "libksba" "libgcrypt" "zlib") +port='ntbtls' +version='0.2.0' +useconfigure='true' +use_fresh_config_sub='true' +config_sub_paths=( + 'build-aux/config.sub' +) +depends=( + 'libgcrypt' + 'libgpg-error' + 'libksba' + 'zlib' +) files=( "https://gnupg.org/ftp/gcrypt/ntbtls/ntbtls-${version}.tar.bz2#649fe74a311d13e43b16b26ebaa91665ddb632925b73902592eac3ed30519e17" ) -configopts=( - "--with-libgcrypt-prefix=${SERENITY_INSTALL_ROOT}/usr/local" - "--with-libgpg-error-prefix=${SERENITY_INSTALL_ROOT}/usr/local" - # It's documented as "--with-libksba-prefix" (note the "lib"), but if it is set it is - # immediately overwritten by whatever is given through "--with-ksba-prefix", - # EVEN IF the latter switch is not given, thus overwriting it with the empty string. - "--with-ksba-prefix=${SERENITY_INSTALL_ROOT}/usr/local" -) pre_configure() { - export ntbtls_cv_gcc_has_f_visibility=no + export ntbtls_cv_gcc_has_f_visibility='no' } 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")" \ + --with-libgcrypt-prefix="${SERENITY_INSTALL_ROOT}/usr/local" \ + --with-libgpg-error-prefix="${SERENITY_INSTALL_ROOT}/usr/local" \ + --with-ksba-prefix="${SERENITY_INSTALL_ROOT}/usr/local" + # It's documented as "--with-libksba-prefix" (note the "lib"), but if it is set it is + # immediately overwritten by whatever is given through "--with-ksba-prefix", + # EVEN IF the latter switch is not given, thus overwriting it with the empty string. } diff --git a/Ports/openrct2/package.sh b/Ports/openrct2/package.sh index 4eab3d315a5..cbe1367499f 100755 --- a/Ports/openrct2/package.sh +++ b/Ports/openrct2/package.sh @@ -23,14 +23,6 @@ files=( ) useconfigure='true' workdir="OpenRCT2-${version}" -configopts=( - "-DCMAKE_TOOLCHAIN_FILE=${SERENITY_BUILD_DIR}/CMakeToolchain.txt" - "-DCMAKE_INSTALL_PREFIX=${DESTDIR}/usr/local/" - "-DCMAKE_BUILD_TYPE=Release" - "-DDISABLE_DISCORD_RPC=ON" - "-DDISABLE_GOOGLE_BENCHMARK=ON" - "-DWITH_TESTS=OFF" - "-DDISABLE_OPENGL=ON") icon_file='resources/logo/icon_x16.png' launcher_name='OpenRCT2' launcher_category='Games' @@ -39,7 +31,16 @@ launcher_command='/usr/local/bin/openrct2' configure() { mkdir -p "${PORT_BUILD_DIR}/OpenRCT2-${version}-build" cd "${PORT_BUILD_DIR}/OpenRCT2-${version}-build" - cmake -G Ninja "${configopts[@]}" "${PORT_BUILD_DIR}/OpenRCT2-${version}" + cmake \ + -G Ninja \ + -DCMAKE_TOOLCHAIN_FILE="${SERENITY_BUILD_DIR}/CMakeToolchain.txt" \ + -DCMAKE_INSTALL_PREFIX="${DESTDIR}/usr/local/" \ + -DCMAKE_BUILD_TYPE='Release' \ + -DDISABLE_DISCORD_RPC='ON' \ + -DDISABLE_GOOGLE_BENCHMARK='ON' \ + -DWITH_TESTS='OFF' \ + -DDISABLE_OPENGL='ON' \ + "${PORT_BUILD_DIR}/OpenRCT2-${version}" } build() { diff --git a/Ports/openssl/package.sh b/Ports/openssl/package.sh index e523f7f306d..6ee566e4706 100755 --- a/Ports/openssl/package.sh +++ b/Ports/openssl/package.sh @@ -22,11 +22,11 @@ configopts=( configure() { export LDFLAGS="-L${SERENITY_INSTALL_ROOT}/usr/local/lib" - 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/pcre/package.sh b/Ports/pcre/package.sh index 049f79b71da..78f51d5a339 100755 --- a/Ports/pcre/package.sh +++ b/Ports/pcre/package.sh @@ -1,8 +1,8 @@ #!/usr/bin/env -S bash ../.port_include.sh -port=pcre -version=8.45 -useconfigure=true -use_fresh_config_sub=true +port='pcre' +version='8.45' +useconfigure='true' +use_fresh_config_sub='true' files=( "https://downloads.sourceforge.net/project/pcre/pcre/${version}/pcre-${version}.tar.gz#4e6ce03e0336e8b4a3d6c2b70b1c5e18590a5673a98186da90d4f33c23defc09" ) diff --git a/Ports/pkgconf/package.sh b/Ports/pkgconf/package.sh index 76e9d295e13..ad1dad27773 100755 --- a/Ports/pkgconf/package.sh +++ b/Ports/pkgconf/package.sh @@ -1,13 +1,16 @@ #!/usr/bin/env -S bash ../.port_include.sh -port=pkgconf -version=1.8.0 +port='pkgconf' +version='1.8.0' files=( "https://distfiles.ariadne.space/pkgconf/pkgconf-${version}.tar.xz#ef9c7e61822b7cb8356e6e9e1dca58d9556f3200d78acab35e4347e9d4c2bbaf" ) -useconfigure=true -use_fresh_config_sub=true +useconfigure='true' +use_fresh_config_sub='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/pt2-clone/package.sh b/Ports/pt2-clone/package.sh index 2b23b3c7a6d..16f56598a4f 100755 --- a/Ports/pt2-clone/package.sh +++ b/Ports/pt2-clone/package.sh @@ -5,11 +5,13 @@ files=( "https://github.com/8bitbubsy/pt2-clone/archive/v${version}.tar.gz#c2e796b25aba625551c50b2c0743ccc83b007d2eeac2f5eaad870b60f5a1554b" ) useconfigure='true' -configopts=("-DCMAKE_TOOLCHAIN_FILE=${SERENITY_BUILD_DIR}/CMakeToolchain.txt") -depends=("SDL2") +depends=( + 'SDL2' +) configure() { - run cmake "${configopts[@]}" + run cmake \ + -DCMAKE_TOOLCHAIN_FILE="${SERENITY_BUILD_DIR}/CMakeToolchain.txt" } install() { diff --git a/Ports/qoi/package.sh b/Ports/qoi/package.sh index 5b2e7846279..a2c1ec5e273 100755 --- a/Ports/qoi/package.sh +++ b/Ports/qoi/package.sh @@ -4,7 +4,10 @@ version='edb8d7b1140be3168cc99ed87edc605c7c1cf31f' files=( "https://github.com/phoboslab/qoi/archive/${version}.zip#3d3df95fb0b59aca2113ce45396f887eaba1be914cd54b56804efc241f93f203" ) -depends=('libpng' 'stb') +depends=( + 'libpng' + 'stb' +) install() { run cp qoibench "${SERENITY_INSTALL_ROOT}/bin" diff --git a/Ports/r0/package.sh b/Ports/r0/package.sh index 2a2a75c1088..fa6c67579d6 100755 --- a/Ports/r0/package.sh +++ b/Ports/r0/package.sh @@ -1,9 +1,6 @@ #!/usr/bin/env -S bash ../.port_include.sh -port=r0 -version=0.8 -useconfigure=false -workdir=$port-$version +port='r0' +version='0.8' files=( "https://github.com/radareorg/r0/archive/$version.tar.gz#a31722838a21cd3391c41bbb2e63f60552544244362b21f6d9a30d6c24c43bbe" ) -depends=() diff --git a/Ports/readline/package.sh b/Ports/readline/package.sh index cde400243d5..3f45512eb2f 100755 --- a/Ports/readline/package.sh +++ b/Ports/readline/package.sh @@ -1,16 +1,17 @@ #!/usr/bin/env -S bash ../.port_include.sh - -port=readline -version=8.1.2 -useconfigure=true -config_sub_paths=("support/config.sub") -use_fresh_config_sub=true +port='readline' +version='8.1.2' +useconfigure='true' +use_fresh_config_sub='true' +config_sub_paths=( + 'support/config.sub' +) files=( "https://ftpmirror.gnu.org/gnu/readline/readline-${version}.tar.gz#7589a2381a8419e68654a47623ce7dfcb756815c8fee726b98f90bf668af7bc6" ) configopts=( - "--disable-static" - "--enable-shared" + '--disable-static' + '--enable-shared' ) post_install() { diff --git a/Ports/rsync/package.sh b/Ports/rsync/package.sh index f78c8c86aa4..4c8c7b3b17c 100755 --- a/Ports/rsync/package.sh +++ b/Ports/rsync/package.sh @@ -1,9 +1,11 @@ #!/usr/bin/env -S bash ../.port_include.sh -port=rsync -version=3.1.3 -useconfigure="true" -use_fresh_config_sub="true" +port='rsync' +version='3.1.3' +useconfigure='true' +use_fresh_config_sub='true' files=( "https://download.samba.org/pub/rsync/src/rsync-${version}.tar.gz#55cc554efec5fdaad70de921cd5a5eeb6c29a95524c715f3bbf849235b0800c0" ) -configopts=("--target=${SERENITY_ARCH}-pc-serenity") +configopts=( + "--target=${SERENITY_ARCH}-pc-serenity" +) diff --git a/Ports/sdl12-compat/package.sh b/Ports/sdl12-compat/package.sh index c5c8c1db39a..415ec871dbd 100755 --- a/Ports/sdl12-compat/package.sh +++ b/Ports/sdl12-compat/package.sh @@ -1,21 +1,21 @@ #!/usr/bin/env -S bash ../.port_include.sh port='sdl12-compat' version='1.2.56' -workdir=sdl12-compat-release-${version} +workdir="sdl12-compat-release-${version}" useconfigure='true' files=( "https://github.com/libsdl-org/sdl12-compat/archive/refs/tags/release-${version}.tar.gz#f62f3e15f95aade366ee6c03f291e8825c4689390a6be681535259a877259c58" ) -configopts=( - "-DCMAKE_TOOLCHAIN_FILE=${SERENITY_BUILD_DIR}/CMakeToolchain.txt" - "-DCMAKE_BUILD_TYPE=Release" - "-DCMAKE_INSTALL_PREFIX=${SERENITY_INSTALL_ROOT}/usr/local/" - "-B./build" +depends=( + 'SDL2' ) -depends=("SDL2") configure() { - run cmake "${configopts[@]}" + run cmake \ + -B 'build' \ + -DCMAKE_TOOLCHAIN_FILE="${SERENITY_BUILD_DIR}/CMakeToolchain.txt" \ + -DCMAKE_BUILD_TYPE='Release' \ + -DCMAKE_INSTALL_PREFIX="${SERENITY_INSTALL_ROOT}/usr/local/" } build() { diff --git a/Ports/stress-ng/package.sh b/Ports/stress-ng/package.sh index 2f34159d7e4..f75201170bc 100755 --- a/Ports/stress-ng/package.sh +++ b/Ports/stress-ng/package.sh @@ -1,10 +1,12 @@ #!/usr/bin/env -S bash ../.port_include.sh -port=stress-ng -version=0.14.03 +port='stress-ng' +version='0.14.03' files=( "https://github.com/ColinIanKing/stress-ng/archive/V${version}.tar.gz#95012c62883ab5826e6157557a075df98cce3cbce2a48bb40851bcc968a8441a" ) -depends=("zlib") +depends=( + 'zlib' +) pre_configure() { export CFLAGS="-I${SERENITY_INSTALL_ROOT}/usr/local/include" diff --git a/Ports/tig/package.sh b/Ports/tig/package.sh index 44545a2be5a..5cf89d21b87 100755 --- a/Ports/tig/package.sh +++ b/Ports/tig/package.sh @@ -1,8 +1,13 @@ #!/usr/bin/env -S bash ../.port_include.sh -port=tig -version=2.5.5 -useconfigure="true" +port='tig' +version='2.5.5' +useconfigure='true' files=( "https://github.com/jonas/tig/releases/download/tig-${version}/tig-${version}.tar.gz#24ba2c8beae889e6002ea7ced0e29851dee57c27fde8480fb9c64d5eb8765313" ) -depends=("ncurses" "pcre" "readline" "libiconv") +depends=( + 'libiconv' + 'ncurses' + 'pcre' + 'readline' +) diff --git a/Ports/vttest/package.sh b/Ports/vttest/package.sh index 3400961b8f8..be959c81c74 100755 --- a/Ports/vttest/package.sh +++ b/Ports/vttest/package.sh @@ -1,7 +1,7 @@ #!/usr/bin/env -S bash ../.port_include.sh -port=vttest -version=20220215 -useconfigure=true +port='vttest' +version='20220215' +useconfigure='true' files=( - "https://invisible-mirror.net/archives/vttest/vttest-$version.tgz#4a65998c5e12cf08ced2cfce119adb44fa842ac1495d0f150f21c8a6785915a1" + "https://invisible-mirror.net/archives/vttest/vttest-${version}.tgz#4a65998c5e12cf08ced2cfce119adb44fa842ac1495d0f150f21c8a6785915a1" ) diff --git a/Ports/wget/package.sh b/Ports/wget/package.sh index 8b1c50391d1..13eec3b9b07 100755 --- a/Ports/wget/package.sh +++ b/Ports/wget/package.sh @@ -1,13 +1,20 @@ #!/usr/bin/env -S bash ../.port_include.sh -port=wget -version=1.21.3 -useconfigure="true" -use_fresh_config_sub=true -config_sub_paths=("build-aux/config.sub") -depends=("openssl") +port='wget' +version='1.21.3' +useconfigure='true' +use_fresh_config_sub='true' +config_sub_paths=( + 'build-aux/config.sub' +) +depends=( + 'openssl' +) files=( "https://ftpmirror.gnu.org/gnu/wget/wget-${version}.tar.gz#5726bb8bc5ca0f6dc7110f6416e4bb7019e2d2ff5bf93d1ca2ffcc6656f220e5" ) -configopts=("--with-ssl=openssl" "--disable-ipv6") +configopts=( + '--with-ssl=openssl' + '--disable-ipv6' +) -export OPENSSL_LIBS="-lssl -lcrypto -ldl" +export OPENSSL_LIBS='-lssl -lcrypto -ldl' diff --git a/Ports/x264/package.sh b/Ports/x264/package.sh index 7d7266c379b..ce80b6c016b 100755 --- a/Ports/x264/package.sh +++ b/Ports/x264/package.sh @@ -1,5 +1,4 @@ #!/usr/bin/env -S bash ../.port_include.sh - port='x264' version='baee400fa9ced6f5481a728138fed6e867b0ff7f' files=( @@ -7,4 +6,6 @@ files=( ) useconfigure='true' use_fresh_config_sub='true' -configopts=("--enable-shared") +configopts=( + '--enable-shared' +) diff --git a/Ports/xz/package.sh b/Ports/xz/package.sh index 2f4ab34e232..bb06749acc2 100755 --- a/Ports/xz/package.sh +++ b/Ports/xz/package.sh @@ -1,11 +1,19 @@ #!/usr/bin/env -S bash ../.port_include.sh -port=xz -version=5.2.5 -useconfigure=true -configopts=("--disable-static" "--enable-shared") -use_fresh_config_sub=true -config_sub_paths=("build-aux/config.sub") +port='xz' +version='5.2.5' +depends=( + 'libiconv' + 'zlib' +) files=( "https://tukaani.org/xz/xz-${version}.tar.gz#f6f4910fd033078738bd82bfba4f49219d03b17eb0794eb91efbae419f4aba10" ) -depends=("zlib" "libiconv") +useconfigure='true' +use_fresh_config_sub='true' +config_sub_paths=( + 'build-aux/config.sub' +) +configopts=( + '--disable-static' + '--enable-shared' +) diff --git a/Ports/zstd/package.sh b/Ports/zstd/package.sh index e53c2b55f70..4c6b4c9fd33 100755 --- a/Ports/zstd/package.sh +++ b/Ports/zstd/package.sh @@ -1,17 +1,15 @@ #!/usr/bin/env -S bash ../.port_include.sh -port=zstd -version=1.5.2 +port='zstd' +version='1.5.2' files=( "https://github.com/facebook/zstd/releases/download/v${version}/zstd-${version}.tar.gz#7c42d56fac126929a6a85dbc73ff1db2411d04f104fae9bdea51305663a83fd0" ) useconfigure='true' -configopts=( - "-Sbuild/cmake" - "-DCMAKE_TOOLCHAIN_FILE=${SERENITY_BUILD_DIR}/CMakeToolchain.txt" -) configure() { - run cmake "${configopts[@]}" + run cmake \ + -S 'build/cmake' \ + -DCMAKE_TOOLCHAIN_FILE="${SERENITY_BUILD_DIR}/CMakeToolchain.txt" } install() {