vars/build.vars, subr/pkg_setup_env.subr: automatically infer ${PKG_{SUB,BUILD_}DIR} from ${PKG_URLS_GIT}.

1 files changed, 0 insertions, 55 deletions

diff --git a/vars/build.vars b/vars/build.vars
index 5d611323..a6d191a8 100644
--- a/vars/build.vars
+++ b/vars/build.vars
@@ -83,8 +83,6 @@ export PATH="${PREFIX}/bin${PATH:+:${PATH}}";
 #
 INVARIANTS_PACKAGES="chainport";
 : ${PKG_CHAINPORT_URLS_GIT:="chainport=${GITROOT}/ports/chainport"};
-: ${PKG_CHAINPORT_BUILD_DIR:=chainport};
-: ${PKG_CHAINPORT_SUBDIR:=chainport};
 
 #
 # Build target host_toolchain
@@ -100,19 +98,16 @@ HOST_TOOLCHAIN_PREFIX="${PREFIX_CROSS}";
 : ${PKG_SLIBTOOL_HOST_URLS_GIT:="slibtool=${GITROOT}/slibtool"};
 : ${PKG_SLIBTOOL_HOST_CONFIGURE_ARGS:=--host= --prefix=};
 : ${PKG_SLIBTOOL_HOST_MAKEFLAGS_INSTALL:=DESTDIR=${PREFIX}};
-: ${PKG_SLIBTOOL_HOST_SUBDIR:=slibtool};
 : ${PKG_PERK_HOST_URLS_GIT:="perk=${GITROOT}/perk"};
 : ${PKG_PERK_HOST_CONFIGURE_ARGS:="--prefix=/usr"};
 : ${PKG_PERK_HOST_INSTALL_FILES:="@perk=bin/${TARGET}-perk"};
 : ${PKG_PERK_HOST_MAKEFLAGS_INSTALL:="DESTDIR=${PREFIX}"};
 : ${PKG_PERK_HOST_PREFIX:=${PREFIX}};
-: ${PKG_PERK_HOST_SUBDIR:=perk};
 : ${PKG_MDSO_HOST_URLS_GIT:="mdso=${GITROOT}/mdso"};
 : ${PKG_MDSO_HOST_CONFIGURE_ARGS:="--prefix=/usr"};
 : ${PKG_MDSO_HOST_INSTALL_FILES:="@mdso=bin/${TARGET}-mdso bin/mdso=${TARGET}/bin/mdso"};
 : ${PKG_MDSO_HOST_MAKEFLAGS_INSTALL:="DESTDIR=${PREFIX}"};
 : ${PKG_MDSO_HOST_PREFIX:=${PREFIX}};
