reformat build.sh for some packages

* Packages where dependencies were sorted are bumped.

packages/apt/build.sh

@@ -1,13 +1,23 @@
 TERMUX_PKG_HOMEPAGE=https://packages.debian.org/apt
 TERMUX_PKG_DESCRIPTION="Front-end for the dpkg package manager"
 TERMUX_PKG_LICENSE="GPL-2.0"
-TERMUX_PKG_DEPENDS="coreutils, grep, findutils, libcurl, liblzma, dpkg, gpgv, libc++, sed, termux-exec, zlib, termux-licenses"
+TERMUX_PKG_VERSION=1.4.9
+TERMUX_PKG_REVISION=14
+TERMUX_PKG_SRCURL=http://ftp.debian.org/debian/pool/main/a/apt/apt_${TERMUX_PKG_VERSION}.tar.xz
+TERMUX_PKG_SHA256=d4d65e7c84da86f3e6dcc933bba46a08db429c9d933b667c864f5c0e880bac0d
+# apt-key requires utilities from coreutils, findutils, gpgv, grep, sed.
+TERMUX_PKG_DEPENDS="coreutils, dpkg, findutils, gpgv, grep, libc++, libcurl, liblzma, sed, termux-exec, termux-licenses, zlib"
+TERMUX_PKG_CONFLICTS="apt-transport-https"
+TERMUX_PKG_REPLACES="apt-transport-https"
 TERMUX_PKG_RECOMMENDS="game-repo, science-repo"
 TERMUX_PKG_SUGGESTS="unstable-repo"
-TERMUX_PKG_VERSION=1.4.9
+TERMUX_PKG_ESSENTIAL=yes
-TERMUX_PKG_REVISION=13
+
-TERMUX_PKG_SHA256=d4d65e7c84da86f3e6dcc933bba46a08db429c9d933b667c864f5c0e880bac0d
+TERMUX_PKG_CONFFILES="
-TERMUX_PKG_SRCURL=http://ftp.debian.org/debian/pool/main/a/apt/apt_${TERMUX_PKG_VERSION}.tar.xz
+etc/apt/sources.list
+etc/apt/trusted.gpg
+"
+
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -DPERL_EXECUTABLE=$(which perl)
 -DCMAKE_INSTALL_FULL_LOCALSTATEDIR=$TERMUX_PREFIX
@@ -16,10 +26,7 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -DUSE_NLS=OFF
 -DWITH_DOC=OFF
 "
-TERMUX_PKG_ESSENTIAL=yes
+
-TERMUX_PKG_CONFFILES="etc/apt/sources.list etc/apt/trusted.gpg"
-TERMUX_PKG_CONFLICTS=apt-transport-https
-TERMUX_PKG_REPLACES=apt-transport-https
 TERMUX_PKG_RM_AFTER_INSTALL="
 bin/apt-cdrom
 bin/apt-extracttemplates

packages/bash/build.sh

@@ -1,15 +1,15 @@
 TERMUX_PKG_HOMEPAGE=https://www.gnu.org/software/bash/
 TERMUX_PKG_DESCRIPTION="A sh-compatible shell that incorporates useful features from the Korn shell (ksh) and C shell (csh)"
 TERMUX_PKG_LICENSE="GPL-3.0"
-TERMUX_PKG_DEPENDS="ncurses, readline (>= 8.0), libandroid-support, libiconv, termux-tools, command-not-found"
 _MAIN_VERSION=5.0
 _PATCH_VERSION=7
-TERMUX_PKG_REVISION=2
-TERMUX_PKG_SHA256=b4a80f2ac66170b2913efbfb9f2594f1f76c7b1afd11f799e22035d63077fb4d
 TERMUX_PKG_VERSION=${_MAIN_VERSION}.${_PATCH_VERSION}
+TERMUX_PKG_REVISION=3
 TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/bash/bash-${_MAIN_VERSION}.tar.gz
-TERMUX_PKG_BUILD_IN_SRC=true
+TERMUX_PKG_SHA256=b4a80f2ac66170b2913efbfb9f2594f1f76c7b1afd11f799e22035d63077fb4d
+TERMUX_PKG_DEPENDS="command-not-found, libandroid-support, libiconv, ncurses, readline (>= 8.0), termux-tools"
 TERMUX_PKG_ESSENTIAL=true
