no more develsplit + provide static libraries as separate package

%ci:no-build
6 years ago · 21b96d3b41
276 changed files with 845 additions and 335 deletions
--- a/packages/apache2/build.sh
+++ b/packages/apache2/build.sh
@ -2,10 +2,12 @@ TERMUX_PKG_HOMEPAGE=https://httpd.apache.org
 TERMUX_PKG_DESCRIPTION="Apache Web Server"
 TERMUX_PKG_LICENSE="Apache-2.0"
 TERMUX_PKG_VERSION=2.4.39
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_REVISION=2
 TERMUX_PKG_SHA256=b4ca9d05773aa59b54d66cd8f4744b945289f084d3be17d7981d1783a5decfa2
 TERMUX_PKG_SRCURL=https://www.apache.org/dist/httpd/httpd-$TERMUX_PKG_VERSION.tar.bz2
 TERMUX_PKG_DEPENDS="apr, apr-util, pcre, openssl, libcrypt, libandroid-support, libnghttp2, libexpat, libuuid, zlib"
+TERMUX_PKG_BREAKS="apache2-dev"
+TERMUX_PKG_REPLACES="apache2-dev"
 TERMUX_PKG_CONFFILES="
 etc/apache2/httpd.conf
 etc/apache2/extra/httpd-autoindex.conf
@ -68,7 +70,6 @@ ac_cv_have_threadsafe_pollset=no
 "
 TERMUX_PKG_BUILD_IN_SRC=true
 TERMUX_PKG_RM_AFTER_INSTALL="share/apache2/manual etc/apache2/original share/man/man8/suexec.8 libexec/httpd.exp"
