From 37f837bde7a56b449be2d7225d5bcf8d03c4b632 Mon Sep 17 00:00:00 2001 From: Linus Groh Date: Thu, 11 Mar 2021 20:03:52 +0100 Subject: [PATCH] Ports: Replace hardcoded versions in 'files' URLs Let's just use $version everywhere (we already do this for most ports). --- Ports/ed/package.sh | 2 +- Ports/figlet/package.sh | 2 +- Ports/jq/package.sh | 2 +- Ports/lua/package.sh | 2 +- Ports/mrsh/package.sh | 2 +- Ports/nasm/package.sh | 2 +- Ports/pkgconf/package.sh | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Ports/ed/package.sh b/Ports/ed/package.sh index 2eab3d8d05..2155abb4d4 100755 --- a/Ports/ed/package.sh +++ b/Ports/ed/package.sh @@ -1,7 +1,7 @@ #!/usr/bin/env -S bash ../.port_include.sh port=ed version=1.15 -files="https://ftp.gnu.org/gnu/ed/ed-1.15.tar.lz ed-1.15.tar.lz" +files="https://ftp.gnu.org/gnu/ed/ed-${version}.tar.lz ed-${version}.tar.lz" useconfigure=true depends=pcre2 diff --git a/Ports/figlet/package.sh b/Ports/figlet/package.sh index dfad280c88..b4db155e2b 100755 --- a/Ports/figlet/package.sh +++ b/Ports/figlet/package.sh @@ -1,5 +1,5 @@ #!/usr/bin/env -S bash ../.port_include.sh port=figlet version=2.2.5 -files="http://ftp.figlet.org/pub/figlet/program/unix/figlet-2.2.5.tar.gz figlet-2.2.5.tar.gz d88cb33a14f1469fff975d021ae2858e" +files="http://ftp.figlet.org/pub/figlet/program/unix/figlet-${version}.tar.gz figlet-${version}.tar.gz d88cb33a14f1469fff975d021ae2858e" makeopts="CC=i686-pc-serenity-gcc LD=i686-pc-serenity-gcc" diff --git a/Ports/jq/package.sh b/Ports/jq/package.sh index 9eacbd7515..aa7014913e 100755 --- a/Ports/jq/package.sh +++ b/Ports/jq/package.sh @@ -3,7 +3,7 @@ port=jq version=1.6 useconfigure=true configopts="--with-oniguruma=builtin --disable-maintainer-mode" -files="https://github.com/stedolan/jq/releases/download/jq-1.6/jq-1.6.tar.gz jq-1.6.tar.gz" +files="https://github.com/stedolan/jq/releases/download/jq-${version}/jq-${version}.tar.gz jq-${version}.tar.gz" makeopts="LDFLAGS=-all-static" pre_configure() { diff --git a/Ports/lua/package.sh b/Ports/lua/package.sh index bfbb9d3bec..79213516f0 100755 --- a/Ports/lua/package.sh +++ b/Ports/lua/package.sh @@ -1,6 +1,6 @@ #!/usr/bin/env -S bash ../.port_include.sh port=lua version=5.3.5 -files="http://www.lua.org/ftp/lua-5.3.5.tar.gz lua-5.3.5.tar.gz 4f4b4f323fd3514a68e0ab3da8ce3455" +files="http://www.lua.org/ftp/lua-${version}.tar.gz lua-${version}.tar.gz 4f4b4f323fd3514a68e0ab3da8ce3455" makeopts="-j$(nproc) serenity" installopts="INSTALL_TOP=${SERENITY_BUILD_DIR}/Root/usr/local" diff --git a/Ports/mrsh/package.sh b/Ports/mrsh/package.sh index d23dc5abae..aaab409cba 100755 --- a/Ports/mrsh/package.sh +++ b/Ports/mrsh/package.sh @@ -1,7 +1,7 @@ #!/usr/bin/env -S bash ../.port_include.sh port=mrsh version=d9763a32e7da572677d1681bb1fc67f117d641f3 -files="https://codeload.github.com/emersion/mrsh/legacy.tar.gz/d9763a32e7da572677d1681bb1fc67f117d641f3 emersion-mrsh-d9763a3.tar.gz" +files="https://codeload.github.com/emersion/mrsh/legacy.tar.gz/${version} emersion-mrsh-d9763a3.tar.gz" useconfigure=true makeopts= workdir=emersion-mrsh-d9763a3 diff --git a/Ports/nasm/package.sh b/Ports/nasm/package.sh index 689bad937a..6d01c5ae1e 100755 --- a/Ports/nasm/package.sh +++ b/Ports/nasm/package.sh @@ -1,7 +1,7 @@ #!/usr/bin/env -S bash ../.port_include.sh port=nasm version=2.14.02 -files="https://www.nasm.us/pub/nasm/releasebuilds/2.14.02/nasm-2.14.02.tar.gz nasm-2.14.02.tar.gz" +files="https://www.nasm.us/pub/nasm/releasebuilds/${version}/nasm-${version}.tar.gz nasm-${version}.tar.gz" useconfigure=true makeopts= diff --git a/Ports/pkgconf/package.sh b/Ports/pkgconf/package.sh index 0940cefdbb..ef55505806 100755 --- a/Ports/pkgconf/package.sh +++ b/Ports/pkgconf/package.sh @@ -1,7 +1,7 @@ #!/usr/bin/env -S bash ../.port_include.sh port=pkgconf version=1.7.3 -files="https://distfiles.dereferenced.org/pkgconf/pkgconf-1.7.3.tar.xz pkgconf-1.7.3.tar.xz" +files="https://distfiles.dereferenced.org/pkgconf/pkgconf-${version}.tar.xz pkgconf-${version}.tar.xz" useconfigure=true # FIXME: This looks suspiciously host-y... configopts="--prefix=/usr/local --with-pkg-config-dir=/usr/local/lib/pkgconfig"