diff --git a/packages/assimp/build.sh b/packages/assimp/build.sh
index f77bbb5be3..cc67e9330b 100644
--- a/packages/assimp/build.sh
+++ b/packages/assimp/build.sh
@@ -3,8 +3,8 @@ TERMUX_PKG_DESCRIPTION="Library to import various well-known 3D model formats in
 TERMUX_PKG_LICENSE="BSD"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION="6.0.2"
-TERMUX_PKG_REVISION=1
-TERMUX_PKG_SRCURL=https://github.com/assimp/assimp/archive/refs/tags/v$TERMUX_PKG_VERSION.tar.gz
+TERMUX_PKG_REVISION=2
+TERMUX_PKG_SRCURL="https://github.com/assimp/assimp/archive/refs/tags/v$TERMUX_PKG_VERSION.tar.gz"
 TERMUX_PKG_SHA256=d1822d9a19c9205d6e8bc533bf897174ddb360ce504680f294170cc1d6319751
 TERMUX_PKG_AUTO_UPDATE=true
 TERMUX_PKG_DEPENDS="libc++, zlib"
diff --git a/packages/bastet/build.sh b/packages/bastet/build.sh
index 649cdce1d3..fe657cf1fe 100644
--- a/packages/bastet/build.sh
+++ b/packages/bastet/build.sh
@@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=http://fph.altervista.org/prog/bastet.html
 TERMUX_PKG_DESCRIPTION="Tetris clone with 'bastard' block-choosing AI"
 TERMUX_PKG_LICENSE="GPL-3.0"
 TERMUX_PKG_MAINTAINER="@termux"
-TERMUX_PKG_VERSION=0.43.2
-TERMUX_PKG_REVISION=12
-TERMUX_PKG_SRCURL=https://github.com/fph/bastet/archive/refs/tags/$TERMUX_PKG_VERSION.tar.gz
+TERMUX_PKG_VERSION="0.43.2"
+TERMUX_PKG_REVISION=13
+TERMUX_PKG_SRCURL="https://github.com/fph/bastet/archive/refs/tags/$TERMUX_PKG_VERSION.tar.gz"
 TERMUX_PKG_SHA256=f219510afc1d83e4651fbffd5921b1e0b926d5311da4f8fa7df103dc7f2c403f
 TERMUX_PKG_DEPENDS="libc++, ncurses"
 TERMUX_PKG_BUILD_DEPENDS="boost-headers, boost-static"
diff --git a/packages/bitcoin/build.sh b/packages/bitcoin/build.sh
index 901ebe41a4..32d4ee64eb 100644
--- a/packages/bitcoin/build.sh
+++ b/packages/bitcoin/build.sh
@@ -3,7 +3,8 @@ TERMUX_PKG_DESCRIPTION="Bitcoin Core"
 TERMUX_PKG_LICENSE="MIT"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION="30.1"
-TERMUX_PKG_SRCURL=https://github.com/bitcoin/bitcoin/archive/refs/tags/v${TERMUX_PKG_VERSION}.tar.gz
+TERMUX_PKG_REVISION=1
+TERMUX_PKG_SRCURL="https://github.com/bitcoin/bitcoin/archive/refs/tags/v${TERMUX_PKG_VERSION}.tar.gz"
 TERMUX_PKG_SHA256=6580d24ab4b882b1c1e7e2ddf8275be7c6b283ef57544b490551e86f2fb61a51
 TERMUX_PKG_AUTO_UPDATE=true
 TERMUX_PKG_DEPENDS="capnproto, libc++, libevent"
diff --git a/packages/boost/build.sh b/packages/boost/build.sh
index 88318ea4d7..e66d4ece94 100644
--- a/packages/boost/build.sh
+++ b/packages/boost/build.sh
@@ -4,10 +4,10 @@ TERMUX_PKG_LICENSE="BSL-1.0"
 TERMUX_PKG_MAINTAINER="@termux"
 # Never forget to always bump revision of reverse dependencies and rebuild them
 # when bumping version.
-TERMUX_PKG_VERSION="1:1.89.0"
+TERMUX_PKG_VERSION="1:1.90.0"
 _VERSION="${TERMUX_PKG_VERSION:2}"
 TERMUX_PKG_SRCURL="https://archives.boost.io/release/${_VERSION}/source/boost_${_VERSION//./_}.tar.bz2"
-TERMUX_PKG_SHA256=85a33fa22621b4f314f8e85e1a5e2a9363d22e4f4992925d4bb3bc631b5a0c7a
+TERMUX_PKG_SHA256=49551aff3b22cbc5c5a9ed3dbc92f0e23ea50a0f7325b0d198b705e8ee3fc305
 TERMUX_PKG_AUTO_UPDATE=false
 TERMUX_PKG_DEPENDS="libc++, libbz2, libiconv, liblzma, zlib, libandroid-wordexp"
 TERMUX_PKG_BUILD_DEPENDS="python"
diff --git a/packages/boost/fix-aligned-alloc-detection.patch b/packages/boost/fix-aligned-alloc-detection.patch
new file mode 100644
index 0000000000..7e2155e9ce
--- /dev/null
+++ b/packages/boost/fix-aligned-alloc-detection.patch
@@ -0,0 +1,17 @@
+Fixes:
+/data/data/com.termux/files/usr/include/boost/asio/detail/memory.hpp:107:20:
+error: reference to unresolved using declaration
+  107 |   void* ptr = std::aligned_alloc(align, size);
+in reverse dependency botan3
+
+--- a/boost/asio/detail/config.hpp
++++ b/boost/asio/detail/config.hpp
+@@ -377,7 +377,7 @@
+ #      if defined(__FreeBSD__) || defined(__Fuchsia__) || defined(__wasi__) \
+          || defined(__NetBSD__) || defined(__OpenBSD__)
+ #       define BOOST_ASIO_HAS_STD_ALIGNED_ALLOC 1
+-#      elif defined(__linux__)
++#      elif defined(__linux__) && !defined(__ANDROID__)
+ #       if defined(_LIBCPP_HAS_MUSL_LIBC)
+ #        define BOOST_ASIO_HAS_STD_ALIGNED_ALLOC 1
+ #       else // !defined(_LIBCPP_HAS_MUSL_LIBC)
diff --git a/packages/botan3/build.sh b/packages/botan3/build.sh
index 47b918b40c..f33f81883f 100644
--- a/packages/botan3/build.sh
+++ b/packages/botan3/build.sh
@@ -4,7 +4,8 @@ TERMUX_PKG_LICENSE="BSD 2-Clause"
 TERMUX_PKG_MAINTAINER="@termux"
 # This specific package is for libbotan-3.
 TERMUX_PKG_VERSION="3.10.0"
