diff --git a/build-all.sh b/build-all.sh
index 1fd8d64c1..cd2976082 100755
--- a/build-all.sh
+++ b/build-all.sh
@@ -9,7 +9,7 @@ test -f $HOME/.termuxrc && . $HOME/.termuxrc
 : ${TERMUX_ARCH:="aarch64"}
 : ${TERMUX_DEBUG:=""}
 
-_show_usage () {
+_show_usage() {
 	echo "Usage: ./build-all.sh [-a ARCH] [-d] [-o DIR]"
 	echo "Build all packages."
 	echo "  -a The architecture to build for: aarch64(default), arm, i686, x86_64 or all."
diff --git a/build-package.sh b/build-package.sh
index 04e549aa1..a55d1498c 100755
--- a/build-package.sh
+++ b/build-package.sh
@@ -247,7 +247,7 @@ termux_setup_cmake() {
 
 # First step is to handle command-line arguments. Not to be overridden by packages.
 termux_step_handle_arguments() {
-	_show_usage () {
+	_show_usage() {
 	    echo "Usage: ./build-package.sh [-a ARCH] [-d] [-D] [-f] [-q] [-s] [-o DIR] PACKAGE"
 	    echo "Build a package by creating a .deb file in the debs/ folder."
 	    echo "  -a The architecture to build for: aarch64(default), arm, i686, x86_64 or all."
@@ -833,7 +833,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" '{}' \;
@@ -844,7 +844,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"
@@ -954,7 +954,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"
@@ -997,7 +997,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 \
@@ -1010,7 +1010,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
@@ -1020,7 +1020,7 @@ termux_step_configure () {
 	fi
 }
 
-termux_step_post_configure () {
+termux_step_post_configure() {
 	return
 }
 
diff --git a/disabled-packages/alsa-lib/build.sh b/disabled-packages/alsa-lib/build.sh
index 2c5b1b13c..2795c8dee 100644
--- a/disabled-packages/alsa-lib/build.sh
+++ b/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
diff --git a/disabled-packages/alsa-plugins/build.sh b/disabled-packages/alsa-plugins/build.sh
index 36d417411..c53d0e58c 100644
--- a/disabled-packages/alsa-plugins/build.sh
+++ b/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
 }
diff --git a/disabled-packages/alsa-utils/build.sh b/disabled-packages/alsa-utils/build.sh
index bc163c708..d9afa91e1 100644
--- a/disabled-packages/alsa-utils/build.sh
+++ b/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"
 }
diff --git a/disabled-packages/ant/build.sh b/disabled-packages/ant/build.sh
index a727324b5..46c467436 100755
--- a/disabled-packages/ant/build.sh
+++ b/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
diff --git a/disabled-packages/checkinstall/build.sh b/disabled-packages/checkinstall/build.sh
index 1976eaed9..1e161a210 100644
--- a/disabled-packages/checkinstall/build.sh
+++ b/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
 }
diff --git a/disabled-packages/clisp/build.sh b/disabled-packages/clisp/build.sh
index 8947b78e0..7d2645db6 100644
--- a/disabled-packages/clisp/build.sh
+++ b/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"
diff --git a/disabled-packages/crawl/build.sh b/disabled-packages/crawl/build.sh
index 599693a2f..9665da073 100644
--- a/disabled-packages/crawl/build.sh
+++ b/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
 }
diff --git a/disabled-packages/cups/build.sh b/disabled-packages/cups/build.sh
index c21ce54ba..4adf73994 100644
--- a/disabled-packages/cups/build.sh
+++ b/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/
 }
diff --git a/disabled-packages/d8/build.sh b/disabled-packages/d8/build.sh
index 35980c142..c16bf4882 100755
--- a/disabled-packages/d8/build.sh
+++ b/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
diff --git a/disabled-packages/dovecot/build.sh b/disabled-packages/dovecot/build.sh
index 1d54fe010..01222b7a2 100644
--- a/disabled-packages/dovecot/build.sh
+++ b/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
diff --git a/disabled-packages/easy-rsa/build.sh b/disabled-packages/easy-rsa/build.sh
index 7e3f7d948..91e5099f7 100644
--- a/disabled-packages/easy-rsa/build.sh
+++ b/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
diff --git a/disabled-packages/ghc/build.sh b/disabled-packages/ghc/build.sh
index 740a3536e..88fd9d542 100644
--- a/disabled-packages/ghc/build.sh
+++ b/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
 
diff --git a/disabled-packages/javac/build.sh b/disabled-packages/javac/build.sh
index 5bd5a6b2d..7ca035afc 100755
--- a/disabled-packages/javac/build.sh
+++ b/disabled-packages/javac/build.sh
@@ -3,11 +3,11 @@ 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
diff --git a/disabled-packages/libffi-updated/build.sh b/disabled-packages/libffi-updated/build.sh
index 970e9e636..1b58628c9 100755
--- a/disabled-packages/libffi-updated/build.sh
+++ b/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
 }
diff --git a/disabled-packages/mono/build.sh b/disabled-packages/mono/build.sh
index e3e513ca0..eff184731 100644
--- a/disabled-packages/mono/build.sh
+++ b/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
diff --git a/disabled-packages/nethack/build.sh b/disabled-packages/nethack/build.sh
index 7d1578245..930936e84 100644
--- a/disabled-packages/nethack/build.sh
+++ b/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
 
diff --git a/disabled-packages/ocaml/build.sh b/disabled-packages/ocaml/build.sh
index 5a62d7572..589f12e8e 100644
--- a/disabled-packages/ocaml/build.sh
+++ b/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
 }
diff --git a/disabled-packages/openjdk-9-jre-headless/build.sh b/disabled-packages/openjdk-9-jre-headless/build.sh
index 5862cb69b..e943616d4 100644
--- a/disabled-packages/openjdk-9-jre-headless/build.sh
+++ b/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"
diff --git a/disabled-packages/openvpn/build.sh b/disabled-packages/openvpn/build.sh
index 39fdc390d..1e01a1b24 100644
--- a/disabled-packages/openvpn/build.sh
+++ b/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
diff --git a/disabled-packages/pacman/build.sh b/disabled-packages/pacman/build.sh
index ae6cad2ce..16b25c400 100644
--- a/disabled-packages/pacman/build.sh
+++ b/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
diff --git a/disabled-packages/premake/build.sh b/disabled-packages/premake/build.sh
index d0f9d184a..1a02133e6 100644
--- a/disabled-packages/premake/build.sh
+++ b/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
 }
diff --git a/disabled-packages/racket/build.sh b/disabled-packages/racket/build.sh
index f679e0808..4053f49ad 100644
--- a/disabled-packages/racket/build.sh
+++ b/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"
diff --git a/disabled-packages/sbcl/build.sh b/disabled-packages/sbcl/build.sh
index 505f0dc21..d69fd591c 100644
--- a/disabled-packages/sbcl/build.sh
+++ b/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
 }
diff --git a/disabled-packages/swi-prolog/build.sh b/disabled-packages/swi-prolog/build.sh
index 343b51ee3..7a7783647 100644
--- a/disabled-packages/swi-prolog/build.sh
+++ b/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/
 }
diff --git a/disabled-packages/toybox/build.sh b/disabled-packages/toybox/build.sh
index cd4ccad28..1f3d72605 100644
--- a/disabled-packages/toybox/build.sh
+++ b/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
 }
diff --git a/disabled-packages/unnethack/build.sh b/disabled-packages/unnethack/build.sh
index 92a72dc4f..7f27e90bf 100644
--- a/disabled-packages/unnethack/build.sh
+++ b/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,7 +40,7 @@ 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
@@ -50,7 +50,7 @@ termux_step_post_configure () {
         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
diff --git a/packages/aapt/build.sh b/packages/aapt/build.sh
index 5312c56d5..c3d87b445 100644
--- a/packages/aapt/build.sh
+++ b/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
diff --git a/packages/abduco/build.sh b/packages/abduco/build.sh
index 332161593..b3227f187 100644
--- a/packages/abduco/build.sh
+++ b/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"
 }
diff --git a/packages/ack-grep/build.sh b/packages/ack-grep/build.sh
index 7bc2d7910..d7203cb1e 100644
--- a/packages/ack-grep/build.sh
+++ b/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 \
diff --git a/packages/alpine/build.sh b/packages/alpine/build.sh
index 1937297f8..ca74a0644 100644
--- a/packages/alpine/build.sh
+++ b/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
diff --git a/packages/angband/build.sh b/packages/angband/build.sh
index 7696dd82d..9c7cd0334 100644
--- a/packages/angband/build.sh
+++ b/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}
 }
diff --git a/packages/apache2/build.sh b/packages/apache2/build.sh
index d9a0bc36e..46becadb6 100644
--- a/packages/apache2/build.sh
+++ b/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
 
diff --git a/packages/apksigner/build.sh b/packages/apksigner/build.sh
index e8a49fb59..2194231ea 100644
--- a/packages/apksigner/build.sh
+++ b/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/
diff --git a/packages/apr/build.sh b/packages/apr/build.sh
index 4183f0747..ecf72b695 100644
--- a/packages/apr/build.sh
+++ b/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
 }
diff --git a/packages/asciinema/build.sh b/packages/asciinema/build.sh
index 77730a794..3c576c136 100644
--- a/packages/asciinema/build.sh
+++ b/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
 }
diff --git a/packages/autoconf/build.sh b/packages/autoconf/build.sh
index 1c4c57071..959422d88 100644
--- a/packages/autoconf/build.sh
+++ b/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
 }
diff --git a/packages/autossh/build.sh b/packages/autossh/build.sh
index 8e80e7b4d..67332dcdc 100644
--- a/packages/autossh/build.sh
+++ b/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"
 }
diff --git a/packages/bash/build.sh b/packages/bash/build.sh
index 8323addf9..224d3e595 100755
--- a/packages/bash/build.sh
+++ b/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 | \
diff --git a/packages/binutils/build.sh b/packages/binutils/build.sh
index 02d89c8ae..ac2081c44 100755
--- a/packages/binutils/build.sh
+++ b/packages/binutils/build.sh
@@ -12,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
@@ -22,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
diff --git a/packages/brogue/build.sh b/packages/brogue/build.sh
index 204771c8c..a9d7d63b3 100644
--- a/packages/brogue/build.sh
+++ b/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
 }
diff --git a/packages/busybox/build.sh b/packages/busybox/build.sh
index ee39f026b..da06ac73e 100755
--- a/packages/busybox/build.sh
+++ b/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
diff --git a/packages/ca-certificates/build.sh b/packages/ca-certificates/build.sh
index 046dbcc90..aa6e27b5f 100644
--- a/packages/ca-certificates/build.sh
+++ b/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
 
diff --git a/packages/cboard/build.sh b/packages/cboard/build.sh
index 27131cfd9..4831b10a9 100644
--- a/packages/cboard/build.sh
+++ b/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
diff --git a/packages/cmatrix/build.sh b/packages/cmatrix/build.sh
index 3a5ec7bdc..8c3eadd99 100644
--- a/packages/cmatrix/build.sh
+++ b/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
diff --git a/packages/cmus/build.sh b/packages/cmus/build.sh
index 7cc820e42..0f9854fb6 100644
--- a/packages/cmus/build.sh
+++ b/packages/cmus/build.sh
@@ -13,6 +13,6 @@ termux_step_pre_configure() {
 	export CONFIG_OSS=n
 }
 
-termux_step_configure () {
+termux_step_configure() {
 	./configure prefix=$TERMUX_PREFIX
 }
diff --git a/packages/command-not-found/build.sh b/packages/command-not-found/build.sh
index 0aa2cc1b6..5ca62cebb 100644
--- a/packages/command-not-found/build.sh
+++ b/packages/command-not-found/build.sh
@@ -3,7 +3,7 @@ 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 \
diff --git a/packages/corkscrew/build.sh b/packages/corkscrew/build.sh
index 6ccc219ee..2391cf6f8 100644
--- a/packages/corkscrew/build.sh
+++ b/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
diff --git a/packages/cowsay/build.sh b/packages/cowsay/build.sh
index bb5fa3262..a0c3c6dc1 100644
--- a/packages/cowsay/build.sh
+++ b/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
 }
diff --git a/packages/curseofwar/build.sh b/packages/curseofwar/build.sh
index 3e6ac1218..6caeb37fc 100644
--- a/packages/curseofwar/build.sh
+++ b/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
diff --git a/packages/dash/build.sh b/packages/dash/build.sh
index 9417bd6a0..fbd0e807e 100644
--- a/packages/dash/build.sh
+++ b/packages/dash/build.sh
@@ -7,7 +7,7 @@ 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
 	cd $TERMUX_PREFIX/bin
 	ln -sf dash sh
diff --git a/packages/dcraw/build.sh b/packages/dcraw/build.sh
index c1ce39c33..dab011272 100644
--- a/packages/dcraw/build.sh
+++ b/packages/dcraw/build.sh
@@ -7,7 +7,7 @@ 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
diff --git a/packages/dialog/build.sh b/packages/dialog/build.sh
index f647e79fd..d7c42d2af 100755
--- a/packages/dialog/build.sh
+++ b/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
diff --git a/packages/dnsutils/build.sh b/packages/dnsutils/build.sh
index a507de127..67ca38ef1 100644
--- a/packages/dnsutils/build.sh
+++ b/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
diff --git a/packages/doxygen/build.sh b/packages/doxygen/build.sh
index 14fcbf295..116fdd91a 100644
--- a/packages/doxygen/build.sh
+++ b/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
 }
diff --git a/packages/dpkg/build.sh b/packages/dpkg/build.sh
index 4325ac60e..877dabadd 100755
--- a/packages/dpkg/build.sh
+++ b/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
 }
diff --git a/packages/dropbear/build.sh b/packages/dropbear/build.sh
index ee7ac9868..37d24148f 100644
--- a/packages/dropbear/build.sh
+++ b/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"
diff --git a/packages/dx/build.sh b/packages/dx/build.sh
index 38f950227..9756cfd3e 100755
--- a/packages/dx/build.sh
+++ b/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
diff --git a/packages/ecj/build.sh b/packages/ecj/build.sh
index 10300328c..4d962a931 100755
--- a/packages/ecj/build.sh
+++ b/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 \
diff --git a/packages/ecj4.6/build.sh b/packages/ecj4.6/build.sh
index 211e74d16..c930d0303 100755
--- a/packages/ecj4.6/build.sh
+++ b/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 \
diff --git a/packages/emacs/build.sh b/packages/emacs/build.sh
index b7c13236e..ebb98482a 100644
--- a/packages/emacs/build.sh
+++ b/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/
 }
diff --git a/packages/erlang/build.sh b/packages/erlang/build.sh
index 5978eb5f4..7c8aac874 100755
--- a/packages/erlang/build.sh
+++ b/packages/erlang/build.sh
@@ -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:
diff --git a/packages/expect/build.sh b/packages/expect/build.sh
index eaae91882..de49d9aad 100644
--- a/packages/expect/build.sh
+++ b/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 .
 }
diff --git a/packages/ffmpeg/build.sh b/packages/ffmpeg/build.sh
index f224edf00..c2a001c13 100644
--- a/packages/ffmpeg/build.sh
+++ b/packages/ffmpeg/build.sh
@@ -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"
diff --git a/packages/figlet/build.sh b/packages/figlet/build.sh
index 506e0569f..f2ca827b0 100644
--- a/packages/figlet/build.sh
+++ b/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
 }
diff --git a/packages/finch/build.sh b/packages/finch/build.sh
index 5e1750fe3..aa881ba43 100644
--- a/packages/finch/build.sh
+++ b/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 .
diff --git a/packages/fish/build.sh b/packages/fish/build.sh
index a4fe78bf9..439b0b655 100644
--- a/packages/fish/build.sh
+++ b/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
diff --git a/packages/fortune/build.sh b/packages/fortune/build.sh
index c47f20c83..898036789 100644
--- a/packages/fortune/build.sh
+++ b/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
diff --git a/packages/fossil/build.sh b/packages/fossil/build.sh
index 13f5db378..31b30929a 100644
--- a/packages/fossil/build.sh
+++ b/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 \
diff --git a/packages/freetype/build.sh b/packages/freetype/build.sh
index 1b0b55a30..9e6cf45da 100644
--- a/packages/freetype/build.sh
+++ b/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/
 }
diff --git a/packages/frotz/build.sh b/packages/frotz/build.sh
index 42337f3bb..64e724a0b 100644
--- a/packages/frotz/build.sh
+++ b/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
 }
diff --git a/packages/fzf/build.sh b/packages/fzf/build.sh
index 6f8ef5580..95dbdd8aa 100644
--- a/packages/fzf/build.sh
+++ b/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
 }
diff --git a/packages/gawk/build.sh b/packages/gawk/build.sh
index d158ae8fa..447577657 100644
--- a/packages/gawk/build.sh
+++ b/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
 
diff --git a/packages/getmail/build.sh b/packages/getmail/build.sh
index def53bad8..227fce2f9 100644
--- a/packages/getmail/build.sh
+++ b/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
 }
diff --git a/packages/gettext/build.sh b/packages/gettext/build.sh
index 063f6f724..3417dde9f 100644
--- a/packages/gettext/build.sh
+++ b/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
 }
diff --git a/packages/ghostscript/build.sh b/packages/ghostscript/build.sh
index 49865bbc3..951a4ac6f 100644
--- a/packages/ghostscript/build.sh
+++ b/packages/ghostscript/build.sh
@@ -17,6 +17,6 @@ CCAUX=gcc
 --with-system-libtiff
 "
 
-termux_step_post_extract_package () {
+termux_step_post_extract_package() {
         rm -rdf $TERMUX_PKG_SRCDIR/{jpeg,libpng,expat,jasper,freetype,lcms2,tiff,openjpeg}
 }
diff --git a/packages/git-crypt/build.sh b/packages/git-crypt/build.sh
index 855b69710..b50aa53c6 100644
--- a/packages/git-crypt/build.sh
+++ b/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
 }
diff --git a/packages/git/build.sh b/packages/git/build.sh
index 64eafe6c4..9858173b6 100755
--- a/packages/git/build.sh
+++ b/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
diff --git a/packages/glib/build.sh b/packages/glib/build.sh
index 7ac3eb918..a2e0ec7b3 100755
--- a/packages/glib/build.sh
+++ b/packages/glib/build.sh
@@ -24,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__:
diff --git a/packages/glulxe/build.sh b/packages/glulxe/build.sh
index 2766ebdbb..361e5b154 100644
--- a/packages/glulxe/build.sh
+++ b/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..."
 }
diff --git a/packages/gmic/build.sh b/packages/gmic/build.sh
index c943101c1..58b368433 100644
--- a/packages/gmic/build.sh
+++ b/packages/gmic/build.sh
@@ -13,7 +13,7 @@ termux_step_configure() {
 	return 0;
 }
 