-TERMUX_PKG_INCLUDE_IN_DEVPACKAGE="share/apache2/build"
 TERMUX_PKG_EXTRA_MAKE_ARGS="-s"

 termux_step_pre_configure() {
--- a/packages/apr-util/build.sh
+++ b/packages/apr-util/build.sh
@ -2,14 +2,15 @@ TERMUX_PKG_HOMEPAGE=https://apr.apache.org/
 TERMUX_PKG_DESCRIPTION="Apache Portable Runtime Utility Library"
 TERMUX_PKG_LICENSE="Apache-2.0"
 TERMUX_PKG_VERSION=1.6.1
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_REVISION=2
 TERMUX_PKG_SHA256=d3e12f7b6ad12687572a3a39475545a072608f4ba03a6ce8a3778f607dd0035b
 TERMUX_PKG_SRCURL=http://apache.mirrors.spacedump.net/apr/apr-util-${TERMUX_PKG_VERSION}.tar.bz2
 TERMUX_PKG_DEPENDS="apr, libcrypt, libexpat, libiconv, libuuid"
+TERMUX_PKG_BREAKS="apr-util-dev"
+TERMUX_PKG_REPLACES="apr-util-dev"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 ac_cv_lib_pq_PQsendQueryPrepared=no
 --with-apr=$TERMUX_PREFIX
 --without-sqlite3
 "
-TERMUX_PKG_INCLUDE_IN_DEVPACKAGE="bin/apu-1-config"
 TERMUX_PKG_RM_AFTER_INSTALL="lib/aprutil.exp"
--- a/packages/apr/build.sh
+++ b/packages/apr/build.sh
@ -2,10 +2,12 @@ TERMUX_PKG_HOMEPAGE=https://apr.apache.org/
 TERMUX_PKG_DESCRIPTION="Apache Portable Runtime Library"
 TERMUX_PKG_LICENSE="Apache-2.0"
 TERMUX_PKG_VERSION=1.7.0
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_REVISION=2
 TERMUX_PKG_SRCURL=http://apache.mirrors.spacedump.net/apr/apr-${TERMUX_PKG_VERSION}.tar.bz2
 TERMUX_PKG_SHA256=e2e148f0b2e99b8e5c6caa09f6d4fb4dd3e83f744aa72a952f94f5a14436f7ea
 TERMUX_PKG_DEPENDS="libuuid"
+TERMUX_PKG_BREAKS="apr-dev"
+TERMUX_PKG_REPLACES="apr-dev"
 TERMUX_PKG_BUILD_IN_SRC="yes"
 # "ac_cv_search_crypt=" to avoid needlessly linking to libcrypt.
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
@ -18,7 +20,6 @@ apr_cv_process_shared_works=no
 apr_cv_tcp_nodelay_with_cork=yes
 ac_cv_sizeof_struct_iovec=$(( TERMUX_ARCH_BITS==32 ? 8 : 16 ))
 ac_cv_search_crypt="
-TERMUX_PKG_INCLUDE_IN_DEVPACKAGE="bin/apr-1-config share/apr-1/build"
 TERMUX_PKG_RM_AFTER_INSTALL="lib/apr.exp"

 termux_step_post_make_install() {
--- a/packages/argp/build.sh
+++ b/packages/argp/build.sh
@ -2,10 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://www.lysator.liu.se/~nisse/misc/
 TERMUX_PKG_DESCRIPTION="Standalone version of arguments parsing functions from GLIBC"
 TERMUX_PKG_LICENSE="LGPL-2.0"
 TERMUX_PKG_VERSION=1.3
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SHA256=dec79694da1319acd2238ce95df57f3680fea2482096e483323fddf3d818d8be
 TERMUX_PKG_SRCURL=https://www.lysator.liu.se/~nisse/misc/argp-standalone-$TERMUX_PKG_VERSION.tar.gz
-TERMUX_PKG_KEEP_STATIC_LIBRARIES=true
-TERMUX_PKG_NO_DEVELSPLIT=true
+TERMUX_PKG_NO_STATICSPLIT=yes

 termux_step_post_make_install() {
 	cp libargp.a $TERMUX_PREFIX/lib
--- a/packages/attr/build.sh
+++ b/packages/attr/build.sh
@ -2,8 +2,11 @@ TERMUX_PKG_HOMEPAGE=http://savannah.nongnu.org/projects/attr/
 TERMUX_PKG_DESCRIPTION="Utilities for manipulating filesystem extended attributes"
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_VERSION=2.4.48
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=http://download.savannah.gnu.org/releases/attr/attr-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=5ead72b358ec709ed00bbf7a9eaef1654baad937c001c044fe8b74c57f5324e7
+TERMUX_PKG_BREAKS="attr-dev"
+TERMUX_PKG_REPLACES="attr-dev"
 TERMUX_PKG_BUILD_IN_SRC=yes
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--enable-gettext=no"
 # TERMUX_PKG_MAKE_INSTALL_TARGET="install install-lib"
--- a/packages/babl/build.sh
+++ b/packages/babl/build.sh
@ -2,9 +2,12 @@ TERMUX_PKG_HOMEPAGE=http://gegl.org/babl/
 TERMUX_PKG_DESCRIPTION="Dynamic pixel format translation library"
 TERMUX_PKG_LICENSE="LGPL-3.0"
 TERMUX_PKG_VERSION=0.1.68
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://github.com/GNOME/babl/archive/BABL_${TERMUX_PKG_VERSION//./_}.tar.gz
 TERMUX_PKG_SHA256=788f60c6ae9a78c9ed7b6a0f2a1e2c493d81a5b1e5f3c795447b01824331637e
 TERMUX_PKG_DEPENDS="littlecms"
+TERMUX_PKG_BREAKS="babl-dev"
+TERMUX_PKG_REPLACES="babl-dev"

 termux_step_pre_configure() {
 	NOCONFIGURE=1 ./autogen.sh
--- a/packages/bash/build.sh
+++ b/packages/bash/build.sh
@ -4,10 +4,12 @@ TERMUX_PKG_LICENSE="GPL-3.0"
 _MAIN_VERSION=5.0
 _PATCH_VERSION=7
 TERMUX_PKG_VERSION=${_MAIN_VERSION}.${_PATCH_VERSION}
-TERMUX_PKG_REVISION=3
+TERMUX_PKG_REVISION=4
 TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/bash/bash-${_MAIN_VERSION}.tar.gz
 TERMUX_PKG_SHA256=b4a80f2ac66170b2913efbfb9f2594f1f76c7b1afd11f799e22035d63077fb4d
 TERMUX_PKG_DEPENDS="command-not-found, libandroid-support, libiconv, ncurses, readline (>= 8.0), termux-tools"
+TERMUX_PKG_BREAKS="bash-dev"
+TERMUX_PKG_REPLACES="bash-dev"
 TERMUX_PKG_ESSENTIAL=true
 TERMUX_PKG_BUILD_IN_SRC=true

--- a/packages/binutils/build.sh
+++ b/packages/binutils/build.sh
@ -2,14 +2,16 @@ 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=4
+TERMUX_PKG_REVISION=5
 TERMUX_PKG_SHA256=9b0d97b3d30df184d302bced12f976aa1e5fbf4b0be696cdebc6cca30411a46e
 TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/binutils/binutils-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_DEPENDS="libc++, zlib"
+TERMUX_PKG_BREAKS="binutils-dev"
+TERMUX_PKG_REPLACES="binutils-dev"
 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"
-TERMUX_PKG_KEEP_STATIC_LIBRARIES=true
+TERMUX_PKG_NO_STATICSPLIT=yes
 TERMUX_PKG_HAS_DEBUG=no
 # Debug build fails with:
 # ~/termux-build/binutils/src/binutils/readelf.c:19060:81: error: in call to 'fread', size * count is too large for the given buffer
--- a/packages/boost/build.sh
+++ b/packages/boost/build.sh
@ -2,14 +2,14 @@ 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=4
+TERMUX_PKG_REVISION=5
 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="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)"
+TERMUX_PKG_BREAKS="libboost-python (<= 1.65.1-2), boost-dev"
+TERMUX_PKG_REPLACES="libboost-python (<= 1.65.1-2), boost-dev"

 termux_step_make_install() {
 	CXXFLAGS+=" -std=c++14"
--- a/packages/brotli/build.sh
+++ b/packages/brotli/build.sh
@ -2,7 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://github.com/google/brotli
 TERMUX_PKG_DESCRIPTION="lossless compression algorithm and format (command line utility)"
 TERMUX_PKG_LICENSE="MIT"
 TERMUX_PKG_VERSION=1.0.7
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SHA256=4c61bfb0faca87219ea587326c467b95acb25555b53d1a421ffa3c8a9296ee2c
+TERMUX_PKG_BREAKS="brotli-dev"
+TERMUX_PKG_REPLACES="brotli-dev"
 TERMUX_PKG_SRCURL=https://github.com/google/brotli/archive/v$TERMUX_PKG_VERSION.tar.gz
 TERMUX_PKG_FORCE_CMAKE=yes

--- a/packages/build-essential/build.sh
+++ b/packages/build-essential/build.sh
@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="A metapackage that installs essential development tools"
 TERMUX_PKG_LICENSE="Public Domain"
 TERMUX_PKG_MAINTAINER="Leonid Plyushch <leonid.plyushch@gmail.com>"
 TERMUX_PKG_VERSION=3.1
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_METAPACKAGE=yes
 TERMUX_PKG_PLATFORM_INDEPENDENT=yes

@ -19,7 +20,7 @@ TERMUX_PKG_PLATFORM_INDEPENDENT=yes
 TERMUX_PKG_DEPENDS="autoconf, automake, bison, clang, cmake, flex, gperf, libtool, m4, make, ninja, pkg-config, bc, bzip2, coreutils, diffutils, ed, findutils, gawk, grep, gzip, lzip, lzop, patch, procps, psmisc, sed, tar, util-linux, xz-utils"

 # Other packages that may be interesting.
-TERMUX_PKG_SUGGESTS="git, golang, nodejs, patchelf, proot, python-dev, python2-dev, ruby-dev, rust, subversion"
+TERMUX_PKG_SUGGESTS="git, golang, nodejs, patchelf, proot, python, python2, ruby, rust, subversion"

 termux_step_post_massage() {
 	cd "$TERMUX_PKG_MASSAGEDIR"
--- a/packages/c-ares/build.sh
+++ b/packages/c-ares/build.sh
@ -2,9 +2,11 @@ TERMUX_PKG_HOMEPAGE=https://c-ares.haxx.se
 TERMUX_PKG_DESCRIPTION="Library for asynchronous DNS requests (including name resolves)"
 TERMUX_PKG_LICENSE="MIT"
 TERMUX_PKG_VERSION=1.15.0
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_REVISION=2
 TERMUX_PKG_SRCURL=https://github.com/c-ares/c-ares/archive/cares-${TERMUX_PKG_VERSION//./_}.tar.gz
 TERMUX_PKG_SHA256=7deb7872cbd876c29036d5f37e30c4cbc3cc068d59d8b749ef85bb0736649f04
+TERMUX_PKG_BREAKS="c-ares-dev"
+TERMUX_PKG_REPLACES="c-ares-dev"
 # Build with cmake to install cmake/c-ares/*.cmake files:
 TERMUX_PKG_FORCE_CMAKE=yes
 TERMUX_PKG_RM_AFTER_INSTALL="bin/"
--- a/packages/c-toxcore/build.sh
+++ b/packages/c-toxcore/build.sh
@ -3,9 +3,12 @@ TERMUX_PKG_DESCRIPTION="Backend library for the Tox protocol"
 TERMUX_PKG_LICENSE="GPL-3.0"
 TERMUX_PKG_MAINTAINER="Leonid Plyushch <leonid.plyushch@gmail.com>"
 TERMUX_PKG_VERSION=0.2.10
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SHA256=5ccc4ecd79b95c367efe8341b06bf2a81f853032e6fcd7cb2bc0ad0ef7419d40
 TERMUX_PKG_SRCURL=https://github.com/TokTok/toxcore/archive/v${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_DEPENDS="libsodium"
+TERMUX_PKG_BREAKS="c-toxcore-dev"
+TERMUX_PKG_REPLACES="c-toxcore-dev"
 #TERMUX_PKG_BUILD_IN_SRC=true
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -DCMAKE_INSTALL_PREFIX=${TERMUX_PREFIX}
--- a/packages/capstone/build.sh
+++ b/packages/capstone/build.sh
@ -3,7 +3,9 @@ TERMUX_PKG_DESCRIPTION="Lightweight multi-platform, multi-architecture disassemb
 TERMUX_PKG_LICENSE="BSD"
 TERMUX_PKG_MAINTAINER="Leonid Plyushch <leonid.plyushch@gmail.com>"
 TERMUX_PKG_VERSION=4.0.1
-TERMUX_PKG_REVISION=2
+TERMUX_PKG_REVISION=3
 TERMUX_PKG_SRCURL=https://github.com/aquynh/capstone/archive/$TERMUX_PKG_VERSION.tar.gz
 TERMUX_PKG_SHA256=79bbea8dbe466bd7d051e037db5961fdb34f67c9fac5c3471dd105cfb1e05dc7
+TERMUX_PKG_BREAKS="capstone-dev"
+TERMUX_PKG_REPLACES="capstone-dev"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="-DINSTALL_LIB_DIR=$TERMUX_PREFIX/lib"
--- a/packages/clamav/build.sh
+++ b/packages/clamav/build.sh
@ -3,10 +3,12 @@ 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=5
+TERMUX_PKG_REVISION=6
 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"
+TERMUX_PKG_BREAKS="clamav-dev"
+TERMUX_PKG_REPLACES="clamav-dev"

 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 --sysconfdir=$TERMUX_PREFIX/etc/clamav
--- a/packages/cmark/build.sh
+++ b/packages/cmark/build.sh
@ -2,10 +2,12 @@ TERMUX_PKG_HOMEPAGE=https://github.com/github/cmark
 TERMUX_PKG_DESCRIPTION="CommonMark parsing and rendering program"
 TERMUX_PKG_LICENSE="BSD 2-Clause"
 TERMUX_PKG_VERSION=0.29.0.gfm.0
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SHA256=6a94aeaa59a583fadcbf28de81dea8641b3f56d935dda5b2447a3c8df6c95fea
+TERMUX_PKG_BREAKS="cmark-dev"
+TERMUX_PKG_REPLACES="cmark-dev"
 TERMUX_PKG_SRCURL=https://github.com/github/cmark/archive/${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="-DCMAKE_INSTALL_LIBDIR=$TERMUX_PREFIX/lib"
-TERMUX_PKG_INCLUDE_IN_DEVPACKAGE="lib/cmake-gfm-extensions"

 termux_step_post_make_install() {
    cd $TERMUX_PREFIX/bin
--- a/packages/dbus-glib/build.sh
+++ b/packages/dbus-glib/build.sh
@ -3,10 +3,12 @@ TERMUX_PKG_DESCRIPTION="GLib bindings for DBUS"
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_MAINTAINER="Tristan Ross <spaceboyross@yandex.com>"
 TERMUX_PKG_VERSION=0.110
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_REVISION=2
 TERMUX_PKG_SRCURL="https://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-$TERMUX_PKG_VERSION.tar.gz"
 TERMUX_PKG_SHA256=7ce4760cf66c69148f6bd6c92feaabb8812dee30846b24cd0f7395c436d7e825
 TERMUX_PKG_DEPENDS="dbus, glib"
+TERMUX_PKG_BREAKS="dbus-glib-dev"
+TERMUX_PKG_REPLACES="dbus-glib-dev"
 TERMUX_PKG_HOSTBUILD=true

 termux_step_host_build() {
--- a/packages/dbus/build.sh
+++ b/packages/dbus/build.sh
@ -3,10 +3,12 @@ TERMUX_PKG_DESCRIPTION="Freedesktop.org message bus system"
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_MAINTAINER="Tristan Ross <spaceboyross@yandex.com>"
 TERMUX_PKG_VERSION=1.12.16
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_REVISION=2
 TERMUX_PKG_SRCURL="https://dbus.freedesktop.org/releases/dbus/dbus-$TERMUX_PKG_VERSION.tar.gz"
 TERMUX_PKG_SHA256=54a22d2fa42f2eb2a871f32811c6005b531b9613b1b93a0d269b05e7549fec80
 TERMUX_PKG_DEPENDS="libexpat"
+TERMUX_PKG_BREAKS="dbus-dev"
+TERMUX_PKG_REPLACES="dbus-dev"
 TERMUX_PKG_BUILD_IN_SRC=true
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-libaudit --disable-systemd --disable-tests"

--- a/packages/dnsutils/build.sh
+++ b/packages/dnsutils/build.sh
@ -2,9 +2,12 @@ TERMUX_PKG_HOMEPAGE=https://www.isc.org/downloads/bind/
 TERMUX_PKG_DESCRIPTION="Clients provided with BIND"
 TERMUX_PKG_LICENSE="MPL-2.0"
 TERMUX_PKG_VERSION=9.14.4
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL="ftp://ftp.isc.org/isc/bind9/${TERMUX_PKG_VERSION}/bind-${TERMUX_PKG_VERSION}.tar.gz"
 TERMUX_PKG_SHA256=312efb82a6889074f31ef2849af498b3ec97ca69acd5c4e5e4b4045a8fe6b83f
 TERMUX_PKG_DEPENDS="openssl, readline, resolv-conf, zlib"
+TERMUX_PKG_BREAKS="dnsutils-dev"
+TERMUX_PKG_REPLACES="dnsutils-dev"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 --disable-linux-caps
 --without-python
--- a/packages/dpkg/build.sh
+++ b/packages/dpkg/build.sh
@ -2,11 +2,13 @@ TERMUX_PKG_HOMEPAGE=https://packages.debian.org/dpkg
 TERMUX_PKG_DESCRIPTION="Debian package management system"
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_VERSION=1.19.7
-TERMUX_PKG_REVISION=4
+TERMUX_PKG_REVISION=5
 TERMUX_PKG_SRCURL=https://mirrors.kernel.org/debian/pool/main/d/dpkg/dpkg_${TERMUX_PKG_VERSION}.tar.xz
 TERMUX_PKG_SHA256=4c27fededf620c0aa522fff1a48577ba08144445341257502e7730f2b1a296e8
 # with the extract.c.patch we remove the -p and --warning=no-timestamp tar options so we can use busybox tar
 TERMUX_PKG_DEPENDS="bzip2, coreutils, diffutils, gzip, less, libbz2, liblzma, tar, xz-utils, zlib"
+TERMUX_PKG_BREAKS="dpkg-dev"
+TERMUX_PKG_REPLACES="dpkg-dev"
 TERMUX_PKG_ESSENTIAL=yes

 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
--- a/packages/dtc/build.sh
+++ b/packages/dtc/build.sh
@ -3,7 +3,10 @@ TERMUX_PKG_DESCRIPTION="Device Tree Compiler"
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_MAINTAINER="Leonid Plyushch <leonid.plyushch@gmail.com>"
 TERMUX_PKG_VERSION=1.5.0
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://git.kernel.org/pub/scm/utils/dtc/dtc.git/snapshot/dtc-$TERMUX_PKG_VERSION.tar.gz
 TERMUX_PKG_SHA256=3416f10ca69b0b911f027a9cb96471485dd8705705fc4813283f963299eaae0a
+TERMUX_PKG_BREAKS="dtc-dev"
+TERMUX_PKG_REPLACES="dtc-dev"
 TERMUX_PKG_EXTRA_MAKE_ARGS="PREFIX=$TERMUX_PREFIX"
 TERMUX_PKG_BUILD_IN_SRC=true
--- a/packages/e2fsprogs/build.sh
+++ b/packages/e2fsprogs/build.sh
@ -4,14 +4,16 @@ TERMUX_PKG_LICENSE="GPL-2.0, LGPL-2.0, MIT"
 TERMUX_PKG_LICENSE_FILE="NOTICE"
 TERMUX_PKG_MAINTAINER="Leonid Plyushch <leonid.plyushch@gmail.com>"
 TERMUX_PKG_VERSION=1.45.3
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v$TERMUX_PKG_VERSION/e2fsprogs-$TERMUX_PKG_VERSION.tar.xz
 TERMUX_PKG_SHA256=90d10066b815e27b0b4875f0d5e396c663e0bf55aa3ca10868978d10c6ffe595
-TERMUX_PKG_KEEP_STATIC_LIBRARIES=true
-TERMUX_PKG_INCLUDE_IN_DEVPACKAGE="lib/*.a"
 TERMUX_PKG_CONFFILES="etc/mke2fs.conf"
+TERMUX_PKG_NO_STATICSPLIT=yes

 ## util-linux provides libblkid
 TERMUX_PKG_DEPENDS="libuuid, util-linux"
+TERMUX_PKG_BREAKS="e2fsprogs-dev"
+TERMUX_PKG_REPLACES="e2fsprogs-dev"

 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 --sbindir=${TERMUX_PREFIX}/bin
--- a/packages/emacs/build.sh
+++ b/packages/emacs/build.sh
@ -2,9 +2,12 @@ TERMUX_PKG_HOMEPAGE=https://www.gnu.org/software/emacs/
 TERMUX_PKG_DESCRIPTION="Extensible, customizable text editor-and more"
 TERMUX_PKG_LICENSE="GPL-3.0"
 TERMUX_PKG_VERSION=26.2
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SHA256=151ce69dbe5b809d4492ffae4a4b153b2778459de6deb26f35691e1281a9c58e
 TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/emacs/emacs-${TERMUX_PKG_VERSION}.tar.xz
 TERMUX_PKG_DEPENDS="ncurses, gnutls, libxml2"
+TERMUX_PKG_BREAKS="emacs-dev"
+TERMUX_PKG_REPLACES="emacs-dev"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 --disable-autodepend
 --with-gif=no
--- a/packages/erlang/build.sh
+++ b/packages/erlang/build.sh
@ -2,15 +2,15 @@ TERMUX_PKG_HOMEPAGE=https://www.erlang.org/
 TERMUX_PKG_DESCRIPTION="General-purpose concurrent functional programming language"
 TERMUX_PKG_LICENSE="Apache-2.0"
 TERMUX_PKG_VERSION=22.0.7
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://github.com/erlang/otp/archive/OTP-$TERMUX_PKG_VERSION.tar.gz
 TERMUX_PKG_SHA256=04c090b55ec4a01778e7e1a5b7fdf54012548ca72737965b7aa8c4d7878c92bc
 TERMUX_PKG_DEPENDS="openssl, ncurses, zlib"
+TERMUX_PKG_NO_STATICSPLIT=yes
 TERMUX_PKG_HOSTBUILD="yes"
 TERMUX_PKG_BUILD_IN_SRC="yes"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--without-javac --with-ssl=${TERMUX_PREFIX} --with-termcap"
 TERMUX_PKG_EXTRA_MAKE_ARGS="noboot"
-TERMUX_PKG_KEEP_STATIC_LIBRARIES="true"
-TERMUX_PKG_NO_DEVELSPLIT="yes"

 termux_step_post_extract_package() {
 	# We need a host build every time:
--- a/packages/espeak/build.sh
+++ b/packages/espeak/build.sh
@ -5,8 +5,10 @@ TERMUX_PKG_LICENSE="GPL-2.0"
 # See https://github.com/espeak-ng/espeak-ng/issues/180
 # about cross compilation of espeak-ng.
 TERMUX_PKG_VERSION=1.49.2
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_REVISION=2
 TERMUX_PKG_SHA256=cf7ed86850b99bafe819548c73a6651a74300980dd15f319ff22e2bd72ea20b4
+TERMUX_PKG_BREAKS="espeak-dev"
+TERMUX_PKG_REPLACES="espeak-dev"
 TERMUX_PKG_SRCURL=https://github.com/espeak-ng/espeak-ng/releases/download/${TERMUX_PKG_VERSION}/espeak-ng-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_BUILD_IN_SRC=yes
 TERMUX_PKG_HOSTBUILD=yes
--- a/packages/exiv2/build.sh
+++ b/packages/exiv2/build.sh
@ -3,10 +3,12 @@ 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_REVISION=2
 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"
+TERMUX_PKG_BREAKS="exiv2-dev"
+TERMUX_PKG_REPLACES="exiv2-dev"

 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -DEXIV2_ENABLE_VIDEO=ON
--- a/packages/expect/build.sh
+++ b/packages/expect/build.sh
@ -2,10 +2,12 @@ TERMUX_PKG_HOMEPAGE=https://core.tcl.tk/expect/index
 TERMUX_PKG_DESCRIPTION="Tool for automating interactive terminal applications"
 TERMUX_PKG_LICENSE="Public Domain"
 TERMUX_PKG_VERSION=5.45.4
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_REVISION=2
 TERMUX_PKG_SHA256=49a7da83b0bdd9f46d04a04deec19c7767bb9a323e40c4781f89caf760b92c34
 TERMUX_PKG_SRCURL=http://downloads.sourceforge.net/project/expect/Expect/${TERMUX_PKG_VERSION}/expect${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_DEPENDS="tcl"
+TERMUX_PKG_BREAKS="expect-dev"
+TERMUX_PKG_REPLACES="expect-dev"

 termux_step_pre_configure() {
 	autoconf
--- a/packages/fakeroot/build.sh
+++ b/packages/fakeroot/build.sh
@ -3,11 +3,11 @@ TERMUX_PKG_DESCRIPTION="Tool for simulating superuser privileges (with tcp ipc)"
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_MAINTAINER="Leonid Plyushch <leonid.plyushch@gmail.com>"
 TERMUX_PKG_VERSION=1.23
-TERMUX_PKG_REVISION=2
+TERMUX_PKG_REVISION=3
 TERMUX_PKG_SRCURL=http://ftp.debian.org/debian/pool/main/f/fakeroot/fakeroot_${TERMUX_PKG_VERSION}.orig.tar.xz
 TERMUX_PKG_SHA256=009cd6696a931562cf1c212bb57ca441a4a2d45cd32c3190a35c7ae98506f4f6
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--with-ipc=tcp"
-TERMUX_PKG_BUILD_DEPENDS="libcap-dev"
+TERMUX_PKG_BUILD_DEPENDS="libcap"

 termux_step_post_make_install() {
 	ln -sfr "${TERMUX_PREFIX}/lib/libfakeroot-0.so" "${TERMUX_PREFIX}/lib/libfakeroot.so"
--- a/packages/fcgi/build.sh
+++ b/packages/fcgi/build.sh
@ -3,8 +3,11 @@ TERMUX_PKG_DESCRIPTION="A language independent, high performant extension to CGI
 TERMUX_PKG_LICENSE="custom"
 TERMUX_PKG_LICENSE_FILE="LICENSE.TERMS"
 TERMUX_PKG_VERSION=2.4.0
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://sources.archlinux.org/other/packages/fcgi/fcgi-$TERMUX_PKG_VERSION.tar.gz
 TERMUX_PKG_SHA256=66fc45c6b36a21bf2fbbb68e90f780cc21a9da1fffbae75e76d2b4402d3f05b9
+TERMUX_PKG_BREAKS="fcgi-dev"
+TERMUX_PKG_REPLACES="fcgi-dev"

 termux_step_pre_configure() {
 	libtoolize --automake --copy --force
--- a/packages/ffmpeg/build.sh
+++ b/packages/ffmpeg/build.sh
@ -3,12 +3,13 @@ TERMUX_PKG_DESCRIPTION="Tools and libraries to manipulate a wide range of multim
 TERMUX_PKG_LICENSE="GPL-3.0"
 # NOTE: mpv has to be rebuilt and version bumped after updating ffmpeg.
 TERMUX_PKG_VERSION=4.1.4
-TERMUX_PKG_REVISION=1
-TERMUX_PKG_SHA256=f1f049a82fcfbf156564e73a3935d7e750891fab2abf302e735104fd4050a7e1
+TERMUX_PKG_REVISION=2
 TERMUX_PKG_SRCURL=https://www.ffmpeg.org/releases/ffmpeg-${TERMUX_PKG_VERSION}.tar.xz
+TERMUX_PKG_SHA256=f1f049a82fcfbf156564e73a3935d7e750891fab2abf302e735104fd4050a7e1
 TERMUX_PKG_DEPENDS="libass, libbz2, libiconv, libsoxr, libx264, libx265, xvidcore, libvorbis, libmp3lame, libopus, libvpx, libgnutls, libandroid-glob, freetype, zlib, liblzma"
-TERMUX_PKG_INCLUDE_IN_DEVPACKAGE="share/ffmpeg/examples"
 TERMUX_PKG_CONFLICTS="libav"
+TERMUX_PKG_BREAKS="ffmpeg-dev"
+TERMUX_PKG_REPLACES="ffmpeg-dev"

 termux_step_configure() {
 	cd $TERMUX_PKG_BUILDDIR
--- a/packages/fftw/build.sh
+++ b/packages/fftw/build.sh
@ -2,15 +2,16 @@ TERMUX_PKG_HOMEPAGE=http://www.fftw.org/
 TERMUX_PKG_DESCRIPTION="Library for computing the Discrete Fourier Transform (DFT) in one or more dimensions"
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_VERSION=3.3.8
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_REVISION=2
 TERMUX_PKG_SHA256=6113262f6e92c5bd474f2875fa1b01054c4ad5040f6b0da7c03c98821d9ae303
+TERMUX_PKG_BREAKS="fftw-dev"
+TERMUX_PKG_REPLACES="fftw-dev"
 TERMUX_PKG_SRCURL=http://www.fftw.org/fftw-${TERMUX_PKG_VERSION}.tar.gz
 # ac_cv_func_clock_gettime=no avoids having clock_gettime(CLOCK_SGI_CYCLE, &t)
 # being used. It's not supported on Android but fails at runtime and, fftw
 # does not check the return value so gets bogus values.
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--enable-threads ac_cv_func_clock_gettime=no"
 TERMUX_PKG_RM_AFTER_INSTALL="include/fftw*.f*"
-TERMUX_PKG_INCLUDE_IN_DEVPACKAGE="bin/ share/man/"

 termux_step_post_make_install() {
 	local COMMON_ARGS="$TERMUX_PKG_EXTRA_CONFIGURE_ARGS"
--- a/packages/file/build.sh
+++ b/packages/file/build.sh
@ -2,9 +2,12 @@ TERMUX_PKG_HOMEPAGE=https://darwinsys.com/file/
 TERMUX_PKG_DESCRIPTION="Command-line tool that tells you in words what kind of data a file contains"
 TERMUX_PKG_LICENSE="BSD 2-Clause"
 TERMUX_PKG_VERSION=5.37
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=ftp://ftp.astron.com/pub/file/file-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=e9c13967f7dd339a3c241b7710ba093560b9a33013491318e88e6b8b57bae07f
 TERMUX_PKG_DEPENDS="zlib"
+TERMUX_PKG_BREAKS="file-dev"
+TERMUX_PKG_REPLACES="file-dev"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="ac_cv_func_mmap_fixed_mapped=yes"
 TERMUX_PKG_EXTRA_MAKE_ARGS="FILE_COMPILE=$TERMUX_PKG_HOSTBUILD_DIR/src/file"
 TERMUX_PKG_HOSTBUILD="yes"
--- a/packages/finch/build.sh
+++ b/packages/finch/build.sh
@ -2,10 +2,12 @@ TERMUX_PKG_HOMEPAGE=https://pidgin.im/
 TERMUX_PKG_DESCRIPTION="Text-based multi-protocol instant messaging client"
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_VERSION=2.13.0
-TERMUX_PKG_REVISION=2
+TERMUX_PKG_REVISION=3
 TERMUX_PKG_SHA256=2747150c6f711146bddd333c496870bfd55058bab22ffb7e4eb784018ec46d8f
 TERMUX_PKG_SRCURL=http://downloads.sourceforge.net/project/pidgin/Pidgin/${TERMUX_PKG_VERSION}/pidgin-${TERMUX_PKG_VERSION}.tar.bz2
 TERMUX_PKG_DEPENDS="libiconv, libgnutls, libxml2, ncurses-ui-libs, glib"
+TERMUX_PKG_BREAKS="finch-dev"
+TERMUX_PKG_REPLACES="finch-dev"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 --disable-gtkui
 --disable-gstreamer
--- a/packages/flex/build.sh
+++ b/packages/flex/build.sh
@ -2,12 +2,12 @@ TERMUX_PKG_HOMEPAGE=https://github.com/westes/flex
 TERMUX_PKG_DESCRIPTION="Fast lexical analyser generator"
 TERMUX_PKG_LICENSE="BSD 2-Clause"
 TERMUX_PKG_VERSION=2.6.4
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://github.com/westes/flex/releases/download/v${TERMUX_PKG_VERSION}/flex-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=e87aae032bf07c26f85ac0ed3250998c37621d95f8bd748b31f15b33c45ee995
 TERMUX_PKG_DEPENDS="m4"
 TERMUX_PKG_HOSTBUILD=true
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS+="ac_cv_path_M4=$TERMUX_PREFIX/bin/m4"
-TERMUX_PKG_NO_DEVELSPLIT=yes
 TERMUX_PKG_CONFLICTS="flex-dev"
 TERMUX_PKG_REPLACES="flex-dev"

--- a/packages/fontconfig/build.sh
+++ b/packages/fontconfig/build.sh
@ -2,11 +2,12 @@ TERMUX_PKG_HOMEPAGE=https://www.freedesktop.org/wiki/Software/fontconfig/
 TERMUX_PKG_DESCRIPTION="Library for configuring and customizing font access"
 TERMUX_PKG_LICENSE="BSD"
 TERMUX_PKG_VERSION=2.13.1
-TERMUX_PKG_REVISION=3
+TERMUX_PKG_REVISION=4
 TERMUX_PKG_SHA256=f655dd2a986d7aa97e052261b36aa67b0a64989496361eca8d604e6414006741
 TERMUX_PKG_SRCURL=https://www.freedesktop.org/software/fontconfig/release/fontconfig-${TERMUX_PKG_VERSION}.tar.bz2
 TERMUX_PKG_DEPENDS="freetype, libxml2, libpng, libuuid, zlib"
-TERMUX_PKG_DEVPACKAGE_DEPENDS="freetype-dev, libxml2-dev"
+TERMUX_PKG_BREAKS="fontconfig-dev"
+TERMUX_PKG_REPLACES="fontconfig-dev"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 --enable-libxml2
 --enable-iconv=no
--- a/packages/freetype/build.sh
+++ b/packages/freetype/build.sh
@ -2,10 +2,12 @@ TERMUX_PKG_HOMEPAGE=https://www.freetype.org
 TERMUX_PKG_DESCRIPTION="Software font engine capable of producing high-quality output"
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_VERSION=2.10.1
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SHA256=16dbfa488a21fe827dc27eaf708f42f7aa3bb997d745d31a19781628c36ba26f
 TERMUX_PKG_SRCURL=https://download.savannah.gnu.org/releases/freetype/freetype-$TERMUX_PKG_VERSION.tar.xz
 TERMUX_PKG_DEPENDS="libbz2, libpng, zlib"
-TERMUX_PKG_INCLUDE_IN_DEVPACKAGE="bin/freetype-config share/man/man1/freetype-config.1"
+TERMUX_PKG_BREAKS="freetype-dev"
+TERMUX_PKG_REPLACES="freetype-dev"
 # Use with-harfbuzz=no to avoid circular dependency between freetype and harfbuzz:
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--with-harfbuzz=no"
 # not install these files anymore so install them manually.
--- a/packages/fribidi/build.sh
+++ b/packages/fribidi/build.sh
@ -2,7 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://github.com/fribidi/fribidi/
 TERMUX_PKG_DESCRIPTION="Implementation of the Unicode Bidirectional Algorithm"
 TERMUX_PKG_LICENSE="LGPL-2.0"
 TERMUX_PKG_VERSION=1.0.5
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SHA256=6a64f2a687f5c4f203a46fa659f43dd43d1f8b845df8d723107e8a7e6158e4ce
 TERMUX_PKG_SRCURL=https://github.com/fribidi/fribidi/releases/download/v$TERMUX_PKG_VERSION/fribidi-$TERMUX_PKG_VERSION.tar.bz2
 TERMUX_PKG_DEPENDS="glib"
+TERMUX_PKG_BREAKS="fribidi-dev"
+TERMUX_PKG_REPLACES="fribidi-dev"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-docs"
--- a/packages/fwknop/build.sh
+++ b/packages/fwknop/build.sh
@ -2,9 +2,12 @@ TERMUX_PKG_HOMEPAGE=https://www.cipherdyne.org/fwknop/
 TERMUX_PKG_DESCRIPTION="fwknop: Single Packet Authorization > Port Knocking"
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_VERSION=2.6.10
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SHA256=f6c09bec97ed8e474a98ae14f9f53e1bcdda33393f20667b6af3fb6bb894ca77
 TERMUX_PKG_SRCURL=https://www.cipherdyne.org/fwknop/download/fwknop-${TERMUX_PKG_VERSION}.tar.bz2
 TERMUX_PKG_DEPENDS="gpgme"
+TERMUX_PKG_BREAKS="fwknop-dev"
+TERMUX_PKG_REPLACES="fwknop-dev"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 --disable-server
 --with-gpgme
--- a/packages/gawk/build.sh
+++ b/packages/gawk/build.sh
@ -2,10 +2,12 @@ TERMUX_PKG_HOMEPAGE=https://www.gnu.org/software/gawk/
 TERMUX_PKG_DESCRIPTION="Programming language designed for text processing"
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_VERSION=5.0.1
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_REVISION=2
 TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/gawk/gawk-${TERMUX_PKG_VERSION}.tar.xz
 TERMUX_PKG_SHA256=8e4e86f04ed789648b66f757329743a0d6dfb5294c3b91b756a474f1ce05a794
 TERMUX_PKG_DEPENDS="libandroid-support, libgmp, libmpfr, readline"
+TERMUX_PKG_BREAKS="gawk-dev"
+TERMUX_PKG_REPLACES="gawk-dev"
 TERMUX_PKG_RM_AFTER_INSTALL="bin/gawk-* bin/igawk share/man/man1/igawk.1"

 termux_step_pre_configure() {
--- a/packages/gdb/build.sh
+++ b/packages/gdb/build.sh
@ -2,15 +2,15 @@ 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_VERSION=8.3
-TERMUX_PKG_REVISION=3
+TERMUX_PKG_REVISION=4
 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_BREAKS="gdb-dev"
+TERMUX_PKG_REPLACES="gdb-dev"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 --with-system-readline
 --with-curses
--enable-static
 ac_cv_func_getpwent=no
 ac_cv_func_getpwnam=no
 "
--- a/packages/gdbm/build.sh
+++ b/packages/gdbm/build.sh
@ -2,7 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://www.gnu.org.ua/software/gdbm/
 TERMUX_PKG_DESCRIPTION="Library of database functions that use extensible hashing"
 TERMUX_PKG_LICENSE="GPL-3.0"
 TERMUX_PKG_VERSION=1.18.1
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_REVISION=2
 TERMUX_PKG_SHA256=86e613527e5dba544e73208f42b78b7c022d4fa5a6d5498bf18c8d6f745b91dc
+TERMUX_PKG_BREAKS="gdbm-dev"
+TERMUX_PKG_REPLACES="gdbm-dev"
 TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/gdbm/gdbm-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--without-readline --enable-libgdbm-compat"
--- a/packages/gdk-pixbuf/build.sh
+++ b/packages/gdk-pixbuf/build.sh
@ -6,7 +6,8 @@ TERMUX_PKG_REVISION=2
 TERMUX_PKG_SHA256=f19ff836ba991031610dcc53774e8ca436160f7d981867c8c3a37acfe493ab3a
 TERMUX_PKG_SRCURL=ftp://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/${TERMUX_PKG_VERSION:0:4}/gdk-pixbuf-${TERMUX_PKG_VERSION}.tar.xz
 TERMUX_PKG_DEPENDS="glib, libpng, libtiff, libjpeg-turbo"
-TERMUX_PKG_DEVPACKAGE_DEPENDS="libpng-dev, glib-dev"
+TERMUX_PKG_BREAKS="gdk-pixbuf-dev"
+TERMUX_PKG_REPLACES="gdk-pixbuf-dev"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -Dgio_sniffing=false
 -Dgir=false
--- a/packages/gegl/build.sh
+++ b/packages/gegl/build.sh
@ -2,10 +2,12 @@ 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_REVISION=2
+TERMUX_PKG_REVISION=3
 TERMUX_PKG_SRCURL=https://download.gimp.org/pub/gegl/${TERMUX_PKG_VERSION:0:3}/gegl-${TERMUX_PKG_VERSION}.tar.bz2
 TERMUX_PKG_SHA256=0112df690301d9eb993cc48965fc71b7751c9021a4f4ee08fcae366c326b5e5a
 TERMUX_PKG_DEPENDS="libandroid-support, libc++, ffmpeg, babl, json-glib, libjpeg-turbo, libpng, libjasper, littlecms, libtiff, librsvg, zlib"
+TERMUX_PKG_BREAKS="gegl-dev"
+TERMUX_PKG_REPLACES="gegl-dev"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 --without-gdk-pixbuf
 ac_cv_func_bind_textdomain_codeset=yes
--- a/packages/gettext/build.sh
+++ b/packages/gettext/build.sh
@ -2,10 +2,12 @@ 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_REVISION=2
 TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/gettext/gettext-${TERMUX_PKG_VERSION}.tar.xz
 TERMUX_PKG_SHA256=53f02fbbec9e798b0faaf7c73272f83608e835c6288dd58be6c9bb54624a3800
 TERMUX_PKG_DEPENDS="libc++, libiconv, pcre, liblzma, libxml2, libcroco, ncurses, libunistring, zlib"
+TERMUX_PKG_BREAKS="gettext-dev"
+TERMUX_PKG_REPLACES="gettext-dev"
 TERMUX_PKG_BUILD_IN_SRC=yes

 termux_step_pre_configure() {
--- a/packages/giflib/build.sh
+++ b/packages/giflib/build.sh
@ -3,6 +3,9 @@ TERMUX_PKG_DESCRIPTION="A library for reading and writing gif images"
 TERMUX_PKG_LICENSE="MIT"
 TERMUX_PKG_MAINTAINER="Leonid Plyushch <leonid.plyushch@gmail.com>"
 TERMUX_PKG_VERSION=5.2.1
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SHA256=31da5562f44c5f15d63340a09a4fd62b48c45620cd302f77a6d9acf0077879bd
+TERMUX_PKG_BREAKS="giflib-dev"
+TERMUX_PKG_REPLACES="giflib-dev"
 TERMUX_PKG_SRCURL=https://fossies.org/linux/misc/giflib-$TERMUX_PKG_VERSION.tar.gz
 TERMUX_PKG_BUILD_IN_SRC=yes
--- a/packages/glib/build.sh
+++ b/packages/glib/build.sh
@ -2,14 +2,15 @@ TERMUX_PKG_HOMEPAGE=https://developer.gnome.org/glib/
 TERMUX_PKG_DESCRIPTION="Library providing core building blocks for libraries and applications written in C"
 TERMUX_PKG_LICENSE="LGPL-2.1"
 TERMUX_PKG_VERSION=2.60.6
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://ftp.gnome.org/pub/gnome/sources/glib/${TERMUX_PKG_VERSION:0:4}/glib-${TERMUX_PKG_VERSION}.tar.xz
 TERMUX_PKG_SHA256=ff8fab8d8deaa4fd0536c90f90d9769a09071779c7e6183907f6855645bffb6c
 # libandroid-support to get langinfo.h in include path.
 TERMUX_PKG_DEPENDS="libffi, libiconv, pcre, libandroid-support, zlib"
+TERMUX_PKG_BREAKS="glib-dev"
+TERMUX_PKG_REPLACES="glib-dev"
 TERMUX_PKG_RM_AFTER_INSTALL="share/gtk-doc lib/locale share/glib-2.0/gettext share/gdb/auto-load share/glib-2.0/codegen share/glib-2.0/gdb bin/gtester-report bin/glib-gettextize bin/gdbus-codegen"
 # Needed by pkg-config for glib-2.0:
-TERMUX_PKG_DEVPACKAGE_DEPENDS="pcre-dev"
-TERMUX_PKG_INCLUDE_IN_DEVPACKAGE="lib/glib-2.0/include"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -Dlibmount=false
 -Diconv=gnu
--- a/packages/gmic/build.sh
+++ b/packages/gmic/build.sh
@ -2,12 +2,11 @@ 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.7
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_REVISION=2
 TERMUX_PKG_SRCURL=https://gmic.eu/files/source/gmic_$TERMUX_PKG_VERSION.tar.gz
 TERMUX_PKG_SHA256=2e5535d1bae66254136e928428750aac8efcef6f4413fc352b6de9ce8ac8b0ff
 TERMUX_PKG_DEPENDS="libc++, libcurl, fftw, libpng, libjpeg-turbo, libtiff, zlib"
 TERMUX_PKG_BUILD_DEPENDS="graphicsmagick"
-TERMUX_PKG_NO_DEVELSPLIT=yes
 TERMUX_PKG_BUILD_IN_SRC=yes

 termux_step_configure() {
--- a/packages/golang/build.sh
+++ b/packages/golang/build.sh
@ -5,10 +5,10 @@ local _MAJOR_VERSION=1.12.7
 TERMUX_PKG_SHA256=95e8447d6f04b8d6a62de1726defbb20ab203208ee167ed15f83d7978ce43b13
 # Use the ~ deb versioning construct in the future:
 TERMUX_PKG_VERSION=2:${_MAJOR_VERSION}
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_REVISION=2
 TERMUX_PKG_SRCURL=https://storage.googleapis.com/golang/go${_MAJOR_VERSION}.src.tar.gz
-TERMUX_PKG_KEEP_STATIC_LIBRARIES=true
 TERMUX_PKG_DEPENDS="clang"
+TERMUX_PKG_NO_STATICSPLIT=yes

 termux_step_make_install() {
 	termux_setup_golang
--- a/packages/googletest/build.sh
+++ b/packages/googletest/build.sh
@ -2,10 +2,9 @@ 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=2
+TERMUX_PKG_REVISION=3
 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"

--- a/packages/gpgme/build.sh
+++ b/packages/gpgme/build.sh
@ -2,10 +2,12 @@ TERMUX_PKG_HOMEPAGE=https://www.gnupg.org/related_software/gpgme/
 TERMUX_PKG_DESCRIPTION="Library designed to make access to GnuPG easier"
 TERMUX_PKG_LICENSE="LGPL-2.0"
 TERMUX_PKG_VERSION=1.13.1
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=ftp://ftp.gnupg.org/gcrypt/gpgme/gpgme-${TERMUX_PKG_VERSION}.tar.bz2
 TERMUX_PKG_SHA256=c4e30b227682374c23cddc7fdb9324a99694d907e79242a25a4deeedb393be46
 TERMUX_PKG_DEPENDS="gnupg (>= 2.2.9-1), libassuan, libgpg-error"
-TERMUX_PKG_DEVPACKAGE_DEPENDS="libgpg-error-dev"
+TERMUX_PKG_BREAKS="gpgme-dev"
+TERMUX_PKG_REPLACES="gpgme-dev"
 # Use "--disable-gpg-test" to avoid "No rule to make target `../../src/libgpgme-pthread.la":
 # Use "--enable-languages=no" to only build the C library.
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
@ -16,4 +18,3 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 --without-gpgconf
 --without-gpgsm
 "
-TERMUX_PKG_INCLUDE_IN_DEVPACKAGE="bin/gpgme-config"
--- a/packages/graphicsmagick/build.sh
+++ b/packages/graphicsmagick/build.sh
@ -2,17 +2,16 @@ 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=2
+TERMUX_PKG_REVISION=3
 # 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, libc++, libtiff, freetype, libjasper, libjpeg-turbo, libpng, libbz2, libxml2, liblzma, zstd, zlib"
-TERMUX_PKG_REPLACES="graphicsmagick++"
-TERMUX_PKG_DEVPACKAGE_REPLACES="graphicsmagick++-dev"
+TERMUX_PKG_BREAKS="graphicsmagick-dev"
+TERMUX_PKG_REPLACES="graphicsmagick++, graphicsmagick-dev"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 ac_cv_func_ftime=no
 --with-fontpath=/system/fonts
 --without-webp
 --without-x
 "
-TERMUX_PKG_INCLUDE_IN_DEVPACKAGE="bin/*-config"
--- a/packages/graphviz/build.sh
+++ b/packages/graphviz/build.sh
@ -3,10 +3,12 @@ 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=8
+TERMUX_PKG_REVISION=9
 TERMUX_PKG_SRCURL=https://fossies.org/linux/misc/graphviz-$TERMUX_PKG_VERSION.tar.gz
 TERMUX_PKG_SHA256=ca5218fade0204d59947126c38439f432853543b0818d9d728c589dfe7f3a421
 TERMUX_PKG_DEPENDS="libandroid-glob, libc++, libcairo, pango, libexpat, libltdl, librsvg, libgd, zlib"
+TERMUX_PKG_BREAKS="graphviz-dev"
+TERMUX_PKG_REPLACES="graphviz-dev"
 TERMUX_PKG_BUILD_DEPENDS="libtool"
 TERMUX_PKG_BUILD_IN_SRC=yes
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
--- a/packages/gsl/build.sh
+++ b/packages/gsl/build.sh
@ -2,7 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://www.gnu.org/software/gsl/
 TERMUX_PKG_DESCRIPTION="GNU Scientific Library (GSL) providing a wide range of mathematical routines"
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_VERSION=2.5
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SHA256=0460ad7c2542caaddc6729762952d345374784100223995eb14d614861f2258d
+TERMUX_PKG_BREAKS="gsl-dev"
+TERMUX_PKG_REPLACES="gsl-dev"
 TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/gsl/gsl-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_RM_AFTER_INSTALL="bin/ share/man/man1"

--- a/packages/gst-plugins-bad/build.sh
+++ b/packages/gst-plugins-bad/build.sh
@ -2,10 +2,12 @@ TERMUX_PKG_HOMEPAGE=https://gstreamer.freedesktop.org/
 TERMUX_PKG_DESCRIPTION="GStreamer Bad Plug-ins"
 TERMUX_PKG_LICENSE="LGPL-2.0"
 TERMUX_PKG_VERSION=1.16.0
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_REVISION=2
 TERMUX_PKG_SRCURL=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-${TERMUX_PKG_VERSION}.tar.xz
 TERMUX_PKG_SHA256=22139de35626ada6090bdfa3423b27b7fc15a0198331d25c95e6b12cb1072b05
 TERMUX_PKG_DEPENDS="gst-plugins-base, libbz2, libcurl, libiconv, libpng, librsvg, libssh2, libsndfile, libx264, libx265, littlecms, openal-soft, openjpeg"
+TERMUX_PKG_BREAKS="gst-plugins-bad-dev"
+TERMUX_PKG_REPLACES="gst-plugins-bad-dev"
 TERMUX_PKG_BUILD_IN_SRC=yes
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 --disable-android_media
--- a/packages/gst-plugins-base/build.sh
+++ b/packages/gst-plugins-base/build.sh
@ -2,10 +2,12 @@ TERMUX_PKG_HOMEPAGE=https://gstreamer.freedesktop.org/
 TERMUX_PKG_DESCRIPTION="GStreamer base plug-ins"
 TERMUX_PKG_LICENSE="LGPL-2.0"
 TERMUX_PKG_VERSION=1.16.0
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_REVISION=2
 TERMUX_PKG_SRCURL=https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-${TERMUX_PKG_VERSION}.tar.xz
 TERMUX_PKG_SHA256=4093aa7b51e28fb24dfd603893fead8d1b7782f088b05ed0f22a21ef176fb5ae
 TERMUX_PKG_DEPENDS="gstreamer, libjpeg-turbo, libopus, libpng, libvorbis, zlib"
+TERMUX_PKG_BREAKS="gst-plugins-base-dev"
+TERMUX_PKG_REPLACES="gst-plugins-base-dev"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 GLIB_GENMARSHAL=/usr/bin/glib-genmarshal
 GLIB_MKENUMS=/usr/bin/glib-mkenums
--- a/packages/gstreamer/build.sh
+++ b/packages/gstreamer/build.sh
@ -2,10 +2,12 @@ TERMUX_PKG_HOMEPAGE=https://gstreamer.freedesktop.org/
 TERMUX_PKG_DESCRIPTION="Open source multimedia framework"
 TERMUX_PKG_LICENSE="LGPL-2.0"
 TERMUX_PKG_VERSION=1.16.0
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${TERMUX_PKG_VERSION}.tar.xz
 TERMUX_PKG_SHA256=0e8e2f7118be437cba879353970cf83c2acced825ecb9275ba05d9186ef07c00
 TERMUX_PKG_DEPENDS="glib"
-TERMUX_PKG_DEVPACKAGE_DEPENDS="glib-dev"
+TERMUX_PKG_BREAKS="gstreamer-dev"
+TERMUX_PKG_REPLACES="gstreamer-dev"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 --disable-check
 --disable-tests
--- a/packages/harfbuzz/build.sh
+++ b/packages/harfbuzz/build.sh
@ -2,9 +2,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.5.3
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://www.freedesktop.org/software/harfbuzz/release/harfbuzz-${TERMUX_PKG_VERSION}.tar.xz
 TERMUX_PKG_SHA256=fed00dc797b7ba3ca943225f0a854baaed4c1640fff8a31d455cd3b5caec855c
 TERMUX_PKG_DEPENDS="freetype, glib, libbz2, libc++, libpng, libgraphite"
+TERMUX_PKG_BREAKS="harfbuzz-dev"
+TERMUX_PKG_REPLACES="harfbuzz-dev"
 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"
--- a/packages/hoedown/build.sh
+++ b/packages/hoedown/build.sh
@ -3,7 +3,9 @@ TERMUX_PKG_DESCRIPTION="Hoedown is a revived fork of Sundown, the Markdown parse
 TERMUX_PKG_LICENSE="ISC"
 TERMUX_PKG_MAINTAINER="Leonid Plyushch <leonid.plyushch@gmail.com>"
 TERMUX_PKG_VERSION=3.0.7
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_REVISION=2
 TERMUX_PKG_SRCURL=https://github.com/hoedown/hoedown/archive/$TERMUX_PKG_VERSION.tar.gz
 TERMUX_PKG_SHA256=01b6021b1ec329b70687c0d240b12edcaf09c4aa28423ddf344d2bd9056ba920
+TERMUX_PKG_BREAKS="hoedown-dev"
+TERMUX_PKG_REPLACES="hoedown-dev"
 TERMUX_PKG_BUILD_IN_SRC=yes
--- a/packages/httrack/build.sh
+++ b/packages/httrack/build.sh
@ -3,9 +3,11 @@ TERMUX_PKG_DESCRIPTION="It allows you to download a World Wide Web site from the
 TERMUX_PKG_LICENSE="GPL-3.0"
 TERMUX_PKG_MAINTAINER="Leonid Plyushch <leonid.plyushch@gmail.com>"
 TERMUX_PKG_VERSION=3.49.2
-TERMUX_PKG_REVISION=5
+TERMUX_PKG_REVISION=6
 TERMUX_PKG_SRCURL=http://mirror.httrack.com/historical/httrack-$TERMUX_PKG_VERSION.tar.gz
 TERMUX_PKG_SHA256=3477a0e5568e241c63c9899accbfcdb6aadef2812fcce0173688567b4c7d4025
 TERMUX_PKG_DEPENDS="libandroid-support, openssl, zlib"
+TERMUX_PKG_BREAKS="httrack-dev"
+TERMUX_PKG_REPLACES="httrack-dev"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--with-zlib=$TERMUX_PREFIX"
 TERMUX_PKG_BUILD_IN_SRC="yes"
--- a/packages/hunspell/build.sh
+++ b/packages/hunspell/build.sh
@ -2,10 +2,12 @@ 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=4
+TERMUX_PKG_REVISION=5
 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_BREAKS="hunspell-dev"
+TERMUX_PKG_REPLACES="hunspell-dev"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--with-ui --with-readline"
 TERMUX_PKG_BUILD_IN_SRC=yes

--- a/packages/imagemagick/build.sh
+++ b/packages/imagemagick/build.sh
@ -2,10 +2,12 @@ TERMUX_PKG_HOMEPAGE=https://www.imagemagick.org/
 TERMUX_PKG_DESCRIPTION="Suite to create, edit, compose, or convert images in a variety of formats"
 TERMUX_PKG_LICENSE="ImageMagick"
 TERMUX_PKG_VERSION=7.0.8.56
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_REVISION=2
 TERMUX_PKG_SRCURL=https://github.com/ImageMagick/ImageMagick/archive/$(echo $TERMUX_PKG_VERSION | sed 's/\(.*\)\./\1-/').tar.gz
 TERMUX_PKG_SHA256=061b80fdc3dc254acb6d61166162e4cdfed5f1ded19034ca0cc15497c4e19f38
 TERMUX_PKG_DEPENDS="fftw, pango, glib, libbz2, libjpeg-turbo, liblzma, libpng, libtiff, libxml2, openjpeg, littlecms, libwebp"
+TERMUX_PKG_BREAKS="imagemagick-dev"
+TERMUX_PKG_REPLACES="imagemagick-dev"

 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 --disable-largefile
--- a/packages/inotify-tools/build.sh
+++ b/packages/inotify-tools/build.sh
@ -2,7 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://github.com/rvoicilas/inotify-tools/wiki
 TERMUX_PKG_DESCRIPTION="Programs providing a simple interface to inotify"
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_VERSION=3.20.1
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SHA256=a433cc1dedba851078276db69b0e97f9fe41e4ba3336d2971adfca4b3a6242ac
+TERMUX_PKG_BREAKS="inotify-tools-dev"
+TERMUX_PKG_REPLACES="inotify-tools-dev"
 TERMUX_PKG_SRCURL=https://github.com/rvoicilas/inotify-tools/archive/${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_BUILD_IN_SRC=yes

--- a/packages/iperf3/build.sh
+++ b/packages/iperf3/build.sh
@ -2,7 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://github.com/esnet/iperf
 TERMUX_PKG_DESCRIPTION="TCP, UDP, and SCTP network bandwidth measurement tool"
 TERMUX_PKG_LICENSE="BSD 3-Clause"
 TERMUX_PKG_VERSION=3.7
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SHA256=d846040224317caf2f75c843d309a950a7db23f9b44b94688ccbe557d6d1710c
 TERMUX_PKG_SRCURL=https://fossies.org/linux/privat/iperf-$TERMUX_PKG_VERSION.tar.gz
 TERMUX_PKG_DEPENDS="openssl"
+TERMUX_PKG_BREAKS="iperf3-dev"
+TERMUX_PKG_REPLACES="iperf3-dev"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-profiling"
--- a/packages/irssi/build.sh
+++ b/packages/irssi/build.sh
@ -2,7 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://irssi.org/
 TERMUX_PKG_DESCRIPTION="Terminal based IRC client"
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_DEPENDS="libiconv, ncurses, openssl, glib, libandroid-glob, utf8proc"
+TERMUX_PKG_BREAKS="irssi-dev"
+TERMUX_PKG_REPLACES="irssi-dev"
 TERMUX_PKG_VERSION=1.2.1
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://github.com/irssi/irssi/releases/download/$TERMUX_PKG_VERSION/irssi-$TERMUX_PKG_VERSION.tar.xz
 TERMUX_PKG_SHA256=5466a1ed9612cfa707d9a37d60b29d027b4ac7d83c74ceb1a410e2b59edba92c
 TERMUX_PKG_BUILD_IN_SRC=yes
--- a/packages/iverilog/build.sh
+++ b/packages/iverilog/build.sh
@ -3,10 +3,12 @@ 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=6
+TERMUX_PKG_REVISION=7
 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"
+TERMUX_PKG_BREAKS="iverilog-dev"
+TERMUX_PKG_REPLACES="iverilog-dev"

 termux_step_pre_configure() {
 	LDFLAGS+=" -lm"
--- a/packages/jq/build.sh
+++ b/packages/jq/build.sh
@ -2,7 +2,10 @@ TERMUX_PKG_HOMEPAGE=http://stedolan.github.io/jq/
 TERMUX_PKG_DESCRIPTION="Command-line JSON processor"
 TERMUX_PKG_LICENSE="MIT"
 TERMUX_PKG_VERSION=1.6
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SHA256=5de8c8e29aaa3fb9cc6b47bb27299f271354ebb72514e3accadc7d38b5bbaa72
+TERMUX_PKG_BREAKS="jq-dev"
+TERMUX_PKG_REPLACES="jq-dev"
 TERMUX_PKG_SRCURL=https://github.com/stedolan/jq/releases/download/jq-$TERMUX_PKG_VERSION/jq-$TERMUX_PKG_VERSION.tar.gz
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--with-oniguruma=no"
 TERMUX_PKG_BUILD_IN_SRC=yes
--- a/packages/json-c/build.sh
+++ b/packages/json-c/build.sh
@ -3,7 +3,10 @@ TERMUX_PKG_DESCRIPTION="A JSON implementation in C"
 TERMUX_PKG_LICENSE="MIT"
 TERMUX_PKG_MAINTAINER="Balazs Kutil @balazs_kutil"
 TERMUX_PKG_VERSION=0.13.1
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SHA256=b87e608d4d3f7bfdd36ef78d56d53c74e66ab278d318b71e6002a369d36f4873
+TERMUX_PKG_BREAKS="json-c-dev"
+TERMUX_PKG_REPLACES="json-c-dev"
 TERMUX_PKG_SRCURL=https://s3.amazonaws.com/json-c_releases/releases/json-c-${TERMUX_PKG_VERSION}.tar.gz

 termux_step_make() {
--- a/packages/json-glib/build.sh
+++ b/packages/json-glib/build.sh
@ -2,11 +2,12 @@ TERMUX_PKG_HOMEPAGE=https://wiki.gnome.org/Projects/JsonGlib
 TERMUX_PKG_DESCRIPTION="GLib JSON manipulation library"
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_VERSION=1.4.4
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_REVISION=2
 TERMUX_PKG_SHA256=720c5f4379513dc11fd97dc75336eb0c0d3338c53128044d9fabec4374f4bc47
 TERMUX_PKG_SRCURL=https://download.gnome.org/sources/json-glib/${TERMUX_PKG_VERSION:0:3}/json-glib-${TERMUX_PKG_VERSION}.tar.xz
 TERMUX_PKG_DEPENDS="glib"
-TERMUX_PKG_DEVPACKAGE_DEPENDS="glib-dev"
+TERMUX_PKG_BREAKS="json-glib-dev"
+TERMUX_PKG_REPLACES="json-glib-dev"
 TERMUX_PKG_RM_AFTER_INSTALL="
 share/installed-tests
 libexec/installed-tests
--- a/packages/jsoncpp/build.sh
+++ b/packages/jsoncpp/build.sh
@ -2,9 +2,12 @@ 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.9.1
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SHA256=c7b40f5605dd972108f503f031b20186f5e5bca2b65cd4b8bd6c3e4ba8126697
 TERMUX_PKG_SRCURL=https://github.com/open-source-parsers/jsoncpp/archive/${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_DEPENDS="libc++"
+TERMUX_PKG_BREAKS="jsoncpp-dev"
+TERMUX_PKG_REPLACES="jsoncpp-dev"

 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -DBUILD_SHARED_LIBS=ON
--- a/packages/keystone/build.sh
+++ b/packages/keystone/build.sh
@ -3,10 +3,12 @@ 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=5
+TERMUX_PKG_REVISION=6
 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_BREAKS="keystone-dev"
+TERMUX_PKG_REPLACES="keystone-dev"

 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -DPYTHON_EXECUTABLE=$(which python2.7)
--- a/packages/krb5/build.sh
+++ b/packages/krb5/build.sh
@ -2,12 +2,17 @@ TERMUX_PKG_HOMEPAGE=https://web.mit.edu/kerberos
 TERMUX_PKG_DESCRIPTION="The Kerberos network authentication system"
 TERMUX_PKG_LICENSE="MIT"
 TERMUX_PKG_VERSION=1.17
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://fossies.org/linux/misc/krb5-$TERMUX_PKG_VERSION.tar.gz
 TERMUX_PKG_SHA256=5a6e2284a53de5702d3dc2be3b9339c963f9b5397d3fbbc53beb249380a781f5
 TERMUX_PKG_DEPENDS="libandroid-support, libandroid-glob, readline, openssl, libdb"
+TERMUX_PKG_BREAKS="krb5-dev"
+TERMUX_PKG_REPLACES="krb5-dev"
 TERMUX_PKG_MAINTAINER="Vishal Biswas @vishalbiswas"
 TERMUX_PKG_CONFFILES="etc/krb5.conf var/krb5kdc/kdc.conf"
-TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--with-readline
+TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
+--disable-static
+--with-readline
 --without-system-verto
 --with-netlib=-lc
 --enable-dns-for-realm
--- 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=2
+TERMUX_PKG_REVISION=3

 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
@ -19,6 +19,7 @@ TERMUX_PKG_SHA256=(4b2fd3eb90fb6debc0ae6d70406bc78fcb531a0f20806640e626d4822e87b
 		   bd17cf67784f2ea0a2e0298761c662c80fddf6700c065f6689eb353e2144c987
 		   3692974b6dc6c81280c0321371b400101006f28bafb890f089b1d357dadbcbf1)
 TERMUX_PKG_DEPENDS="clang, libc++, zlib"
+TERMUX_PKG_NO_STATICSPLIT=yes
 TERMUX_PKG_HOSTBUILD=true
 TERMUX_PKG_FORCE_CMAKE=yes
 #These CMake args are only used to configure a patched LLVM
@ -29,8 +30,6 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -DLLVM_TABLEGEN=$TERMUX_PKG_HOSTBUILD_DIR/bin/llvm-tblgen
 -DPYTHON_EXECUTABLE=$(which python3)
 "
-TERMUX_PKG_KEEP_STATIC_LIBRARIES=true
-TERMUX_PKG_NO_DEVELSPLIT=yes

 termux_step_post_extract_package() {
 	mv llvm-${TERMUX_PKG_VERSION[1]}.src llvm
--- a/packages/ldns/build.sh
+++ b/packages/ldns/build.sh
@ -1,16 +1,19 @@
 TERMUX_PKG_HOMEPAGE=https://www.nlnetlabs.nl/projects/ldns/
 TERMUX_PKG_DESCRIPTION="Library for simplifying DNS programming and supporting recent and experimental RFCs"
 TERMUX_PKG_LICENSE="BSD 3-Clause"
-TERMUX_PKG_DEPENDS="openssl"
 TERMUX_PKG_VERSION=1.7.1
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://www.nlnetlabs.nl/downloads/ldns/ldns-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=8ac84c16bdca60e710eea75782356f3ac3b55680d40e1530d7cea474ac208229
+TERMUX_PKG_DEPENDS="openssl"
+TERMUX_PKG_BREAKS="ldns-dev"
+TERMUX_PKG_REPLACES="ldns-dev"
 TERMUX_PKG_BUILD_IN_SRC=yes
+
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 --with-ssl=$TERMUX_PREFIX
 --disable-gost
 "
-TERMUX_PKG_INCLUDE_IN_DEVPACKAGE="bin/ldns-config share/man/man1/ldns-config.1"

 termux_step_post_make_install() {
 	# The ldns build doesn't install its pkg-config:
--- a/packages/ledger/build.sh
+++ b/packages/ledger/build.sh
@ -2,10 +2,12 @@ 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=2
+TERMUX_PKG_REVISION=3
 TERMUX_PKG_SRCURL=https://github.com/ledger/ledger/archive/v${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=b248c91d65c7a101b9d6226025f2b4bf3dabe94c0c49ab6d51ce84a22a39622b
 TERMUX_PKG_DEPENDS="boost, libc++, libedit, libmpfr, libgmp"
+TERMUX_PKG_BREAKS="ledger-dev"
+TERMUX_PKG_REPLACES="ledger-dev"
 TERMUX_PKG_BUILD_DEPENDS="utf8cpp"
 # See https://gitlab.kitware.com/cmake/cmake/issues/18865:
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="-DBoost_NO_BOOST_CMAKE=ON"
--- a/packages/leptonica/build.sh
+++ b/packages/leptonica/build.sh
@ -2,10 +2,12 @@ TERMUX_PKG_HOMEPAGE=http://www.leptonica.com/
 TERMUX_PKG_DESCRIPTION="Library for image processing and image analysis"
 TERMUX_PKG_LICENSE="BSD 2-Clause"
 TERMUX_PKG_VERSION=1.78.0
-TERMUX_PKG_REVISION=2
+TERMUX_PKG_REVISION=3
 TERMUX_PKG_SHA256=f8ac4d93cc76b524c2c81d27850bfc342e68b91368aa7a1f7d69e34ce13adbb4
 TERMUX_PKG_SRCURL=https://github.com/DanBloomberg/leptonica/archive/${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_DEPENDS="libjpeg-turbo, libpng, libtiff, zlib"
+TERMUX_PKG_BREAKS="leptonica-dev"
+TERMUX_PKG_REPLACES="leptonica-dev"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--without-giflib --without-libwebp --without-libopenjpeg"

 termux_step_pre_configure() {
--- a/packages/leveldb/build.sh
+++ b/packages/leveldb/build.sh
@ -2,8 +2,10 @@ 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_REVISION=1
+TERMUX_PKG_REVISION=2
 TERMUX_PKG_SRCURL=https://github.com/google/leveldb/archive/${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=55423cac9e3306f4a9502c738a001e4a339d1a38ffbee7572d4a07d5d63949b2
 TERMUX_PKG_DEPENDS="libc++"
+TERMUX_PKG_BREAKS="leveldb-dev"
+TERMUX_PKG_REPLACES="leveldb-dev"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="-DBUILD_SHARED_LIBS=TRUE"
--- a/packages/lhasa/build.sh
+++ b/packages/lhasa/build.sh
@ -3,7 +3,9 @@ TERMUX_PKG_DESCRIPTION="LHA compressor/decompressor"
 TERMUX_PKG_LICENSE="ISC"
 TERMUX_PKG_MAINTAINER="Leonid Plyushch <leonid.plyushch@gmail.com>"
 TERMUX_PKG_VERSION=0.3.1
-TERMUX_PKG_REVISION=4
+TERMUX_PKG_REVISION=5
 TERMUX_PKG_SRCURL=https://soulsphere.org/projects/lhasa/lhasa-$TERMUX_PKG_VERSION.tar.gz
 TERMUX_PKG_SHA256=3fb08e5f85a9b9dd023922896be9157d5fb5c0448424681810aaa2b0558a5f24
+TERMUX_PKG_BREAKS="lhasa-dev"
+TERMUX_PKG_REPLACES="lhasa-dev"
 TERMUX_PKG_BUILD_IN_SRC=yes
--- a/packages/libandroid-glob/build.sh
+++ b/packages/libandroid-glob/build.sh
@ -1,10 +1,17 @@
 TERMUX_PKG_HOMEPAGE=http://man7.org/linux/man-pages/man3/glob.3.html
 TERMUX_PKG_DESCRIPTION="Shared library for the glob(3) system function"
 TERMUX_PKG_LICENSE="BSD 3-Clause"
-TERMUX_PKG_VERSION=0.4
+TERMUX_PKG_VERSION=0.5
 TERMUX_PKG_BUILD_IN_SRC=yes

+termux_step_make() {
+	$CC $CFLAGS $CPPFLAGS -I$TERMUX_PKG_BUILDER_DIR -c $TERMUX_PKG_BUILDER_DIR/glob.c
+	$CC $LDFLAGS -shared glob.o -o libandroid-glob.so
+	$AR rcu libandroid-glob.a glob.o
+}
+
 termux_step_make_install() {
-	cp $TERMUX_PKG_BUILDER_DIR/glob.h $TERMUX_PREFIX/include/
-	$CC $CFLAGS $CPPFLAGS $LDFLAGS $TERMUX_PKG_BUILDER_DIR/glob.c -shared -o $TERMUX_PREFIX/lib/libandroid-glob.so
+	install -Dm600 $TERMUX_PKG_BUILDER_DIR/glob.h $TERMUX_PREFIX/include/glob.h
+	install -Dm600 libandroid-glob.a $TERMUX_PREFIX/lib/libandroid-glob.a
+	install -Dm600 libandroid-glob.so $TERMUX_PREFIX/lib/libandroid-glob.so
 }
--- a/packages/libandroid-shmem/build.sh
+++ b/packages/libandroid-shmem/build.sh
@ -1,7 +1,9 @@
 TERMUX_PKG_HOMEPAGE=https://github.com/termux/libandroid-shmem
 TERMUX_PKG_DESCRIPTION="System V shared memory emulation on Android using ashmem"
 TERMUX_PKG_LICENSE="BSD 3-Clause"
-TERMUX_PKG_VERSION=0.2
+TERMUX_PKG_VERSION=0.2.1
 TERMUX_PKG_SRCURL=https://github.com/termux/libandroid-shmem/archive/v${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_SHA256=75e687f48c01d96ea1345f11c064ff76f7eb9a119f51ebe2f6253cf8b24a2b97
+TERMUX_PKG_SHA256=09369398658af357e3644178d42ebfcc79ea11fe760b10855011521fc3e35be4
+TERMUX_PKG_BREAKS="libandroid-shmem-dev"
+TERMUX_PKG_REPLACES="libandroid-shmem-dev"
 TERMUX_PKG_BUILD_IN_SRC=yes
--- a/packages/libandroid-support/build.sh
+++ b/packages/libandroid-support/build.sh
@ -2,17 +2,28 @@ TERMUX_PKG_HOMEPAGE=https://github.com/termux/libandroid-support
 TERMUX_PKG_DESCRIPTION="Library extending the Android C library (Bionic) for additional multibyte, locale and math support"
 TERMUX_PKG_LICENSE="Apache-2.0"
 TERMUX_PKG_VERSION=25
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://github.com/termux/libandroid-support/archive/v$TERMUX_PKG_VERSION.tar.gz
 TERMUX_PKG_SHA256=42e7b55c2e5fc91cc0447fa8bea432e7a75ec78b03469330668af17aea56f660
 TERMUX_PKG_PRE_DEPENDS="dpkg (>= 1.19.4-3)"
 TERMUX_PKG_BUILD_IN_SRC=yes
 TERMUX_PKG_ESSENTIAL=yes

+termux_step_make() {
+	local c_file
+
+	mkdir objects
+	for c_file in $(find src -type f -iname \*.c); do
+		$CC $CPPFLAGS $CFLAGS -std=c99 -DNULL=0 -fPIC -Iinclude \
+			-c $c_file -o ./objects/$(basename "$c_file").o
+	done
+
+	cd objects
+	ar rcu ../libandroid-support.a
+	$CC $LDFLAGS -shared -o ../libandroid-support.so *.o
+}
+
 termux_step_make_install() {
-	_C_FILES="src/musl-*/*.c"
-	$CC $CFLAGS -std=c99 -DNULL=0 $CPPFLAGS $LDFLAGS \
-		-Iinclude \
-		$_C_FILES \
-		-shared -fpic \
-		-o $TERMUX_PREFIX/lib/libandroid-support.so
+	install -Dm600 libandroid-support.a $TERMUX_PREFIX/lib/libandroid-support.a
+	install -Dm600 libandroid-support.so $TERMUX_PREFIX/lib/libandroid-support.so
 }
--- a/packages/libarchive/build.sh
+++ b/packages/libarchive/build.sh
@ -2,9 +2,12 @@ TERMUX_PKG_HOMEPAGE=https://www.libarchive.org/
 TERMUX_PKG_DESCRIPTION="Multi-format archive and compression library"
 TERMUX_PKG_LICENSE="BSD 2-Clause"
 TERMUX_PKG_VERSION=3.4.0
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SHA256=8643d50ed40c759f5412a3af4e353cffbce4fdf3b5cf321cb72cacf06b2d825e
 TERMUX_PKG_SRCURL=https://github.com/libarchive/libarchive/releases/download/v$TERMUX_PKG_VERSION/libarchive-$TERMUX_PKG_VERSION.tar.gz
 TERMUX_PKG_DEPENDS="libbz2, libiconv, liblzma, libxml2, openssl, zlib"
+TERMUX_PKG_BREAKS="libarchive-dev"
+TERMUX_PKG_REPLACES="libarchive-dev"

 # --without-nettle to use openssl instead:
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
--- a/packages/libass/build.sh
+++ b/packages/libass/build.sh
@ -3,6 +3,9 @@ TERMUX_PKG_DESCRIPTION="A portable library for SSA/ASS subtitles rendering"
 TERMUX_PKG_LICENSE="BSD"
 TERMUX_PKG_MAINTAINER="Leonid Plyushch <leonid.plyushch@gmail.com>"
 TERMUX_PKG_VERSION=0.14.0
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://github.com/libass/libass/releases/download/$TERMUX_PKG_VERSION/libass-$TERMUX_PKG_VERSION.tar.xz
 TERMUX_PKG_SHA256=881f2382af48aead75b7a0e02e65d88c5ebd369fe46bc77d9270a94aa8fd38a2
 TERMUX_PKG_DEPENDS="fontconfig, fribidi, glib, harfbuzz"
+TERMUX_PKG_BREAKS="libass-dev"
+TERMUX_PKG_REPLACES="libass-dev"
--- a/packages/libassuan/build.sh
+++ b/packages/libassuan/build.sh
@ -2,7 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://www.gnupg.org/related_software/libassuan/
 TERMUX_PKG_DESCRIPTION="Library implementing the Assuan IPC protocol used between most newer GnuPG components"
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_VERSION=2.5.3
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SHA256=91bcb0403866b4e7c4bc1cc52ed4c364a9b5414b3994f718c70303f7f765e702
 TERMUX_PKG_SRCURL=https://www.gnupg.org/ftp/gcrypt/libassuan/libassuan-${TERMUX_PKG_VERSION}.tar.bz2
-TERMUX_PKG_INCLUDE_IN_DEVPACKAGE="bin/libassuan-config"
 TERMUX_PKG_DEPENDS="libgpg-error"
+TERMUX_PKG_BREAKS="libassuan-dev"
+TERMUX_PKG_REPLACES="libassuan-dev"
--- a/packages/libbsd/build.sh
+++ b/packages/libbsd/build.sh
@ -2,6 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://libbsd.freedesktop.org
 TERMUX_PKG_DESCRIPTION="utility functions from BSD systems"
 TERMUX_PKG_LICENSE="BSD 3-Clause"
 TERMUX_PKG_VERSION=0.9.1
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://libbsd.freedesktop.org/releases/libbsd-$TERMUX_PKG_VERSION.tar.xz
 TERMUX_PKG_SHA256=56d835742327d69faccd16955a60b6dcf30684a8da518c4eca0ac713b9e0a7a4
+TERMUX_PKG_BREAKS="libbsd-dev"
+TERMUX_PKG_REPLACES="libbsd-dev"
 TERMUX_PKG_BUILD_IN_SRC=yes
--- a/packages/libbz2/build.sh
+++ b/packages/libbz2/build.sh
@ -2,9 +2,11 @@ TERMUX_PKG_HOMEPAGE=http://www.bzip.org/
 TERMUX_PKG_DESCRIPTION="BZ2 format compression library"
 TERMUX_PKG_LICENSE="BSD"
 TERMUX_PKG_VERSION=1.0.8
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_REVISION=2
 TERMUX_PKG_SRCURL=https://fossies.org/linux/misc/bzip2-${TERMUX_PKG_VERSION}.tar.xz
 TERMUX_PKG_SHA256=47fd74b2ff83effad0ddf62074e6fad1f6b4a77a96e121ab421c20a216371a1f
+TERMUX_PKG_BREAKS="libbz2-dev"
+TERMUX_PKG_REPLACES="libbz2-dev"
 TERMUX_PKG_ESSENTIAL=yes
 TERMUX_PKG_EXTRA_MAKE_ARGS="PREFIX=$TERMUX_PREFIX"
 TERMUX_PKG_BUILD_IN_SRC=yes
--- a/packages/libcaca/build.sh
+++ b/packages/libcaca/build.sh
@ -2,10 +2,12 @@ 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=5
+TERMUX_PKG_REVISION=6
 TERMUX_PKG_SRCURL=http://fossies.org/linux/privat/libcaca-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=128b467c4ed03264c187405172a4e83049342cc8cc2f655f53a2d0ee9d3772f4
 TERMUX_PKG_DEPENDS="libc++, ncurses, zlib"
+TERMUX_PKG_BREAKS="libcaca-dev"
+TERMUX_PKG_REPLACES="libcaca-dev"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-python --disable-java --disable-ruby --disable-doc"

 termux_step_post_configure() {
--- a/packages/libcairo/build.sh
+++ b/packages/libcairo/build.sh
@ -2,10 +2,12 @@ TERMUX_PKG_HOMEPAGE=https://cairographics.org
 TERMUX_PKG_DESCRIPTION="Cairo 2D vector graphics library"
 TERMUX_PKG_LICENSE="LGPL-2.0"
 TERMUX_PKG_VERSION=1.16.0
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_REVISION=2
 TERMUX_PKG_SHA256=5e7b29b3f113ef870d1e3ecf8adf21f923396401604bda16d44be45e66052331
 TERMUX_PKG_SRCURL=https://cairographics.org/releases/cairo-${TERMUX_PKG_VERSION}.tar.xz
 TERMUX_PKG_DEPENDS="libandroid-support, libpixman, fontconfig, freetype, libpng"
+TERMUX_PKG_BREAKS="libcairo-dev"
+TERMUX_PKG_REPLACES="libcairo-dev"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 ac_cv_lib_lzo2_lzo2a_decompress=no
 --disable-gtk-doc-html
--- a/packages/libcap/build.sh
+++ b/packages/libcap/build.sh
@ -3,9 +3,12 @@ TERMUX_PKG_DESCRIPTION="POSIX 1003.1e capabilities"
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_MAINTAINER="Leonid Plyushch <leonid.plyushch@gmail.com>"
 TERMUX_PKG_VERSION=2.27
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://kernel.org/pub/linux/libs/security/linux-privs/libcap2/libcap-${TERMUX_PKG_VERSION}.tar.xz
 TERMUX_PKG_SHA256=dac1792d0118bee6aae6ba7fb93ff1602c6a9bda812fd63916eee1435b9c486a
 TERMUX_PKG_DEPENDS="attr"
+TERMUX_PKG_BREAKS="libcap-dev"
+TERMUX_PKG_REPLACES="libcap-dev"
 TERMUX_PKG_BUILD_IN_SRC=true

 termux_step_make() {
--- a/packages/libcln/build.sh
+++ b/packages/libcln/build.sh
@ -2,10 +2,12 @@ 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=5
+TERMUX_PKG_REVISION=6
 TERMUX_PKG_SRCURL=https://fossies.org/linux/privat/cln-$TERMUX_PKG_VERSION.tar.xz
 TERMUX_PKG_SHA256=c32e59b6afbcf8b84075ab454c42982429c6ea9675aee2bbda176cb85293e38f
 TERMUX_PKG_DEPENDS="libc++, libgmp"
+TERMUX_PKG_BREAKS="libcln-dev"
+TERMUX_PKG_REPLACES="libcln-dev"
 TERMUX_PKG_BUILD_IN_SRC=yes

 termux_step_pre_configure() {
--- a/packages/libcoap/build.sh
+++ b/packages/libcoap/build.sh
@ -2,9 +2,12 @@ TERMUX_PKG_HOMEPAGE=https://libcoap.net/
 TERMUX_PKG_DESCRIPTION="Implementation of CoAP, a lightweight protocol for resource constrained devices"
 TERMUX_PKG_LICENSE="BSD 2-Clause"
 TERMUX_PKG_VERSION=4.2.0
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SHA256=9523e38da6ee8b2a8f5ce83ded64107dd1e514c7ad00cd74ccfe3454b679c271
 TERMUX_PKG_SRCURL=https://github.com/obgm/libcoap/archive/v$TERMUX_PKG_VERSION.tar.gz
 TERMUX_PKG_DEPENDS="openssl"
+TERMUX_PKG_BREAKS="libcoap-dev"
+TERMUX_PKG_REPLACES="libcoap-dev"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--with-openssl --disable-doxygen"

 termux_step_pre_configure() {
--- a/packages/libconfig/build.sh
+++ b/packages/libconfig/build.sh
@ -3,10 +3,12 @@ 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=2
+TERMUX_PKG_REVISION=3
 TERMUX_PKG_SRCURL=https://github.com/hyperrealm/libconfig/archive/v${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=f67ac44099916ae260a6c9e290a90809e7d782d96cdd462cac656ebc5b685726
 TERMUX_PKG_DEPENDS="libc++"
+TERMUX_PKG_BREAKS="libconfig-dev"
+TERMUX_PKG_REPLACES="libconfig-dev"

 termux_step_pre_configure() {
 	autoreconf -fi
--- a/packages/libconfuse/build.sh
+++ b/packages/libconfuse/build.sh
@ -2,5 +2,8 @@ TERMUX_PKG_HOMEPAGE=https://github.com/martinh/libconfuse
 TERMUX_PKG_DESCRIPTION="Small configuration file parser library for C"
 TERMUX_PKG_LICENSE="LGPL-2.0"
 TERMUX_PKG_VERSION=3.2.2
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SHA256=71316b55592f8d0c98924242c98dbfa6252153a8b6e7d89e57fe6923934d77d0
+TERMUX_PKG_BREAKS="libconfuse-dev"
+TERMUX_PKG_REPLACES="libconfuse-dev"
 TERMUX_PKG_SRCURL=https://github.com/martinh/libconfuse/releases/download/v$TERMUX_PKG_VERSION/confuse-$TERMUX_PKG_VERSION.tar.gz
--- a/packages/libcroco/build.sh
+++ b/packages/libcroco/build.sh
@ -2,7 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://github.com/GNOME/libcroco
 TERMUX_PKG_DESCRIPTION="CSS parsing and manipulation library"
 TERMUX_PKG_LICENSE="LGPL-2.0"
 TERMUX_PKG_VERSION=0.6.13
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_REVISION=2
 TERMUX_PKG_SHA256=767ec234ae7aa684695b3a735548224888132e063f92db585759b422570621d4
 TERMUX_PKG_SRCURL=http://ftp.gnome.org/pub/gnome/sources/libcroco/${TERMUX_PKG_VERSION:0:3}/libcroco-${TERMUX_PKG_VERSION}.tar.xz
 TERMUX_PKG_DEPENDS="glib,liblzma,libxml2"
+TERMUX_PKG_BREAKS="libcroco-dev"
+TERMUX_PKG_REPLACES="libcroco-dev"
--- a/packages/libcrypt/build.sh
+++ b/packages/libcrypt/build.sh
@ -2,8 +2,10 @@ TERMUX_PKG_HOMEPAGE=http://michael.dipperstein.com/crypt/
 TERMUX_PKG_DESCRIPTION="A crypt(3) implementation"
 TERMUX_PKG_LICENSE="BSD 2-Clause"
 TERMUX_PKG_VERSION=0.2
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_REVISION=2
 TERMUX_PKG_DEPENDS="openssl"
+TERMUX_PKG_BREAKS="libcrypt-dev"
+TERMUX_PKG_REPLACES="libcrypt-dev"

 termux_step_make_install() {
 	$CC $CFLAGS $CPPFLAGS $LDFLAGS -Wall -Wextra -fPIC -shared $TERMUX_PKG_BUILDER_DIR/crypt3.c -lcrypto -o $TERMUX_PREFIX/lib/libcrypt.so
--- a/packages/libcue/build.sh
+++ b/packages/libcue/build.sh
@ -2,7 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://github.com/lipnitsk/libcue/
 TERMUX_PKG_DESCRIPTION="CUE Sheet Parser Library"
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_VERSION=2.2.1
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SHA256=f27bc3ebb2e892cd9d32a7bee6d84576a60f955f29f748b9b487b173712f1200
+TERMUX_PKG_BREAKS="libcue-dev"
+TERMUX_PKG_REPLACES="libcue-dev"
 TERMUX_PKG_SRCURL=https://github.com/lipnitsk/libcue/archive/v${TERMUX_PKG_VERSION}.tar.gz
 # To avoid picking up cross-compiled flex and bison:
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
--- a/packages/libcurl/build.sh
+++ b/packages/libcurl/build.sh
@ -2,10 +2,12 @@ TERMUX_PKG_HOMEPAGE=https://curl.haxx.se/
 TERMUX_PKG_DESCRIPTION="Easy-to-use client-side URL transfer library"
 TERMUX_PKG_LICENSE="MIT"
 TERMUX_PKG_VERSION=7.65.3
-TERMUX_PKG_REVISION=2
+TERMUX_PKG_REVISION=3
 TERMUX_PKG_SRCURL=https://curl.haxx.se/download/curl-${TERMUX_PKG_VERSION}.tar.bz2
 TERMUX_PKG_SHA256=0a855e83be482d7bc9ea00e05bdb1551a44966076762f9650959179c89fce509
 TERMUX_PKG_DEPENDS="libnghttp2, openssl (>= 1.1.1), zlib"
+TERMUX_PKG_BREAKS="libcurl-dev"
+TERMUX_PKG_REPLACES="libcurl-dev"
 TERMUX_PKG_ESSENTIAL=yes

 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
@ -19,7 +21,6 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 --with-ssl
 "

-TERMUX_PKG_INCLUDE_IN_DEVPACKAGE="bin/curl-config share/man/man1/curl-config.1"

 # Starting with version 7.62 curl started enabling http/2 by default.
 # Support for http/2 as added in version 1.4.8-8 of the apt package, so we
--- a/packages/libdb/build.sh
+++ b/packages/libdb/build.sh
@ -3,8 +3,10 @@ TERMUX_PKG_DESCRIPTION="The Berkeley DB embedded database system (library)"
 TERMUX_PKG_LICENSE="BSD 3-Clause"
 TERMUX_PKG_MAINTAINER="Vishal Biswas @vishalbiswas"
 TERMUX_PKG_VERSION=18.1.32
-TERMUX_PKG_REVISION=2
+TERMUX_PKG_REVISION=3
 TERMUX_PKG_SHA256=fa1fe7de9ba91ad472c25d026f931802597c29f28ae951960685cde487c8d654
+TERMUX_PKG_BREAKS="libdb-dev"
+TERMUX_PKG_REPLACES="libdb-dev"
 TERMUX_PKG_SRCURL=https://fossies.org/linux/misc/db-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 --enable-hash
--- a/packages/libduktape/build.sh
+++ b/packages/libduktape/build.sh
@ -2,11 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://www.duktape.org/
 TERMUX_PKG_DESCRIPTION="An embeddable Javascript engine with a focus on portability and compact footprint"
 TERMUX_PKG_LICENSE="MIT"
 TERMUX_PKG_VERSION=2.3.0
-TERMUX_PKG_REVISION=4
-TERMUX_PKG_REPLACES="duktape (<< 2.3.0-1)"
-TERMUX_PKG_BREAKS="duktape (<< 2.3.0-1)"
-TERMUX_PKG_DEVPACKAGE_BREAKS="duktape-dev"
-TERMUX_PKG_DEVPACKAGE_REPLACES="duktape-dev"
+TERMUX_PKG_REVISION=5
+TERMUX_PKG_REPLACES="duktape (<< 2.3.0-1), libduktape-dev"
+TERMUX_PKG_BREAKS="duktape (<< 2.3.0-1), libduktape-dev"
 TERMUX_PKG_BUILD_IN_SRC=yes

 termux_step_extract_package() {
--- a/packages/libedit/build.sh
+++ b/packages/libedit/build.sh
@ -2,9 +2,12 @@ TERMUX_PKG_HOMEPAGE=https://thrysoee.dk/editline/
 TERMUX_PKG_DESCRIPTION="Library providing line editing, history, and tokenization functions"
 TERMUX_PKG_LICENSE="BSD 3-Clause"
 TERMUX_PKG_VERSION=20190324-3.1
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SHA256=ac8f0f51c1cf65492e4d1e3ed2be360bda41e54633444666422fbf393bba1bae
 TERMUX_PKG_SRCURL=https://thrysoee.dk/editline/libedit-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_DEPENDS="libandroid-support, ncurses"
+TERMUX_PKG_BREAKS="libedit-dev"
+TERMUX_PKG_REPLACES="libedit-dev"
 TERMUX_PKG_RM_AFTER_INSTALL="share/man/man7/editline.7 share/man/man3/history.3"

 termux_step_pre_configure() {
--- a/packages/libelf/build.sh
+++ b/packages/libelf/build.sh
@ -4,14 +4,15 @@ TERMUX_PKG_LICENSE="GPL-2.0"
 # NOTE: We only build the libelf part of elfutils for now,
 # as other parts are not clang compatible.
 TERMUX_PKG_VERSION=0.176
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SHA256=eb5747c371b0af0f71e86215a5ebb88728533c3a104a43d4231963f308cd1023
 TERMUX_PKG_SRCURL=ftp://sourceware.org/pub/elfutils/${TERMUX_PKG_VERSION}/elfutils-${TERMUX_PKG_VERSION}.tar.bz2
 # libandroid-support for langinfo.
 TERMUX_PKG_DEPENDS="libandroid-support, zlib"
 TERMUX_PKG_BUILD_DEPENDS="argp"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="ac_cv_c99=yes --disable-symbol-versioning"
-TERMUX_PKG_CONFLICTS=elfutils
-TERMUX_PKG_REPLACES=elfutils
+TERMUX_PKG_CONFLICTS="elfutils, libelf-dev"
+TERMUX_PKG_REPLACES="elfutils, libelf-dev"

 termux_step_pre_configure() {
 	CFLAGS+=" -Wno-error=unused-value -Wno-error=format-nonliteral -Wno-error"