-: ${PKG_MDSO_HOST_SUBDIR:=mdso};
 : ${PKG_BINUTILS_HOST_SHA256SUM:=250d3b2925c6b211fb16173b0b25bc091c58829fbcad3eb849645e0af52cf7fa};
 : ${PKG_BINUTILS_HOST_VERSION:=2.24.51};
 : ${PKG_BINUTILS_HOST_URL:=ftp://sourceware.org/pub/binutils/snapshots/binutils-${PKG_BINUTILS_HOST_VERSION}.tar.bz2};
@@ -129,7 +124,6 @@ HOST_TOOLCHAIN_PREFIX="${PREFIX_CROSS}";
 : ${PKG_GCC_STAGE1_VERSION:=4.6.4};
 : ${PKG_PSXSTUB_URLS_GIT:="psxstub=${GITROOT}/psxstub"};
 : ${PKG_PSXSTUB_BUILD_STEPS:="setup_env:always fetch:main install:main"};
-: ${PKG_PSXSTUB_SUBDIR:=psxstub};
 : ${PKG_MUSL_NO_COMPLEX_VERSION:=1.1.12};
 : ${PKG_GCC_RUNTIME_VERSION:=4.6.4};
 : ${PKG_MUSL_FULL_VERSION:=1.1.12};
@@ -141,7 +135,6 @@ HOST_TOOLCHAIN_PREFIX="${PREFIX_CROSS}";
 : ${PKG_PSXTYPES_HOST_BUILD_DIR:=psxtypes};
 : ${PKG_PSXTYPES_HOST_MAKEFLAGS_BUILD:="DESTDIR=${PREFIX_CROSS}"};
 : ${PKG_PSXTYPES_HOST_MAKEFLAGS_INSTALL:="DESTDIR=${PREFIX_CROSS}"};
-: ${PKG_PSXTYPES_HOST_SUBDIR:=psxtypes};
 : ${PKG_LDSO_HOST_URLS_GIT:=pemagine=${GITROOT}/pemagine};
 : ${PKG_LDSO_HOST_BUILD_TYPE:=cross};
 : ${PKG_LDSO_HOST_CFLAGS_CONFIGURE_EXTRA:="-O0 -DPE_LDSO -I${PREFIX_CROSS}/include"};
@@ -149,7 +142,6 @@ HOST_TOOLCHAIN_PREFIX="${PREFIX_CROSS}";
 : ${PKG_LDSO_HOST_INSTALL_FILES:="@../${TARGET}/lib/libldso.a=${PREFIX}/lib/libldso.a"};
 : ${PKG_LDSO_HOST_MAKEFLAGS_BUILD_EXTRA:=STATIC_LIB_NAME=libldso.a};
 : ${PKG_LDSO_HOST_MAKEFLAGS_INSTALL_EXTRA:="DESTDIR=${PREFIX_CROSS} STATIC_LIB_NAME=libldso.a"};
-: ${PKG_LDSO_HOST_SUBDIR:=pemagine};
 : ${PKG_PKGCONF_HOST_CONFIGURE_ARGS:="-C --prefix=${PREFIX_NATIVE}"};
 : ${PKG_PKGCONF_HOST_MAKEFLAGS_INSTALL_EXTRA:=prefix=${PREFIX}};
 : ${PKG_PKGCONF_HOST_SHA256SUM:=7ec8b516e655e247f4ba976837cee808134785819ab8f538f652fe919cc6c09f};
@@ -168,11 +160,9 @@ musl_native gcc_native gcc_stage1_native_x86_64_w64_mingw32 mdso";
 NATIVE_TOOLCHAIN_PREFIX="${PREFIX_NATIVE}";
 : ${PKG_SLIBTOOL_URLS_GIT:="slibtool=git://midipix.org/slibtool"};
 : ${PKG_SLIBTOOL_CONFIGURE_ARGS:="--host=${TARGET} --prefix= --target=${TARGET}"};
-: ${PKG_SLIBTOOL_SUBDIR:=slibtool};
 : ${PKG_PERK_URLS_GIT:="perk=${GITROOT}/perk"};
 : ${PKG_PERK_CONFIGURE_ARGS:="--prefix=/usr --target=${TARGET}"};
 : ${PKG_PERK_INSTALL_FILES:="@perk=bin/${TARGET}-perk"};
-: ${PKG_PERK_SUBDIR:=perk};
 : ${PKG_PKGCONF_SHA256SUM:=7ec8b516e655e247f4ba976837cee808134785819ab8f538f652fe919cc6c09f};
 : ${PKG_PKGCONF_VERSION:=0.9.12};
 : ${PKG_PKGCONF_URL:=https://github.com/pkgconf/pkgconf/releases/download/pkgconf-${PKG_PKGCONF_VERSION}/pkgconf-${PKG_PKGCONF_VERSION}.tar.bz2};
@@ -218,7 +208,6 @@ NATIVE_TOOLCHAIN_PREFIX="${PREFIX_NATIVE}";
 : ${PKG_MDSO_URLS_GIT:="mdso=${GITROOT}/mdso"};
 : ${PKG_MDSO_CONFIGURE_ARGS:="--prefix=/usr --target=${TARGET}"};
 : ${PKG_MDSO_INSTALL_FILES:="@mdso=bin/${TARGET}-mdso @../../bin/mdso=${TARGET}/bin/mdso"};
-: ${PKG_MDSO_SUBDIR:=mdso};
 
 #
 # Build target runtime
@@ -233,47 +222,36 @@ RUNTIME_PREFIX="${PREFIX_NATIVE}";
 : ${PKG_PSXTYPES_URLS_GIT:=psxtypes=${GITROOT}/psxtypes};
 : ${PKG_PSXTYPES_BUILD_DIR:=psxtypes};
 : ${PKG_PSXTYPES_MAKEFLAGS_BUILD:="DESTDIR=${PREFIX_NATIVE}"};
-: ${PKG_PSXTYPES_SUBDIR:=psxtypes};
 : ${PKG_PEMAGINE_URLS_GIT:=pemagine=${GITROOT}/pemagine};
 : ${PKG_PEMAGINE_CFLAGS_CONFIGURE_EXTRA:=-O0};
 : ${PKG_PEMAGINE_INSTALL_TARGET_EXTRA:=install-lib};
-: ${PKG_PEMAGINE_SUBDIR:=pemagine};
 : ${PKG_DALIST_URLS_GIT:=dalist=${GITROOT}/dalist};
 : ${PKG_DALIST_INSTALL_TARGET_EXTRA:=install-lib};
-: ${PKG_DALIST_SUBDIR:=dalist};
 : ${PKG_LDSO_URLS_GIT:=pemagine=${GITROOT}/pemagine};
 : ${PKG_LDSO_CFLAGS_CONFIGURE_EXTRA:="-O0 -DPE_LDSO"};
 : ${PKG_LDSO_CONFIGURE_ARGS_EXTRA:=--disable-shared};
 : ${PKG_LDSO_INSTALL_FILES:="@../../lib/libldso.a=${TARGET}/lib/libldso.a"};
 : ${PKG_LDSO_MAKEFLAGS_BUILD_EXTRA:=STATIC_LIB_NAME=libldso.a};
 : ${PKG_LDSO_MAKEFLAGS_INSTALL_EXTRA:=STATIC_LIB_NAME=libldso.a};
-: ${PKG_LDSO_SUBDIR:=pemagine};
 : ${PKG_NTCON_URLS_GIT:=ntcon=${GITROOT}/ntcon};
 : ${PKG_NTCON_INSTALL_TARGET_EXTRA:=install-lib};
-: ${PKG_NTCON_SUBDIR:=ntcon};
 : ${PKG_NTAPI_URLS_GIT:=ntapi=${GITROOT}/ntapi};
 : ${PKG_NTAPI_INSTALL_TARGET_EXTRA:=install-lib};
-: ${PKG_NTAPI_SUBDIR:=ntapi};
 : ${PKG_PSXSCL_URLS_GIT:=psxscl=${GITROOT_HEAD}/psxscl};
 : ${PKG_PSXSCL_CFLAGS_CONFIGURE_EXTRA:=-O0};
 : ${PKG_PSXSCL_INSTALL_TARGET_EXTRA:=install-lib};
-: ${PKG_PSXSCL_SUBDIR:=psxscl};
 : ${PKG_PSXSCL_STRACE_URLS_GIT:=psxscl=${GITROOT_HEAD}/psxscl};
 : ${PKG_PSXSCL_STRACE_CFLAGS_CONFIGURE_EXTRA:="-DPSX_INTERNAL_STRACE -O0"};
 : ${PKG_PSXSCL_STRACE_INSTALL_FILES:="/=lib/psxscl_strace lib/libpsxscl.so=lib/psxscl_strace/"};
 : ${PKG_PSXSCL_STRACE_NO_MAKE_INSTALL:=1};
-: ${PKG_PSXSCL_STRACE_SUBDIR:=psxscl};
 : ${PKG_NTCTTY_URLS_GIT:=ntctty=${GITROOT_HEAD}/ntctty};
 : ${PKG_NTCTTY_CFLAGS_CONFIGURE_EXTRA:=-O0};
-: ${PKG_NTCTTY_SUBDIR:=ntctty};
 : ${PKG_PTYCON_URLS_GIT:=ptycon=${GITROOT_HEAD}/ptycon};
 : ${PKG_PTYCON_CFLAGS_CONFIGURE_EXTRA:=-O0};
 : ${PKG_PTYCON_INSTALL_TARGET_EXTRA:="install-app install-lib"};
-: ${PKG_PTYCON_SUBDIR:=ptycon};
 : ${PKG_U16PORTS_CFLAGS_CONFIGURE_EXTRA:=-Wno-error=missing-field-initializers};
 : ${PKG_U16PORTS_URLS_GIT:=u16ports=${GITROOT_HEAD}/u16ports};
 : ${PKG_U16PORTS_INSTALL_TARGET_EXTRA:=install-lib};
-: ${PKG_U16PORTS_SUBDIR:=u16ports};
 
 #
 # Build target host_packages
@@ -307,11 +285,7 @@ intltool_host libffi_host ruby_host";
 : ${PKG_GLIB_HOST_SHA256SUM:=fe22998ff0394ec31e6e5511c379b74011bee61a4421bca7fcab223dfbe0fc6a};
 : ${PKG_GLIB_HOST_VERSION:=2.54.0};
 : ${PKG_GLIB_HOST_URL:=http://ftp.gnome.org/pub/GNOME/sources/glib/${PKG_GLIB_HOST_VERSION%.[0-9]}/glib-${PKG_GLIB_HOST_VERSION}.tar.xz};
-: ${PKG_INFOUNZIP_HOST_BUILD_DIR:=infounzip-host};
-: ${PKG_INFOUNZIP_HOST_SUBDIR:=infounzip-host};
 : ${PKG_INFOUNZIP_HOST_URLS_GIT:=infounzip-host=https://github.com/Redfoxmoon3/infounzip.git@master};
-: ${PKG_INFOZIP_HOST_BUILD_DIR:=infozip-host};
-: ${PKG_INFOZIP_HOST_SUBDIR:=infozip-host};
 : ${PKG_INFOZIP_HOST_URLS_GIT:=infozip-host=https://github.com/Redfoxmoon3/infozip.git@master};
 : ${PKG_INTLTOOL_HOST_BUILD_TYPE:=host};
 : ${PKG_INTLTOOL_HOST_MAKEFLAGS_BUILD_EXTRA:=V=99};
@@ -397,8 +371,6 @@ LIB_PACKAGES_PREFIX="${PREFIX_NATIVE}";
 : ${PKG_LIBZ_URL:=https://sortix.org/libz/release/libz-${PKG_LIBZ_VERSION}.tar.gz};
 : ${PKG_LIBZ_CONFIGURE_ARGS:=--host=${TARGET} --prefix= --target=${TARGET}};
 : ${PKG_LMDB_URLS_GIT:="lmdb=https://github.com/Redfoxmoon3/lmdb.git@mdb.master"};
-: ${PKG_LMDB_SUBDIR:=lmdb};
-: ${PKG_LMDB_BUILD_DIR:=lmdb};
 : ${PKG_LIBFFI_SHA256SUM:=d06ebb8e1d9a22d19e38d63fdb83954253f39bedc5d46232a05645685722ca37};
 : ${PKG_LIBFFI_VERSION:=3.2.1};
 : ${PKG_LIBFFI_URL:=ftp://sourceware.org/pub/libffi/libffi-${PKG_LIBFFI_VERSION}.tar.gz};
@@ -408,7 +380,6 @@ LIB_PACKAGES_PREFIX="${PREFIX_NATIVE}";
 : ${PKG_GDBM_VERSION:=1.13};
 : ${PKG_GDBM_URL:=ftp://ftp.gnu.org/gnu/gdbm/gdbm-${PKG_GDBM_VERSION}.tar.gz};
 : ${PKG_GEOIP_URLS_GIT:="geoip-api-c=https://github.com/maxmind/geoip-api-c@master"};
-: ${PKG_GEOIP_SUBDIR:=geoip-api-c};
 : ${PKG_GIFLIB_SHA256SUM:=df27ec3ff24671f80b29e6ab1c4971059c14ac3db95406884fc26574631ba8d5};
 : ${PKG_GIFLIB_VERSION:=5.1.4};
 : ${PKG_GIFLIB_URL:=https://ftp.osuosl.org/pub/blfs/conglomeration/giflib/giflib-${PKG_GIFLIB_VERSION}.tar.bz2};
@@ -437,7 +408,6 @@ LIB_PACKAGES_PREFIX="${PREFIX_NATIVE}";
 : ${PKG_LIBARCHIVE_LDFLAGS_CONFIGURE_EXTRA:=-L${PREFIX_NATIVE}/lib};
 : ${PKG_LIBARCHIVE_MAKEFLAGS_INSTALL_EXTRA:="prefix=:DESTDIR=${PREFIX_NATIVE}:LIBTOOL=slibtool"};
 : ${PKG_LIBATOMIC_OPS_URLS_GIT:="libatomic_ops=https://github.com/ivmai/libatomic_ops@master"};
-: ${PKG_LIBATOMIC_OPS_SUBDIR:=libatomic_ops};
 : ${PKG_LIBPIPELINE_SHA256SUM:=da46d7b20163aadb9db2faae483f734e9096a7550c84b94029abeab62dd1b9ee};
 : ${PKG_LIBPIPELINE_VERSION:=1.4.1};
 : ${PKG_LIBPIPELINE_URL:=http://download.savannah.gnu.org/releases/libpipeline/libpipeline-${PKG_LIBPIPELINE_VERSION}.tar.gz};
@@ -469,7 +439,6 @@ LIB_PACKAGES_PREFIX="${PREFIX_NATIVE}";
 : ${PKG_LIBFIRM_CONFIGURE_ARGS:="--source-dir=../../../libfirm --prefix="};
 : ${PKG_LIBFIRM_MAKEFLAGS_INSTALL:=DESTDIR=../../sysroot};
 : ${PKG_LIBFIRM_PREFIX_EXTRA:=${PREFIX_NATIVE}};
-: ${PKG_LIBFIRM_SUBDIR:=libfirm};
 : ${PKG_LIBGCRYPT_SHA256SUM:=3b67862e2f4711e25c4ce3cc4b48d52a58a3afdcd1d8c6a57f93a1c0ef03e5c6};
 : ${PKG_LIBGCRYPT_VERSION:=1.7.4};
 : ${PKG_LIBGCRYPT_URL:=https://www.gnupg.org/ftp/gcrypt/libgcrypt/libgcrypt-${PKG_LIBGCRYPT_VERSION}.tar.bz2};
@@ -482,7 +451,6 @@ LIB_PACKAGES_PREFIX="${PREFIX_NATIVE}";
 : ${PKG_LIBKSBA_VERSION:=1.3.5};
 : ${PKG_LIBKSBA_URL:=https://www.gnupg.org/ftp/gcrypt/libksba/libksba-${PKG_LIBKSBA_VERSION}.tar.bz2};
 : ${PKG_LIBUDNS_URLS_GIT:=libudns=https://github.com/shadowsocks/libudns.git@master};
-: ${PKG_LIBUDNS_SUBDIR:=libudns};
 : ${PKG_LUA_SHA256SUM:=5113c06884f7de453ce57702abaac1d618307f33f6789fa870e87a59d772aca2};
 : ${PKG_LUA_VERSION:=5.3.3};
 : ${PKG_LUA_URL:=https://www.lua.org/ftp/lua-${PKG_LUA_VERSION}.tar.gz};
@@ -527,12 +495,10 @@ LIB_PACKAGES_PREFIX="${PREFIX_NATIVE}";
 : ${PKG_TIFF_URL:=ftp://download.osgeo.org/libtiff/tiff-${PKG_TIFF_VERSION}.tar.gz};
 : ${PKG_TIFF_CONFIGURE_ARGS_EXTRA:=--disable-cxx};
 : ${PKG_W32API_URLS_GIT:="w32api=git://github.com/midipix-ports/w32api.ports@main"};
-: ${PKG_W32API_BUILD_DIR:=w32api};
 : ${PKG_W32API_MAKEFLAGS_BUILD:="DESTDIR=${PREFIX_NATIVE}"};
 : ${PKG_W32API_MAKEFLAGS_INSTALL:="DESTDIR=${PREFIX_NATIVE}"};
 : ${PKG_W32API_SUBDIR:=w32api};
 : ${PKG_W32LIB_URLS_GIT:="w32lib=git://git.midipix.org/w32lib"};
-: ${PKG_W32LIB_SUBDIR:=w32lib};
 : ${PKG_W32LIB_CONFIGURE_ARGS:="--host=${TARGET} --prefix= --target=${TARGET}"};
 
 : ${PKG_XZ_SHA256SUM:=73df4d5d34f0468bd57d09f2d8af363e95ed6cc3a4a86129d2f2c366259902a2};
@@ -662,7 +628,6 @@ LIB_PACKAGES_PREFIX="${PREFIX_NATIVE}";
 : ${PKG_LIBCACA_CONFIGURE_ARGS_EXTRA:=--program-prefix=};
 : ${PKG_LIBCACA_ENV_VARS_EXTRA:="IMLIB2_CFLAGS=-I${PREFIX_NATIVE}:IMLIB2_LIBS=-L${PREFIX_NATIVE}/lib -lImlib2"};
 : ${PKG_LIBCACA_LDFLAGS_BUILD_EXTRA:="-L${PREFIX_NATIVE}/lib -lImlib2"};
-: ${PKG_LIBCACA_SUBDIR:=libcaca};
 
 #
 # Build target dev_packages
@@ -707,7 +672,6 @@ LEAF_PACKAGES_PREFIX="${PREFIX_NATIVE}";
 : ${PKG_BC_VERSION:=1.06.95};
 : ${PKG_BC_URL:=http://alpha.gnu.org/gnu/bc/bc-${PKG_BC_VERSION}.tar.bz2};
 : ${PKG_BDWGC_URLS_GIT:="bdwgc=https://github.com/ivmai/bdwgc@master"};
-: ${PKG_BDWGC_SUBDIR:=bdwgc};
 : ${PKG_BIND_SHA256SUM:=7f46ad8620f7c3b0ac375d7a5211b15677708fda84ce25d7aeb7222fe2e3c77a};
 : ${PKG_BIND_VERSION:=9.11.2};
 : ${PKG_BIND_URL:=https://ftp.isc.org/isc/bind9/cur/${PKG_BIND_VERSION%.*}/bind-${PKG_BIND_VERSION}.tar.gz};
@@ -734,11 +698,8 @@ LEAF_PACKAGES_PREFIX="${PREFIX_NATIVE}";
 : ${PKG_CPARSER_CONFIGURE_ARGS:="--source-dir=../../../cparser --prefix="};
 : ${PKG_CPARSER_MAKEFLAGS_INSTALL:=DESTDIR=../../sysroot};
 : ${PKG_CPARSER_PREFIX_EXTRA:=${PREFIX_NATIVE}};
-: ${PKG_CPARSER_SUBDIR:=cparser};
 : ${PKG_CRON_URLS_GIT:="pkg-cron.git=git://anonscm.debian.org/pkg-cron/pkg-cron.git@debian/3.0pl1-128"};
-: ${PKG_CRON_BUILD_DIR:=pkg-cron.git};
 : ${PKG_CRON_ENV_VARS_EXTRA:="CC=${TARGET}-gcc:CFLAGS=${PACKAGES_CFLAGS_CONFIGURE} -D__GNU__"};
-: ${PKG_CRON_SUBDIR:=pkg-cron.git};
 : ${PKG_DASH_SHA256SUM:=5ecd5bea72a93ed10eb15a1be9951dd51b52e5da1d4a7ae020efd9826b49e659};
 : ${PKG_DASH_VERSION:=0.5.9.1};
 : ${PKG_DASH_URL:=https://bintray.com/termux/upstream/download_file?file_path=dash-${PKG_DASH_VERSION}.tar.gz};
@@ -797,7 +758,6 @@ LEAF_PACKAGES_PREFIX="${PREFIX_NATIVE}";
 : ${PKG_GREP_URL:=https://ftp.gnu.org/gnu/grep/grep-${PKG_GREP_VERSION}.tar.xz};
 : ${PKG_HEXCURSE_URLS_GIT:="hexcurse=https://github.com/LonnyGomes/hexcurse@master"};
 : ${PKG_HEXCURSE_CFLAGS_CONFIGURE_EXTRA:=-I${PREFIX_NATIVE}/include/ncursesw};
-: ${PKG_HEXCURSE_SUBDIR:=hexcurse};
 : ${PKG_HTOP_SHA256SUM:=f410626dfaf6b70fdf73cd7bb33cae768869707028d847fed94a978e974f5666};
 : ${PKG_HTOP_VERSION:=2.0.1};
 : ${PKG_HTOP_URL:=http://hisham.hm/htop/releases/${PKG_HTOP_VERSION}/htop-${PKG_HTOP_VERSION}.tar.gz};
@@ -812,12 +772,8 @@ LEAF_PACKAGES_PREFIX="${PREFIX_NATIVE}";
 : ${PKG_INETUTILS_CONFIGURE_ARGS_EXTRA:="--disable-ftpd --disable-inetd --disable-rexecd --disable-rlogind --disable-rshd --disable-syslogd --disable-talkd --disable-telnetd --disable-tftpd --disable-uucpd --disable-ftp --disable-dnsdomainname --disable-hostname --disable-ping --disable-ping6 --disable-rcp --disable-rexec --disable-rlogin --disable-rsh --disable-logger --disable-talk --enable-telnet --disable-tftp --disable-whois --disable-ifconfig --disable-traceroute"};
 : ${PKG_INFOUNZIP_URLS_GIT:=infounzip=https://github.com/Redfoxmoon3/infounzip.git@master};
 : ${PKG_INFOUNZIP_MAKEFLAGS_INSTALL_EXTRA:=DESTDIR=${PREFIX_NATIVE}};
-: ${PKG_INFOUNZIP_BUILD_DIR:=infounzip};
-: ${PKG_INFOUNZIP_SUBDIR:=infounzip};
 : ${PKG_INFOZIP_URLS_GIT:=infozip=https://github.com/Redfoxmoon3/infozip.git@master};
 : ${PKG_INFOZIP_MAKEFLAGS_INSTALL_EXTRA:=DESTDIR=${PREFIX_NATIVE}};
-: ${PKG_INFOZIP_BUILD_DIR:=infozip};
-: ${PKG_INFOZIP_SUBDIR:=infozip};
 : ${PKG_IRSSI_SHA256SUM:=48ff359f8abb706e729cbb8bc7bd93863e4e785f9a05d993a398310ac74beea8};
 : ${PKG_IRSSI_VERSION:=1.0.4};
 : ${PKG_IRSSI_URL:=https://github.com/irssi/irssi/releases/download/${PKG_IRSSI_VERSION}/irssi-${PKG_IRSSI_VERSION}.tar.gz};
@@ -851,8 +807,6 @@ LEAF_PACKAGES_PREFIX="${PREFIX_NATIVE}";
 : ${PKG_FLEX_URL:=https://github.com/westes/flex/releases/download/v${PKG_FLEX_VERSION}/flex-${PKG_FLEX_VERSION}.tar.gz};
 : ${PKG_FLEX_CONFIGURE_ARGS_EXTRA:=--disable-libfl};
 : ${PKG_LUNIX_URLS_GIT:=lunix=https://github.com/Redfoxmoon3/lunix.git@master};
-: ${PKG_LUNIX_SUBDIR:=lunix};
-: ${PKG_LUNIX_BUILD_DIR:=lunix};
 : ${PKG_LUNIX_MAKEFLAGS_BUILD:="all5.3"};
 : ${PKG_LUNIX_MAKEFLAGS_INSTALL:=DESTDIR=""};
 : ${PKG_LUNIX_ENV_VARS_EXTRA:="libdir=${PREFIX_NATIVE}/lib"};
@@ -920,10 +874,8 @@ LEAF_PACKAGES_PREFIX="${PREFIX_NATIVE}";
 : ${PKG_OPENSSH_CONFIGURE_ARGS_EXTRA_DEBUG:=--disable-strip};
 : ${PKG_OPENSSH_INSTALL_TARGET:=install-nokeys};
 : ${PKG_P7ZIP_URLS_GIT:="p7zip-midipix.git=https://github.com/lalbornoz/p7zip-midipix.git@master"};
-: ${PKG_P7ZIP_BUILD_DIR:=p7zip-midipix.git};
 : ${PKG_P7ZIP_INSTALL_FILES:="bin/7za=bin/"};
 : ${PKG_P7ZIP_NO_MAKE_INSTALL:=1};
-: ${PKG_P7ZIP_SUBDIR:=p7zip-midipix.git};
 : ${PKG_PACMAN_SHA256SUM:=84599e2ee2158134fd704f1cd681ea46e021165bed4df5f002aa1748caef9e7b};
 : ${PKG_PACMAN_VERSION:=5.0.1};
 : ${PKG_PACMAN_URL:=https://projects.archlinux.org/pacman.git/snapshot/pacman-${PKG_PACMAN_VERSION}.tar.gz};
@@ -974,15 +926,11 @@ LEAF_PACKAGES_PREFIX="${PREFIX_NATIVE}";
 : ${PKG_RXVT_UNICODE_URL:=http://dist.schmorp.de/rxvt-unicode/rxvt-unicode-${PKG_RXVT_UNICODE_VERSION}.tar.bz2};
 : ${PKG_RXVT_UNICODE_CONFIGURE_ARGS_EXTRA:=--disable-perl --disable-lastlog --disable-utmp --disable-wtmp};
 : ${PKG_SBASE_URLS_GIT:="sbase=http://git.suckless.org/sbase@master"};
-: ${PKG_SBASE_SUBDIR:=sbase};
-: ${PKG_SBASE_BUILD_DIR:=sbase};
 : ${PKG_SBASE_MAKEFLAGS_INSTALL:="DESTDIR=${PREFIX_NATIVE}/suckless PREFIX="};
 : ${PKG_SED_SHA256SUM:=cbd6ebc5aaf080ed60d0162d7f6aeae58211a1ee9ba9bb25623daa6cd942683b};
 : ${PKG_SED_VERSION:=4.4};
 : ${PKG_SED_URL:=https://ftp.gnu.org/gnu/sed/sed-${PKG_SED_VERSION}.tar.xz};
-: ${PKG_SMALLBASIC_SUBDIR:=SmallBASIC};
 : ${PKG_SMALLBASIC_URLS_GIT:="SmallBASIC=https://github.com/smallbasic/SmallBASIC@master"};
-: ${PKG_SMALLBASIC_BUILD_DIR:=${PKG_SMALLBASIC_SUBDIR}};
 : ${PKG_SMALLBASIC_CONFIGURE_ARGS_EXTRA:=--program-prefix=};
 : ${PKG_SMALLBASIC_CFLAGS_CONFIGURE_EXTRA:=-std=gnu99};
 : ${PKG_SOCAT_SHA256SUM:=ce3efc17e3e544876ebce7cd6c85b3c279fda057b2857fcaaf67b9ab8bdaf034};
@@ -1016,12 +964,9 @@ LEAF_PACKAGES_PREFIX="${PREFIX_NATIVE}";
 : ${PKG_TMUX_VERSION:=2.3};
 : ${PKG_TMUX_URL:=https://github.com/tmux/tmux/releases/download/${PKG_TMUX_VERSION}/tmux-${PKG_TMUX_VERSION}.tar.gz};
 : ${PKG_TOILET_URLS_GIT:=toilet=https://github.com/cacalabs/toilet@master};
-: ${PKG_TOILET_SUBDIR:=toilet};
 : ${PKG_TOILET_ENV_VARS_EXTRA:="CACA_CFLAGS=-I${PREFIX_NATIVE}:CACA_LIBS=-L${PREFIX_NATIVE}/lib -lcaca"};
 : ${PKG_TOILET_CONFIGURE_ARGS_EXTRA:=--program-prefix=""};
 : ${PKG_UBASE_URLS_GIT:="ubase=http://git.suckless.org/ubase@master"};
-: ${PKG_UBASE_SUBDIR:=ubase};
-: ${PKG_UBASE_BUILD_DIR:=ubase};
 : ${PKG_UBASE_MAKEFLAGS_INSTALL:="DESTDIR=${PREFIX_NATIVE}/suckless PREFIX="};
 : ${PKG_UTIL_LINUX_SHA256SUM:=d5950e4b2839d00aa3781f439bfada8091bc6ed8180d8262c53b4e4304e2d299};
 : ${PKG_UTIL_LINUX_VERSION:=2.31};