-termux_step_make () {
+termux_step_make() {
 	cd src/
 	make cli
 }
diff --git a/packages/gnugo/build.sh b/packages/gnugo/build.sh
index 975ba266c..f864cfeb4 100644
--- a/packages/gnugo/build.sh
+++ b/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
diff --git a/packages/gnushogi/build.sh b/packages/gnushogi/build.sh
index 4ecd225e4..a9b4a2974 100644
--- a/packages/gnushogi/build.sh
+++ b/packages/gnushogi/build.sh
@@ -14,7 +14,7 @@ termux_step_pre_configure() {
 	CFLAGS+=" $CPPFLAGS"
 }
 
-termux_step_post_configure () {
+termux_step_post_configure() {
 	cp $TERMUX_PKG_HOSTBUILD_DIR/gnushogi/pat2inc $TERMUX_PKG_BUILDDIR/gnushogi/pat2inc
 	# Update timestamps so that the binaries does not get rebuilt:
 	touch -d "next hour" $TERMUX_PKG_BUILDDIR/gnushogi/pat2inc
diff --git a/packages/golang/build.sh b/packages/golang/build.sh
index d8fb820dc..98924f0b1 100644
--- a/packages/golang/build.sh
+++ b/packages/golang/build.sh
@@ -9,7 +9,7 @@ TERMUX_PKG_SRCURL=https://storage.googleapis.com/golang/go${_MAJOR_VERSION}.src.
 TERMUX_PKG_KEEP_STATIC_LIBRARIES=true
 TERMUX_PKG_DEPENDS="clang"
 
-termux_step_make_install () {
+termux_step_make_install() {
 	termux_setup_golang
 
 	TERMUX_GOLANG_DIRNAME=${GOOS}_$GOARCH
@@ -37,6 +37,6 @@ termux_step_make_install () {
 	cp -Rf pkg/${TERMUX_GOLANG_DIRNAME}/* $TERMUX_GODIR/pkg/${TERMUX_GOLANG_DIRNAME}/
 }
 
-termux_step_post_massage () {
+termux_step_post_massage() {
 	find . -path '*/testdata*' -delete
 }
diff --git a/packages/gpsbabel/build.sh b/packages/gpsbabel/build.sh
index ef7b4a30e..445b454c0 100644
--- a/packages/gpsbabel/build.sh
+++ b/packages/gpsbabel/build.sh
@@ -6,6 +6,6 @@ TERMUX_PKG_SHA256=22860e913f093aa9124e295d52d1d4ae1afccaa67ed6bed6f1f8d8b0a45336
 TERMUX_PKG_SRCURL=https://github.com/gpsbabel/gpsbabel/archive/gpsbabel_${TERMUX_PKG_VERSION//./_}.tar.gz
 TERMUX_PKG_DEPENDS="libexpat"
 
-termux_step_post_extract_package () {
+termux_step_post_extract_package() {
 	TERMUX_PKG_SRCDIR+=/gpsbabel
 }
diff --git a/packages/graphviz/build.sh b/packages/graphviz/build.sh
index cdb487a64..57fc4ecd1 100644
--- a/packages/graphviz/build.sh
+++ b/packages/graphviz/build.sh
@@ -44,7 +44,7 @@ termux_step_post_make_install() {
 	done
 }
 
-termux_step_create_debscripts () {
+termux_step_create_debscripts() {
 	echo "#!$TERMUX_PREFIX/bin/sh" > postinst
 	echo "dot -c" >> postinst
 	echo "exit 0" >> postinst
diff --git a/packages/gst-plugins-base/build.sh b/packages/gst-plugins-base/build.sh
index d1a12589c..a8c1080a3 100644
--- a/packages/gst-plugins-base/build.sh
+++ b/packages/gst-plugins-base/build.sh
@@ -11,7 +11,7 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 --disable-pango
 "
 
-termux_step_post_make_install () {
+termux_step_post_make_install() {
 	for BINARY in gst-play-1.0 gst-discoverer-1.0 gst-device-monitor-1.0
 	    do	
 		echo $BINARY
diff --git a/packages/gstreamer/build.sh b/packages/gstreamer/build.sh
index d06e8fe56..fcb497e5e 100644
--- a/packages/gstreamer/build.sh
+++ b/packages/gstreamer/build.sh
@@ -8,7 +8,7 @@ TERMUX_PKG_DEPENDS="glib"
 TERMUX_PKG_DEVPACKAGE_DEPENDS="glib-dev"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-check --disable-tests --disable-examples --disable-benchmarks --with-unwind=no --with-dw=no"
 
-termux_step_post_make_install () {
+termux_step_post_make_install() {
 	for BINARY in gst-inspect-1.0 gst-stats-1.0 gst-typefind-1.0 gst-launch-1.0
 	    do	
 		echo $BINARY
diff --git a/packages/hashdeep/build.sh b/packages/hashdeep/build.sh
index 2e9e88504..2fed33625 100644
--- a/packages/hashdeep/build.sh
+++ b/packages/hashdeep/build.sh
@@ -10,7 +10,7 @@ if [ "$TERMUX_ARCH_BITS" = 32 ]; then
 	TERMUX_PKG_API_LEVEL=24
 fi
 
-termux_step_pre_configure () {
+termux_step_pre_configure() {
 	sh bootstrap.sh
 	CPPFLAGS+=" -DTERMUX_EXPOSE_FILE_OFFSET64=1"
 }
diff --git a/packages/heyu/build.sh b/packages/heyu/build.sh
index 8db777f81..473d9a08a 100644
--- a/packages/heyu/build.sh
+++ b/packages/heyu/build.sh
@@ -5,7 +5,7 @@ TERMUX_PKG_VERSION=2.11-rc3
 TERMUX_PKG_SHA256=6285f134e03688b5ec03986ef53cce463abc007281996156cac52b61cbeb58b2
 TERMUX_PKG_SRCURL=https://github.com/HeyuX10Automation/heyu/archive/v$TERMUX_PKG_VERSION.tar.gz
 
-termux_step_pre_configure () {
+termux_step_pre_configure() {
 	# rindex is an obsolete version of strrchr which is not available in Android:
 	CFLAGS+=" -Drindex=strrchr"
 	LDFLAGS+=" -llog"
diff --git a/packages/hunspell-en-us/build.sh b/packages/hunspell-en-us/build.sh
index e0deb17d5..2d5f7fa6c 100644
--- a/packages/hunspell-en-us/build.sh
+++ b/packages/hunspell-en-us/build.sh
@@ -4,7 +4,7 @@ TERMUX_PKG_LICENSE="LGPL-3.0"
 TERMUX_PKG_VERSION=2018.10.25
 TERMUX_PKG_PLATFORM_INDEPENDENT=yes
 
-termux_step_make_install () {
+termux_step_make_install() {
 	mkdir -p $TERMUX_PREFIX/share/hunspell/
 	# On checksum mismatch the files may have been updated:
 	#  https://cgit.freedesktop.org/libreoffice/dictionaries/log/en/en_US.aff
diff --git a/packages/hunspell-ru/build.sh b/packages/hunspell-ru/build.sh
index 19335b669..d5a02e388 100644
--- a/packages/hunspell-ru/build.sh
+++ b/packages/hunspell-ru/build.sh
@@ -4,7 +4,7 @@ TERMUX_PKG_LICENSE="LGPL-3.0"
 TERMUX_PKG_VERSION=2017.03.03
 TERMUX_PKG_PLATFORM_INDEPENDENT=yes
 
-termux_step_make_install () {
+termux_step_make_install() {
 	mkdir -p $TERMUX_PREFIX/share/hunspell/
 	# On checksum mismatch the files may have been updated:
 	#  https://cgit.freedesktop.org/libreoffice/dictionaries/log/ru_RU/ru_RU.aff
diff --git a/packages/iconv/build.sh b/packages/iconv/build.sh
index e51cd600a..bcc35f983 100755
--- a/packages/iconv/build.sh
+++ b/packages/iconv/build.sh
@@ -7,7 +7,7 @@ TERMUX_PKG_SHA256=ccf536620a45458d26ba83887a983b96827001e92a13847b45e4925cc89131
 # Only install the binary, not the library since we use libandroid-support for iconv functions:
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--enable-static --disable-shared"
 
-termux_step_make_install () {
+termux_step_make_install() {
 	mkdir -p $TERMUX_PREFIX/share/man/man1
 	make -C lib install # this installs libiconv.{a,la} which the below install task needs:
 	make -C src install
diff --git a/packages/inotify-tools/build.sh b/packages/inotify-tools/build.sh
index 7226d368c..a2691b9b5 100644
--- a/packages/inotify-tools/build.sh
+++ b/packages/inotify-tools/build.sh
@@ -12,11 +12,11 @@ termux_step_pre_configure() {
 	LDFLAGS+=" -llog"
 }
 
-termux_step_make () {
+termux_step_make() {
 	:
 }
 
-termux_step_make_install () {
+termux_step_make_install() {
 	# the command-line tools needs the libinotifytools installed before building
 	make -C libinotifytools install
 	make install
diff --git a/packages/ipcalc/build.sh b/packages/ipcalc/build.sh
index 3b8be2947..162d940c8 100644
--- a/packages/ipcalc/build.sh
+++ b/packages/ipcalc/build.sh
@@ -6,7 +6,7 @@ TERMUX_PKG_VERSION=0.41
 TERMUX_PKG_SRCURL=http://jodies.de/ipcalc-archive/ipcalc-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=dda9c571ce3369e5b6b06e92790434b54bec1f2b03f1c9df054c0988aa4e2e8a
 
-termux_step_make_install () {
+termux_step_make_install() {
   cp $TERMUX_PKG_SRCDIR/ipcalc $TERMUX_PREFIX/bin/
 }
 
diff --git a/packages/irssi/build.sh b/packages/irssi/build.sh
index 1273774cc..3f216be0c 100755
--- a/packages/irssi/build.sh
+++ b/packages/irssi/build.sh
@@ -7,6 +7,6 @@ TERMUX_PKG_SHA256=5ccc2b89a394e91bea0aa83a951c3b1d471c76da87b4169ec435530a31bf97
 TERMUX_PKG_SRCURL=https://github.com/irssi/irssi/releases/download/$TERMUX_PKG_VERSION/irssi-$TERMUX_PKG_VERSION.tar.xz
 TERMUX_PKG_BUILD_IN_SRC=yes
 
-termux_step_pre_configure () {
+termux_step_pre_configure() {
 	LDFLAGS+=" -landroid-glob"
 }
diff --git a/packages/jhead/build.sh b/packages/jhead/build.sh
index 0f648e21b..2000245fc 100755
--- a/packages/jhead/build.sh
+++ b/packages/jhead/build.sh
@@ -6,7 +6,7 @@ TERMUX_PKG_SHA256=82194e0128d9141038f82fadcb5845391ca3021d61bc00815078601619f6c0
 TERMUX_PKG_SRCURL=http://www.sentex.net/~mwandel/jhead/jhead-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_BUILD_IN_SRC=yes
 
-termux_step_make_install () {
+termux_step_make_install() {
 	cp jhead $TERMUX_PREFIX/bin/jhead
 	cp -f jhead.1 $TERMUX_PREFIX/share/man/man1/jhead.1
 }
diff --git a/packages/json-c/build.sh b/packages/json-c/build.sh
index 6c6f692f5..0a50302f8 100644
--- a/packages/json-c/build.sh
+++ b/packages/json-c/build.sh
@@ -6,7 +6,7 @@ TERMUX_PKG_VERSION=0.13.1
 TERMUX_PKG_SHA256=b87e608d4d3f7bfdd36ef78d56d53c74e66ab278d318b71e6002a369d36f4873
 TERMUX_PKG_SRCURL=https://s3.amazonaws.com/json-c_releases/releases/json-c-${TERMUX_PKG_VERSION}.tar.gz
 
-termux_step_make () {
+termux_step_make() {
 	make \
 		LDFLAGS="$LDFLAGS -llog"
 }
diff --git a/packages/jsoncpp/build.sh b/packages/jsoncpp/build.sh
index d7c2ea73a..760cf8042 100644
--- a/packages/jsoncpp/build.sh
+++ b/packages/jsoncpp/build.sh
@@ -11,7 +11,7 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -DCCACHE_FOUND=OFF
 "
 
-termux_step_pre_configure () {
+termux_step_pre_configure() {
 	# The installation does not overwrite symlinks such as libjsoncpp.so.1,
 	# so if rebuilding these are not detected as modified. Fix that:
 	rm -f $TERMUX_PREFIX/lib/libjsoncpp.so*
diff --git a/packages/krb5/build.sh b/packages/krb5/build.sh
index a4d4d739a..b13044a61 100644
--- a/packages/krb5/build.sh
+++ b/packages/krb5/build.sh
@@ -23,7 +23,7 @@ termux_step_post_extract_package() {
 	TERMUX_PKG_SRCDIR+="/src"
 }
 
-termux_step_pre_configure () {
+termux_step_pre_configure() {
 	# cannot test these when cross compiling
 	export krb5_cv_attr_constructor_destructor='yes,yes'
 	export ac_cv_func_regcomp='yes'
@@ -36,7 +36,7 @@ termux_step_pre_configure () {
 	LDFLAGS="$LDFLAGS -landroid-glob -llog"
 }
 
-termux_step_post_make_install () {
+termux_step_post_make_install() {
 	# Enable logging to STDERR by default
 	echo -e "\tdefault = STDERR" >> $TERMUX_PKG_SRCDIR/config-files/krb5.conf
 
diff --git a/packages/ldc/build.sh b/packages/ldc/build.sh
index 31097ea7f..ec1489417 100644
--- a/packages/ldc/build.sh
+++ b/packages/ldc/build.sh
@@ -32,7 +32,7 @@ TERMUX_PKG_KEEP_STATIC_LIBRARIES=true
 TERMUX_PKG_NO_DEVELSPLIT=yes
 TERMUX_PKG_MAINTAINER="Joakim @joakim-noah"
 
-termux_step_post_extract_package () {
+termux_step_post_extract_package() {
 	mv llvm-${TERMUX_PKG_VERSION[1]}.src llvm
 	mv tools-${TERMUX_PKG_VERSION[2]} rdmd
 	mv dub-${TERMUX_PKG_VERSION[3]} dub
@@ -48,7 +48,7 @@ termux_step_post_extract_package () {
 	chmod 755 $TERMUX_PKG_BUILDDIR/llvm-config
 }
 
-termux_step_host_build () {
+termux_step_host_build() {
 	termux_setup_cmake
 	termux_setup_ninja
 	cmake -GNinja $TERMUX_PKG_SRCDIR/llvm \
@@ -58,7 +58,7 @@ termux_step_host_build () {
 	ninja -j $TERMUX_MAKE_PROCESSES llvm-tblgen
 }
 
-termux_step_pre_configure () {
+termux_step_pre_configure() {
 	local LLVM_TARGET_ARCH
 	if [ $TERMUX_ARCH = "arm" ]; then
 		LLVM_TARGET_ARCH=ARM
@@ -86,7 +86,7 @@ termux_step_pre_configure () {
 	mkdir "$TERMUX_PKG_BUILDDIR"
 }
 
-termux_step_post_configure () {
+termux_step_post_configure() {
 	TERMUX_PKG_SRCDIR=$OLD_TERMUX_PKG_SRCDIR
 	TERMUX_PKG_BUILDDIR=$OLD_TERMUX_PKG_BUILDDIR
 	cd "$TERMUX_PKG_BUILDDIR"
@@ -106,7 +106,7 @@ termux_step_post_configure () {
 	termux_step_configure_cmake
 }
 
-termux_step_make () {
+termux_step_make() {
 	$LDC_PATH/bin/ldc-build-runtime --ninja -j $TERMUX_MAKE_PROCESSES \
 		--dFlags="$LDC_FLAGS" --cFlags="$CFLAGS -I$TERMUX_PREFIX/include" \
 		--targetSystem="Android;Linux;UNIX" --ldcSrcDir="$TERMUX_PKG_SRCDIR"
@@ -137,7 +137,7 @@ termux_step_make () {
 	$CC $TERMUX_PKG_BUILDDIR/bin/dub.o $D_LDFLAGS -o $TERMUX_PKG_BUILDDIR/bin/dub
 }
 
-termux_step_make_install () {
+termux_step_make_install() {
 	cp bin/{dub,ldc-build-runtime,ldc2,ldmd2,rdmd} $TERMUX_PREFIX/bin
 	cp $TERMUX_PKG_BUILDDIR/ldc-build-runtime.tmp/lib/lib{druntime,phobos2}*.a $TERMUX_PREFIX/lib
 	sed -i "/runtime\/druntime\/src/d" bin/ldc2.conf
diff --git a/packages/lftp/build.sh b/packages/lftp/build.sh
index bb15c1b5d..3e048802d 100644
--- a/packages/lftp/build.sh
+++ b/packages/lftp/build.sh
@@ -16,7 +16,7 @@ ac_cv_func_dn_expand=no
 TERMUX_PKG_DEPENDS="libexpat, openssl, readline, libutil, libidn2"
 TERMUX_PKG_BUILD_DEPENDS="ncurses-dev"
 
-termux_step_pre_configure () {
+termux_step_pre_configure() {
 	TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --with-zlib=$TERMUX_STANDALONE_TOOLCHAIN/sysroot/usr"
 	if [ "$TERMUX_DEBUG" == "true" ]; then
 		# When doing debug build, -D_FORTIFY_SOURCE=2 gives this error:
diff --git a/packages/libandroid-glob/build.sh b/packages/libandroid-glob/build.sh
index 42da4c6be..5a8485fc6 100644
--- a/packages/libandroid-glob/build.sh
+++ b/packages/libandroid-glob/build.sh
@@ -4,7 +4,7 @@ TERMUX_PKG_LICENSE="BSD 3-Clause"
 TERMUX_PKG_VERSION=0.4
 TERMUX_PKG_BUILD_IN_SRC=yes
 
-termux_step_make_install () {
+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
 }
diff --git a/packages/libandroid-support/build.sh b/packages/libandroid-support/build.sh
index 048142e74..aa9aa0ed7 100755
--- a/packages/libandroid-support/build.sh
+++ b/packages/libandroid-support/build.sh
@@ -7,7 +7,7 @@ TERMUX_PKG_SRCURL=https://github.com/termux/libandroid-support/archive/v${TERMUX
 TERMUX_PKG_BUILD_IN_SRC=yes
 TERMUX_PKG_ESSENTIAL=yes
 
-termux_step_make_install () {
+termux_step_make_install() {
 	# Remove files previously in package to avoid them being left
 	# in build environments.
 	rm -f $TERMUX_PREFIX/include/langinfo.h $TERMUX_PREFIX/include/iconv.h
diff --git a/packages/libbz2/build.sh b/packages/libbz2/build.sh
index a79f6816a..d4e24f60a 100644
--- a/packages/libbz2/build.sh
+++ b/packages/libbz2/build.sh
@@ -8,17 +8,17 @@ TERMUX_PKG_SRCURL=https://fossies.org/linux/misc/bzip2-${TERMUX_PKG_VERSION}.tar
 TERMUX_PKG_EXTRA_MAKE_ARGS="PREFIX=$TERMUX_PREFIX"
 TERMUX_PKG_BUILD_IN_SRC=yes
 
-termux_step_configure () {
+termux_step_configure() {
 	# bzip2 does not use configure. But place man pages at correct path:
 	sed -i "s@(PREFIX)/man@(PREFIX)/share/man@g" $TERMUX_PKG_SRCDIR/Makefile
 }
 
-termux_step_make () {
+termux_step_make() {
 	# bzip2 uses a separate makefile for the shared library
 	make -f Makefile-libbz2_so
 }
 
-termux_step_make_install () {
+termux_step_make_install() {
 	# The shared library makefile contains no install makefile, so issue a normal install to get scripts
 	make $TERMUX_PKG_EXTRA_MAKE_ARGS install
 
diff --git a/packages/libc++/build.sh b/packages/libc++/build.sh
index ee81fa049..c544c954b 100644
--- a/packages/libc++/build.sh
+++ b/packages/libc++/build.sh
@@ -9,7 +9,7 @@ TERMUX_PKG_VERSION=$TERMUX_NDK_VERSION
 # dependency on it.
 TERMUX_PKG_ESSENTIAL=yes
 
-termux_step_post_massage () {
+termux_step_post_massage() {
 	mkdir lib
 	cp $TERMUX_PREFIX/lib/libc++_shared.so lib/
 }
diff --git a/packages/libcaca/build.sh b/packages/libcaca/build.sh
index 3da1168bd..17e276535 100644
--- a/packages/libcaca/build.sh
+++ b/packages/libcaca/build.sh
@@ -10,7 +10,7 @@ TERMUX_PKG_SHA256=128b467c4ed03264c187405172a4e83049342cc8cc2f655f53a2d0ee9d3772
 TERMUX_PKG_DEPENDS="ncurses"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-python --disable-java --disable-ruby --disable-doc"
 
-termux_step_post_configure () {
+termux_step_post_configure() {
 	if [ $TERMUX_ARCH = x86_64 ]; then
 		# Remove troublesome asm usage:
 		perl -p -i -e 's/#define HAVE_FLDLN2 1//' $TERMUX_PKG_BUILDDIR/config.h
diff --git a/packages/libcrypt/build.sh b/packages/libcrypt/build.sh
index 6c92180bd..04a9b19df 100644
--- a/packages/libcrypt/build.sh
+++ b/packages/libcrypt/build.sh
@@ -5,7 +5,7 @@ TERMUX_PKG_VERSION=0.2
 TERMUX_PKG_REVISION=1
 TERMUX_PKG_DEPENDS="openssl"
 
-termux_step_make_install () {
+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
 	mkdir -p $TERMUX_PREFIX/include/
 	cp $TERMUX_PKG_BUILDER_DIR/crypt.h $TERMUX_PREFIX/include/
diff --git a/packages/libffi/build.sh b/packages/libffi/build.sh
index f8f4ff518..765e5e2e0 100755
--- a/packages/libffi/build.sh
+++ b/packages/libffi/build.sh
@@ -8,7 +8,7 @@ TERMUX_PKG_SHA256=d06ebb8e1d9a22d19e38d63fdb83954253f39bedc5d46232a05645685722ca
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-multi-os-directory"
 TERMUX_PKG_RM_AFTER_INSTALL="lib/libffi-${TERMUX_PKG_VERSION}/include"
 
-termux_step_pre_configure () {
+termux_step_pre_configure() {
 	if [ $TERMUX_ARCH = arm ]; then
 		CFLAGS+=" -fno-integrated-as"
 	fi
diff --git a/packages/libgc/build.sh b/packages/libgc/build.sh
index 2e76a6b0f..00b08128d 100644
--- a/packages/libgc/build.sh
+++ b/packages/libgc/build.sh
@@ -9,7 +9,7 @@ TERMUX_PKG_SRCURL=(https://github.com/ivmai/bdwgc/releases/download/v$TERMUX_PKG
 		   https://github.com/ivmai/libatomic_ops/releases/download/v${TERMUX_PKG_VERSION[1]}/libatomic_ops-${TERMUX_PKG_VERSION[1]}.tar.gz)
 TERMUX_PKG_RM_AFTER_INSTALL="share/gc"
 
-termux_step_post_extract_package () {
+termux_step_post_extract_package() {
 	mv libatomic_ops-${TERMUX_PKG_VERSION[1]} libatomic_ops
 	./autogen.sh
 }
diff --git a/packages/libgcrypt/build.sh b/packages/libgcrypt/build.sh
index c281f6a73..269e377f4 100755
--- a/packages/libgcrypt/build.sh
+++ b/packages/libgcrypt/build.sh
@@ -12,7 +12,7 @@ ac_cv_lib_pthread_pthread_create=yes
 --disable-jent-support
 "
 
-termux_step_pre_configure () {
+termux_step_pre_configure() {
 	# libgcrypt uses syslog, which we redirect to android logging:
 	LDFLAGS="$LDFLAGS -llog"
 
diff --git a/packages/libgpg-error/build.sh b/packages/libgpg-error/build.sh
index 2bde8d339..e2f3a2077 100755
--- a/packages/libgpg-error/build.sh
+++ b/packages/libgpg-error/build.sh
@@ -6,7 +6,7 @@ TERMUX_PKG_SHA256=cbd5ee62a8a8c88d48c158fff4fc9ead4132aacd1b4a56eb791f9f997d07e0
 TERMUX_PKG_SRCURL=https://www.gnupg.org/ftp/gcrypt/libgpg-error/libgpg-error-${TERMUX_PKG_VERSION}.tar.bz2
 TERMUX_PKG_RM_AFTER_INSTALL="share/common-lisp"
 
-termux_step_post_extract_package () {
+termux_step_post_extract_package() {
 	# Upstream only has Android definitions for platform-specific lock objects.
 	# See https://lists.gnupg.org/pipermail/gnupg-devel/2014-January/028203.html
 	# for how to generate a lock-obj header file on devices.
diff --git a/packages/libgrpc/build.sh b/packages/libgrpc/build.sh
index 0f3dce0a5..37d1a32ea 100644
--- a/packages/libgrpc/build.sh
+++ b/packages/libgrpc/build.sh
@@ -46,7 +46,7 @@ termux_step_extract_package() {
 	cp -Rf $CHECKED_OUT_FOLDER/* .
 }
 
-termux_step_host_build () {
+termux_step_host_build() {
 	termux_setup_cmake
 	termux_download https://github.com/protocolbuffers/protobuf/releases/download/v${_protoc_version}/protoc-${_protoc_version}-linux-x86_64.zip \
 			protoc-${_protoc_version}-linux-x86_64.zip \
diff --git a/packages/libhdf5/build.sh b/packages/libhdf5/build.sh
index faaba1edb..84917a86a 100755
--- a/packages/libhdf5/build.sh
+++ b/packages/libhdf5/build.sh
@@ -12,13 +12,13 @@ TERMUX_PKG_DEPENDS="libzopfli"
 TERMUX_PKG_FORCE_CMAKE=true
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="-C$TERMUX_PKG_BUILDER_DIR/$TERMUX_ARCH/TryRunResults_out.cmake "
 
-termux_step_pre_configure () {
+termux_step_pre_configure() {
 	cp $TERMUX_PKG_BUILDER_DIR/$TERMUX_ARCH/{H5Tinit.c,H5lib_settings.c} $TERMUX_PKG_BUILDDIR/
 	mkdir -p $TERMUX_PKG_BUILDDIR/shared/
 	cp $TERMUX_PKG_BUILDER_DIR/$TERMUX_ARCH/{H5Tinit.c,H5lib_settings.c} $TERMUX_PKG_BUILDDIR/shared/
 }
 
-termux_step_post_configure () {
+termux_step_post_configure() {
 	cp $TERMUX_PKG_BUILDER_DIR/$TERMUX_ARCH/{H5Tinit.c,H5lib_settings.c} $TERMUX_PKG_BUILDDIR/shared/
 }
 
diff --git a/packages/libjansson/build.sh b/packages/libjansson/build.sh
index 0fcf513c8..9afa6f8e6 100644
--- a/packages/libjansson/build.sh
+++ b/packages/libjansson/build.sh
@@ -6,6 +6,6 @@ TERMUX_PKG_SHA256=76260d30e9bbd0ef392798525e8cd7fe59a6450c54ca6135672e3cd6a16429
 TERMUX_PKG_SRCURL=https://github.com/akheron/jansson/archive/v${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_BUILD_IN_SRC=yes
 
-termux_step_pre_configure () {
+termux_step_pre_configure() {
 	autoreconf -fi
 }
diff --git a/packages/libllvm/build.sh b/packages/libllvm/build.sh
index a61540978..2b608e342 100644
--- a/packages/libllvm/build.sh
+++ b/packages/libllvm/build.sh
@@ -52,13 +52,13 @@ TERMUX_PKG_FORCE_CMAKE=yes
 TERMUX_PKG_KEEP_STATIC_LIBRARIES=true
 TERMUX_PKG_HAS_DEBUG=no
 
-termux_step_post_extract_package () {
+termux_step_post_extract_package() {
 	mv cfe-${TERMUX_PKG_VERSION}.src tools/clang
 	mv lld-${TERMUX_PKG_VERSION}.src tools/lld
 	mv openmp-${TERMUX_PKG_VERSION}.src projects/openmp
 }
 
-termux_step_host_build () {
+termux_step_host_build() {
 	termux_setup_cmake
 	cmake -G "Unix Makefiles" $TERMUX_PKG_SRCDIR \
 		-DLLVM_BUILD_TESTS=OFF \
@@ -66,7 +66,7 @@ termux_step_host_build () {
 	make -j $TERMUX_MAKE_PROCESSES clang-tblgen llvm-tblgen
 }
 
-termux_step_pre_configure () {
+termux_step_pre_configure() {
 	mkdir projects/openmp/runtime/src/android
 	cp $TERMUX_PKG_BUILDER_DIR/nl_types.h projects/openmp/runtime/src/android
 	cp $TERMUX_PKG_BUILDER_DIR/nltypes_stubs.cpp projects/openmp/runtime/src/android
@@ -90,7 +90,7 @@ termux_step_pre_configure () {
 	TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" -DLLVM_TARGET_ARCH=$LLVM_TARGET_ARCH -DLLVM_TARGETS_TO_BUILD=all"
 	TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" -DLLVM_HOST_TRIPLE=$LLVM_DEFAULT_TARGET_TRIPLE"
 }
-termux_step_post_make_install () {
+termux_step_post_make_install() {
 	if [ $TERMUX_ARCH = "arm" ]; then
 		cp ../src/projects/openmp/runtime/exports/common.min.50/include/omp.h $TERMUX_PREFIX/include
 	else
@@ -111,7 +111,7 @@ termux_step_post_make_install () {
 	done
 }
 
-termux_step_post_massage () {
+termux_step_post_massage() {
 	sed $TERMUX_PKG_BUILDER_DIR/llvm-config.in \
 		-e "s|@TERMUX_PKG_VERSION@|$TERMUX_PKG_VERSION|g" \
 		-e "s|@TERMUX_PREFIX@|$TERMUX_PREFIX|g" \
diff --git a/packages/liblua/build.sh b/packages/liblua/build.sh
index b059a10fe..5fede34c0 100644
--- a/packages/liblua/build.sh
+++ b/packages/liblua/build.sh
@@ -10,7 +10,7 @@ TERMUX_PKG_CONFLICTS=libluajit
 TERMUX_PKG_REPLACES=libluajit
 TERMUX_PKG_BUILD_DEPENDS="readline"
 
-termux_step_pre_configure () {
+termux_step_pre_configure() {
 	AR+=" rcu"
 	CFLAGS+=" -fPIC -DLUA_COMPAT_5_2 -DLUA_COMPAT_UNPACK"
 }
diff --git a/packages/libnl/build.sh b/packages/libnl/build.sh
index 82907ac05..58bd6efff 100644
--- a/packages/libnl/build.sh
+++ b/packages/libnl/build.sh
@@ -6,6 +6,6 @@ TERMUX_PKG_SHA256=b7287637ae71c6db6f89e1422c995f0407ff2fe50cecd61a312b6a9b0921f5
 TERMUX_PKG_SRCURL=https://github.com/thom311/libnl/releases/download/libnl${TERMUX_PKG_VERSION//./_}/libnl-$TERMUX_PKG_VERSION.tar.gz
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-pthreads --disable-cli"
 
-termux_step_pre_configure () {
+termux_step_pre_configure() {
 	CFLAGS+=" -Dsockaddr_storage=__kernel_sockaddr_storage"
 }
diff --git a/packages/libpixman/build.sh b/packages/libpixman/build.sh
index eb8d2ede3..197a8f1e8 100644
--- a/packages/libpixman/build.sh
+++ b/packages/libpixman/build.sh
@@ -6,7 +6,7 @@ TERMUX_PKG_SHA256=1ca19c8d4d37682adfbc42741d24977903fec1169b4153ec05bb690d4acf9f
 TERMUX_PKG_SRCURL=https://cairographics.org/releases/pixman-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-libpng"
 
-termux_step_pre_configure () {
+termux_step_pre_configure() {
 	if [ $TERMUX_ARCH = arm ]; then
 		CFLAGS+=" -fno-integrated-as"
 	fi
diff --git a/packages/libprotobuf/build.sh b/packages/libprotobuf/build.sh
index c26e966dc..57ac89f71 100755
--- a/packages/libprotobuf/build.sh
+++ b/packages/libprotobuf/build.sh
@@ -16,6 +16,6 @@ termux_step_host_build() {
 	make -j $TERMUX_MAKE_PROCESSES install
 }
 
-termux_step_post_extract_package () {
+termux_step_post_extract_package() {
 	./autogen.sh
 }
diff --git a/packages/libpulseaudio/build.sh b/packages/libpulseaudio/build.sh
index 99b512402..7c4613e13 100644
--- a/packages/libpulseaudio/build.sh
+++ b/packages/libpulseaudio/build.sh
@@ -23,7 +23,7 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-neon-opt
 ax_cv_PTHREAD_PRIO_INHERIT=no
 ac_cv_func_posix_madvise=no"
 
-termux_step_pre_configure () {
+termux_step_pre_configure() {
 	# Avoid aclocal-1.15 dependency:
 	NOCONFIGURE=1 ./bootstrap.sh
 
@@ -49,7 +49,7 @@ termux_step_pre_configure () {
 	LDFLAGS+=" -llog -landroid-glob"
 }
 
-termux_step_post_make_install () {
+termux_step_post_make_install() {
 	# Some binaries link against these:
 	cd $TERMUX_PREFIX/lib
 	for lib in pulseaudio/lib*.so* pulse-${TERMUX_PKG_VERSION}/modules/lib*.so*; do
diff --git a/packages/librsync/build.sh b/packages/librsync/build.sh
index 2661adfe2..26bb9c00b 100644
--- a/packages/librsync/build.sh
+++ b/packages/librsync/build.sh
@@ -8,12 +8,12 @@ TERMUX_PKG_DEPENDS="libbz2"
 TERMUX_PKG_BUILD_DEPENDS="libpopt"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="-DPERL_EXECUTABLE=`which perl`"
 
-termux_step_pre_configure () {
+termux_step_pre_configure() {
 	# Remove old files to ensure new timestamps on symlinks:
 	rm -Rf $TERMUX_PREFIX/lib/librsync.*
 }
 
-termux_step_post_configure () {
+termux_step_post_configure() {
 	mkdir -p $TERMUX_PREFIX/share/man/man{1,3}
 	cp $TERMUX_PKG_SRCDIR/doc/rdiff.1 $TERMUX_PREFIX/share/man/man1
 	cp $TERMUX_PKG_SRCDIR/doc/librsync.3 $TERMUX_PREFIX/share/man/man3
diff --git a/packages/libsasl/build.sh b/packages/libsasl/build.sh
index 2525af7f0..f10c5f450 100644
--- a/packages/libsasl/build.sh
+++ b/packages/libsasl/build.sh
@@ -21,13 +21,13 @@ ac_cv_header_syslog_h=no
 "
 TERMUX_PKG_RM_AFTER_INSTALL="bin/pluginviewer"
 
-termux_step_post_configure () {
+termux_step_post_configure() {
 	# Build wants to run makemd5 at build time:
 	gcc $TERMUX_PKG_SRCDIR/include/makemd5.c -o $TERMUX_PKG_BUILDDIR/include/makemd5
 	touch -d "next hour" $TERMUX_PKG_BUILDDIR/include/makemd5
 }
 
-termux_step_post_massage () {
+termux_step_post_massage() {
 	for sub in anonymous crammd5 digestmd5 plain; do
 		local base=lib/sasl2/lib${sub}
 		if [ ! -f ${base}.so ]; then
diff --git a/packages/libsndfile/build.sh b/packages/libsndfile/build.sh
index 115d9383a..f1600a0db 100644
--- a/packages/libsndfile/build.sh
+++ b/packages/libsndfile/build.sh
@@ -10,6 +10,6 @@ TERMUX_PKG_DEPENDS="libflac, libvorbis"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-sqlite --disable-alsa"
 TERMUX_PKG_RM_AFTER_INSTALL="bin/ share/man/man1/"
 
-termux_step_pre_configure () {
+termux_step_pre_configure() {
 	sh autogen.sh
 }
diff --git a/packages/libsqlite/build.sh b/packages/libsqlite/build.sh
index 2495d1f4d..07649b8fc 100755
--- a/packages/libsqlite/build.sh
+++ b/packages/libsqlite/build.sh
@@ -21,7 +21,7 @@ termux_step_pre_configure() {
 	LDFLAGS+=" -lm"
 }
 
-termux_step_post_make_install () {
+termux_step_post_make_install() {
 	mkdir -p $TERMUX_PREFIX/src/libsqlite
 	cp $TERMUX_PKG_SRCDIR/tea/generic/tclsqlite3.c $TERMUX_PREFIX/src/libsqlite/tclsqlite3.c
 }
diff --git a/packages/libtalloc/build.sh b/packages/libtalloc/build.sh
index b66bf8e64..0c2f8d2b1 100644
--- a/packages/libtalloc/build.sh
+++ b/packages/libtalloc/build.sh
@@ -6,7 +6,7 @@ TERMUX_PKG_SHA256=b185602756a628bac507fa8af8b9df92ace69d27c0add5dab93190ad7c3367
 TERMUX_PKG_SRCURL=https://www.samba.org/ftp/talloc/talloc-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_BUILD_IN_SRC="yes"
 
-termux_step_configure () {
+termux_step_configure() {
 	# Force fresh install:
 	rm -f $TERMUX_PREFIX/include/talloc.h
 
diff --git a/packages/libtermkey/build.sh b/packages/libtermkey/build.sh
index 6f264ec3a..060eefc0a 100644
--- a/packages/libtermkey/build.sh
+++ b/packages/libtermkey/build.sh
@@ -8,11 +8,11 @@ TERMUX_PKG_SHA256=6c0d87c94ab9915e76ecd313baec08dedf3bd56de83743d9aa923a081935d2
 TERMUX_PKG_DEPENDS="libunibilium"
 TERMUX_PKG_BUILD_IN_SRC=yes
 
-termux_step_make () {
+termux_step_make() {
 	return
 }
 
-termux_step_make_install () {
+termux_step_make_install() {
 	CFLAGS+=" -std=c99 -DHAVE_UNIBILIUM=1"
 	$CC $CFLAGS $CPPFLAGS -c -fPIC termkey.c -o termkey.o
 	$CC $CFLAGS $CPPFLAGS -c -fPIC driver-csi.c -o driver-csi.o
diff --git a/packages/libtool/build.sh b/packages/libtool/build.sh
index 1f7266d4e..e017340c2 100644
--- a/packages/libtool/build.sh
+++ b/packages/libtool/build.sh
@@ -10,6 +10,6 @@ TERMUX_PKG_NO_DEVELSPLIT=yes
 TERMUX_PKG_CONFLICTS="libtool-dev"
 TERMUX_PKG_REPLACES="libtool-dev"
 
-termux_step_post_make_install () {
+termux_step_post_make_install() {
 	perl -p -i -e "s|\"/bin/|\"$TERMUX_PREFIX/bin/|" $TERMUX_PREFIX/bin/{libtool,libtoolize}
 }
diff --git a/packages/libunibilium/build.sh b/packages/libunibilium/build.sh
index cd4b9e86e..af6837c55 100644
--- a/packages/libunibilium/build.sh
+++ b/packages/libunibilium/build.sh
@@ -6,11 +6,11 @@ TERMUX_PKG_SHA256=78997d38d4c8177c60d3d0c1aa8c53fd0806eb21825b7b335b1768d7116bc1
 TERMUX_PKG_SRCURL=https://github.com/mauke/unibilium/archive/v${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_BUILD_IN_SRC=yes
 
-termux_step_make () {
+termux_step_make() {
 	return
 }
 
-termux_step_make_install () {
+termux_step_make_install() {
 	CFLAGS+=" -DTERMINFO_DIRS=\"$TERMUX_PREFIX/share/terminfo/\""
 	$CC $CFLAGS -c -fPIC unibilium.c -o unibilium.o
 	$CC $CFLAGS -c -fPIC uninames.c -o uninames.o
diff --git a/packages/libutil/build.sh b/packages/libutil/build.sh
index da6e7286e..79e0ffad6 100644
--- a/packages/libutil/build.sh
+++ b/packages/libutil/build.sh
@@ -4,7 +4,7 @@ TERMUX_PKG_LICENSE="NCSA" # same as ndk-sysroot
 TERMUX_PKG_VERSION=0.4
 TERMUX_PKG_BUILD_IN_SRC=yes
 
-termux_step_make_install () {
+termux_step_make_install() {
 	CPPFLAGS+=" -std=c11 -Wall -Werror"
 	$CC $CPPFLAGS $CFLAGS -c -fPIC $TERMUX_PKG_BUILDER_DIR/pty.c -o pty.o
 	$CC -shared -fPIC $LDFLAGS -o $TERMUX_PREFIX/lib/libutil.so pty.o
diff --git a/packages/libuv/build.sh b/packages/libuv/build.sh
index 42b862b0f..3518aa3d7 100644
--- a/packages/libuv/build.sh
+++ b/packages/libuv/build.sh
@@ -5,7 +5,7 @@ TERMUX_PKG_VERSION=1.25.0
 TERMUX_PKG_SHA256=0e927ddc0f1c83899000a63e9286cac5958222f8fb5870a49b0c81804944a912
 TERMUX_PKG_SRCURL=https://dist.libuv.org/dist/v${TERMUX_PKG_VERSION}/libuv-v${TERMUX_PKG_VERSION}.tar.gz
 
-termux_step_pre_configure () {
+termux_step_pre_configure() {
 	export PLATFORM=android
 	sh autogen.sh
 }
diff --git a/packages/libvpx/build.sh b/packages/libvpx/build.sh
index 74ec3bfb7..11d76fb83 100644
--- a/packages/libvpx/build.sh
+++ b/packages/libvpx/build.sh
@@ -6,7 +6,7 @@ TERMUX_PKG_REVISION=1
 TERMUX_PKG_SHA256=1fec931eb5c94279ad219a5b6e0202358e94a93a90cfb1603578c326abfc1238
 TERMUX_PKG_SRCURL=https://github.com/webmproject/libvpx/archive/v${TERMUX_PKG_VERSION}.tar.gz
 
-termux_step_configure () {
+termux_step_configure() {
 	# Force fresh install of header files:
 	rm -Rf $TERMUX_PREFIX/include/vpx
 
diff --git a/packages/libvterm/build.sh b/packages/libvterm/build.sh
index 79ad64f99..efb4ef213 100644
--- a/packages/libvterm/build.sh
+++ b/packages/libvterm/build.sh
@@ -8,11 +8,11 @@ TERMUX_PKG_SHA256=1da101b5b5885acc83e9f84e2ac2d93d97ac85e09122af3d5dd2606d8fe93b
 TERMUX_PKG_SRCURL=https://github.com/neovim/libvterm/archive/$_COMMIT.zip
 TERMUX_PKG_BUILD_IN_SRC=yes
 
-termux_step_make () {
+termux_step_make() {
 	make src/encoding/DECdrawing.inc src/encoding/uk.inc
 }
 
-termux_step_make_install () {
+termux_step_make_install() {
 	cd $TERMUX_PKG_SRCDIR/src
 	$CC -std=c99 -shared -fPIC $LDFLAGS -o $TERMUX_PREFIX/lib/libvterm.so *.c -I../include -I.
 	cp ../include/*.h $TERMUX_PREFIX/include/
diff --git a/packages/libx264/build.sh b/packages/libx264/build.sh
index 61e447d54..ae2d5e92b 100644
--- a/packages/libx264/build.sh
+++ b/packages/libx264/build.sh
@@ -9,7 +9,7 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 --disable-swscale
 --disable-lavf"
 
-termux_step_pre_configure () {
+termux_step_pre_configure() {
 	#if [ $TERMUX_ARCH = "i686" -o $TERMUX_ARCH = "x86_64" ]; then
 	if [ $TERMUX_ARCH = "i686" ]; then
 		# Avoid text relocations on i686, see:
diff --git a/packages/libx265/build.sh b/packages/libx265/build.sh
index 4a9862a59..d395e11d7 100644
--- a/packages/libx265/build.sh
+++ b/packages/libx265/build.sh
@@ -5,7 +5,7 @@ TERMUX_PKG_VERSION=3.0
 TERMUX_PKG_SHA256=c5b9fc260cabbc4a81561a448f4ce9cad7218272b4011feabc3a6b751b2f0662
 TERMUX_PKG_SRCURL=http://ftp.videolan.org/pub/videolan/x265/x265_${TERMUX_PKG_VERSION}.tar.gz
 
-termux_step_pre_configure () {
+termux_step_pre_configure() {
 	if [ $TERMUX_ARCH = "i686" ]; then
 		# Avoid text relocations.
 		TERMUX_PKG_EXTRA_CONFIGURE_ARGS="-DENABLE_ASSEMBLY=OFF"
diff --git a/packages/libzopfli/build.sh b/packages/libzopfli/build.sh
index 077330f13..f4b586376 100644
--- a/packages/libzopfli/build.sh
+++ b/packages/libzopfli/build.sh
@@ -7,7 +7,7 @@ TERMUX_PKG_SHA256=4a570307c37172d894ec4ef93b6e8e3aacc401e78cbcc51cf85b212dbc379a
 TERMUX_PKG_SRCURL=https://github.com/google/zopfli/archive/zopfli-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_BUILD_IN_SRC=yes
 
-termux_step_post_make_install () {
+termux_step_post_make_install() {
 	make zopflipng
 	cp zopfli zopflipng $TERMUX_PREFIX/bin/
 
diff --git a/packages/lighttpd/build.sh b/packages/lighttpd/build.sh
index 66ec77816..39bcbc624 100644
--- a/packages/lighttpd/build.sh
+++ b/packages/lighttpd/build.sh
@@ -8,7 +8,7 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--with-bzip2 --with-openssl --with-pcre --with-
 TERMUX_PKG_DEPENDS="libbz2, openssl, pcre, libcrypt, libandroid-glob"
 TERMUX_PKG_RM_AFTER_INSTALL="bin/lighttpd-angel"
 
-termux_step_pre_configure () {
+termux_step_pre_configure() {
 	# liblog for syslog:
 	LDFLAGS="$LDFLAGS -llog -landroid-glob"
 }
diff --git a/packages/ltrace/build.sh b/packages/ltrace/build.sh
index 197a20df6..729c183fe 100644
--- a/packages/ltrace/build.sh
+++ b/packages/ltrace/build.sh
@@ -13,7 +13,7 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 ac_cv_host=$TERMUX_ARCH-generic-linux-gnu
 "
 
-termux_step_pre_configure () {
+termux_step_pre_configure() {
 	# rindex is an obsolete version of strrchr which is not available in Android:
 	CFLAGS+=" -Drindex=strrchr"
 	if [ "$TERMUX_ARCH" == "arm" ]; then
diff --git a/packages/luarocks/build.sh b/packages/luarocks/build.sh
index 87a9f4b91..655bf8cef 100644
--- a/packages/luarocks/build.sh
+++ b/packages/luarocks/build.sh
@@ -10,7 +10,7 @@ TERMUX_PKG_BUILD_DEPENDS="liblua-dev"
 TERMUX_PKG_BUILD_IN_SRC=yes
 TERMUX_PKG_PLATFORM_INDEPENDENT=yes
 
-termux_step_configure () {
+termux_step_configure() {
 	./configure --prefix=$TERMUX_PREFIX \
 		--with-lua=$TERMUX_PREFIX \
 		--lua-version=5.3
diff --git a/packages/lynx/build.sh b/packages/lynx/build.sh
index 7685f2121..5bd7f46f5 100644
--- a/packages/lynx/build.sh
+++ b/packages/lynx/build.sh
@@ -29,7 +29,7 @@ termux_step_pre_configure() {
 	unset LDFLAGS
 }
 
-termux_step_make_install () {
+termux_step_make_install() {
 	make uninstall
 	make install
 }
diff --git a/packages/man/build.sh b/packages/man/build.sh
index be229ca49..6f2fbed31 100644
--- a/packages/man/build.sh
+++ b/packages/man/build.sh
@@ -8,7 +8,7 @@ TERMUX_PKG_DEPENDS="less,libandroid-glob"
 TERMUX_PKG_BUILD_IN_SRC=yes
 TERMUX_PKG_RM_AFTER_INSTALL="share/examples"
 
-termux_step_pre_configure () {
+termux_step_pre_configure() {
 	LDFLAGS+=" -landroid-glob"
 	echo "PREFIX=\"$TERMUX_PREFIX\"" > configure.local
 	echo "CC=\"$CC\"" >> configure.local
@@ -22,7 +22,7 @@ termux_step_pre_configure () {
 	echo "HAVE_SQLITE3=1" >> configure.local
 }
 
-termux_step_create_debscripts () {
+termux_step_create_debscripts() {
 	echo "interest-noawait $TERMUX_PREFIX/share/man" > triggers
 	
 	echo "#!$TERMUX_PREFIX/bin/sh" >> postinst
diff --git a/packages/mariadb/build.sh b/packages/mariadb/build.sh
index 429e78c03..e9eefd9e8 100644
--- a/packages/mariadb/build.sh
+++ b/packages/mariadb/build.sh
@@ -53,7 +53,7 @@ TERMUX_PKG_MAINTAINER="Vishal Biswas @vishalbiswas"
 TERMUX_PKG_CONFLICTS="mysql"
 TERMUX_PKG_RM_AFTER_INSTALL="bin/mysqltest*"
 
-termux_step_host_build () {
+termux_step_host_build() {
 	termux_setup_cmake
 	cmake -G "Unix Makefiles" \
 		$TERMUX_PKG_SRCDIR \
@@ -62,7 +62,7 @@ termux_step_host_build () {
 	make -j $TERMUX_MAKE_PROCESSES import_executables
 }
 
-termux_step_pre_configure () {
+termux_step_pre_configure() {
 	CPPFLAGS+=" -Dushort=u_short"
 
 	if [ $TERMUX_ARCH_BITS = 32 ]; then
@@ -75,13 +75,13 @@ termux_step_pre_configure () {
 	fi
 }
 
-termux_step_post_make_install () {
+termux_step_post_make_install() {
 	# files not needed
 	rm -r $TERMUX_PREFIX/{mysql-test,sql-bench}
 	rm $TERMUX_PREFIX/share/man/man1/mysql-test-run.pl.1
 }
 
-termux_step_create_debscripts () {
+termux_step_create_debscripts() {
 	echo "if [ ! -e "$TERMUX_PREFIX/var/lib/mysql" ]; then" > postinst
 	echo "  echo 'Initializing mysql data directory...'" >> postinst
 	echo "  mkdir -p $TERMUX_PREFIX/var/lib/mysql" >> postinst
diff --git a/packages/mlocate/build.sh b/packages/mlocate/build.sh
index 72bed42cf..a8996c942 100644
--- a/packages/mlocate/build.sh
+++ b/packages/mlocate/build.sh
@@ -14,7 +14,7 @@ termux_step_pre_configure() {
 	CPPFLAGS+=" -DLINE_MAX=_POSIX2_LINE_MAX"
 }
 
-termux_step_create_debscripts () {
+termux_step_create_debscripts() {
 	echo "#!$TERMUX_PREFIX/bin/sh" > postinst
 	echo "mkdir -p $TERMUX_PREFIX/var/mlocate/" >> postinst
         echo "exit 0" >> postinst
diff --git a/packages/moon-buggy/build.sh b/packages/moon-buggy/build.sh
index b4683d7c0..f0a24f5f0 100644
--- a/packages/moon-buggy/build.sh
+++ b/packages/moon-buggy/build.sh
@@ -10,7 +10,7 @@ TERMUX_PKG_SRCURL=ftp://ftp.netbsd.org/pub/pkgsrc/distfiles/moon-buggy-${TERMUX_
 TERMUX_PKG_SHA256=352dc16ccae4c66f1e87ab071e6a4ebeb94ff4e4f744ce1b12a769d02fe5d23f
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--sharedstatedir=$TERMUX_PREFIX/var"
 
-termux_step_make_install () {
+termux_step_make_install() {
 	mkdir -p $TERMUX_PREFIX/share/man/man6
 	cp moon-buggy $TERMUX_PREFIX/bin
 	cp moon-buggy.6 $TERMUX_PREFIX/share/man/man6
diff --git a/packages/moria/build.sh b/packages/moria/build.sh
index f100a8ab1..96e33c2ef 100644
--- a/packages/moria/build.sh
+++ b/packages/moria/build.sh
@@ -15,7 +15,7 @@ termux_step_pre_configure() {
     mkdir -p $TERMUX_PREFIX/share/man/man6/
     cp $TERMUX_PKG_SRCDIR/doc/moria.man $TERMUX_PREFIX/share/man/man6/moria.6
 }
-termux_step_create_debscripts () {
+termux_step_create_debscripts() {
     # Create scores file in a debscript, so an update to the package wouldn't erease any scores
     echo "mkdir -p $TERMUX_PREFIX/var/games/moria/" > postinst
     echo "touch $TERMUX_PREFIX/var/games/moria/scores" >> postinst
diff --git a/packages/mosh/build.sh b/packages/mosh/build.sh
index 3c0699e99..fbd3a3b93 100644
--- a/packages/mosh/build.sh
+++ b/packages/mosh/build.sh
@@ -7,12 +7,12 @@ TERMUX_PKG_SHA256=da600573dfa827d88ce114e0fed30210689381bbdcff543c931e4d6a2e8512
 TERMUX_PKG_SRCURL=https://github.com/mobile-shell/mosh/releases/download/mosh-${TERMUX_PKG_VERSION}/mosh-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_DEPENDS="libandroid-support, libprotobuf, ncurses, openssl, openssh, libutil"
 
-termux_step_pre_configure () {
+termux_step_pre_configure() {
 	export PROTOC=$TERMUX_TOPDIR/libprotobuf/host-build/src/protoc
 	CXXFLAGS+=" -std=c++11" # Required by protobuf.
 }
 
-termux_step_post_make_install () {
+termux_step_post_make_install() {
 	cd $TERMUX_PREFIX/bin
 	mv mosh mosh.pl
 	$CXX $CXXFLAGS $LDFLAGS \
diff --git a/packages/mpd/build.sh b/packages/mpd/build.sh
index 10a84e6be..286ed7716 100644
--- a/packages/mpd/build.sh
+++ b/packages/mpd/build.sh
@@ -25,7 +25,7 @@ termux_step_pre_configure() {
 	rm -f $TERMUX_PREFIX/etc/mpd.conf
 }
 
-termux_step_post_make_install () {
+termux_step_post_make_install() {
 	cp -f $TERMUX_PKG_SRCDIR/doc/mpdconf.example $TERMUX_PREFIX/etc/mpd.conf
 
 	# Try to work around OpenSL ES library clashes:
diff --git a/packages/mpv/build.sh b/packages/mpv/build.sh
index 7b7ddf9fe..a4cb55d72 100644
--- a/packages/mpv/build.sh
+++ b/packages/mpv/build.sh
@@ -12,7 +12,7 @@ termux_step_pre_configure() {
 	LDFLAGS+=" -landroid-glob"
 }
 
-termux_step_make_install () {
+termux_step_make_install() {
 	cd $TERMUX_PKG_SRCDIR
 
 	./bootstrap.py
diff --git a/packages/msmtp/build.sh b/packages/msmtp/build.sh
index cfb7ef9de..c5ccef70c 100644
--- a/packages/msmtp/build.sh
+++ b/packages/msmtp/build.sh
@@ -7,7 +7,7 @@ TERMUX_PKG_SHA256=d1185c1969ed00d0e2c57dbcd5eb09a9f82156042b21309d558f761978a587
 TERMUX_PKG_SRCURL=https://marlam.de/msmtp/releases/msmtp-$TERMUX_PKG_VERSION.tar.xz
 TERMUX_PKG_DEPENDS="libgnutls, libidn"
 
-termux_step_pre_configure () {
+termux_step_pre_configure() {
 	LDFLAGS=" -llog"
 	autoreconf -if
 }
diff --git a/packages/multitail/build.sh b/packages/multitail/build.sh
index fc59931ac..9ae6f5492 100644
--- a/packages/multitail/build.sh
+++ b/packages/multitail/build.sh
@@ -8,7 +8,7 @@ TERMUX_PKG_SHA256=af1d5458a78ad3b747c5eeb135b19bdca281ce414cefdc6ea0cff6d913caa1
 TERMUX_PKG_DEPENDS="ncurses, ncurses-ui-libs, libandroid-glob"
 TERMUX_PKG_BUILD_IN_SRC=yes
 
-termux_step_pre_configure () {
+termux_step_pre_configure() {
 	CFLAGS+=" -DNCURSES_WIDECHAR"
 	LDFLAGS+=" -landroid-glob"
 }
diff --git a/packages/mutt/build.sh b/packages/mutt/build.sh
index 4721705be..fb223bf57 100644
--- a/packages/mutt/build.sh
+++ b/packages/mutt/build.sh
@@ -30,14 +30,14 @@ etc/mime.types
 "
 TERMUX_PKG_CONFFILES="etc/Muttrc"
 
-termux_step_post_configure () {
+termux_step_post_configure() {
 	# Build wants to run mutt_md5 and makedoc:
 	gcc -DHAVE_STDINT_H -DMD5UTIL $TERMUX_PKG_SRCDIR/md5.c -o $TERMUX_PKG_BUILDDIR/mutt_md5
 	gcc -DHAVE_STRERROR $TERMUX_PKG_SRCDIR/doc/makedoc.c -o $TERMUX_PKG_BUILDDIR/doc/makedoc
 	touch -d "next hour" $TERMUX_PKG_BUILDDIR/mutt_md5 $TERMUX_PKG_BUILDDIR/doc/makedoc
 }
 
-termux_step_post_make_install () {
+termux_step_post_make_install() {
 	cp $TERMUX_PKG_SRCDIR/doc/mutt.man $TERMUX_PREFIX/share/man/man1/mutt.1.man
 	mkdir -p $TERMUX_PREFIX/share/examples/mutt/
 	cp $TERMUX_PKG_SRCDIR/contrib/gpg.rc $TERMUX_PREFIX/share/examples/mutt/gpg.rc
diff --git a/packages/nano/build.sh b/packages/nano/build.sh
index ebb23fc59..bd5c3a7ef 100644
--- a/packages/nano/build.sh
+++ b/packages/nano/build.sh
@@ -23,7 +23,7 @@ termux_step_pre_configure() {
 	fi
 }
 
-termux_step_post_make_install () {
+termux_step_post_make_install() {
 	# Configure nano to use syntax highlighting:
 	NANORC=$TERMUX_PREFIX/etc/nanorc
 	echo include \"$TERMUX_PREFIX/share/nano/\*nanorc\" > $NANORC
diff --git a/packages/ncdc/build.sh b/packages/ncdc/build.sh
index 667ddb17d..e751ea92b 100644
--- a/packages/ncdc/build.sh
+++ b/packages/ncdc/build.sh
@@ -9,7 +9,7 @@ TERMUX_PKG_DEPENDS="libandroid-support, libgnutls, libsqlite, bzip2, glib, ncurs
 TERMUX_PKG_BUILD_DEPENDS="libbz2-dev, libnettle-dev, libidn-dev"
 TERMUX_PKG_BUILD_IN_SRC="yes"
 
-termux_step_post_configure () {
+termux_step_post_configure() {
 	# Cross compiling steps documented in ncdc README
 	gcc $TERMUX_PKG_SRCDIR/deps/makeheaders.c -o makeheaders
 	gcc -I. $TERMUX_PKG_SRCDIR/doc/gendoc.c -o gendoc
diff --git a/packages/ncurses/build.sh b/packages/ncurses/build.sh
index 0143ddffd..e1428e0a2 100755
--- a/packages/ncurses/build.sh
+++ b/packages/ncurses/build.sh
@@ -44,7 +44,7 @@ termux_step_pre_configure() {
 	TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --with-pkg-config-libdir=$PKG_CONFIG_LIBDIR"
 }
 
-termux_step_post_make_install () {
+termux_step_post_make_install() {
 	cd $TERMUX_PREFIX/lib
 	# we need the rm as we create(d) symlinks for the versioned so as well
 	for lib in form menu ncurses panel; do
@@ -68,7 +68,7 @@ termux_step_post_make_install () {
 	ln -s ../{ncurses.h,termcap.h,panel.h,unctrl.h,menu.h,form.h,tic.h,nc_tparm.h,term.h,eti.h,term_entry.h,ncurses_dll.h,curses.h} ncursesw
 }
 
-termux_step_post_massage () {
+termux_step_post_massage() {
 	# Strip away 30 years of cruft to decrease size.
 	local TI=$TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/share/terminfo
 	mv $TI $TERMUX_PKG_TMPDIR/full-terminfo
diff --git a/packages/ndk-multilib/build.sh b/packages/ndk-multilib/build.sh
index 2e6ad4e75..a0ac9dbca 100644
--- a/packages/ndk-multilib/build.sh
+++ b/packages/ndk-multilib/build.sh
@@ -7,7 +7,7 @@ TERMUX_PKG_NO_DEVELSPLIT=yes
 TERMUX_PKG_KEEP_STATIC_LIBRARIES="true"
 TERMUX_PKG_PLATFORM_INDEPENDENT=true
 
-prepare_libs () {
+prepare_libs() {
 	local ARCH="$1"
 	local SUFFIX="$2"
 	local NDK_SUFFIX=$SUFFIX
@@ -31,7 +31,7 @@ prepare_libs () {
 	cp $LIBGCC/libgcc.a $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/$SUFFIX/lib/
 }
 
-termux_step_extract_into_massagedir () {
+termux_step_extract_into_massagedir() {
 	prepare_libs "arm" "arm-linux-androideabi"
 	prepare_libs "arm64" "aarch64-linux-android"
 	prepare_libs "x86" "i686-linux-android"
diff --git a/packages/ndk-stl/build.sh b/packages/ndk-stl/build.sh
index 901b362fb..daa1b0f08 100644
--- a/packages/ndk-stl/build.sh
+++ b/packages/ndk-stl/build.sh
@@ -5,7 +5,7 @@ TERMUX_PKG_VERSION=$TERMUX_NDK_VERSION
 TERMUX_PKG_REVISION=4
 TERMUX_PKG_NO_DEVELSPLIT=yes
 
-termux_step_extract_into_massagedir () {
+termux_step_extract_into_massagedir() {
 	mkdir -p $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/include/c++/v1/
 	cp -Rf $TERMUX_STANDALONE_TOOLCHAIN/include/c++/4.9.x/* $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/include/c++/v1/
 
@@ -17,6 +17,6 @@ termux_step_extract_into_massagedir () {
 	sed "s%\@TERMUX_HOST_PLATFORM\@%${TERMUX_HOST_PLATFORM}%g" $TERMUX_SCRIPTDIR/ndk-patches/cstddef.cpppatch | patch -p1 -R
 }
 
-termux_step_massage () {
+termux_step_massage() {
 	echo "overriding termux_step_massage to avoid removing header files"
 }
diff --git a/packages/ndk-sysroot/build.sh b/packages/ndk-sysroot/build.sh
index a916584ef..ea588d8c7 100644
--- a/packages/ndk-sysroot/build.sh
+++ b/packages/ndk-sysroot/build.sh
@@ -10,7 +10,7 @@ TERMUX_PKG_KEEP_STATIC_LIBRARIES="true"
 TERMUX_PKG_CONFLICTS="libutil-dev, libgcc, libandroid-support-dev"
 TERMUX_PKG_REPLACES="libutil-dev, libgcc, libandroid-support-dev"
 
-termux_step_extract_into_massagedir () {
+termux_step_extract_into_massagedir() {
 	mkdir -p $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/lib/pkgconfig \
 		$TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/include
 
diff --git a/packages/neovim/build.sh b/packages/neovim/build.sh
index e53a2fd66..1d0e4a8a8 100644
--- a/packages/neovim/build.sh
+++ b/packages/neovim/build.sh
@@ -20,7 +20,7 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 "
 TERMUX_PKG_CONFFILES="share/nvim/sysinit.vim"
 
-termux_step_host_build () {
+termux_step_host_build() {
 	termux_setup_cmake
 
 	mkdir -p $TERMUX_PKG_HOSTBUILD_DIR/deps
@@ -34,7 +34,7 @@ termux_step_host_build () {
 	rm -Rf build/
 }
 
-termux_step_post_make_install () {
+termux_step_post_make_install() {
 	local _CONFIG_DIR=$TERMUX_PREFIX/share/nvim
 	mkdir -p $_CONFIG_DIR
 	cp $TERMUX_PKG_BUILDER_DIR/sysinit.vim $_CONFIG_DIR/
diff --git a/packages/net-tools/build.sh b/packages/net-tools/build.sh
index b8852fbe4..c575aaf3c 100644
--- a/packages/net-tools/build.sh
+++ b/packages/net-tools/build.sh
@@ -12,13 +12,13 @@ TERMUX_PKG_SRCURL=https://dl.bintray.com/termux/upstream/net-tools-code-${commit
 TERMUX_PKG_BUILD_IN_SRC=true
 TERMUX_PKG_EXTRA_MAKE_ARGS="BINDIR=$TERMUX_PREFIX/bin SBINDIR=$TERMUX_PREFIX/bin HAVE_HOSTNAME_TOOLS=0"
 
-termux_step_configure () {
+termux_step_configure() {
 	CFLAGS="$CFLAGS -D_LINUX_IN6_H -Dindex=strchr -Drindex=strrchr"
 	LDFLAGS="$LDFLAGS -llog"
 	sed -i "s#/usr#$TERMUX_PREFIX#" $TERMUX_PKG_SRCDIR/man/Makefile
 	yes "" | make config || true
 }
 
-termux_step_make_install () {
+termux_step_make_install() {
 	make $TERMUX_PKG_EXTRA_MAKE_ARGS update
 }
diff --git a/packages/netpbm/build.sh b/packages/netpbm/build.sh
index 5c93f929e..c8f643609 100644
--- a/packages/netpbm/build.sh
+++ b/packages/netpbm/build.sh
@@ -11,7 +11,7 @@ TERMUX_PKG_SRCURL=https://dl.bintray.com/termux/upstream/netpbm-advanced-r${TERM
 TERMUX_PKG_DEPENDS="libpng, libxml2, libjpeg-turbo, libtiff"
 TERMUX_PKG_BUILD_IN_SRC=yes
 
-termux_step_configure () {
+termux_step_configure() {
 	# Put the android libpng-config script in the path (before the host one):
 	TERMUX_PKG_LIBPNG_CONFIG_DIR=$TERMUX_PKG_TMPDIR/libpng-config
 	mkdir -p $TERMUX_PKG_LIBPNG_CONFIG_DIR
@@ -42,7 +42,7 @@ termux_step_configure () {
 	cp $TERMUX_PKG_BUILDER_DIR/standardppmdfont.c lib/
 }
 
-termux_step_make_install () {
+termux_step_make_install() {
 	rm -Rf /tmp/netpbm
 	make -j 1 package pkgdir=/tmp/netpbm
 	./installnetpbm
diff --git a/packages/nginx/build.sh b/packages/nginx/build.sh
index 846a9bdde..011752483 100644
--- a/packages/nginx/build.sh
+++ b/packages/nginx/build.sh
@@ -10,7 +10,7 @@ TERMUX_PKG_CONFFILES="etc/nginx/fastcgi.conf etc/nginx/fastcgi_params etc/nginx/
 etc/nginx/mime.types etc/nginx/nginx.conf etc/nginx/scgi_params etc/nginx/uwsgi_params etc/nginx/win-utf"
 TERMUX_PKG_MAINTAINER="Vishal Biswas @vishalbiswas"
 
-termux_step_pre_configure () {
+termux_step_pre_configure() {
 	CPPFLAGS="$CPPFLAGS -DIOV_MAX=1024"
 	LDFLAGS="$LDFLAGS -landroid-glob"
 
@@ -18,7 +18,7 @@ termux_step_pre_configure () {
 	rm -rf "$TERMUX_PREFIX/etc/nginx"
 }
 
-termux_step_configure () {
+termux_step_configure() {
 	DEBUG_FLAG=""
 	test -n "$TERMUX_DEBUG" && DEBUG_FLAG="--with-debug"
 
@@ -52,7 +52,7 @@ termux_step_configure () {
 		$DEBUG_FLAG
 }
 
-termux_step_post_make_install () {
+termux_step_post_make_install() {
 	# many parts are taken directly from Arch PKGBUILD
 	# https://git.archlinux.org/svntogit/packages.git/tree/trunk/PKGBUILD?h=packages/nginx
 
@@ -80,7 +80,7 @@ termux_step_post_make_install () {
 	cp "$TERMUX_PKG_SRCDIR/man/nginx.8" "$TERMUX_PREFIX/share/man/man8/"
 }
 
-termux_step_post_massage () {
+termux_step_post_massage() {
 	# keep empty dirs which were deleted in massage
 	mkdir -p "$TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/var/log/nginx"
 	for dir in client-body proxy fastcgi scgi uwsgi; do
diff --git a/packages/ninja/build.sh b/packages/ninja/build.sh
index 7a4e67e44..e19dc7a83 100644
--- a/packages/ninja/build.sh
+++ b/packages/ninja/build.sh
@@ -6,15 +6,15 @@ TERMUX_PKG_REVISION=1
 TERMUX_PKG_SHA256=86b8700c3d0880c2b44c2ff67ce42774aaf8c28cbf57725cb881569288c1c6f4
 TERMUX_PKG_SRCURL=https://github.com/ninja-build/ninja/archive/v${TERMUX_PKG_VERSION}.tar.gz
 
-termux_step_configure () {
+termux_step_configure() {
 	$TERMUX_PKG_SRCDIR/configure.py
 }
 
-termux_step_make () {
+termux_step_make() {
 	termux_setup_ninja
 	ninja -j $TERMUX_MAKE_PROCESSES
 }
 
-termux_step_make_install () {
+termux_step_make_install() {
 	cp ninja $TERMUX_PREFIX/bin
 }
diff --git a/packages/nmap/build.sh b/packages/nmap/build.sh
index 514bd4163..0d04fb86f 100644
--- a/packages/nmap/build.sh
+++ b/packages/nmap/build.sh
@@ -14,7 +14,7 @@ TERMUX_PKG_DEPENDS="libpcap, pcre, openssl, resolv-conf, netcat, liblua, libssh2
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--enable-static --with-liblua=$TERMUX_PREFIX --without-nmap-update --without-zenmap --without-ndiff"
 TERMUX_PKG_BUILD_IN_SRC="yes"
 
-termux_step_post_make_install () {
+termux_step_post_make_install() {
 	# Setup 'netcat' and 'nc' as symlink to 'ncat', since the other netcat implementations
 	# are outdated (gnu-netcat) or non-portable (openbsd-netcat).
 	for prog in netcat nc; do
diff --git a/packages/nodejs-lts/build.sh b/packages/nodejs-lts/build.sh
index e73b80520..1d303d21f 100644
--- a/packages/nodejs-lts/build.sh
+++ b/packages/nodejs-lts/build.sh
@@ -12,7 +12,7 @@ TERMUX_PKG_RM_AFTER_INSTALL="lib/node_modules/npm/html lib/node_modules/npm/make
 TERMUX_PKG_BUILD_IN_SRC=yes
 TERMUX_PKG_CONFLICTS="nodejs"
 
-termux_step_configure () {
+termux_step_configure() {
 	local DEST_CPU
 	if [ $TERMUX_ARCH = "arm" ]; then
 		DEST_CPU="arm"
diff --git a/packages/nodejs/build.sh b/packages/nodejs/build.sh
index c2fb6bcfa..23f345540 100644
--- a/packages/nodejs/build.sh
+++ b/packages/nodejs/build.sh
@@ -13,7 +13,7 @@ TERMUX_PKG_BUILD_IN_SRC=yes
 TERMUX_PKG_CONFLICTS="nodejs-lts, nodejs-current"
 TERMUX_PKG_REPLACES="nodejs-current"
 
-termux_step_configure () {
+termux_step_configure() {
 	local DEST_CPU
 	if [ $TERMUX_ARCH = "arm" ]; then
 		DEST_CPU="arm"
diff --git a/packages/notmuch/build.sh b/packages/notmuch/build.sh
index c6f65974b..9d095a657 100644
--- a/packages/notmuch/build.sh
+++ b/packages/notmuch/build.sh
@@ -7,7 +7,7 @@ TERMUX_PKG_SRCURL=https://notmuchmail.org/releases/notmuch-${TERMUX_PKG_VERSION}
 TERMUX_PKG_BUILD_IN_SRC=yes
 TERMUX_PKG_DEPENDS="glib, libgmime, libtalloc, libxapian"
 
-termux_step_configure () {
+termux_step_configure() {
 	# Use python3 so that the python3-sphinx package is
 	# found for man page generation.
 	export PYTHON=python3
diff --git a/packages/nzbget/build.sh b/packages/nzbget/build.sh
index 92f57cbec..f8600570a 100644
--- a/packages/nzbget/build.sh
+++ b/packages/nzbget/build.sh
@@ -8,7 +8,7 @@ TERMUX_PKG_SHA256=04dc36d432549c33d55145ecd95cc4309b3ab4a7731a1a03d954de389eacd0
 TERMUX_PKG_DEPENDS="libxml2, ncurses, openssl, unrar, p7zip"
 TERMUX_PKG_BUILD_IN_SRC=yes
 
-termux_step_create_debscripts () {
+termux_step_create_debscripts() {
 	echo "#!$TERMUX_PREFIX/bin/sh" > postinst
 	echo "if [ -z \"\$2\" ]; then" >> postinst # Run only on fresh install, not on upgrade
 	echo "sed -e 's|^\(CertStore=\).*|\1$TERMUX_PREFIX/etc/tls/cert.pem|g" >> postinst
diff --git a/packages/oathtool/build.sh b/packages/oathtool/build.sh
index 1b3a8f0bd..fd1cd49a5 100644
--- a/packages/oathtool/build.sh
+++ b/packages/oathtool/build.sh
@@ -8,7 +8,7 @@ TERMUX_PKG_SHA256=b03446fa4b549af5ebe4d35d7aba51163442d255660558cd861ebce536824a
 TERMUX_PKG_DEPENDS="xmlsec"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-pam"
 
-termux_step_pre_configure () {
+termux_step_pre_configure() {
 	if [ "$TERMUX_DEBUG" == "true" ]; then
 		# When doing debug build, -D_FORTIFY_SOURCE=2 gives this error:
 		# /home/builder/.termux-build/oathtool/src/liboath/usersfile.c:482:46: error: 'umask' called with invalid mode
diff --git a/packages/openjpeg/build.sh b/packages/openjpeg/build.sh
index 1e592412e..4fbb325f2 100644
--- a/packages/openjpeg/build.sh
+++ b/packages/openjpeg/build.sh
@@ -6,7 +6,7 @@ TERMUX_PKG_REVISION=1
 TERMUX_PKG_SHA256=3dc787c1bb6023ba846c2a0d9b1f6e179f1cd255172bde9eb75b01f1e6c7d71a
 TERMUX_PKG_SRCURL=https://github.com/uclouvain/openjpeg/archive/v${TERMUX_PKG_VERSION}.tar.gz
 
-termux_step_pre_configure () {
+termux_step_pre_configure() {
 	# Force symlinks to be overwritten:
 	rm -Rf $TERMUX_PREFIX/lib/libopenjp2.so*
 }
diff --git a/packages/openssh/build.sh b/packages/openssh/build.sh
index d8104ce30..079e9a19f 100644
--- a/packages/openssh/build.sh
+++ b/packages/openssh/build.sh
@@ -61,7 +61,7 @@ termux_step_post_configure() {
 	rm -Rf $TERMUX_PREFIX/etc/moduli
 }
 
-termux_step_post_make_install () {
+termux_step_post_make_install() {
 	# "PrintMotd no" is due to our login program already showing it.
 	# OpenSSH 7.0 disabled ssh-dss by default, keep it for a while in Termux:
 	echo -e "PrintMotd no\nPasswordAuthentication yes\nPubkeyAcceptedKeyTypes +ssh-dss\nSubsystem sftp $TERMUX_PREFIX/libexec/sftp-server" > $TERMUX_PREFIX/etc/ssh/sshd_config
@@ -82,7 +82,7 @@ termux_step_post_make_install () {
 	cp $TERMUX_PKG_SRCDIR/moduli $TERMUX_PREFIX/etc/ssh/moduli
 }
 
-termux_step_post_massage () {
+termux_step_post_massage() {
 	# Verify that we have man pages packaged (#1538).
 	local manpage
 	for manpage in ssh-keyscan.1 ssh-add.1 scp.1 ssh-agent.1 ssh.1; do
@@ -92,7 +92,7 @@ termux_step_post_massage () {
 	done
 }
 
-termux_step_create_debscripts () {
+termux_step_create_debscripts() {
 	echo "#!$TERMUX_PREFIX/bin/sh" > postinst
 	echo "mkdir -p \$HOME/.ssh" >> postinst
 	echo "touch \$HOME/.ssh/authorized_keys" >> postinst
diff --git a/packages/openssh/source-ssh-agent.sh b/packages/openssh/source-ssh-agent.sh
index 3051c869f..07d0965ef 100755
--- a/packages/openssh/source-ssh-agent.sh
+++ b/packages/openssh/source-ssh-agent.sh
@@ -9,7 +9,7 @@ fi
 
 export SSH_AUTH_SOCK=$PREFIX/tmp/ssh-agent
 
-start_agent () {
+start_agent() {
         rm -f $SSH_AUTH_SOCK
         ssh-agent -a $SSH_AUTH_SOCK > /dev/null
         ssh-add
diff --git a/packages/openssl/build.sh b/packages/openssl/build.sh
index 5995f7655..d3bce04d2 100755
--- a/packages/openssl/build.sh
+++ b/packages/openssl/build.sh
@@ -9,7 +9,7 @@ TERMUX_PKG_RM_AFTER_INSTALL="bin/c_rehash etc/ssl/misc"
 TERMUX_PKG_BUILD_IN_SRC=yes
 TERMUX_PKG_CONFLICTS="libcurl (<< 7.61.0-1)"
 
-termux_step_configure () {
+termux_step_configure() {
 	CFLAGS+=" -DNO_SYSLOG"
 	if [ $TERMUX_ARCH = arm ]; then
 		CFLAGS+=" -fno-integrated-as"
@@ -34,12 +34,12 @@ termux_step_configure () {
 		no-tests
 }
 
-termux_step_make () {
+termux_step_make() {
 	make depend
 	make -j $TERMUX_MAKE_PROCESSES all
 }
 
-termux_step_make_install () {
+termux_step_make_install() {
 	# "install_sw" instead of "install" to not install man pages:
 	make -j 1 install_sw MANDIR=$TERMUX_PREFIX/share/man MANSUFFIX=.ssl
 
diff --git a/packages/optipng/build.sh b/packages/optipng/build.sh
index fcc2771e8..d37028a5b 100644
--- a/packages/optipng/build.sh
+++ b/packages/optipng/build.sh
@@ -8,6 +8,6 @@ TERMUX_PKG_DEPENDS="libpng"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--with-system-zlib --with-system-libpng --mandir=$TERMUX_PREFIX/share/man"
 TERMUX_PKG_BUILD_IN_SRC=yes
 
-termux_step_pre_configure () {
+termux_step_pre_configure() {
 	LD=$CC
 }
diff --git a/packages/p7zip/build.sh b/packages/p7zip/build.sh
index 0db6d9852..5aef266f0 100644
--- a/packages/p7zip/build.sh
+++ b/packages/p7zip/build.sh
@@ -8,16 +8,16 @@ TERMUX_PKG_SHA256=5eb20ac0e2944f6cb9c2d51dd6c4518941c185347d4089ea89087ffdd6e234
 TERMUX_PKG_SRCURL=https://downloads.sourceforge.net/project/p7zip/p7zip/${TERMUX_PKG_VERSION}/p7zip_${TERMUX_PKG_VERSION}_src_all.tar.bz2
 TERMUX_PKG_BUILD_IN_SRC=yes
 
-termux_step_configure () {
+termux_step_configure() {
 	export CXXFLAGS="$CXXFLAGS -Wno-c++11-narrowing"
 	cp makefile.android_arm makefile.machine
 }
 
-termux_step_make () {
+termux_step_make() {
 	LD="$CC $LDFLAGS" CC="$CC $CFLAGS $CPPFLAGS $LDFLAGS" \
 		make -j $TERMUX_MAKE_PROCESSES all3 OPTFLAGS="${CXXFLAGS}" DEST_HOME=$TERMUX_PREFIX
 }
 
-termux_step_make_install () {
+termux_step_make_install() {
 	make install DEST_HOME=$TERMUX_PREFIX DEST_MAN=$TERMUX_PREFIX/share/man
 }
diff --git a/packages/parted/build.sh b/packages/parted/build.sh
index ceab0a763..f744646ed 100644
--- a/packages/parted/build.sh
+++ b/packages/parted/build.sh
@@ -9,6 +9,6 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 --disable-device-mapper
 "
 
-termux_step_pre_configure () {
+termux_step_pre_configure() {
     CFLAGS+=" -Wno-gnu-designator"
 }
diff --git a/packages/pastebinit/build.sh b/packages/pastebinit/build.sh
index 0d8b00d54..c2dce2fc6 100644
--- a/packages/pastebinit/build.sh
+++ b/packages/pastebinit/build.sh
@@ -8,7 +8,7 @@ TERMUX_PKG_DEPENDS="python"
 TERMUX_PKG_BUILD_IN_SRC=yes
 TERMUX_PKG_PLATFORM_INDEPENDENT=yes
 
-termux_step_make_install () {
+termux_step_make_install() {
         cp pastebinit $TERMUX_PREFIX/bin/
 	xsltproc -''-nonet /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/manpages/docbook.xsl pastebinit.xml
 	cp pastebinit.1 $TERMUX_PREFIX/share/man/man1/
diff --git a/packages/patchelf/build.sh b/packages/patchelf/build.sh
index 2c5c17d03..5d0b785a4 100644
--- a/packages/patchelf/build.sh
+++ b/packages/patchelf/build.sh
@@ -8,6 +8,6 @@ TERMUX_PKG_SHA256=fbf494896e3bb8cef9c47b8c3f4d6d387ab19ff4161b61a8fafbcf7395f960
 TERMUX_PKG_SRCURL=https://github.com/NixOS/patchelf/archive/29c085fd9d3fc972f75b3961905d6b4ecce7eb2b.zip
 TERMUX_PKG_BUILD_IN_SRC=yes
 
-termux_step_pre_configure () {
+termux_step_pre_configure() {
 	./bootstrap.sh
 }
diff --git a/packages/pathpicker/build.sh b/packages/pathpicker/build.sh
index cb962b6ab..cf72a4479 100644
--- a/packages/pathpicker/build.sh
+++ b/packages/pathpicker/build.sh
@@ -8,7 +8,7 @@ TERMUX_PKG_DEPENDS="bash,python"
 TERMUX_PKG_BUILD_IN_SRC=yes
 TERMUX_PKG_PLATFORM_INDEPENDENT=yes
 
-termux_step_make_install () {
+termux_step_make_install() {
 	_PKG_DIR=$TERMUX_PREFIX/share/pathpicker
 	rm -Rf $_PKG_DIR
 	mkdir -p $_PKG_DIR
diff --git a/packages/perl/build.sh b/packages/perl/build.sh
index 76227f06a..9b468d151 100644
--- a/packages/perl/build.sh
+++ b/packages/perl/build.sh
@@ -12,7 +12,7 @@ TERMUX_MAKE_PROCESSES=1
 TERMUX_PKG_RM_AFTER_INSTALL="bin/perl${TERMUX_PKG_VERSION}"
 TERMUX_PKG_NO_DEVELSPLIT=yes
 
-termux_step_post_extract_package () {
+termux_step_post_extract_package() {
 	# This port uses perl-cross: http://arsv.github.io/perl-cross/
 	cp -rf perl-cross-${TERMUX_PKG_VERSION[1]}/* .
 
@@ -22,7 +22,7 @@ termux_step_post_extract_package () {
 	rm -f $TERMUX_PREFIX/include/perl
 }
 
-termux_step_configure () {
+termux_step_configure() {
 	export PATH=$PATH:$TERMUX_STANDALONE_TOOLCHAIN/bin
 
 	ORIG_AR=$AR; unset AR
@@ -54,7 +54,7 @@ termux_step_configure () {
 		-Duseshrplib
 }
 
-termux_step_post_make_install () {
+termux_step_post_make_install() {
 	# Replace hardlinks with symlinks:
 	cd $TERMUX_PREFIX/share/man/man1
 	rm perlbug.1
diff --git a/packages/pforth/build.sh b/packages/pforth/build.sh
index b221d7812..74a1058a7 100644
--- a/packages/pforth/build.sh
+++ b/packages/pforth/build.sh
@@ -7,13 +7,13 @@ TERMUX_PKG_SHA256=3cf472bb944aa53b0eb0b93d021c8c2c0eff18dd2e3e54daddaf4af342e441
 TERMUX_PKG_SRCURL=https://github.com/philburk/pforth/archive/${_COMMIT}.zip
 TERMUX_PKG_HOSTBUILD=yes
 
-termux_step_post_configure () {
+termux_step_post_configure() {
 	# Avoid caching the host build as it differs between arches
 	# and is quite fast here anyway:
 	rm -Rf $TERMUX_PKG_HOSTBUILD_DIR
 }
 
-termux_step_host_build () {
+termux_step_host_build() {
 	local M32=""
 	if [ $TERMUX_ARCH_BITS = "32" ]; then
 		M32="-m32"
@@ -24,7 +24,7 @@ termux_step_host_build () {
 	CC="gcc $M32" make all
 }
 
-termux_step_pre_configure () {
+termux_step_pre_configure() {
 	for file in pfdicdat.h pforth; do
 		cp $TERMUX_PKG_HOSTBUILD_DIR/build/unix/$file $TERMUX_PKG_SRCDIR/build/unix/$file
 		touch -d "next hour" $TERMUX_PKG_SRCDIR/build/unix/$file
@@ -33,6 +33,6 @@ termux_step_pre_configure () {
 	export TERMUX_PKG_BUILDDIR=$TERMUX_PKG_SRCDIR/build/unix
 	export CC="$CC $CFLAGS"
 }
-termux_step_make_install () {
+termux_step_make_install() {
 	cp $TERMUX_PKG_BUILDDIR/pforth_standalone $TERMUX_PREFIX/bin/pforth
 }
diff --git a/packages/php/build.sh b/packages/php/build.sh
index 9dde61e2e..e1d333714 100644
--- a/packages/php/build.sh
+++ b/packages/php/build.sh
@@ -47,7 +47,7 @@ ac_cv_func_res_nsearch=no
 --sbindir=$TERMUX_PREFIX/bin
 "
 
-termux_step_pre_configure () {
+termux_step_pre_configure() {
 	LDFLAGS+=" -landroid-glob -llog"
 
 	export PATH=$PATH:$TERMUX_PKG_HOSTBUILD_DIR/sapi/cli/
@@ -59,14 +59,14 @@ termux_step_pre_configure () {
 	export EXTENSION_DIR=$TERMUX_PREFIX/lib/php
 }
 
-termux_step_post_configure () {
+termux_step_post_configure() {
 	# Avoid src/ext/gd/gd.c trying to include <X11/xpm.h>:
 	sed -i 's/#define HAVE_GD_XPM 1//' $TERMUX_PKG_BUILDDIR/main/php_config.h
 	# Avoid src/ext/standard/dns.c trying to use struct __res_state:
 	sed -i 's/#define HAVE_RES_NSEARCH 1//' $TERMUX_PKG_BUILDDIR/main/php_config.h
 }
 
-termux_step_post_make_install () {
+termux_step_post_make_install() {
 	mkdir -p $TERMUX_PREFIX/etc/php-fpm.d
 	cp sapi/fpm/php-fpm.conf $TERMUX_PREFIX/etc/
 	cp sapi/fpm/www.conf $TERMUX_PREFIX/etc/php-fpm.d/
diff --git a/packages/picolisp/build.sh b/packages/picolisp/build.sh
index 6d614af01..309a81731 100644
--- a/packages/picolisp/build.sh
+++ b/packages/picolisp/build.sh
@@ -33,7 +33,7 @@ termux_step_pre_configure() {
 	CFLAGS+=" -c $LDFLAGS $CPPFLAGS"
 }
 
-termux_step_make_install () {
+termux_step_make_install() {
 	cd $TERMUX_PKG_SRCDIR/
 
 	if [ $TERMUX_ARCH_BITS = "64" ]; then
diff --git a/packages/pkg-config/build.sh b/packages/pkg-config/build.sh
index 7a480f7de..b94e9970b 100644
--- a/packages/pkg-config/build.sh
+++ b/packages/pkg-config/build.sh
@@ -7,6 +7,6 @@ TERMUX_PKG_SHA256=6fc69c01688c9458a57eb9a1664c9aba372ccda420a02bf4429fe610e7e7d5
 TERMUX_PKG_DEPENDS="glib"
 TERMUX_PKG_RM_AFTER_INSTALL="bin/*-pkg-config"
 
-termux_step_pre_configure () {
+termux_step_pre_configure() {
 	rm -Rf $TERMUX_PREFIX/bin/*pkg-config
 }
diff --git a/packages/play-audio/build.sh b/packages/play-audio/build.sh
index d75f06abd..6276a11ab 100644
--- a/packages/play-audio/build.sh
+++ b/packages/play-audio/build.sh
@@ -7,7 +7,7 @@ TERMUX_PKG_SHA256=e114123c4b337cddb1d4aa6c3287574d8c81b2dc4b3abc07ce21616fa14f9e
 TERMUX_PKG_SRCURL=https://github.com/termux/play-audio/archive/v${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_BUILD_IN_SRC=yes
 
-termux_step_post_make_install () {
+termux_step_post_make_install() {
 	local LIBEXEC_BINARY=$TERMUX_PREFIX/libexec/play-audio
 	local BIN_BINARY=$TERMUX_PREFIX/bin/play-audio
 	mv $BIN_BINARY $LIBEXEC_BINARY
diff --git a/packages/pngquant/build.sh b/packages/pngquant/build.sh
index 32e436404..61771b5c5 100644
--- a/packages/pngquant/build.sh
+++ b/packages/pngquant/build.sh
@@ -13,6 +13,6 @@ TERMUX_PKG_MAINTAINER="Vishal Biswas @vishalbiswas"
 TERMUX_PKG_BUILD_IN_SRC=true
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-sse"
 
-termux_step_post_extract_package () {
+termux_step_post_extract_package() {
 	mv $TERMUX_PKG_SRCDIR/libimagequant-$TERMUX_PKG_VERSION/* $TERMUX_PKG_SRCDIR/lib/
 }
diff --git a/packages/proot/build.sh b/packages/proot/build.sh
index 1e3bbdc91..10cd3a217 100644
--- a/packages/proot/build.sh
+++ b/packages/proot/build.sh
@@ -17,7 +17,7 @@ termux_step_pre_configure() {
 	CPPFLAGS+=" -DARG_MAX=131072"
 }
 
-termux_step_make_install () {
+termux_step_make_install() {
 	export CROSS_COMPILE=${TERMUX_HOST_PLATFORM}-
 
 	cd $TERMUX_PKG_SRCDIR/src
diff --git a/packages/python/build.sh b/packages/python/build.sh
index 7f4049617..792ee9c98 100644
--- a/packages/python/build.sh
+++ b/packages/python/build.sh
@@ -52,7 +52,7 @@ termux_step_pre_configure() {
 	if [ $TERMUX_ARCH = x86_64 ]; then LDFLAGS+=64; fi
 }
 
-termux_step_post_make_install () {
+termux_step_post_make_install() {
 	(cd $TERMUX_PREFIX/bin
 	 ln -sf python${_MAJOR_VERSION}m python${_MAJOR_VERSION}
 	 ln -sf python3 python
@@ -67,7 +67,7 @@ termux_step_post_make_install () {
 	mv $TERMUX_PREFIX/include/python${_MAJOR_VERSION}m/pyconfig.h $TERMUX_PKG_TMPDIR/pyconfig.h
 }
 
-termux_step_post_massage () {
+termux_step_post_massage() {
 	# Verify that desired modules have been included:
 	for module in _ssl _bz2 zlib _curses _sqlite3 _lzma; do
 		if [ ! -f lib/python${_MAJOR_VERSION}/lib-dynload/${module}.*.so ]; then
@@ -84,7 +84,7 @@ termux_step_post_massage () {
 	find $TERMUX_PKG_MASSAGEDIR -depth -name __pycache__ -exec rm -rf {} +
 }
 
-termux_step_create_debscripts () {
+termux_step_create_debscripts() {
 	## POST INSTALL:
 	echo "#!$TERMUX_PREFIX/bin/sh" > postinst
 	echo 'echo "Setting up pip..."' >> postinst
diff --git a/packages/python2/build.sh b/packages/python2/build.sh
index d1d1b957f..0795308d4 100644
--- a/packages/python2/build.sh
+++ b/packages/python2/build.sh
@@ -45,7 +45,7 @@ lib/python${_MAJOR_VERSION}/*/test
 lib/python${_MAJOR_VERSION}/*/tests
 "
 
-termux_step_host_build () {
+termux_step_host_build() {
 	# We need a host-built Parser/pgen binary, copied into cross-compile build in termux_step_post_configure() below
 	$TERMUX_PKG_SRCDIR/configure
 	make Parser/pgen
@@ -55,7 +55,7 @@ termux_step_host_build () {
         ln -s python python$_MAJOR_VERSION
 }
 
-termux_step_post_configure () {
+termux_step_post_configure() {
 	cp $TERMUX_PKG_HOSTBUILD_DIR/Parser/pgen $TERMUX_PKG_BUILDDIR/Parser/pgen
 	touch -d "next hour" $TERMUX_PKG_BUILDDIR/Parser/pgen
 }
@@ -74,7 +74,7 @@ termux_step_pre_configure() {
 	if [ $TERMUX_ARCH = x86_64 ]; then LDFLAGS+=64; fi
 }
 
-termux_step_post_make_install () {
+termux_step_post_make_install() {
 	# Avoid file clashes with the python (3) package:
 	(cd $TERMUX_PREFIX/bin
 	 mv 2to3 2to3-${_MAJOR_VERSION}
@@ -84,7 +84,7 @@ termux_step_post_make_install () {
         export PATH=$TERMUX_ORIG_PATH
 }
 
-termux_step_post_massage () {
+termux_step_post_massage() {
 	# Verify that desired modules have been included:
 	for module in _ssl bz2 zlib _curses _sqlite3; do
 		if [ ! -f lib/python${_MAJOR_VERSION}/lib-dynload/${module}.so ]; then
@@ -93,7 +93,7 @@ termux_step_post_massage () {
 	done
 }
 
-termux_step_create_debscripts () {
+termux_step_create_debscripts() {
 	## POST INSTALL:
 	echo "#!$TERMUX_PREFIX/bin/sh" > postinst
 	echo "echo 'Setting up pip2...'" >> postinst
diff --git a/packages/qpdf/build.sh b/packages/qpdf/build.sh
index 435bf026b..93bc92cc4 100644
--- a/packages/qpdf/build.sh
+++ b/packages/qpdf/build.sh
@@ -9,6 +9,6 @@ TERMUX_PKG_MAINTAINER="Vishal Biswas @vishalbiswas"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--with-random=/dev/urandom"
 TERMUX_PKG_BUILD_IN_SRC=true
 
-termux_step_pre_configure () {
+termux_step_pre_configure() {
 	./autogen.sh
 }
diff --git a/packages/readline/build.sh b/packages/readline/build.sh
index 48566b32e..de63facdf 100755
--- a/packages/readline/build.sh
+++ b/packages/readline/build.sh
@@ -12,7 +12,7 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--with-curses --enable-multibyte bash_cv_wcwidt
 TERMUX_PKG_EXTRA_MAKE_ARGS="SHLIB_LIBS=-lncursesw"
 TERMUX_PKG_CONFFILES="etc/inputrc"
 
-termux_step_pre_configure () {
+termux_step_pre_configure() {
 	local PATCH_CHECKSUMS
 	PATCH_CHECKSUMS[1]=9ac1b3ac2ec7b1bf0709af047f2d7d2a34ccde353684e57c6b47ebca77d7a376
 	PATCH_CHECKSUMS[2]=8747c92c35d5db32eae99af66f17b384abaca961653e185677f9c9a571ed2d58
diff --git a/packages/remind/build.sh b/packages/remind/build.sh
index a534edda3..3097baac1 100644
--- a/packages/remind/build.sh
+++ b/packages/remind/build.sh
@@ -8,6 +8,6 @@ TERMUX_PKG_DEPENDS="libandroid-glob"
 TERMUX_PKG_BUILD_IN_SRC=yes
 TERMUX_PKG_RM_AFTER_INSTALL="bin/tkremind share/man/man1/tkremind.1 bin/cm2rem.tcl share/man/man1/cm2rem.1"
 
-termux_step_pre_configure () {
+termux_step_pre_configure() {
 	LDFLAGS+=" -landroid-glob"
 }
diff --git a/packages/resolv-conf/build.sh b/packages/resolv-conf/build.sh
index d3faffeb7..c31da1025 100644
--- a/packages/resolv-conf/build.sh
+++ b/packages/resolv-conf/build.sh
@@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="Resolver configuration file"
 TERMUX_PKG_LICENSE="Public Domain"
 TERMUX_PKG_VERSION=1.1
 
-termux_step_make_install () {
+termux_step_make_install() {
 	_RESOLV_CONF=$TERMUX_PREFIX/etc/resolv.conf
 	printf "nameserver 8.8.8.8\nnameserver 8.8.4.4" > $_RESOLV_CONF
 }
diff --git a/packages/rhash/build.sh b/packages/rhash/build.sh
index ff2d2d671..ff853060d 100644
--- a/packages/rhash/build.sh
+++ b/packages/rhash/build.sh
@@ -10,14 +10,14 @@ TERMUX_PKG_MAINTAINER="Vishal Biswas @vishalbiswas"
 TERMUX_PKG_CONFLICTS=librhash
 TERMUX_PKG_REPLACES=librhash
 
-termux_step_make () {
+termux_step_make() {
 	CFLAGS="-DOPENSSL_RUNTIME $CPPFLAGS $CFLAGS"
 	make -j $TERMUX_MAKE_PROCESSES \
 		ADDCFLAGS="$CFLAGS" \
 		ADDLDFLAGS="$LDFLAGS"
 }
 
-termux_step_make_install () {
+termux_step_make_install() {
 	make install install-pkg-config
 	make -C librhash install-lib-headers
 
diff --git a/packages/root-repo/build.sh b/packages/root-repo/build.sh
index a3004c8bf..9cff81e29 100644
--- a/packages/root-repo/build.sh
+++ b/packages/root-repo/build.sh
@@ -11,7 +11,7 @@ termux_step_make_install() {
 	echo "deb https://grimler.se root stable" > $TERMUX_PREFIX/etc/apt/sources.list.d/root.list
 }
 
-termux_step_create_debscripts () {
+termux_step_create_debscripts() {
 	echo "#!$TERMUX_PREFIX/bin/sh" > postinst
 	echo "echo Downloading updated package list ..." >> postinst
 	echo "apt update" >> postinst
diff --git a/packages/rsync/build.sh b/packages/rsync/build.sh
index 645582e7c..bfb359538 100755
--- a/packages/rsync/build.sh
+++ b/packages/rsync/build.sh
@@ -8,6 +8,6 @@ TERMUX_PKG_SRCURL=https://rsync.samba.org/ftp/rsync/src/rsync-${TERMUX_PKG_VERSI
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--with-rsyncd-conf=$TERMUX_PREFIX/etc/rsyncd.conf --with-included-zlib=no --disable-debug"
 TERMUX_PKG_DEPENDS="libpopt, openssh | dropbear"
 
-termux_step_pre_configure () {
+termux_step_pre_configure() {
 	CFLAGS="$CFLAGS -llog" # for syslog
 }
diff --git a/packages/ruby/build.sh b/packages/ruby/build.sh
index f347a0bd0..c95729314 100644
--- a/packages/ruby/build.sh
+++ b/packages/ruby/build.sh
@@ -26,7 +26,7 @@ termux_step_pre_configure() {
 	fi
 }
 
-termux_step_make_install () {
+termux_step_make_install() {
 	make install
 	make uninstall # remove possible remains to get fresh timestamps
 	make install
@@ -42,7 +42,7 @@ termux_step_make_install () {
 	perl -p -i -e 's/^.*CONFIG\["GREP"\].*$/  CONFIG["GREP"] = "grep"/' $RBCONFIG
 }
 
-termux_step_post_massage () {
+termux_step_post_massage() {
 	if [ ! -f $TERMUX_PREFIX/lib/ruby/${_MAJOR_VERSION}.0/${TERMUX_HOST_PLATFORM}/readline.so ]; then
 		echo "Error: The readline extension was not built"
 	fi
diff --git a/packages/rust/build.sh b/packages/rust/build.sh
index c85d71c95..e40e0d966 100644
--- a/packages/rust/build.sh
+++ b/packages/rust/build.sh
@@ -7,7 +7,7 @@ TERMUX_PKG_SHA256=d617a7dc39daaafa8256320991005fc376c8ef2080593918301b24466d0067
 TERMUX_PKG_SRCURL=https://static.rust-lang.org/dist/rustc-$TERMUX_PKG_VERSION-src.tar.xz
 TERMUX_PKG_DEPENDS="clang, openssl, lld"
 
-termux_step_configure () {
+termux_step_configure() {
 	termux_setup_cmake
 	termux_setup_rust
 
@@ -38,14 +38,14 @@ termux_step_configure () {
 	unset CC CXX CPP LD CFLAGS CXXFLAGS CPPFLAGS LDFLAGS PKG_CONFIG
 }
 
-termux_step_make () {
+termux_step_make() {
 	$TERMUX_PKG_SRCDIR/x.py dist \
 		--host $CARGO_TARGET_NAME \
 		--target $CARGO_TARGET_NAME \
 		--target wasm32-unknown-unknown
 }
 
-termux_step_make_install () {
+termux_step_make_install() {
 	local host_files_to_remove="$TERMUX_PREFIX/lib/rustlib/x86_64-unknown-linux-gnu \
 		$TERMUX_PREFIX/lib/rustlib/manifest-rust-analysis-x86_64-unknown-linux-gnu \
 		$TERMUX_PREFIX/lib/rustlib/manifest-rust-std-x86_64-unknown-linux-gnu"
diff --git a/packages/screen/build.sh b/packages/screen/build.sh
index 5f0227b9c..e13ba2c0c 100644
--- a/packages/screen/build.sh
+++ b/packages/screen/build.sh
@@ -12,7 +12,7 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 --with-ssl=openssl
 "
 
-termux_step_pre_configure () {
+termux_step_pre_configure() {
 	# Run autoreconf since we have patched configure.ac
 	autoconf
 	CFLAGS+=" -DGETUTENT"
diff --git a/packages/screenfetch/build.sh b/packages/screenfetch/build.sh
index f24b7f6f1..ef0724b92 100644
--- a/packages/screenfetch/build.sh
+++ b/packages/screenfetch/build.sh
@@ -9,7 +9,7 @@ TERMUX_PKG_BUILD_IN_SRC=yes
 TERMUX_PKG_MAINTAINER="Pierre Rudloff @Rudloff"
 TERMUX_PKG_PLATFORM_INDEPENDENT=yes
 
-termux_step_make_install () {
+termux_step_make_install() {
     install screenfetch-dev ${TERMUX_PREFIX}/bin/screenfetch
     install screenfetch.1 ${TERMUX_PREFIX}/share/man/man1/
 }
diff --git a/packages/sed/build.sh b/packages/sed/build.sh
index ba580836a..99bb7a81d 100644
--- a/packages/sed/build.sh
+++ b/packages/sed/build.sh
@@ -10,6 +10,6 @@ termux_step_pre_configure() {
 	CFLAGS+=" -D__USE_FORTIFY_LEVEL=2"
 }
 
-termux_step_post_configure () {
+termux_step_post_configure() {
 	touch -d "next hour" $TERMUX_PKG_SRCDIR/doc/sed.1
 }
diff --git a/packages/serf/build.sh b/packages/serf/build.sh
index b49be093e..f4f43ae30 100644
--- a/packages/serf/build.sh
+++ b/packages/serf/build.sh
@@ -8,7 +8,7 @@ TERMUX_PKG_SHA256=549c2d21c577a8a9c0450facb5cca809f26591f048e466552240947bdf7a87
 TERMUX_PKG_DEPENDS="apr, apr-util, openssl, libuuid, libexpat"
 TERMUX_PKG_BUILD_IN_SRC=yes
 
-termux_step_make_install () {
+termux_step_make_install() {
 	scons APR=$TERMUX_PREFIX \
 	      APU=$TERMUX_PREFIX \
 	      CC=`which $CC` \
diff --git a/packages/sl/build.sh b/packages/sl/build.sh
index 176c12817..5360b06b8 100644
--- a/packages/sl/build.sh
+++ b/packages/sl/build.sh
@@ -8,7 +8,7 @@ TERMUX_PKG_SHA256=1e5996757f879c81f202a18ad8e982195cf51c41727d3fea4af01fdcbbb556
 TERMUX_PKG_DEPENDS="ncurses"
 TERMUX_PKG_BUILD_IN_SRC=yes
 
-termux_step_make_install () {
+termux_step_make_install() {
 	install sl $TERMUX_PREFIX/bin/
 	cp sl.1 $TERMUX_PREFIX/share/man/man1
 }
diff --git a/packages/socat/build.sh b/packages/socat/build.sh
index 7213f841a..ea0047a63 100644
--- a/packages/socat/build.sh
+++ b/packages/socat/build.sh
@@ -10,11 +10,11 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="ac_header_resolv_h=no ac_cv_c_compiler_gnu=yes
 TERMUX_PKG_BUILD_IN_SRC=yes
 #TERMUX_PKG_HOSTBUILD=yes
 
-termux_step_pre_configure () {
+termux_step_pre_configure() {
 	LDFLAGS="$LDFLAGS -llog" # uses syslog
 }
 
-#termux_step_configure () {
+#termux_step_configure() {
         # From socat_buildscript_for_android.sh in socat source:
 #./configure --host --disable-unix --disable-openssl --prefix=$TERMUX_PREFIX
         # Replace misconfigured values in config.h and enable PTY functions
diff --git a/packages/squid/build.sh b/packages/squid/build.sh
index c95c1c64c..389041132 100644
--- a/packages/squid/build.sh
+++ b/packages/squid/build.sh
@@ -33,7 +33,7 @@ squid_cv_gnu_atomics=yes
 --mandir=$TERMUX_PREFIX/share/man
 "
 
-termux_step_pre_configure () {
+termux_step_pre_configure() {
 	LDFLAGS="$LDFLAGS -llog"
 
 	# needed for building cf_gen
diff --git a/packages/tcl/build.sh b/packages/tcl/build.sh
index 367e3c285..3bbaeb810 100644
--- a/packages/tcl/build.sh
+++ b/packages/tcl/build.sh
@@ -22,12 +22,12 @@ tcl_cv_strtoul_unbroken=ok
 TERMUX_PKG_KEEP_STATIC_LIBRARIES=yes
 TERMUX_PKG_INCLUDE_IN_DEVPACKAGE="lib/*.a lib/itcl*/*.a lib/tdbc*/libtdbcstub*.a"
 
-termux_step_pre_configure () {
+termux_step_pre_configure() {
 	TERMUX_PKG_SRCDIR=$TERMUX_PKG_SRCDIR/unix
 	CFLAGS+=" -DBIONIC_IOCTL_NO_SIGNEDNESS_OVERLOAD"
 }
 
-termux_step_post_make_install () {
+termux_step_post_make_install() {
 	# expect needs private headers
 	make install-private-headers
 	local _MAJOR_VERSION=${TERMUX_PKG_VERSION:0:3}
diff --git a/packages/termux-am/build.sh b/packages/termux-am/build.sh
index 98473b1cb..260fbeb87 100644
--- a/packages/termux-am/build.sh
+++ b/packages/termux-am/build.sh
@@ -9,12 +9,12 @@ TERMUX_PKG_PLATFORM_INDEPENDENT=yes
 TERMUX_PKG_BUILD_IN_SRC=yes
 TERMUX_PKG_CONFLICTS="termux-tools (<< 0.51)"
 
-termux_step_make () {
+termux_step_make() {
 	export ANDROID_HOME
 	GRADLE_OPTS=" -Dorg.gradle.daemon=false" ./gradlew :app:assembleRelease
 }
 
-termux_step_make_install () {
+termux_step_make_install() {
 	cp $TERMUX_PKG_SRCDIR/am-libexec-packaged $TERMUX_PREFIX/bin/am
 	mkdir -p $TERMUX_PREFIX/libexec/termux-am
 	cp $TERMUX_PKG_SRCDIR/app/build/outputs/apk/release/app-release-unsigned.apk $TERMUX_PREFIX/libexec/termux-am/am.apk
diff --git a/packages/termux-create-package/build.sh b/packages/termux-create-package/build.sh
index cc4ccbd63..8b7775c1e 100644
--- a/packages/termux-create-package/build.sh
+++ b/packages/termux-create-package/build.sh
@@ -8,6 +8,6 @@ TERMUX_PKG_DEPENDS="python"
 TERMUX_PKG_BUILD_IN_SRC=yes
 TERMUX_PKG_PLATFORM_INDEPENDENT=yes
 
-termux_step_make_install () {
+termux_step_make_install() {
 	cp termux-create-package $TERMUX_PREFIX/bin/termux-create-package
 }
diff --git a/packages/termux-tools/build.sh b/packages/termux-tools/build.sh
index 02e2d804a..69dda4515 100644
--- a/packages/termux-tools/build.sh
+++ b/packages/termux-tools/build.sh
@@ -8,7 +8,7 @@ TERMUX_PKG_DEPENDS="termux-am"
 TERMUX_PKG_CONFFILES="etc/motd"
 TERMUX_PKG_CONFLICTS="procps (<< 3.3.15-2)"
 
-termux_step_make_install () {
+termux_step_make_install() {
 	mkdir -p $TERMUX_PREFIX/bin/applets
 	# Remove LD_LIBRARY_PATH from environment to avoid conflicting
 	# with system libraries that system binaries may link against:
diff --git a/packages/texlive-bin/build.sh b/packages/texlive-bin/build.sh
index b56b85110..d08859996 100644
--- a/packages/texlive-bin/build.sh
+++ b/packages/texlive-bin/build.sh
@@ -126,7 +126,7 @@ share/texlive/texmf-dist/scripts/lua2dox/lua2dox_filter
 share/texlive/texmf-dist/scripts/context/perl/mptopdf.pl
 share/texlive/texmf-dist/scripts/checkcites/checkcites.lua"
 
-termux_step_host_build () {
+termux_step_host_build() {
 	mkdir -p auxdir/auxsub
 	mkdir -p texk/kpathsea
 	mkdir -p texk/web2c
@@ -159,7 +159,7 @@ termux_step_pre_configure() {
 	export LD_LIBRARY_PATH=$TERMUX_PKG_HOSTBUILD_DIR/texk/kpathsea/.libs
 }
 
-termux_step_create_debscripts () {
+termux_step_create_debscripts() {
 	# Clean texlive's folder if needed (run on fresh install)
 	echo "#!$TERMUX_PREFIX/bin/bash" > preinst
 	echo "if [ ! -d $PREFIX/opt/texlive ]; then echo 'Removing residual files from old version of TeX Live for Termux'; rm -rf $PREFIX/opt/texlive; fi" >> preinst
diff --git a/packages/texlive-tlmgr/build.sh b/packages/texlive-tlmgr/build.sh
index 1cdb6bf0a..1279fde16 100644
--- a/packages/texlive-tlmgr/build.sh
+++ b/packages/texlive-tlmgr/build.sh
@@ -14,13 +14,13 @@ TERMUX_PKG_PLATFORM_INDEPENDENT=yes
 TL_ROOT=$TERMUX_PREFIX/share/texlive
 TL_BINDIR=$TERMUX_PREFIX/bin
 
-termux_step_make () {
+termux_step_make() {
 	mkdir -p $TL_ROOT/{tlpkg/{backups,tlpobj},texmf-var/web2c}
 	cp -r $TERMUX_PKG_SRCDIR/* $TL_ROOT/
 	cp $TERMUX_PKG_BUILDER_DIR/texlive.tlpdb $TL_ROOT/tlpkg/
 }
 
-termux_step_post_make_install () {
+termux_step_post_make_install() {
 	# Replace tlmgr link with a small wrapper that prevents error on "tlmgr update --self"
 	rm -rf $TL_BINDIR/tlmgr
 	ln -sf ../share/texlive/texmf-dist/scripts/texlive/tlmgr.pl $TL_BINDIR/tlmgr.ln
@@ -33,7 +33,7 @@ termux_step_post_make_install () {
 	chmod 0744 $TL_BINDIR/tlmgr
 }
 
-termux_step_create_debscripts () {
+termux_step_create_debscripts() {
 	echo "#!$TERMUX_PREFIX/bin/bash" > postinst
 	echo "mkdir -p $TL_ROOT/{tlpkg/{backups,tlpobj},texmf-var/{web2c,tex/generic/config}}" >> postinst
 	echo "export TMPDIR=$TERMUX_PREFIX/tmp" >> postinst
diff --git a/packages/texlive/build.sh b/packages/texlive/build.sh
index bda8e42c2..e94635592 100644
--- a/packages/texlive/build.sh
+++ b/packages/texlive/build.sh
@@ -40,7 +40,7 @@ termux_step_make() {
 	perl -I$TL_ROOT/tlpkg/ $TL_ROOT/texmf-dist/scripts/texlive/mktexlsr.pl $TL_ROOT/texmf-dist
 }
 
-termux_step_create_debscripts () {
+termux_step_create_debscripts() {
 	# Clean texlive's folder if needed (run on upgrade)
 	echo "#!$TERMUX_PREFIX/bin/bash" > preinst
 	echo "if [ -d $TERMUX_PREFIX/opt/texlive ]; then echo 'Removing residual files from old version of TeX Live for Termux'; rm -rf $PREFIX/opt/texlive; fi" >> preinst
diff --git a/packages/tig/build.sh b/packages/tig/build.sh
index f272343fa..de45b12af 100644
--- a/packages/tig/build.sh
+++ b/packages/tig/build.sh
@@ -8,6 +8,6 @@ TERMUX_PKG_SRCURL=https://github.com/jonas/tig/releases/download/tig-$TERMUX_PKG
 TERMUX_PKG_BUILD_IN_SRC=yes
 TERMUX_PKG_DEPENDS="ncurses, git, libandroid-support"
 
-termux_step_post_make_install () {
+termux_step_post_make_install() {
         make -j 1 install-doc
 }
diff --git a/packages/tinyscheme/build.sh b/packages/tinyscheme/build.sh
index 73ab165e6..9f9448674 100644
--- a/packages/tinyscheme/build.sh
+++ b/packages/tinyscheme/build.sh
@@ -7,12 +7,12 @@ TERMUX_PKG_SRCURL=http://downloads.sourceforge.net/project/tinyscheme/tinyscheme
 TERMUX_PKG_SHA256=eac0103494c755192b9e8f10454d9f98f2bbd4d352e046f7b253439a3f991999
 TERMUX_PKG_BUILD_IN_SRC=yes
 
-termux_step_pre_configure () {
+termux_step_pre_configure() {
 	AR+=" crs"
 	LD=$CC
 }
 
-termux_step_post_make_install () {
+termux_step_post_make_install() {
 	mkdir -p $TERMUX_PREFIX/share/tinyscheme/
 	cp $TERMUX_PKG_SRCDIR/init.scm $TERMUX_PREFIX/share/tinyscheme/
 }
diff --git a/packages/tmate/build.sh b/packages/tmate/build.sh
index 6a1a87bce..b1362bae2 100644
--- a/packages/tmate/build.sh
+++ b/packages/tmate/build.sh
@@ -7,7 +7,7 @@ TERMUX_PKG_SRCURL=https://github.com/tmate-io/tmate/archive/${TERMUX_PKG_VERSION
 TERMUX_PKG_SHA256=d9c2ac59f42e65aac5f500f0548ea8056fd79c9c5285e5af324d833e2a84c305
 TERMUX_PKG_DEPENDS="libandroid-support, libevent, libmsgpack, libssh, libutil, ncurses"
 
-termux_step_pre_configure () {
+termux_step_pre_configure() {
 	CFLAGS+=" -DIOV_MAX=1024"
 
 	./autogen.sh
diff --git a/packages/tmux/build.sh b/packages/tmux/build.sh
index b6fb46233..582e2601b 100755
--- a/packages/tmux/build.sh
+++ b/packages/tmux/build.sh
@@ -13,6 +13,6 @@ termux_step_pre_configure() {
 	LDFLAGS+=" -landroid-glob"
 }
 
-termux_step_post_make_install () {
+termux_step_post_make_install() {
 	cp $TERMUX_PKG_BUILDER_DIR/tmux.conf $TERMUX_PREFIX/etc/tmux.conf
 }
diff --git a/packages/tor/build.sh b/packages/tor/build.sh
index 1ac986989..9f64fa1e7 100644
--- a/packages/tor/build.sh
+++ b/packages/tor/build.sh
@@ -9,11 +9,11 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-zstd --disable-unittests"
 TERMUX_PKG_CONFFILES="etc/tor/torrc"
 TERMUX_PKG_MAINTAINER="Vishal Biswas @vishalbiswas"
 
-termux_step_pre_configure () {
+termux_step_pre_configure() {
 	LDFLAGS="$LDFLAGS -llog"
 }
 
-termux_step_post_make_install () {
+termux_step_post_make_install() {
 	# use default config
 	mv "$TERMUX_PREFIX/etc/tor/torrc.sample" "$TERMUX_PREFIX/etc/tor/torrc"
 }
diff --git a/packages/torsocks/build.sh b/packages/torsocks/build.sh
index 9f9c9f6ec..1ad15cd3a 100644
--- a/packages/torsocks/build.sh
+++ b/packages/torsocks/build.sh
@@ -6,7 +6,7 @@ TERMUX_PKG_SHA256=817c143e8a9d217f41a223a85139c6ca28e1b99556c547fcdb4c72dbc170b6
 TERMUX_PKG_SRCURL=https://github.com/dgoulet/torsocks/archive/v$TERMUX_PKG_VERSION.tar.gz
 TERMUX_PKG_DEPENDS="tor"
 
-termux_step_pre_configure () {
+termux_step_pre_configure() {
 	./autogen.sh
 }
 
diff --git a/packages/tracepath/build.sh b/packages/tracepath/build.sh
index 614c27727..e975db889 100644
--- a/packages/tracepath/build.sh
+++ b/packages/tracepath/build.sh
@@ -7,15 +7,15 @@ TERMUX_PKG_SRCURL=https://github.com/iputils/iputils/archive/s${TERMUX_PKG_VERSI
 TERMUX_PKG_BUILD_IN_SRC=yes
 TERMUX_PKG_DEPENDS="libidn"
 
-termux_step_configure () {
+termux_step_configure() {
 	return
 }
 
-termux_step_make () {
+termux_step_make() {
 	return
 }
 
-termux_step_make_install () {
+termux_step_make_install() {
 	$CC $CFLAGS $LDFLAGS -lidn -o $TERMUX_PREFIX/bin/tracepath tracepath.c
 	local MANDIR=$TERMUX_PREFIX/share/man/man8
 	mkdir -p $MANDIR
diff --git a/packages/tree/build.sh b/packages/tree/build.sh
index 1c58aae2b..10d8b1b70 100644
--- a/packages/tree/build.sh
+++ b/packages/tree/build.sh
@@ -9,7 +9,7 @@ TERMUX_PKG_SRCURL=http://mama.indstate.edu/users/ice/tree/src/tree-${TERMUX_PKG_
 TERMUX_PKG_DEPENDS="libandroid-support"
 TERMUX_PKG_BUILD_IN_SRC=yes
 
-termux_step_make () {
+termux_step_make() {
 	make \
 		CC="$CC" \
 		CFLAGS="$CFLAGS $CPPFLAGS -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64" \
@@ -17,7 +17,7 @@ termux_step_make () {
 		OBJS="file.o tree.o unix.o html.o xml.o json.o hash.o color.o strverscmp.o"
 }
 
-termux_step_make_install () {
+termux_step_make_install() {
 	make install \
 		prefix="$TERMUX_PREFIX" \
 		MANDIR="$TERMUX_PREFIX/share/man/man1"
diff --git a/packages/tsu/build.sh b/packages/tsu/build.sh
index a8d01655b..6278e81f1 100644
--- a/packages/tsu/build.sh
+++ b/packages/tsu/build.sh
@@ -11,7 +11,7 @@ termux_step_make() {
 	:
 }
 
-termux_step_make_install () {
+termux_step_make_install() {
 	cp tsu $TERMUX_PREFIX/bin/tsu
 	chmod +x $TERMUX_PREFIX/bin/tsu
 
diff --git a/packages/ttyrec/build.sh b/packages/ttyrec/build.sh
index bd9dbda6d..2efa8eb4f 100644
--- a/packages/ttyrec/build.sh
+++ b/packages/ttyrec/build.sh
@@ -11,7 +11,7 @@ termux_step_pre_configure() {
 	CFLAGS+=" -Dset_progname=setprogname"
 }
 
-termux_step_make_install () {
+termux_step_make_install() {
 	cp ttyrec ttyplay ttytime $TERMUX_PREFIX/bin
 	mkdir -p $TERMUX_PREFIX/share/man/man1
 	cp ttyrec.1 ttyplay.1 ttytime.1 $TERMUX_PREFIX/share/man/man1
diff --git a/packages/unstable-repo/build.sh b/packages/unstable-repo/build.sh
index a9fd13d1b..3c6edaf2d 100644
--- a/packages/unstable-repo/build.sh
+++ b/packages/unstable-repo/build.sh
@@ -11,7 +11,7 @@ termux_step_make_install() {
 	echo "deb https://dl.bintray.com/xeffyr/unstable-packages unstable main" > $TERMUX_PREFIX/etc/apt/sources.list.d/unstable.list
 }
 
-termux_step_create_debscripts () {
+termux_step_create_debscripts() {
 	echo "#!$TERMUX_PREFIX/bin/sh" > postinst
 	echo "echo Downloading updated package list ..." >> postinst
 	echo "apt update" >> postinst
diff --git a/packages/unzip/build.sh b/packages/unzip/build.sh
index 61866fe0f..4a4a4469a 100644
--- a/packages/unzip/build.sh
+++ b/packages/unzip/build.sh
@@ -8,10 +8,10 @@ TERMUX_PKG_SHA256=036d96991646d0449ed0aa952e4fbe21b476ce994abc276e49d30e686708bd
 TERMUX_PKG_DEPENDS="libbz2"
 TERMUX_PKG_BUILD_IN_SRC=yes
 
-termux_step_configure () {
+termux_step_configure() {
 	cp unix/Makefile Makefile
 }
 
-termux_step_make () {
+termux_step_make() {
 	LD="$CC $LDFLAGS -lbz2" CC="$CC $CFLAGS $CPPFLAGS $LDFLAGS -DNO_LCHMOD -DUSE_BZIP2" make -j $TERMUX_MAKE_PROCESSES generic
 }
diff --git a/packages/vim-python/build.sh b/packages/vim-python/build.sh
index af46e1c28..7ea13b507 100755
--- a/packages/vim-python/build.sh
+++ b/packages/vim-python/build.sh
@@ -49,7 +49,7 @@ termux_step_pre_configure() {
 	CPPFLAGS+=" -I${TERMUX_PREFIX}/include/python3.7m"
 }
 
-termux_step_pre_configure () {
+termux_step_pre_configure() {
 	make distclean
 
 	# Remove eventually existing symlinks from previous builds so that they get re-created
@@ -57,7 +57,7 @@ termux_step_pre_configure () {
 	rm -f $TERMUX_PREFIX/share/man/man1/view.1
 }
 
-termux_step_post_make_install () {
+termux_step_post_make_install() {
 	cp $TERMUX_PKG_BUILDER_DIR/vimrc $TERMUX_PREFIX/share/vim/vimrc
 
 	# Remove most tutor files:
diff --git a/packages/vim/build.sh b/packages/vim/build.sh
index 120e0cea8..89d37ffd2 100755
--- a/packages/vim/build.sh
+++ b/packages/vim/build.sh
@@ -36,7 +36,7 @@ TERMUX_PKG_CONFFILES="share/vim/vimrc"
 
 TERMUX_PKG_CONFLICTS="vim-python"
 
-termux_step_pre_configure () {
+termux_step_pre_configure() {
 	make distclean
 
 	# Remove eventually existing symlinks from previous builds so that they get re-created
@@ -44,7 +44,7 @@ termux_step_pre_configure () {
 	rm -f $TERMUX_PREFIX/share/man/man1/view.1
 }
 
-termux_step_post_make_install () {
+termux_step_post_make_install() {
 	cp $TERMUX_PKG_BUILDER_DIR/vimrc $TERMUX_PREFIX/share/vim/vimrc
 
 	# Remove most tutor files:
diff --git a/packages/wireguard-tools/build.sh b/packages/wireguard-tools/build.sh
index 4c5022099..18423ddfa 100644
--- a/packages/wireguard-tools/build.sh
+++ b/packages/wireguard-tools/build.sh
@@ -8,7 +8,7 @@ TERMUX_PKG_DEPENDS="libmnl, tsu"
 TERMUX_PKG_BUILD_IN_SRC=yes
 TERMUX_PKG_EXTRA_MAKE_ARGS=" -C src/tools WITH_BASHCOMPLETION=yes WITH_WGQUICK=no WITH_SYSTEMDUNITS=no"
 
-termux_step_post_make_install () {
+termux_step_post_make_install() {
     cd src/tools/wg-quick
     $CC $CFLAGS -DWG_CONFIG_SEARCH_PATHS="\"$TERMUX_ANDROID_HOME/.wireguard $TERMUX_PREFIX/etc/wireguard /data/misc/wireguard /data/data/com.wireguard.android/files\"" -o wg-quick android.c
     install -m 0755 wg-quick $TERMUX_PREFIX/bin
diff --git a/packages/x11-repo/build.sh b/packages/x11-repo/build.sh
index 4b56d39ee..1390b0026 100644
--- a/packages/x11-repo/build.sh
+++ b/packages/x11-repo/build.sh
@@ -11,7 +11,7 @@ termux_step_make_install() {
 	echo "deb https://dl.bintray.com/xeffyr/x11-packages x11 main" > $TERMUX_PREFIX/etc/apt/sources.list.d/x11.list
 }
 
-termux_step_create_debscripts () {
+termux_step_create_debscripts() {
 	echo "#!$TERMUX_PREFIX/bin/sh" > postinst
 	echo "echo Downloading updated package list ..." >> postinst
 	echo "apt update" >> postinst
diff --git a/packages/xvidcore/build.sh b/packages/xvidcore/build.sh
index 85cf9f06b..5a89691ea 100644
--- a/packages/xvidcore/build.sh
+++ b/packages/xvidcore/build.sh
@@ -6,7 +6,7 @@ TERMUX_PKG_SHA256=165ba6a2a447a8375f7b06db5a3c91810181f2898166e7c8137401d7fc894c
 TERMUX_PKG_SRCURL=http://downloads.xvid.org/downloads/xvidcore-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_BUILD_IN_SRC=yes
 
-termux_step_pre_configure () {
+termux_step_pre_configure() {
 	rm -f $TERMUX_PREFIX/lib/libxvid*
 	export TERMUX_PKG_BUILDDIR=$TERMUX_PKG_BUILDDIR/build/generic
 	export TERMUX_PKG_SRCDIR=$TERMUX_PKG_BUILDDIR
diff --git a/packages/yarn/build.sh b/packages/yarn/build.sh
index d580769b3..6dd8edcf7 100644
--- a/packages/yarn/build.sh
+++ b/packages/yarn/build.sh
@@ -9,7 +9,7 @@ TERMUX_PKG_SRCURL=https://yarnpkg.com/downloads/${TERMUX_PKG_VERSION}/yarn-v${TE
 TERMUX_PKG_BUILD_IN_SRC=yes
 TERMUX_PKG_PLATFORM_INDEPENDENT=yes
 
-termux_step_make_install () {
+termux_step_make_install() {
 	cp -r . ${TERMUX_PREFIX}/share/yarn/
 	ln -f -s ../share/yarn/bin/yarn ${TERMUX_PREFIX}/bin/yarn
 }
diff --git a/packages/zbar/build.sh b/packages/zbar/build.sh
index abc92ba60..38676abb8 100644
--- a/packages/zbar/build.sh
+++ b/packages/zbar/build.sh
@@ -11,6 +11,6 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-pthread
 --without-x --without-gtk --without-qt
 --without-python --mandir=$TERMUX_PREFIX/share/man"
 
-termux_step_pre_configure () {
+termux_step_pre_configure() {
 	autoconf
 }
diff --git a/packages/zip/build.sh b/packages/zip/build.sh
index 274b49b73..f8ace2736 100644
--- a/packages/zip/build.sh
+++ b/packages/zip/build.sh
@@ -8,10 +8,10 @@ TERMUX_PKG_SHA256=f0e8bb1f9b7eb0b01285495a2699df3a4b766784c1765a8f1aeedf63c08063
 TERMUX_PKG_DEPENDS="libandroid-support, libbz2"
 TERMUX_PKG_BUILD_IN_SRC=yes
 
-termux_step_configure () {
+termux_step_configure() {
 	cp unix/Makefile Makefile
 }
 
-termux_step_make () {
+termux_step_make() {
 	LD="$CC $LDFLAGS" CC="$CC $CFLAGS $CPPFLAGS $LDFLAGS" make -j $TERMUX_MAKE_PROCESSES generic
 }
diff --git a/packages/zsh/build.sh b/packages/zsh/build.sh
index 439c183e8..8b86f873a 100644
--- a/packages/zsh/build.sh
+++ b/packages/zsh/build.sh
@@ -17,7 +17,7 @@ ac_cv_func_getpwuid=yes
 TERMUX_PKG_CONFFILES="etc/zshrc"
 TERMUX_PKG_BUILD_IN_SRC=yes
 
-termux_step_post_configure () {
+termux_step_post_configure() {
 	# INSTALL file: "For a non-dynamic zsh, the default is to compile the complete, compctl, zle,
 	# computil, complist, sched, # parameter, zleparameter and rlimits modules into the shell,
 	# and you will need to edit config.modules to make any other modules available."
@@ -36,7 +36,7 @@ termux_step_post_configure () {
 	done
 }
 
-termux_step_post_make_install () {
+termux_step_post_make_install() {
 	# /etc/zshrc - Run for interactive shells (http://zsh.sourceforge.net/Guide/zshguide02.html):
 	sed "s|@TERMUX_PREFIX@|$TERMUX_PREFIX|" $TERMUX_PKG_BUILDER_DIR/etc-zshrc > $TERMUX_PREFIX/etc/zshrc