diff --git a/packages/aapt/build.sh b/packages/aapt/build.sh
index 07031a4d0..4c2cf9ffa 100644
--- a/packages/aapt/build.sh
+++ b/packages/aapt/build.sh
@@ -4,9 +4,9 @@ TERMUX_PKG_LICENSE="Apache-2.0"
 _TAG_VERSION=7.1.2
 _TAG_REVISION=33
 TERMUX_PKG_VERSION=${_TAG_VERSION}.${_TAG_REVISION}
-TERMUX_PKG_REVISION=5
+TERMUX_PKG_REVISION=6
 TERMUX_PKG_BUILD_IN_SRC=yes
-TERMUX_PKG_DEPENDS="libexpat, libpng, libzopfli, zlib"
+TERMUX_PKG_DEPENDS="libc++, libexpat, libpng, libzopfli, zlib"
 
 termux_step_make_install() {
 	# FIXME: We would like to enable checksums when downloading
diff --git a/packages/apt/build.sh b/packages/apt/build.sh
index 73917758e..a8bef7b91 100644
--- a/packages/apt/build.sh
+++ b/packages/apt/build.sh
@@ -5,7 +5,7 @@ TERMUX_PKG_DEPENDS="libcurl, liblzma, dpkg, gpgv, libc++, termux-exec, zlib, ter
 TERMUX_PKG_RECOMMENDS="game-repo, science-repo"
 TERMUX_PKG_SUGGESTS="unstable-repo"
 TERMUX_PKG_VERSION=1.4.9
-TERMUX_PKG_REVISION=4
+TERMUX_PKG_REVISION=5
 TERMUX_PKG_SHA256=d4d65e7c84da86f3e6dcc933bba46a08db429c9d933b667c864f5c0e880bac0d
 TERMUX_PKG_SRCURL=http://ftp.debian.org/debian/pool/main/a/apt/apt_${TERMUX_PKG_VERSION}.tar.xz
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
diff --git a/packages/aria2/build.sh b/packages/aria2/build.sh
index 1a6a8e482..f9c20885d 100644
--- a/packages/aria2/build.sh
+++ b/packages/aria2/build.sh
@@ -2,10 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://aria2.github.io
 TERMUX_PKG_DESCRIPTION="Download utility supporting HTTP/HTTPS, FTP, BitTorrent and Metalink"
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_VERSION=1.34.0
-TERMUX_PKG_REVISION=5
+TERMUX_PKG_REVISION=6
 TERMUX_PKG_SRCURL=https://github.com/aria2/aria2/releases/download/release-${TERMUX_PKG_VERSION}/aria2-${TERMUX_PKG_VERSION}.tar.xz
 TERMUX_PKG_SHA256=3a44a802631606e138a9e172a3e9f5bcbaac43ce2895c1d8e2b46f30487e77a3
-TERMUX_PKG_DEPENDS="c-ares, openssl, libxml2, zlib"
+TERMUX_PKG_DEPENDS="libc++, c-ares, openssl, libxml2, zlib"
 # sqlite3 is only used for loading cookies from firefox or chrome:
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 --with-openssl
diff --git a/packages/atomicparsley/build.sh b/packages/atomicparsley/build.sh
index 52db6f0e6..03e953503 100644
--- a/packages/atomicparsley/build.sh
+++ b/packages/atomicparsley/build.sh
@@ -2,10 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://bitbucket.org/wez/atomicparsley
 TERMUX_PKG_DESCRIPTION="Read, parse and set metadata of MPEG-4 and 3gp files"
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_VERSION=0.9.6
-TERMUX_PKG_REVISION=4
+TERMUX_PKG_REVISION=5
 TERMUX_PKG_SRCURL=https://bitbucket.org/wez/atomicparsley/get/${TERMUX_PKG_VERSION}.tar.bz2
 TERMUX_PKG_SHA256=e28d46728be86219e6ce48695ea637d831ca0170ca6bdac99810996a8291ee50
-TERMUX_PKG_DEPENDS="zlib"
+TERMUX_PKG_DEPENDS="libc++, zlib"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="ac_cv_func_lroundf=yes"
 
 termux_step_pre_configure() {
diff --git a/packages/binutils/build.sh b/packages/binutils/build.sh
index 061c47af7..54c84f905 100644
--- a/packages/binutils/build.sh
+++ b/packages/binutils/build.sh
@@ -2,10 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://www.gnu.org/software/binutils/
 TERMUX_PKG_DESCRIPTION="Collection of binary tools, the main ones being ld, the GNU linker, and as, the GNU assembler"
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_VERSION=2.32
-TERMUX_PKG_REVISION=2
+TERMUX_PKG_REVISION=3
 TERMUX_PKG_SHA256=9b0d97b3d30df184d302bced12f976aa1e5fbf4b0be696cdebc6cca30411a46e
 TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/binutils/binutils-${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_DEPENDS="zlib"
+TERMUX_PKG_DEPENDS="libc++, zlib"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--enable-gold --enable-plugins --disable-werror --with-system-zlib --enable-new-dtags"
 TERMUX_PKG_EXTRA_MAKE_ARGS="tooldir=$TERMUX_PREFIX"
 TERMUX_PKG_RM_AFTER_INSTALL="share/man/man1/windmc.1 share/man/man1/windres.1 bin/ld.bfd"
diff --git a/packages/boost/build.sh b/packages/boost/build.sh
index 29703916e..85815134d 100644
--- a/packages/boost/build.sh
+++ b/packages/boost/build.sh
@@ -2,11 +2,11 @@ TERMUX_PKG_HOMEPAGE=https://boost.org
 TERMUX_PKG_DESCRIPTION="Free peer-reviewed portable C++ source libraries"
 TERMUX_PKG_LICENSE="BSL-1.0"
 TERMUX_PKG_VERSION=1.70.0
-TERMUX_PKG_REVISION=3
-TERMUX_PKG_SHA256=430ae8354789de4fd19ee52f3b1f739e1fba576f0aded0897c3c2bc00fb38778
+TERMUX_PKG_REVISION=4
 TERMUX_PKG_SRCURL=https://dl.bintray.com/boostorg/release/$TERMUX_PKG_VERSION/source/boost_${TERMUX_PKG_VERSION//./_}.tar.bz2
+TERMUX_PKG_SHA256=430ae8354789de4fd19ee52f3b1f739e1fba576f0aded0897c3c2bc00fb38778
 TERMUX_PKG_BUILD_IN_SRC=yes
-TERMUX_PKG_DEPENDS="libbz2, libiconv, liblzma, zlib"
+TERMUX_PKG_DEPENDS="libc++, libbz2, libiconv, liblzma, zlib"
 TERMUX_PKG_BUILD_DEPENDS="python, python2"
 TERMUX_PKG_BREAKS="libboost-python (<= 1.65.1-2)"
 TERMUX_PKG_REPLACES="libboost-python (<= 1.65.1-2)"
diff --git a/packages/cgdb/build.sh b/packages/cgdb/build.sh
index d12ec313b..5d0115560 100644
--- a/packages/cgdb/build.sh
+++ b/packages/cgdb/build.sh
@@ -1,11 +1,11 @@
 TERMUX_PKG_HOMEPAGE=https://cgdb.github.io/
 TERMUX_PKG_DESCRIPTION="A lightweight curses (terminal-based) interface to the GNU Debugger (GDB)"
 TERMUX_PKG_LICENSE="GPL-2.0"
-TERMUX_PKG_DEPENDS="ncurses,readline,gdb,libutil"
 TERMUX_PKG_VERSION=0.7.0
-TERMUX_PKG_REVISION=5
+TERMUX_PKG_REVISION=6
 TERMUX_PKG_SRCURL=https://cgdb.me/files/cgdb-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=bf7a9264668db3f9342591b08b2cc3bbb08e235ba2372877b4650b70c6fb5423
+TERMUX_PKG_DEPENDS="libc++, libutil, ncurses, readline, gdb"
 TERMUX_PKG_BUILD_IN_SRC="yes"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 ac_cv_lib_ncursesw6_addnwstr=yes ac_cv_file__dev_ptmx=yes
diff --git a/packages/clamav/build.sh b/packages/clamav/build.sh
index 07fce6e56..d027b4a18 100644
--- a/packages/clamav/build.sh
+++ b/packages/clamav/build.sh
@@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="Anti-virus toolkit for Unix"
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_MAINTAINER="Leonid Plyushch <leonid.plyushch@gmail.com>"
 TERMUX_PKG_VERSION=0.101.2
-TERMUX_PKG_REVISION=4
+TERMUX_PKG_REVISION=5
 TERMUX_PKG_SRCURL=https://www.clamav.net/downloads/production/clamav-$TERMUX_PKG_VERSION.tar.gz
 TERMUX_PKG_SHA256=0a12ebdf6ff7a74c0bde2bdc2b55cae33449e6dd953ec90824a9e01291277634
 TERMUX_PKG_DEPENDS="json-c, libandroid-support, libbz2, libc++, libcurl, libltdl, liblzma, libxml2, openssl, pcre2, zlib"
diff --git a/packages/cmake/build.sh b/packages/cmake/build.sh
index 03ebacd1f..2b3cad24a 100644
--- a/packages/cmake/build.sh
+++ b/packages/cmake/build.sh
@@ -2,8 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://cmake.org/
 TERMUX_PKG_DESCRIPTION="Family of tools designed to build, test and package software"
 TERMUX_PKG_LICENSE="BSD 3-Clause"
 TERMUX_PKG_VERSION=3.14.5
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://www.cmake.org/files/v${TERMUX_PKG_VERSION:0:4}/cmake-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=505ae49ebe3c63c595fa5f814975d8b72848447ee13b6613b0f8b96ebda18c06
-TERMUX_PKG_DEPENDS="libarchive, libcurl, libexpat, jsoncpp, libuv, rhash, make, clang, zlib"
+TERMUX_PKG_DEPENDS="libarchive, libc++, libcurl, libexpat, jsoncpp, libuv, rhash, make, clang, zlib"
 TERMUX_PKG_FORCE_CMAKE=yes
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="-DKWSYS_LFS_WORKS=ON -DBUILD_CursesDialog=ON"
diff --git a/packages/ddrescue/build.sh b/packages/ddrescue/build.sh
index 6e07a4444..7b21ce4e8 100644
--- a/packages/ddrescue/build.sh
+++ b/packages/ddrescue/build.sh
@@ -2,5 +2,7 @@ TERMUX_PKG_HOMEPAGE=https://www.gnu.org/software/ddrescue/
 TERMUX_PKG_DESCRIPTION="GNU data recovery tool"
 TERMUX_PKG_LICENSE="GPL-3.0"
 TERMUX_PKG_VERSION=1.24
-TERMUX_PKG_SHA256=4b5d3feede70e3657ca6b3c7844f23131851cbb6af0cecc9721500f7d7021087
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/ddrescue/ddrescue-${TERMUX_PKG_VERSION}.tar.lz
+TERMUX_PKG_SHA256=4b5d3feede70e3657ca6b3c7844f23131851cbb6af0cecc9721500f7d7021087
+TERMUX_PKG_DEPENDS="libc++"
diff --git a/packages/doxygen/build.sh b/packages/doxygen/build.sh
index 896a98af3..c35494295 100644
--- a/packages/doxygen/build.sh
+++ b/packages/doxygen/build.sh
@@ -3,10 +3,10 @@ TERMUX_PKG_DESCRIPTION="A documentation system for C++, C, Java, IDL and PHP"
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_MAINTAINER="lokesh @hax4us"
 TERMUX_PKG_VERSION=1.8.15
-TERMUX_PKG_REVISION=1
-TERMUX_PKG_SHA256=cc5492b3e2d1801ae823c88e0e7a38caee61a42303587e987142fe9b68a43078
+TERMUX_PKG_REVISION=2
 TERMUX_PKG_SRCURL=https://github.com/doxygen/doxygen/archive/Release_${TERMUX_PKG_VERSION//./_}.tar.gz
-TERMUX_PKG_DEPENDS="libiconv"
+TERMUX_PKG_SHA256=cc5492b3e2d1801ae823c88e0e7a38caee61a42303587e987142fe9b68a43078
+TERMUX_PKG_DEPENDS="libc++, libiconv"
 
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -DBISON_EXECUTABLE=$(which bison)
diff --git a/packages/exiv2/build.sh b/packages/exiv2/build.sh
index fa9a9f73c..ce9560acf 100644
--- a/packages/exiv2/build.sh
+++ b/packages/exiv2/build.sh
@@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="Exif, Iptc and XMP metadata manipulation library and too
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_MAINTAINER="Leonid Plyushch <leonid.plyushch@gmail.com>"
 TERMUX_PKG_VERSION=0.27.1
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://github.com/Exiv2/exiv2/archive/$TERMUX_PKG_VERSION.tar.gz
 TERMUX_PKG_SHA256=1b3766b2c203ce213a4195de14d61694017ec1a69d15d4575bccecef130990fe
 TERMUX_PKG_DEPENDS="libandroid-support, libc++, libexpat, zlib"
diff --git a/packages/fish/build.sh b/packages/fish/build.sh
index 375324ee6..bca00a3b7 100644
--- a/packages/fish/build.sh
+++ b/packages/fish/build.sh
@@ -2,11 +2,12 @@ TERMUX_PKG_HOMEPAGE=https://fishshell.com/
 TERMUX_PKG_DESCRIPTION="Shell geared towards interactive use"
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_VERSION=3.0.2
-TERMUX_PKG_SHA256=14728ccc6b8e053d01526ebbd0822ca4eb0235e6487e832ec1d0d22f1395430e
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://github.com/fish-shell/fish-shell/releases/download/$TERMUX_PKG_VERSION/fish-${TERMUX_PKG_VERSION}.tar.gz
+TERMUX_PKG_SHA256=14728ccc6b8e053d01526ebbd0822ca4eb0235e6487e832ec1d0d22f1395430e
 # fish calls 'tput' from ncurses-utils, at least when cancelling (Ctrl+C) a command line.
 # man is needed since fish calls apropos during command completion.
-TERMUX_PKG_DEPENDS="ncurses, libandroid-support, ncurses-utils, man, bc, pcre2"
+TERMUX_PKG_DEPENDS="libc++, ncurses, libandroid-support, ncurses-utils, man, bc, pcre2"
 TERMUX_PKG_BUILD_IN_SRC=yes
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 ac_cv_file__proc_self_stat=yes
diff --git a/packages/frobtads/build.sh b/packages/frobtads/build.sh
index e0242962c..1a90b376e 100644
--- a/packages/frobtads/build.sh
+++ b/packages/frobtads/build.sh
@@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=http://www.tads.org/frobtads.htm
 TERMUX_PKG_DESCRIPTION="TADS is a free authoring system for writing your own Interactive Fiction"
 TERMUX_PKG_LICENSE="non-free"
 TERMUX_PKG_VERSION=1.2.4
-TERMUX_PKG_REVISION=2
-TERMUX_PKG_SHA256=705be5849293844f499a85280e793941b0eacb362b90d49d85ae8308e4c5b63c
+TERMUX_PKG_REVISION=3
 TERMUX_PKG_SRCURL=https://github.com/realnc/frobtads/releases/download/$TERMUX_PKG_VERSION/frobtads-$TERMUX_PKG_VERSION.tar.bz2
+TERMUX_PKG_SHA256=705be5849293844f499a85280e793941b0eacb362b90d49d85ae8308e4c5b63c
 TERMUX_PKG_RM_AFTER_INSTALL="share/frobtads/tads3/doc share/frobtads/tads3/lib/webuires"
-TERMUX_PKG_DEPENDS="ncurses, libcurl"
+TERMUX_PKG_DEPENDS="libc++, ncurses, libcurl"
 TERMUX_PKG_LICENSE_FILE="doc/COPYING"
diff --git a/packages/gdb/build.sh b/packages/gdb/build.sh
index ab543c909..85f0b1a56 100644
--- a/packages/gdb/build.sh
+++ b/packages/gdb/build.sh
@@ -1,11 +1,11 @@
 TERMUX_PKG_HOMEPAGE=https://www.gnu.org/software/gdb/
 TERMUX_PKG_DESCRIPTION="The standard GNU Debugger that runs on many Unix-like systems and works for many programming languages"
 TERMUX_PKG_LICENSE="GPL-3.0"
-TERMUX_PKG_DEPENDS="liblzma, libexpat, readline, ncurses, libmpfr, zlib"
 TERMUX_PKG_VERSION=8.3
-TERMUX_PKG_REVISION=1
-TERMUX_PKG_SHA256=802f7ee309dcc547d65a68d61ebd6526762d26c3051f52caebe2189ac1ffd72e
+TERMUX_PKG_REVISION=2
 TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/gdb/gdb-${TERMUX_PKG_VERSION}.tar.xz
+TERMUX_PKG_SHA256=802f7ee309dcc547d65a68d61ebd6526762d26c3051f52caebe2189ac1ffd72e
+TERMUX_PKG_DEPENDS="libc++, liblzma, libexpat, readline, ncurses, libmpfr, zlib"
 # gdb can not build with our normal --disable-static: https://sourceware.org/bugzilla/show_bug.cgi?id=15916
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 --with-system-readline
diff --git a/packages/gegl/build.sh b/packages/gegl/build.sh
index 681e3e3e7..719f877a7 100644
--- a/packages/gegl/build.sh
+++ b/packages/gegl/build.sh
@@ -2,9 +2,11 @@ TERMUX_PKG_HOMEPAGE=http://gegl.org/
 TERMUX_PKG_DESCRIPTION="Data flow based image processing framework"
 TERMUX_PKG_LICENSE="GPL-3.0"
 TERMUX_PKG_VERSION=0.4.16
-TERMUX_PKG_SHA256=0112df690301d9eb993cc48965fc71b7751c9021a4f4ee08fcae366c326b5e5a
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://download.gimp.org/pub/gegl/${TERMUX_PKG_VERSION:0:3}/gegl-${TERMUX_PKG_VERSION}.tar.bz2
-TERMUX_PKG_DEPENDS="libandroid-support, ffmpeg, babl, json-glib, libjpeg-turbo, libpng, libjasper, littlecms, libtiff, librsvg, zlib"
+TERMUX_PKG_SHA256=0112df690301d9eb993cc48965fc71b7751c9021a4f4ee08fcae366c326b5e5a
+TERMUX_PKG_DEPENDS="libandroid-support, libc++, ffmpeg, babl, json-glib, libjpeg-turbo, libpng, libjasper, littlecms, libtiff, librsvg, zlib"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 --without-gdk-pixbuf
+ac_cv_func_bind_textdomain_codeset=yes
 "
diff --git a/packages/gettext/build.sh b/packages/gettext/build.sh
index e9bf50f43..c60dbe238 100644
--- a/packages/gettext/build.sh
+++ b/packages/gettext/build.sh
@@ -2,9 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://www.gnu.org/software/gettext/
 TERMUX_PKG_DESCRIPTION="GNU Internationalization utilities"
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_VERSION=0.20.1
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/gettext/gettext-${TERMUX_PKG_VERSION}.tar.xz
 TERMUX_PKG_SHA256=53f02fbbec9e798b0faaf7c73272f83608e835c6288dd58be6c9bb54624a3800
-TERMUX_PKG_DEPENDS="libiconv, pcre, liblzma, libxml2, libcroco, ncurses, libunistring, zlib"
+TERMUX_PKG_DEPENDS="libc++, libiconv, pcre, liblzma, libxml2, libcroco, ncurses, libunistring, zlib"
 TERMUX_PKG_BUILD_IN_SRC=yes
 
 termux_step_pre_configure() {
diff --git a/packages/git-crypt/build.sh b/packages/git-crypt/build.sh
index b50aa53c6..83a8f7499 100644
--- a/packages/git-crypt/build.sh
+++ b/packages/git-crypt/build.sh
@@ -1,13 +1,14 @@
 TERMUX_PKG_HOMEPAGE=https://www.agwa.name/projects/git-crypt/
-TERMUX_PKG_DESCRIPTION="git-crypt enables transparent encryption and decryption of files in a git repository."
+TERMUX_PKG_DESCRIPTION="Enables transparent encryption and decryption of files for a git repository"
 TERMUX_PKG_LICENSE="GPL-3.0"
-TERMUX_PKG_VERSION=0.6.0
 TERMUX_PKG_MAINTAINER="@jottr"
+TERMUX_PKG_VERSION=0.6.0
+TERMUX_PKG_REVISION=1
+TERMUX_PKG_SRCURL=https://github.com/AGWA/git-crypt/archive/${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=777c0c7aadbbc758b69aff1339ca61697011ef7b92f1d1ee9518a8ee7702bb78
-TERMUX_PKG_SRCURL="https://github.com/AGWA/git-crypt/archive/${TERMUX_PKG_VERSION}.tar.gz"
+TERMUX_PKG_DEPENDS="git, libc++, openssl"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" -DCMAKE_BUILD_TYPE=Release -Dbuild_parse=yes -Dbuild_xmlparser=yes"
 TERMUX_PKG_EXTRA_MAKE_ARGS="make ENABLE_MAN=yes"
-TERMUX_PKG_DEPENDS="git, openssl"
 
 termux_step_make() {
 	cd $TERMUX_PKG_SRCDIR
diff --git a/packages/gmic/build.sh b/packages/gmic/build.sh
index 8a52a58e7..8e1f64a8c 100644
--- a/packages/gmic/build.sh
+++ b/packages/gmic/build.sh
@@ -2,9 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://gmic.eu
 TERMUX_PKG_DESCRIPTION="Full-featured framework for image processing"
 TERMUX_PKG_LICENSE="CeCILL-2.1"
 TERMUX_PKG_VERSION=2.6.5
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://gmic.eu/files/source/gmic_$TERMUX_PKG_VERSION.tar.gz
 TERMUX_PKG_SHA256=b0da81a3ed7ee25475ffb0ca148c755f7a7028650614e7e103a3fc507a81e10e
-TERMUX_PKG_DEPENDS="libcurl, fftw, libpng, libjpeg-turbo, libtiff, zlib, graphicsmagick++"
+TERMUX_PKG_DEPENDS="libc++, libcurl, fftw, libpng, libjpeg-turbo, libtiff, zlib, graphicsmagick++"
 TERMUX_PKG_BUILD_DEPENDS="graphicsmagick"
 TERMUX_PKG_NO_DEVELSPLIT=yes
 TERMUX_PKG_BUILD_IN_SRC=yes
diff --git a/packages/gnuchess/build.sh b/packages/gnuchess/build.sh
index 0f9aec3c8..846c9e502 100644
--- a/packages/gnuchess/build.sh
+++ b/packages/gnuchess/build.sh
@@ -2,8 +2,8 @@ TERMUX_PKG_HOMEPAGE=https://www.gnu.org/software/chess/
 TERMUX_PKG_DESCRIPTION="Chess-playing program"
 TERMUX_PKG_LICENSE="GPL-3.0"
 TERMUX_PKG_VERSION=6.2.5
-TERMUX_PKG_REVISION=2
+TERMUX_PKG_REVISION=3
 TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/chess/gnuchess-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=9a99e963355706cab32099d140b698eda9de164ebce40a5420b1b9772dd04802
-TERMUX_PKG_DEPENDS="ncurses, readline"
+TERMUX_PKG_DEPENDS="libc++, ncurses, readline"
 TERMUX_PKG_RM_AFTER_INSTALL="bin/gnuchessu bin/gnuchessx"
diff --git a/packages/gnuplot/build.sh b/packages/gnuplot/build.sh
index de3a9e511..f18e0a14f 100644
--- a/packages/gnuplot/build.sh
+++ b/packages/gnuplot/build.sh
@@ -2,10 +2,11 @@ TERMUX_PKG_HOMEPAGE=http://gnuplot.info/
 TERMUX_PKG_DESCRIPTION="Command-line driven graphing utility"
 TERMUX_PKG_LICENSE="BSD"
 TERMUX_PKG_VERSION=5.2.7
-TERMUX_PKG_SHA256=97fe503ff3b2e356fe2ae32203fc7fd2cf9cef1f46b60fe46dc501a228b9f4ed
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://downloads.sourceforge.net/project/gnuplot/gnuplot/${TERMUX_PKG_VERSION}/gnuplot-${TERMUX_PKG_VERSION}.tar.gz
+TERMUX_PKG_SHA256=97fe503ff3b2e356fe2ae32203fc7fd2cf9cef1f46b60fe46dc501a228b9f4ed
+TERMUX_PKG_DEPENDS="libandroid-support, libc++, libiconv, readline, pango, libgd, zlib"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--without-x --with-lua=no --with-bitmap-terminals"
-TERMUX_PKG_DEPENDS="libandroid-support, libiconv, readline, pango, libgd, zlib"
 TERMUX_PKG_HOSTBUILD=yes
 
 termux_step_host_build() {
diff --git a/packages/googletest/build.sh b/packages/googletest/build.sh
index 162059fdf..dce5a7e7b 100644
--- a/packages/googletest/build.sh
+++ b/packages/googletest/build.sh
@@ -2,9 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://github.com/google/googletest
 TERMUX_PKG_DESCRIPTION="Google C++ testing framework"
 TERMUX_PKG_LICENSE="BSD 3-Clause"
 TERMUX_PKG_VERSION=1.8.1
-TERMUX_PKG_REVISION=1
-TERMUX_PKG_SHA256=9bf1fe5182a604b4135edc1a425ae356c9ad15e9b23f9f12a02e80184c3a249c
+TERMUX_PKG_REVISION=2
 TERMUX_PKG_SRCURL=https://github.com/google/googletest/archive/release-${TERMUX_PKG_VERSION}.tar.gz
+TERMUX_PKG_SHA256=9bf1fe5182a604b4135edc1a425ae356c9ad15e9b23f9f12a02e80184c3a249c
+TERMUX_PKG_DEPENDS="libc++"
 TERMUX_PKG_NO_DEVELSPLIT=yes
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="-DBUILD_SHARED_LIBS=ON"
 
diff --git a/packages/gperf/build.sh b/packages/gperf/build.sh
index cc22f469f..2d2d52f95 100644
--- a/packages/gperf/build.sh
+++ b/packages/gperf/build.sh
@@ -2,7 +2,8 @@ TERMUX_PKG_HOMEPAGE=https://www.gnu.org/software/gperf
 TERMUX_PKG_DESCRIPTION="A perfect hash function generator"
 TERMUX_PKG_LICENSE="GPL-3.0"
 TERMUX_PKG_VERSION=3.1
-TERMUX_PKG_REVISION=3
+TERMUX_PKG_REVISION=4
 TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/gperf/gperf-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=588546b945bba4b70b6a3a616e80b4ab466e3f33024a352fc2198112cdbb3ae2
+TERMUX_PKG_DEPENDS="libc++"
 TERMUX_PKG_BUILD_IN_SRC=yes
diff --git a/packages/graphicsmagick/build.sh b/packages/graphicsmagick/build.sh
index 691a89ce6..7c7e22651 100644
--- a/packages/graphicsmagick/build.sh
+++ b/packages/graphicsmagick/build.sh
@@ -2,10 +2,11 @@ TERMUX_PKG_HOMEPAGE=http://www.graphicsmagick.org/
 TERMUX_PKG_DESCRIPTION="Collection of image processing tools"
 TERMUX_PKG_LICENSE="MIT"
 TERMUX_PKG_VERSION=1.3.32
+TERMUX_PKG_REVISION=1
 # Bandwith limited on main ftp site, so it's asked to use sourceforge instead:
 TERMUX_PKG_SRCURL=http://downloads.sourceforge.net/project/graphicsmagick/graphicsmagick/${TERMUX_PKG_VERSION}/GraphicsMagick-${TERMUX_PKG_VERSION}.tar.xz
 TERMUX_PKG_SHA256=b842a5a0d6c84fd6c5f161b5cd8e02bbd210b0c0b6728dd762b7c53062ba94e1
-TERMUX_PKG_DEPENDS="littlecms, libtiff, freetype, libjasper, libjpeg-turbo, libpng, libbz2, libxml2, liblzma, zstd, zlib"
+TERMUX_PKG_DEPENDS="littlecms, libc++, libtiff, freetype, libjasper, libjpeg-turbo, libpng, libbz2, libxml2, liblzma, zstd, zlib"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 ac_cv_func_ftime=no
 --with-fontpath=/system/fonts
diff --git a/packages/graphviz/build.sh b/packages/graphviz/build.sh
index f4ed5ee0f..90e3ebb02 100644
--- a/packages/graphviz/build.sh
+++ b/packages/graphviz/build.sh
@@ -3,10 +3,10 @@ TERMUX_PKG_DESCRIPTION="Rich set of graph drawing tools"
 TERMUX_PKG_LICENSE="EPL-2.0"
 TERMUX_PKG_MAINTAINER="Dustin DeWeese @HackerFoo"
 TERMUX_PKG_VERSION=2.40.1
-TERMUX_PKG_REVISION=7
+TERMUX_PKG_REVISION=8
 TERMUX_PKG_SRCURL=https://fossies.org/linux/misc/graphviz-$TERMUX_PKG_VERSION.tar.gz
 TERMUX_PKG_SHA256=ca5218fade0204d59947126c38439f432853543b0818d9d728c589dfe7f3a421
-TERMUX_PKG_DEPENDS="libandroid-glob,libcairo,pango,libexpat,libltdl,librsvg,libgd,zlib"
+TERMUX_PKG_DEPENDS="libandroid-glob, libc++, libcairo, pango, libexpat, libltdl, librsvg, libgd, zlib"
 TERMUX_PKG_BUILD_DEPENDS="libtool"
 TERMUX_PKG_BUILD_IN_SRC=yes
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
diff --git a/packages/harfbuzz/build.sh b/packages/harfbuzz/build.sh
index 3650a84b2..e06a49736 100644
--- a/packages/harfbuzz/build.sh
+++ b/packages/harfbuzz/build.sh
@@ -1,10 +1,11 @@
 TERMUX_PKG_HOMEPAGE=https://www.freedesktop.org/wiki/Software/HarfBuzz/
 TERMUX_PKG_DESCRIPTION="OpenType text shaping engine"
 TERMUX_PKG_LICENSE="MIT"
-TERMUX_PKG_VERSION=2.4.0
-TERMUX_PKG_SHA256=b470eff9dd5b596edf078596b46a1f83c179449f051a469430afc15869db336f
-TERMUX_PKG_SRCURL=https://www.freedesktop.org/software/harfbuzz/release/harfbuzz-${TERMUX_PKG_VERSION}.tar.bz2
-TERMUX_PKG_DEPENDS="freetype,glib,libbz2,libpng,libgraphite"
+TERMUX_PKG_VERSION=2.5.1
+TERMUX_PKG_REVISION=1
+TERMUX_PKG_SRCURL=https://www.freedesktop.org/software/harfbuzz/release/harfbuzz-${TERMUX_PKG_VERSION}.tar.xz
+TERMUX_PKG_SHA256=6d4834579abd5f7ab3861c085b4c55129f78b27fe47961fd96769d3704f6719e
+TERMUX_PKG_DEPENDS="freetype, glib, libbz2, libc++, libpng, libgraphite"
 TERMUX_PKG_BUILD_DEPENDS="libicu"
 TERMUX_PKG_DEVPACKAGE_DEPENDS="libgraphite-dev"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--with-icu=yes --with-graphite2=yes --disable-gtk-doc-html"
diff --git a/packages/hashdeep/build.sh b/packages/hashdeep/build.sh
index f97886d71..985a8286a 100644
--- a/packages/hashdeep/build.sh
+++ b/packages/hashdeep/build.sh
@@ -2,9 +2,10 @@ TERMUX_PKG_HOMEPAGE=http://md5deep.sourceforge.net/
 TERMUX_PKG_DESCRIPTION="Programs to compute hashsums of arbitrary number of files recursively"
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_VERSION=4.4
-TERMUX_PKG_REVISION=3
+TERMUX_PKG_REVISION=4
 TERMUX_PKG_SRCURL=https://github.com/jessek/hashdeep/archive/v$TERMUX_PKG_VERSION.tar.gz
 TERMUX_PKG_SHA256=ad78d42142f9a74fe8ec0c61bc78d6588a528cbb9aede9440f50b6ff477f3a7f
+TERMUX_PKG_DEPENDS="libc++"
 # hashdeep requires 64-bit off_t.
 TERMUX_PKG_BLACKLISTED_ARCHES="arm, i686"
 
diff --git a/packages/hugo/build.sh b/packages/hugo/build.sh
index 571a34aca..b4c704d4c 100644
--- a/packages/hugo/build.sh
+++ b/packages/hugo/build.sh
@@ -2,8 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://gohugo.io/
 TERMUX_PKG_DESCRIPTION="A fast and flexible static site generator"
 TERMUX_PKG_LICENSE="Apache-2.0"
 TERMUX_PKG_VERSION=0.55.6
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://github.com/gohugoio/hugo/archive/v$TERMUX_PKG_VERSION.tar.gz
 TERMUX_PKG_SHA256=2b585e1919e2643e5bb4226eb64d7cd523bbf85be266f43bf3a132fa924949e4
+TERMUX_PKG_DEPENDS="libc++"
 
 termux_step_make() {
 	termux_setup_golang
diff --git a/packages/hunspell/build.sh b/packages/hunspell/build.sh
index cc53698e1..bfdec8056 100644
--- a/packages/hunspell/build.sh
+++ b/packages/hunspell/build.sh
@@ -2,11 +2,11 @@ TERMUX_PKG_HOMEPAGE=https://hunspell.github.io
 TERMUX_PKG_DESCRIPTION="Spell checker"
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_VERSION=1.7.0
-TERMUX_PKG_REVISION=3
-TERMUX_PKG_SHA256=bb27b86eb910a8285407cf3ca33b62643a02798cf2eef468c0a74f6c3ee6bc8a
+TERMUX_PKG_REVISION=4
 TERMUX_PKG_SRCURL=https://github.com/hunspell/hunspell/archive/v${TERMUX_PKG_VERSION}.tar.gz
+TERMUX_PKG_SHA256=bb27b86eb910a8285407cf3ca33b62643a02798cf2eef468c0a74f6c3ee6bc8a
+TERMUX_PKG_DEPENDS="libc++, libiconv, ncurses, readline, hunspell-en-us"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--with-ui --with-readline"
-TERMUX_PKG_DEPENDS="libiconv, ncurses, readline, hunspell-en-us"
 TERMUX_PKG_BUILD_IN_SRC=yes
 
 termux_step_pre_configure() {
diff --git a/packages/iverilog/build.sh b/packages/iverilog/build.sh
index 2433129f1..dc6aed0bb 100644
--- a/packages/iverilog/build.sh
+++ b/packages/iverilog/build.sh
@@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="Icarus Verilog compiler and simulation tool"
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_MAINTAINER="Leonid Plyushch <leonid.plyushch@gmail.com>"
 TERMUX_PKG_VERSION=10.2
-TERMUX_PKG_REVISION=4
+TERMUX_PKG_REVISION=5
 TERMUX_PKG_SRCURL=https://github.com/steveicarus/iverilog/archive/v${TERMUX_PKG_VERSION/./_}.tar.gz
 TERMUX_PKG_SHA256=f54d91821223c71c70f4735a1fb2af39c62efbccdeb9b0060ea1cf9c67647ee3
 TERMUX_PKG_DEPENDS="libbz2, libc++, readline, zlib"
diff --git a/packages/jsoncpp/build.sh b/packages/jsoncpp/build.sh
index 4c66f6802..24f1c4c6c 100644
--- a/packages/jsoncpp/build.sh
+++ b/packages/jsoncpp/build.sh
@@ -2,9 +2,11 @@ TERMUX_PKG_HOMEPAGE=https://github.com/open-source-parsers/jsoncpp
 TERMUX_PKG_DESCRIPTION="C++ library for interacting with JSON"
 TERMUX_PKG_LICENSE="MIT"
 TERMUX_PKG_VERSION=1.8.4
-TERMUX_PKG_REVISION=2
-TERMUX_PKG_SHA256=c49deac9e0933bcb7044f08516861a2d560988540b23de2ac1ad443b219afdb6
+TERMUX_PKG_REVISION=3
 TERMUX_PKG_SRCURL=https://github.com/open-source-parsers/jsoncpp/archive/${TERMUX_PKG_VERSION}.tar.gz
+TERMUX_PKG_SHA256=c49deac9e0933bcb7044f08516861a2d560988540b23de2ac1ad443b219afdb6
+TERMUX_PKG_DEPENDS="libc++"
+
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -DBUILD_SHARED_LIBS=ON
 -DJSONCPP_WITH_TESTS=OFF
diff --git a/packages/kakoune/build.sh b/packages/kakoune/build.sh
index 46b6074a5..f4758370c 100644
--- a/packages/kakoune/build.sh
+++ b/packages/kakoune/build.sh
@@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://github.com/mawww/kakoune
 TERMUX_PKG_DESCRIPTION="Code editor heavily inspired by Vim"
 TERMUX_PKG_LICENSE="Unlicense"
 TERMUX_PKG_VERSION=2019.01.20
-TERMUX_PKG_REVISION=1
-TERMUX_PKG_SHA256=991103a227be00ca1b10ad575fd6c749fa4c99eb19763971c7b1e113e299b995
+TERMUX_PKG_REVISION=2
 TERMUX_PKG_SRCURL=https://github.com/mawww/kakoune/releases/download/v$TERMUX_PKG_VERSION/kakoune-$TERMUX_PKG_VERSION.tar.bz2
-TERMUX_PKG_DEPENDS="ncurses"
+TERMUX_PKG_SHA256=991103a227be00ca1b10ad575fd6c749fa4c99eb19763971c7b1e113e299b995
+TERMUX_PKG_DEPENDS="libc++, ncurses"
 TERMUX_PKG_BUILD_IN_SRC=yes
 TERMUX_PKG_EXTRA_MAKE_ARGS=" -C src debug=no"
diff --git a/packages/keystone/build.sh b/packages/keystone/build.sh
index 280ef8854..2c1d16020 100644
--- a/packages/keystone/build.sh
+++ b/packages/keystone/build.sh
@@ -3,9 +3,10 @@ TERMUX_PKG_DESCRIPTION="Keystone is a lightweight multi-platform, multi-architec
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_MAINTAINER="Leonid Plyushch <leonid.plyushch@gmail.com>"
 TERMUX_PKG_VERSION=0.9.1
-TERMUX_PKG_REVISION=4
+TERMUX_PKG_REVISION=5
 TERMUX_PKG_SRCURL=https://github.com/keystone-engine/keystone/archive/$TERMUX_PKG_VERSION.tar.gz
 TERMUX_PKG_SHA256=e9d706cd0c19c49a6524b77db8158449b9c434b415fbf94a073968b68cf8a9f0
+TERMUX_PKG_DEPENDS="libc++"
 
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -DPYTHON_EXECUTABLE=$(which python2.7)
diff --git a/packages/ldc/build.sh b/packages/ldc/build.sh
index 0aca138e6..9d89bfe61 100644
--- a/packages/ldc/build.sh
+++ b/packages/ldc/build.sh
@@ -6,7 +6,7 @@ TERMUX_PKG_VERSION+=(1.13.0)
 TERMUX_PKG_VERSION+=(7.0.1)   # LLVM version
 TERMUX_PKG_VERSION+=(2.083.1) # TOOLS version
 TERMUX_PKG_VERSION+=(1.12.1)  # DUB version
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_REVISION=2
 
 TERMUX_PKG_SRCURL=(https://github.com/ldc-developers/ldc/releases/download/v${TERMUX_PKG_VERSION}/ldc-${TERMUX_PKG_VERSION}-src.tar.gz
 		   https://github.com/ldc-developers/llvm/releases/download/ldc-v${TERMUX_PKG_VERSION[1]}/llvm-${TERMUX_PKG_VERSION[1]}.src.tar.xz
@@ -18,7 +18,7 @@ TERMUX_PKG_SHA256=(4b2fd3eb90fb6debc0ae6d70406bc78fcb531a0f20806640e626d4822e87b
 		   78d90dcda6b82d3eda69c30fa2308a8c8f1a3bce574d637806ca1af3c7f65888
 		   bd17cf67784f2ea0a2e0298761c662c80fddf6700c065f6689eb353e2144c987
 		   3692974b6dc6c81280c0321371b400101006f28bafb890f089b1d357dadbcbf1)
-TERMUX_PKG_DEPENDS="clang, zlib"
+TERMUX_PKG_DEPENDS="clang, libc++, zlib"
 TERMUX_PKG_HOSTBUILD=true
 TERMUX_PKG_FORCE_CMAKE=yes
 #These CMake args are only used to configure a patched LLVM
diff --git a/packages/ledger/build.sh b/packages/ledger/build.sh
index 74e40e908..28137a719 100644
--- a/packages/ledger/build.sh
+++ b/packages/ledger/build.sh
@@ -2,10 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://www.ledger-cli.org
 TERMUX_PKG_DESCRIPTION="Powerful, double-entry accounting system"
 TERMUX_PKG_LICENSE="BSD 3-Clause"
 TERMUX_PKG_VERSION=3.1.3
-TERMUX_PKG_REVISION=1
-TERMUX_PKG_SHA256=b248c91d65c7a101b9d6226025f2b4bf3dabe94c0c49ab6d51ce84a22a39622b
+TERMUX_PKG_REVISION=2
 TERMUX_PKG_SRCURL=https://github.com/ledger/ledger/archive/v${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_DEPENDS="boost, libedit, libmpfr, libgmp"
+TERMUX_PKG_SHA256=b248c91d65c7a101b9d6226025f2b4bf3dabe94c0c49ab6d51ce84a22a39622b
+TERMUX_PKG_DEPENDS="boost, libc++, libedit, libmpfr, libgmp"
 TERMUX_PKG_BUILD_DEPENDS="utf8cpp"
 # See https://gitlab.kitware.com/cmake/cmake/issues/18865:
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="-DBoost_NO_BOOST_CMAKE=ON"
diff --git a/packages/leveldb/build.sh b/packages/leveldb/build.sh
index fab80a803..36b8edbf9 100644
--- a/packages/leveldb/build.sh
+++ b/packages/leveldb/build.sh
@@ -2,6 +2,8 @@ TERMUX_PKG_HOMEPAGE=https://github.com/google/leveldb
 TERMUX_PKG_DESCRIPTION="Fast key-value storage library"
 TERMUX_PKG_LICENSE="BSD 3-Clause"
 TERMUX_PKG_VERSION=1.22
-TERMUX_PKG_SHA256=55423cac9e3306f4a9502c738a001e4a339d1a38ffbee7572d4a07d5d63949b2
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://github.com/google/leveldb/archive/${TERMUX_PKG_VERSION}.tar.gz
+TERMUX_PKG_SHA256=55423cac9e3306f4a9502c738a001e4a339d1a38ffbee7572d4a07d5d63949b2
+TERMUX_PKG_DEPENDS="libc++"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="-DBUILD_SHARED_LIBS=TRUE"
diff --git a/packages/lftp/build.sh b/packages/lftp/build.sh
index 78be4289c..03afb8b62 100644
--- a/packages/lftp/build.sh
+++ b/packages/lftp/build.sh
@@ -2,9 +2,11 @@ TERMUX_PKG_HOMEPAGE=https://lftp.tech/
 TERMUX_PKG_DESCRIPTION="FTP/HTTP client and file transfer program"
 TERMUX_PKG_LICENSE="GPL-3.0"
 TERMUX_PKG_VERSION=4.8.4
-TERMUX_PKG_REVISION=5
-TERMUX_PKG_SHA256=4ebc271e9e5cea84a683375a0f7e91086e5dac90c5d51bb3f169f75386107a62
+TERMUX_PKG_REVISION=6
 TERMUX_PKG_SRCURL=https://lftp.tech/ftp/lftp-${TERMUX_PKG_VERSION}.tar.xz
+TERMUX_PKG_SHA256=4ebc271e9e5cea84a683375a0f7e91086e5dac90c5d51bb3f169f75386107a62
+TERMUX_PKG_DEPENDS="libandroid-support, libc++, libexpat, libiconv, libutil, openssl, readline, libidn2, zlib"
+
 # (1) Android has dn_expand, but lftp assumes that dn_skipname then exists, which it does not on android.
 # (2) Use --with-openssl to use openssl instead of gnutls.
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
@@ -14,8 +16,6 @@ ac_cv_func_dn_expand=no
 --with-readline=$TERMUX_PREFIX
 --with-zlib=$TERMUX_PREFIX
 "
-TERMUX_PKG_DEPENDS="libandroid-support, libexpat, libiconv, openssl, readline, libutil, libidn2, zlib"
-TERMUX_PKG_BUILD_DEPENDS="ncurses-dev"
 
 termux_step_pre_configure() {
 	if [ "$TERMUX_DEBUG" == "true" ]; then
diff --git a/packages/libcaca/build.sh b/packages/libcaca/build.sh
index 0fb2b18a5..5b9e19589 100644
--- a/packages/libcaca/build.sh
+++ b/packages/libcaca/build.sh
@@ -2,12 +2,10 @@ TERMUX_PKG_HOMEPAGE=http://caca.zoy.org/wiki/libcaca
 TERMUX_PKG_DESCRIPTION="Graphics library that outputs text instead of pixels"
 TERMUX_PKG_LICENSE="WTFPL"
 TERMUX_PKG_VERSION=0.99.beta19
-TERMUX_PKG_REVISION=4
-# Switched to mirror on 2014-12-22 since master was down:
+TERMUX_PKG_REVISION=5
 TERMUX_PKG_SRCURL=http://fossies.org/linux/privat/libcaca-${TERMUX_PKG_VERSION}.tar.gz
-#		      http://caca.zoy.org/files/libcaca/libcaca-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=128b467c4ed03264c187405172a4e83049342cc8cc2f655f53a2d0ee9d3772f4
-TERMUX_PKG_DEPENDS="ncurses, zlib"
+TERMUX_PKG_DEPENDS="libc++, ncurses, zlib"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-python --disable-java --disable-ruby --disable-doc"
 
 termux_step_post_configure() {
diff --git a/packages/libcln/build.sh b/packages/libcln/build.sh
index 3750c0746..a23eea5c1 100644
--- a/packages/libcln/build.sh
+++ b/packages/libcln/build.sh
@@ -2,10 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://www.ginac.de/CLN/
 TERMUX_PKG_DESCRIPTION="CLN is a library for efficient computations with all kinds of numbers in arbitrary precision"
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_VERSION=1.3.4
-TERMUX_PKG_REVISION=4
+TERMUX_PKG_REVISION=5
 TERMUX_PKG_SRCURL=https://fossies.org/linux/privat/cln-$TERMUX_PKG_VERSION.tar.xz
 TERMUX_PKG_SHA256=c32e59b6afbcf8b84075ab454c42982429c6ea9675aee2bbda176cb85293e38f
-TERMUX_PKG_DEPENDS="libgmp"
+TERMUX_PKG_DEPENDS="libc++, libgmp"
 TERMUX_PKG_BUILD_IN_SRC=yes
 
 termux_step_pre_configure() {
diff --git a/packages/libconfig/build.sh b/packages/libconfig/build.sh
index 4d72d0ba3..84940687a 100644
--- a/packages/libconfig/build.sh
+++ b/packages/libconfig/build.sh
@@ -3,9 +3,10 @@ TERMUX_PKG_DESCRIPTION="C/C++ Configuration File Library"
 TERMUX_PKG_LICENSE="LGPL-2.0"
 TERMUX_PKG_MAINTAINER="Leonid Plyushch <leonid.plyushch@gmail.com>"
 TERMUX_PKG_VERSION=1.7.2
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_REVISION=2
 TERMUX_PKG_SRCURL=https://github.com/hyperrealm/libconfig/archive/v${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=f67ac44099916ae260a6c9e290a90809e7d782d96cdd462cac656ebc5b685726
+TERMUX_PKG_DEPENDS="libc++"
 
 termux_step_pre_configure() {
 	autoreconf -fi
diff --git a/packages/libflac/build.sh b/packages/libflac/build.sh
index bb9a0a267..7d13bd411 100644
--- a/packages/libflac/build.sh
+++ b/packages/libflac/build.sh
@@ -2,7 +2,7 @@ TERMUX_PKG_HOMEPAGE=https://xiph.org/flac/
 TERMUX_PKG_DESCRIPTION="FLAC (Free Lossless Audio Codec) library"
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_VERSION=1.3.2
-TERMUX_PKG_REVISION=8
+TERMUX_PKG_REVISION=9
 TERMUX_PKG_SRCURL=http://downloads.xiph.org/releases/flac/flac-${TERMUX_PKG_VERSION}.tar.xz
 TERMUX_PKG_SHA256=91cfc3ed61dc40f47f050a109b08610667d73477af6ef36dcad31c31a4a8d53f
-TERMUX_PKG_DEPENDS="libogg"
+TERMUX_PKG_DEPENDS="libc++, libogg"
diff --git a/packages/libgraphite/build.sh b/packages/libgraphite/build.sh
index 283e2daf4..e03b2d65a 100644
--- a/packages/libgraphite/build.sh
+++ b/packages/libgraphite/build.sh
@@ -2,7 +2,8 @@ TERMUX_PKG_HOMEPAGE=https://github.com/silnrsi/graphite
 TERMUX_PKG_DESCRIPTION="Font system for multiple languages"
 TERMUX_PKG_LICENSE="LGPL-2.0"
 TERMUX_PKG_VERSION=1.3.13
-TERMUX_PKG_REVISION=1
-TERMUX_PKG_SHA256=2f9f609deeddfe2b193502adc8df3b0396694b799a433c36e85fd1242e654cd9
+TERMUX_PKG_REVISION=2
 TERMUX_PKG_SRCURL=https://github.com/silnrsi/graphite/archive/${TERMUX_PKG_VERSION}.tar.gz
+TERMUX_PKG_SHA256=2f9f609deeddfe2b193502adc8df3b0396694b799a433c36e85fd1242e654cd9
+TERMUX_PKG_DEPENDS="libc++"
 TERMUX_PKG_RM_AFTER_INSTALL="bin/gr2fonttest"
diff --git a/packages/libgrpc/build.sh b/packages/libgrpc/build.sh
index 8c6b05ba6..02006fdc1 100644
--- a/packages/libgrpc/build.sh
+++ b/packages/libgrpc/build.sh
@@ -3,8 +3,8 @@ TERMUX_PKG_DESCRIPTION="High performance, open source, general RPC framework tha
 TERMUX_PKG_LICENSE="Apache-2.0"
 TERMUX_PKG_MAINTAINER="Vishal Biswas @vishalbiswas"
 TERMUX_PKG_VERSION=1.20.1
-TERMUX_PKG_REVISION=1
-TERMUX_PKG_DEPENDS="openssl, protobuf, c-ares, zlib"
+TERMUX_PKG_REVISION=2
+TERMUX_PKG_DEPENDS="libc++, openssl, protobuf, c-ares, zlib"
 TERMUX_PKG_BUILD_DEPENDS="libprotobuf"
 TERMUX_PKG_HOSTBUILD=true
 TERMUX_PKG_BUILD_IN_SRC=yes
diff --git a/packages/libical/build.sh b/packages/libical/build.sh
index 21e017f46..b3ef4d515 100644
--- a/packages/libical/build.sh
+++ b/packages/libical/build.sh
@@ -2,7 +2,8 @@ TERMUX_PKG_HOMEPAGE=http://libical.github.io/libical/
 TERMUX_PKG_DESCRIPTION="Libical is an Open Source implementation of the iCalendar protocols and protocol data units"
 TERMUX_PKG_LICENSE="LGPL-2.0"
 TERMUX_PKG_VERSION=3.0.5
-TERMUX_PKG_SHA256=7ad550c8c49c9b9983658e3ab3e68b1eee2439ec17b169a6b1e6ecb5274e78e6
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://github.com/libical/libical/releases/download/v$TERMUX_PKG_VERSION/libical-$TERMUX_PKG_VERSION.tar.gz
-TERMUX_PKG_DEPENDS="libxml2"
+TERMUX_PKG_SHA256=7ad550c8c49c9b9983658e3ab3e68b1eee2439ec17b169a6b1e6ecb5274e78e6
+TERMUX_PKG_DEPENDS="libc++, libxml2"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" -DSHARED_ONLY=true -DICAL_GLIB=false -DUSE_BUILTIN_TZDATA=true -DPERL_EXECUTABLE=/usr/bin/perl"
diff --git a/packages/libicu/build.sh b/packages/libicu/build.sh
index 3f7d8320c..1939985b4 100644
--- a/packages/libicu/build.sh
+++ b/packages/libicu/build.sh
@@ -1,14 +1,16 @@
 TERMUX_PKG_HOMEPAGE=http://site.icu-project.org/home
 TERMUX_PKG_DESCRIPTION='International Components for Unicode library'
 TERMUX_PKG_LICENSE="BSD"
+TERMUX_PKG_MAINTAINER="Vishal Biswas @vishalbiswas"
 TERMUX_PKG_VERSION=64.2
-TERMUX_PKG_SHA256=09762184afa33c3b1042715192da1777f9fda31688cab5b03b8b71fad1dcd0c7
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://fossies.org/linux/misc/icu4c-${TERMUX_PKG_VERSION//./_}-src.tar.xz
+TERMUX_PKG_SHA256=09762184afa33c3b1042715192da1777f9fda31688cab5b03b8b71fad1dcd0c7
+TERMUX_PKG_DEPENDS="libc++"
 TERMUX_PKG_INCLUDE_IN_DEVPACKAGE="bin/icu-config share/man/man1/icu-config.1 lib/icu share/icu"
 TERMUX_PKG_HOSTBUILD=true
 TERMUX_PKG_EXTRA_HOSTBUILD_CONFIGURE_ARGS="--disable-samples --disable-tests"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-samples --disable-tests --with-cross-build=$TERMUX_PKG_HOSTBUILD_DIR"
-TERMUX_PKG_MAINTAINER='Vishal Biswas @vishalbiswas'
 
 termux_step_post_extract_package() {
 	TERMUX_PKG_SRCDIR+="/source"
diff --git a/packages/libllvm/build.sh b/packages/libllvm/build.sh
index 6a41c6172..a466f37c0 100644
--- a/packages/libllvm/build.sh
+++ b/packages/libllvm/build.sh
@@ -2,7 +2,7 @@ TERMUX_PKG_HOMEPAGE=https://clang.llvm.org/
 TERMUX_PKG_DESCRIPTION="Modular compiler and toolchain technologies library"
 TERMUX_PKG_LICENSE="NCSA"
 TERMUX_PKG_VERSION=8.0.0
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_REVISION=2
 TERMUX_PKG_SHA256=(8872be1b12c61450cacc82b3d153eab02be2546ef34fa3580ed14137bb26224c
                    084c115aab0084e63b23eee8c233abb6739c399e29966eaeccfc6e088e0b736b
 		   9caec8ec922e32ffa130f0fb08e4c5a242d7e68ce757631e425e9eba2e1a6e37
@@ -21,7 +21,7 @@ bin/macho-dump
 lib/libgomp.a
 lib/libiomp5.a
 "
-TERMUX_PKG_DEPENDS="binutils, ncurses, ndk-sysroot, libffi, zlib"
+TERMUX_PKG_DEPENDS="binutils, libc++, ncurses, ndk-sysroot, libffi, zlib"
 # Replace gcc since gcc is deprecated by google on android and is not maintained upstream.
 # Conflict with clang versions earlier than 3.9.1-3 since they bundled llvm.
 TERMUX_PKG_CONFLICTS="gcc, clang (<< 3.9.1-3)"
diff --git a/packages/libmosquitto/build.sh b/packages/libmosquitto/build.sh
index 692453444..09e8dc7c9 100644
--- a/packages/libmosquitto/build.sh
+++ b/packages/libmosquitto/build.sh
@@ -1,11 +1,12 @@
 TERMUX_PKG_HOMEPAGE=https://mosquitto.org/
 TERMUX_PKG_DESCRIPTION="MQTT library"
 TERMUX_PKG_LICENSE="EPL-1.0"
+TERMUX_PKG_MAINTAINER="Nathaniel Wesley Filardo @nwf"
 TERMUX_PKG_VERSION=1.6.2
-TERMUX_PKG_SHA256=33499e78dfa0ca1cb488fd196fde940a66305bdfd44ba763ce2001db2569a08b
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://mosquitto.org/files/source/mosquitto-${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_DEPENDS="c-ares, libwebsockets, openssl"
-TERMUX_PKG_MAINTAINER="Nathaniel Wesley Filardo @nwf"
+TERMUX_PKG_SHA256=33499e78dfa0ca1cb488fd196fde940a66305bdfd44ba763ce2001db2569a08b
+TERMUX_PKG_DEPENDS="c-ares, libc++, libwebsockets, openssl"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -DWITH_THREADING=OFF
 -DWITH_TLS_PSK=OFF
diff --git a/packages/libprotobuf-c/build.sh b/packages/libprotobuf-c/build.sh
index 721ff4dbf..5b9993383 100644
--- a/packages/libprotobuf-c/build.sh
+++ b/packages/libprotobuf-c/build.sh
@@ -3,8 +3,7 @@ TERMUX_PKG_DESCRIPTION="Protocol buffers C library"
 TERMUX_PKG_LICENSE="BSD 3-Clause"
 TERMUX_PKG_MAINTAINER="Henrik Grimler @Grimler91"
 TERMUX_PKG_VERSION=1.3.1
-TERMUX_PKG_REVISION=1
-TERMUX_PKG_SHA256=51472d3a191d6d7b425e32b612e477c06f73fe23e07f6a6a839b11808e9d2267
+TERMUX_PKG_REVISION=2
 TERMUX_PKG_SRCURL=https://github.com/protobuf-c/protobuf-c/releases/download/v${TERMUX_PKG_VERSION}/protobuf-c-${TERMUX_PKG_VERSION}.tar.gz
-# libprotobuf-c uses libprotoc.so from protobuf in bin/protoc-gen-c.
-TERMUX_PKG_DEPENDS="protobuf"
+TERMUX_PKG_SHA256=51472d3a191d6d7b425e32b612e477c06f73fe23e07f6a6a839b11808e9d2267
+TERMUX_PKG_DEPENDS="libc++, libprotobuf, protobuf"
diff --git a/packages/libprotobuf/build.sh b/packages/libprotobuf/build.sh
index f7abaca7e..4acae93fa 100644
--- a/packages/libprotobuf/build.sh
+++ b/packages/libprotobuf/build.sh
@@ -2,10 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://github.com/google/protobuf
 TERMUX_PKG_DESCRIPTION="Protocol buffers C++ library"
 TERMUX_PKG_LICENSE="BSD 3-Clause"
 TERMUX_PKG_VERSION=3.7.1
-TERMUX_PKG_REVISION=1
-TERMUX_PKG_SHA256=f1748989842b46fa208b2a6e4e2785133cfcc3e4d43c17fecb023733f0f5443f
+TERMUX_PKG_REVISION=2
 TERMUX_PKG_SRCURL=https://github.com/google/protobuf/archive/v${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_DEPENDS="zlib"
+TERMUX_PKG_SHA256=f1748989842b46fa208b2a6e4e2785133cfcc3e4d43c17fecb023733f0f5443f
+TERMUX_PKG_DEPENDS="libc++, zlib"
 TERMUX_PKG_FORCE_CMAKE=yes
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -Dprotobuf_BUILD_TESTS=OFF
diff --git a/packages/libtiff/build.sh b/packages/libtiff/build.sh
index 275cdb6dc..08572ce53 100644
--- a/packages/libtiff/build.sh
+++ b/packages/libtiff/build.sh
@@ -2,8 +2,8 @@ TERMUX_PKG_HOMEPAGE=http://www.simplesystems.org/libtiff/ # Note that http://lib
 TERMUX_PKG_DESCRIPTION="Support for the Tag Image File Format (TIFF) for storing image data"
 TERMUX_PKG_LICENSE="BSD"
 TERMUX_PKG_VERSION=4.0.10
-TERMUX_PKG_REVISION=4
-TERMUX_PKG_SHA256=2c52d11ccaf767457db0c46795d9c7d1a8d8f76f68b0b800a3dfe45786b996e4
+TERMUX_PKG_REVISION=5
 TERMUX_PKG_SRCURL=http://download.osgeo.org/libtiff/tiff-${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_DEPENDS="libjpeg-turbo, liblzma, zlib"
+TERMUX_PKG_SHA256=2c52d11ccaf767457db0c46795d9c7d1a8d8f76f68b0b800a3dfe45786b996e4
+TERMUX_PKG_DEPENDS="libc++, libjpeg-turbo, liblzma, zlib"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-webp --disable-zstd"
diff --git a/packages/libvpx/build.sh b/packages/libvpx/build.sh
index 4a3f4a6d3..d87b5e16b 100644
--- a/packages/libvpx/build.sh
+++ b/packages/libvpx/build.sh
@@ -2,9 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://www.webmproject.org
 TERMUX_PKG_DESCRIPTION="VP8 & VP9 Codec SDK"
 TERMUX_PKG_LICENSE="BSD 3-Clause"
 TERMUX_PKG_VERSION=1.8.0
-TERMUX_PKG_REVISION=1
-TERMUX_PKG_SHA256=86df18c694e1c06cc8f83d2d816e9270747a0ce6abe316e93a4f4095689373f6
+TERMUX_PKG_REVISION=2
 TERMUX_PKG_SRCURL=https://github.com/webmproject/libvpx/archive/v${TERMUX_PKG_VERSION}.tar.gz
+TERMUX_PKG_SHA256=86df18c694e1c06cc8f83d2d816e9270747a0ce6abe316e93a4f4095689373f6
+TERMUX_PKG_DEPENDS="libc++"
 
 termux_step_configure() {
 	# Force fresh install of header files:
diff --git a/packages/libx265/build.sh b/packages/libx265/build.sh
index 868010ad1..ea855bf5d 100644
--- a/packages/libx265/build.sh
+++ b/packages/libx265/build.sh
@@ -2,9 +2,10 @@ TERMUX_PKG_HOMEPAGE=http://x265.org/
 TERMUX_PKG_DESCRIPTION="H.265/HEVC video stream encoder library"
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_VERSION=3.0
-TERMUX_PKG_REVISION=1
-TERMUX_PKG_SHA256=c5b9fc260cabbc4a81561a448f4ce9cad7218272b4011feabc3a6b751b2f0662
+TERMUX_PKG_REVISION=2
 TERMUX_PKG_SRCURL=http://ftp.videolan.org/pub/videolan/x265/x265_${TERMUX_PKG_VERSION}.tar.gz
+TERMUX_PKG_SHA256=c5b9fc260cabbc4a81561a448f4ce9cad7218272b4011feabc3a6b751b2f0662
+TERMUX_PKG_DEPENDS="libc++"
 
 termux_step_pre_configure() {
 	if [ $TERMUX_ARCH = "i686" ]; then
diff --git a/packages/libxapian/build.sh b/packages/libxapian/build.sh
index bcb194972..1728c2d5c 100644
--- a/packages/libxapian/build.sh
+++ b/packages/libxapian/build.sh
@@ -2,10 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://xapian.org
 TERMUX_PKG_DESCRIPTION="Xapian search engine library"
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_VERSION=1.4.11
-TERMUX_PKG_REVISION=1
-TERMUX_PKG_SHA256=9f16b2f3e2351a24034d7636f73566ab74c3f0729e9e0492934e956b25c5bc07
+TERMUX_PKG_REVISION=2
 TERMUX_PKG_SRCURL=http://oligarchy.co.uk/xapian/${TERMUX_PKG_VERSION}/xapian-core-${TERMUX_PKG_VERSION}.tar.xz
+TERMUX_PKG_SHA256=9f16b2f3e2351a24034d7636f73566ab74c3f0729e9e0492934e956b25c5bc07
 # Note that we cannot /proc/sys/kernel/random/uuid (permission denied on
 # new android versions) so need libuuid.
-TERMUX_PKG_DEPENDS="libuuid, zlib"
+TERMUX_PKG_DEPENDS="libc++, libuuid, zlib"
 TERMUX_PKG_INCLUDE_IN_DEVPACKAGE="bin/xapian-config share/man/man1/xapian-config.1"
diff --git a/packages/libzmq/build.sh b/packages/libzmq/build.sh
index e5cc95bd5..d569f0de5 100644
--- a/packages/libzmq/build.sh
+++ b/packages/libzmq/build.sh
@@ -2,10 +2,10 @@ TERMUX_PKG_HOMEPAGE=http://zeromq.org/
 TERMUX_PKG_DESCRIPTION="Fast messaging system built on sockets. C and C++ bindings. aka 0MQ, ZMQ."
 TERMUX_PKG_LICENSE="LGPL-2.0"
 TERMUX_PKG_VERSION=4.3.1
-TERMUX_PKG_REVISION=1
-TERMUX_PKG_SHA256=bcbabe1e2c7d0eec4ed612e10b94b112dd5f06fcefa994a0c79a45d835cd21eb
+TERMUX_PKG_REVISION=2
 TERMUX_PKG_SRCURL=https://github.com/zeromq/libzmq/releases/download/v${TERMUX_PKG_VERSION}/zeromq-${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_DEPENDS="libsodium"
+TERMUX_PKG_SHA256=bcbabe1e2c7d0eec4ed612e10b94b112dd5f06fcefa994a0c79a45d835cd21eb
+TERMUX_PKG_DEPENDS="libc++, libsodium"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--with-libsodium --disable-libunwind --disable-Werror"
 
 termux_step_post_extract_package() {
diff --git a/packages/libzopfli/build.sh b/packages/libzopfli/build.sh
index 4e9cecb1a..937921712 100644
--- a/packages/libzopfli/build.sh
+++ b/packages/libzopfli/build.sh
@@ -2,9 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://github.com/google/zopfli
 TERMUX_PKG_DESCRIPTION="New zlib compatible compressor library"
 TERMUX_PKG_LICENSE="Apache-2.0"
 TERMUX_PKG_VERSION=1.0.2
-TERMUX_PKG_REVISION=2
-TERMUX_PKG_SHA256=4a570307c37172d894ec4ef93b6e8e3aacc401e78cbcc51cf85b212dbc379a55
+TERMUX_PKG_REVISION=3
 TERMUX_PKG_SRCURL=https://github.com/google/zopfli/archive/zopfli-${TERMUX_PKG_VERSION}.tar.gz
+TERMUX_PKG_SHA256=4a570307c37172d894ec4ef93b6e8e3aacc401e78cbcc51cf85b212dbc379a55
+TERMUX_PKG_DEPENDS="libc++"
 TERMUX_PKG_BUILD_IN_SRC=yes
 
 termux_step_post_make_install() {
diff --git a/packages/lldb/build.sh b/packages/lldb/build.sh
index a97097d70..1121fe267 100644
--- a/packages/lldb/build.sh
+++ b/packages/lldb/build.sh
@@ -2,9 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://lldb.llvm.org
 TERMUX_PKG_DESCRIPTION="LLVM based debugger"
 TERMUX_PKG_LICENSE="NCSA"
 TERMUX_PKG_VERSION=8.0.0
-TERMUX_PKG_SHA256=49918b9f09816554a20ac44c5f85a32dc0a7a00759b3259e78064d674eac0373
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://releases.llvm.org/${TERMUX_PKG_VERSION}/lldb-$TERMUX_PKG_VERSION.src.tar.xz
-TERMUX_PKG_DEPENDS="libedit, libllvm, libxml2, ncurses-ui-libs"
+TERMUX_PKG_SHA256=49918b9f09816554a20ac44c5f85a32dc0a7a00759b3259e78064d674eac0373
+TERMUX_PKG_DEPENDS="libc++, libedit, libllvm, libxml2, ncurses-ui-libs"
 TERMUX_PKG_HAS_DEBUG=no
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -DLLDB_DISABLE_CURSES=0
diff --git a/packages/ltrace/build.sh b/packages/ltrace/build.sh
index d563b5be8..e7043f03f 100644
--- a/packages/ltrace/build.sh
+++ b/packages/ltrace/build.sh
@@ -2,11 +2,12 @@ TERMUX_PKG_HOMEPAGE=http://www.ltrace.org/
 TERMUX_PKG_DESCRIPTION="Tracks runtime library calls in dynamically linked programs"
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_VERSION=0.7.3.20160411
-TERMUX_PKG_REVISION=4
-TERMUX_PKG_DEPENDS="libelf"
+TERMUX_PKG_REVISION=5
 local _COMMIT=2def9f1217374cc8371105993003b2c663aefda7
 TERMUX_PKG_SRCURL=https://github.com/dkogan/ltrace/archive/${_COMMIT}.zip
 TERMUX_PKG_SHA256=d089ae8affd8af782c12aed7ba97f44c7f55b60033ec78ab07e415e7b091a90c
+TERMUX_PKG_DEPENDS="libc++, libelf"
+
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 --disable-werror
 --without-libunwind
diff --git a/packages/lzip/build.sh b/packages/lzip/build.sh
index 3ba7e8b09..ae6ce17ef 100644
--- a/packages/lzip/build.sh
+++ b/packages/lzip/build.sh
@@ -2,6 +2,7 @@ TERMUX_PKG_HOMEPAGE=https://www.nongnu.org/lzip/
 TERMUX_PKG_DESCRIPTION="Lossless data compressor similar to gzip and bzip2"
 TERMUX_PKG_LICENSE="GPL-3.0"
 TERMUX_PKG_VERSION=1.21
-TERMUX_PKG_REVISION=1
-TERMUX_PKG_SHA256=68c703c7b5198b3fd7a0c3f20011e9a8c938b8dec14824c4c873922fdb01719f
+TERMUX_PKG_REVISION=2
 TERMUX_PKG_SRCURL=https://download.savannah.gnu.org/releases/lzip/lzip-${TERMUX_PKG_VERSION}.tar.lz
+TERMUX_PKG_SHA256=68c703c7b5198b3fd7a0c3f20011e9a8c938b8dec14824c4c873922fdb01719f
+TERMUX_PKG_DEPENDS="libc++"
diff --git a/packages/mariadb/build.sh b/packages/mariadb/build.sh
index 8f2bd40a4..284dd1518 100644
--- a/packages/mariadb/build.sh
+++ b/packages/mariadb/build.sh
@@ -1,10 +1,13 @@
 TERMUX_PKG_HOMEPAGE=https://mariadb.org
 TERMUX_PKG_DESCRIPTION="A drop-in replacement for mysql server"
 TERMUX_PKG_LICENSE="GPL-2.0"
+TERMUX_PKG_MAINTAINER="Vishal Biswas @vishalbiswas"
 TERMUX_PKG_VERSION=10.3.14
-TERMUX_PKG_REVISION=2
-TERMUX_PKG_SHA256=ba1c94d92fc8ebdf9b8a1d1b93ed6aeeead33da507efbbd4afcf49f32023e054
+TERMUX_PKG_REVISION=3
 TERMUX_PKG_SRCURL=https://ftp.osuosl.org/pub/mariadb/mariadb-$TERMUX_PKG_VERSION/source/mariadb-$TERMUX_PKG_VERSION.tar.gz
+TERMUX_PKG_SHA256=ba1c94d92fc8ebdf9b8a1d1b93ed6aeeead33da507efbbd4afcf49f32023e054
+TERMUX_PKG_DEPENDS="libc++, libiconv, liblzma, ncurses, libedit, openssl, pcre, libcrypt, libandroid-support, libandroid-glob, zlib"
+
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -DBISON_EXECUTABLE=$(which bison)
 -DGETCONF=$(which getconf)
@@ -47,9 +50,8 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -DWITH_UNIT_TESTS=OFF
 -DINSTALL_SYSCONFDIR=$TERMUX_PREFIX/etc
 "
+
 TERMUX_PKG_HOSTBUILD=true
-TERMUX_PKG_DEPENDS="libiconv, liblzma, ncurses, libedit, openssl, pcre, libcrypt, libandroid-support, libandroid-glob, zlib"
-TERMUX_PKG_MAINTAINER="Vishal Biswas @vishalbiswas"
 TERMUX_PKG_CONFLICTS="mysql"
 TERMUX_PKG_RM_AFTER_INSTALL="bin/mysqltest*"
 
diff --git a/packages/mosh/build.sh b/packages/mosh/build.sh
index 930bc7529..b1676a403 100644
--- a/packages/mosh/build.sh
+++ b/packages/mosh/build.sh
@@ -2,10 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://mosh.org
 TERMUX_PKG_DESCRIPTION="Mobile shell that supports roaming and intelligent local echo"
 TERMUX_PKG_LICENSE="GPL-3.0"
 TERMUX_PKG_VERSION=1.3.2
-TERMUX_PKG_REVISION=12
-TERMUX_PKG_SHA256=da600573dfa827d88ce114e0fed30210689381bbdcff543c931e4d6a2e851216
+TERMUX_PKG_REVISION=13
 TERMUX_PKG_SRCURL=https://github.com/mobile-shell/mosh/releases/download/mosh-${TERMUX_PKG_VERSION}/mosh-${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_DEPENDS="libandroid-support, libprotobuf, ncurses, openssl, openssh, libutil"
+TERMUX_PKG_SHA256=da600573dfa827d88ce114e0fed30210689381bbdcff543c931e4d6a2e851216
+TERMUX_PKG_DEPENDS="libandroid-support, libc++, libprotobuf, ncurses, openssl, libutil, openssh"
 
 termux_step_pre_configure() {
 	termux_setup_protobuf
diff --git a/packages/mpd/build.sh b/packages/mpd/build.sh
index c18ec41ff..875887d4c 100644
--- a/packages/mpd/build.sh
+++ b/packages/mpd/build.sh
@@ -2,9 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://www.musicpd.org
 TERMUX_PKG_DESCRIPTION="Music player daemon"
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_VERSION=0.21.10
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://github.com/MusicPlayerDaemon/MPD/archive/v$TERMUX_PKG_VERSION.tar.gz
 TERMUX_PKG_SHA256=ed7d2036383ee7a191e28b9c3b36c33403e10166ab32da8a960e21af36e1148a
-TERMUX_PKG_DEPENDS="libcurl, libid3tag, libopus, libpulseaudio, libmpdclient, openal-soft, libvorbis, libsqlite, ffmpeg, libmp3lame, libbz2, libogg, libnfs, zlib"
+TERMUX_PKG_DEPENDS="libc++, libcurl, libid3tag, libopus, libpulseaudio, libmpdclient, openal-soft, libvorbis, libsqlite, ffmpeg, libmp3lame, libbz2, libogg, libnfs, zlib"
 TERMUX_PKG_BUILD_DEPENDS="boost"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -Dalsa=disabled
diff --git a/packages/mu/build.sh b/packages/mu/build.sh
index 15e050447..245619308 100644
--- a/packages/mu/build.sh
+++ b/packages/mu/build.sh
@@ -2,6 +2,7 @@ TERMUX_PKG_HOMEPAGE=https://www.djcbsoftware.nl/code/mu/
 TERMUX_PKG_DESCRIPTION="Maildir indexer/searcher and Emacs client (mu4e)"
 TERMUX_PKG_LICENSE="GPL-3.0"
 TERMUX_PKG_VERSION=1.2
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://github.com/djcb/mu/releases/download/$TERMUX_PKG_VERSION/mu-$TERMUX_PKG_VERSION.0.tar.xz
 TERMUX_PKG_SHA256=f634c7f244dc6844ff71dc3c3e1893e48e193caa9e0e747eba616309775f053a
-TERMUX_PKG_DEPENDS="glib, libxapian, libgmime"
+TERMUX_PKG_DEPENDS="glib, libc++, libxapian, libgmime"
diff --git a/packages/ncmpcpp/build.sh b/packages/ncmpcpp/build.sh
index 3b08da560..301227165 100644
--- a/packages/ncmpcpp/build.sh
+++ b/packages/ncmpcpp/build.sh
@@ -2,10 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://rybczak.net/ncmpcpp/
 TERMUX_PKG_DESCRIPTION="NCurses Music Player Client (Plus Plus)"
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_VERSION=0.8.2
-TERMUX_PKG_REVISION=8
-TERMUX_PKG_SHA256=650ba3e8089624b7ad9e4cc19bc1ac6028edb7523cc111fa1686ea44c0921554
+TERMUX_PKG_REVISION=9
 TERMUX_PKG_SRCURL=https://rybczak.net/ncmpcpp/stable/ncmpcpp-${TERMUX_PKG_VERSION}.tar.bz2
-TERMUX_PKG_DEPENDS="fftw, boost, readline, libcurl, libmpdclient, ncurses, zlib"
+TERMUX_PKG_SHA256=650ba3e8089624b7ad9e4cc19bc1ac6028edb7523cc111fa1686ea44c0921554
+TERMUX_PKG_DEPENDS="fftw, boost, readline, libandroid-support, libc++, libcurl, libmpdclient, ncurses, zlib"
 TERMUX_PKG_BUILD_IN_SRC=yes
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--enable-visualizer --enable-outputs --enable-clock"
 
diff --git a/packages/ndk-multilib/build.sh b/packages/ndk-multilib/build.sh
index 822d75628..0d8d31033 100644
--- a/packages/ndk-multilib/build.sh
+++ b/packages/ndk-multilib/build.sh
@@ -2,6 +2,7 @@ TERMUX_PKG_HOMEPAGE=https://developer.android.com/tools/sdk/ndk/index.html
 TERMUX_PKG_DESCRIPTION="Multilib binaries for cross-compilation"
 TERMUX_PKG_LICENSE="NCSA"
 TERMUX_PKG_VERSION=$TERMUX_NDK_VERSION
+TERMUX_PKG_REVISION=0
 TERMUX_PKG_NO_DEVELSPLIT=yes
 TERMUX_PKG_KEEP_STATIC_LIBRARIES="true"
 TERMUX_PKG_PLATFORM_INDEPENDENT=true
diff --git a/packages/ndk-sysroot/build.sh b/packages/ndk-sysroot/build.sh
index 68f65d982..9cef0defd 100644
--- a/packages/ndk-sysroot/build.sh
+++ b/packages/ndk-sysroot/build.sh
@@ -2,7 +2,6 @@ TERMUX_PKG_HOMEPAGE=https://developer.android.com/tools/sdk/ndk/index.html
 TERMUX_PKG_DESCRIPTION="System header and library files from the Android NDK needed for compiling C programs"
 TERMUX_PKG_LICENSE="NCSA"
 TERMUX_PKG_VERSION=$TERMUX_NDK_VERSION
-TERMUX_PKG_REVISION=4
 TERMUX_PKG_NO_DEVELSPLIT=yes
 TERMUX_PKG_KEEP_STATIC_LIBRARIES="true"
 # This package has taken over <pty.h> from the previous libutil-dev
@@ -41,7 +40,7 @@ termux_step_extract_into_massagedir() {
 	if [ $TERMUX_ARCH = "arm" ]; then
 		rm thumb -rf
 		cp $TERMUX_STANDALONE_TOOLCHAIN/sysroot/usr/lib/$TERMUX_HOST_PLATFORM/libunwind.a .
-	fi                                               
+	fi
 	ln -f -s $_SYSTEM_LIBDIR/libc.so librt.so
 	ln -f -s $_SYSTEM_LIBDIR/libc.so libpthread.so
 }
diff --git a/packages/newsboat/build.sh b/packages/newsboat/build.sh
index 95e47426c..8b4e6ca4e 100644
--- a/packages/newsboat/build.sh
+++ b/packages/newsboat/build.sh
@@ -2,10 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://newsboat.org/
 TERMUX_PKG_DESCRIPTION="RSS/Atom feed reader for the text console"
 TERMUX_PKG_LICENSE="MIT"
 TERMUX_PKG_VERSION=2.15
-TERMUX_PKG_REVISION=1
-TERMUX_PKG_SHA256=da68ce93c02dda908a471ef8994bb3c668f060eb6046d486c3f05649c6650db7
+TERMUX_PKG_REVISION=2
 TERMUX_PKG_SRCURL=https://newsboat.org/releases/${TERMUX_PKG_VERSION}/newsboat-${TERMUX_PKG_VERSION}.tar.xz
-TERMUX_PKG_DEPENDS="libiconv, libandroid-support, libandroid-glob, json-c, libsqlite, libcurl, libxml2, stfl, ncurses, openssl"
+TERMUX_PKG_SHA256=da68ce93c02dda908a471ef8994bb3c668f060eb6046d486c3f05649c6650db7
+TERMUX_PKG_DEPENDS="libc++, libiconv, libandroid-support, libandroid-glob, json-c, libsqlite, libcurl, libxml2, stfl, ncurses, openssl"
 TERMUX_PKG_BUILD_IN_SRC=yes
 TERMUX_PKG_RM_AFTER_INSTALL="share/locale"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="ac_cv_lib_bsd_main=no"
diff --git a/packages/ninja/build.sh b/packages/ninja/build.sh
index cd69e7921..5299392dd 100644
--- a/packages/ninja/build.sh
+++ b/packages/ninja/build.sh
@@ -2,9 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://ninja-build.org
 TERMUX_PKG_DESCRIPTION="A small build system with a focus on speed"
 TERMUX_PKG_LICENSE="Apache-2.0"
 TERMUX_PKG_VERSION=1.9.0
-TERMUX_PKG_REVISION=1
-TERMUX_PKG_SHA256=5d7ec75828f8d3fd1a0c2f31b5b0cea780cdfe1031359228c428c1a48bfcd5b9
+TERMUX_PKG_REVISION=2
 TERMUX_PKG_SRCURL=https://github.com/ninja-build/ninja/archive/v${TERMUX_PKG_VERSION}.tar.gz
+TERMUX_PKG_SHA256=5d7ec75828f8d3fd1a0c2f31b5b0cea780cdfe1031359228c428c1a48bfcd5b9
+TERMUX_PKG_DEPENDS="libc++"
 
 termux_step_configure() {
 	$TERMUX_PKG_SRCDIR/configure.py
diff --git a/packages/nmap/build.sh b/packages/nmap/build.sh
index c0e255571..b51e690f6 100644
--- a/packages/nmap/build.sh
+++ b/packages/nmap/build.sh
@@ -2,12 +2,12 @@ TERMUX_PKG_HOMEPAGE=https://nmap.org/
 TERMUX_PKG_DESCRIPTION="Utility for network discovery and security auditing"
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_VERSION=7.70
-TERMUX_PKG_REVISION=5
-TERMUX_PKG_SHA256=847b068955f792f4cc247593aca6dc3dc4aae12976169873247488de147a6e18
+TERMUX_PKG_REVISION=6
 TERMUX_PKG_SRCURL=https://nmap.org/dist/nmap-${TERMUX_PKG_VERSION}.tar.bz2
+TERMUX_PKG_SHA256=847b068955f792f4cc247593aca6dc3dc4aae12976169873247488de147a6e18
 # Depend on netcat so that it gets installed automatically when installing
 # nmap, since the ncat program is usually distributed as part of nmap.
-TERMUX_PKG_DEPENDS="libpcap, pcre, openssl, resolv-conf, netcat, liblua, libssh2, zlib"
+TERMUX_PKG_DEPENDS="libc++, libpcap, pcre, openssl, resolv-conf, netcat, liblua, libssh2, zlib"
 # --without-nmap-update to avoid linking against libsvn_client:
 # --without-zenmap to avoid python scripts for graphical gtk frontend:
 # --without-ndiff to avoid python2-using ndiff utility:
diff --git a/packages/nodejs-lts/build.sh b/packages/nodejs-lts/build.sh
index 2ee4af073..cb5a7c492 100644
--- a/packages/nodejs-lts/build.sh
+++ b/packages/nodejs-lts/build.sh
@@ -2,13 +2,13 @@ TERMUX_PKG_HOMEPAGE=https://nodejs.org/
 TERMUX_PKG_DESCRIPTION="Platform built on Chrome's JavaScript runtime for easily building fast, scalable network applications"
 TERMUX_PKG_LICENSE="MIT"
 TERMUX_PKG_VERSION=10.16.0
-TERMUX_PKG_REVISION=1
-TERMUX_PKG_SHA256=18e37f891d10ea7fbc8f6410c444c2b1d9cc3cbbb1d35aa9c41f761816956608
+TERMUX_PKG_REVISION=2
 TERMUX_PKG_SRCURL=https://nodejs.org/dist/v${TERMUX_PKG_VERSION}/node-v${TERMUX_PKG_VERSION}.tar.xz
+TERMUX_PKG_SHA256=18e37f891d10ea7fbc8f6410c444c2b1d9cc3cbbb1d35aa9c41f761816956608
 # Note that we do not use a shared libuv to avoid an issue with the Android
 # linker, which does not use symbols of linked shared libraries when resolving
 # symbols on dlopen(). See https://github.com/termux/termux-packages/issues/462.
-TERMUX_PKG_DEPENDS="openssl, c-ares, libicu"
+TERMUX_PKG_DEPENDS="libc++, openssl, c-ares, libicu, zlib"
 TERMUX_PKG_RM_AFTER_INSTALL="lib/node_modules/npm/html lib/node_modules/npm/make.bat share/systemtap lib/dtrace"
 TERMUX_PKG_BUILD_IN_SRC=yes
 TERMUX_PKG_CONFLICTS="nodejs"
diff --git a/packages/nodejs/build.sh b/packages/nodejs/build.sh
index 2e9bedf26..08a0a5f8c 100644
--- a/packages/nodejs/build.sh
+++ b/packages/nodejs/build.sh
@@ -2,12 +2,13 @@ TERMUX_PKG_HOMEPAGE=https://nodejs.org/
 TERMUX_PKG_DESCRIPTION="Platform built on Chrome's JavaScript runtime for easily building fast, scalable network applications"
 TERMUX_PKG_LICENSE="MIT"
 TERMUX_PKG_VERSION=12.4.0
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://nodejs.org/dist/v${TERMUX_PKG_VERSION}/node-v${TERMUX_PKG_VERSION}.tar.xz
 TERMUX_PKG_SHA256=20b52366d3502c60d4aec0bd5052c841a94bf1cd5d74b2ea1e498c1a2ada8ce3
 # Note that we do not use a shared libuv to avoid an issue with the Android
 # linker, which does not use symbols of linked shared libraries when resolving
 # symbols on dlopen(). See https://github.com/termux/termux-packages/issues/462.
-TERMUX_PKG_DEPENDS="openssl, c-ares, libicu"
+TERMUX_PKG_DEPENDS="libc++, openssl, c-ares, libicu, zlib"
 TERMUX_PKG_RM_AFTER_INSTALL="lib/node_modules/npm/html lib/node_modules/npm/make.bat share/systemtap lib/dtrace"
 TERMUX_PKG_BUILD_IN_SRC=yes
 TERMUX_PKG_CONFLICTS="nodejs-lts, nodejs-current"
diff --git a/packages/notmuch/build.sh b/packages/notmuch/build.sh
index 69f2fbbad..ad1cc2c08 100644
--- a/packages/notmuch/build.sh
+++ b/packages/notmuch/build.sh
@@ -2,10 +2,11 @@ TERMUX_PKG_HOMEPAGE=https://notmuchmail.org
 TERMUX_PKG_DESCRIPTION="Thread-based email index, search and tagging system"
 TERMUX_PKG_LICENSE="GPL-3.0"
 TERMUX_PKG_VERSION=0.28.4
-TERMUX_PKG_SHA256=bab1cabb0542ce2bd4b41a15b84a8d81c8dc3332162705ded6f311dd898656ca
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://notmuchmail.org/releases/notmuch-${TERMUX_PKG_VERSION}.tar.gz
+TERMUX_PKG_SHA256=bab1cabb0542ce2bd4b41a15b84a8d81c8dc3332162705ded6f311dd898656ca
+TERMUX_PKG_DEPENDS="glib, libc++, libgmime, libtalloc, libxapian, zlib"
 TERMUX_PKG_BUILD_IN_SRC=yes
-TERMUX_PKG_DEPENDS="glib, libgmime, libtalloc, libxapian, zlib"
 
 termux_step_configure() {
 	# Use python3 so that the python3-sphinx package is
diff --git a/packages/nzbget/build.sh b/packages/nzbget/build.sh
index 64ee5da9e..d8186d16e 100644
--- a/packages/nzbget/build.sh
+++ b/packages/nzbget/build.sh
@@ -2,9 +2,11 @@ TERMUX_PKG_HOMEPAGE=https://nzbget.net/
 TERMUX_PKG_DESCRIPTION="The most efficient usenet downloader"
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_VERSION=21.0
-TERMUX_PKG_SHA256=65a5d58eb8f301e62cf086b72212cbf91de72316ffc19182ae45119ddd058d53
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://github.com/nzbget/nzbget/releases/download/v${TERMUX_PKG_VERSION}/nzbget-${TERMUX_PKG_VERSION}-src.tar.gz
-TERMUX_PKG_DEPENDS="libxml2, ncurses, openssl, unrar, p7zip, zlib"
+TERMUX_PKG_SHA256=65a5d58eb8f301e62cf086b72212cbf91de72316ffc19182ae45119ddd058d53
+TERMUX_PKG_DEPENDS="libc++, libxml2, ncurses, openssl, p7zip, zlib"
+TERMUX_PKG_RECOMMENDS="unrar"
 TERMUX_PKG_BUILD_IN_SRC=yes
 
 termux_step_create_debscripts() {
diff --git a/packages/ocrad/build.sh b/packages/ocrad/build.sh
index 081a90cd1..83b0b31df 100644
--- a/packages/ocrad/build.sh
+++ b/packages/ocrad/build.sh
@@ -2,5 +2,7 @@ TERMUX_PKG_HOMEPAGE=https://www.gnu.org/software/ocrad/ocrad.html
 TERMUX_PKG_DESCRIPTION="Optical Character Recognition program based on a feature extraction method"
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_VERSION=0.27
-TERMUX_PKG_SHA256=a9bfe67e9a040907aff5640dca56392476b6a89e48e37dc94ba846c5b6733b36
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/ocrad/ocrad-${TERMUX_PKG_VERSION}.tar.lz
+TERMUX_PKG_SHA256=a9bfe67e9a040907aff5640dca56392476b6a89e48e37dc94ba846c5b6733b36
+TERMUX_PKG_DEPENDS="libc++"
diff --git a/packages/p7zip/build.sh b/packages/p7zip/build.sh
index 4c815326d..8a2cdaff9 100644
--- a/packages/p7zip/build.sh
+++ b/packages/p7zip/build.sh
@@ -3,9 +3,10 @@ TERMUX_PKG_DESCRIPTION="Command-line version of the 7zip compressed file archive
 TERMUX_PKG_LICENSE="LGPL-2.1"
 TERMUX_PKG_MAINTAINER="Francisco Demartino @franciscod"
 TERMUX_PKG_VERSION=16.02
-TERMUX_PKG_REVISION=3
-TERMUX_PKG_SHA256=5eb20ac0e2944f6cb9c2d51dd6c4518941c185347d4089ea89087ffdd6e2341f
+TERMUX_PKG_REVISION=4
 TERMUX_PKG_SRCURL=https://downloads.sourceforge.net/project/p7zip/p7zip/${TERMUX_PKG_VERSION}/p7zip_${TERMUX_PKG_VERSION}_src_all.tar.bz2
+TERMUX_PKG_SHA256=5eb20ac0e2944f6cb9c2d51dd6c4518941c185347d4089ea89087ffdd6e2341f
+TERMUX_PKG_DEPENDS="libc++"
 TERMUX_PKG_BUILD_IN_SRC=yes
 
 termux_step_configure() {
diff --git a/packages/par2/build.sh b/packages/par2/build.sh
index 01f32a59a..81eee0ced 100644
--- a/packages/par2/build.sh
+++ b/packages/par2/build.sh
@@ -1,11 +1,11 @@
 TERMUX_PKG_HOMEPAGE=https://github.com/Parchive/par2cmdline
 TERMUX_PKG_DESCRIPTION="par2cmdline is a PAR 2.0 compatible file verification and repair tool."
 TERMUX_PKG_LICENSE="GPL-2.0"
-TERMUX_PKG_VERSION=0.8.0
-TERMUX_PKG_REVISION=1
-TERMUX_PKG_SHA256=461b45627a0d800061657b2d800c432c7d1c86c859b40a3ced35a0cc6a85faca
 TERMUX_PKG_MAINTAINER="Oliver Schmidhauser @Neo-Oli"
+TERMUX_PKG_VERSION=0.8.0
+TERMUX_PKG_REVISION=2
 TERMUX_PKG_SRCURL=https://github.com/Parchive/par2cmdline/archive/v${TERMUX_PKG_VERSION}.tar.gz
+TERMUX_PKG_SHA256=461b45627a0d800061657b2d800c432c7d1c86c859b40a3ced35a0cc6a85faca
 TERMUX_PKG_BUILD_IN_SRC=yes
 
 termux_step_pre_configure() {
diff --git a/packages/patchelf/build.sh b/packages/patchelf/build.sh
index 9b2aa4c3e..e4de49ef2 100644
--- a/packages/patchelf/build.sh
+++ b/packages/patchelf/build.sh
@@ -2,8 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://nixos.org/patchelf.html
 TERMUX_PKG_DESCRIPTION="Utility to modify the dynamic linker and RPATH of ELF executables"
 TERMUX_PKG_LICENSE="GPL-3.0"
 TERMUX_PKG_VERSION=0.10
-TERMUX_PKG_SHA256=b3cb6bdedcef5607ce34a350cf0b182eb979f8f7bc31eae55a93a70a3f020d13
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://github.com/NixOS/patchelf/archive/$TERMUX_PKG_VERSION.tar.gz
+TERMUX_PKG_SHA256=b3cb6bdedcef5607ce34a350cf0b182eb979f8f7bc31eae55a93a70a3f020d13
+TERMUX_PKG_DEPENDS="libc++"
 TERMUX_PKG_BUILD_IN_SRC=yes
 
 termux_step_pre_configure() {
diff --git a/packages/pdfgrep/build.sh b/packages/pdfgrep/build.sh
index 04ffd1430..cc11a391b 100644
--- a/packages/pdfgrep/build.sh
+++ b/packages/pdfgrep/build.sh
@@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="Command line utility to search text in PDF files"
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_MAINTAINER="Leonid Plyushch <leonid.plyushch@gmail.com>"
 TERMUX_PKG_VERSION=2.1.2
-TERMUX_PKG_REVISION=3
+TERMUX_PKG_REVISION=4
 TERMUX_PKG_SRCURL=https://pdfgrep.org/download/pdfgrep-$TERMUX_PKG_VERSION.tar.gz
 TERMUX_PKG_SHA256=0ef3dca1d749323f08112ffe68e6f4eb7bc25f56f90a2e933db477261b082aba
 TERMUX_PKG_DEPENDS="libc++, libgcrypt, libgpg-error, pcre, poppler"
diff --git a/packages/play-audio/build.sh b/packages/play-audio/build.sh
index 7a49bf3a6..60f72aacc 100644
--- a/packages/play-audio/build.sh
+++ b/packages/play-audio/build.sh
@@ -2,9 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://github.com/termux/play-audio
 TERMUX_PKG_DESCRIPTION="Simple commandline audio player for Android"
 TERMUX_PKG_LICENSE="Apache-2.0"
 TERMUX_PKG_VERSION=0.5
-TERMUX_PKG_REVISION=2
-TERMUX_PKG_SHA256=e114123c4b337cddb1d4aa6c3287574d8c81b2dc4b3abc07ce21616fa14f9e82
+TERMUX_PKG_REVISION=3
 TERMUX_PKG_SRCURL=https://github.com/termux/play-audio/archive/v${TERMUX_PKG_VERSION}.tar.gz
+TERMUX_PKG_SHA256=e114123c4b337cddb1d4aa6c3287574d8c81b2dc4b3abc07ce21616fa14f9e82
+TERMUX_PKG_DEPENDS="libc++"
 TERMUX_PKG_BUILD_IN_SRC=yes
 
 termux_step_post_make_install() {
diff --git a/packages/poppler/build.sh b/packages/poppler/build.sh
index abe697725..f72a0ed05 100644
--- a/packages/poppler/build.sh
+++ b/packages/poppler/build.sh
@@ -1,12 +1,11 @@
 TERMUX_PKG_HOMEPAGE=https://poppler.freedesktop.org/
 TERMUX_PKG_DESCRIPTION="PDF rendering library"
 TERMUX_PKG_LICENSE="GPL-2.0"
-TERMUX_PKG_VERSION=0.75.0
-TERMUX_PKG_REVISION=1
-TERMUX_PKG_SHA256=3bbaedb0fa2797cac933a0659d144303e4d09eec6892c65600da987d8707199a
+TERMUX_PKG_VERSION=0.76.1
 TERMUX_PKG_SRCURL=https://poppler.freedesktop.org/poppler-${TERMUX_PKG_VERSION}.tar.xz
+TERMUX_PKG_SHA256=e62cd4053f851eecc4a6aa2b81d739fbab1d67b3c60b31ebac7049483cc617b1
 # libcairo and littlecms is used by pdftocairo:
-TERMUX_PKG_DEPENDS="libiconv, fontconfig, glib, libcairo, libpng, libjpeg-turbo, libtiff, littlecms, openjpeg, freetype, libcurl"
+TERMUX_PKG_DEPENDS="libc++, libiconv, fontconfig, glib, libcairo, libpng, libjpeg-turbo, libtiff, littlecms, openjpeg, freetype, libcurl"
 #texlive needs the xpdf headers
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -DENABLE_GLIB=ON
diff --git a/packages/qalc/build.sh b/packages/qalc/build.sh
index 7479c7b83..310e84d7e 100644
--- a/packages/qalc/build.sh
+++ b/packages/qalc/build.sh
@@ -2,8 +2,8 @@ TERMUX_PKG_HOMEPAGE=https://qalculate.github.io/
 TERMUX_PKG_DESCRIPTION="Powerful and easy to use command line calculator"
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_VERSION=2.8.1
-TERMUX_PKG_REVISION=4
-TERMUX_PKG_SHA256=a901be570bbfad80f1fccb1839ef2d03f6f2b7a02b051df35d5b687a08396105
+TERMUX_PKG_REVISION=6
 TERMUX_PKG_SRCURL=https://github.com/Qalculate/libqalculate/releases/download/v$TERMUX_PKG_VERSION/libqalculate-$TERMUX_PKG_VERSION.tar.gz
-TERMUX_PKG_DEPENDS="libiconv, libcurl, libmpfr, libxml2, readline, libgmp, zlib"
+TERMUX_PKG_SHA256=a901be570bbfad80f1fccb1839ef2d03f6f2b7a02b051df35d5b687a08396105
+TERMUX_PKG_DEPENDS="libc++, libiconv, libcurl, libmpfr, libxml2, readline, libgmp, zlib"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--without-icu"
diff --git a/packages/qpdf/build.sh b/packages/qpdf/build.sh
index 7e9f488de..191613eb2 100644
--- a/packages/qpdf/build.sh
+++ b/packages/qpdf/build.sh
@@ -3,9 +3,10 @@ TERMUX_PKG_DESCRIPTION="Content-Preserving PDF Transformation System"
 TERMUX_PKG_LICENSE="Apache-2.0"
 TERMUX_PKG_MAINTAINER="Vishal Biswas @vishalbiswas"
 TERMUX_PKG_VERSION=8.4.2
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://github.com/qpdf/qpdf/archive/release-qpdf-$TERMUX_PKG_VERSION.tar.gz
 TERMUX_PKG_SHA256=741a171295e561eadf0285ae6b0b821632f9773b8db0daa95df4dc565bf566bb
-TERMUX_PKG_DEPENDS="libjpeg-turbo, zlib"
+TERMUX_PKG_DEPENDS="libc++, libjpeg-turbo, zlib"
 TERMUX_PKG_BUILD_IN_SRC=true
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--with-random=/dev/urandom"
 
diff --git a/packages/ragel/build.sh b/packages/ragel/build.sh
index 650713ba8..2e5306a49 100644
--- a/packages/ragel/build.sh
+++ b/packages/ragel/build.sh
@@ -2,6 +2,7 @@ TERMUX_PKG_HOMEPAGE=https://www.colm.net/open-source/ragel/
 TERMUX_PKG_DESCRIPTION="Compiles finite state machines from regular languages into executable C, C++, Objective-C, or D code"
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_VERSION=6.10
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_REVISION=2
 TERMUX_PKG_SRCURL=https://www.colm.net/files/ragel/ragel-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=5f156edb65d20b856d638dd9ee2dfb43285914d9aa2b6ec779dac0270cd56c3f
+TERMUX_PKG_DEPENDS="libc++"
diff --git a/packages/rust/build.sh b/packages/rust/build.sh
index 94bb399f9..5bffeccee 100644
--- a/packages/rust/build.sh
+++ b/packages/rust/build.sh
@@ -3,9 +3,10 @@ TERMUX_PKG_DESCRIPTION="Systems programming language focused on safety, speed an
 TERMUX_PKG_LICENSE="MIT"
 TERMUX_PKG_MAINTAINER="Kevin Cotugno @kcotugno"
 TERMUX_PKG_VERSION=1.35.0
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://static.rust-lang.org/dist/rustc-$TERMUX_PKG_VERSION-src.tar.xz
 TERMUX_PKG_SHA256=169756df2298957bcf02da6a612996c24a51b9ac3b23409e6507d69eb2e6f523
-TERMUX_PKG_DEPENDS="clang, openssl, lld, zlib"
+TERMUX_PKG_DEPENDS="libc++, clang, openssl, lld, zlib"
 
 termux_step_configure() {
 	termux_setup_cmake
@@ -15,7 +16,7 @@ termux_step_configure() {
 	# ../lib from bin location:
 	# this is about to get ugly but i have to make sure a rustc in a proper bin lib
 	# configuration is used otherwise it fails a long time into the build...
-	# like 30 to 40 + minutes ... so lets get it right 
+	# like 30 to 40 + minutes ... so lets get it right
 
 	export PATH=$HOME/.rustup/toolchains/$TERMUX_PKG_VERSION-x86_64-unknown-linux-gnu/bin:$PATH
 	local RUSTC=$(which rustc)
diff --git a/packages/squid/build.sh b/packages/squid/build.sh
index c0f9566c1..b1e804a04 100644
--- a/packages/squid/build.sh
+++ b/packages/squid/build.sh
@@ -3,9 +3,10 @@ TERMUX_PKG_DESCRIPTION="Full-featured Web proxy cache server"
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_MAINTAINER="Vishal Biswas @vishalbiswas"
 TERMUX_PKG_VERSION=4.7
+TERMUX_PKG_REVISION=1
+TERMUX_PKG_SRCURL=http://squid.mirror.globo.tech/archive/4/squid-$TERMUX_PKG_VERSION.tar.xz
 TERMUX_PKG_SHA256=a29cf65f77ab70a8b1cf47e6fe1d2975ec9d04d2446d54669a5afd2aee5e354e
-TERMUX_PKG_SRCURL=http://www.squid-cache.org/Versions/v4/squid-$TERMUX_PKG_VERSION.tar.xz
-TERMUX_PKG_DEPENDS="libcrypt, openssl, libnettle, libltdl"
+TERMUX_PKG_DEPENDS="libc++, libcrypt, openssl, libnettle, libltdl"
 # disk-io requires msgctl and store-io requires disk-io
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 ac_cv_lib_sasl2_sasl_errstring=no
diff --git a/packages/swig/build.sh b/packages/swig/build.sh
index eaaff942c..84bc450c1 100644
--- a/packages/swig/build.sh
+++ b/packages/swig/build.sh
@@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="Generate scripting interfaces to C/C++ code"
 TERMUX_PKG_LICENSE="GPL-3.0"
 TERMUX_PKG_MAINTAINER="Leonid Plyushch <leonid.plyushch@gmail.com>"
 TERMUX_PKG_VERSION=4.0.0
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=http://downloads.sourceforge.net/swig/swig-$TERMUX_PKG_VERSION.tar.gz
 TERMUX_PKG_SHA256=e8a39cd6437e342cdcbd5af27a9bf11b62dc9efec9248065debcb8276fcbb925
 TERMUX_PKG_DEPENDS="libc++, pcre, zlib"
diff --git a/packages/tasksh/build.sh b/packages/tasksh/build.sh
index 4652d565b..6c003b9f6 100644
--- a/packages/tasksh/build.sh
+++ b/packages/tasksh/build.sh
@@ -2,10 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://taskwarrior.org
 TERMUX_PKG_DESCRIPTION="Shell command wrapping Taskwarrior commands"
 TERMUX_PKG_LICENSE="MIT"
 TERMUX_PKG_VERSION=1.2.0
-TERMUX_PKG_REVISION=4
+TERMUX_PKG_REVISION=5
 TERMUX_PKG_SRCURL=https://taskwarrior.org/download/tasksh-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=6e42f949bfd7fbdde4870af0e7b923114cc96c4344f82d9d924e984629e21ffd
-TERMUX_PKG_DEPENDS="readline, taskwarrior, libandroid-glob"
+TERMUX_PKG_DEPENDS="libc++, readline, taskwarrior, libandroid-glob"
 
 termux_step_pre_configure() {
 	LDFLAGS+=" -landroid-glob"
diff --git a/packages/taskwarrior/build.sh b/packages/taskwarrior/build.sh
index 4b9dd7c41..23454a167 100644
--- a/packages/taskwarrior/build.sh
+++ b/packages/taskwarrior/build.sh
@@ -2,10 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://taskwarrior.org
 TERMUX_PKG_DESCRIPTION="Utility for managing your TODO list"
 TERMUX_PKG_LICENSE="MIT"
 TERMUX_PKG_VERSION=2.5.1
-TERMUX_PKG_REVISION=6
+TERMUX_PKG_REVISION=7
 TERMUX_PKG_SRCURL=https://taskwarrior.org/download/task-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=d87bcee58106eb8a79b850e9abc153d98b79e00d50eade0d63917154984f2a15
-TERMUX_PKG_DEPENDS="libgnutls, libuuid, libandroid-glob"
+TERMUX_PKG_DEPENDS="libc++, libgnutls, libuuid, libandroid-glob"
 
 termux_step_pre_configure() {
 	LDFLAGS+=" -landroid-glob"
diff --git a/packages/teckit/build.sh b/packages/teckit/build.sh
index 0c0cb2a5a..8cad7641d 100644
--- a/packages/teckit/build.sh
+++ b/packages/teckit/build.sh
@@ -3,10 +3,10 @@ TERMUX_PKG_DESCRIPTION="TECkit is a library for encoding conversion"
 TERMUX_PKG_LICENSE="LGPL-2.1"
 TERMUX_PKG_MAINTAINER="Henrik Grimler @Grimler91"
 TERMUX_PKG_VERSION=2.5.9
-TERMUX_PKG_REVISION=1
-TERMUX_PKG_SHA256=9c9f77ed40e2fcfbbb82e88b78fee2233c58e2ecfd3f3201bfa4b13ea6b5c970
+TERMUX_PKG_REVISION=2
 TERMUX_PKG_SRCURL=https://github.com/silnrsi/teckit/archive/v$TERMUX_PKG_VERSION.tar.gz
-TERMUX_PKG_DEPENDS="zlib"
+TERMUX_PKG_SHA256=9c9f77ed40e2fcfbbb82e88b78fee2233c58e2ecfd3f3201bfa4b13ea6b5c970
+TERMUX_PKG_DEPENDS="libc++, zlib"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="ac_cv_lib_expat_XML_ExpatVersion=no"
 
 termux_step_pre_configure() {
diff --git a/packages/termux-elf-cleaner/build.sh b/packages/termux-elf-cleaner/build.sh
index f02576b03..5eb1f91de 100644
--- a/packages/termux-elf-cleaner/build.sh
+++ b/packages/termux-elf-cleaner/build.sh
@@ -5,6 +5,8 @@ TERMUX_PKG_LICENSE="GPL-3.0"
 #       to create a native binary. Bumping this version will need
 #       updating the checksum used there.
 TERMUX_PKG_VERSION=1.6
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://github.com/termux/termux-elf-cleaner/archive/v${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=94ea8ed64c57f8222ebf933e960be97030a903395d750b499eb792892e0d836f
+TERMUX_PKG_DEPENDS="libc++"
 TERMUX_PKG_BUILD_IN_SRC=yes
diff --git a/packages/tesseract/build.sh b/packages/tesseract/build.sh
index 6e31b6804..17d61aba1 100644
--- a/packages/tesseract/build.sh
+++ b/packages/tesseract/build.sh
@@ -2,10 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://github.com/tesseract-ocr/tesseract
 TERMUX_PKG_DESCRIPTION="Tesseract is probably the most accurate open source OCR engine available"
 TERMUX_PKG_LICENSE="Apache-2.0"
 TERMUX_PKG_VERSION=4.0.0
-TERMUX_PKG_REVISION=1
-TERMUX_PKG_SHA256=a1f5422ca49a32e5f35c54dee5112b11b99928fc9f4ee6695cdc6768d69f61dd
+TERMUX_PKG_REVISION=2
 TERMUX_PKG_SRCURL=https://github.com/tesseract-ocr/tesseract/archive/${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_DEPENDS="libtool, libuuid, leptonica, libandroid-glob"
+TERMUX_PKG_SHA256=a1f5422ca49a32e5f35c54dee5112b11b99928fc9f4ee6695cdc6768d69f61dd
+TERMUX_PKG_DEPENDS="libc++, libtool, libuuid, leptonica, libandroid-glob"
 
 termux_step_pre_configure() {
 	# http://blog.matt-swain.com/post/26419042500/installing-tesseract-ocr-on-mac-os-x-lion
diff --git a/packages/texlive-bin/build.sh b/packages/texlive-bin/build.sh
index f29a8fc74..cc965e243 100644
--- a/packages/texlive-bin/build.sh
+++ b/packages/texlive-bin/build.sh
@@ -3,10 +3,10 @@ TERMUX_PKG_DESCRIPTION="TeX Live is a distribution of the TeX typesetting system
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_MAINTAINER="Henrik Grimler @Grimler91"
 TERMUX_PKG_VERSION=20190410
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_REVISION=2
 TERMUX_PKG_SRCURL=https://github.com/TeX-Live/texlive-source/archive/build-svn50882.tar.gz
 TERMUX_PKG_SHA256=a7462f8e29163faa52ad2ac658727b60f95241449832f1a4dac8d8a406d18233
-TERMUX_PKG_DEPENDS="libiconv, freetype, libpng, libgd, libgmp, libmpfr, libicu, liblua, poppler, libgraphite, harfbuzz, harfbuzz-icu, teckit, libpixman, libcairo, zlib"
+TERMUX_PKG_DEPENDS="libc++, libiconv, freetype, libpng, libgd, libgmp, libmpfr, libicu, liblua, poppler, libgraphite, harfbuzz, harfbuzz-icu, teckit, libpixman, libcairo, zlib"
 # libpcre, glib, fonconfig are dependencies to libcairo. pkg-config gives an error if they are missing
 # libuuid, libxml2 are needed by fontconfig
 TERMUX_PKG_BUILD_DEPENDS="icu-devtools, pcre-dev, glib-dev, fontconfig, libuuid-dev, libxml2-dev"
diff --git a/packages/timewarrior/build.sh b/packages/timewarrior/build.sh
index d1f5c561e..7ab885bc6 100644
--- a/packages/timewarrior/build.sh
+++ b/packages/timewarrior/build.sh
@@ -2,10 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://taskwarrior.org/docs/timewarrior/
 TERMUX_PKG_DESCRIPTION="Command-line time tracker"
 TERMUX_PKG_LICENSE="MIT"
 TERMUX_PKG_VERSION=1.1.1
-TERMUX_PKG_REVISION=4
-TERMUX_PKG_SHA256=1f7d9a62e55fc5a3126433654ccb1fd7d2d135f06f05697f871897c9db77ccc9
+TERMUX_PKG_REVISION=5
 TERMUX_PKG_SRCURL=https://taskwarrior.org/download/timew-${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_DEPENDS="libandroid-glob"
+TERMUX_PKG_SHA256=1f7d9a62e55fc5a3126433654ccb1fd7d2d135f06f05697f871897c9db77ccc9
+TERMUX_PKG_DEPENDS="libandroid-glob, libc++"
 
 termux_step_pre_configure() {
 	LDFLAGS+=" -landroid-glob"
diff --git a/packages/unrar/build.sh b/packages/unrar/build.sh
index 3f23b9851..c732133d9 100644
--- a/packages/unrar/build.sh
+++ b/packages/unrar/build.sh
@@ -1,9 +1,10 @@
 TERMUX_PKG_HOMEPAGE=https://www.rarlab.com/
 TERMUX_PKG_DESCRIPTION="Tool for extracting files from .rar archives"
 TERMUX_PKG_LICENSE="non-free"
+TERMUX_PKG_LICENSE_FILE="license.txt"
 TERMUX_PKG_VERSION=5.7.5
-TERMUX_PKG_SHA256=e1c2fddaa87a88b1535bfc10ca484f3c5af4e5a55fbb933f8819e26203bbe2ee
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://www.rarlab.com/rar/unrarsrc-${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_DEPENDS="libandroid-support"
+TERMUX_PKG_SHA256=e1c2fddaa87a88b1535bfc10ca484f3c5af4e5a55fbb933f8819e26203bbe2ee
+TERMUX_PKG_DEPENDS="libandroid-support, libc++"
 TERMUX_PKG_BUILD_IN_SRC=yes
-TERMUX_PKG_LICENSE_FILE="license.txt"
diff --git a/packages/utfdecode/build.sh b/packages/utfdecode/build.sh
index bbccacc5d..eba9b538b 100644
--- a/packages/utfdecode/build.sh
+++ b/packages/utfdecode/build.sh
@@ -2,6 +2,7 @@ TERMUX_PKG_HOMEPAGE=https://github.com/fornwall/utfdecode
 TERMUX_PKG_DESCRIPTION="Tool for decoding, encoding and debugging unicode"
 TERMUX_PKG_LICENSE="Apache-2.0"
 TERMUX_PKG_VERSION=0.3.4
-TERMUX_PKG_REVISION=3
-TERMUX_PKG_SHA256=5fd1473f6cf6bdedeb33569c3b0f6823aceda366c714f6a475e2d28767f99b5a
+TERMUX_PKG_REVISION=4
 TERMUX_PKG_SRCURL=https://github.com/fornwall/utfdecode/releases/download/v$TERMUX_PKG_VERSION/utfdecode-$TERMUX_PKG_VERSION.tar.gz
+TERMUX_PKG_SHA256=5fd1473f6cf6bdedeb33569c3b0f6823aceda366c714f6a475e2d28767f99b5a
+TERMUX_PKG_DEPENDS="libc++"
diff --git a/packages/vtutils/build.sh b/packages/vtutils/build.sh
index 445530f83..51421b6c8 100644
--- a/packages/vtutils/build.sh
+++ b/packages/vtutils/build.sh
@@ -2,6 +2,7 @@ TERMUX_PKG_HOMEPAGE=https://github.com/fornwall/vtutils
 TERMUX_PKG_DESCRIPTION="Utilities for testing and working with virtual terminals"
 TERMUX_PKG_LICENSE="Apache-2.0"
 TERMUX_PKG_VERSION=0.5
-TERMUX_PKG_REVISION=1
-TERMUX_PKG_SHA256=ef0b11f9570697f53bcda7a61093f8d472afee2c8551b5b35e9b5b7c1539c2c6
+TERMUX_PKG_REVISION=2
 TERMUX_PKG_SRCURL=https://github.com/fornwall/vtutils/releases/download/v$TERMUX_PKG_VERSION/vtutils-$TERMUX_PKG_VERSION.tar.gz
+TERMUX_PKG_SHA256=ef0b11f9570697f53bcda7a61093f8d472afee2c8551b5b35e9b5b7c1539c2c6
+TERMUX_PKG_DEPENDS="libc++"