+TERMUX_PKG_BUILD_IN_SRC=true
 
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--enable-multibyte --without-bash-malloc --with-installed-readline"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" bash_cv_job_control_missing=present"

packages/coreutils/build.sh

@@ -1,14 +1,14 @@
 TERMUX_PKG_HOMEPAGE=https://www.gnu.org/software/coreutils/
 TERMUX_PKG_DESCRIPTION="Basic file, shell and text manipulation utilities from the GNU project"
 TERMUX_PKG_LICENSE="GPL-3.0"
-TERMUX_PKG_ESSENTIAL=yes
 TERMUX_PKG_VERSION=8.31
 TERMUX_PKG_REVISION=7
-TERMUX_PKG_SHA256=ff7a9c918edce6b4f4b2725e3f9b37b0c4d193531cac49a48b56c4d0d3a9e9fd
 TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/coreutils/coreutils-${TERMUX_PKG_VERSION}.tar.xz
+TERMUX_PKG_SHA256=ff7a9c918edce6b4f4b2725e3f9b37b0c4d193531cac49a48b56c4d0d3a9e9fd
 TERMUX_PKG_DEPENDS="libandroid-support, libiconv"
 TERMUX_PKG_BREAKS="busybox (<< 1.30.1-4)"
 TERMUX_PKG_REPLACES="busybox (<< 1.30.1-4)"
+TERMUX_PKG_ESSENTIAL=yes
 
 # pinky has no usage on Android.
 # df does not work either, let system binary prevail.

packages/dash/build.sh

@@ -1,11 +1,11 @@
 TERMUX_PKG_HOMEPAGE=http://gondor.apana.org.au/~herbert/dash/
 TERMUX_PKG_DESCRIPTION="Small POSIX-compliant implementation of /bin/sh"
 TERMUX_PKG_LICENSE="BSD 3-Clause"
-TERMUX_PKG_ESSENTIAL=yes
 TERMUX_PKG_VERSION=0.5.10.2
 TERMUX_PKG_REVISION=1
-TERMUX_PKG_SHA256=3c663919dc5c66ec991da14c7cf7e0be8ad00f3db73986a987c118862b5f6071
 TERMUX_PKG_SRCURL=http://gondor.apana.org.au/~herbert/dash/files/dash-${TERMUX_PKG_VERSION}.tar.gz
