Merge branch 'master' into fast_build_rebased

build-package.sh

@@ -227,7 +227,7 @@ termux_setup_meson() {
 # Utility function to setup a current cmake build system
 termux_setup_cmake() {
 	local TERMUX_CMAKE_MAJORVESION=3.13
-	local TERMUX_CMAKE_MINORVERSION=3
+	local TERMUX_CMAKE_MINORVERSION=4
 	local TERMUX_CMAKE_VERSION=$TERMUX_CMAKE_MAJORVESION.$TERMUX_CMAKE_MINORVERSION
 	local TERMUX_CMAKE_TARNAME=cmake-${TERMUX_CMAKE_VERSION}-Linux-x86_64.tar.gz
 	local TERMUX_CMAKE_TARFILE=$TERMUX_PKG_TMPDIR/$TERMUX_CMAKE_TARNAME
@@ -235,7 +235,7 @@ termux_setup_cmake() {
 	if [ ! -d "$TERMUX_CMAKE_FOLDER" ]; then
 		termux_download https://cmake.org/files/v$TERMUX_CMAKE_MAJORVESION/$TERMUX_CMAKE_TARNAME \
 		                "$TERMUX_CMAKE_TARFILE" \
-				78227de38d574d4d19093399fd4b40a4fb0a76cbfc4249783a969652ce515270
+				563a39e0a7c7368f81bfa1c3aff8b590a0617cdfe51177ddc808f66cc0866c76
 		rm -Rf "$TERMUX_PKG_TMPDIR/cmake-${TERMUX_CMAKE_VERSION}-Linux-x86_64"
 		tar xf "$TERMUX_CMAKE_TARFILE" -C "$TERMUX_PKG_TMPDIR"
 		mv "$TERMUX_PKG_TMPDIR/cmake-${TERMUX_CMAKE_VERSION}-Linux-x86_64" \
@@ -968,7 +968,7 @@ termux_step_patch_package() {
 }
 
 # Replace autotools build-aux/config.{sub,guess} with ours to add android targets.
-termux_step_replace_guess_scripts () {
+termux_step_replace_guess_scripts() {
 	cd "$TERMUX_PKG_SRCDIR"
 	find . -name config.sub -exec chmod u+w '{}' \; -exec cp "$TERMUX_SCRIPTDIR/scripts/config.sub" '{}' \;
 	find . -name config.guess -exec chmod u+w '{}' \; -exec cp "$TERMUX_SCRIPTDIR/scripts/config.guess" '{}' \;
@@ -979,7 +979,7 @@ termux_step_pre_configure() {
 	return
 }
 
-termux_step_configure_autotools () {
+termux_step_configure_autotools() {
 	if [ ! -e "$TERMUX_PKG_SRCDIR/configure" ]; then return; fi
 
 	local DISABLE_STATIC="--disable-static"
@@ -1089,7 +1089,7 @@ termux_step_configure_autotools () {
 		$QUIET_BUILD
 }
 
-termux_step_configure_cmake () {
+termux_step_configure_cmake() {
 	termux_setup_cmake
 
 	local TOOLCHAIN_ARGS="-DCMAKE_ANDROID_STANDALONE_TOOLCHAIN=$TERMUX_STANDALONE_TOOLCHAIN"
@@ -1132,7 +1132,7 @@ termux_step_configure_cmake () {
 		$TERMUX_PKG_EXTRA_CONFIGURE_ARGS $TOOLCHAIN_ARGS
 }
 
-termux_step_configure_meson () {
+termux_step_configure_meson() {
 	termux_setup_meson
 	CC=gcc CXX=g++ $TERMUX_MESON \
 		$TERMUX_PKG_SRCDIR \
@@ -1145,7 +1145,7 @@ termux_step_configure_meson () {
 		$TERMUX_PKG_EXTRA_CONFIGURE_ARGS
 }
 
-termux_step_configure () {
+termux_step_configure() {
 	if [ "$TERMUX_PKG_FORCE_CMAKE" == 'no' ] && [ -f "$TERMUX_PKG_SRCDIR/configure" ]; then
 		termux_step_configure_autotools
 	elif [ -f "$TERMUX_PKG_SRCDIR/CMakeLists.txt" ]; then
@@ -1155,7 +1155,7 @@ termux_step_configure () {
 	fi
 }
 
-termux_step_post_configure () {
+termux_step_post_configure() {
 	return
 }
 

disabled-packages/alsa-lib/build.sh

@@ -8,7 +8,7 @@ TERMUX_PKG_SHA256=71282502184c592c1a008e256c22ed0ba5728ca65e05273ceb480c70f51596
 # TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--with-pythonlibs=\"-lpython2.7\" --with-pythonincludes=-I/$TERMUX_PREFIX/include/python2.7"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-python"
 
-termux_step_pre_configure () {
+termux_step_pre_configure() {
     #LDFLAGS="$LDFLAGS -landroid-shmem"
     #_files='src/pcm/pcm_dsnoop.c src/pcm/pcm_mmap.c src/pcm/pcm_shm.c src/pcm/pcm_dmix.c src/pcm/pcm_dshare.c src/pcm/pcm_direct.c src/shmarea.c src/control/control_shm.c aserver/aserver.c'
     #for _file in $_files; do sed -i 's%#include <sys/shm.h>%#include <shmem/shm.h>%' "$TERMUX_PKG_SRCDIR/$_file"; done

disabled-packages/alsa-plugins/build.sh

@@ -5,6 +5,6 @@ TERMUX_PKG_SHA256=8ea4d1e082c36528a896a2581e5eb62d4dc2683238e353050d0d624e65f901
 TERMUX_PKG_DEPENDS="alsa-lib, pulseaudio"
 TERMUX_PKG_EXTRA_MAKE_ARGS='SUBDIRS=pulse'
 
-termux_step_post_make_install () {
+termux_step_post_make_install() {
     cp $TERMUX_PKG_BUILDER_DIR/asound.conf $TERMUX_PREFIX/etc
 }

disabled-packages/alsa-utils/build.sh

@@ -5,6 +5,6 @@ TERMUX_PKG_SHA256=127217a54eea0f9a49700a2f239a2d4f5384aa094d68df04a8eb80132eb616
 TERMUX_PKG_DEPENDS="alsa-lib, ncurses"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--with-udev-rules-dir=$TERMUX_PREFIX/lib/udev/rules.d --with-asound-state-dir=$TERMUX_PREFIX/var/lib/alsa --disable-bat --disable-rst2man"
 
-termux_step_pre_configure () {
+termux_step_pre_configure() {
     LDFLAGS+=" -llog"
 }

disabled-packages/ant/build.sh

@@ -5,7 +5,7 @@ TERMUX_PKG_SRCURL=http://apache.mirrors.spacedump.net//ant/binaries/apache-ant-$
 TERMUX_PKG_BUILD_IN_SRC=yes
 TERMUX_PKG_PLATFORM_INDEPENDENT=true
 
-termux_step_make_install () {
+termux_step_make_install() {
         mkdir -p $TERMUX_PREFIX/share/ant/lib
 
         for jar in ant ant-launcher; do

disabled-packages/apt-updated/build.sh

@@ -34,6 +34,6 @@ lib/libapt-inst.so
 
 termux_step_post_make_install() {
 	printf "# The main termux repository:\ndeb [arch=all,${TERMUX_ARCH}] https://termux.net stable main\n" > $TERMUX_PREFIX/etc/apt/sources.list
-        cp $TERMUX_PKG_BUILDER_DIR/trusted.gpg $TERMUX_PREFIX/etc/apt/
+	cp $TERMUX_PKG_BUILDER_DIR/trusted.gpg $TERMUX_PREFIX/etc/apt/
 	rm /data/data/com.termux/files/usr/include/apt-pkg -r
 }

disabled-packages/checkinstall/build.sh

@@ -14,7 +14,7 @@ termux_step_pre_configure() {
 	CFLAGS+=" -DS_IREAD=S_IRUSR"
 }
 
-termux_step_post_make_install () {
+termux_step_post_make_install() {
 	mv $TERMUX_PREFIX/lib/checkinstall/checkinstallrc-dist \
 	   $TERMUX_PREFIX/lib/checkinstall/checkinstallrc
 }

disabled-packages/clisp/build.sh

@@ -5,7 +5,7 @@ TERMUX_PKG_SRCURL=http://downloads.sourceforge.net/project/clisp/clisp/${TERMUX_
 TERMUX_PKG_DEPENDS="readline, libandroid-support"
 TERMUX_MAKE_PROCESSES=1
 
-termux_step_configure () {
+termux_step_configure() {
 	cd $TERMUX_PKG_BUILDDIR
 
 	export XCPPFLAGS="$CPPFLAGS"

disabled-packages/crawl/build.sh

@@ -9,7 +9,7 @@ TERMUX_PKG_SRCURL=https://crawl.develz.org/release/stone_soup-${TERMUX_PKG_VERSI
 TERMUX_PKG_EXTRA_MAKE_ARGS="V=1"
 TERMUX_PKG_BUILD_IN_SRC=yes
 
-termux_step_pre_configure () {
+termux_step_pre_configure() {
 	export CROSSHOST=$TERMUX_HOST_PLATFORM
 	TERMUX_PKG_BUILDDIR=$TERMUX_PKG_SRCDIR/source
 }

disabled-packages/cups/build.sh

@@ -13,10 +13,10 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 --with-components=core
 "
 
-termux_step_pre_configure () {
+termux_step_pre_configure() {
 	LDFLAGS="$LDFLAGS -llog -lcrypt"
 }
 
-termux_step_post_make_install () {
+termux_step_post_make_install() {
 	mv "$TERMUX_PREFIX"/lib64/libcups.so* "$TERMUX_PREFIX"/lib/
 }

disabled-packages/d8/build.sh

@@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="Dexer that converts java byte code to dex code"
 TERMUX_PKG_VERSION=$TERMUX_ANDROID_BUILD_TOOLS_VERSION
 TERMUX_PKG_PLATFORM_INDEPENDENT=true
 
-termux_step_make_install () {
+termux_step_make_install() {
 	# Rewrite packages to avoid using com.android.* classes which may clash with
 	# classes in the Android runtime on devices (see #1801):
 	local JARJAR=$TERMUX_PKG_CACHEDIR/jarjar.jar

disabled-packages/dovecot/build.sh

@@ -24,7 +24,7 @@ lib_cv_va_copy=yes
 lib_cv___va_copy=yes
 "
 
-termux_step_pre_configure () {
+termux_step_pre_configure() {
 	LDFLAGS="$LDFLAGS -llog"
 
 	for i in `find $TERMUX_PKG_SRCDIR/src/director -type f`; do sed 's|\bstruct user\b|struct usertest|g' -i $i; done
@@ -36,7 +36,7 @@ termux_step_pre_configure () {
 	fi
 }
 
-termux_step_post_make_install () {
+termux_step_post_make_install() {
 	for binary in doveadm doveconf; do
 		mv $TERMUX_PREFIX/bin/$binary $TERMUX_PREFIX/libexec/dovecot/$binary
 		cat > $TERMUX_PREFIX/bin/$binary <<HERE

disabled-packages/easy-rsa/build.sh

@@ -7,7 +7,7 @@ TERMUX_PKG_CONFFILES="etc/easy-rsa/openssl-1.0.cnf, etc/easy-rsa/vars"
 TERMUX_PKG_MAINTAINER='Vishal Biswas @vishalbiswas'
 TERMUX_PKG_BUILD_IN_SRC=true
 
-termux_step_make_install () {
+termux_step_make_install() {
     install -D -m0755 easyrsa "${TERMUX_PREFIX}"/bin/easyrsa
 
     install -D -m0644 openssl-1.0.cnf "${TERMUX_PREFIX}"/etc/easy-rsa/openssl-1.0.cnf

disabled-packages/ghc/build.sh

@@ -35,7 +35,7 @@ termux_step_post_extract_package() {
 	TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --target=${TERMUX_HOST_PLATFORM}"
 }
 
-termux_step_pre_configure () {
+termux_step_pre_configure() {
 	echo "INTEGER_LIBRARY = integer-simple" > mk/build.mk
 	#echo "GhcStage2HcOpts = $ORIG_CFLAGS $ORIG_CPPFLAGS $ORIG_LDFLAGS" >> mk/build.mk
 

disabled-packages/help2man/build.sh

@@ -1,7 +1,7 @@
 # Build fails in docker image, install-info needed there:
 #   build-aux/missing: 81: build-aux/missing: install-info: not found
 #   WARNING: 'install-info' is missing on your system.
-TERMUX_PKG_HOMEPAGE=https://www.gnu.org/software/help2man/             
+TERMUX_PKG_HOMEPAGE=https://www.gnu.org/software/help2man/
 TERMUX_PKG_DESCRIPTION="tool for automatically generating simple manual pages from program output."  
 TERMUX_PKG_VERSION=1.47.5
 TERMUX_PKG_SHA256=7ca60b2519fdbe97f463fe2df66a6188d18b514bfd44127d985f0234ee2461b1

disabled-packages/javac/build.sh

@@ -3,14 +3,14 @@ TERMUX_PKG_DESCRIPTION="Java programming language compiler from (openjdk)"
 TERMUX_PKG_VERSION=8u45
 TERMUX_PKG_PLATFORM_INDEPENDENT=true
 
-termux_step_extract_package () {
+termux_step_extract_package() {
 	mkdir $TERMUX_PKG_SRCDIR
 }
 
-termux_step_make () {
+termux_step_make() {
 	RAW_JAR=/usr/lib/jvm/java-7-openjdk-amd64/lib/tools.jar
 
-        mkdir -p $TERMUX_PREFIX/share/dex
+	mkdir -p $TERMUX_PREFIX/share/dex
 	$TERMUX_DX \
 		--dex \
 		--output=$TERMUX_PREFIX/share/dex/tools.jar \

disabled-packages/libffi-updated/build.sh

@@ -8,7 +8,7 @@ TERMUX_PKG_SRCURL=https://github.com/libffi/libffi/archive/${_COMMIT}.zip
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-multi-os-directory --enable-symvers=no"
 TERMUX_PKG_RM_AFTER_INSTALL="lib/libffi-${TERMUX_PKG_VERSION}/include"
 
-termux_step_pre_configure () {
+termux_step_pre_configure() {
 	cd $TERMUX_PKG_SRCDIR
 	./autogen.sh
 }

disabled-packages/mono/build.sh

@@ -12,7 +12,7 @@ TERMUX_PKG_FOLDERNAME=mono-$_MONO_VERSION
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS+="--disable-btls --disable-dynamic-btls" #--with-btls-android-ndk=$ANDROID_NDK"
 TERMUX_PKG_BUILD_IN_SRC=true
 
-termux_step_pre_configure () {
+termux_step_pre_configure() {
 #	export CFLAGS="$CFLAGS -mthumb"
 	cd "$TERMUX_PKG_SRCDIR"
 #	NOCONFIGURE=1 ./autogen.sh

disabled-packages/nethack/build.sh

@@ -5,7 +5,7 @@ TERMUX_PKG_SRCURL=https://s3.amazonaws.com/altorg/nethack/nethack-360-src.tgz
 TERMUX_PKG_BUILD_IN_SRC=yes
 TERMUX_PKG_DEPENDS="ncurses"
 
-termux_step_make_install () {
+termux_step_make_install() {
 	cd $TERMUX_PKG_SRCDIR/sys/unix
 	sh setup.sh hints/linux
 

disabled-packages/ocaml/build.sh

@@ -5,7 +5,7 @@ TERMUX_PKG_SRCURL=http://caml.inria.fr/pub/distrib/ocaml-4.02/ocaml-4.02.3.tar.x
 TERMUX_PKG_DEPENDS="pcre, openssl, libuuid"
 TERMUX_PKG_BUILD_IN_SRC=yes
 
-termux_step_configure () {
+termux_step_configure() {
 	./configure -prefix $TERMUX_PREFIX -mandir $TERMUX_PREFIX/share/man/man1 -cc "$CC $CFLAGS $CPPFLAGS $LDFLAGS" \
 		-host $TERMUX_HOST_PLATFORM
 }

disabled-packages/openjdk-9-jre-headless/build.sh

@@ -49,7 +49,7 @@ _url_src=http://hg.openjdk.java.net/mobile/dev
 TERMUX_PKG_SRCURL=$_url_src/archive/${changesets[0]}.tar.bz2
 TERMUX_PKG_SHA256=${sha256sums[0]}
 
-termux_step_post_extract_package () {
+termux_step_post_extract_package() {
 	cd "$TERMUX_PKG_TMPDIR"
 	# download and extract repo archives
 	for index in {1..7}; do
@@ -72,11 +72,11 @@ termux_step_post_extract_package () {
 }
 
 # override this step to since openjdk provides its own customized guess scripts
-termux_step_replace_guess_scripts () {
+termux_step_replace_guess_scripts() {
 	return
 }
 
-termux_step_pre_configure () {
+termux_step_pre_configure() {
 	TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --with-cups-include=$TERMUX_PKG_SRCDIR/cups-$_cups_ver"
 
 	ln -sf $TERMUX_STANDALONE_TOOLCHAIN/sysroot/usr/lib/libc.so $TERMUX_PKG_TMPDIR/libpthread.so
@@ -100,7 +100,7 @@ HERE
 	# remove sa_proc support
 	rm $TERMUX_PKG_SRCDIR/hotspot/make/lib/Lib-jdk.hotspot.agent.gmk
 }
-termux_step_configure () {
+termux_step_configure() {
 	if [ $TERMUX_ARCH = "x86_64" ]; then
 	ln -sf $TERMUX_STANDALONE_TOOLCHAIN/sysroot/usr/lib64/libc.so $TERMUX_PKG_TMPDIR/libpthread.so
 	else
@@ -124,11 +124,11 @@ termux_step_configure () {
 		$TERMUX_PKG_EXTRA_CONFIGURE_ARGS
 }
 
-termux_step_make () {
+termux_step_make() {
 	make JOBS=$TERMUX_MAKE_PROCESSES images
 }
 
-termux_step_post_make_install () {
+termux_step_post_make_install() {
 	# move jvm install dir
 	mkdir -p $TERMUX_PREFIX/lib/jvm
 	rm -rf "$TERMUX_PREFIX/lib/jvm/openjdk-9"

disabled-packages/openvpn/build.sh

@@ -19,7 +19,7 @@ IPROUTE=$TERMUX_PREFIX/bin/ip
 NETSTAT=$TERMUX_PREFIX/bin/netstat"
 TERMUX_PKG_MAINTAINER="Vishal Biswas @vishalbiswas"
 
-termux_step_pre_configure () {
+termux_step_pre_configure() {
     # need to provide getpass, else you "can't get console input"
     cp "$TERMUX_PKG_BUILDER_DIR/netbsd_getpass.c" "$TERMUX_PKG_SRCDIR/src/openvpn/"
 
@@ -27,7 +27,7 @@ termux_step_pre_configure () {
     LDFLAGS="$LDFLAGS -llog "
 }
 
-termux_step_post_make_install () {
+termux_step_post_make_install() {
     # helper script
     install -m700 "$TERMUX_PKG_BUILDER_DIR/termux-openvpn" "$TERMUX_PREFIX/bin/"
     # Install examples

disabled-packages/pacman/build.sh

@@ -17,13 +17,13 @@ termux_step_pre_configure() {
   LDFLAGS+="$LDFLAGS -llog -landroid-glob"
 }
 
-termux_step_make () {
+termux_step_make() {
   make
   make -C contrib
   # make -C "$pkgname-$pkgver" check
 }
 
-termux_step_make_install () {
+termux_step_make_install() {
 
   make install
   make -C contrib install

disabled-packages/premake/build.sh

@@ -6,6 +6,6 @@ TERMUX_PKG_SRCURL=http://downloads.sourceforge.net/project/premake/Premake/4.4/p
 # TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--with-ssl=openssl"
 
 
-termux_step_pre_configure () {
+termux_step_pre_configure() {
 	TERMUX_PKG_BUILDDIR=$TERMUX_PKG_SRCDIR/build/gmake.unix
 }

disabled-packages/racket/build.sh

@@ -9,12 +9,12 @@ TERMUX_PKG_HOSTBUILD=true
 TERMUX_PKG_DEPENDS="libffi, libandroid-support"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--enable-racket=$TERMUX_PKG_HOSTBUILD_DIR/racket/racketcgc --enable-libs --disable-shared --disable-gracket --enable-libffi"
 
-termux_step_host_build () {
+termux_step_host_build() {
 	$TERMUX_PKG_SRCDIR/src/configure ${TERMUX_PKG_EXTRA_HOSTBUILD_CONFIGURE_ARGS}
 	make -j $TERMUX_MAKE_PROCESSES
 }
 
-termux_step_pre_configure () {
+termux_step_pre_configure() {
 	CPPFLAGS+=" -I$TERMUX_PKG_SRCDIR/src/racket/include -I$TERMUX_PKG_BUILDDIR/racket"
 	# Due to use of syslog.
 	LDFLAGS+=" -llog"

disabled-packages/sbcl/build.sh

@@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="Steel Bank Common Lisp"
 TERMUX_PKG_VERSION=1.3.9
 TERMUX_PKG_SRCURL=http://prdownloads.sourceforge.net/sbcl/sbcl-${TERMUX_PKG_VERSION}-source.tar.bz2
 
-termux_step_pre_configure () {
+termux_step_pre_configure() {
 	local SBCL_HOST_TARFILE=$TERMUX_PKG_CACHEDIR/sbcl-host-${TERMUX_PKG_VERSION}.tar.bz2
 	if [ ! -f $SBCL_HOST_TARFILE ]; then
 		curl -o $SBCL_HOST_TARFILE -L http://downloads.sourceforge.net/project/sbcl/sbcl/${TERMUX_PKG_VERSION}/sbcl-${TERMUX_PKG_VERSION}-x86-64-linux-binary.tar.bz2
@@ -16,7 +16,7 @@ termux_step_pre_configure () {
 	export SBCL_HOME=$TERMUX_PKG_CACHEDIR/sbcl-host/lib/sbcl
 }
 
-termux_step_make_install () {
+termux_step_make_install() {
 	cd $TERMUX_PKG_SRCDIR
 	sh make.sh --prefix=$TERMUX_PREFIX
 }

disabled-packages/swi-prolog/build.sh

@@ -6,7 +6,7 @@ TERMUX_PKG_BUILD_IN_SRC=true
 TERMUX_PKG_HOSTBUILD=true
 TERMUX_PKG_DEPENDS="readline, libgmp"
 
-termux_step_host_build () {
+termux_step_host_build() {
 	cp -Rf $TERMUX_PKG_SRCDIR/* .
 
 	# apt install libgmp-dev:i386 libncurses5-dev:i386
@@ -23,7 +23,7 @@ termux_step_host_build () {
 }
 
 
-termux_step_post_configure () {
+termux_step_post_configure() {
 	cp $TERMUX_PKG_HOSTBUILD_DIR/src/defatom src/
 	touch -d "next hour" $TERMUX_PKG_BUILDDIR/src/defatom
 	#cp $TERMUX_PKG_HOSTBUILD_DIR/{defatom,swipl} $TERMUX_PKG_BUILDDIR/src/
@@ -35,6 +35,6 @@ termux_step_post_configure () {
 	perl -p -i -e "s|${TERMUX_ARCH}-linux|i386-linux|" */swipl.sh
 }
 
-termux_step_post_make_install () {
+termux_step_post_make_install() {
 	mv $TERMUX_PREFIX/lib/swipl-$TERMUX_PKG_VERSION/lib/${TERMUX_ARCH}-linux/libswipl.so* $TERMUX_PREFIX/lib/
 }

disabled-packages/toybox/build.sh

@@ -5,6 +5,6 @@ TERMUX_PKG_SRCURL=http://landley.net/toybox/downloads/toybox-${TERMUX_PKG_VERSIO
 TERMUX_PKG_SHA256=e6469b508224e0d2e4564dda05c4bb47aef5c28bf29d6c983bcdc6e3a0cd29d6
 TERMUX_PKG_BUILD_IN_SRC=yes
 
-termux_step_configure () {
+termux_step_configure() {
 	make defconfig
 }

disabled-packages/unnethack/build.sh

@@ -15,7 +15,7 @@ CFLAGS="$CFLAGS $CPPFLAGS $LDFLAGS"
 export LFLAGS="$LDFLAGS"
 LD="$CC"
 
-termux_step_pre_configure () {
+termux_step_pre_configure() {
 	# Create a host build for the makedefs binary
 	mkdir $TERMUX_PKG_TMPDIR/host-build
 	cd $TERMUX_PKG_TMPDIR/host-build
@@ -40,17 +40,17 @@ termux_step_pre_configure () {
 	export LFLAGS=$ORIG_LFLAGS
 }
 
-termux_step_post_configure () {
+termux_step_post_configure() {
 	# Use the host built makedefs
 	cp $TERMUX_PKG_TMPDIR/host-build/util/makedefs $TERMUX_PKG_BUILDDIR/util/makedefs
 	cp $TERMUX_PKG_TMPDIR/host-build/util/lev_comp $TERMUX_PKG_BUILDDIR/util/lev_comp
 	cp $TERMUX_PKG_TMPDIR/host-build/util/dgn_comp $TERMUX_PKG_BUILDDIR/util/dgn_comp
 	cp $TERMUX_PKG_TMPDIR/host-build/util/dlb $TERMUX_PKG_BUILDDIR/util/dlb
 	# Update timestamp so the binary does not get rebuilt
-        touch -d "next hour" $TERMUX_PKG_BUILDDIR/util/makedefs $TERMUX_PKG_BUILDDIR/util/lev_comp $TERMUX_PKG_BUILDDIR/util/dgn_comp $TERMUX_PKG_BUILDDIR/util/dlb
+	touch -d "next hour" $TERMUX_PKG_BUILDDIR/util/makedefs $TERMUX_PKG_BUILDDIR/util/lev_comp $TERMUX_PKG_BUILDDIR/util/dgn_comp $TERMUX_PKG_BUILDDIR/util/dlb
 }
 
-termux_step_post_make_install () {
+termux_step_post_make_install() {
 	# Add directory which must exist:
 	mkdir -p $TERMUX_PREFIX/var/unnethack/level
 	echo "This directory stores locks" > $TERMUX_PREFIX/var/unnethack/level/README

packages/aapt/build.sh

@@ -8,7 +8,7 @@ TERMUX_PKG_REVISION=2
 TERMUX_PKG_BUILD_IN_SRC=yes
 TERMUX_PKG_DEPENDS="libexpat, libpng, libzopfli"
 
-termux_step_make_install () {
+termux_step_make_install() {
 	# FIXME: We would like to enable checksums when downloading
 	# tar files, but they change each time as the tar metadata
 	# differs: https://github.com/google/gitiles/issues/84
@@ -96,10 +96,10 @@ termux_step_make_install () {
 	# In file included from process_name.c:29:
 	# /data/data/com.termux/files/usr/include/aosp/cutils/properties.h:116:45: error: expected identifier
 	# __errordecl(__property_get_too_small_error, "property_get() called with too small of a buffer");
-	#                                               ^
+	#						^
 	# /data/data/com.termux/files/usr/include/aosp/cutils/properties.h:119:5: error: static declaration of 'property_get' follows non-static declaration
 	# int property_get(const char *key, char *value, const char *default_value) {
-	#       ^
+	#	^
 	# /data/data/com.termux/files/usr/include/aosp/cutils/properties.h:46:5: note: previous declaration is here
 	# int property_get(const char *key, char *value, const char *default_value);
 	$CC ${CFLAGS/-D_FORTIFY_SOURCE=2/} \

packages/abduco/build.sh

@@ -7,6 +7,6 @@ TERMUX_PKG_SHA256=c90909e13fa95770b5afc3b59f311b3d3d2fdfae23f9569fa4f96a3e192a35
 TERMUX_PKG_BUILD_IN_SRC=yes
 TERMUX_PKG_DEPENDS="libutil,dvtm"
 
-termux_step_pre_configure () {
+termux_step_pre_configure() {
 	CFLAGS+=" $CPPFLAGS"
 }

packages/ack-grep/build.sh

@@ -9,7 +9,7 @@ TERMUX_PKG_SKIP_SRC_EXTRACT=yes
 TERMUX_PKG_DEPENDS="perl, coreutils"
 TERMUX_PKG_PLATFORM_INDEPENDENT=yes
 
-termux_step_make_install () {
+termux_step_make_install() {
 	termux_download \
 		$TERMUX_PKG_SRCURL \
 		$TERMUX_PREFIX/bin/ack \

packages/alpine/build.sh

@@ -17,7 +17,7 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 "
 TERMUX_PKG_BUILD_IN_SRC=yes
 
-termux_step_pre_configure () {
+termux_step_pre_configure() {
 	export TCC=$CC
 	export TRANLIB=$RANLIB
 	export SPELLPROG=${TERMUX_PREFIX}/bin/hunspell
@@ -40,7 +40,7 @@ termux_step_post_configure() {
 	$CC_FOR_BUILD help_h_gen.c -o help_h_gen
 	touch -d "next hour" help_c_gen help_h_gen
 }
-termux_step_create_debscripts () {
+termux_step_create_debscripts() {
 
         echo "#!$TERMUX_PREFIX/bin/sh" >> postinst
 	echo "if [ ! -e $TERMUX_ANDROID_HOME/.alpine-smime/.pwd/MasterPassword.crt ] && [ ! -e $HOME/.alpine-smime/.pwd/MasterPassword.key ]; then" >> postinst

packages/angband/build.sh

@@ -9,11 +9,11 @@ TERMUX_PKG_BUILD_IN_SRC=yes
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-x11 --bindir=$TERMUX_PREFIX/bin --sysconfdir=$TERMUX_PREFIX/share/angband"
 TERMUX_PKG_RM_AFTER_INSTALL="share/angband/xtra share/angband/icons"
 
-termux_step_pre_configure () {
+termux_step_pre_configure() {
 	./autogen.sh
 	perl -p -i -e 's|ncursesw5-config|ncursesw6-config|g' configure
 }
 
-termux_step_post_make_install () {
+termux_step_post_make_install() {
 	rm -Rf $TERMUX_PREFIX/share/angband/{fonts,sounds}
 }

packages/apache2/build.sh

@@ -70,7 +70,7 @@ TERMUX_PKG_RM_AFTER_INSTALL="share/apache2/manual etc/apache2/original share/man
 TERMUX_PKG_INCLUDE_IN_DEVPACKAGE="share/apache2/build"
 TERMUX_PKG_EXTRA_MAKE_ARGS="-s"
 
-termux_step_pre_configure () {
+termux_step_pre_configure() {
 	# remove old files
 	rm -rf "$TERMUX_PREFIX"/{libexec,share,etc}/apache2
 	rm -rf "$TERMUX_PREFIX"/lib/cgi-bin
@@ -87,13 +87,13 @@ termux_step_pre_configure () {
 	cat $TERMUX_PKG_BUILDER_DIR/Termux.layout > $TERMUX_PKG_SRCDIR/config.layout
 }
 
-termux_step_post_configure () {
+termux_step_post_configure() {
 	# thanks to @JetBalsa
 	gcc -O2 -DCROSS_COMPILE $TERMUX_PKG_SRCDIR/server/gen_test_char.c -o $TERMUX_PKG_BUILDDIR/server/gen_test_char
 	touch -d "1 hour" $TERMUX_PKG_BUILDDIR/server/gen_test_char
 }
 
-termux_step_post_make_install () {
+termux_step_post_make_install() {
 	sed -e "s#/$TERMUX_PREFIX/libexec/apache2/#modules/#" \
 		-e 's|#\(LoadModule negotiation_module \)|\1|' \
 		-e 's|#\(LoadModule include_module \)|\1|' \
@@ -110,7 +110,7 @@ termux_step_post_make_install () {
 		-i "$TERMUX_PREFIX/etc/apache2/httpd.conf"
 }
 
-termux_step_post_massage () {
+termux_step_post_massage() {
 	# sometimes it creates a $TERMUX_PREFIX/bin/sh -> /bin/sh
 	rm ${TERMUX_PKG_MASSAGEDIR}${TERMUX_PREFIX}/bin/sh || true
 

packages/apksigner/build.sh

@@ -8,7 +8,7 @@ TERMUX_PKG_SRCURL=https://github.com/fornwall/apksigner/archive/v${TERMUX_PKG_VE
 TERMUX_PKG_BUILD_IN_SRC=yes
 TERMUX_PKG_PLATFORM_INDEPENDENT=true
 
-termux_step_make () {
+termux_step_make() {
 	mkdir -p $TERMUX_PREFIX/share/{dex,man/man1}
 
 	cp apksigner.1 $TERMUX_PREFIX/share/man/man1/

packages/apr/build.sh

@@ -19,6 +19,6 @@ 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 () {
+termux_step_post_make_install() {
 	sed -i "s%NM=\".*%NM=\"${TERMUX_HOST_PLATFORM}-nm -B\"%g" $TERMUX_PREFIX/share/apr-1/build/libtool
 }

packages/apt/build.sh

@@ -2,9 +2,8 @@ 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="libcurl, liblzma, dpkg, gpgv, libc++, termux-exec"
-TERMUX_PKG_VERSION=1.4.8
-TERMUX_PKG_REVISION=9
-TERMUX_PKG_SHA256=767ad7d6efb64cde52faececb7d3c0bf49800b9fe06f3a5b0132ab4c01a5b8f8
+TERMUX_PKG_VERSION=1.4.9
+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="
 -DPERL_EXECUTABLE=`which perl`

packages/apt/fix-CVE-2019-3462.patch

@@ -1,17 +0,0 @@
-diff -uNr apt-1.4.8/apt-pkg/acquire-method.cc apt-1.4.8.mod/apt-pkg/acquire-method.cc
---- apt-1.4.8/apt-pkg/acquire-method.cc	2017-09-13 19:47:33.000000000 +0300
-+++ apt-1.4.8.mod/apt-pkg/acquire-method.cc	2019-01-22 23:03:29.751025868 +0200
-@@ -458,6 +458,13 @@
-  * the worker will enqueue again later on to the right queue */
- void pkgAcqMethod::Redirect(const string &NewURI)
- {
-+   if (NewURI.find_first_not_of(" !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~") != std::string::npos)
-+   {
-+       _error->Error("SECURITY: URL redirect target contains control characters, rejecting.");
-+       Fail();
-+       return;
-+   }
-+
-    std::cout << "103 Redirect\nURI: " << Queue->Uri << "\n"
- 	     << "New-URI: " << NewURI << "\n"
- 	     << "\n" << std::flush;

packages/asciinema/build.sh

@@ -10,15 +10,15 @@ TERMUX_PKG_HAS_DEBUG=no
 # ncurses-utils for tput which asciinema uses:
 TERMUX_PKG_DEPENDS="python, ncurses-utils"
 
-termux_step_make () {
+termux_step_make() {
 	return
 }
 
-termux_step_make_install () {
+termux_step_make_install() {
 	export PYTHONPATH=$TERMUX_PREFIX/lib/python3.7/site-packages/
 	python3.7 setup.py install --prefix=$TERMUX_PREFIX --force
 }
 
-termux_step_post_massage () {
+termux_step_post_massage() {
 	find . -path '*/__pycache__*' -delete
 }

packages/autoconf/build.sh

@@ -7,11 +7,11 @@ TERMUX_PKG_SHA256=64ebcec9f8ac5b2487125a86a7760d2591ac9e1d3dbd59489633f9de62a576
 TERMUX_PKG_DEPENDS="m4, make, perl"
 TERMUX_PKG_PLATFORM_INDEPENDENT=yes
 
-termux_step_post_extract_package () {
+termux_step_post_extract_package() {
 	perl -p -i -e "s|/bin/sh|$TERMUX_PREFIX/bin/sh|" lib/*/*.m4
 }
 
-termux_step_post_massage () {
+termux_step_post_massage() {
 	perl -p -i -e "s|/usr/bin/m4|$TERMUX_PREFIX/bin/m4|" bin/*
 	perl -p -i -e "s|CONFIG_SHELL-/bin/sh|CONFIG_SHELL-$TERMUX_PREFIX/bin/sh|" bin/autoconf
 }

packages/autossh/build.sh

@@ -8,7 +8,7 @@ TERMUX_PKG_BUILD_IN_SRC="yes"
 TERMUX_PKG_DEPENDS="openssh | dropbear"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--mandir=$TERMUX_PREFIX/share/man ac_cv_path_ssh=$TERMUX_PREFIX/bin/ssh"
 
-termux_step_pre_configure () {
+termux_step_pre_configure() {
 	# For syslog logging:
 	LDFLAGS+=" -llog"
 }

packages/babl/Makefile.am.patch

@@ -1,11 +1,13 @@
-diff -u -r ../babl-BABL_0_1_34/Makefile.am ./Makefile.am
---- ../babl-BABL_0_1_34/Makefile.am	2017-10-06 15:15:57.000000000 +0200
-+++ ./Makefile.am	2017-10-14 20:26:51.643517261 +0200
-@@ -3,7 +3,6 @@
+diff -u -r ../babl-BABL_0_1_62/Makefile.am ./Makefile.am
+--- ../babl-BABL_0_1_62/Makefile.am	2019-02-01 16:22:50.000000000 +0000
++++ ./Makefile.am	2019-02-03 21:11:44.103560598 +0000
+@@ -3,8 +3,7 @@
  SUBDIRS = \
  	babl		\
  	extensions	\
--	tests		\
- 	tools
+-	tools		\
+-	tests
++	tools
  
  if ENABLE_DOCS
+ SUBDIRS+= docs

packages/babl/build.sh

@@ -1,9 +1,10 @@
 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.60
-TERMUX_PKG_SHA256=1850e024b8972404cae04809e00c7392501b6f14c1b00c65d8128592e021dd1a
+TERMUX_PKG_VERSION=0.1.62
+TERMUX_PKG_SHA256=1364e8e0dae5b03f96b3496348388508e4a93ab4f9cc0c06cca6a719e0c2ec36
 TERMUX_PKG_SRCURL=https://github.com/GNOME/babl/archive/BABL_${TERMUX_PKG_VERSION//./_}.tar.gz
+TERMUX_PKG_DEPENDS="littlecms"
 
 termux_step_pre_configure() {
 	NOCONFIGURE=1 ./autogen.sh

packages/bash/build.sh

@@ -27,7 +27,7 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" bash_cv_getcwd_malloc=yes"
 
 TERMUX_PKG_RM_AFTER_INSTALL="share/man/man1/bashbug.1 bin/bashbug"
 
-termux_step_pre_configure () {
+termux_step_pre_configure() {
 	declare -A PATCH_CHECKSUMS
 	PATCH_CHECKSUMS[001]=3e28d91531752df9a8cb167ad07cc542abaf944de9353fe8c6a535c9f1f17f0f
 	PATCH_CHECKSUMS[002]=7020a0183e17a7233e665b979c78c184ea369cfaf3e8b4b11f5547ecb7c13c53
@@ -63,7 +63,7 @@ termux_step_pre_configure () {
 	done
 }
 
-termux_step_post_make_install () {
+termux_step_post_make_install() {
 	sed "s|@TERMUX_PREFIX@|$TERMUX_PREFIX|" $TERMUX_PKG_BUILDER_DIR/etc-profile > $TERMUX_PREFIX/etc/profile
 	sed "s|@TERMUX_PREFIX@|$TERMUX_PREFIX|" \
 		$TERMUX_PKG_BUILDER_DIR/etc-profile | \

packages/bat/build.sh

@@ -1,9 +1,8 @@
 TERMUX_PKG_HOMEPAGE=https://github.com/sharkdp/bat
 TERMUX_PKG_DESCRIPTION="A cat(1) clone with wings"
 TERMUX_PKG_LICENSE="Apache-2.0"
-TERMUX_PKG_VERSION=0.9.0
-TERMUX_PKG_REVISION=2
-TERMUX_PKG_SHA256=4ce9c118cf5da1159a882dea389f3c5737b5d98192e9a619b0fe8c1730341cc6
+TERMUX_PKG_VERSION=0.10.0
+TERMUX_PKG_SHA256=54dd396e8f20d44c6032a32339f45eab46a69b6134e74a704f8d4a27c18ddc3e
 TERMUX_PKG_SRCURL=https://github.com/sharkdp/bat/archive/v$TERMUX_PKG_VERSION.tar.gz
 TERMUX_PKG_BUILD_IN_SRC=yes
 # bat calls less with '--RAW-CONTROL-CHARS' which busybox less does not support:

packages/binutils/build.sh

@@ -1,9 +1,8 @@
 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.31.1
-TERMUX_PKG_REVISION=3
-TERMUX_PKG_SHA256=e88f8d36bd0a75d3765a4ad088d819e35f8d7ac6288049780e2fefcad18dde88
+TERMUX_PKG_VERSION=2.32
+TERMUX_PKG_SHA256=9b0d97b3d30df184d302bced12f976aa1e5fbf4b0be696cdebc6cca30411a46e
 TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/binutils/binutils-${TERMUX_PKG_VERSION}.tar.gz
 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"
@@ -13,7 +12,7 @@ TERMUX_PKG_KEEP_STATIC_LIBRARIES=true
 # Avoid linking against libfl.so from flex if available:
 export LEXLIB=
 
-termux_step_pre_configure () {
+termux_step_pre_configure() {
 	export CPPFLAGS="$CPPFLAGS -Wno-c++11-narrowing"
 
 	if [ $TERMUX_ARCH_BITS = 32 ]; then
@@ -23,7 +22,7 @@ termux_step_pre_configure () {
 	fi
 }
 
-termux_step_post_make_install () {
+termux_step_post_make_install() {
 	cp $TERMUX_PKG_BUILDER_DIR/ldd $TERMUX_PREFIX/bin/ldd
 	cd $TERMUX_PREFIX/bin
 	# Setup symlinks as these are used when building, so used by
@@ -31,5 +30,5 @@ termux_step_post_make_install () {
 	for b in ar ld nm objdump ranlib readelf strip; do
 		ln -s -f $b $TERMUX_HOST_PLATFORM-$b
 	done
-        ln -sf ld.gold gold
+	ln -sf ld.gold gold
 }

packages/bison/build.sh

@@ -2,8 +2,8 @@ TERMUX_PKG_HOMEPAGE=https://www.gnu.org/software/bison/
 TERMUX_PKG_DESCRIPTION="General-purpose parser generator"
 TERMUX_PKG_LICENSE="GPL-3.0"
 TERMUX_PKG_DEPENDS="m4"
-TERMUX_PKG_VERSION=3.3
-TERMUX_PKG_SHA256=162ea71d21e134c44942f4ebb74685e19c942dcf40a7120eba165ba5e2553bb9
+TERMUX_PKG_VERSION=3.3.2
+TERMUX_PKG_SHA256=039ee45b61d95e5003e7e8376f9080001b4066ff357bde271b7faace53b9d804
 TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/bison/bison-${TERMUX_PKG_VERSION}.tar.xz
 TERMUX_PKG_BUILD_IN_SRC=yes
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="M4=m4"

packages/brogue/build.sh

@@ -8,10 +8,10 @@ TERMUX_PKG_DEPENDS="ncurses"
 TERMUX_PKG_EXTRA_MAKE_ARGS="curses"
 TERMUX_PKG_BUILD_IN_SRC=yes
 
-termux_step_pre_configure () {
+termux_step_pre_configure() {
 	CC="$CC $CFLAGS $CPPFLAGS $LDFLAGS"
 }
 
-termux_step_make_install () {
+termux_step_make_install() {
 	cp bin/brogue $TERMUX_PREFIX/bin
 }

packages/busybox/build.sh

@@ -11,11 +11,11 @@ TERMUX_PKG_BUILD_IN_SRC=yes
 # We replace env in the old coreutils package:
 TERMUX_PKG_CONFLICTS="coreutils (<< 8.25-4)"
 
-termux_step_pre_configure () {
+termux_step_pre_configure() {
 	CFLAGS+=" -llog" # Android system liblog.so for syslog
 }
 
-termux_step_configure () {
+termux_step_configure() {
 	cp $TERMUX_PKG_BUILDER_DIR/busybox.config .config
 	echo "CONFIG_SYSROOT=\"$TERMUX_STANDALONE_TOOLCHAIN/sysroot\"" >> .config
 	echo "CONFIG_PREFIX=\"$TERMUX_PREFIX\"" >> .config
@@ -25,7 +25,7 @@ termux_step_configure () {
 	make oldconfig
 }
 
-termux_step_post_make_install () {
+termux_step_post_make_install() {
 	if [ "$TERMUX_DEBUG" == "true" ]; then
 		install busybox_unstripped $PREFIX/bin/busybox
 	fi

packages/ca-certificates/build.sh

@@ -8,7 +8,7 @@ TERMUX_PKG_SHA256=c1fd9b235896b1094ee97bfb7e042f93530b5e300781f59b45edf84ee8c750
 TERMUX_PKG_SKIP_SRC_EXTRACT=yes
 TERMUX_PKG_PLATFORM_INDEPENDENT=yes
 
-termux_step_make_install () {
+termux_step_make_install() {
 	local CERTDIR=$TERMUX_PREFIX/etc/tls
 	local CERTFILE=$CERTDIR/cert.pem
 

packages/caddy/build.sh

@@ -1,9 +1,9 @@
 TERMUX_PKG_HOMEPAGE=https://caddyserver.com/
 TERMUX_PKG_DESCRIPTION="Fast, cross-platform HTTP/2 web server"
 TERMUX_PKG_LICENSE="Apache-2.0"
-TERMUX_PKG_VERSION=0.11.2
+TERMUX_PKG_VERSION=0.11.3
+TERMUX_PKG_SHA256=b99973614b85f55da309cdf79e5d6c9aae8ad1bd83c425b1f1fd17b21386eab6
 TERMUX_PKG_SRCURL=https://github.com/mholt/caddy/archive/v$TERMUX_PKG_VERSION.tar.gz
-TERMUX_PKG_SHA256=61779a09959bf6a0e7007e8ff5c2a94811dd12b7628166cb31e9648a97c0e75b
 
 termux_step_make() {
 	termux_setup_golang

packages/cboard/build.sh

@@ -6,7 +6,7 @@ TERMUX_PKG_SHA256=dd748039f3531653e1573577cd814741524e1b16e16e3a841ef512e5150da6
 TERMUX_PKG_SRCURL=http://downloads.sourceforge.net/project/c-board/${TERMUX_PKG_VERSION}/cboard-${TERMUX_PKG_VERSION}.tar.bz2
 TERMUX_PKG_DEPENDS="libandroid-support,libandroid-glob,gnuchess, ncurses, ncurses-ui-libs"
 
-termux_step_pre_configure () {
+termux_step_pre_configure() {
 	CFLAGS+=" -DLINE_MAX=_POSIX2_LINE_MAX"
 	LDFLAGS+=" -landroid-glob"
 	if [ "$TERMUX_DEBUG" == "true" ]; then

packages/cmake/build.sh

@@ -1,8 +1,8 @@
 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.13.3
-TERMUX_PKG_SHA256=665f905036b1f731a2a16f83fb298b1fb9d0f98c382625d023097151ad016b25
+TERMUX_PKG_VERSION=3.13.4
+TERMUX_PKG_SHA256=fdd928fee35f472920071d1c7f1a6a2b72c9b25e04f7a37b409349aef3f20e9b
 TERMUX_PKG_SRCURL=https://www.cmake.org/files/v${TERMUX_PKG_VERSION:0:4}/cmake-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_DEPENDS="libarchive, libcurl, libexpat, jsoncpp, libuv, rhash, make, clang"
 TERMUX_PKG_FORCE_CMAKE=yes

packages/cmatrix/build.sh

@@ -8,7 +8,7 @@ TERMUX_PKG_SRCURL=https://github.com/abishekvashok/cmatrix/archive/${_REAL_VERSI
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--mandir=$TERMUX_PREFIX/share/man"
 TERMUX_PKG_DEPENDS="ncurses"
 
-termux_step_pre_configure () {
+termux_step_pre_configure() {
 	export ac_cv_file__usr_lib_kbd_consolefonts=no
 	export ac_cv_file__usr_share_consolefonts=no
 	export ac_cv_file__usr_lib_X11_fonts_misc=no

packages/cmus/build.sh

@@ -2,7 +2,7 @@ TERMUX_PKG_HOMEPAGE=https://cmus.github.io/
 TERMUX_PKG_DESCRIPTION="Small, fast and powerful console music player"
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_VERSION=2.7.1
-TERMUX_PKG_REVISION=3
+TERMUX_PKG_REVISION=4
 TERMUX_PKG_SHA256=8179a7a843d257ddb585f4c65599844bc0e516fe85e97f6f87a7ceade4eb5165
 TERMUX_PKG_DEPENDS="libandroid-support, ncurses, libflac, libmad, libvorbis, opusfile, libcue, libpulseaudio"
 TERMUX_PKG_SRCURL=https://github.com/cmus/cmus/archive/v${TERMUX_PKG_VERSION}.tar.gz
@@ -13,6 +13,6 @@ termux_step_pre_configure() {
 	export CONFIG_OSS=n
 }
 
-termux_step_configure () {
+termux_step_configure() {
 	./configure prefix=$TERMUX_PREFIX
 }

packages/command-not-found/build.sh

@@ -3,9 +3,9 @@ TERMUX_PKG_DESCRIPTION="Suggest installation of packages in interactive shell se
 TERMUX_PKG_LICENSE="Apache-2.0"
 TERMUX_PKG_VERSION=1.36
 
-termux_step_make_install () {
+termux_step_make_install() {
 	TERMUX_LIBEXEC_DIR=$TERMUX_PREFIX/libexec/termux
 	mkdir -p $TERMUX_LIBEXEC_DIR
 	$CC -Wall -Wextra -Werror -pedantic $CFLAGS $LDFLAGS -std=c11 $TERMUX_PKG_BUILDER_DIR/command-not-found.c \
-	        -o $TERMUX_LIBEXEC_DIR/command-not-found
+		-o $TERMUX_LIBEXEC_DIR/command-not-found
 }

packages/corkscrew/build.sh

@@ -7,7 +7,7 @@ TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://dl.bintray.com/termux/upstream/corkscrew-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=0d0fcbb41cba4a81c4ab494459472086f377f9edb78a2e2238ed19b58956b0be
 
-termux_step_post_make_install () {
+termux_step_post_make_install() {
 	# Corkscrew does not distribute a man page, use one from debian:
 	mkdir -p $TERMUX_PREFIX/share/man/man1
 	cp $TERMUX_PKG_BUILDER_DIR/corkscrew.1 $TERMUX_PREFIX/share/man/man1

packages/cowsay/build.sh

@@ -7,7 +7,7 @@ TERMUX_PKG_SHA256=10bae895d9afb2d720d2211db58f396352b00fe1386c369ca3608cbf6497b8
 TERMUX_PKG_DEPENDS="perl"
 TERMUX_PKG_PLATFORM_INDEPENDENT=yes
 
-termux_step_make_install () {
+termux_step_make_install() {
 	cd $TERMUX_PKG_SRCDIR
 	sh install.sh
 }

packages/curseofwar/build.sh

@@ -7,7 +7,7 @@ TERMUX_PKG_REVISION=2
 TERMUX_PKG_SRCURL=https://github.com/a-nikolaev/curseofwar/archive/v${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=91b7781e26341faa6b6999b6baf6e74ef532fa94303ab6a2bf9ff6d614a3f670
 
-termux_step_make_install () {
+termux_step_make_install() {
 	mkdir -p $TERMUX_PREFIX/share/man/man6
 	cp curseofwar $TERMUX_PREFIX/bin
 	cp $TERMUX_PKG_SRCDIR/curseofwar.6 $TERMUX_PREFIX/share/man/man6

packages/dash/build.sh

@@ -7,11 +7,10 @@ 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_step_post_make_install () {
+termux_step_post_make_install() {
 	# Symlink sh -> dash
-	rm -f $TERMUX_PREFIX/bin/sh $TERMUX_PREFIX/share/man/man1/sh.1
 	cd $TERMUX_PREFIX/bin
-	ln -s dash sh
+	ln -sf dash sh
 	cd $TERMUX_PREFIX/share/man/man1
-	ln -s dash.1 sh.1
+	ln -sf dash.1 sh.1
 }

packages/dcraw/build.sh

@@ -7,9 +7,9 @@ TERMUX_PKG_SRCURL=http://www.cybercom.net/~dcoffin/dcraw/archive/dcraw-${TERMUX_
 TERMUX_PKG_BUILD_IN_SRC=yes
 TERMUX_PKG_DEPENDS="littlecms, libjasper, libjpeg-turbo"
 
-termux_step_make_install () {
+termux_step_make_install() {
 	# See the "install" script for flags:
 	$CC $CFLAGS $CPPFLAGS $LDFLAGS dcraw.c $TERMUX_PKG_BUILDER_DIR/swab.c -lm -ljasper -ljpeg -llcms2 -o $TERMUX_PREFIX/bin/dcraw
-        chmod +w dcraw.1 # Add missing write permission
+	chmod +w dcraw.1 # Add missing write permission
 	cp dcraw.1 $TERMUX_PREFIX/share/man/man1/
 }

packages/debianutils/build.sh

@@ -1,7 +1,7 @@
 TERMUX_PKG_HOMEPAGE=https://packages.debian.org/debianutils
 TERMUX_PKG_DESCRIPTION="Small utilities which are used primarily by the installation scripts of Debian packages"
 TERMUX_PKG_LICENSE="GPL-2.0"
-TERMUX_PKG_VERSION=4.8.6
-TERMUX_PKG_SHA256=db09047144dadf6a35d0f28977fbef83b0dd60ca32e6c8512cce2444a6423f73
+TERMUX_PKG_VERSION=4.8.6.1
+TERMUX_PKG_SHA256=099f1e8a7278b26145a2ba2dda84c4118403bfab38c8d7070a6235a7ffcb55ed
 TERMUX_PKG_SRCURL=http://ftp.debian.org/debian/pool/main/d/debianutils/debianutils_${TERMUX_PKG_VERSION}.tar.xz
 TERMUX_PKG_RM_AFTER_INSTALL="bin/installkernel share/man/man8/installkernel.8"

packages/dialog/build.sh

@@ -8,12 +8,12 @@ TERMUX_PKG_SRCURL=http://invisible-island.net/datafiles/release/dialog.tar.gz
 # This will break when a new version is released (the URL unfortunately does not change)
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--with-ncursesw --enable-widec --with-pkg-config"
 
-termux_step_pre_configure () {
+termux_step_pre_configure() {
 	# Put a temporary link for libtinfo.so
 	ln -s -f $TERMUX_PREFIX/lib/libncursesw.so $TERMUX_PREFIX/lib/libtinfo.so
 }
 
-termux_step_post_make_install () {
+termux_step_post_make_install() {
 	rm $TERMUX_PREFIX/lib/libtinfo.so
 	cd $TERMUX_PREFIX/bin
 	ln -f -s dialog whiptail

packages/dnsutils/build.sh

@@ -20,7 +20,7 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 --with-eddsa=no
 "
 
-termux_step_pre_configure () {
+termux_step_pre_configure() {
 	export BUILD_AR=ar
 	export BUILD_CC=gcc
 	export BUILD_CFLAGS=
@@ -33,7 +33,7 @@ termux_step_pre_configure () {
 	LDFLAGS+=" -llog"
 }
 
-termux_step_make () {
+termux_step_make() {
 	make -C lib/isc
 	make -C lib/dns
 	make -C lib/ns
@@ -46,7 +46,7 @@ termux_step_make () {
 	make -C bin/nsupdate
 }
 
-termux_step_make_install () {
+termux_step_make_install() {
 	make -C lib/isc install
 	make -C lib/dns install
 	make -C lib/ns install

packages/doxygen/build.sh

@@ -13,7 +13,7 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -Dbuild_parse=yes
 -Dbuild_xmlparser=yes
 "
-termux_step_post_make_install () {
+termux_step_post_make_install() {
 	mkdir -p $TERMUX_PREFIX/share/man/man1
 	cp $TERMUX_PKG_SRCDIR/doc/doxygen.1 $TERMUX_PREFIX/share/man/man1
 }

packages/dpkg/build.sh

@@ -65,7 +65,7 @@ share/perl5
 TERMUX_PKG_DEPENDS="busybox, liblzma"
 TERMUX_PKG_ESSENTIAL=yes
 
-termux_step_pre_configure () {
+termux_step_pre_configure() {
 	export TAR=tar # To make sure dpkg tries to use "tar" instead of e.g. "gnutar" (which happens when building on OS X)
 	perl -p -i -e "s/TERMUX_ARCH/$TERMUX_ARCH/" $TERMUX_PKG_SRCDIR/configure
 }

packages/dropbear/build.sh

@@ -23,7 +23,7 @@ termux_step_post_make_install() {
     ln -sf "dropbearmulti" "${TERMUX_PREFIX}/bin/ssh"
 }
 
-termux_step_create_debscripts () {
+termux_step_create_debscripts() {
     {
         echo "#!$TERMUX_PREFIX/bin/sh"
         echo "mkdir -p $TERMUX_PREFIX/etc/dropbear"

packages/dx/build.sh

@@ -4,7 +4,7 @@ TERMUX_PKG_LICENSE="Apache-2.0"
 TERMUX_PKG_VERSION=$TERMUX_ANDROID_BUILD_TOOLS_VERSION
 TERMUX_PKG_PLATFORM_INDEPENDENT=true
 
-termux_step_make_install () {
+termux_step_make_install() {
 	# Rewrite packages to avoid using com.android.* classes which may clash with
 	# classes in the Android runtime on devices (see #1801):
 	local JARJAR=$TERMUX_PKG_CACHEDIR/jarjar.jar

packages/ecj/build.sh

@@ -9,11 +9,11 @@ TERMUX_PKG_SRCURL=http://archive.eclipse.org/eclipse/downloads/drops${TERMUX_PKG
 TERMUX_PKG_PLATFORM_INDEPENDENT=true
 TERMUX_PKG_CONFLICTS="ecj4.6"
 
-termux_step_extract_package () {
+termux_step_extract_package() {
 	mkdir $TERMUX_PKG_SRCDIR
 }
 
-termux_step_make () {
+termux_step_make() {
 	local RAW_JAR=$TERMUX_PKG_CACHEDIR/ecj-${TERMUX_PKG_VERSION}.jar
 	termux_download $TERMUX_PKG_SRCURL \
 		$RAW_JAR \
@@ -32,16 +32,16 @@ termux_step_make () {
 	jar cf ecj.jar classes.dex
 	# Add needed properties file to jar file:
 	jar xf $RAW_JAR org/eclipse/jdt/internal/compiler/batch/messages.properties
-	jar uf ecj.jar  org/eclipse/jdt/internal/compiler/batch/messages.properties
+	jar uf ecj.jar	org/eclipse/jdt/internal/compiler/batch/messages.properties
 	jar xf $RAW_JAR org/eclipse/jdt/internal/compiler/problem/messages.properties
-	jar uf ecj.jar  org/eclipse/jdt/internal/compiler/problem/messages.properties
+	jar uf ecj.jar	org/eclipse/jdt/internal/compiler/problem/messages.properties
 	jar xf $RAW_JAR org/eclipse/jdt/internal/compiler/messages.properties
-	jar uf ecj.jar  org/eclipse/jdt/internal/compiler/messages.properties
+	jar uf ecj.jar	org/eclipse/jdt/internal/compiler/messages.properties
 	jar xf $RAW_JAR org/eclipse/jdt/internal/compiler/parser/readableNames.props
-	jar uf ecj.jar  org/eclipse/jdt/internal/compiler/parser/readableNames.props
+	jar uf ecj.jar	org/eclipse/jdt/internal/compiler/parser/readableNames.props
 	for i in `seq 1 24`; do
 		jar xf $RAW_JAR org/eclipse/jdt/internal/compiler/parser/parser$i.rsc
-		jar uf ecj.jar  org/eclipse/jdt/internal/compiler/parser/parser$i.rsc
+		jar uf ecj.jar	org/eclipse/jdt/internal/compiler/parser/parser$i.rsc
 	done
 	# Move into place:
 	mv ecj.jar $TERMUX_PREFIX/share/dex/ecj.jar
@@ -50,7 +50,7 @@ termux_step_make () {
 	mkdir android-jar
 	cd android-jar
 
-        # We need the android classes for JDT to compile against.
+	# We need the android classes for JDT to compile against.
 	cp $ANDROID_HOME/platforms/android-28/android.jar .
 	unzip -q android.jar
 	rm -Rf android.jar resources.arsc res assets

packages/ecj4.6/build.sh

@@ -9,11 +9,11 @@ TERMUX_PKG_SRCURL=http://archive.eclipse.org/eclipse/downloads/drops${TERMUX_PKG
 TERMUX_PKG_PLATFORM_INDEPENDENT=true
 TERMUX_PKG_CONFLICTS="ecj"
 
-termux_step_extract_package () {
+termux_step_extract_package() {
 	mkdir $TERMUX_PKG_SRCDIR
 }
 
-termux_step_make () {
+termux_step_make() {
 	local RAW_JAR=$TERMUX_PKG_CACHEDIR/ecj-${TERMUX_PKG_VERSION}.jar
 	termux_download $TERMUX_PKG_SRCURL \
 		$RAW_JAR \
@@ -32,16 +32,16 @@ termux_step_make () {
 	jar cf ecj.jar classes.dex
 	# Add needed properties file to jar file:
 	jar xf $RAW_JAR org/eclipse/jdt/internal/compiler/batch/messages.properties
-	jar uf ecj.jar  org/eclipse/jdt/internal/compiler/batch/messages.properties
+	jar uf ecj.jar	org/eclipse/jdt/internal/compiler/batch/messages.properties
 	jar xf $RAW_JAR org/eclipse/jdt/internal/compiler/problem/messages.properties
-	jar uf ecj.jar  org/eclipse/jdt/internal/compiler/problem/messages.properties
+	jar uf ecj.jar	org/eclipse/jdt/internal/compiler/problem/messages.properties
 	jar xf $RAW_JAR org/eclipse/jdt/internal/compiler/messages.properties
-	jar uf ecj.jar  org/eclipse/jdt/internal/compiler/messages.properties
+	jar uf ecj.jar	org/eclipse/jdt/internal/compiler/messages.properties
 	jar xf $RAW_JAR org/eclipse/jdt/internal/compiler/parser/readableNames.props
-	jar uf ecj.jar  org/eclipse/jdt/internal/compiler/parser/readableNames.props
+	jar uf ecj.jar	org/eclipse/jdt/internal/compiler/parser/readableNames.props
 	for i in `seq 1 24`; do
 		jar xf $RAW_JAR org/eclipse/jdt/internal/compiler/parser/parser$i.rsc
-		jar uf ecj.jar  org/eclipse/jdt/internal/compiler/parser/parser$i.rsc
+		jar uf ecj.jar	org/eclipse/jdt/internal/compiler/parser/parser$i.rsc
 	done
 	# Move into place:
 	mv ecj.jar $TERMUX_PREFIX/share/dex/ecj.jar
@@ -50,7 +50,7 @@ termux_step_make () {
 	mkdir android-jar
 	cd android-jar
 
-        # We need the android classes for JDT to compile against.
+	# We need the android classes for JDT to compile against.
 	cp $ANDROID_HOME/platforms/android-28/android.jar .
 	unzip -q android.jar
 	rm -Rf android.jar resources.arsc res assets

packages/emacs/build.sh

@@ -41,7 +41,7 @@ TERMUX_PKG_RM_AFTER_INSTALL="share/icons share/emacs/${TERMUX_PKG_VERSION}/etc/i
 # program still remain in the emacs package):
 TERMUX_PKG_RM_AFTER_INSTALL+=" bin/ctags share/man/man1/ctags.1 share/man/man1/ctags.1.gz"
 
-termux_step_post_extract_package () {
+termux_step_post_extract_package() {
 	# XXX: We have to start with new host build each time
 	#      to avoid build error when cross compiling.
 	rm -Rf $TERMUX_PKG_HOSTBUILD_DIR
@@ -56,7 +56,7 @@ termux_step_post_extract_package () {
 	export CANNOT_DUMP=yes
 }
 
-termux_step_host_build () {
+termux_step_host_build() {
 	# Build a bootstrap-emacs binary to be used in termux_step_post_configure.
 	local NATIVE_PREFIX=$TERMUX_PKG_TMPDIR/emacs-native
 	mkdir -p $NATIVE_PREFIX/share/emacs/$TERMUX_PKG_VERSION
@@ -66,13 +66,13 @@ termux_step_host_build () {
 	make -j $TERMUX_MAKE_PROCESSES
 }
 
-termux_step_post_configure () {
+termux_step_post_configure() {
 	cp $TERMUX_PKG_HOSTBUILD_DIR/src/bootstrap-emacs $TERMUX_PKG_BUILDDIR/src/bootstrap-emacs
 	cp $TERMUX_PKG_HOSTBUILD_DIR/lib-src/make-docfile $TERMUX_PKG_BUILDDIR/lib-src/make-docfile
 	# Update timestamps so that the binaries does not get rebuilt:
 	touch -d "next hour" $TERMUX_PKG_BUILDDIR/src/bootstrap-emacs $TERMUX_PKG_BUILDDIR/lib-src/make-docfile
 }
 
-termux_step_post_make_install () {
+termux_step_post_make_install() {
 	cp $TERMUX_PKG_BUILDER_DIR/site-init.el $TERMUX_PREFIX/share/emacs/${TERMUX_PKG_VERSION}/lisp/emacs-lisp/
 }

packages/erlang/build.sh

@@ -1,8 +1,8 @@
 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=21.2.4
-TERMUX_PKG_SHA256=833d31ac102536b752e474dc6d69be7cc3e37d2d944191317312b30b1ea8ef0d
+TERMUX_PKG_VERSION=21.2.5
+TERMUX_PKG_SHA256=3ff578ab020a714be25d6787b81938df016db375692d4126a28f1303e6e9c165
 TERMUX_PKG_SRCURL=https://github.com/erlang/otp/archive/OTP-$TERMUX_PKG_VERSION.tar.gz
 TERMUX_PKG_DEPENDS="openssl, ncurses, libutil"
 TERMUX_PKG_HOSTBUILD="yes"
@@ -18,13 +18,13 @@ termux_step_post_extract_package() {
 	./otp_build autoconf
 }
 
-termux_step_host_build () {
+termux_step_host_build() {
 	cd $TERMUX_PKG_SRCDIR
 	./configure --enable-bootstrap-only
 	make -j "$TERMUX_MAKE_PROCESSES"
 }
 
-termux_step_pre_configure () {
+termux_step_pre_configure() {
 	(cd erts && autoreconf)
 
 	# liblog is needed for syslog usage:

packages/expect/build.sh

@@ -6,11 +6,11 @@ TERMUX_PKG_SHA256=49a7da83b0bdd9f46d04a04deec19c7767bb9a323e40c4781f89caf760b92c
 TERMUX_PKG_SRCURL=http://downloads.sourceforge.net/project/expect/Expect/${TERMUX_PKG_VERSION}/expect${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_DEPENDS="libutil, tcl"
 
-termux_step_pre_configure () {
+termux_step_pre_configure() {
 	autoconf
 }
 
-termux_step_post_make_install () {
+termux_step_post_make_install() {
 	cd $TERMUX_PREFIX/lib
 	ln -f -s expect${TERMUX_PKG_VERSION}/libexpect${TERMUX_PKG_VERSION}.so .
 }

packages/ffmpeg/build.sh

@@ -3,7 +3,7 @@ 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
-TERMUX_PKG_REVISION=2
+TERMUX_PKG_REVISION=3
 TERMUX_PKG_SHA256=a38ec4d026efb58506a99ad5cd23d5a9793b4bf415f2c4c2e9c1bb444acd1994
 TERMUX_PKG_SRCURL=https://www.ffmpeg.org/releases/ffmpeg-${TERMUX_PKG_VERSION}.tar.xz
 # libbz2 is used by matroska decoder:
@@ -13,7 +13,7 @@ TERMUX_PKG_DEPENDS="libbz2, libsoxr, libx264, libx265, xvidcore, libvorbis, libm
 TERMUX_PKG_INCLUDE_IN_DEVPACKAGE="share/ffmpeg/examples"
 TERMUX_PKG_CONFLICTS="libav"
 
-termux_step_configure () {
+termux_step_configure() {
 	cd $TERMUX_PKG_BUILDDIR
 
 	export ASFLAGS="-no-integrated-as"

packages/figlet/build.sh

@@ -7,6 +7,6 @@ TERMUX_PKG_SRCURL=ftp://ftp.figlet.org/pub/figlet/program/unix/figlet-${TERMUX_P
 TERMUX_PKG_SHA256=bf88c40fd0f077dab2712f54f8d39ac952e4e9f2e1882f1195be9e5e4257417d
 TERMUX_PKG_BUILD_IN_SRC=yes
 
-termux_step_pre_configure () {
+termux_step_pre_configure() {
 	LD=$CC
 }

packages/finch/build.sh

@@ -21,12 +21,12 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 "
 TERMUX_PKG_RM_AFTER_INSTALL="share/sounds/purple lib/purple-2/libmsn.so"
 
-termux_step_pre_configure () {
+termux_step_pre_configure() {
 	# For arpa:
 	CFLAGS+=" -isystem $TERMUX_PKG_BUILDER_DIR"
 }
 
-termux_step_post_configure () {
+termux_step_post_configure() {
         # Hack to compile first version of libpurple-ciphers.la
         cp $TERMUX_PREFIX/lib/libxml2.so $TERMUX_PREFIX/lib/libpurple.so
 
@@ -41,7 +41,7 @@ termux_step_post_configure () {
         make clean
 }
 
-termux_step_post_make_install () {
+termux_step_post_make_install() {
         cd $TERMUX_PREFIX/lib
         for lib in jabber oscar ymsg; do
                 ln -f -s purple-2/lib${lib}.so .

packages/fish/build.sh

@@ -17,7 +17,7 @@ termux_step_pre_configure() {
 	CXXFLAGS+=" $CPPFLAGS"
 }
 
-termux_step_post_make_install () {
+termux_step_post_make_install() {
 	cat >> $TERMUX_PREFIX/etc/fish/config.fish <<HERE
 
 function __fish_command_not_found_handler --on-event fish_command_not_found

packages/fortune/build.sh

@@ -5,7 +5,7 @@ TERMUX_PKG_VERSION=1.2
 TERMUX_PKG_SRCURL=http://dl.fefe.de/fortune-${TERMUX_PKG_VERSION}.tar.bz2
 TERMUX_PKG_SHA256=cbb246a500366db39ce035632eb4954e09f1e03b28f2c4688864bfa8661b236a
 
-termux_step_make_install () {
+termux_step_make_install() {
 	cd $TERMUX_PKG_SRCDIR
 	$CC $CFLAGS fortune.c -o $TERMUX_PREFIX/bin/fortune
 	mkdir -p $TERMUX_PREFIX/share/man/man6

packages/fossil/build.sh

@@ -8,14 +8,14 @@ TERMUX_PKG_SHA256=2c24359131d7495e47dc95021eb35f1ba408ded9087e36370d94742a401103
 TERMUX_PKG_SRCURL=https://www.fossil-scm.org/index.html/uv/fossil-src-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_DEPENDS="libsqlite, openssl"
 
-termux_step_pre_configure () {
+termux_step_pre_configure() {
 	# Avoid mixup of flags between cross compilation
 	# and native build.
 	CC="$CC $CFLAGS $LDFLAGS"
 	unset CFLAGS LDFLAGS
 }
 
-termux_step_configure () {
+termux_step_configure() {
 	$TERMUX_PKG_SRCDIR/configure \
 		--prefix=$TERMUX_PREFIX \
 		--host=$TERMUX_HOST_PLATFORM \

packages/freetype/build.sh

@@ -10,7 +10,7 @@ TERMUX_PKG_INCLUDE_IN_DEVPACKAGE="bin/freetype-config share/man/man1/freetype-co
 # 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.
-termux_step_post_make_install () {
+termux_step_post_make_install() {
 	cp freetype-config $TERMUX_PREFIX/bin
 	cp ../src/docs/freetype-config.1 $TERMUX_PREFIX/share/man/man1/
 }

packages/frotz/build.sh

@@ -15,11 +15,11 @@ termux_step_pre_configure() {
 	CFLAGS+=" -Drindex=strrchr"
 }
 
-termux_step_make () {
+termux_step_make() {
 	CC="$CC $CFLAGS $CPPFLAGS $LDFLAGS" PREFIX=$TERMUX_PREFIX make -j $TERMUX_MAKE_PROCESSES install
 }
 
-termux_step_make_install () {
+termux_step_make_install() {
 	cp $TERMUX_PKG_BUILDER_DIR/zgames $TERMUX_PREFIX/bin/zgames
 	chmod +x $TERMUX_PREFIX/bin/zgames
 }

packages/fzf/build.sh

@@ -14,7 +14,7 @@ termux_step_make() {
 	:
 }
 
-termux_step_make_install () {
+termux_step_make_install() {
 	termux_setup_golang
 	export CGO_CFLAGS="-I$TERMUX_PREFIX/include"
 	export CGO_LDFLAGS="-L$TERMUX_PREFIX/lib"
@@ -60,7 +60,7 @@ termux_step_make_install () {
 	cp $TERMUX_PKG_SRCDIR/plugin/fzf.vim $TERMUX_PREFIX/share/nvim/runtime/plugin/
 }
 
-termux_step_post_massage () {
+termux_step_post_massage() {
 	# Remove so that the vim build doesn't add it to vim-runtime:
 	rm $TERMUX_PREFIX/share/vim/vim81/plugin/fzf.vim
 }

packages/gawk/build.sh

@@ -8,7 +8,7 @@ TERMUX_PKG_SHA256=d1119785e746d46a8209d28b2de404a57f983aa48670f4e225531d3bdc1755
 TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/gawk/gawk-${TERMUX_PKG_VERSION}.tar.xz
 TERMUX_PKG_RM_AFTER_INSTALL="bin/gawk-* bin/igawk share/man/man1/igawk.1"
 
-termux_step_pre_configure () {
+termux_step_pre_configure() {
 	# Remove old symlink to force a fresh timestamp:
 	rm -f $TERMUX_PREFIX/bin/awk
 

packages/getmail/build.sh

@@ -8,10 +8,10 @@ TERMUX_PKG_DEPENDS="python2"
 TERMUX_PKG_BUILD_IN_SRC=yes
 TERMUX_PKG_PLATFORM_INDEPENDENT=yes
 
-termux_step_make_install () {
+termux_step_make_install() {
         python2 setup.py install --prefix=$TERMUX_PREFIX --force
 }
 
-termux_step_post_massage () {
+termux_step_post_massage() {
         find . -path '*.pyc' -delete
 }

packages/gettext/build.sh

@@ -6,6 +6,6 @@ TERMUX_PKG_SHA256=105556dbc5c3fbbc2aa0edb46d22d055748b6f5c7cd7a8d99f8e7eb84e938b
 TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/gettext/gettext-${TERMUX_PKG_VERSION}.tar.xz
 TERMUX_PKG_BUILD_IN_SRC=yes
 TERMUX_PKG_DEPENDS="pcre, liblzma, libxml2, libcroco, ncurses, libunistring"
-termux_step_pre_configure () {
+termux_step_pre_configure() {
 	autoreconf
 }

packages/ghostscript/build.sh

@@ -2,6 +2,7 @@ TERMUX_PKG_HOMEPAGE=https://www.ghostscript.com/
 TERMUX_PKG_DESCRIPTION="Interpreter for the PostScript language and for PDF"
 TERMUX_PKG_LICENSE="AGPL-V3"
 TERMUX_PKG_VERSION=9.26
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SHA256=b0d4916b669a63ed861f563c4607cc1230949c53431ab0798db8e680fdacc777
 TERMUX_PKG_SRCURL=https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs${TERMUX_PKG_VERSION//.}/ghostpdl-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_DEPENDS="libandroid-support, libtiff, libjpeg-turbo, libpng, libexpat, freetype, fontconfig, libidn, littlecms, openjpeg"
@@ -16,6 +17,6 @@ CCAUX=gcc
 --with-system-libtiff
 "
 
-termux_step_post_extract_package () {
-        rm -rdf $TERMUX_PKG_SRCDIR/{jpeg,libpng,expat,jasper,freetype,lcms2,tiff,openjpeg}
+termux_step_post_extract_package() {
+	rm -rdf $TERMUX_PKG_SRCDIR/{jpeg,libpng,expat,jasper,freetype,lcms2,tiff,openjpeg}
 }

packages/git-crypt/build.sh

@@ -9,12 +9,12 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" -DCMAKE_BUILD_TYPE=Release -Dbuild_parse=yes -
 TERMUX_PKG_EXTRA_MAKE_ARGS="make ENABLE_MAN=yes"
 TERMUX_PKG_DEPENDS="git, openssl"
 
-termux_step_make () {
+termux_step_make() {
 	cd $TERMUX_PKG_SRCDIR
 	make
 }
 
-termux_step_make_install () {
+termux_step_make_install() {
 	cd $TERMUX_PKG_SRCDIR
 	make install
 }

packages/git/build.sh

@@ -40,7 +40,7 @@ share/man/man1/git-cvsserver.1
 share/man/man1/git-shell.1
 "
 
-termux_step_pre_configure () {
+termux_step_pre_configure() {
 	# Setup perl so that the build process can execute it:
 	rm -f $TERMUX_PREFIX/bin/perl
 	ln -s `which perl` $TERMUX_PREFIX/bin/perl
@@ -54,7 +54,7 @@ termux_step_pre_configure () {
 	CPPFLAGS="-I$TERMUX_PKG_SRCDIR $CPPFLAGS"
 }
 
-termux_step_post_make_install () {
+termux_step_post_make_install() {
 	# Installing man requires asciidoc and xmlto, so git uses separate make targets for man pages
 	make -j $TERMUX_MAKE_PROCESSES install-man
 
@@ -74,7 +74,7 @@ termux_step_post_make_install () {
 	(cd $TERMUX_PREFIX/bin; ln -s -f ../libexec/git-core/git-upload-pack git-upload-pack)
 }
 
-termux_step_post_massage () {
+termux_step_post_massage() {
 	if [ ! -f libexec/git-core/git-remote-https ]; then
 		termux_error_exit "Git built without https support"
 	fi

packages/glib/build.sh

@@ -1,9 +1,8 @@
 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.58.2
-TERMUX_PKG_REVISION=1
-TERMUX_PKG_SHA256=c7b24ed6536f1a10fc9bce7994e55c427b727602e78342821f1f07fb48753d4b
+TERMUX_PKG_VERSION=2.58.3
+TERMUX_PKG_SHA256=8f43c31767e88a25da72b52a40f3301fefc49a665b56dc10ee7cc9565cbe7481
 TERMUX_PKG_SRCURL=https://ftp.gnome.org/pub/gnome/sources/glib/${TERMUX_PKG_VERSION:0:4}/glib-${TERMUX_PKG_VERSION}.tar.xz
 # libandroid-support to get langinfo.h in include path.
 TERMUX_PKG_DEPENDS="libffi, pcre, libandroid-support"
@@ -25,7 +24,7 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 --with-pcre=system
 "
 
-termux_step_pre_configure () {
+termux_step_pre_configure() {
 	NOCONFIGURE=1 ./autogen.sh
 
 	# glib checks for __BIONIC__ instead of __ANDROID__:

packages/glulxe/build.sh

@@ -7,14 +7,14 @@ TERMUX_PKG_SHA256=33c563bdbd0fdbae625e1a2441e9a6f40f1491f1cdc2a197bbd6cf2c32c383
 TERMUX_PKG_BUILD_IN_SRC="yes"
 TERMUX_PKG_DEPENDS="ncurses"
 
-termux_step_configure () {
+termux_step_configure() {
 	termux_download http://eblong.com/zarf/glk/glktermw-104.tar.gz \
 		$TERMUX_PKG_CACHEDIR/glktermw-104.tar.gz \
 		5968630b45e2fd53de48424559e3579db0537c460f4dc2631f258e1c116eb4ea
 	tar xf $TERMUX_PKG_CACHEDIR/glktermw-104.tar.gz
 }
 
-termux_step_make () {
+termux_step_make() {
 	cd $TERMUX_PKG_SRCDIR/glkterm
 	patch -p1 < $TERMUX_PKG_BUILDER_DIR/glkterm.patch.special
 	CC="$CC $CFLAGS $CPPFLAGS $LDFLAGS" PREFIX=$TERMUX_PREFIX make -j 1
@@ -24,6 +24,6 @@ termux_step_make () {
 	cp glulxe $TERMUX_PREFIX/bin
 }
 
-termux_step_make_install () {
+termux_step_make_install() {
 	echo "Do nothing..."
 }

packages/gmic/build.sh

@@ -13,7 +13,7 @@ termux_step_configure() {
 	return 0;
 }
 
-termux_step_make () {
+termux_step_make() {
 	cd src/
 	make cli
 }

packages/gnugo/build.sh

@@ -13,7 +13,7 @@ termux_step_pre_configure() {
 	CFLAGS+=" -Wno-overflow"
 }
 
-termux_step_post_configure () {
+termux_step_post_configure() {
 	cp $TERMUX_PKG_HOSTBUILD_DIR/patterns/mkeyes $TERMUX_PKG_BUILDDIR/patterns/mkeyes
 	cp $TERMUX_PKG_HOSTBUILD_DIR/patterns/uncompress_fuseki $TERMUX_PKG_BUILDDIR/patterns/uncompress_fuseki
 	cp $TERMUX_PKG_HOSTBUILD_DIR/patterns/joseki $TERMUX_PKG_BUILDDIR/patterns/joseki

packages/gnuplot/build.sh

@@ -7,6 +7,7 @@ TERMUX_PKG_SRCURL=https://downloads.sourceforge.net/project/gnuplot/gnuplot/${TE
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--without-x --with-lua=no --with-bitmap-terminals"
 TERMUX_PKG_DEPENDS="libandroid-support, readline, pango, libgd"
 TERMUX_PKG_HOSTBUILD=yes
+TERMUX_PKG_REVISION=1
 
 termux_step_host_build() {
 	"$TERMUX_PKG_SRCDIR/configure"