-TERMUX_PKG_SRCURL=https://botan.randombit.net/releases/Botan-${TERMUX_PKG_VERSION}.tar.xz
+TERMUX_PKG_REVISION=1
+TERMUX_PKG_SRCURL="https://botan.randombit.net/releases/Botan-${TERMUX_PKG_VERSION}.tar.xz"
 TERMUX_PKG_SHA256=fde194236f6d5434f136ea0a0627f6cc9d26af8b96e9f1e1c7d8c82cd90f4f24
 TERMUX_PKG_DEPENDS="libbz2, libc++, liblzma, libsqlite, zlib"
 TERMUX_PKG_BUILD_DEPENDS="boost, boost-headers"
diff --git a/packages/enblend/build.sh b/packages/enblend/build.sh
index 13a777cbd8..4dc52c9f31 100644
--- a/packages/enblend/build.sh
+++ b/packages/enblend/build.sh
@@ -2,10 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://enblend.sourceforge.net/
 TERMUX_PKG_DESCRIPTION="A tool for compositing images using a Burt&Adelson multiresolution spline"
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_MAINTAINER="@termux"
-_VERSION=4.2.0_p20161007
-TERMUX_PKG_VERSION=${_VERSION//_/}
-TERMUX_PKG_REVISION=7
-TERMUX_PKG_SRCURL=https://dev.gentoo.org/~soap/distfiles/enblend-${_VERSION}.tar.xz
+TERMUX_PKG_VERSION="4.2.0p20161007"
+TERMUX_PKG_REVISION=8
+TERMUX_PKG_SRCURL="https://dev.gentoo.org/~soap/distfiles/enblend-${TERMUX_PKG_VERSION//p/_p}.tar.xz"
 TERMUX_PKG_SHA256=4fe05af3d697bd6b2797facc8ba5aeabdc91e233156552301f1c7686232ff4c3
 TERMUX_PKG_DEPENDS="gsl, libandroid-glob, libc++, libtiff, libvigra, littlecms"
 TERMUX_PKG_BUILD_DEPENDS="boost, boost-headers, libjpeg-turbo, libpng, zlib"
diff --git a/packages/i2pd/build.sh b/packages/i2pd/build.sh
index f849e5ceb4..45a1c7d5fc 100644
--- a/packages/i2pd/build.sh
+++ b/packages/i2pd/build.sh
@@ -4,7 +4,8 @@ TERMUX_PKG_LICENSE="BSD 3-Clause"
 TERMUX_PKG_LICENSE_FILE="../LICENSE"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION="2.58.0"
-TERMUX_PKG_SRCURL=https://github.com/PurpleI2P/i2pd/archive/refs/tags/$TERMUX_PKG_VERSION.tar.gz
+TERMUX_PKG_REVISION=1
+TERMUX_PKG_SRCURL="https://github.com/PurpleI2P/i2pd/archive/refs/tags/$TERMUX_PKG_VERSION.tar.gz"
 TERMUX_PKG_SHA256=5ff650c6da8fda3522c10ec22889a7fd1c6b5d1af42c24531d84c36f6cc49019
 TERMUX_PKG_AUTO_UPDATE=true
 TERMUX_PKG_DEPENDS="boost, libc++, miniupnpc, openssl, zlib"
diff --git a/packages/innoextract/build.sh b/packages/innoextract/build.sh
index 087b005deb..f09b35630f 100644
--- a/packages/innoextract/build.sh
+++ b/packages/innoextract/build.sh
@@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://constexpr.org/innoextract/
 TERMUX_PKG_DESCRIPTION="A tool to unpack installers created by Inno Setup"
 TERMUX_PKG_LICENSE="ZLIB"
 TERMUX_PKG_MAINTAINER="@termux"
-TERMUX_PKG_VERSION=1.9
-TERMUX_PKG_REVISION=9
-TERMUX_PKG_SRCURL=https://constexpr.org/innoextract/files/innoextract-${TERMUX_PKG_VERSION}/innoextract-${TERMUX_PKG_VERSION}.tar.gz
+TERMUX_PKG_VERSION="1.9"
+TERMUX_PKG_REVISION=10
+TERMUX_PKG_SRCURL="https://constexpr.org/innoextract/files/innoextract-${TERMUX_PKG_VERSION}/innoextract-${TERMUX_PKG_VERSION}.tar.gz"
 TERMUX_PKG_SHA256=6344a69fc1ed847d4ed3e272e0da5998948c6b828cb7af39c6321aba6cf88126
 TERMUX_PKG_DEPENDS="libc++, boost, liblzma, libiconv"
 TERMUX_PKG_BUILD_DEPENDS="boost-headers"
diff --git a/packages/ledger/build.sh b/packages/ledger/build.sh
index 75311bc33a..6acdadd914 100644
--- a/packages/ledger/build.sh
+++ b/packages/ledger/build.sh
@@ -3,7 +3,8 @@ TERMUX_PKG_DESCRIPTION="Powerful, double-entry accounting system"
 TERMUX_PKG_LICENSE="BSD 3-Clause"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION="3.4.1"
-TERMUX_PKG_SRCURL=https://github.com/ledger/ledger/archive/refs/tags/v${TERMUX_PKG_VERSION}.tar.gz
+TERMUX_PKG_REVISION=1
+TERMUX_PKG_SRCURL="https://github.com/ledger/ledger/archive/refs/tags/v${TERMUX_PKG_VERSION}.tar.gz"
 TERMUX_PKG_SHA256=1cf012cdc8445cab0efc445064ef9b2d3f46ed0165dae803c40fe3d2b23fdaad
 TERMUX_PKG_AUTO_UPDATE=true
 TERMUX_PKG_DEPENDS="boost, libc++, libedit, libmpfr, libgmp, python"
diff --git a/packages/lgogdownloader/build.sh b/packages/lgogdownloader/build.sh
index d681319476..0394dd8108 100644
--- a/packages/lgogdownloader/build.sh
+++ b/packages/lgogdownloader/build.sh
@@ -3,7 +3,8 @@ TERMUX_PKG_DESCRIPTION="Open source downloader to GOG.com for Linux users using
 TERMUX_PKG_LICENSE="WTFPL"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION="3.18"
-TERMUX_PKG_SRCURL=https://github.com/Sude-/lgogdownloader/releases/download/v${TERMUX_PKG_VERSION}/lgogdownloader-${TERMUX_PKG_VERSION}.tar.gz
+TERMUX_PKG_REVISION=1
+TERMUX_PKG_SRCURL="https://github.com/Sude-/lgogdownloader/releases/download/v${TERMUX_PKG_VERSION}/lgogdownloader-${TERMUX_PKG_VERSION}.tar.gz"
 TERMUX_PKG_SHA256=1974f09cb0e0cdfed536937335488548addd92e5c654f4229ac22594a22f8ae0
 TERMUX_PKG_AUTO_UPDATE=true
 TERMUX_PKG_DEPENDS="boost, jsoncpp, libc++, libcurl, libhtmlcxx, libtinyxml2, rhash, tidy"
diff --git a/packages/libarrow-cpp/build.sh b/packages/libarrow-cpp/build.sh
index db0a15c788..3754f4a62a 100644
--- a/packages/libarrow-cpp/build.sh
+++ b/packages/libarrow-cpp/build.sh
@@ -3,8 +3,8 @@ TERMUX_PKG_DESCRIPTION="C++ libraries for Apache Arrow"
 TERMUX_PKG_LICENSE="Apache-2.0"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION="22.0.0"
-TERMUX_PKG_REVISION=2
-TERMUX_PKG_SRCURL=https://github.com/apache/arrow/archive/refs/tags/apache-arrow-${TERMUX_PKG_VERSION}.tar.gz
+TERMUX_PKG_REVISION=3
+TERMUX_PKG_SRCURL="https://github.com/apache/arrow/archive/refs/tags/apache-arrow-${TERMUX_PKG_VERSION}.tar.gz"
 TERMUX_PKG_SHA256=8a95e6c7b9bec2bc0058feb73efe38ad6cfd49a0c7094db29b37ecaa8ab16051
 TERMUX_PKG_AUTO_UPDATE=true
 TERMUX_PKG_DEPENDS="abseil-cpp, apache-orc, libandroid-execinfo, libc++, liblz4, libprotobuf, libre2, libsnappy, thrift, utf8proc, zlib, zstd"
diff --git a/packages/libasio/build.sh b/packages/libasio/build.sh
index 3032ed242d..da5762e662 100644
--- a/packages/libasio/build.sh
+++ b/packages/libasio/build.sh
@@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE="https://think-async.com/Asio"
 TERMUX_PKG_DESCRIPTION="Cross-platform C++ library for network and low-level I/O programming"
 TERMUX_PKG_LICENSE="BSL-1.0"
 TERMUX_PKG_MAINTAINER="@termux"
-TERMUX_PKG_VERSION=1.24.0
-TERMUX_PKG_REVISION=3
-TERMUX_PKG_SRCURL=https://downloads.sourceforge.net/project/asio/asio/${TERMUX_PKG_VERSION}%20%28Stable%29/asio-${TERMUX_PKG_VERSION}.zip
+TERMUX_PKG_VERSION="1.24.0"
+TERMUX_PKG_REVISION=4
+TERMUX_PKG_SRCURL="https://downloads.sourceforge.net/project/asio/asio/${TERMUX_PKG_VERSION}%20%28Stable%29/asio-${TERMUX_PKG_VERSION}.zip"
 TERMUX_PKG_SHA256=b628291471aee837ff951ea38c8a3a0b00ff99fd2a1ff3b7c7d3d993c0030b73
 TERMUX_PKG_BUILD_DEPENDS="boost, boost-headers, openssl"
 TERMUX_PKG_PLATFORM_INDEPENDENT=true
diff --git a/packages/libc++utilities/build.sh b/packages/libc++utilities/build.sh
index d7fbfe10b2..16a9c4ceb1 100644
--- a/packages/libc++utilities/build.sh
+++ b/packages/libc++utilities/build.sh
@@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="Useful C++ classes and routines such as argument parser,
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION="5.32.1"
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://github.com/Martchus/cpp-utilities/archive/refs/tags/v${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=785c782d5057bb242d6d3c5a5985b26205575c5df1f657483287fbcb32e2c771
 TERMUX_PKG_AUTO_UPDATE=true
diff --git a/packages/libmsgpack-cxx/build.sh b/packages/libmsgpack-cxx/build.sh
index c84066f8ea..2084aa5a33 100644
--- a/packages/libmsgpack-cxx/build.sh
+++ b/packages/libmsgpack-cxx/build.sh
@@ -3,8 +3,8 @@ TERMUX_PKG_DESCRIPTION="msgpack for C++"
 TERMUX_PKG_LICENSE="BSL-1.0"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION="7.0.0"
-TERMUX_PKG_REVISION=3
-TERMUX_PKG_SRCURL=https://github.com/msgpack/msgpack-c/releases/download/cpp-${TERMUX_PKG_VERSION}/msgpack-cxx-${TERMUX_PKG_VERSION}.tar.gz
+TERMUX_PKG_REVISION=4
+TERMUX_PKG_SRCURL="https://github.com/msgpack/msgpack-c/releases/download/cpp-${TERMUX_PKG_VERSION}/msgpack-cxx-${TERMUX_PKG_VERSION}.tar.gz"
 TERMUX_PKG_SHA256=7504b7af7e7b9002ce529d4f941e1b7fb1fb435768780ce7da4abaac79bb156f
 TERMUX_PKG_BUILD_DEPENDS="boost, boost-headers"
 TERMUX_PKG_AUTO_UPDATE=true
diff --git a/packages/libosmium/build.sh b/packages/libosmium/build.sh
index 755c39e7cf..902b7ec914 100644
--- a/packages/libosmium/build.sh
+++ b/packages/libosmium/build.sh
@@ -3,8 +3,8 @@ TERMUX_PKG_DESCRIPTION="Library for reading from and writing to OSM files in XML
 TERMUX_PKG_LICENSE="BSL-1.0"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION="2.22.0"
-TERMUX_PKG_REVISION=4
-TERMUX_PKG_SRCURL=https://github.com/osmcode/libosmium/archive/refs/tags/v${TERMUX_PKG_VERSION}.tar.gz
+TERMUX_PKG_REVISION=5
+TERMUX_PKG_SRCURL="https://github.com/osmcode/libosmium/archive/refs/tags/v${TERMUX_PKG_VERSION}.tar.gz"
 TERMUX_PKG_SHA256=8f74e3f6ba295baa7325ae5606e8f74ad9056f1d6ab4555c50bff6aa8246f366
 TERMUX_PKG_AUTO_UPDATE=true
 TERMUX_PKG_BUILD_DEPENDS="boost, boost-headers, liblz4, libprotozero"
diff --git a/packages/libpagmo/build.sh b/packages/libpagmo/build.sh
index 2125770f8e..29b5752f1d 100644
--- a/packages/libpagmo/build.sh
+++ b/packages/libpagmo/build.sh
@@ -5,7 +5,7 @@ TERMUX_PKG_LICENSE="LGPL-3.0, GPL-3.0"
 TERMUX_PKG_LICENSE_FILE="COPYING.lgpl3"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION="2.19.1"
-TERMUX_PKG_REVISION=4
+TERMUX_PKG_REVISION=5
 TERMUX_PKG_SRCURL="https://github.com/esa/pagmo2/archive/refs/tags/v$TERMUX_PKG_VERSION.tar.gz"
 TERMUX_PKG_SHA256=ecc180e669fa6bbece959429ac7d92439e89e1fd1c523aa72b11b6c82e414a1d
 TERMUX_PKG_AUTO_UPDATE=true
diff --git a/packages/librime/build.sh b/packages/librime/build.sh
index 6654e404d9..fb77da9add 100644
--- a/packages/librime/build.sh
+++ b/packages/librime/build.sh
@@ -4,6 +4,7 @@ TERMUX_PKG_LICENSE="BSD 3-Clause, LGPL-3.0"
 TERMUX_PKG_LICENSE_FILE="LICENSE, data/preset/LICENSE.PRELUDE"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION="1.16.0"
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL="https://github.com/rime/librime/archive/refs/tags/${TERMUX_PKG_VERSION}.tar.gz"
 TERMUX_PKG_SHA256=9d6469246d3f0c3b94ebc05a5299fb2e65fdd3600179617df15eacafa1085788
 TERMUX_PKG_AUTO_UPDATE=true
diff --git a/packages/libtins/build.sh b/packages/libtins/build.sh
index 366607b897..e626420645 100644
--- a/packages/libtins/build.sh
+++ b/packages/libtins/build.sh
@@ -3,8 +3,8 @@ TERMUX_PKG_DESCRIPTION="High-level, multiplatform C++ network packet sniffing an
 TERMUX_PKG_LICENSE="BSD 2-Clause"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION="4.5"
-TERMUX_PKG_REVISION=3
-TERMUX_PKG_SRCURL=https://github.com/mfontanini/libtins/archive/refs/tags/v$TERMUX_PKG_VERSION.tar.gz
+TERMUX_PKG_REVISION=4
+TERMUX_PKG_SRCURL="https://github.com/mfontanini/libtins/archive/refs/tags/v$TERMUX_PKG_VERSION.tar.gz"
 TERMUX_PKG_SHA256=6ff5fe1ada10daef8538743dccb9c9b3e19d05d028ffdc24838e62ff3fc55841
 TRRMUX_PKG_AUTO_UPDATE=true
 TERMUX_PKG_DEPENDS="libc++, libpcap, openssl"
diff --git a/packages/libtorrent-rasterbar/build.sh b/packages/libtorrent-rasterbar/build.sh
index bb06167215..a3bae948e3 100644
--- a/packages/libtorrent-rasterbar/build.sh
+++ b/packages/libtorrent-rasterbar/build.sh
@@ -3,8 +3,8 @@ TERMUX_PKG_DESCRIPTION="A feature complete C++ bittorrent implementation focusin
 TERMUX_PKG_LICENSE="BSD 3-Clause"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION="2.0.11"
-TERMUX_PKG_REVISION=4
-TERMUX_PKG_SRCURL=https://github.com/arvidn/libtorrent/releases/download/v${TERMUX_PKG_VERSION}/libtorrent-rasterbar-${TERMUX_PKG_VERSION}.tar.gz
+TERMUX_PKG_REVISION=5
+TERMUX_PKG_SRCURL="https://github.com/arvidn/libtorrent/releases/download/v${TERMUX_PKG_VERSION}/libtorrent-rasterbar-${TERMUX_PKG_VERSION}.tar.gz"
 TERMUX_PKG_SHA256=f0db58580f4f29ade6cc40fa4ba80e2c9a70c90265cd77332d3cdec37ecf1e6d
 TERMUX_PKG_AUTO_UPDATE=true
 TERMUX_PKG_DEPENDS="boost, libc++, openssl, python"
diff --git a/packages/monero/build.sh b/packages/monero/build.sh
index f941f1b421..a36755e5f3 100644
--- a/packages/monero/build.sh
+++ b/packages/monero/build.sh
@@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="A private, secure, untraceable, decentralised digital cu
 TERMUX_PKG_LICENSE="BSD 3-Clause"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION="0.18.4.5"
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_REVISION=2
 TERMUX_PKG_AUTO_UPDATE=true
 TERMUX_PKG_SRCURL=git+https://github.com/monero-project/monero
 TERMUX_PKG_DEPENDS="boost, libc++, libprotobuf, libsodium, libunbound, libusb, libzmq, miniupnpc, openssl, readline"
diff --git a/packages/mpdscribble/build.sh b/packages/mpdscribble/build.sh
index c77150cfee..3a480b436c 100644
--- a/packages/mpdscribble/build.sh
+++ b/packages/mpdscribble/build.sh
@@ -3,8 +3,8 @@ TERMUX_PKG_DESCRIPTION="A Music Player Daemon (MPD) client which submits informa
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_MAINTAINER="Henrik Grimler @Grimler91"
 TERMUX_PKG_VERSION="0.25"
-TERMUX_PKG_REVISION=3
-TERMUX_PKG_SRCURL=https://github.com/MusicPlayerDaemon/mpdscribble/archive/refs/tags/v${TERMUX_PKG_VERSION}.tar.gz
+TERMUX_PKG_REVISION=4
+TERMUX_PKG_SRCURL="https://github.com/MusicPlayerDaemon/mpdscribble/archive/refs/tags/v${TERMUX_PKG_VERSION}.tar.gz"
 TERMUX_PKG_SHA256=ce24145df6657f1d8070c88f6795f567f21ff9126b0740c088f40344fc496b1e
 TERMUX_PKG_DEPENDS="libc++, libcurl, libgcrypt, mpd, libmpdclient, glib"
 TERMUX_PKG_BUILD_DEPENDS="boost, boost-headers"
diff --git a/packages/ncmpcpp/build.sh b/packages/ncmpcpp/build.sh
index ffe46c1af9..097e4adcb4 100644
--- a/packages/ncmpcpp/build.sh
+++ b/packages/ncmpcpp/build.sh
@@ -3,8 +3,8 @@ TERMUX_PKG_DESCRIPTION="NCurses Music Player Client (Plus Plus)"
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION="0.10.1"
-TERMUX_PKG_REVISION=7
-TERMUX_PKG_SRCURL=https://github.com/ncmpcpp/ncmpcpp/archive/refs/tags/${TERMUX_PKG_VERSION}.tar.gz
+TERMUX_PKG_REVISION=8
+TERMUX_PKG_SRCURL="https://github.com/ncmpcpp/ncmpcpp/archive/refs/tags/${TERMUX_PKG_VERSION}.tar.gz"
 TERMUX_PKG_SHA256=ddc89da86595d272282ae8726cc7913867b9517eec6e765e66e6da860b58e2f9
 TERMUX_PKG_DEPENDS="boost, fftw, libandroid-support, libc++, libcurl, libicu, libmpdclient, ncurses, readline, taglib"
 TERMUX_PKG_BUILD_DEPENDS="boost-headers"
diff --git a/packages/openbabel/build.sh b/packages/openbabel/build.sh
index 5ef904f5bf..423550e00c 100644
--- a/packages/openbabel/build.sh
+++ b/packages/openbabel/build.sh
@@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=http://openbabel.org/wiki/Main_Page
 TERMUX_PKG_DESCRIPTION="Open Babel is a chemical toolbox designed to speak the many languages of chemical data"
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_MAINTAINER="@termux"
-TERMUX_PKG_VERSION=3.1.1
-TERMUX_PKG_REVISION=12
-TERMUX_PKG_SRCURL=https://github.com/openbabel/openbabel/archive/refs/tags/openbabel-${TERMUX_PKG_VERSION//./-}.tar.gz
+TERMUX_PKG_VERSION="3.1.1"
+TERMUX_PKG_REVISION=13
+TERMUX_PKG_SRCURL="https://github.com/openbabel/openbabel/archive/refs/tags/openbabel-${TERMUX_PKG_VERSION//./-}.tar.gz"
 TERMUX_PKG_SHA256=c97023ac6300d26176c97d4ef39957f06e68848d64f1a04b0b284ccff2744f02
 TERMUX_PKG_AUTO_UPDATE=true
 TERMUX_PKG_DEPENDS="libc++, libcairo, libxml2, zlib"
diff --git a/packages/openfoam/build.sh b/packages/openfoam/build.sh
index bcf0728995..0103877138 100644
--- a/packages/openfoam/build.sh
+++ b/packages/openfoam/build.sh
@@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://www.openfoam.com
 TERMUX_PKG_DESCRIPTION="OpenFOAM is a CFD software written in C++"
 TERMUX_PKG_MAINTAINER="Henrik Grimler @Grimler91"
 TERMUX_PKG_LICENSE="GPL-3.0"
-TERMUX_PKG_VERSION=2412
-TERMUX_PKG_REVISION=4
-TERMUX_PKG_SRCURL=https://develop.openfoam.com/Development/openfoam/-/archive/OpenFOAM-v${TERMUX_PKG_VERSION}/openfoam-OpenFOAM-v${TERMUX_PKG_VERSION}.tar.bz2
+TERMUX_PKG_VERSION="2412"
+TERMUX_PKG_REVISION=5
+TERMUX_PKG_SRCURL="https://develop.openfoam.com/Development/openfoam/-/archive/OpenFOAM-v${TERMUX_PKG_VERSION}/openfoam-OpenFOAM-v${TERMUX_PKG_VERSION}.tar.bz2"
 TERMUX_PKG_SHA256=9d7fdfd2b93bb6296fc7604eb27528364683a19229ae319a988e4cdc95b73d9a
 TERMUX_PKG_DEPENDS="boost, libc++, libgmp, libmpfr, openmpi, readline, zlib"
 TERMUX_PKG_BUILD_DEPENDS="boost-headers, cgal, flex, libandroid-execinfo"
diff --git a/packages/openscad/build.sh b/packages/openscad/build.sh
index fe1ce6cc3b..a1fc9519b9 100644
--- a/packages/openscad/build.sh
+++ b/packages/openscad/build.sh
@@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://openscad.org/
 TERMUX_PKG_DESCRIPTION="The programmers solid 3D CAD modeller (headless build)"
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_MAINTAINER="@termux"
-TERMUX_PKG_VERSION=2021.01
-TERMUX_PKG_REVISION=5
-TERMUX_PKG_SRCURL=https://files.openscad.org/openscad-$TERMUX_PKG_VERSION.src.tar.gz
+TERMUX_PKG_VERSION="2021.01"
+TERMUX_PKG_REVISION=6
+TERMUX_PKG_SRCURL="https://files.openscad.org/openscad-$TERMUX_PKG_VERSION.src.tar.gz"
 TERMUX_PKG_SHA256=d938c297e7e5f65dbab1461cac472fc60dfeaa4999ea2c19b31a4184f2d70359
 TERMUX_PKG_DEPENDS="boost, double-conversion, fontconfig, freetype, glib, harfbuzz, libc++, libgmp, libmpfr, libxml2, libzip"
 TERMUX_PKG_BUILD_DEPENDS="boost-headers, cgal, eigen"
diff --git a/packages/osm2pgsql/build.sh b/packages/osm2pgsql/build.sh
index 7ac08f18e8..0f512513bd 100644
--- a/packages/osm2pgsql/build.sh
+++ b/packages/osm2pgsql/build.sh
@@ -3,7 +3,8 @@ TERMUX_PKG_DESCRIPTION="osm2pgsql imports OpenStreetMap (OSM) data into a Postgr
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION="2.2.0"
-TERMUX_PKG_SRCURL=https://github.com/openstreetmap/osm2pgsql/archive/refs/tags/${TERMUX_PKG_VERSION}.tar.gz
+TERMUX_PKG_REVISION=1
+TERMUX_PKG_SRCURL="https://github.com/openstreetmap/osm2pgsql/archive/refs/tags/${TERMUX_PKG_VERSION}.tar.gz"
 TERMUX_PKG_SHA256=567dad078f8a66d6d706ac1876b5251b688109d16974909d89ce2056d6e9f258
 TERMUX_PKG_AUTO_UPDATE=true
 TERMUX_PKG_DEPENDS="boost, libbz2, libc++, libexpat, liblua54, postgresql, proj, zlib, nlohmann-json"
diff --git a/packages/osmium-tool/build.sh b/packages/osmium-tool/build.sh
index 171206593c..1870e85c0b 100644
--- a/packages/osmium-tool/build.sh
+++ b/packages/osmium-tool/build.sh
@@ -4,8 +4,8 @@ TERMUX_PKG_LICENSE="GPL-3.0"
 TERMUX_PKG_LICENSE_FILE="LICENSE.txt"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION="1.18.0"
-TERMUX_PKG_REVISION=4
-TERMUX_PKG_SRCURL=https://github.com/osmcode/osmium-tool/archive/refs/tags/v${TERMUX_PKG_VERSION}.tar.gz
+TERMUX_PKG_REVISION=5
+TERMUX_PKG_SRCURL="https://github.com/osmcode/osmium-tool/archive/refs/tags/v${TERMUX_PKG_VERSION}.tar.gz"
 TERMUX_PKG_SHA256=5438f57043c9df05137ca4bd1b1e4a5fb1c9c8c49cb4bec43a5f1ef30ed68fb5
 TERMUX_PKG_DEPENDS="boost, libbz2, libc++, libexpat, liblz4, zlib"
 TERMUX_PKG_BUILD_DEPENDS="boost-headers, libosmium, libprotozero, nlohmann-json"
diff --git a/packages/poppler/build.sh b/packages/poppler/build.sh
index c49ee2643c..9dfeaef59b 100644
--- a/packages/poppler/build.sh
+++ b/packages/poppler/build.sh
@@ -4,11 +4,8 @@ TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_MAINTAINER="@termux"
 # Please align the version with `poppler-qt` package.
 TERMUX_PKG_VERSION="24.05.0"
-TERMUX_PKG_REVISION=4
-# Do not forget to bump revision of reverse dependencies and rebuild them
-# when SOVERSION is changed.
-_POPPLER_SOVERSION=137
-TERMUX_PKG_SRCURL=https://poppler.freedesktop.org/poppler-${TERMUX_PKG_VERSION}.tar.xz
+TERMUX_PKG_REVISION=5
+TERMUX_PKG_SRCURL="https://poppler.freedesktop.org/poppler-${TERMUX_PKG_VERSION}.tar.xz"
 TERMUX_PKG_SHA256=d8c5eb30b50285ad9f0af8c6335cc2d3b9597fca475cbc2598a5479fa379f779
 # The package must be updated at the same time as poppler, auto updater script does not support that.
 TERMUX_PKG_AUTO_UPDATE=false
@@ -29,6 +26,9 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 "
 
 termux_step_pre_configure() {
+	# Do not forget to bump revision of reverse dependencies and rebuild them
+	# when SOVERSION is changed.
+	local _POPPLER_SOVERSION=137
 	if ! test "${_POPPLER_SOVERSION}"; then
 		termux_error_exit "Please set _POPPLER_SOVERSION variable."
 	fi
diff --git a/packages/povray/build.sh b/packages/povray/build.sh
index 8fd067bf3f..7d094d78df 100644
--- a/packages/povray/build.sh
+++ b/packages/povray/build.sh
@@ -2,10 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://www.povray.org/
 TERMUX_PKG_DESCRIPTION="The Persistence of Vision Raytracer"
 TERMUX_PKG_LICENSE="AGPL-V3"
 TERMUX_PKG_MAINTAINER="@termux"
-_POVRAY_VERSION_BASE=3.8
-TERMUX_PKG_VERSION=${_POVRAY_VERSION_BASE}.0-beta.2
-TERMUX_PKG_REVISION=17
-TERMUX_PKG_SRCURL=https://github.com/POV-Ray/povray/releases/download/v${TERMUX_PKG_VERSION}/povunix-v${TERMUX_PKG_VERSION}-src.tar.gz
+TERMUX_PKG_VERSION="3.8.0-beta.2"
+TERMUX_PKG_REVISION=18
+TERMUX_PKG_SRCURL="https://github.com/POV-Ray/povray/releases/download/v${TERMUX_PKG_VERSION}/povunix-v${TERMUX_PKG_VERSION}-src.tar.gz"
 TERMUX_PKG_SHA256=4717c9bed114deec47cf04a8175cc4060dafc159f26e7896480a60f4411ca5ad
 TERMUX_PKG_DEPENDS="boost, imath, libc++, libjpeg-turbo, libpng, libtiff, openexr, povray-data, zlib"
 TERMUX_PKG_BUILD_DEPENDS="boost-headers"
@@ -39,6 +38,8 @@ termux_step_pre_configure() {
 }
 
 termux_step_create_debscripts() {
+	local _POVRAY_VERSION_BASE="${TERMUX_PKG_VERSION%-*}"
+	_POVRAY_VERSION_BASE="${_POVRAY_VERSION_BASE%.*}"
 	echo "#!$TERMUX_PREFIX/bin/sh" > postinst
 	echo "povconfuser=\$HOME/.povray/${_POVRAY_VERSION_BASE}" >> postinst
 	echo "mkdir -p \$povconfuser/" >> postinst
diff --git a/packages/pybind11/build.sh b/packages/pybind11/build.sh
index 56bc071e97..6098fbc0fb 100644
--- a/packages/pybind11/build.sh
+++ b/packages/pybind11/build.sh
@@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="A lightweight header-only library that exposes C++ types
 TERMUX_PKG_LICENSE="BSD"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION="3.0.1"
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_REVISION=2
 TERMUX_PKG_SRCURL="https://github.com/pybind/pybind11/archive/refs/tags/v${TERMUX_PKG_VERSION}/pybind11-${TERMUX_PKG_VERSION}.tar.gz"
 TERMUX_PKG_SHA256=741633da746b7c738bb71f1854f957b9da660bcd2dce68d71949037f0969d0ca
 TERMUX_PKG_AUTO_UPDATE=true
diff --git a/packages/qrsspig/build.sh b/packages/qrsspig/build.sh
index ffeda7f060..9e551cfcdd 100644
--- a/packages/qrsspig/build.sh
+++ b/packages/qrsspig/build.sh
@@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://gitlab.com/hb9fxx/qrsspig
 TERMUX_PKG_DESCRIPTION="Headless QRSS grabber for Raspberry Pi's"
 TERMUX_PKG_LICENSE="GPL-3.0"
 TERMUX_PKG_MAINTAINER="@termux"
-TERMUX_PKG_VERSION=0.8.0
-TERMUX_PKG_REVISION=6
-TERMUX_PKG_SRCURL=https://gitlab.com/hb9fxx/qrsspig/-/archive/v${TERMUX_PKG_VERSION}/qrsspig-v${TERMUX_PKG_VERSION}.tar.bz2
+TERMUX_PKG_VERSION="0.8.0"
+TERMUX_PKG_REVISION=7
+TERMUX_PKG_SRCURL="https://gitlab.com/hb9fxx/qrsspig/-/archive/v${TERMUX_PKG_VERSION}/qrsspig-v${TERMUX_PKG_VERSION}.tar.bz2"
 TERMUX_PKG_SHA256=9b3df7723944ef15f99d355ed071f41ace663833afe46703036ead89415372d1
 TERMUX_PKG_DEPENDS="boost, fftw, libc++, libcurl, libgd, libliquid-dsp, libssh, libyaml-cpp, pulseaudio"
 TERMUX_PKG_BUILD_DEPENDS="boost-headers"
diff --git a/packages/ravencoin/build.sh b/packages/ravencoin/build.sh
index 695d5b83df..b6d7d1d87c 100644
--- a/packages/ravencoin/build.sh
+++ b/packages/ravencoin/build.sh
@@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://ravencoin.org/
 TERMUX_PKG_DESCRIPTION="A peer-to-peer blockchain, handling the efficient creation and transfer of assets from one party to another"
 TERMUX_PKG_LICENSE="MIT"
 TERMUX_PKG_MAINTAINER="@termux"
-TERMUX_PKG_VERSION=4.6.1
-TERMUX_PKG_REVISION=8
-TERMUX_PKG_SRCURL=https://github.com/RavenProject/Ravencoin/archive/refs/tags/v${TERMUX_PKG_VERSION}.tar.gz
+TERMUX_PKG_VERSION="4.6.1"
+TERMUX_PKG_REVISION=9
+TERMUX_PKG_SRCURL="https://github.com/RavenProject/Ravencoin/archive/refs/tags/v${TERMUX_PKG_VERSION}.tar.gz"
 TERMUX_PKG_SHA256=42e8444e9e21eecfed1a546dffe6f2418271e890038a7d9d9a856b376a6284e8
 TERMUX_PKG_DEPENDS="boost, libc++, libevent, libzmq, miniupnpc, openssl"
 TERMUX_PKG_BUILD_DEPENDS="boost-headers, libdb"
diff --git a/packages/snapcast-server/build.sh b/packages/snapcast-server/build.sh
index 10b628accf..5ea9059085 100644
--- a/packages/snapcast-server/build.sh
+++ b/packages/snapcast-server/build.sh
@@ -3,8 +3,8 @@ TERMUX_PKG_DESCRIPTION="A multiroom client-server audio player (server)"
 TERMUX_PKG_LICENSE="GPL-3.0"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION="0.34.0"
-TERMUX_PKG_REVISION=1
-TERMUX_PKG_SRCURL=https://github.com/badaix/snapcast/archive/refs/tags/v${TERMUX_PKG_VERSION}.tar.gz
+TERMUX_PKG_REVISION=2
+TERMUX_PKG_SRCURL="https://github.com/badaix/snapcast/archive/refs/tags/v${TERMUX_PKG_VERSION}.tar.gz"
 TERMUX_PKG_SHA256=a2918ea4d1f9b2df9c4247fd71bd452ea03a5d20ac44f60a736df90488858944
 TERMUX_PKG_DEPENDS="libc++, libexpat, libflac, libogg, libopus, libsoxr, libvorbis, openssl"
 TERMUX_PKG_BUILD_DEPENDS="boost, boost-headers"
diff --git a/packages/solidity/build.sh b/packages/solidity/build.sh
index 514871b689..2f83712118 100644
--- a/packages/solidity/build.sh
+++ b/packages/solidity/build.sh
@@ -3,7 +3,8 @@ TERMUX_PKG_DESCRIPTION="An Ethereum smart contract-oriented language"
 TERMUX_PKG_LICENSE="GPL-3.0"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION="0.8.33"
-TERMUX_PKG_SRCURL=https://github.com/argotorg/solidity/releases/download/v${TERMUX_PKG_VERSION}/solidity_${TERMUX_PKG_VERSION}.tar.gz
+TERMUX_PKG_REVISION=1
+TERMUX_PKG_SRCURL="https://github.com/argotorg/solidity/releases/download/v${TERMUX_PKG_VERSION}/solidity_${TERMUX_PKG_VERSION}.tar.gz"
 TERMUX_PKG_SHA256=2fb0a76b13e25b21bcd50607713a563f64709c8c283ed65464db3a2d546b9abf
 TERMUX_PKG_AUTO_UPDATE=true
 TERMUX_PKG_DEPENDS="boost, libc++"
diff --git a/packages/stuntman/build.sh b/packages/stuntman/build.sh
index fbf7fe0ae3..bffb3c32aa 100644
--- a/packages/stuntman/build.sh
+++ b/packages/stuntman/build.sh
@@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://www.stunprotocol.org/
 TERMUX_PKG_DESCRIPTION="An open source STUN server"
 TERMUX_PKG_LICENSE="Apache-2.0"
 TERMUX_PKG_MAINTAINER="@termux"
-TERMUX_PKG_VERSION=1.2.16
-TERMUX_PKG_REVISION=6
-TERMUX_PKG_SRCURL=https://www.stunprotocol.org/stunserver-${TERMUX_PKG_VERSION}.tgz
+TERMUX_PKG_VERSION="1.2.16"
+TERMUX_PKG_REVISION=7
+TERMUX_PKG_SRCURL="https://www.stunprotocol.org/stunserver-${TERMUX_PKG_VERSION}.tgz"
 TERMUX_PKG_SHA256=4479e1ae070651dfc4836a998267c7ac2fba4f011abcfdca3b8ccd7736d4fd26
 TERMUX_PKG_DEPENDS="libc++, openssl"
 TERMUX_PKG_BUILD_DEPENDS="boost, boost-headers"
diff --git a/packages/supercollider/build.sh b/packages/supercollider/build.sh
index 65fed8fcd2..d88aeff469 100644
--- a/packages/supercollider/build.sh
+++ b/packages/supercollider/build.sh
@@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=http://supercollider.github.io/
 TERMUX_PKG_DESCRIPTION="A platform for audio synthesis and algorithmic composition"
 TERMUX_PKG_LICENSE="GPL-2.0-or-later, GPL-3.0"
 TERMUX_PKG_MAINTAINER="@rene-descartes2021"
-TERMUX_PKG_VERSION=3.14.0
-TERMUX_PKG_REVISION=1
-TERMUX_PKG_SRCURL=https://github.com/supercollider/supercollider/releases/download/Version-${TERMUX_PKG_VERSION}/SuperCollider-${TERMUX_PKG_VERSION}-Source.tar.bz2
+TERMUX_PKG_VERSION="3.14.0"
+TERMUX_PKG_REVISION=2
+TERMUX_PKG_SRCURL="https://github.com/supercollider/supercollider/releases/download/Version-${TERMUX_PKG_VERSION}/SuperCollider-${TERMUX_PKG_VERSION}-Source.tar.bz2"
 TERMUX_PKG_SHA256=ab710e84376f5c082c92fcea7465b85d375934f3da7deed583457a0a48b0a918
 TERMUX_PKG_DEPENDS="boost, fftw, jack2, libandroid-glob, libsndfile, libyaml-cpp, readline"
 TERMUX_PKG_BUILD_DEPENDS="boost-headers"
diff --git a/packages/taglib/build.sh b/packages/taglib/build.sh
index 660997b849..88e4f43a0a 100644
--- a/packages/taglib/build.sh
+++ b/packages/taglib/build.sh
@@ -5,8 +5,8 @@ TERMUX_PKG_LICENSE="custom"
 TERMUX_PKG_LICENSE_FILE="COPYING.LGPL, COPYING.MPL"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION="2.1.1"
-TERMUX_PKG_REVISION=3
-TERMUX_PKG_SRCURL=https://github.com/taglib/taglib/archive/refs/tags/v${TERMUX_PKG_VERSION}.tar.gz
+TERMUX_PKG_REVISION=4
+TERMUX_PKG_SRCURL="https://github.com/taglib/taglib/archive/refs/tags/v${TERMUX_PKG_VERSION}.tar.gz"
 TERMUX_PKG_SHA256=bd57924496a272322d6f9252502da4e620b6ab9777992e8934779ebd64babd6e
 TERMUX_PKG_AUTO_UPDATE=true
 TERMUX_PKG_DEPENDS="libc++, zlib, utf8cpp"
diff --git a/packages/thrift/build.sh b/packages/thrift/build.sh
index 1127673193..a072b3f9e0 100644
--- a/packages/thrift/build.sh
+++ b/packages/thrift/build.sh
@@ -3,8 +3,8 @@ TERMUX_PKG_DESCRIPTION="Scalable cross-language services framework for IPC/RPC"
 TERMUX_PKG_LICENSE="Apache-2.0"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION="0.22.0"
-TERMUX_PKG_REVISION=1
-TERMUX_PKG_SRCURL=https://downloads.apache.org/thrift/${TERMUX_PKG_VERSION}/thrift-${TERMUX_PKG_VERSION}.tar.gz
+TERMUX_PKG_REVISION=2
+TERMUX_PKG_SRCURL="https://downloads.apache.org/thrift/${TERMUX_PKG_VERSION}/thrift-${TERMUX_PKG_VERSION}.tar.gz"
 TERMUX_PKG_SHA256=794a0e455787960d9f27ab92c38e34da27e8deeda7a5db0e59dc64a00df8a1e5
 TERMUX_PKG_AUTO_UPDATE=true
 TERMUX_PKG_UPDATE_METHOD=repology
diff --git a/packages/tizonia/build.sh b/packages/tizonia/build.sh
index 3162192fec..90077921cf 100644
--- a/packages/tizonia/build.sh
+++ b/packages/tizonia/build.sh
@@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://github.com/tizonia/
 TERMUX_PKG_DESCRIPTION="A command-line streaming music client/server for Linux"
 TERMUX_PKG_LICENSE="LGPL-3.0"
 TERMUX_PKG_MAINTAINER="@termux"
-TERMUX_PKG_VERSION=0.22.0
-TERMUX_PKG_REVISION=20
-TERMUX_PKG_SRCURL=https://github.com/tizonia/tizonia-openmax-il/archive/refs/tags/v${TERMUX_PKG_VERSION}.tar.gz
+TERMUX_PKG_VERSION="0.22.0"
+TERMUX_PKG_REVISION=21
+TERMUX_PKG_SRCURL="https://github.com/tizonia/tizonia-openmax-il/archive/refs/tags/v${TERMUX_PKG_VERSION}.tar.gz"
 TERMUX_PKG_SHA256=0750cae23ed600fb4b4699a392f43a5e03dcd0870383d64da4b8c28ea94a82f8
 TERMUX_PKG_DEPENDS="boost, dbus, libandroid-wordexp, libc++, libcurl, libflac, liblog4c, libmad, libmediainfo, libmp3lame, liboggz, libopus, libsndfile, libsqlite, libuuid, libvpx, libmpg123, opusfile, pulseaudio, python, taglib"
 TERMUX_PKG_BUILD_DEPENDS="boost-headers, libev"
diff --git a/packages/tome2/build.sh b/packages/tome2/build.sh
index bb04a1c0ea..e3ac3b0fa1 100644
--- a/packages/tome2/build.sh
+++ b/packages/tome2/build.sh
@@ -3,7 +3,8 @@ TERMUX_PKG_DESCRIPTION="An open world roguelike adventure set in middle earth"
 TERMUX_PKG_LICENSE="non-free"
 TERMUX_PKG_MAINTAINER="@termux"
 _COMMIT=885799917d42ea9e6eb69fc320fa03922cd8cbb4
-TERMUX_PKG_VERSION=2025.12.13
+TERMUX_PKG_VERSION="2025.12.13"
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=git+https://github.com/tome2/tome2
 TERMUX_PKG_SHA256=a7115bfd526b6b1172cba3b59ba37f975a7f7749d0cb3a40e890988558af7a89
 TERMUX_PKG_GIT_BRANCH=master
diff --git a/packages/vera/build.sh b/packages/vera/build.sh
index a02f34493b..1eaf2d79de 100644
--- a/packages/vera/build.sh
+++ b/packages/vera/build.sh
@@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://bitbucket.org/verateam/vera
 TERMUX_PKG_DESCRIPTION="A programmable tool for verification, analysis and transformation of C++ source code"
 TERMUX_PKG_LICENSE="BSL-1.0"
 TERMUX_PKG_MAINTAINER="@termux"
-TERMUX_PKG_VERSION=1.3.0
-TERMUX_PKG_REVISION=8
-TERMUX_PKG_SRCURL=https://github.com/verateam/vera/archive/refs/tags/v${TERMUX_PKG_VERSION}.tar.gz
+TERMUX_PKG_VERSION="1.3.0"
+TERMUX_PKG_REVISION=9
+TERMUX_PKG_SRCURL="https://github.com/verateam/vera/archive/refs/tags/v${TERMUX_PKG_VERSION}.tar.gz"
 TERMUX_PKG_SHA256=32d1d29be8ec96556fa0935d908d2627daffbf117abd1aa639f5a1c64ae10ceb
 TERMUX_PKG_AUTO_UPDATE=true
 TERMUX_PKG_UPDATE_TAG_TYPE="newest-tag"