Drop need of setting TERMUX_PKG_FOLDERNAME

Instead figure out the top level source folder ourselves.
2017-09-20 00:48:04 +02:00 · 2017-09-20 00:48:04 +02:00 · 51c7760090
parent b7dabb9f07
commit 51c7760090
159 changed files with 28 additions and 183 deletions
--- a/build-package.sh
+++ b/build-package.sh
@ -309,7 +309,6 @@ termux_step_setup_variables() {
 	TERMUX_PKG_BUILD_DEPENDS=""
 	TERMUX_PKG_HOMEPAGE=""
 	TERMUX_PKG_DESCRIPTION="FIXME:Add description"
-	TERMUX_PKG_FOLDERNAME=""
 	TERMUX_PKG_KEEP_STATIC_LIBRARIES="false"
 	TERMUX_PKG_ESSENTIAL=""
 	TERMUX_PKG_CONFLICTS="" # https://www.debian.org/doc/debian-policy/ch-relationships.html#s-conflicts
@ -469,18 +468,18 @@ termux_step_extract_package() {
 	local file="$TERMUX_PKG_CACHEDIR/$filename"
 	termux_download "$TERMUX_PKG_SRCURL" "$file" "$TERMUX_PKG_SHA256"

-	if [ "x$TERMUX_PKG_FOLDERNAME" = "x" ]; then
-		folder="${filename%%.t*}" && folder="${folder%%.zip}"
-		folder="${folder/_/-}" # dpkg uses _ in tar filename, but - in folder
-	else
-		folder=$TERMUX_PKG_FOLDERNAME
-	fi
-	rm -Rf $folder
+	local folder
+	set +o pipefail
 	if [ "${file##*.}" = zip ]; then
+		folder=`unzip -qql "$file" | head -n1 | tr -s ' ' | cut -d' ' -f5-`
+		rm -Rf $folder
 		unzip -q "$file"
 	else
+		folder=`tar tf "$file" | head -1 | sed -e 's/\/.*//'`
+		rm -Rf $folder
 		tar xf "$file"
 	fi
+	set -o pipefail
 	mv $folder "$TERMUX_PKG_SRCDIR"
 }

--- a/disabled-packages/ant/build.sh
+++ b/disabled-packages/ant/build.sh
@ -2,7 +2,6 @@ TERMUX_PKG_HOMEPAGE=http://ant.apache.org/
 TERMUX_PKG_DESCRIPTION="Java based build tool like make"
 TERMUX_PKG_VERSION=1.9.6
 TERMUX_PKG_SRCURL=http://apache.mirrors.spacedump.net//ant/binaries/apache-ant-${TERMUX_PKG_VERSION}-bin.tar.bz2
-TERMUX_PKG_FOLDERNAME=apache-ant-${TERMUX_PKG_VERSION}
 TERMUX_PKG_BUILD_IN_SRC=yes
 TERMUX_PKG_PLATFORM_INDEPENDENT=true

--- a/disabled-packages/caddy/build.sh
+++ b/disabled-packages/caddy/build.sh
@ -2,4 +2,3 @@ TERMUX_PKG_HOMEPAGE=https://github.com/mholt/caddy
 TERMUX_PKG_DESCRIPTION="Fast, cross-platform HTTP/2 web server with automatic HTTPS"
 TERMUX_PKG_VERSION=0.8.0
 TERMUX_PKG_SRCURL=https://github.com/mholt/caddy/archive/v${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_FOLDERNAME=caddy-${TERMUX_PKG_VERSION}
--- a/disabled-packages/crawl/build.sh
+++ b/disabled-packages/crawl/build.sh
@ -6,7 +6,6 @@ TERMUX_PKG_HOMEPAGE=https://crawl.develz.org/
 TERMUX_PKG_DESCRIPTION="Roguelike adventure through dungeons filled with dangerous monsters"
 TERMUX_PKG_VERSION=0.17.1
 TERMUX_PKG_SRCURL=https://crawl.develz.org/release/stone_soup-${TERMUX_PKG_VERSION}.tar.xz
-TERMUX_PKG_FOLDERNAME=stone_soup-$TERMUX_PKG_VERSION
 TERMUX_PKG_EXTRA_MAKE_ARGS="V=1"
 TERMUX_PKG_BUILD_IN_SRC=yes

--- a/disabled-packages/deborphan/build.sh
+++ b/disabled-packages/deborphan/build.sh
@ -2,6 +2,5 @@ TERMUX_PKG_HOMEPAGE=https://packages.debian.org/source/sid/deborphan
 TERMUX_PKG_DESCRIPTION="Program that can find unused packages"
 TERMUX_PKG_VERSION=1.7.28.8-0.3
 TERMUX_PKG_SRCURL=http://http.debian.net/debian/pool/main/d/deborphan/deborphan_$TERMUX_PKG_VERSION.tar.gz
-TERMUX_PKG_FOLDERNAME="deborphan"
 TERMUX_PKG_BUILD_IN_SRC=yes
 TERMUX_PKG_MAINTAINER="Pierre Rudloff @Rudloff"
--- a/disabled-packages/easy-rsa/build.sh
+++ b/disabled-packages/easy-rsa/build.sh
@ -4,7 +4,6 @@ TERMUX_PKG_DEPENDS="openssl-tool"
 TERMUX_PKG_SRCURL=https://github.com/OpenVPN/easy-rsa/releases/download/$TERMUX_PKG_VERSION/EasyRSA-$TERMUX_PKG_VERSION.tgz
 TERMUX_PKG_SHA256=dbdaf5b9444b99e0c5221fd4bcf15384c62380c1b63cea23d42239414d7b2d4e
 TERMUX_PKG_CONFFILES="etc/easy-rsa/openssl-1.0.cnf, etc/easy-rsa/vars"
-TERMUX_PKG_FOLDERNAME=EasyRSA-$TERMUX_PKG_VERSION
 TERMUX_PKG_MAINTAINER='Vishal Biswas @vishalbiswas'
 TERMUX_PKG_BUILD_IN_SRC=true

--- a/disabled-packages/elixir/build.sh
+++ b/disabled-packages/elixir/build.sh
@ -4,5 +4,4 @@ TERMUX_PKG_VERSION=1.3.4
 TERMUX_PKG_SRCURL=https://github.com/elixir-lang/elixir/archive/v${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_DEPENDS="erlang"
 # TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--with-ssl=openssl --disable-iri"
-TERMUX_PKG_FOLDERNAME=elixir-${TERMUX_PKG_VERSION}
 TERMUX_PKG_BUILD_IN_SRC=yes
--- a/disabled-packages/ghc/build.sh
+++ b/disabled-packages/ghc/build.sh
@ -6,7 +6,6 @@ TERMUX_PKG_HOMEPAGE=https://www.haskell.org/ghc/
 TERMUX_PKG_DESCRIPTION="The Glasgow Haskell Compilation system"
 TERMUX_PKG_VERSION=8.0.1
 TERMUX_PKG_SRCURL=http://downloads.haskell.org/~ghc/${TERMUX_PKG_VERSION}/ghc-${TERMUX_PKG_VERSION}-src.tar.xz
-TERMUX_PKG_FOLDERNAME=ghc-$TERMUX_PKG_VERSION
 TERMUX_PKG_BUILD_IN_SRC=yes
 # Depend on clang for now until llvm is split into separate package:
 TERMUX_PKG_DEPENDS="clang, ncurses"
--- a/disabled-packages/libfakechroot/build.sh
+++ b/disabled-packages/libfakechroot/build.sh
@ -2,4 +2,3 @@ TERMUX_PKG_HOMEPAGE=https://github.com/dex4er/fakechroot/wiki
 TERMUX_PKG_DESCRIPTION="Library for creating fake chroots"
 TERMUX_PKG_VERSION=2.17.2
 TERMUX_PKG_SRCURL=https://github.com/dex4er/fakechroot/archive/${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_FOLDERNAME=fakechroot-${TERMUX_PKG_VERSION}
--- a/disabled-packages/libffi-updated/build.sh
+++ b/disabled-packages/libffi-updated/build.sh
@ -7,7 +7,6 @@ TERMUX_PKG_SRCURL=https://github.com/libffi/libffi/archive/${_COMMIT}.zip
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-multi-os-directory"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --enable-symvers=no"
 TERMUX_PKG_RM_AFTER_INSTALL="lib/libffi-${TERMUX_PKG_VERSION}/include"
-TERMUX_PKG_FOLDERNAME=libffi-$_COMMIT

 termux_step_pre_configure () {
 	cd $TERMUX_PKG_SRCDIR
--- a/disabled-packages/libusb/build.sh
+++ b/disabled-packages/libusb/build.sh
@ -3,7 +3,6 @@ TERMUX_PKG_DESCRIPTION="A cross-platform user library to access USB devices"
 TERMUX_PKG_VERSION=1.0.21
 TERMUX_PKG_SRCURL=https://github.com/libusb/libusb/archive/v${TERMUX_PKG_VERSION}.zip
 TERMUX_PKG_SHA256=83895453d7b6e8149ba3c2aaac796615a80a6a599a94458e73029fef12d1721c
-TERMUX_PKG_FOLDERNAME=libusb-${TERMUX_PKG_VERSION}
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-udev"

 termux_step_pre_configure() {
--- a/disabled-packages/mtr/build.sh
+++ b/disabled-packages/mtr/build.sh
@ -6,7 +6,6 @@ TERMUX_PKG_DESCRIPTION="Network diagnostic tool"
 TERMUX_PKG_VERSION=0.92
 TERMUX_PKG_SHA256=568a52911a8933496e60c88ac6fea12379469d7943feb9223f4337903e4bc164
 TERMUX_PKG_SRCURL=https://github.com/traviscross/mtr/archive/v${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_FOLDERNAME=mtr-$TERMUX_PKG_VERSION
 TERMUX_PKG_DEPENDS="ncurses"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--without-gtk --disable-ipv6"

--- a/disabled-packages/nethack/build.sh
+++ b/disabled-packages/nethack/build.sh
@ -2,7 +2,6 @@ TERMUX_PKG_HOMEPAGE=http://www.nethack.org/
 TERMUX_PKG_DESCRIPTION="Dungeon crawl game"
 TERMUX_PKG_VERSION=3.6.0
 TERMUX_PKG_SRCURL=https://s3.amazonaws.com/altorg/nethack/nethack-360-src.tgz
-TERMUX_PKG_FOLDERNAME=nethack-3.6.0
 TERMUX_PKG_BUILD_IN_SRC=yes
 TERMUX_PKG_DEPENDS="ncurses"

--- a/disabled-packages/openjdk-9-jre-headless/build.sh
+++ b/disabled-packages/openjdk-9-jre-headless/build.sh
@ -49,7 +49,6 @@ _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_PKG_FOLDERNAME=dev-${changesets[0]}

 termux_step_post_extract_package () {
 	cd "$TERMUX_PKG_TMPDIR"
--- a/disabled-packages/premake/build.sh
+++ b/disabled-packages/premake/build.sh
@ -2,7 +2,6 @@ TERMUX_PKG_HOMEPAGE=http://premake.github.io/
 TERMUX_PKG_DESCRIPTION="Build script generator"
 TERMUX_PKG_VERSION=4.4-beta5
 TERMUX_PKG_SRCURL=http://downloads.sourceforge.net/project/premake/Premake/4.4/premake-${TERMUX_PKG_VERSION}-src.zip
-TERMUX_PKG_FOLDERNAME=premake-${TERMUX_PKG_VERSION}
 # TERMUX_PKG_DEPENDS="pcre, openssl, libuuid"
 # TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--with-ssl=openssl"

--- a/disabled-packages/racket/build.sh
+++ b/disabled-packages/racket/build.sh
@ -3,7 +3,6 @@ TERMUX_PKG_DESCRIPTION="Full-spectrum programming language going beyond Lisp and
 TERMUX_PKG_VERSION=6.7
 TERMUX_PKG_SRCURL=https://mirror.racket-lang.org/installers/${TERMUX_PKG_VERSION}/racket-minimal-${TERMUX_PKG_VERSION}-src-builtpkgs.tgz
 TERMUX_PKG_SHA256=4203d9b51a0de7ea549db966cfa49a736f8605ab51e2f198cbdb9cfaf428b0f3
-TERMUX_PKG_FOLDERNAME=racket-${TERMUX_PKG_VERSION}
 TERMUX_PKG_HOSTBUILD=true
 TERMUX_PKG_DEPENDS="libffi, libandroid-support"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--enable-racket=$TERMUX_PKG_HOSTBUILD_DIR/racket/racketcgc"
--- a/disabled-packages/sbcl/build.sh
+++ b/disabled-packages/sbcl/build.sh
@ -2,7 +2,6 @@ TERMUX_PKG_HOMEPAGE=http://www.sbcl.org/
 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_PKG_FOLDERNAME=sbcl-$TERMUX_PKG_VERSION

 termux_step_pre_configure () {
 	local SBCL_HOST_TARFILE=$TERMUX_PKG_CACHEDIR/sbcl-host-${TERMUX_PKG_VERSION}.tar.bz2
--- a/packages/angband/build.sh
+++ b/packages/angband/build.sh
@ -7,7 +7,6 @@ TERMUX_PKG_DEPENDS="ncurses"
 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_PKG_FOLDERNAME=angband-master

 termux_step_pre_configure () {
 	./autogen.sh
--- a/packages/apksigner/build.sh
+++ b/packages/apksigner/build.sh
@ -3,7 +3,6 @@ TERMUX_PKG_DESCRIPTION="APK signing tool"
 TERMUX_PKG_VERSION=0.4
 TERMUX_PKG_SRCURL=https://github.com/fornwall/apksigner/archive/v${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=1da8fecccf5fadef94a5ba05c19fe4e95a695407550d9fe1ed34e48efd9d1b68
-TERMUX_PKG_FOLDERNAME=apksigner-${TERMUX_PKG_VERSION}
 TERMUX_PKG_BUILD_IN_SRC=yes
 TERMUX_PKG_PLATFORM_INDEPENDENT=true

--- a/packages/apt/build.sh
+++ b/packages/apt/build.sh
@ -12,7 +12,6 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -DUSE_NLS=OFF
 -DWITH_DOC=OFF
 "
-TERMUX_PKG_FOLDERNAME=apt-${TERMUX_PKG_VERSION}
 TERMUX_PKG_ESSENTIAL=yes
 TERMUX_PKG_CONFFILES="etc/apt/sources.list"
 TERMUX_PKG_CONFLICTS=apt-transport-https
--- a/packages/asciinema/build.sh
+++ b/packages/asciinema/build.sh
@ -5,7 +5,6 @@ TERMUX_PKG_VERSION=1.4.0
 TERMUX_PKG_DEPENDS="python, ncurses-utils"
 TERMUX_PKG_SRCURL=https://github.com/asciinema/asciinema/archive/v${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=841a55b0f51988d5e155e99badbd6ce5cf3b43cca2ba15cd20c971a19719dc9a
-TERMUX_PKG_FOLDERNAME=asciinema-${TERMUX_PKG_VERSION}
 TERMUX_PKG_BUILD_IN_SRC=yes
 TERMUX_PKG_PLATFORM_INDEPENDENT=yes

--- a/packages/attr/build.sh
+++ b/packages/attr/build.sh
@ -3,7 +3,6 @@ TERMUX_PKG_DESCRIPTION="Utilities for manipulating filesystem extended attribute
 TERMUX_PKG_VERSION=2.4.47
 TERMUX_PKG_SRCURL=http://download.savannah.gnu.org/releases/attr/attr-${TERMUX_PKG_VERSION}.src.tar.gz
 TERMUX_PKG_SHA256=25772f653ac5b2e3ceeb89df50e4688891e21f723c460636548971652af0a859
-TERMUX_PKG_FOLDERNAME=attr-$TERMUX_PKG_VERSION
 TERMUX_PKG_BUILD_IN_SRC=yes
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--enable-gettext=no"
 TERMUX_PKG_MAKE_INSTALL_TARGET="install install-lib"
--- a/packages/babl/build.sh
+++ b/packages/babl/build.sh
@ -3,7 +3,6 @@ TERMUX_PKG_DESCRIPTION="Dynamic pixel format translation library"
 TERMUX_PKG_VERSION=0.1.30
 TERMUX_PKG_SHA256=562ba7b1290d93d55029a92f700f2ec8602349b3acc7ae201188146b96e186be
 TERMUX_PKG_SRCURL=https://github.com/GNOME/babl/archive/BABL_${TERMUX_PKG_VERSION//./_}.tar.gz
-TERMUX_PKG_FOLDERNAME=babl-BABL_${TERMUX_PKG_VERSION//./_}

 termux_step_pre_configure() {
 	NOCONFIGURE=1 ./autogen.sh
--- a/packages/bash-completion/build.sh
+++ b/packages/bash-completion/build.sh
@ -3,6 +3,5 @@ TERMUX_PKG_DESCRIPTION="Programmable completion for the bash shell"
 TERMUX_PKG_VERSION=2.7
 TERMUX_PKG_SRCURL=https://github.com/scop/bash-completion/releases/download/${TERMUX_PKG_VERSION}/bash-completion-${TERMUX_PKG_VERSION}.tar.xz
 TERMUX_PKG_SHA256=41ba892d3f427d4a686de32673f35401bc947a7801f684127120cdb13641441e
-TERMUX_PKG_FOLDERNAME=bash-completion-${TERMUX_PKG_VERSION}
 TERMUX_PKG_DEPENDS="bash"
 TERMUX_PKG_PLATFORM_INDEPENDENT=yes
--- a/packages/bmon/build.sh
+++ b/packages/bmon/build.sh
@ -4,7 +4,6 @@ TERMUX_PKG_VERSION=4.0
 TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://github.com/tgraf/bmon/archive/v$TERMUX_PKG_VERSION.tar.gz
 TERMUX_PKG_SHA256=d5e503ff6b116c681ebf4d10e238604dde836dceb9c0008eb92416a96c87ca40
-TERMUX_PKG_FOLDERNAME=bmon-$TERMUX_PKG_VERSION
 TERMUX_PKG_DEPENDS="libconfuse, libnl, ncurses"
 TERMUX_PKG_BUILD_IN_SRC=yes

--- a/packages/boost/build.sh
+++ b/packages/boost/build.sh
@ -4,7 +4,6 @@ TERMUX_PKG_VERSION=1.64.0
 TERMUX_PKG_REVISION=3
 TERMUX_PKG_SHA256=7bcc5caace97baa948931d712ea5f37038dbb1c5d89b43ad4def4ed7cb683332
 TERMUX_PKG_SRCURL=http://sourceforge.net/projects/boost/files/boost/${TERMUX_PKG_VERSION}/boost_${TERMUX_PKG_VERSION//./_}.tar.bz2
-TERMUX_PKG_FOLDERNAME="boost_${TERMUX_PKG_VERSION//./_}"
 TERMUX_PKG_BUILD_IN_SRC=yes
 TERMUX_PKG_DEPENDS="libbz2"

--- a/packages/brogue/build.sh
+++ b/packages/brogue/build.sh
@ -7,7 +7,6 @@ TERMUX_PKG_SHA256=9e313521c4004566ab1518402393f5bd1cc14df097a283c2cc614998b9097e
 TERMUX_PKG_DEPENDS="ncurses"
 TERMUX_PKG_EXTRA_MAKE_ARGS="curses"
 TERMUX_PKG_BUILD_IN_SRC=yes
-TERMUX_PKG_FOLDERNAME=brogue-${TERMUX_PKG_VERSION}

 termux_step_pre_configure () {
 	CC="$CC $CFLAGS $CPPFLAGS $LDFLAGS"
--- a/packages/bvi/build.sh
+++ b/packages/bvi/build.sh
@ -5,7 +5,6 @@ TERMUX_PKG_VERSION=1.4.0
 TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=http://sourceforge.net/projects/bvi/files/bvi/${TERMUX_PKG_VERSION}/bvi-${TERMUX_PKG_VERSION}.src.tar.gz
 TERMUX_PKG_SHA256=015a3c2832c7c097d98a5527deef882119546287ba8f2a70c736227d764ef802
-TERMUX_PKG_FOLDERNAME=bvi-${TERMUX_PKG_VERSION}
 TERMUX_PKG_BUILD_IN_SRC="yes"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="ac_cv_lib_ncursesw6_addnwstr=yes"
 TERMUX_PKG_RM_AFTER_INSTALL="share/applications share/pixmaps"
--- a/packages/byobu/build.sh
+++ b/packages/byobu/build.sh
@ -1,7 +1,6 @@
 TERMUX_PKG_HOMEPAGE=http://byobu.co/
 TERMUX_PKG_DESCRIPTION="Byobu is a GPLv3 open source text-based window manager and terminal multiplexer"
 TERMUX_PKG_VERSION=5.122
-TERMUX_PKG_FOLDERNAME="byobu-${TERMUX_PKG_VERSION}"
 TERMUX_PKG_SRCURL=https://launchpad.net/byobu/trunk/${TERMUX_PKG_VERSION}/+download/byobu_${TERMUX_PKG_VERSION}.orig.tar.gz
 TERMUX_PKG_SHA256=0e5f14db8340712cf5b1049002c5b7f2a116ca28e6df418cb7500d3c4fa43234
 TERMUX_PKG_DEPENDS="gawk, tmux"
--- a/packages/cava/build.sh
+++ b/packages/cava/build.sh
@ -4,7 +4,6 @@ TERMUX_PKG_VERSION=0.6.0
 TERMUX_PKG_MAINTAINER="Oliver Schmidhauser @Neo-Oli"
 TERMUX_PKG_SRCURL=https://github.com/karlstav/cava/archive/${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=42d51c6c283cd2b0f5125954ea8c61a12385703d1953ef9c40103402c7a744dc
-TERMUX_PKG_FOLDERNAME=cava-$TERMUX_PKG_VERSION
 TERMUX_PKG_DEPENDS="ncurses,fftw"
 TERMUX_PKG_BUILD_DEPENDS="libtool"
 TERMUX_PKG_BUILD_IN_SRC=yes
--- a/packages/cgdb/build.sh
+++ b/packages/cgdb/build.sh
@ -5,7 +5,6 @@ TERMUX_PKG_VERSION=0.7.0
 TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://cgdb.me/files/cgdb-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=bf7a9264668db3f9342591b08b2cc3bbb08e235ba2372877b4650b70c6fb5423
-TERMUX_PKG_FOLDERNAME=cgdb-${TERMUX_PKG_VERSION}
 TERMUX_PKG_BUILD_IN_SRC="yes"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 ac_cv_lib_ncursesw6_addnwstr=yes ac_cv_file__dev_ptmx=yes
--- a/packages/cmark/build.sh
+++ b/packages/cmark/build.sh
@ -3,4 +3,3 @@ TERMUX_PKG_DESCRIPTION="CommonMark parsing and rendering program"
 TERMUX_PKG_VERSION=0.28.0
 TERMUX_PKG_SHA256=68cf191f4a78494a43b7e1663506635e370f0ba4c67c9ee9518e295685bbfe0e
 TERMUX_PKG_SRCURL=https://github.com/jgm/cmark/archive/${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_FOLDERNAME=cmark-$TERMUX_PKG_VERSION
--- a/packages/cmatrix/build.sh
+++ b/packages/cmatrix/build.sh
@ -6,7 +6,6 @@ TERMUX_PKG_SHA256=6b0b9aff4585147843c4cf8a8c9c6048500f66dc4887a38922197dfa326b57
 TERMUX_PKG_SRCURL=https://github.com/abishekvashok/cmatrix/archive/${_REAL_VERSION}.tar.gz
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--mandir=$TERMUX_PREFIX/share/man"
 TERMUX_PKG_DEPENDS="ncurses"
-TERMUX_PKG_FOLDERNAME=cmatrix-${_REAL_VERSION}

 termux_step_pre_configure () {
 	export ac_cv_file__usr_lib_kbd_consolefonts=no
--- a/packages/cmus/build.sh
+++ b/packages/cmus/build.sh
@ -4,7 +4,6 @@ TERMUX_PKG_VERSION=2.7.1
 TERMUX_PKG_DEPENDS="libandroid-support, ncurses, libflac, libmad, libvorbis, opusfile, libcue, libpulseaudio"
 TERMUX_PKG_SRCURL=https://github.com/cmus/cmus/archive/v${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=8179a7a843d257ddb585f4c65599844bc0e516fe85e97f6f87a7ceade4eb5165
-TERMUX_PKG_FOLDERNAME=cmus-$TERMUX_PKG_VERSION
 TERMUX_PKG_BUILD_IN_SRC=yes

 termux_step_pre_configure() {
--- a/packages/cowsay/build.sh
+++ b/packages/cowsay/build.sh
@ -3,7 +3,6 @@ TERMUX_PKG_DESCRIPTION="Program which generates ASCII pictures of a cow with a m
 TERMUX_PKG_VERSION=3.03
 TERMUX_PKG_SRCURL=http://http.debian.net/debian/pool/main/c/cowsay/cowsay_3.03+dfsg1.orig.tar.gz
 TERMUX_PKG_SHA256=10bae895d9afb2d720d2211db58f396352b00fe1386c369ca3608cbf6497b839
-TERMUX_PKG_FOLDERNAME=cowsay-3.03+dfsg1
 TERMUX_PKG_DEPENDS="perl"
 TERMUX_PKG_PLATFORM_INDEPENDENT=yes

--- a/packages/ctags/build.sh
+++ b/packages/ctags/build.sh
@ -5,7 +5,6 @@ local _COMMIT=8a60622839c98ef6fac1c57a5563812393c56c1d
 TERMUX_PKG_SHA256=33bd6ada4889d4d023fb44f44d440a5bcf82606c99a378a694f2a001cb6d1a56
 TERMUX_PKG_SRCURL=https://github.com/universal-ctags/ctags/archive/${_COMMIT}.zip
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--enable-tmpdir=$TERMUX_PREFIX/tmp"
-TERMUX_PKG_FOLDERNAME=ctags-$_COMMIT
 TERMUX_PKG_BUILD_IN_SRC="yes"

 termux_step_pre_configure() {
--- a/packages/curseofwar/build.sh
+++ b/packages/curseofwar/build.sh
@ -5,7 +5,6 @@ TERMUX_PKG_VERSION=1.2.0
 TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://github.com/a-nikolaev/curseofwar/archive/v${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=91b7781e26341faa6b6999b6baf6e74ef532fa94303ab6a2bf9ff6d614a3f670
-TERMUX_PKG_FOLDERNAME="curseofwar-$TERMUX_PKG_VERSION"

 termux_step_make_install () {
 	mkdir -p $TERMUX_PREFIX/share/man/man6
--- a/packages/daemonize/build.sh
+++ b/packages/daemonize/build.sh
@ -4,5 +4,4 @@ TERMUX_PKG_VERSION=1.7.7
 TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://github.com/bmc/daemonize/archive/release-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=b3cafea3244ed5015a3691456644386fc438102adbdc305af553928a185bea05
-TERMUX_PKG_FOLDERNAME=daemonize-release-$TERMUX_PKG_VERSION
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="ac_cv_func_setpgrp_void=yes"
--- a/packages/darkhttpd/build.sh
+++ b/packages/darkhttpd/build.sh
@ -4,5 +4,4 @@ TERMUX_PKG_VERSION=1.12
 TERMUX_PKG_MAINTAINER="David Paskevic @casept"
 TERMUX_PKG_SRCURL=https://fossies.org/linux/www/darkhttpd-${TERMUX_PKG_VERSION}.tar.xz
 TERMUX_PKG_SHA256=2652bc7e3dab35fcb64453616771016017a135e4b263ef73a36d29662593d472
-TERMUX_PKG_FOLDERNAME=darkhttpd-$TERMUX_PKG_VERSION
 TERMUX_PKG_BUILD_IN_SRC=yes
--- a/packages/dcraw/build.sh
+++ b/packages/dcraw/build.sh
@ -4,7 +4,6 @@ TERMUX_PKG_VERSION=9.27.0
 TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=http://www.cybercom.net/~dcoffin/dcraw/archive/dcraw-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=c1d8cc4f19752a3d3aaab1fceb712ea85b912aa25f1f33f68c69cd42ef987099
-TERMUX_PKG_FOLDERNAME=dcraw
 TERMUX_PKG_BUILD_IN_SRC=yes
 TERMUX_PKG_DEPENDS="littlecms, libjasper, libjpeg-turbo"

--- a/packages/debianutils/build.sh
+++ b/packages/debianutils/build.sh
@ -4,4 +4,3 @@ TERMUX_PKG_VERSION=4.8.2
 TERMUX_PKG_SRCURL=http://ftp.debian.org/debian/pool/main/d/debianutils/debianutils_${TERMUX_PKG_VERSION}.tar.xz
 TERMUX_PKG_SHA256=4deb5f293fd3e43c5d4a625a30b18d0fb07662ff77f769e3272841cdb61e7c68
 TERMUX_PKG_RM_AFTER_INSTALL="bin/installkernel share/man/man8/installkernel.8"
-TERMUX_PKG_FOLDERNAME=debianutils-$TERMUX_PKG_VERSION
--- a/packages/dialog/build.sh
+++ b/packages/dialog/build.sh
@ -5,7 +5,6 @@ TERMUX_PKG_VERSION="1.3-20170509"
 TERMUX_PKG_SHA256=2ff1ba74c632b9d13a0d0d2c942295dd4e8909694eeeded7908a467d0bcd4756
 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_FOLDERNAME="dialog-$TERMUX_PKG_VERSION"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--with-ncursesw --enable-widec --with-pkg-config"

 termux_step_pre_configure () {
--- a/packages/dnsutils/build.sh
+++ b/packages/dnsutils/build.sh
@ -3,7 +3,6 @@ TERMUX_PKG_DESCRIPTION="Clients provided with BIND"
 TERMUX_PKG_VERSION=9.11.1-P3
 TERMUX_PKG_SHA256=52426e75432e46996dc90f24fca027805a341c38fbbb022b60dc9acd2677ccf4
 TERMUX_PKG_SRCURL="ftp://ftp.isc.org/isc/bind9/${TERMUX_PKG_VERSION}/bind-${TERMUX_PKG_VERSION}.tar.gz"
-TERMUX_PKG_FOLDERNAME="bind-$TERMUX_PKG_VERSION"
 TERMUX_PKG_DEPENDS="openssl, readline, resolv-conf"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 --with-ecdsa=no
--- a/packages/dvtm/build.sh
+++ b/packages/dvtm/build.sh
@ -4,7 +4,6 @@ TERMUX_PKG_VERSION=0.15
 TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://github.com/martanne/dvtm/archive/v${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=496eada13d8abaa8d772279746f78b0c6fed11b560599490f3e70ebc21197bf0
-TERMUX_PKG_FOLDERNAME=dvtm-$TERMUX_PKG_VERSION
 TERMUX_PKG_BUILD_IN_SRC=yes
 TERMUX_PKG_DEPENDS="libutil, ncurses"

--- a/packages/elinks/build.sh
+++ b/packages/elinks/build.sh
@ -4,7 +4,6 @@ TERMUX_PKG_VERSION=0.12pre6
 TERMUX_PKG_REVISION=4
 TERMUX_PKG_SRCURL=http://archive.ubuntu.com/ubuntu/pool/universe/e/elinks/elinks_0.12~pre6.orig.tar.gz
 TERMUX_PKG_SHA256=c0b3a7871f4aea954b0a66d5bbc6ce6de55ad17aa25aba3987f775707067c800
-TERMUX_PKG_FOLDERNAME=elinks-0.12pre6
 TERMUX_PKG_DEPENDS="libexpat, libidn, openssl, libbz2"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--enable-256-colors --enable-true-color --with-openssl --mandir=$TERMUX_PREFIX/share/man --without-gc"
 TERMUX_MAKE_PROCESSES=1
--- a/packages/erlang/build.sh
+++ b/packages/erlang/build.sh
@ -4,7 +4,6 @@ TERMUX_PKG_VERSION=20.0
 TERMUX_PKG_SHA256=fe80e1e14a2772901be717694bb30ac4e9a07eee0cc7a28988724cbd21476811
 TERMUX_PKG_DEPENDS="openssl, ncurses, libutil"
 TERMUX_PKG_SRCURL="http://erlang.org/download/otp_src_${TERMUX_PKG_VERSION}.tar.gz"
-TERMUX_PKG_FOLDERNAME="otp_src_$TERMUX_PKG_VERSION"
 TERMUX_PKG_HOSTBUILD="yes"
 TERMUX_PKG_BUILD_IN_SRC="yes"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--without-javac --with-ssl=${TERMUX_PREFIX} --with-termcap"
--- a/packages/espeak/build.sh
+++ b/packages/espeak/build.sh
@ -6,7 +6,6 @@ TERMUX_PKG_DESCRIPTION="Compact software speech synthesizer"
 TERMUX_PKG_VERSION=1.49.1
 TERMUX_PKG_SRCURL=https://github.com/espeak-ng/espeak-ng/releases/download/${TERMUX_PKG_VERSION}/espeak-ng-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=4502c6e352d587fda326e8a55763e7d7c28b40e82c9c4683258ecc0a339ed0d4
-TERMUX_PKG_FOLDERNAME=espeak-ng-${TERMUX_PKG_VERSION}
 TERMUX_PKG_BUILD_IN_SRC=yes
 TERMUX_PKG_HOSTBUILD=yes
 # --without-async due to that using pthread_cancel().
--- a/packages/fdupes/build.sh
+++ b/packages/fdupes/build.sh
@ -3,7 +3,6 @@ TERMUX_PKG_DESCRIPTION="Duplicates file detector"
 TERMUX_PKG_VERSION=1.6.1
 TERMUX_PKG_SRCURL=https://github.com/adrianlopezroche/fdupes/archive/v${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=9d6b6fdb0b8419815b4df3bdfd0aebc135b8276c90bbbe78ebe6af0b88ba49ea
-TERMUX_PKG_FOLDERNAME=fdupes-${TERMUX_PKG_VERSION}
 TERMUX_PKG_BUILD_IN_SRC=yes

 termux_step_configure() {
--- a/packages/ffmpeg/build.sh
+++ b/packages/ffmpeg/build.sh
@ -4,7 +4,6 @@ TERMUX_PKG_DESCRIPTION="Tools and libraries to manipulate a wide range of multim
 TERMUX_PKG_VERSION=3.3.4
 TERMUX_PKG_SHA256=98b97e1b908dfeb6aeb6d407e5a5eacdfc253a40c2d195f5867ed2d1d46ea957
 TERMUX_PKG_SRCURL=https://www.ffmpeg.org/releases/ffmpeg-${TERMUX_PKG_VERSION}.tar.xz
-TERMUX_PKG_FOLDERNAME=ffmpeg-$TERMUX_PKG_VERSION
 # libbz2 is used by matroska decoder:
 # libvpx is the VP8 & VP9 video encoder for WebM, see
 # https://trac.ffmpeg.org/wiki/Encode/VP8 and https://trac.ffmpeg.org/wiki/Encode/VP9
--- a/packages/fish/build.sh
+++ b/packages/fish/build.sh
@ -8,7 +8,6 @@ TERMUX_PKG_SHA256=7ee5bbd671c73e5323778982109241685d58a836e52013e18ee5d9f2e638fd
 # man is needed since fish calls apropos during command completion.
 TERMUX_PKG_DEPENDS="ncurses, libandroid-support, ncurses-utils, man, bc"
 TERMUX_PKG_BUILD_IN_SRC=yes
-TERMUX_PKG_FOLDERNAME=fish-$TERMUX_PKG_VERSION
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="ac_cv_file__proc_self_stat=yes"

 termux_step_pre_configure() {
--- a/packages/fossil/build.sh
+++ b/packages/fossil/build.sh
@ -5,7 +5,6 @@ TERMUX_PKG_VERSION=2.3
 TERMUX_PKG_REVISION=2
 TERMUX_PKG_SHA256=f073abf455a38ea0a08c3926d7445ab8115b145457f36c763ad9b74cd6a64a5d
 TERMUX_PKG_SRCURL=https://www.fossil-scm.org/index.html/uv/fossil-src-${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_FOLDERNAME=fossil-${TERMUX_PKG_VERSION}
 TERMUX_PKG_DEPENDS="libsqlite, openssl"

 termux_step_pre_configure () {
--- a/packages/frotz/build.sh
+++ b/packages/frotz/build.sh
@ -6,7 +6,6 @@ TERMUX_PKG_VERSION=2.44
 TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://github.com/DavidGriffith/frotz/archive/${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=dbb5eb3bc95275dcb984c4bdbaea58bc1f1b085b20092ce6e86d9f0bf3ba858f
-TERMUX_PKG_FOLDERNAME=frotz-${TERMUX_PKG_VERSION}
 TERMUX_PKG_BUILD_IN_SRC=yes

 termux_step_pre_configure() {
--- a/packages/fsmon/build.sh
+++ b/packages/fsmon/build.sh
@ -3,7 +3,6 @@ TERMUX_PKG_DESCRIPTION="Filesystem monitor with fanotify and inotify backends"
 TERMUX_PKG_VERSION=1.4
 TERMUX_PKG_SRCURL=https://github.com/nowsecure/fsmon/archive/${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=3458cefb430e3636089d458f873785481e887aeddda0e96a0cd7d16e27da7297
-TERMUX_PKG_FOLDERNAME="fsmon-$TERMUX_PKG_VERSION"
 TERMUX_PKG_BUILD_IN_SRC=yes

 termux_step_make() {
--- a/packages/fzf/build.sh
+++ b/packages/fzf/build.sh
@ -3,7 +3,6 @@ TERMUX_PKG_DESCRIPTION="Command-line fuzzy finder"
 TERMUX_PKG_VERSION=0.16.11
 TERMUX_PKG_SHA256=e3067d4ad58d7be51eba9a35c06518cd7145c0cc297882796c7e40285f268a99
 TERMUX_PKG_SRCURL=https://github.com/junegunn/fzf/archive/${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_FOLDERNAME=fzf-$TERMUX_PKG_VERSION
 TERMUX_PKG_BUILD_IN_SRC="yes"
 # Depend on findutils as fzf uses the -fstype option, which busybox
 # find does not support, when invoking find:
--- a/packages/gegl/build.sh
+++ b/packages/gegl/build.sh
@ -4,7 +4,6 @@ local _MAJOR_VERSION=0.3
 TERMUX_PKG_VERSION=${_MAJOR_VERSION}.18
 TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://download.gimp.org/pub/gegl/$_MAJOR_VERSION/gegl-${TERMUX_PKG_VERSION}.tar.bz2
-TERMUX_PKG_FOLDERNAME=gegl-$TERMUX_PKG_VERSION
 TERMUX_PKG_SHA256=d7858ef26ede136d14e3de188a9e9c0de7707061a9fb96d7d615fab4958491fb
 TERMUX_PKG_DEPENDS="libandroid-support, ffmpeg, babl, json-glib, libjpeg-turbo, libpng, libjasper, littlecms, libtiff, librsvg, glib"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
--- a/packages/getconf/build.sh
+++ b/packages/getconf/build.sh
@ -3,5 +3,4 @@ TERMUX_PKG_DESCRIPTION="Utility to print configuration values"
 TERMUX_PKG_VERSION=0.4
 TERMUX_PKG_SRCURL=https://github.com/termux/getconf/archive/v${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=3147e45e37ff4d419e67d624a575d03d12115ef73006c31991eedf08316bf6c7
-TERMUX_PKG_FOLDERNAME=getconf-$TERMUX_PKG_VERSION
 TERMUX_PKG_BUILD_IN_SRC=yes
--- a/packages/glulxe/build.sh
+++ b/packages/glulxe/build.sh
@ -3,7 +3,6 @@ TERMUX_PKG_DESCRIPTION="Interpreter for the Glulx portable VM for interactive fi
 TERMUX_PKG_VERSION=0.5.4
 TERMUX_PKG_SRCURL=http://www.eblong.com/zarf/glulx/glulxe-051.tar.gz
 TERMUX_PKG_SHA256=33c563bdbd0fdbae625e1a2441e9a6f40f1491f1cdc2a197bbd6cf2c32c3830d
-TERMUX_PKG_FOLDERNAME=glulxe
 TERMUX_PKG_BUILD_IN_SRC="yes"
 TERMUX_PKG_DEPENDS="ncurses"

--- a/packages/gmic/build.sh
+++ b/packages/gmic/build.sh
@ -2,7 +2,6 @@ TERMUX_PKG_HOMEPAGE="http://gmic.eu"
 TERMUX_PKG_DESCRIPTION="imageman"
 TERMUX_PKG_VERSION=2.0.2
 TERMUX_PKG_SRCURL=http://gmic.eu/files/source/gmic_$TERMUX_PKG_VERSION.tar.gz
-TERMUX_PKG_FOLDERNAME="gmic-$TERMUX_PKG_VERSION"
 TERMUX_PKG_SHA256=7da9f08d62a9d23fc8badbc7c819cf76f4a9ce3db763710268fdcb80d83ecfc6
 TERMUX_PKG_DEPENDS="graphicsmagick++, libcurl, fftw"
 TERMUX_PKG_REVISION=2
--- a/packages/golang/build.sh
+++ b/packages/golang/build.sh
@ -5,7 +5,6 @@ local _MAJOR_VERSION=1.9
 TERMUX_PKG_VERSION=2:${_MAJOR_VERSION}
 TERMUX_PKG_SRCURL=https://storage.googleapis.com/golang/go${_MAJOR_VERSION}.src.tar.gz
 TERMUX_PKG_SHA256=a4ab229028ed167ba1986825751463605264e44868362ca8e7accc8be057e993
-TERMUX_PKG_FOLDERNAME=go
 TERMUX_PKG_KEEP_STATIC_LIBRARIES=true
 TERMUX_PKG_DEPENDS="clang"

--- a/packages/googletest/build.sh
+++ b/packages/googletest/build.sh
@ -4,7 +4,6 @@ TERMUX_PKG_VERSION=1.8.0
 TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://github.com/google/googletest/archive/release-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=58a6f4277ca2bc8565222b3bbd58a177609e9c488e8a72649359ba51450db7d8
-TERMUX_PKG_FOLDERNAME=googletest-release-$TERMUX_PKG_VERSION
 TERMUX_PKG_NO_DEVELSPLIT=yes
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="-DBUILD_SHARED_LIBS=ON"

--- a/packages/gpsbabel/build.sh
+++ b/packages/gpsbabel/build.sh
@ -3,7 +3,6 @@ TERMUX_PKG_DESCRIPTION="GPS file conversion plus transfer to/from GPS units"
 TERMUX_PKG_VERSION=1.4.4
 TERMUX_PKG_SHA256=22860e913f093aa9124e295d52d1d4ae1afccaa67ed6bed6f1f8d8b0a45336d1
 TERMUX_PKG_SRCURL=https://github.com/gpsbabel/gpsbabel/archive/gpsbabel_${TERMUX_PKG_VERSION//./_}.tar.gz
-TERMUX_PKG_FOLDERNAME=gpsbabel-gpsbabel_${TERMUX_PKG_VERSION//./_}
 TERMUX_PKG_DEPENDS="libexpat"

 termux_step_post_extract_package () {
--- a/packages/hexcurse/build.sh
+++ b/packages/hexcurse/build.sh
@ -4,5 +4,4 @@ TERMUX_PKG_VERSION=1.60.0
 TERMUX_PKG_REVISION=2
 TERMUX_PKG_SRCURL=https://github.com/LonnyGomes/hexcurse/archive/v${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=f6919e4a824ee354f003f0c42e4c4cef98a93aa7e3aa449caedd13f9a2db5530
-TERMUX_PKG_FOLDERNAME=hexcurse-${TERMUX_PKG_VERSION}
 TERMUX_PKG_DEPENDS="ncurses"
--- a/packages/hub/build.sh
+++ b/packages/hub/build.sh
@ -4,7 +4,6 @@ TERMUX_PKG_VERSION=2.2.8
 TERMUX_PKG_SRCURL=https://github.com/github/hub/archive/v${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=5ff475990a5bd335bad8da2d140ea0966c33e6d03dac26bf1558bda94a02b924
 TERMUX_PKG_DEPENDS="git"
-TERMUX_PKG_FOLDERNAME=hub-${TERMUX_PKG_VERSION}

 termux_step_make_install() {
 	cd $TERMUX_PKG_SRCDIR
--- a/packages/hunspell/build.sh
+++ b/packages/hunspell/build.sh
@ -6,7 +6,6 @@ TERMUX_PKG_SRCURL=https://github.com/hunspell/hunspell/archive/v${TERMUX_PKG_VER
 TERMUX_PKG_SHA256=30f593733c50b794016bb03d31fd2a2071e4610c6fa4708e33edad2335102c49
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--with-ui --with-readline"
 TERMUX_PKG_DEPENDS="ncurses, readline, hunspell-en-us"
-TERMUX_PKG_FOLDERNAME=hunspell-${TERMUX_PKG_VERSION}
 TERMUX_PKG_BUILD_IN_SRC=yes

 termux_step_pre_configure() {
--- a/packages/hydra/build.sh
+++ b/packages/hydra/build.sh
@ -3,7 +3,6 @@ TERMUX_PKG_DESCRIPTION="Network logon cracker supporting different services"
 TERMUX_PKG_VERSION=8.6
 TERMUX_PKG_SHA256=05a87eb018507b24afca970081f067e64441460319fb75ca1e64c4a1f322b80b
 TERMUX_PKG_SRCURL=https://github.com/vanhauser-thc/thc-hydra/archive/${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_FOLDERNAME=thc-hydra-$TERMUX_PKG_VERSION
 TERMUX_PKG_BUILD_IN_SRC=yes
 TERMUX_PKG_DEPENDS="openssl, pcre, libssh"

--- a/packages/imagemagick/build.sh
+++ b/packages/imagemagick/build.sh
@ -3,7 +3,6 @@ TERMUX_PKG_DESCRIPTION="Suite to create, edit, compose, or convert images in a v
 TERMUX_PKG_VERSION="7.0.7-1"
 TERMUX_PKG_SHA256=5a45e29509dbb23793a9c8db5c47ef1114c1ee82c9ca60053eaf06b3fc243e2c
 TERMUX_PKG_SRCURL=https://github.com/ImageMagick/ImageMagick/archive/${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_FOLDERNAME=ImageMagick-${TERMUX_PKG_VERSION}
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 --disable-largefile
 --without-x
--- a/packages/imgflo/build.sh
+++ b/packages/imgflo/build.sh
@ -2,7 +2,6 @@ TERMUX_PKG_HOMEPAGE="http://www.imgflo.org/"
 TERMUX_PKG_DESCRIPTION="HTTP image processing server & Flowhub.io compatible runtime"
 TERMUX_PKG_VERSION=0.4.2
 TERMUX_PKG_SRCURL=https://github.com/imgflo/imgflo/archive/$TERMUX_PKG_VERSION.tar.gz
-TERMUX_PKG_FOLDERNAME=imgflo-$TERMUX_PKG_VERSION
 TERMUX_PKG_SHA256=4dd5fc9d34f3cfc294fd69a14d50ed5401abeb829132f1b1ac316e28223fc393
 TERMUX_PKG_DEPENDS="gegl, libsoup"
 TERMUX_PKG_BUILD_IN_SRC=yes
--- a/packages/ired/build.sh
+++ b/packages/ired/build.sh
@ -3,5 +3,4 @@ TERMUX_PKG_DESCRIPTION="Minimalist hexadecimal editor"
 TERMUX_PKG_VERSION=0.6
 TERMUX_PKG_SRCURL=https://github.com/radare/ired/archive/${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=c15d37b96b1a25c44435d824bd7ef1f9aea9dc191be14c78b689d3156312d58a
-TERMUX_PKG_FOLDERNAME=ired-${TERMUX_PKG_VERSION}
 TERMUX_PKG_BUILD_IN_SRC=yes
--- a/packages/irssi/build.sh
+++ b/packages/irssi/build.sh
@ -4,7 +4,6 @@ TERMUX_PKG_DEPENDS="ncurses, openssl, glib, libandroid-glob"
 TERMUX_PKG_VERSION=1.0.4
 TERMUX_PKG_SHA256=b85c07dbafe178213eccdc69f5f8f0ac024dea01c67244668f91ec1c06b986ca
 TERMUX_PKG_SRCURL=https://github.com/irssi/irssi/releases/download/$TERMUX_PKG_VERSION/irssi-$TERMUX_PKG_VERSION.tar.xz
-TERMUX_PKG_FOLDERNAME=irssi-${TERMUX_PKG_VERSION}
 TERMUX_PKG_BUILD_IN_SRC=yes

 termux_step_pre_configure () {
--- a/packages/joe/build.sh
+++ b/packages/joe/build.sh
@ -5,5 +5,4 @@ TERMUX_PKG_CONFLICTS="jupp"
 TERMUX_PKG_VERSION=4.4
 TERMUX_PKG_SRCURL=https://sourceforge.net/projects/joe-editor/files/JOE%20sources/joe-${TERMUX_PKG_VERSION}/joe-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=a5704828bbca29acb9e200414fef522c66cdf9ce28150f402d6767da43460979
-TERMUX_PKG_FOLDERNAME=joe-${TERMUX_PKG_VERSION}
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-termcap"
--- a/packages/jq/build.sh
+++ b/packages/jq/build.sh
@ -4,4 +4,3 @@ TERMUX_PKG_VERSION=1.5
 TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://github.com/stedolan/jq/archive/jq-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=d5667641d28c27d0c1e70de83e7f9bd8b2fed7fbf6a1d68731177d400a533c65
-TERMUX_PKG_FOLDERNAME=jq-jq-${TERMUX_PKG_VERSION}
--- a/packages/json-c/build.sh
+++ b/packages/json-c/build.sh
@ -4,7 +4,6 @@ TERMUX_PKG_VERSION=0.12.1
 TERMUX_PKG_MAINTAINER="Balazs Kutil @balazs_kutil"
 TERMUX_PKG_SRCURL=https://s3.amazonaws.com/json-c_releases/releases/json-c-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=2a136451a7932d80b7d197b10441e26e39428d67b1443ec43bbba824705e1123
-TERMUX_PKG_FOLDERNAME=json-c-${TERMUX_PKG_VERSION}

 termux_step_make () {
 	make \
--- a/packages/jsoncpp/build.sh
+++ b/packages/jsoncpp/build.sh
@ -3,7 +3,6 @@ TERMUX_PKG_DESCRIPTION="C++ library for interacting with JSON"
 TERMUX_PKG_VERSION=1.8.1
 TERMUX_PKG_SHA256=858db2faf348f89fdf1062bd3e79256772e897e7f17df73e0624edf004f2f9ac
 TERMUX_PKG_SRCURL=https://github.com/open-source-parsers/jsoncpp/archive/${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_FOLDERNAME=jsoncpp-${TERMUX_PKG_VERSION}
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -DBUILD_SHARED_LIBS=ON
 -DJSONCPP_WITH_TESTS=OFF
--- a/packages/jupp/build.sh
+++ b/packages/jupp/build.sh
@ -6,7 +6,6 @@ TERMUX_PKG_CONFLICTS="joe"
 TERMUX_PKG_VERSION=3.1jupp30
 TERMUX_PKG_SRCURL=https://pub.allbsd.org/MirOS/dist/jupp/joe-${TERMUX_PKG_VERSION}.tgz
 TERMUX_PKG_SHA256=65ddb346364a056c1d78a1cb406b0ebf6c9c2fbd753cd404b1b4c8fd3fa9916d
-TERMUX_PKG_FOLDERNAME=jupp
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-termcap --disable-getpwnam --disable-termidx --disable-dependency-tracking --enable-sysconfjoesubdir=/jupp"

 termux_step_post_extract_package() {
--- a/packages/kona/build.sh
+++ b/packages/kona/build.sh
@ -1,7 +1,6 @@
 TERMUX_PKG_HOMEPAGE=https://github.com/kevinlawler/kona
 TERMUX_PKG_DESCRIPTION="Open-source implementation of the APL-like K programming language"
 TERMUX_PKG_VERSION="3.39-69"
-TERMUX_PKG_FOLDERNAME=kona-Win.$TERMUX_PKG_VERSION
 TERMUX_PKG_SRCURL="https://github.com/kevinlawler/kona/archive/Win.${TERMUX_PKG_VERSION}.zip"
 TERMUX_PKG_SHA256=ba6d6e9a1ed58678011cdccdd94a2e42cc7bff8abfee94e8b2de9cd93f71785b
 TERMUX_PKG_BUILD_IN_SRC=yes
--- a/packages/krb5/build.sh
+++ b/packages/krb5/build.sh
@ -5,7 +5,6 @@ TERMUX_PKG_REVISION=2
 TERMUX_PKG_DEPENDS="libandroid-support, libandroid-glob, readline, openssl, libutil, libdb"
 TERMUX_PKG_SRCURL="https://web.mit.edu/kerberos/dist/krb5/1.15/krb5-$TERMUX_PKG_VERSION.tar.gz"
 TERMUX_PKG_SHA256=437c8831ddd5fde2a993fef425dedb48468109bb3d3261ef838295045a89eb45
-TERMUX_PKG_FOLDERNAME="krb5-$TERMUX_PKG_VERSION/src"
 TERMUX_PKG_MAINTAINER="Vishal Biswas @vishalbiswas"
 TERMUX_PKG_CONFFILES="etc/krb5.conf var/krb5kdc/kdc.conf"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--with-readline
@ -20,17 +19,21 @@ DEFKTNAME=$TERMUX_PREFIX/etc/krb5.keytab
 DEFCKTNAME=$TERMUX_PREFIX/var/krb5/user/%{euid}/client.keytab
 "

+termux_step_post_extract_package() {
+	TERMUX_PKG_SRCDIR+="/src"
+}
+
 termux_step_pre_configure () {
-    # cannot test these when cross compiling
-    export krb5_cv_attr_constructor_destructor='yes,yes'
-    export ac_cv_func_regcomp='yes'
-    export ac_cv_printf_positional='yes'
+	# cannot test these when cross compiling
+	export krb5_cv_attr_constructor_destructor='yes,yes'
+	export ac_cv_func_regcomp='yes'
+	export ac_cv_printf_positional='yes'

-    # bionic doesn't have getpass
-    cp "$TERMUX_PKG_BUILDER_DIR/netbsd_getpass.c" "$TERMUX_PKG_SRCDIR/clients/kpasswd/"
+	# bionic doesn't have getpass
+	cp "$TERMUX_PKG_BUILDER_DIR/netbsd_getpass.c" "$TERMUX_PKG_SRCDIR/clients/kpasswd/"

-    CFLAGS="$CFLAGS -D_PASSWORD_LEN=PASS_MAX"
-    LDFLAGS="$LDFLAGS -landroid-glob -llog"
+	CFLAGS="$CFLAGS -D_PASSWORD_LEN=PASS_MAX"
+	LDFLAGS="$LDFLAGS -landroid-glob -llog"
 }

 termux_step_post_make_install () {
--- a/packages/ledger/build.sh
+++ b/packages/ledger/build.sh
@ -3,6 +3,5 @@ TERMUX_PKG_DESCRIPTION="Powerful, double-entry accounting system"
 TERMUX_PKG_VERSION=3.1.1
 TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://github.com/ledger/ledger/archive/v${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_FOLDERNAME="ledger-${TERMUX_PKG_VERSION}"
 TERMUX_PKG_SHA256=90f06561ab692b192d46d67bc106158da9c6c6813cc3848b503243a9dfd8548a
 TERMUX_PKG_DEPENDS="boost, libedit, libmpfr, utf8cpp, libgmp"
--- a/packages/leptonica/build.sh
+++ b/packages/leptonica/build.sh
@ -5,7 +5,6 @@ TERMUX_PKG_DEPENDS="libjpeg-turbo, libpng, libtiff"
 TERMUX_PKG_SRCURL=https://github.com/DanBloomberg/leptonica/archive/${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=2092e126652ff07bc2569971a1d6c6411e1d481539d39c98031534c6f83dfc82
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--without-giflib --without-libwebp --without-libopenjpeg"
-TERMUX_PKG_FOLDERNAME=leptonica-$TERMUX_PKG_VERSION

 termux_step_pre_configure() {
 	./autobuild
--- a/packages/libandroid-shmem/build.sh
+++ b/packages/libandroid-shmem/build.sh
@ -3,5 +3,4 @@ TERMUX_PKG_DESCRIPTION="System V shared memory emulation on Android using ashmem
 TERMUX_PKG_VERSION=0.2
 TERMUX_PKG_SRCURL=https://github.com/termux/libandroid-shmem/archive/v${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=75e687f48c01d96ea1345f11c064ff76f7eb9a119f51ebe2f6253cf8b24a2b97
-TERMUX_PKG_FOLDERNAME=libandroid-shmem-$TERMUX_PKG_VERSION
 TERMUX_PKG_BUILD_IN_SRC=yes
--- a/packages/libandroid-support/build.sh
+++ b/packages/libandroid-support/build.sh
@ -3,7 +3,6 @@ TERMUX_PKG_DESCRIPTION="Library extending the Android C library (Bionic) for add
 TERMUX_PKG_VERSION=22
 TERMUX_PKG_SHA256=667f20d0821a6305c50c667363486d546b293e846f31d02f559947d50121f51e
 TERMUX_PKG_SRCURL=https://github.com/termux/libandroid-support/archive/v${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_FOLDERNAME=libandroid-support-$TERMUX_PKG_VERSION
 TERMUX_PKG_BUILD_IN_SRC=yes
 TERMUX_PKG_ESSENTIAL=yes

--- a/packages/libconfig/build.sh
+++ b/packages/libconfig/build.sh
@ -4,4 +4,3 @@ TERMUX_PKG_VERSION=1.5
 TERMUX_PKG_SRCURL=https://launchpad.net/ubuntu/+archive/primary/+files/libconfig_${TERMUX_PKG_VERSION}.orig.tar.gz
 # TERMUX_PKG_SRCURL=http://www.hyperrealm.com/libconfig/libconfig-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=e31daa390d8e4461c8830512fe2e13ba1a3d6a02a2305a02429eec61e68703f6
-TERMUX_PKG_FOLDERNAME=libconfig-${TERMUX_PKG_VERSION}
--- a/packages/libcue/build.sh
+++ b/packages/libcue/build.sh
@ -3,7 +3,6 @@ TERMUX_PKG_DESCRIPTION="CUE Sheet Parser Library"
 TERMUX_PKG_VERSION=2.1.0
 TERMUX_PKG_SRCURL=https://github.com/lipnitsk/libcue/archive/v${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=288ddd01e5f9e8f901d0c205d31507e4bdffd2540fa86073f2fe82de066d2abb
-TERMUX_PKG_FOLDERNAME=libcue-$TERMUX_PKG_VERSION
 # To avoid picking up cross-compiled flex and bison:
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -DBISON_EXECUTABLE=`which bison`
--- a/packages/libevent/build.sh
+++ b/packages/libevent/build.sh
@ -6,7 +6,6 @@ TERMUX_PKG_SRCURL=https://github.com/libevent/libevent/archive/release-${TERMUX_
 TERMUX_PKG_SHA256=316ddb401745ac5d222d7c529ef1eada12f58f6376a66c1118eee803cb70f83d
 # Strip away libevent core, extra and openssl libraries until someone uses them
 TERMUX_PKG_RM_AFTER_INSTALL="bin/event_rpcgen.py lib/libevent_*"
-TERMUX_PKG_FOLDERNAME=libevent-release-${TERMUX_PKG_VERSION}-stable
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -DEVENT__BUILD_SHARED_LIBRARIES=ON
 -DEVENT__DISABLE_BENCHMARK=ON
--- a/packages/libgit2/build.sh
+++ b/packages/libgit2/build.sh
@ -6,4 +6,3 @@ TERMUX_PKG_SRCURL=https://github.com/libgit2/libgit2/archive/v${TERMUX_PKG_VERSI
 TERMUX_PKG_SHA256=6a62393e0ceb37d02fe0d5707713f504e7acac9006ef33da1e88960bd78b6eac
 TERMUX_PKG_DEPENDS="libcurl, openssl"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="-DBUILD_CLAR=OFF"
-TERMUX_PKG_FOLDERNAME=libgit2-$TERMUX_PKG_VERSION
--- a/packages/libgraphite/build.sh
+++ b/packages/libgraphite/build.sh
@ -4,5 +4,4 @@ TERMUX_PKG_VERSION=1.3.10
 TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://github.com/silnrsi/graphite/archive/${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=68908cf38cfe09d8aadbbb2c5197f1784e3c1df4be315a462f59e2a1f85cbbc2
-TERMUX_PKG_FOLDERNAME=graphite-$TERMUX_PKG_VERSION
 TERMUX_PKG_RM_AFTER_INSTALL="bin/gr2fonttest"
--- a/packages/libgrpc/build.sh
+++ b/packages/libgrpc/build.sh
@ -5,7 +5,6 @@ TERMUX_PKG_SHA256=39545c6e3d5a41c6cdd42ef7ff8288bc58bacf47b791ed324268cdfa999db9
 TERMUX_PKG_MAINTAINER="Vishal Biswas @vishalbiswas"
 TERMUX_PKG_SRCURL=https://github.com/grpc/grpc/archive/v$TERMUX_PKG_VERSION.tar.gz
 TERMUX_PKG_DEPENDS="openssl, protobuf, c-ares"
-TERMUX_PKG_FOLDERNAME=grpc-$TERMUX_PKG_VERSION
 TERMUX_PKG_HOSTBUILD=true
 TERMUX_PKG_KEEP_STATIC_LIBRARIES=true
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
--- a/packages/libicu/build.sh
+++ b/packages/libicu/build.sh
@ -4,19 +4,12 @@ TERMUX_PKG_VERSION=59.1
 TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=http://download.icu-project.org/files/icu4c/${TERMUX_PKG_VERSION/_/}/icu4c-${TERMUX_PKG_VERSION//./_}-src.tgz
 TERMUX_PKG_SHA256=7132fdaf9379429d004005217f10e00b7d2319d0fea22bdfddef8991c45b75fe
-TERMUX_PKG_FOLDERNAME="icu/source"
 TERMUX_PKG_INCLUDE_IN_DEVPACKAGE="bin/icu-config share/man/man1/icu-config.1 lib/icu share/icu"
 TERMUX_PKG_HOSTBUILD=true
 TERMUX_PKG_EXTRA_HOSTBUILD_CONFIGURE_ARGS="--disable-samples --disable-tests"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-samples --disable-tests --with-cross-build=$TERMUX_PKG_HOSTBUILD_DIR"
 TERMUX_PKG_MAINTAINER='Vishal Biswas @vishalbiswas'

-termux_step_post_extract_package () {
-	# LICENSE resides outside of actual src
-        mv "$TERMUX_PKG_TMPDIR/icu/LICENSE" "$TERMUX_PKG_SRCDIR/../"
+termux_step_post_extract_package() {
+	TERMUX_PKG_SRCDIR+="/source"
 }
-
-termux_step_post_make_install () {
-	rm "$TERMUX_PKG_SRCDIR/../LICENSE"
-}
-
--- a/packages/libjasper/build.sh
+++ b/packages/libjasper/build.sh
@ -3,7 +3,6 @@ TERMUX_PKG_DESCRIPTION="Library for manipulating JPEG-2000 files"
 TERMUX_PKG_VERSION=2.0.13
 TERMUX_PKG_SRCURL=https://github.com/mdadams/jasper/archive/version-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=b50413b41bfc82ae419298b41eadcde1aa31f362fb9dc2ac089e5cbc19f60c24
-TERMUX_PKG_FOLDERNAME=jasper-version-$TERMUX_PKG_VERSION
 TERMUX_PKG_DEPENDS="libjpeg-turbo"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -H$TERMUX_PKG_SRCDIR
--- a/packages/libmesode/build.sh
+++ b/packages/libmesode/build.sh
@ -4,7 +4,6 @@ TERMUX_PKG_VERSION=0.9.1
 TERMUX_PKG_MAINTAINER="Oliver Schmidhauser @Neo-Oli"
 TERMUX_PKG_SRCURL=https://github.com/boothj5/libmesode/archive/${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=e693ea1577f0d9e6e58dd8ada9825c359784a225620cbc2fde7295369d295245
-TERMUX_PKG_FOLDERNAME=libmesode-$TERMUX_PKG_VERSION
 TERMUX_PKG_DEPENDS="openssl,libexpat"
 TERMUX_PKG_BUILD_IN_SRC=yes

--- a/packages/libnghttp2/build.sh
+++ b/packages/libnghttp2/build.sh
@ -3,7 +3,6 @@ TERMUX_PKG_DESCRIPTION="nghttp HTTP 2.0 library"
 TERMUX_PKG_VERSION=1.25.0
 TERMUX_PKG_SHA256=9553f144e60aa0d7bc5245df1c0f6a867a9fd9dc35ed6f358c6122a844d52f62
 TERMUX_PKG_SRCURL=https://github.com/nghttp2/nghttp2/releases/download/v${TERMUX_PKG_VERSION}/nghttp2-${TERMUX_PKG_VERSION}.tar.xz
-TERMUX_PKG_FOLDERNAME="nghttp2-$TERMUX_PKG_VERSION"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--enable-lib-only"
 # The tools are not built due to --enable-lib-only:
 TERMUX_PKG_RM_AFTER_INSTALL="share/man/man1 share/nghttp2/fetch-ocsp-response"
--- a/packages/libprotobuf/build.sh
+++ b/packages/libprotobuf/build.sh
@ -3,7 +3,6 @@ TERMUX_PKG_DESCRIPTION="Protocol buffers C++ library"
 TERMUX_PKG_VERSION=3.4.1
 TERMUX_PKG_SHA256=8e0236242106e680b4f9f576cc44b8cd711e948b20a9fc07769b0a20ceab9cc4
 TERMUX_PKG_SRCURL=https://github.com/google/protobuf/archive/v${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_FOLDERNAME=protobuf-$TERMUX_PKG_VERSION
 TERMUX_PKG_HOSTBUILD=yes
 TERMUX_PKG_BUILD_IN_SRC=yes
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--with-protoc=$TERMUX_PKG_HOSTBUILD_DIR/src/protoc"
--- a/packages/librhash/build.sh
+++ b/packages/librhash/build.sh
@ -2,7 +2,6 @@ TERMUX_PKG_HOMEPAGE=http://rhash.sourceforge.net/
 TERMUX_PKG_VERSION=1.3.4
 TERMUX_PKG_SRCURL=https://github.com/rhash/RHash/archive/v$TERMUX_PKG_VERSION.tar.gz
 TERMUX_PKG_SHA256=1f6daa0c066c94d2575f0aace76f34e5800c51f59f4b30029ddcfa9799564f98
-TERMUX_PKG_FOLDERNAME=RHash-$TERMUX_PKG_VERSION
 TERMUX_PKG_DESCRIPTION="Console utility for calculation and verification of magnet links and a wide range of hash sums"
 TERMUX_PKG_DEPENDS="openssl"
 TERMUX_PKG_BUILD_IN_SRC=true
--- a/packages/librsync/build.sh
+++ b/packages/librsync/build.sh
@ -3,7 +3,6 @@ TERMUX_PKG_DESCRIPTION="Remote delta-compression library"
 TERMUX_PKG_VERSION=2.0.0
 TERMUX_PKG_SRCURL=https://github.com/librsync/librsync/archive/v${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=b5c4dd114289832039397789e42d4ff0d1108ada89ce74f1999398593fae2169
-TERMUX_PKG_FOLDERNAME=librsync-${TERMUX_PKG_VERSION}
 TERMUX_PKG_DEPENDS="libbz2"
 TERMUX_PKG_BUILD_DEPENDS="libpopt"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="-DPERL_EXECUTABLE=`which perl`"
--- a/packages/libunibilium/build.sh
+++ b/packages/libunibilium/build.sh
@ -4,7 +4,6 @@ TERMUX_PKG_VERSION=1.2.1
 TERMUX_PKG_SHA256=6045b4f6adca7b1123284007675ca71f718f70942d3a93d8b9fa5bd442006ec1
 TERMUX_PKG_SRCURL=https://github.com/mauke/unibilium/archive/v${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_BUILD_IN_SRC=yes
-TERMUX_PKG_FOLDERNAME=unibilium-${TERMUX_PKG_VERSION}

 termux_step_make () {
 	return
--- a/packages/libunwind/build.sh
+++ b/packages/libunwind/build.sh
@ -5,7 +5,6 @@ local _COMMIT=2b8ab794b3a636c05396fdbaebbba25d8aa4722a
 TERMUX_PKG_VERSION=1.2.20170304
 TERMUX_PKG_SRCURL=https://github.com/libunwind/libunwind/archive/${_COMMIT}.zip
 TERMUX_PKG_SHA256=fdbe8f0348a0db86663fdf7a363fcb281fef220f85bd751db8ed13aca00c062d
-TERMUX_PKG_FOLDERNAME=libunwind-$_COMMIT
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 --disable-tests
 --disable-coredump
--- a/packages/libvpx/build.sh
+++ b/packages/libvpx/build.sh
@ -4,7 +4,6 @@ TERMUX_PKG_VERSION=1.6.1
 TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://github.com/webmproject/libvpx/archive/v${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=cda8bb6f0e4848c018177d3a576fa83ed96d762554d7010fe4cfb9d70c22e588
-TERMUX_PKG_FOLDERNAME=libvpx-${TERMUX_PKG_VERSION}

 termux_step_configure () {
 	# Force fresh install of header files:
--- a/packages/libvterm/build.sh
+++ b/packages/libvterm/build.sh
@ -5,7 +5,6 @@ TERMUX_PKG_VERSION=17.08.04
 _COMMIT=6fe2c783d15942f26abdba53eb4144c04e105c96
 TERMUX_PKG_SHA256=ed945b667d41641cc71f575a0a51786da3f3f5e8f2bdc5ce20ee0e5b6e26f6f6
 TERMUX_PKG_SRCURL=https://github.com/neovim/libvterm/archive/$_COMMIT.zip
-TERMUX_PKG_FOLDERNAME=libvterm-$_COMMIT
 TERMUX_PKG_BUILD_IN_SRC=yes

 termux_step_make () {
--- a/packages/libx265/build.sh
+++ b/packages/libx265/build.sh
@ -3,7 +3,6 @@ TERMUX_PKG_DESCRIPTION="H.265/HEVC video stream encoder library"
 TERMUX_PKG_VERSION=2.5
 TERMUX_PKG_SRCURL=http://ftp.videolan.org/pub/videolan/x265/x265_${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=2e53259b504a7edb9b21b9800163b1ff4c90e60c74e23e7001d423c69c5d3d17
-TERMUX_PKG_FOLDERNAME=x265_$TERMUX_PKG_VERSION

 termux_step_pre_configure () {
 	if [ $TERMUX_ARCH = "i686" ]; then
--- a/packages/libzopfli/build.sh
+++ b/packages/libzopfli/build.sh
@ -4,7 +4,6 @@ TERMUX_PKG_VERSION=1.0.1
 TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://github.com/google/zopfli/archive/zopfli-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=29743d727a4e0ecd1b93e0bf89476ceeb662e809ab2e6ab007a0b0344800e9b4
-TERMUX_PKG_FOLDERNAME=zopfli-zopfli-${TERMUX_PKG_VERSION}
 TERMUX_PKG_BUILD_IN_SRC=yes

 termux_step_post_make_install () {
--- a/packages/ltrace/build.sh
+++ b/packages/ltrace/build.sh
@ -6,7 +6,6 @@ TERMUX_PKG_DEPENDS="elfutils"
 local _COMMIT=2def9f1217374cc8371105993003b2c663aefda7
 TERMUX_PKG_SRCURL=https://github.com/dkogan/ltrace/archive/${_COMMIT}.zip
 TERMUX_PKG_SHA256=d089ae8affd8af782c12aed7ba97f44c7f55b60033ec78ab07e415e7b091a90c
-TERMUX_PKG_FOLDERNAME=ltrace-${_COMMIT}
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 --disable-werror
 --without-libunwind
--- a/Show More
+++ b/Show More