+TERMUX_PKG_SHA256=3c663919dc5c66ec991da14c7cf7e0be8ad00f3db73986a987c118862b5f6071
+TERMUX_PKG_ESSENTIAL=yes
 
 termux_step_post_make_install() {
 	# Symlink sh -> dash

packages/diffutils/build.sh

@@ -1,12 +1,13 @@
 TERMUX_PKG_HOMEPAGE=https://www.gnu.org/software/diffutils/
 TERMUX_PKG_DESCRIPTION="Programs (cmp, diff, diff3 and sdiff) related to finding differences between files"
 TERMUX_PKG_LICENSE="GPL-3.0"
-TERMUX_PKG_ESSENTIAL=yes
 TERMUX_PKG_VERSION=3.7
 TERMUX_PKG_REVISION=2
-TERMUX_PKG_SHA256=b3a7a6221c3dc916085f0d205abf6b8e1ba443d4dd965118da364a1dc1cb3a26
 TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/diffutils/diffutils-${TERMUX_PKG_VERSION}.tar.xz
+TERMUX_PKG_SHA256=b3a7a6221c3dc916085f0d205abf6b8e1ba443d4dd965118da364a1dc1cb3a26
 TERMUX_PKG_DEPENDS="libiconv"
+TERMUX_PKG_ESSENTIAL=yes
+
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="ac_cv_path_PR_PROGRAM=${TERMUX_PREFIX}/bin/pr"
 
 termux_step_pre_configure() {

packages/findutils/build.sh

@@ -5,10 +5,22 @@ TERMUX_PKG_VERSION=4.6.0
 TERMUX_PKG_REVISION=3
 TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/findutils/findutils-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=ded4c9f73731cd48fec3b6bdaccce896473b6d8e337e9612e16cf1431bb1169d
-TERMUX_PKG_EXTRA_CONFIGURE_ARGS="gl_cv_func_fflush_stdin=yes SORT_SUPPORTS_Z=yes SORT=$TERMUX_PREFIX/bin/applets/sort"
 TERMUX_PKG_DEPENDS="libandroid-support"
+
+TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
+gl_cv_func_fflush_stdin=yes
+SORT_SUPPORTS_Z=yes
+SORT=$TERMUX_PREFIX/bin/applets/sort
+"
+
 # Remove locale and updatedb which in Termux is provided by mlocate:
-TERMUX_PKG_RM_AFTER_INSTALL="bin/locate bin/updatedb share/man/man1/locate.1 share/man/man1/updatedb.1 share/man/man5/locatedb.5"
+TERMUX_PKG_RM_AFTER_INSTALL="
+bin/locate
+bin/updatedb
+share/man/man1/locate.1
+share/man/man1/updatedb.1
+share/man/man5/locatedb.5
+"
 
 termux_step_pre_configure() {
 	# This is needed for find to implement support for the

packages/gawk/build.sh

@@ -1,10 +1,11 @@
 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_DEPENDS="libandroid-support, libmpfr, libgmp, readline"
 TERMUX_PKG_VERSION=5.0.1
-TERMUX_PKG_SHA256=8e4e86f04ed789648b66f757329743a0d6dfb5294c3b91b756a474f1ce05a794
+TERMUX_PKG_REVISION=1
 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_RM_AFTER_INSTALL="bin/gawk-* bin/igawk share/man/man1/igawk.1"
 
 termux_step_pre_configure() {

packages/grep/build.sh

@@ -1,11 +1,11 @@
 TERMUX_PKG_HOMEPAGE=https://www.gnu.org/software/grep/
 TERMUX_PKG_DESCRIPTION="Command which searches one or more input files for lines containing a match to a specified pattern"
 TERMUX_PKG_LICENSE="GPL-3.0"
-TERMUX_PKG_DEPENDS="libandroid-support, pcre"
 TERMUX_PKG_VERSION=3.3
 TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/grep/grep-${TERMUX_PKG_VERSION}.tar.xz
 TERMUX_PKG_SHA256=b960541c499619efd6afe1fa795402e4733c8e11ebf9fafccc0bb4bccdc5b514
+TERMUX_PKG_DEPENDS="libandroid-support, pcre"
 
 termux_step_pre_configure() {
 	if [ "$TERMUX_DEBUG" == "true" ]; then

packages/gzip/build.sh

@@ -1,11 +1,12 @@
 TERMUX_PKG_HOMEPAGE=https://www.gnu.org/software/gzip/
 TERMUX_PKG_DESCRIPTION="Standard GNU file compression utilities"
 TERMUX_PKG_LICENSE="GPL-3.0"
-TERMUX_PKG_ESSENTIAL=yes
 TERMUX_PKG_VERSION=1.10
 TERMUX_PKG_REVISION=2
-TERMUX_PKG_SHA256=8425ccac99872d544d4310305f915f5ea81e04d0f437ef1a230dc9d1c819d7c0
 TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/gzip/gzip-${TERMUX_PKG_VERSION}.tar.xz
+TERMUX_PKG_SHA256=8425ccac99872d544d4310305f915f5ea81e04d0f437ef1a230dc9d1c819d7c0
+TERMUX_PKG_ESSENTIAL=yes
+
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="ac_cv_path_GREP=grep"
 
 termux_step_pre_configure() {

packages/less/build.sh

@@ -1,9 +1,9 @@
 TERMUX_PKG_HOMEPAGE=http://www.greenwoodsoftware.com/less/
 TERMUX_PKG_DESCRIPTION="Terminal pager program used to view the contents of a text file one screen at a time"
 TERMUX_PKG_LICENSE="GPL-3.0"
-TERMUX_PKG_ESSENTIAL=yes
 TERMUX_PKG_VERSION=551
 TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=http://www.greenwoodsoftware.com/less/less-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=ff165275859381a63f19135a8f1f6c5a194d53ec3187f94121ecd8ef0795fe3d
 TERMUX_PKG_DEPENDS="ncurses"
+TERMUX_PKG_ESSENTIAL=yes

packages/libbz2/build.sh

@@ -1,11 +1,11 @@
 TERMUX_PKG_HOMEPAGE=http://www.bzip.org/
 TERMUX_PKG_DESCRIPTION="BZ2 format compression library"
 TERMUX_PKG_LICENSE="BSD"
-TERMUX_PKG_ESSENTIAL=yes
 TERMUX_PKG_VERSION=1.0.8
 TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://fossies.org/linux/misc/bzip2-${TERMUX_PKG_VERSION}.tar.xz
 TERMUX_PKG_SHA256=47fd74b2ff83effad0ddf62074e6fad1f6b4a77a96e121ab421c20a216371a1f
+TERMUX_PKG_ESSENTIAL=yes
 TERMUX_PKG_EXTRA_MAKE_ARGS="PREFIX=$TERMUX_PREFIX"
 TERMUX_PKG_BUILD_IN_SRC=yes
 

packages/libcurl/build.sh

@@ -1,12 +1,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_ESSENTIAL=yes
 TERMUX_PKG_VERSION=7.65.3
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_REVISION=2
 TERMUX_PKG_SRCURL=https://curl.haxx.se/download/curl-${TERMUX_PKG_VERSION}.tar.bz2
 TERMUX_PKG_SHA256=0a855e83be482d7bc9ea00e05bdb1551a44966076762f9650959179c89fce509
-TERMUX_PKG_DEPENDS="openssl (>= 1.1.1), libnghttp2, zlib"
+TERMUX_PKG_DEPENDS="libnghttp2, openssl (>= 1.1.1), zlib"
+TERMUX_PKG_ESSENTIAL=yes
 
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 --enable-ntlm-wb=$TERMUX_PREFIX/bin/ntlm_auth

packages/liblzma/build.sh

@@ -1,8 +1,8 @@
 TERMUX_PKG_HOMEPAGE=https://tukaani.org/xz/
 TERMUX_PKG_DESCRIPTION="XZ-format compression library"
 TERMUX_PKG_LICENSE="GPL-2.0"
-TERMUX_PKG_ESSENTIAL=yes
 TERMUX_PKG_VERSION=5.2.4
 TERMUX_PKG_REVISION=3
-TERMUX_PKG_SHA256=9717ae363760dedf573dad241420c5fea86256b65bc21d2cf71b2b12f0544f4b
 TERMUX_PKG_SRCURL=https://fossies.org/linux/misc/xz-${TERMUX_PKG_VERSION}.tar.xz
+TERMUX_PKG_SHA256=9717ae363760dedf573dad241420c5fea86256b65bc21d2cf71b2b12f0544f4b
+TERMUX_PKG_ESSENTIAL=yes

packages/procps/build.sh

@@ -3,9 +3,11 @@ TERMUX_PKG_DESCRIPTION="Utilities that give information about processes using th
 TERMUX_PKG_LICENSE="LGPL-2.0"
 TERMUX_PKG_VERSION=3.3.15
 TERMUX_PKG_REVISION=2
-TERMUX_PKG_SHA256=10bd744ffcb3de2d591d2f6acf1a54a7ba070fdcc432a855931a5057149f0465
 TERMUX_PKG_SRCURL=https://fossies.org/linux/misc/procps-ng-$TERMUX_PKG_VERSION.tar.xz
+TERMUX_PKG_SHA256=10bd744ffcb3de2d591d2f6acf1a54a7ba070fdcc432a855931a5057149f0465
+TERMUX_PKG_DEPENDS="ncurses"
 TERMUX_PKG_BUILD_IN_SRC=yes
+
 # error.h and stdio_ext.h in unified headers does
 # not provide any functionality prior to android-23:
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
@@ -15,7 +17,7 @@ ac_cv_header_stdio_ext_h=no
 --enable-sigwinch
 --disable-modern-top
 "
-TERMUX_PKG_DEPENDS="ncurses"
+
 # About kill: https://bugs.launchpad.net/ubuntu/+source/coreutils/+bug/141168:
 # "For compatibility between distributions, can we have /bin/kill made available from coreutils?"
 # About uptime: Does not work on later android versions as /proc/uptime cannot be read.

packages/psmisc/build.sh

@@ -1,9 +1,9 @@
 TERMUX_PKG_HOMEPAGE=https://gitlab.com/psmisc/psmisc
 TERMUX_PKG_DESCRIPTION="Some small useful utilities that use the proc filesystem"
 TERMUX_PKG_LICENSE="GPL-2.0"
-TERMUX_PKG_DEPENDS="ncurses"
 TERMUX_PKG_VERSION=23.2
-TERMUX_PKG_SHA256=4b7cbffdc9373474da49b85dc3457ae511c43dc7fa7d94513fe06f89dcb87880
 TERMUX_PKG_SRCURL=https://fossies.org/linux/misc/psmisc-$TERMUX_PKG_VERSION.tar.xz
+TERMUX_PKG_SHA256=4b7cbffdc9373474da49b85dc3457ae511c43dc7fa7d94513fe06f89dcb87880
+TERMUX_PKG_DEPENDS="ncurses"
 TERMUX_PKG_BUILD_IN_SRC=yes
 TERMUX_PKG_RM_AFTER_INSTALL="bin/pstree.x11"

packages/sed/build.sh

@@ -2,8 +2,8 @@ TERMUX_PKG_HOMEPAGE=https://www.gnu.org/software/sed/
 TERMUX_PKG_DESCRIPTION="GNU stream editor for filtering/transforming text"
 TERMUX_PKG_LICENSE="GPL-3.0"
 TERMUX_PKG_VERSION=4.7
-TERMUX_PKG_SHA256=2885768cd0a29ff8d58a6280a270ff161f6a3deb5690b2be6c49f46d4c67bd6a
 TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/sed/sed-${TERMUX_PKG_VERSION}.tar.xz
+TERMUX_PKG_SHA256=2885768cd0a29ff8d58a6280a270ff161f6a3deb5690b2be6c49f46d4c67bd6a
 TERMUX_PKG_BUILD_IN_SRC=yes
 
 termux_step_pre_configure() {

packages/tar/build.sh

@@ -1,13 +1,14 @@
 TERMUX_PKG_HOMEPAGE=https://www.gnu.org/software/tar/
 TERMUX_PKG_DESCRIPTION="GNU tar for manipulating tar archives"
 TERMUX_PKG_LICENSE="GPL-3.0"
-TERMUX_PKG_ESSENTIAL=yes
 TERMUX_PKG_VERSION=1.32
-TERMUX_PKG_REVISION=3
+TERMUX_PKG_REVISION=4
-TERMUX_PKG_SHA256=d0d3ae07f103323be809bc3eac0dcc386d52c5262499fe05511ac4788af1fdd8
 TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/tar/tar-${TERMUX_PKG_VERSION}.tar.xz
+TERMUX_PKG_SHA256=d0d3ae07f103323be809bc3eac0dcc386d52c5262499fe05511ac4788af1fdd8
 # Allow xz compression (busybox only provides xz decompression):
-TERMUX_PKG_DEPENDS="libiconv, xz-utils, libandroid-glob"
+TERMUX_PKG_DEPENDS="libandroid-glob, libiconv, xz-utils"
+TERMUX_PKG_ESSENTIAL=yes
+
 # When cross-compiling configure guesses that d_ino in struct dirent only exists
 # if triplet matches linux*-gnu*, so we force set it explicitly:
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="gl_cv_struct_dirent_d_ino=yes"

packages/termux-exec/build.sh

@@ -2,6 +2,6 @@ TERMUX_PKG_HOMEPAGE=https://github.com/termux/termux-exec
 TERMUX_PKG_DESCRIPTION="An execve() wrapper to make /bin and /usr/bin shebangs work"
 TERMUX_PKG_LICENSE="Apache-2.0"
 TERMUX_PKG_VERSION=0.4
-TERMUX_PKG_SHA256=9a8d42d211a7d461d61dcd4e3ef984014c2c2c696cfd6394bae389af13572627
 TERMUX_PKG_SRCURL=https://github.com/termux/termux-exec/archive/v$TERMUX_PKG_VERSION.tar.gz
+TERMUX_PKG_SHA256=9a8d42d211a7d461d61dcd4e3ef984014c2c2c696cfd6394bae389af13572627
 TERMUX_PKG_BUILD_IN_SRC=yes

packages/termux-tools/build.sh

@@ -3,10 +3,10 @@ TERMUX_PKG_DESCRIPTION="Basic system tools for Termux"
 TERMUX_PKG_LICENSE="GPL-3.0"
 TERMUX_PKG_VERSION=0.68
 TERMUX_PKG_PLATFORM_INDEPENDENT=yes
-TERMUX_PKG_ESSENTIAL=yes
 TERMUX_PKG_DEPENDS="termux-am"
-TERMUX_PKG_CONFFILES="etc/motd"
 TERMUX_PKG_CONFLICTS="procps (<< 3.3.15-2)"
+TERMUX_PKG_ESSENTIAL=yes
+TERMUX_PKG_CONFFILES="etc/motd"
 
 termux_step_make_install() {
 	mkdir -p $TERMUX_PREFIX/bin/applets