vars/build.vars, etc/build.usage: split build targets.

subr/pkg_install.subr, vars/env.vars: removes ${PKG_PREFIX_EXTRA}.
etc/config.cache: adds util_linux.

5 files changed, 385 insertions, 329 deletions

diff --git a/etc/build.usage b/etc/build.usage
index e14f840e..79342206 100644
--- a/etc/build.usage
+++ b/etc/build.usage
@@ -27,11 +27,12 @@ usage: ./build.sh [-x] [-4|6] [-a nt32|nt64] [-b debug|release] [-c] [-h]
                                 default compression is xz.
         -v[v[v]]                Be verbose; -vv: always print package logs; -vvv: logs fileops.
         --debug-minipix         Don't strip(1) minipix binaries to facilitate debugging minipix.
-        <target>[ ...]          One of:
-                                host_toolchain_deps, host_toolchain, native_toolchain_deps,
-                                native_toolchain, runtime, host_packages, lib_packages,
-                                dev_packages, leaf_packages, minipix, dist, devroot, dev,
-                                or world.
+        <target>[ ...]          One of: dev, devroot, or world, or:
+                                host or host_toolchain_deps, host_toolchain,
+                                native or native_toolchain_deps, native_toolchain, native_runtime,
+                                packages_deps or host_packages_deps, native_packages_deps, native_packages_deps_x11,
+                                packages or native_packages_cmdline, native_packages_dev, native_packages_etc, native_packages_inet,
+                                or dist, dist_minipix, or dist_target.
 
         ${HOME}/midipix_build.vars, ../midipix_build.vars, and build.vars are sourced
         if they exist.
diff --git a/etc/config.cache b/etc/config.cache
index d3955451..e93a13e5 100644
--- a/etc/config.cache
+++ b/etc/config.cache
@@ -182,6 +182,9 @@ ac_cv_prog_have_pcre=%PREFIX%/bin/pcre-config
 # procps_ng
 ac_cv_func_realloc_0_nonnull=yes
 
+# util_linux
+ac_cv_prog_NCURSESW6_CONFIG=%PREFIX%/bin/ncursesw6-config
+
 # vim
 ac_cv_small_wchar_t=no
 ac_x_header_dirs=%PREFIX%/include
diff --git a/subr/pkg_install.subr b/subr/pkg_install.subr
index ca85f4d1..c4a0c03a 100644
--- a/subr/pkg_install.subr
+++ b/subr/pkg_install.subr
@@ -3,14 +3,9 @@
 #
 
 pkg_install() {
-	local _dst_path;
-	for _dst_path in "${PKG_PREFIX}" "${PKG_PREFIX_EXTRA}"; do
-		if [ -n "${_dst_path}" ]; then
-			ex_build_fileop mkdir "${_dst_path}";
-			tar -C "${PKG_DESTDIR}" -cpf - . |\
-				tar -C "${_dst_path}" -xpf -;
-		fi;
-	done;
+	ex_build_fileop mkdir "${PKG_PREFIX}";
+	tar -C "${PKG_DESTDIR}" -cpf - . |\
+		tar -C "${PKG_PREFIX}" -xpf -;
 };
 
 # vim:filetype=sh
diff --git a/vars/build.vars b/vars/build.vars
index cc675c84..5b7523e9 100644
--- a/vars/build.vars
+++ b/vars/build.vars
@@ -11,9 +11,9 @@ INVARIANTS_PACKAGES="chainport";
 # Build target host_toolchain_deps
 #
 HOST_TOOLCHAIN_DEPS_BUILD_TYPE="host";
-HOST_TOOLCHAIN_DEPS_CONFIGURE_ARGS="-C --disable-nls --host=${TARGET} --prefix= --target=${TARGET}";
+HOST_TOOLCHAIN_DEPS_CONFIGURE_ARGS="--disable-nls --host=${TARGET} --prefix= --target=${TARGET}";
 HOST_TOOLCHAIN_DEPS_PACKAGES="
-slibtool_host perk_host mdso_host binutils_host install_strip_host pkgconf_host";
+slibtool_host perk_host mdso_host install_strip_host pkgconf_host binutils_host binutils_host_x86_64_w64_mingw32";
 HOST_TOOLCHAIN_DEPS_PREFIX="${PREFIX}";
 : ${PKG_SLIBTOOL_HOST_URLS_GIT:="slibtool=${DEFAULT_GITROOT}/slibtool"};
 : ${PKG_SLIBTOOL_HOST_CONFIGURE_ARGS:=--host= --prefix=};
@@ -23,6 +23,12 @@ HOST_TOOLCHAIN_DEPS_PREFIX="${PREFIX}";
 : ${PKG_MDSO_HOST_URLS_GIT:="mdso=${DEFAULT_GITROOT}/mdso"};
 : ${PKG_MDSO_HOST_CONFIGURE_ARGS:="--prefix=/usr"};
 : ${PKG_MDSO_HOST_INSTALL_FILES:="@mdso=bin/${TARGET}-mdso /=${TARGET}/bin bin/mdso=${TARGET}/bin/mdso"};
+: ${PKG_INSTALL_STRIP_HOST_NO_LOG_VARS:=1};
+: ${PKG_PKGCONF_HOST_SHA256SUM:=7ec8b516e655e247f4ba976837cee808134785819ab8f538f652fe919cc6c09f};
+: ${PKG_PKGCONF_HOST_VERSION:=0.9.12};
+: ${PKG_PKGCONF_HOST_URL:=https://github.com/pkgconf/pkgconf/releases/download/pkgconf-${PKG_PKGCONF_HOST_VERSION}/pkgconf-${PKG_PKGCONF_HOST_VERSION}.tar.bz2};
+: ${PKG_PKGCONF_HOST_CONFIGURE_ARGS:="-C --prefix=${PREFIX_NATIVE}"};
+: ${PKG_PKGCONF_HOST_MAKEFLAGS_INSTALL_EXTRA:=prefix=};
 : ${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};
@@ -30,22 +36,6 @@ HOST_TOOLCHAIN_DEPS_PREFIX="${PREFIX}";
 : ${PKG_BINUTILS_HOST_INSTALL_FILES:="@${TARGET}-windmc=bin/windmc @${TARGET}-windres=bin/windres"};
 : ${PKG_BINUTILS_HOST_MAKEFLAGS_INSTALL_EXTRA:="PREFIX= prefix="};
 : ${PKG_BINUTILS_HOST_SLIBTOOL:=slibtool-static};
-: ${PKG_INSTALL_STRIP_HOST_NO_LOG_VARS:=1};
-: ${PKG_PKGCONF_HOST_SHA256SUM:=7ec8b516e655e247f4ba976837cee808134785819ab8f538f652fe919cc6c09f};
-: ${PKG_PKGCONF_HOST_VERSION:=0.9.12};
-: ${PKG_PKGCONF_HOST_URL:=https://github.com/pkgconf/pkgconf/releases/download/pkgconf-${PKG_PKGCONF_HOST_VERSION}/pkgconf-${PKG_PKGCONF_HOST_VERSION}.tar.bz2};
-: ${PKG_PKGCONF_HOST_CONFIGURE_ARGS:="-C --prefix=${PREFIX_NATIVE}"};
-: ${PKG_PKGCONF_HOST_MAKEFLAGS_INSTALL_EXTRA:=prefix=};
-
-#
-# Build target host_toolchain
-#
-HOST_TOOLCHAIN_BUILD_TYPE="host";
-HOST_TOOLCHAIN_CONFIGURE_ARGS="-C --disable-nls --host=${TARGET} --prefix= --target=${TARGET}";
-HOST_TOOLCHAIN_PACKAGES="
-binutils_host_x86_64_w64_mingw32 gcc_stage1_cross_x86_64_w64_mingw32 gcc_stage1
-psxstub musl_no_complex gcc_runtime musl_full gcc_libstdcpp_v3 gcc_full psxtypes_host ldso_host";
-HOST_TOOLCHAIN_PREFIX="${PREFIX_CROSS}";
 : ${PKG_BINUTILS_HOST_X86_64_W64_MINGW32_SHA256SUM:=250d3b2925c6b211fb16173b0b25bc091c58829fbcad3eb849645e0af52cf7fa};
 : ${PKG_BINUTILS_HOST_X86_64_W64_MINGW32_VERSION:=2.24.51};
 : ${PKG_BINUTILS_HOST_X86_64_W64_MINGW32_URL:=ftp://sourceware.org/pub/binutils/snapshots/binutils-${PKG_BINUTILS_HOST_X86_64_W64_MINGW32_VERSION}.tar.bz2};
@@ -53,6 +43,16 @@ HOST_TOOLCHAIN_PREFIX="${PREFIX_CROSS}";
 : ${PKG_BINUTILS_HOST_X86_64_W64_MINGW32_MAKEFLAGS_INSTALL_EXTRA:="PREFIX= prefix="};
 : ${PKG_BINUTILS_HOST_X86_64_W64_MINGW32_SLIBTOOL:=slibtool-static};
 : ${PKG_BINUTILS_HOST_X86_64_W64_MINGW32_TARGET:=x86_64-w64-mingw32};
+
+#
+# Build target host_toolchain
+#
+HOST_TOOLCHAIN_BUILD_TYPE="host";
+HOST_TOOLCHAIN_CONFIGURE_ARGS="--disable-nls --host=${TARGET} --prefix= --target=${TARGET}";
+HOST_TOOLCHAIN_PACKAGES="
+gcc_stage1_cross_x86_64_w64_mingw32 gcc_stage1 psxstub musl_no_complex
+gcc_runtime musl_full gcc_libstdcpp_v3 gcc_full psxtypes_host ldso_host";
+HOST_TOOLCHAIN_PREFIX="${PREFIX_CROSS}";
 : ${PKG_GCC_STAGE1_CROSS_X86_64_W64_MINGW32_VERSION:=4.6.4};
 : ${PKG_GCC_STAGE1_CROSS_X86_64_W64_MINGW32_TARGET:=x86_64-w64-mingw32};
 : ${PKG_GCC_STAGE1_CROSS_X86_64_W64_MINGW32_BASE_DIR:=${WORKDIR}/gcc-build};
@@ -86,10 +86,27 @@ HOST_TOOLCHAIN_PREFIX="${PREFIX_CROSS}";
 #
 NATIVE_TOOLCHAIN_DEPS_CONFIGURE_ARGS="--disable-nls --host=${TARGET} --prefix=/ --target=${TARGET}";
 NATIVE_TOOLCHAIN_DEPS_PACKAGES="
-slibtool perk pkgconf gmp mpfr mpc libelf";
+gmp_host libelf mpfr_host mpc_host perk pkgconf slibtool";
 NATIVE_TOOLCHAIN_DEPS_PREFIX="${PREFIX_NATIVE}";
-: ${PKG_SLIBTOOL_URLS_GIT:="slibtool=git://midipix.org/slibtool"};
-: ${PKG_SLIBTOOL_CONFIGURE_ARGS:="--host=${TARGET} --prefix= --target=${TARGET}"};
+: ${PKG_GMP_HOST_SHA256SUM:=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160};
+: ${PKG_GMP_HOST_VERSION:=5.1.3};
+: ${PKG_GMP_HOST_URL:=https://gmplib.org/download/gmp/gmp-${PKG_GMP_HOST_VERSION}.tar.bz2};
+: ${PKG_GMP_HOST_CONFIGURE_ARGS_EXTRA:=--disable-assembly};
+: ${PKG_GMP_HOST_PREFIX:=${PREFIX_CROSS}};
+: ${PKG_LIBELF_SHA256SUM:=591a9b4ec81c1f2042a97aa60564e0cb79d041c52faa7416acb38bc95bd2c76d};
+: ${PKG_LIBELF_VERSION:=0.8.13};
+: ${PKG_LIBELF_URL:=http://www.mr511.de/software/libelf-${PKG_LIBELF_VERSION}.tar.gz};
+: ${PKG_LIBELF_CONFIGURE_ARGS:="--disable-nls --host=${TARGET} --prefix=${PREFIX_NATIVE} --target=${TARGET}"};
+: ${PKG_MPFR_HOST_SHA256SUM:=79c73f60af010a30a5c27a955a1d2d01ba095b72537dab0ecaad57f5a7bb1b6b};
+: ${PKG_MPFR_HOST_VERSION:=3.1.2};
+: ${PKG_MPFR_HOST_URL:=ftp://ftp.gnu.org/gnu/mpfr/mpfr-${PKG_MPFR_HOST_VERSION}.tar.bz2};
+: ${PKG_MPFR_HOST_CONFIGURE_ARGS_EXTRA:=--with-gmp=${PREFIX_NATIVE}};
+: ${PKG_MPFR_HOST_PREFIX:=${PREFIX_CROSS}};
+: ${PKG_MPC_HOST_SHA256SUM:=ed5a815cfea525dc778df0cb37468b9c1b554aaf30d9328b1431ca705b7400ff};
+: ${PKG_MPC_HOST_VERSION:=1.0.1};
+: ${PKG_MPC_HOST_URL:=ftp://ftp.gnu.org/gnu/mpc/mpc-${PKG_MPC_HOST_VERSION}.tar.gz};
+: ${PKG_MPC_HOST_CONFIGURE_ARGS_EXTRA:=--with-gmp=${PREFIX_NATIVE} --with-mpfr=${PREFIX_NATIVE}};
+: ${PKG_MPC_HOST_PREFIX:=${PREFIX_CROSS}};
 : ${PKG_PERK_URLS_GIT:="perk=${DEFAULT_GITROOT}/perk"};
 : ${PKG_PERK_CONFIGURE_ARGS:="--prefix=/usr --target=${TARGET}"};
 : ${PKG_PERK_INSTALL_FILES:="@perk=bin/${TARGET}-perk"};
@@ -97,25 +114,8 @@ NATIVE_TOOLCHAIN_DEPS_PREFIX="${PREFIX_NATIVE}";
 : ${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};
 : ${PKG_PKGCONF_INSTALL_FILES:=/=lib/pkgconfig};
-: ${PKG_GMP_SHA256SUM:=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160};
-: ${PKG_GMP_VERSION:=5.1.3};
-: ${PKG_GMP_URL:=https://gmplib.org/download/gmp/gmp-${PKG_GMP_VERSION}.tar.bz2};
-: ${PKG_GMP_CONFIGURE_ARGS_EXTRA:=--disable-assembly};
-: ${PKG_GMP_PREFIX_EXTRA:=${PREFIX_CROSS}};
-: ${PKG_MPFR_SHA256SUM:=79c73f60af010a30a5c27a955a1d2d01ba095b72537dab0ecaad57f5a7bb1b6b};
-: ${PKG_MPFR_VERSION:=3.1.2};
-: ${PKG_MPFR_URL:=ftp://ftp.gnu.org/gnu/mpfr/mpfr-${PKG_MPFR_VERSION}.tar.bz2};
-: ${PKG_MPFR_CONFIGURE_ARGS_EXTRA:=--with-gmp=${PREFIX_NATIVE}};
-: ${PKG_MPFR_PREFIX_EXTRA:=${PREFIX_CROSS}};
-: ${PKG_MPC_SHA256SUM:=ed5a815cfea525dc778df0cb37468b9c1b554aaf30d9328b1431ca705b7400ff};
-: ${PKG_MPC_VERSION:=1.0.1};
-: ${PKG_MPC_URL:=ftp://ftp.gnu.org/gnu/mpc/mpc-${PKG_MPC_VERSION}.tar.gz};
-: ${PKG_MPC_CONFIGURE_ARGS_EXTRA:=--with-gmp=${PREFIX_NATIVE} --with-mpfr=${PREFIX_NATIVE}};
-: ${PKG_MPC_PREFIX_EXTRA:=${PREFIX_CROSS}};
-: ${PKG_LIBELF_SHA256SUM:=591a9b4ec81c1f2042a97aa60564e0cb79d041c52faa7416acb38bc95bd2c76d};
-: ${PKG_LIBELF_VERSION:=0.8.13};
-: ${PKG_LIBELF_URL:=http://www.mr511.de/software/libelf-${PKG_LIBELF_VERSION}.tar.gz};
-: ${PKG_LIBELF_CONFIGURE_ARGS:="--disable-nls --host=${TARGET} --prefix=${PREFIX_NATIVE} --target=${TARGET}"};
+: ${PKG_SLIBTOOL_URLS_GIT:="slibtool=git://midipix.org/slibtool"};
+: ${PKG_SLIBTOOL_CONFIGURE_ARGS:="--host=${TARGET} --prefix= --target=${TARGET}"};
 
 #
 # Build target native_toolchain
@@ -148,14 +148,14 @@ NATIVE_TOOLCHAIN_PREFIX="${PREFIX_NATIVE}";
 : ${PKG_MDSO_INSTALL_FILES:="@mdso=bin/${TARGET}-mdso /=${TARGET}/bin @../../bin/mdso=${TARGET}/bin/mdso"};
 
 #
-# Build target runtime
+# Build target native_runtime
 #
-RUNTIME_BUILD_TYPE="native";
-RUNTIME_CFLAGS_CONFIGURE="${DEFAULT_CFLAGS_RUNTIME}";
-RUNTIME_CONFIGURE_ARGS="--prefix= --strict --host=${TARGET}";
-RUNTIME_ENV_VARS_EXTRA="CFLAGS_PATH=-I${PREFIX_NATIVE}/include:LDFLAGS_PATH=-L${PREFIX_NATIVE}/lib";
-RUNTIME_PACKAGES="psxtypes pemagine dalist ldso ntcon ntapi psxscl psxscl_strace ntctty ptycon u16ports";
-RUNTIME_PREFIX="${PREFIX_NATIVE}";
+NATIVE_RUNTIME_BUILD_TYPE="native";
+NATIVE_RUNTIME_CFLAGS_CONFIGURE="${DEFAULT_CFLAGS_RUNTIME}";
+NATIVE_RUNTIME_CONFIGURE_ARGS="--prefix= --strict --host=${TARGET}";
+NATIVE_RUNTIME_ENV_VARS_EXTRA="CFLAGS_PATH=-I${PREFIX_NATIVE}/include:LDFLAGS_PATH=-L${PREFIX_NATIVE}/lib";
+NATIVE_RUNTIME_PACKAGES="psxtypes pemagine dalist ldso ntcon ntapi psxscl psxscl_strace ntctty ptycon u16ports";
+NATIVE_RUNTIME_PREFIX="${PREFIX_NATIVE}";
 : ${PKG_PSXTYPES_URLS_GIT:=psxtypes=${DEFAULT_GITROOT}/psxtypes};
 : ${PKG_PSXTYPES_MAKEFLAGS_BUILD:="DESTDIR=${PREFIX_NATIVE}"};
 : ${PKG_PEMAGINE_URLS_GIT:=pemagine=${DEFAULT_GITROOT}/pemagine};
@@ -190,17 +190,17 @@ RUNTIME_PREFIX="${PREFIX_NATIVE}";
 : ${PKG_U16PORTS_INSTALL_TARGET_EXTRA:=install-lib};
 
 #
-# Build target host_packages
+# Build target host_packages_deps
 #
-HOST_PACKAGES_BUILD_TYPE="host";
-HOST_PACKAGES_CFLAGS_CONFIGURE="${DEFAULT_CFLAGS_HOST}";
-HOST_PACKAGES_CONFIGURE_ARGS="-C --disable-nls --prefix=${PREFIX} --program-prefix=";
-HOST_PACKAGES_LDFLAGS_CONFIGURE="";
-HOST_PACKAGES_MAKEFLAGS_INSTALL="PREFIX= prefix=";
-HOST_PACKAGES_PACKAGES="
+HOST_PACKAGES_DEPS_BUILD_TYPE="host";
+HOST_PACKAGES_DEPS_CFLAGS_CONFIGURE="${DEFAULT_CFLAGS_HOST}";
+HOST_PACKAGES_DEPS_CONFIGURE_ARGS="-C --disable-nls --prefix=${PREFIX} --program-prefix=";
+HOST_PACKAGES_DEPS_LDFLAGS_CONFIGURE="";
+HOST_PACKAGES_DEPS_MAKEFLAGS_INSTALL="PREFIX= prefix=";
+HOST_PACKAGES_DEPS_PACKAGES="
 cmake_host llvm_host clang_host file_host libffi_host glib_host
 infounzip_host infozip_host intltool_host ruby_host";
-HOST_PACKAGES_PREFIX="${PREFIX}";
+HOST_PACKAGES_DEPS_PREFIX="${PREFIX}";
 : ${PKG_CMAKE_HOST_SHA256SUM:=7d73ee4fae572eb2d7cd3feb48971aea903bb30a20ea5ae8b4da826d8ccad5fe};
 : ${PKG_CMAKE_HOST_VERSION:=3.6.3};
 : ${PKG_CMAKE_HOST_URL:=https://cmake.org/files/v${PKG_CMAKE_HOST_VERSION%.*}/cmake-${PKG_CMAKE_HOST_VERSION}.tar.gz};
@@ -237,25 +237,19 @@ HOST_PACKAGES_PREFIX="${PREFIX}";
 : ${PKG_RUBY_HOST_CONFIGURE_ARGS_EXTRA:="--disable-install-rdoc --with-out-ext=fiddle"};
 
 #
-# Build target lib_packages
+# Build target native_packages_deps
 #
-LIB_PACKAGES_CFLAGS_CONFIGURE="${DEFAULT_CFLAGS:+${DEFAULT_CFLAGS} }--sysroot=${PREFIX_NATIVE}";
-LIB_PACKAGES_CONFIGURE_ARGS="-C --disable-nls --host=${TARGET} --prefix= --program-prefix= --target=${TARGET}";
-LIB_PACKAGES_LDFLAGS_CONFIGURE="--sysroot=${PREFIX_NATIVE}";
-LIB_PACKAGES_MAKEFLAGS_INSTALL="PREFIX= prefix=";
-LIB_PACKAGES_PACKAGES_LEAVES="
+NATIVE_PACKAGES_DEPS_CFLAGS_CONFIGURE="${DEFAULT_CFLAGS:+${DEFAULT_CFLAGS} }--sysroot=${PREFIX_NATIVE}";
+NATIVE_PACKAGES_DEPS_CONFIGURE_ARGS="-C --disable-nls --host=${TARGET} --prefix= --program-prefix= --target=${TARGET}";
+NATIVE_PACKAGES_DEPS_LDFLAGS_CONFIGURE="--sysroot=${PREFIX_NATIVE}";
+NATIVE_PACKAGES_DEPS_MAKEFLAGS_INSTALL="PREFIX= prefix=";
+NATIVE_PACKAGES_DEPS_PACKAGES="
 expat libxml2 alsa_lib apr apr_util bzip2 curl libz lmdb libpng libjpeg_turbo
 tiff giflib libffi gdbm geoip pcre glib gzip libarchive libatomic_ops
 libpipeline libressl libevent libfetch libgpg_error libassuan libfirm libgcrypt
 libksba libudns lua ncurses ncursestw ncursesw npth popt shared_mime_info
-sqlite3 w32api w32lib xz cmake";
-LIB_PACKAGES_PACKAGES_X11="
-inputproto kbproto xcb_proto xproto fixesproto libXau libpthread_stubs xcb
-xextproto xtrans libX11 libXext freetype fontconfig renderproto Xrender libXft
-libXfixes libXi libICE libSM libXt libXmu libXpm libXaw libxkbfile pixman cairo
-dbus pango atk gdk gtk2 imlib2 libcaca";
-LIB_PACKAGES_PACKAGES="${LIB_PACKAGES_PACKAGES_LEAVES} ${LIB_PACKAGES_PACKAGES_X11}";
-LIB_PACKAGES_PREFIX="${PREFIX_NATIVE}";
+sqlite3 w32api w32lib xz cmake gmp mpfr mpc";
+NATIVE_PACKAGES_DEPS_PREFIX="${PREFIX_NATIVE}";
 : ${PKG_EXPAT_SHA256SUM:=d9e50ff2d19b3538bd2127902a89987474e1a4db8e43a66a4d1a712ab9a504ff};
 : ${PKG_EXPAT_VERSION:=2.2.0};
 : ${PKG_EXPAT_URL:=http://pkgs.fedoraproject.org/repo/pkgs/expat/expat-${PKG_EXPAT_VERSION}.tar.bz2/2f47841c829facb346eb6e3fab5212e2/expat-${PKG_EXPAT_VERSION}.tar.bz2};
@@ -420,7 +414,32 @@ LIB_PACKAGES_PREFIX="${PREFIX_NATIVE}";
 : ${PKG_CMAKE_URL:=https://cmake.org/files/v${PKG_CMAKE_VERSION%.*}/cmake-${PKG_CMAKE_VERSION}.tar.gz};
 : ${PKG_CMAKE_CFLAGS_CONFIGURE_EXTRA:="-g0 -O2"};
 : ${PKG_CMAKE_CONFIGURE_ARGS:="--parallel=${DEFAULT_BUILD_CPUS} --prefix="};
+: ${PKG_GMP_SHA256SUM:=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160};
+: ${PKG_GMP_VERSION:=5.1.3};
+: ${PKG_GMP_URL:=https://gmplib.org/download/gmp/gmp-${PKG_GMP_VERSION}.tar.bz2};
+: ${PKG_GMP_CONFIGURE_ARGS_EXTRA:=--disable-assembly};
+: ${PKG_MPFR_SHA256SUM:=79c73f60af010a30a5c27a955a1d2d01ba095b72537dab0ecaad57f5a7bb1b6b};
+: ${PKG_MPFR_VERSION:=3.1.2};
+: ${PKG_MPFR_URL:=ftp://ftp.gnu.org/gnu/mpfr/mpfr-${PKG_MPFR_VERSION}.tar.bz2};
+: ${PKG_MPFR_CONFIGURE_ARGS_EXTRA:=--with-gmp=${PREFIX_NATIVE}};
+: ${PKG_MPC_SHA256SUM:=ed5a815cfea525dc778df0cb37468b9c1b554aaf30d9328b1431ca705b7400ff};
+: ${PKG_MPC_VERSION:=1.0.1};
+: ${PKG_MPC_URL:=ftp://ftp.gnu.org/gnu/mpc/mpc-${PKG_MPC_VERSION}.tar.gz};
+: ${PKG_MPC_CONFIGURE_ARGS_EXTRA:=--with-gmp=${PREFIX_NATIVE} --with-mpfr=${PREFIX_NATIVE}};
 
+#
+# Build target native_packages_deps_x11
+#
+NATIVE_PACKAGES_DEPS_X11_CFLAGS_CONFIGURE="${DEFAULT_CFLAGS:+${DEFAULT_CFLAGS} }--sysroot=${PREFIX_NATIVE}";
+NATIVE_PACKAGES_DEPS_X11_CONFIGURE_ARGS="-C --disable-nls --host=${TARGET} --prefix= --program-prefix= --target=${TARGET}";
+NATIVE_PACKAGES_DEPS_X11_LDFLAGS_CONFIGURE="--sysroot=${PREFIX_NATIVE}";
+NATIVE_PACKAGES_DEPS_X11_MAKEFLAGS_INSTALL="PREFIX= prefix=";
+NATIVE_PACKAGES_DEPS_X11_PACKAGES="
+inputproto kbproto xcb_proto xproto fixesproto libXau libpthread_stubs xcb
+xextproto xtrans libX11 libXext freetype fontconfig renderproto Xrender libXft
+libXfixes libXi libICE libSM libXt libXmu libXpm libXaw libxkbfile pixman cairo
+dbus pango atk gdk gtk2 imlib2 libcaca";
+NATIVE_PACKAGES_DEPS_X11_PREFIX="${PREFIX_NATIVE}";
 : ${PKG_INPUTPROTO_SHA256SUM:=893a6af55733262058a27b38eeb1edc733669f01d404e8581b167f03c03ef31d};
 : ${PKG_INPUTPROTO_VERSION:=2.3.2};
 : ${PKG_INPUTPROTO_URL:=https://www.x.org/releases/individual/proto/inputproto-${PKG_INPUTPROTO_VERSION}.tar.bz2};
@@ -542,39 +561,25 @@ LIB_PACKAGES_PREFIX="${PREFIX_NATIVE}";
 # Build target dev_packages
 #
 DEV_PACKAGES_CFLAGS_CONFIGURE="${DEFAULT_CFLAGS:+${DEFAULT_CFLAGS} }--sysroot=${PREFIX_NATIVE}";
-DEV_PACKAGES_CONFIGURE_ARGS="${LIB_PACKAGES_CONFIGURE_ARGS}";
-DEV_PACKAGES_LDFLAGS_CONFIGURE="${LIB_PACKAGES_LDFLAGS_CONFIGURE}";
-DEV_PACKAGES_MAKEFLAGS_INSTALL="${LIB_PACKAGES_MAKEFLAGS_INSTALL}";
+DEV_PACKAGES_CONFIGURE_ARGS="${NATIVE_PACKAGES_DEPS_CONFIGURE_ARGS}";
+DEV_PACKAGES_LDFLAGS_CONFIGURE="${NATIVE_PACKAGES_DEPS_LDFLAGS_CONFIGURE}";
+DEV_PACKAGES_MAKEFLAGS_INSTALL="${NATIVE_PACKAGES_DEPS_MAKEFLAGS_INSTALL}";
 DEV_PACKAGES_PACKAGES="
 ncurses ncursesw coreutils bash libz git make sed grep findutils m4 flex bison
 diffutils patch patchutils gzip tar dos2unix nano vim";
-DEV_PACKAGES_PREFIX="${LIB_PACKAGES_PREFIX}";
+DEV_PACKAGES_PREFIX="${NATIVE_PACKAGES_DEPS_PREFIX}";
 
 #
-# Build target leaf_packages
-#
-LEAF_PACKAGES_CFLAGS_CONFIGURE="${DEFAULT_CFLAGS:+${DEFAULT_CFLAGS} }--sysroot=${PREFIX_NATIVE}";
-LEAF_PACKAGES_CONFIGURE_ARGS="-C --disable-nls --host=${TARGET} --prefix= --target=${TARGET}";
-LEAF_PACKAGES_LDFLAGS_CONFIGURE="--sysroot=${PREFIX_NATIVE}";
-LEAF_PACKAGES_MAKEFLAGS_INSTALL="PREFIX= prefix=";
-LEAF_PACKAGES_PACKAGES="
-apk_tools aria2 bash bc bdwgc bind bison chicken coreutils cparser cron dash
-datamash diffutils dos2unix dropbear ed figlet file findutils gawk git gnupg
-grep hexcurse htop inetutils infounzip infozip irssi john ldns less lighttpd
-flex lunix lynx make man_db mc mksh mtr m4 nano ncdu nginx openlitespeed
-openssh p7zip pacman patch patchutils perl procps_ng python3 qpdf rsync ruby
-rxvt_unicode sbase sed smallbasic socat st tar tcsh the_silver_searcher thttpd
-tmux toilet ubase util_linux vim weechat wget which whois xeyes xwd zsh";
-LEAF_PACKAGES_PREFIX="${PREFIX_NATIVE}";
-: ${PKG_APK_TOOLS_SHA256SUM:=def2b2c23cd12fd2a9c19be49653b0d1bf9d81a26dac5a0ee79a1351d674f93b};
-: ${PKG_APK_TOOLS_VERSION:=2.6.8};
-: ${PKG_APK_TOOLS_URL:=http://git.alpinelinux.org/cgit/apk-tools/snapshot/apk-tools-${PKG_APK_TOOLS_VERSION}.tar.bz2};
-: ${PKG_APK_TOOLS_ENV_VARS_EXTRA:=CFLAGS=--sysroot=${PREFIX_NATIVE}:CROSS_COMPILE=${TARGET}-:LUAAPK=:VERBOSE=1:PREFIX=${PREFIX_NATIVE}};
-: ${PKG_APK_TOOLS_MAKEFLAGS_INSTALL_EXTRA:="PREFIX=${PREFIX_NATIVE} MANDIR=/share/man DOCDIR=/share/doc/apk"};
-: ${PKG_ARIA2_SHA256SUM:=546e9194a9135d665fce572cb93c88f30fb5601d113bfa19951107ced682dc50};
-: ${PKG_ARIA2_VERSION:=1.32.0};
-: ${PKG_ARIA2_URL:=https://github.com/aria2/aria2/releases/download/release-${PKG_ARIA2_VERSION}/aria2-${PKG_ARIA2_VERSION}.tar.xz};
-: ${PKG_ARIA2_DISABLED:=1};
+# Build target native_packages_cmdline
+#
+NATIVE_PACKAGES_CMDLINE_CFLAGS_CONFIGURE="${DEFAULT_CFLAGS:+${DEFAULT_CFLAGS} }--sysroot=${PREFIX_NATIVE}";
+NATIVE_PACKAGES_CMDLINE_CONFIGURE_ARGS="-C --disable-nls --host=${TARGET} --prefix= --target=${TARGET}";
+NATIVE_PACKAGES_CMDLINE_LDFLAGS_CONFIGURE="--sysroot=${PREFIX_NATIVE}";
+NATIVE_PACKAGES_CMDLINE_MAKEFLAGS_INSTALL="PREFIX= prefix=";
+NATIVE_PACKAGES_CMDLINE_PACKAGES="
+bash bc coreutils dash datamash dos2unix ed figlet file findutils gawk grep
+mksh sbase sed tar tcsh the_silver_searcher toilet ubase util_linux which zsh";
+NATIVE_PACKAGES_CMDLINE_PREFIX="${PREFIX_NATIVE}";
 : ${PKG_BASH_SHA256SUM:=d86b3392c1202e8ff5a423b302e6284db7f8f435ea9f39b5b1b20fd3ac36dfcb};
 : ${PKG_BASH_VERSION:=4.4};
 : ${PKG_BASH_URL:=https://ftp.gnu.org/gnu/bash/bash-${PKG_BASH_VERSION}.tar.gz};
@@ -582,34 +587,9 @@ LEAF_PACKAGES_PREFIX="${PREFIX_NATIVE}";
 : ${PKG_BC_SHA256SUM:=7ee4abbcfac03d8a6e1a8a3440558a3d239d6b858585063e745c760957725ecc};
 : ${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_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};
-: ${PKG_BIND_CONFIGURE_ARGS_EXTRA:="--with-ecdsa=yes --with-gost=no --with-gssapi=no --with-libtool --with-libxml2=${PREFIX}/bin/${TARGET}-xml2-config --with-libjson=no --with-openssl=${PREFIX_NATIVE} --with-randomdev=/dev/urandom BUILD_CC=gcc"};
-: ${PKG_BISON_SHA256SUM:=a72428c7917bdf9fa93cb8181c971b6e22834125848cf1d03ce10b1bb0716fe1};
-: ${PKG_BISON_VERSION:=3.0.4};
-: ${PKG_BISON_URL:=https://ftp.gnu.org/gnu/bison/bison-3.0.4.tar.xz};
-: ${PKG_CHICKEN_SHA256SUM:=e3dc2b8f95b6a3cd59c85b5bb6bdb2bd9cefc45b5d536a20cad74e3c63f4ad89};
-: ${PKG_CHICKEN_VERSION:=4.11.0};
-: ${PKG_CHICKEN_URL:=https://code.call-cc.org/releases/4.11.0/chicken-${PKG_CHICKEN_VERSION}.tar.gz};
-: ${PKG_CHICKEN_BUILD_STEPS_DISABLE:=build_clean:variant};
-: ${PKG_CHICKEN_MAKEFLAGS_BUILD:="PLATFORM=midipix-${ARCH} PREFIX=${PREFIX_NATIVE} TARGET_PREFIX=${PREFIX_NATIVE} C_COMPILER=${TARGET}-gcc HOSTSYSTEM=${TARGET}"};
-: ${PKG_CHICKEN_MAKEFLAGS_BUILD_EXTRA_DEBUG:=DEBUGBUILD=1};
-: ${PKG_CHICKEN_MAKEFLAGS_BUILD_EXTRA_RELEASE:=DEBUGBUILD=0};
-: ${PKG_CHICKEN_MAKE_INSTALL_VNAME:=TARGET_PREFIX};
-: ${PKG_CHICKEN_MAKEFLAGS_INSTALL:="PLATFORM=midipix-${ARCH} PREFIX=${PREFIX_NATIVE} C_COMPILER=${TARGET}-gcc HOSTSYSTEM=${TARGET} CROSS_CHICKEN=1"};
 : ${PKG_COREUTILS_SHA256SUM:=1117b1a16039ddd84d51a9923948307cfa28c2cea03d1a2438742253df0a0c65};
 : ${PKG_COREUTILS_VERSION:=8.28};
 : ${PKG_COREUTILS_URL:=https://ftp.gnu.org/gnu/coreutils/coreutils-${PKG_COREUTILS_VERSION}.tar.xz};
-: ${PKG_CPARSER_URLS_GIT:="cparser=http://pp.info.uni-karlsruhe.de/git/cparser.git@master bcparser=${DEFAULT_GITROOT}/compilers/bcparser@main"};
-: ${PKG_CPARSER_BASE_DIR:=${WORKDIR}/cparser+libfirm-build};
-: ${PKG_CPARSER_BUILD_DIR:=build/cparser};
-: ${PKG_CPARSER_CONFIGURE:=bcparser/configure};
-: ${PKG_CPARSER_CONFIGURE_ARGS:="--source-dir=../../cparser --prefix="};
-: ${PKG_CPARSER_DISABLED:=1};
-: ${PKG_CRON_URLS_GIT:="pkg-cron.git=git://anonscm.debian.org/pkg-cron/pkg-cron.git@debian/3.0pl1-128"};
-: ${PKG_CRON_ENV_VARS_EXTRA:="CC=${TARGET}-gcc:CFLAGS=${PACKAGES_CFLAGS_CONFIGURE} -D__GNU__"};
 : ${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};
@@ -618,18 +598,11 @@ LEAF_PACKAGES_PREFIX="${PREFIX_NATIVE}";
 : ${PKG_DATAMASH_SHA256SUM:=e8d46fb22ccc77e5380f26cde622a733f363d388b04a2c22e7fb6de0e9d85996};
 : ${PKG_DATAMASH_VERSION:=1.2};
 : ${PKG_DATAMASH_URL:=https://ftp.gnu.org/gnu/datamash/datamash-${PKG_DATAMASH_VERSION}.tar.gz};
-: ${PKG_DIFFUTILS_SHA256SUM:=d621e8bdd4b573918c8145f7ae61817d1be9deb4c8d2328a65cea8e11d783bd6};
-: ${PKG_DIFFUTILS_VERSION:=3.6};
-: ${PKG_DIFFUTILS_URL:=https://ftp.gnu.org/gnu/diffutils/diffutils-${PKG_DIFFUTILS_VERSION}.tar.xz};
 : ${PKG_DOS2UNIX_SHA256SUM:=307e0363c19384467bd9a15e1cfea482ca3e3089d76c7a02b969022fff32583a};
 : ${PKG_DOS2UNIX_VERSION:=7.3.5-beta3};
 : ${PKG_DOS2UNIX_URL:=http://waterlan.home.xs4all.nl/dos2unix/dos2unix-${PKG_DOS2UNIX_VERSION}.tar.gz};
 : ${PKG_DOS2UNIX_CFLAGS_BUILD_EXTRA:=${PACKAGES_CFLAGS_CONFIGURE}};
 : ${PKG_DOS2UNIX_INSTALL_FILES:="dos2unix=bin/ dos2unix=bin/ @dos2unix=bin/mac2unix @unix2dos=bin/unix2mac"};
-: ${PKG_DROPBEAR_VERSION:=2017.75};
-: ${PKG_DROPBEAR_URL:=https://matt.ucc.asn.au/dropbear/releases/dropbear-${PKG_DROPBEAR_VERSION}.tar.bz2};
-: ${PKG_DROPBEAR_SHA256SUM:=6cbc1dcb1c9709d226dff669e5604172a18cf5dbf9a201474d5618ae4465098c};
-: ${PKG_DROPBEAR_CONFIGURE_ARGS_EXTRA:=--disable-loginfunc};
 : ${PKG_ED_SHA256SUM:=c3521a607b3dfd5d2a087d53a72cdf71970763059c369cb0b330881b8491cd50};
 : ${PKG_ED_VERSION:=1.14.2};
 : ${PKG_ED_URL:=https://fossies.org/linux/privat/ed-${PKG_ED_VERSION}.tar.gz};
@@ -649,6 +622,242 @@ LEAF_PACKAGES_PREFIX="${PREFIX_NATIVE}";
 : ${PKG_GAWK_SHA256SUM:=d4f3cd31c001fd0ed52832d4fbfbdfeaa38ad541c182f80ff8fdf87324a6a9f2};
 : ${PKG_GAWK_VERSION:=4.2.0};
 : ${PKG_GAWK_URL:=https://ftp.gnu.org/gnu/gawk/gawk-${PKG_GAWK_VERSION}.tar.xz};
+: ${PKG_GREP_SHA256SUM:=db625c7ab3bb3ee757b3926a5cfa8d9e1c3991ad24707a83dde8a5ef2bf7a07e};
+: ${PKG_GREP_VERSION:=3.1};
+: ${PKG_GREP_URL:=https://ftp.gnu.org/gnu/grep/grep-${PKG_GREP_VERSION}.tar.xz};
+: ${PKG_MKSH_SHA256SUM:=8bce3837c386684aa7780f085f1a4dbd5e3e26fb5c528ee0d41ae29af7f39013};
+: ${PKG_MKSH_VERSION:=R54};
+: ${PKG_MKSH_URL:=http://pub.allbsd.org/MirOS/dist/mir/mksh/mksh-${PKG_MKSH_VERSION}.tgz};
+: ${PKG_MKSH_BUILD_STEPS_DISABLE:=install_make:dynamic};
+: ${PKG_MKSH_ENV_VARS_EXTRA:="CC=${TARGET}-gcc:CFLAGS=${PACKAGES_CFLAGS_CONFIGURE:+${PACKAGES_CFLAGS_CONFIGURE} }-DMKSH_NOPROSPECTOFWORK"};
+: ${PKG_MKSH_INSTALL_FILES:="mksh=bin/ /=share/doc/mksh/examples dot.mkshrc=share/doc/mksh/examples/ mksh.1=share/man/man1/"};
+: ${PKG_MKSH_SUBDIR:=mksh};
+: ${PKG_SBASE_URLS_GIT:="sbase=http://git.suckless.org/sbase@master"};
+: ${PKG_SBASE_MAKE_INSTALL_VNAME:=PREFIX};
+: ${PKG_SBASE_PREFIX:=${PREFIX_NATIVE}/suckless};
+: ${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_URLS_GIT:="SmallBASIC=https://github.com/smallbasic/SmallBASIC@master"};
+: ${PKG_SMALLBASIC_BUILD_DIR:=SmallBASIC};
+: ${PKG_SMALLBASIC_CFLAGS_CONFIGURE_EXTRA:=-std=gnu99};
+: ${PKG_TAR_SHA256SUM:=cae466e6e58c7292355e7080248f244db3a4cf755f33f4fa25ca7f9a7ed09af0};
+: ${PKG_TAR_VERSION:=1.29};
+: ${PKG_TAR_URL:=https://ftp.gnu.org/gnu/tar/tar-${PKG_TAR_VERSION}.tar.gz};
+: ${PKG_TCSH_SHA256SUM:=b89de7064ab54dac454a266cfe5d8bf66940cb5ed048d0c30674ea62e7ecef9d};
+: ${PKG_TCSH_VERSION:=6.20.00};
+: ${PKG_TCSH_URL:=http://ftp.funet.fi/pub/mirrors/ftp.astron.com/pub/tcsh/tcsh-${PKG_TCSH_VERSION}.tar.gz};
+: ${PKG_THE_SILVER_SEARCHER_SHA256SUM:=d4652bd91c3a05e87a15809c5f3f14ad2e5e1f80185af510e3fa4ad2038c15d4};
+: ${PKG_THE_SILVER_SEARCHER_VERSION:=2.1.0};
+: ${PKG_THE_SILVER_SEARCHER_URL:=http://geoff.greer.fm/ag/releases/the_silver_searcher-${PKG_THE_SILVER_SEARCHER_VERSION}.tar.gz};
+: ${PKG_TOILET_URLS_GIT:=toilet=https://github.com/cacalabs/toilet@master};
+: ${PKG_UBASE_URLS_GIT:="ubase=http://git.suckless.org/ubase@master"};
+: ${PKG_UBASE_MAKE_INSTALL_VNAME:=PREFIX};
+: ${PKG_UBASE_PREFIX:=${PREFIX_NATIVE}/suckless};
+: ${PKG_UTIL_LINUX_SHA256SUM:=d5950e4b2839d00aa3781f439bfada8091bc6ed8180d8262c53b4e4304e2d299};
+: ${PKG_UTIL_LINUX_VERSION:=2.31};
+: ${PKG_UTIL_LINUX_URL:=https://www.kernel.org/pub/linux/utils/util-linux/v${PKG_UTIL_LINUX_VERSION}/util-linux-${PKG_UTIL_LINUX_VERSION}.tar.gz};
+: ${PKG_UTIL_LINUX_CONFIGURE_ARGS_EXTRA:=--disable-agetty --disable-lslogins --disable-wall --disable-write};
+: ${PKG_WHICH_SHA256SUM:=f4a245b94124b377d8b49646bf421f9155d36aa7614b6ebf83705d3ffc76eaad};
+: ${PKG_WHICH_VERSION:=2.21};
+: ${PKG_WHICH_URL:=https://ftp.gnu.org/gnu/which/which-${PKG_WHICH_VERSION}.tar.gz};
+: ${PKG_ZSH_SHA256SUM:=76f82cfd5ce373cf799a03b6f395283f128430db49202e3e3f512fb5a19d6f8a};
+: ${PKG_ZSH_VERSION:=5.3};
+: ${PKG_ZSH_URL:=https://ftp.osuosl.org/pub/blfs/conglomeration/zsh/zsh-${PKG_ZSH_VERSION}.tar.xz};
+
+#
+# Build target native_packages_dev
+#
+NATIVE_PACKAGES_DEV_CFLAGS_CONFIGURE="${DEFAULT_CFLAGS:+${DEFAULT_CFLAGS} }--sysroot=${PREFIX_NATIVE}";
+NATIVE_PACKAGES_DEV_CONFIGURE_ARGS="-C --disable-nls --host=${TARGET} --prefix= --target=${TARGET}";
+NATIVE_PACKAGES_DEV_LDFLAGS_CONFIGURE="--sysroot=${PREFIX_NATIVE}";
+NATIVE_PACKAGES_DEV_MAKEFLAGS_INSTALL="PREFIX= prefix=";
+NATIVE_PACKAGES_DEV_PACKAGES="
+bdwgc bison chicken cparser diffutils flex lunix m4 make man_db patch patchutils perl python3 ruby smallbasic";
+NATIVE_PACKAGES_DEV_PREFIX="${PREFIX_NATIVE}";
+: ${PKG_BDWGC_URLS_GIT:="bdwgc=https://github.com/ivmai/bdwgc@master"};
+: ${PKG_BISON_SHA256SUM:=a72428c7917bdf9fa93cb8181c971b6e22834125848cf1d03ce10b1bb0716fe1};
+: ${PKG_BISON_VERSION:=3.0.4};
+: ${PKG_BISON_URL:=https://ftp.gnu.org/gnu/bison/bison-3.0.4.tar.xz};
+: ${PKG_CHICKEN_SHA256SUM:=e3dc2b8f95b6a3cd59c85b5bb6bdb2bd9cefc45b5d536a20cad74e3c63f4ad89};
+: ${PKG_CHICKEN_VERSION:=4.11.0};
+: ${PKG_CHICKEN_URL:=https://code.call-cc.org/releases/4.11.0/chicken-${PKG_CHICKEN_VERSION}.tar.gz};
+: ${PKG_CHICKEN_BUILD_STEPS_DISABLE:=build_clean:variant};
+: ${PKG_CHICKEN_MAKEFLAGS_BUILD:="PLATFORM=midipix-${ARCH} PREFIX=${PREFIX_NATIVE} TARGET_PREFIX=${PREFIX_NATIVE} C_COMPILER=${TARGET}-gcc HOSTSYSTEM=${TARGET}"};
+: ${PKG_CHICKEN_MAKEFLAGS_BUILD_EXTRA_DEBUG:=DEBUGBUILD=1};
+: ${PKG_CHICKEN_MAKEFLAGS_BUILD_EXTRA_RELEASE:=DEBUGBUILD=0};
+: ${PKG_CHICKEN_MAKE_INSTALL_VNAME:=TARGET_PREFIX};
+: ${PKG_CHICKEN_MAKEFLAGS_INSTALL:="PLATFORM=midipix-${ARCH} PREFIX=${PREFIX_NATIVE} C_COMPILER=${TARGET}-gcc HOSTSYSTEM=${TARGET} CROSS_CHICKEN=1"};
+: ${PKG_CPARSER_URLS_GIT:="cparser=http://pp.info.uni-karlsruhe.de/git/cparser.git@master bcparser=${DEFAULT_GITROOT}/compilers/bcparser@main"};
+: ${PKG_CPARSER_BASE_DIR:=${WORKDIR}/cparser+libfirm-build};
+: ${PKG_CPARSER_BUILD_DIR:=build/cparser};
+: ${PKG_CPARSER_CONFIGURE:=bcparser/configure};
+: ${PKG_CPARSER_CONFIGURE_ARGS:="--source-dir=../../cparser --prefix="};
+: ${PKG_CPARSER_DISABLED:=1};
+: ${PKG_DIFFUTILS_SHA256SUM:=d621e8bdd4b573918c8145f7ae61817d1be9deb4c8d2328a65cea8e11d783bd6};
+: ${PKG_DIFFUTILS_VERSION:=3.6};
+: ${PKG_DIFFUTILS_URL:=https://ftp.gnu.org/gnu/diffutils/diffutils-${PKG_DIFFUTILS_VERSION}.tar.xz};
+: ${PKG_FLEX_SHA256SUM:=e87aae032bf07c26f85ac0ed3250998c37621d95f8bd748b31f15b33c45ee995};
+: ${PKG_FLEX_VERSION:=2.6.4};
+: ${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_BUILD_DIR:=lunix};
+: ${PKG_LUNIX_MAKEFLAGS_BUILD:="all5.3 libdir=${PREFIX_NATIVE}/lib"};
+: ${PKG_LUNIX_MAKEFLAGS_INSTALL_EXTRA:="libdir=lib"};
+: ${PKG_MAKE_SHA256SUM:=d6e262bf3601b42d2b1e4ef8310029e1dcf20083c5446b4b7aa67081fdffc589};
+: ${PKG_MAKE_VERSION:=4.2.1};
+: ${PKG_MAKE_URL:=https://ftp.gnu.org/gnu/make/make-${PKG_MAKE_VERSION}.tar.bz2};
+: ${PKG_MAN_DB_SHA256SUM:=08edbc52f24aca3eebac429b5444efd48b9b90b9b84ca0ed5507e5c13ed10f3f};
+: ${PKG_MAN_DB_VERSION:=2.7.6.1};
+: ${PKG_MAN_DB_URL:=http://download.savannah.gnu.org/releases/man-db/man-db-${PKG_MAN_DB_VERSION}.tar.xz};
+: ${PKG_MAN_DB_CFLAGS_BUILD_EXTRA:="-Dprogram_name=program_invocation_name -I${PREFIX_NATIVE}/include"};
+: ${PKG_M4_SHA256SUM:=f2c1e86ca0a404ff281631bdc8377638992744b175afb806e25871a24a934e07};
+: ${PKG_M4_VERSION:=1.4.18};
+: ${PKG_M4_URL:=https://ftp.gnu.org/gnu/m4/m4-${PKG_M4_VERSION}.tar.xz};
+: ${PKG_PATCH_SHA256SUM:=7436f5a19f93c3ca83153ce9c5cbe4847e97c5d956e57a220121e741f6e7968f};
+: ${PKG_PATCH_VERSION:=2.7.5};
+: ${PKG_PATCH_URL:=https://ftp.gnu.org/gnu/patch/patch-${PKG_PATCH_VERSION}.tar.gz};
+: ${PKG_PATCHUTILS_SHA256SUM:=cf55d4db83ead41188f5b6be16f60f6b76a87d5db1c42f5459d596e81dabe876};
+: ${PKG_PATCHUTILS_VERSION:=0.3.4};
+: ${PKG_PATCHUTILS_URL:=http://cyberelk.net/tim/data/patchutils/stable/patchutils-${PKG_PATCHUTILS_VERSION}.tar.xz};
+: ${PKG_PERL_SHA256SUM:=2b475d0849d54c4250e9cba4241b7b7291cffb45dfd083b677ca7b5d38118f27};
+: ${PKG_PERL_VERSION:=5.22.1};
+: ${PKG_PERL_URL:=http://www.cpan.org/src/5.0/perl-${PKG_PERL_VERSION}.tar.gz};
+: ${PKG_PERL_URLS_GIT:="perl-cross=https://github.com/lalbornoz/perl-cross@master"};
+: ${PKG_PERL_BASE_DIR:=${WORKDIR}/perl-build};
+: ${PKG_PERL_CONFIGURE_ARGS:="-A ccflags=-I${PREFIX_NATIVE}/include --sysroot=${PREFIX_NATIVE} --target=${TARGET}"};
+: ${PKG_PERL_ENV_VARS_EXTRA:="TARGET=${TARGET}"};
+: ${PKG_PERL_MAKEFLAGS_BUILD:=-j1};
+: ${PKG_PERL_SUBDIR:=perl-${PKG_PERL_VERSION}};
+: ${PKG_PYTHON3_SHA256SUM:=687e067d9f391da645423c7eda8205bae9d35edc0c76ef5218dcbe4cc770d0d7};
+: ${PKG_PYTHON3_VERSION:=3.5.1};
+: ${PKG_PYTHON3_URL:=https://www.python.org/ftp/python/${PKG_PYTHON3_VERSION}/Python-${PKG_PYTHON3_VERSION}.tgz};
+: ${PKG_PYTHON3_CONFIGURE_ARGS:="--build=x86_64 -C --enable-ipv6 --enable-shared --host=${TARGET} --prefix=${PREFIX_NATIVE} --without-ensurepip"};
+: ${PKG_PYTHON3_ENV_VARS_EXTRA:="BLDSHARED=${TARGET}-gcc -shared -mout-dsolib --sysroot=${PREFIX_NATIVE}:CC=${TARGET}-gcc:CFLAGS=--sysroot=${PREFIX_NATIVE}:CPPFLAGS=--sysroot=${PREFIX_NATIVE}:LDFLAGS=-L${PREFIX_NATIVE}/lib"}:
+: ${PKG_PYTHON3_SUBDIR:=Python-${PKG_PYTHON3_VERSION}};
+: ${PKG_RUBY_SHA256SUM:=ba5ba60e5f1aa21b4ef8e9bf35b9ddb57286cb546aac4b5a28c71f459467e507};
+: ${PKG_RUBY_VERSION:=2.3.0};
+: ${PKG_RUBY_URL:=https://cache.ruby-lang.org/pub/ruby/${PKG_RUBY_VERSION%.*}/ruby-${PKG_RUBY_VERSION}.tar.gz};
+: ${PKG_RUBY_CONFIGURE_ARGS_EXTRA:="--disable-install-rdoc --with-baseruby=${PREFIX}/bin/ruby --with-out-ext=fiddle"};
+: ${PKG_RUBY_MAKEFLAGS_BUILD:=-j1};
+: ${PKG_SMALLBASIC_URLS_GIT:="SmallBASIC=https://github.com/smallbasic/SmallBASIC@master"};
+: ${PKG_SMALLBASIC_BUILD_DIR:=SmallBASIC};
+: ${PKG_SMALLBASIC_CFLAGS_CONFIGURE_EXTRA:=-std=gnu99};
+
+#
+# Build target native_packages_etc
+#
+NATIVE_PACKAGES_ETC_CFLAGS_CONFIGURE="${DEFAULT_CFLAGS:+${DEFAULT_CFLAGS} }--sysroot=${PREFIX_NATIVE}";
+NATIVE_PACKAGES_ETC_CONFIGURE_ARGS="-C --disable-nls --host=${TARGET} --prefix= --target=${TARGET}";
+NATIVE_PACKAGES_ETC_LDFLAGS_CONFIGURE="--sysroot=${PREFIX_NATIVE}";
+NATIVE_PACKAGES_ETC_MAKEFLAGS_INSTALL="PREFIX= prefix=";
+NATIVE_PACKAGES_PACKAGES="
+cron hexcurse htop infounzip infozip john less mc nano ncdu p7zip procps_ng qpdf
+rxvt_unicode st tmux vim xeyes xwd";
+NATIVE_PACKAGES_ETC_PREFIX="${PREFIX_NATIVE}";
+: ${PKG_CRON_URLS_GIT:="pkg-cron.git=git://anonscm.debian.org/pkg-cron/pkg-cron.git@debian/3.0pl1-128"};
+: ${PKG_CRON_ENV_VARS_EXTRA:="CC=${TARGET}-gcc:CFLAGS=${PACKAGES_CFLAGS_CONFIGURE} -D__GNU__"};
+: ${PKG_HEXCURSE_URLS_GIT:="hexcurse=https://github.com/LonnyGomes/hexcurse@master"};
+: ${PKG_HEXCURSE_CFLAGS_CONFIGURE_EXTRA:=-I${PREFIX_NATIVE}/include/ncursesw};
+: ${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};
+: ${PKG_INFOUNZIP_URLS_GIT:=infounzip=https://github.com/Redfoxmoon3/infounzip.git@master};
+: ${PKG_INFOZIP_URLS_GIT:=infozip=https://github.com/Redfoxmoon3/infozip.git@master};
+: ${PKG_JOHN_SHA256SUM:=952cf68369fb5b27f2d112ce7ca1eb16b975c85cbce8c658abb8bc5a20e1b266};
+: ${PKG_JOHN_VERSION:=1.8.0};
+: ${PKG_JOHN_URL:=http://www.openwall.com/john/j/john-${PKG_JOHN_VERSION}.tar.xz};
+: ${PKG_JOHN_BUILD_STEPS_DISABLE:=install_make:dynamic};
+: ${PKG_JOHN_DISABLED:=$(if [ "${ARCH}" = "nt32" ]; then echo 1; fi)};
+: ${PKG_JOHN_INSTALL_FILES:="run/john=bin/ run/mailer=bin/ run/makechr=bin/ run/relbench=bin/ run/unafs=bin/ run/unique=bin/ run/unshadow=bin/ /=share/john run/ascii.chr=share/john/ run/digits.chr=share/john/ run/john.conf=share/john/ run/lm_ascii.chr=share/john/ run/password.lst=share/john/"};
+: ${PKG_JOHN_MAKEFLAGS_BUILD_EXTRA_DEBUG:="-C src midipix-x86-64"};
+: ${PKG_JOHN_MAKEFLAGS_BUILD_EXTRA_RELEASE:="-C src midipix-x86-64 LDFLAGS_DEBUG=-s"};
+: ${PKG_JOHN_SUBDIR:=john-${PKG_JOHN_VERSION}};
+: ${PKG_LESS_SHA256SUM:=f3dc8455cb0b2b66e0c6b816c00197a71bf6d1787078adeee0bcf2aea4b12706};
+: ${PKG_LESS_VERSION:=487};
+: ${PKG_LESS_URL:=http://www.greenwoodsoftware.com/less/less-${PKG_LESS_VERSION}.tar.gz};
+: ${PKG_MC_SHA256SUM:=eb9e56bbb5b2893601d100d0e0293983049b302c5ab61bfb544ad0ee2cc1f2df};
+: ${PKG_MC_VERSION:=4.8.19};
+: ${PKG_MC_URL:=http://ftp.midnight-commander.org/mc-${PKG_MC_VERSION}.tar.xz};
+: ${PKG_MC_CFLAGS_CONFIGURE_EXTRA:="-I${PREFIX_NATIVE}/include -I${PREFIX_NATIVE}/include/ncursesw"};
+: ${PKG_MC_CONFIGURE_ARGS_EXTRA:="--with-screen=ncurses --x-includes=${PREFIX_NATIVE}/include/X11 --x-libraries=${PREFIX_NATIVE}/lib"};
+: ${PKG_NANO_SHA256SUM:=220cdf0b29b3d2bcba66e7aaa5b27ed1f2bf53c44192d8e0e0328624da3dbebf};
+: ${PKG_NANO_VERSION:=2.9.0};
+: ${PKG_NANO_URL:=http://www.nano-editor.org/dist/v${PKG_NANO_VERSION%.[0-9]}/nano-${PKG_NANO_VERSION}.tar.gz};
+: ${PKG_NCDU_SHA256SUM:=820e4e4747a2a2ec7a2e9f06d2f5a353516362c22496a10a9834f871b877499a};
+: ${PKG_NCDU_VERSION:=1.12};
+: ${PKG_NCDU_URL:=https://dev.yorhel.nl/download/ncdu-${PKG_NCDU_VERSION}.tar.gz};
+: ${PKG_P7ZIP_URLS_GIT:="p7zip-midipix.git=https://github.com/lalbornoz/p7zip-midipix.git@master"};
+: ${PKG_P7ZIP_BUILD_STEPS_DISABLE:=install_make:dynamic};
+: ${PKG_P7ZIP_INSTALL_FILES:="bin/7za=bin/"};
+: ${PKG_PROCPS_NG_SHA256SUM:=b1036c109f271c7c50325b11a748236f8e58aa1dbafefb30c995ff1d05b4a1a8};
+: ${PKG_PROCPS_NG_VERSION:=3.3.12};
+: ${PKG_PROCPS_NG_URL:=https://gitlab.com/procps-ng/procps/repository/archive.tar.gz?ref=v${PKG_PROCPS_NG_VERSION}};
+: ${PKG_PROCPS_NG_CFLAGS_CONFIGURE_EXTRA:=-I${PREFIX_NATIVE}/include/ncursesw};
+: ${PKG_PROCPS_NG_SUBDIR:=procps-v${PKG_PROCPS_NG_VERSION}-e0784ddaed30d095bb1d9a8ad6b5a23d10a212c4};
+: ${PKG_QPDF_SHA256SUM:=a9fdc7e94d38fcd3831f37b6e0fe36492bf79aa6d54f8f66062cf7f9c4155233};
+: ${PKG_QPDF_VERSION:=6.0.0};
+: ${PKG_QPDF_URL:=http://sourceforge.mirrorservice.org/q/qp/qpdf/qpdf/${PKG_QPDF_VERSION}/qpdf-${PKG_QPDF_VERSION}.tar.gz};
+: ${PKG_QPDF_BUILD_DIR:=qpdf-${PKG_QPDF_VERSION}};
+: ${PKG_QPDF_CONFIGURE_ARGS_EXTRA:=--with-random=/dev/urandom};
+: ${PKG_RXVT_UNICODE_SHA256SUM:=e94628e9bcfa0adb1115d83649f898d6edb4baced44f5d5b769c2eeb8b95addd};
+: ${PKG_RXVT_UNICODE_VERSION:=9.22};
+: ${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_ST_SHA256SUM:=f7870d906ccc988926eef2cc98950a99cc78725b685e934c422c03c1234e6000};
+: ${PKG_ST_VERSION:=0.7};
+: ${PKG_ST_URL:=https://dl.suckless.org/st/st-${PKG_ST_VERSION}.tar.gz};
+: ${PKG_ST_BUILD_STEPS_DISABLE:=install_make:dynamic};
+: ${PKG_ST_CFLAGS_BUILD_EXTRA:=${LEAF_PACKAGES_CFLAGS_CONFIGURE} -I${PREFIX_NATIVE}/include/freetype2};
+: ${PKG_ST_INSTALL_FILES:=st=bin/ st.1=share/man/man1/ st.info=bin/};
+: ${PKG_ST_LDFLAGS_BUILD_EXTRA:=-L${PREFIX_NATIVE}/lib -lX11 -lXft -lfreetype -lfontconfig};
+: ${PKG_TMUX_SHA256SUM:=55313e132f0f42de7e020bf6323a1939ee02ab79c48634aa07475db41573852b};
+: ${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_VIM_SHA256SUM:=8de19b12cabde17b87f915a05e1855f6ff8404962947c5cf2204cf51f1ce5d67};
+: ${PKG_VIM_VERSION:=7.4.1952};
+: ${PKG_VIM_URL:=https://github.com/vim/vim/archive/v${PKG_VIM_VERSION}.tar.gz};
+: ${PKG_VIM_BUILD_DIR:=vim-${PKG_VIM_VERSION}};
+: ${PKG_VIM_CONFIGURE_ARGS_EXTRA:=--with-tlib=ncursesw};
+: ${PKG_VIM_INSTALL_FILES:=@vim=bin/vi};
+: ${PKG_VIM_MAKEFLAGS_INSTALL_EXTRA:=STRIP=/bin/true};
+: ${PKG_VIM_SUBDIR:=${PKG_VIM_BUILD_DIR}};
+: ${PKG_XEYES_SHA256SUM:=975e98680cd59e1f9439016386609546ed08c284d0f05a95276f96aca6e8a521};
+: ${PKG_XEYES_VERSION:=1.1.1};
+: ${PKG_XEYES_URL:=https://www.x.org/releases/individual/app/xeyes-${PKG_XEYES_VERSION}.tar.bz2};
+: ${PKG_XWD_SHA256SUM:=3bb396a2268d78de4b1c3e5237a85f7849d3434e87b3cd1f4d57eef614227d79};
+: ${PKG_XWD_VERSION:=1.0.6};
+: ${PKG_XWD_URL:=https://www.x.org/releases/individual/app/xwd-${PKG_XWD_VERSION}.tar.bz2};
+
+#
+# Build target native_packages_inet
+#
+NATIVE_PACKAGES_INET_CFLAGS_CONFIGURE="${DEFAULT_CFLAGS:+${DEFAULT_CFLAGS} }--sysroot=${PREFIX_NATIVE}";
+NATIVE_PACKAGES_INET_CONFIGURE_ARGS="-C --disable-nls --host=${TARGET} --prefix= --target=${TARGET}";
+NATIVE_PACKAGES_INET_LDFLAGS_CONFIGURE="--sysroot=${PREFIX_NATIVE}";
+NATIVE_PACKAGES_INET_MAKEFLAGS_INSTALL="PREFIX= prefix=";
+NATIVE_PACKAGES_INET_PACKAGES="
+apk_tools aria2 bind dropbear git gnupg httpd inetutils irssi ldns lighttpd lynx
+mtr nginx openlitespeed openssh pacman rsync socat thttpd weechat wget whois";
+NATIVE_PACKAGES_INET_PREFIX="${PREFIX_NATIVE}";
+: ${PKG_APK_TOOLS_SHA256SUM:=def2b2c23cd12fd2a9c19be49653b0d1bf9d81a26dac5a0ee79a1351d674f93b};
+: ${PKG_APK_TOOLS_VERSION:=2.6.8};
+: ${PKG_APK_TOOLS_URL:=http://git.alpinelinux.org/cgit/apk-tools/snapshot/apk-tools-${PKG_APK_TOOLS_VERSION}.tar.bz2};
+: ${PKG_APK_TOOLS_ENV_VARS_EXTRA:=CFLAGS=--sysroot=${PREFIX_NATIVE}:CROSS_COMPILE=${TARGET}-:LUAAPK=:VERBOSE=1:PREFIX=${PREFIX_NATIVE}};
+: ${PKG_APK_TOOLS_MAKEFLAGS_INSTALL_EXTRA:="PREFIX=${PREFIX_NATIVE} MANDIR=/share/man DOCDIR=/share/doc/apk"};
+: ${PKG_ARIA2_SHA256SUM:=546e9194a9135d665fce572cb93c88f30fb5601d113bfa19951107ced682dc50};
+: ${PKG_ARIA2_VERSION:=1.32.0};
+: ${PKG_ARIA2_URL:=https://github.com/aria2/aria2/releases/download/release-${PKG_ARIA2_VERSION}/aria2-${PKG_ARIA2_VERSION}.tar.xz};
+: ${PKG_ARIA2_DISABLED:=1};
+: ${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};
+: ${PKG_BIND_CONFIGURE_ARGS_EXTRA:="--with-ecdsa=yes --with-gost=no --with-gssapi=no --with-libtool --with-libxml2=${PREFIX}/bin/${TARGET}-xml2-config --with-libjson=no --with-openssl=${PREFIX_NATIVE} --with-randomdev=/dev/urandom BUILD_CC=gcc"};
+: ${PKG_DROPBEAR_VERSION:=2017.75};
+: ${PKG_DROPBEAR_URL:=https://matt.ucc.asn.au/dropbear/releases/dropbear-${PKG_DROPBEAR_VERSION}.tar.bz2};
+: ${PKG_DROPBEAR_SHA256SUM:=6cbc1dcb1c9709d226dff669e5604172a18cf5dbf9a201474d5618ae4465098c};
+: ${PKG_DROPBEAR_CONFIGURE_ARGS_EXTRA:=--disable-loginfunc};
 : ${PKG_GIT_SHA256SUM:=ccc366d5d674fb755fd98d219c23f2b4e5da8a49d8582a6314813b280d75536b};
 : ${PKG_GIT_VERSION:=2.14.1};
 : ${PKG_GIT_URL:=https://github.com/git/git/archive/v${PKG_GIT_VERSION}.tar.gz};
@@ -658,14 +867,6 @@ LEAF_PACKAGES_PREFIX="${PREFIX_NATIVE}";
 : ${PKG_GNUPG_VERSION:=2.1.16};
 : ${PKG_GNUPG_URL:=https://www.gnupg.org/ftp/gcrypt/gnupg/gnupg-${PKG_GNUPG_VERSION}.tar.bz2};
 : ${PKG_GNUPG_CONFIGURE_ARGS_EXTRA:="--with-libgpg-error-prefix=${PREFIX_NATIVE} --with-libgcrypt-prefix=${PREFIX_NATIVE} --with-libassuan-prefix=${PREFIX_NATIVE} --with-ksba-prefix=${PREFIX_NATIVE} --with-npth-prefix=${PREFIX_NATIVE}"};
-: ${PKG_GREP_SHA256SUM:=db625c7ab3bb3ee757b3926a5cfa8d9e1c3991ad24707a83dde8a5ef2bf7a07e};
-: ${PKG_GREP_VERSION:=3.1};
-: ${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_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};
 : ${PKG_HTTPD_SHA256SUM:=f87ec2df1c9fee3e6bfde3c8b855a3ddb7ca1ab20ca877bd0e2b6bf3f05c80b2};
 : ${PKG_HTTPD_VERSION:=2.4.25};
 : ${PKG_HTTPD_URL:=http://mirror.softaculous.com/apache//httpd/httpd-${PKG_HTTPD_VERSION}.tar.bz2};
@@ -674,80 +875,27 @@ LEAF_PACKAGES_PREFIX="${PREFIX_NATIVE}";
 : ${PKG_INETUTILS_VERSION:=1.9.4};
 : ${PKG_INETUTILS_URL:=https://ftp.gnu.org/gnu/inetutils/inetutils-${PKG_INETUTILS_VERSION}.tar.xz};
 : ${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_INFOZIP_URLS_GIT:=infozip=https://github.com/Redfoxmoon3/infozip.git@master};
 : ${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};
 : ${PKG_IRSSI_CONFIGURE_ARGS_EXTRA:=--with-ncurses=${PREFIX_NATIVE}};
-: ${PKG_JOHN_SHA256SUM:=952cf68369fb5b27f2d112ce7ca1eb16b975c85cbce8c658abb8bc5a20e1b266};
-: ${PKG_JOHN_VERSION:=1.8.0};
-: ${PKG_JOHN_URL:=http://www.openwall.com/john/j/john-${PKG_JOHN_VERSION}.tar.xz};
-: ${PKG_JOHN_BUILD_STEPS_DISABLE:=install_make:dynamic};
-: ${PKG_JOHN_DISABLED:=$(if [ "${ARCH}" = "nt32" ]; then echo 1; fi)};
-: ${PKG_JOHN_INSTALL_FILES:="run/john=bin/ run/mailer=bin/ run/makechr=bin/ run/relbench=bin/ run/unafs=bin/ run/unique=bin/ run/unshadow=bin/ /=share/john run/ascii.chr=share/john/ run/digits.chr=share/john/ run/john.conf=share/john/ run/lm_ascii.chr=share/john/ run/password.lst=share/john/"};
-: ${PKG_JOHN_MAKEFLAGS_BUILD_EXTRA_DEBUG:="-C src midipix-x86-64"};
-: ${PKG_JOHN_MAKEFLAGS_BUILD_EXTRA_RELEASE:="-C src midipix-x86-64 LDFLAGS_DEBUG=-s"};
-: ${PKG_JOHN_SUBDIR:=john-${PKG_JOHN_VERSION}};
 : ${PKG_LDNS_SHA256SUM:=c19f5b1b4fb374cfe34f4845ea11b1e0551ddc67803bd6ddd5d2a20f0997a6cc};
 : ${PKG_LDNS_VERSION:=1.7.0};
 : ${PKG_LDNS_URL:=https://www.nlnetlabs.nl/downloads/ldns/ldns-${PKG_LDNS_VERSION}.tar.gz};
 : ${PKG_LDNS_CONFIGURE_ARGS_EXTRA:="--with-ssl=${PREFIX_NATIVE} --disable-dane-ta-usage --with-drill --with-examples"};
-: ${PKG_LESS_SHA256SUM:=f3dc8455cb0b2b66e0c6b816c00197a71bf6d1787078adeee0bcf2aea4b12706};
-: ${PKG_LESS_VERSION:=487};
-: ${PKG_LESS_URL:=http://www.greenwoodsoftware.com/less/less-${PKG_LESS_VERSION}.tar.gz};
 : ${PKG_LIGHTTPD_SHA256SUM:=1c97225deea33eefba6d4158c2cef27913d47553263516bbe9d2e2760fc43a3f};
 : ${PKG_LIGHTTPD_VERSION:=1.4.45};
 : ${PKG_LIGHTTPD_URL:=http://download.lighttpd.net/lighttpd/releases-${PKG_LIGHTTPD_VERSION%.*}.x/lighttpd-${PKG_LIGHTTPD_VERSION}.tar.xz};
-: ${PKG_FLEX_SHA256SUM:=e87aae032bf07c26f85ac0ed3250998c37621d95f8bd748b31f15b33c45ee995};
-: ${PKG_FLEX_VERSION:=2.6.4};
-: ${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_BUILD_DIR:=lunix};
-: ${PKG_LUNIX_MAKEFLAGS_BUILD:="all5.3 libdir=${PREFIX_NATIVE}/lib"};
-: ${PKG_LUNIX_MAKEFLAGS_INSTALL_EXTRA:="libdir=lib"};
 : ${PKG_LYNX_SHA256SUM:=6980e75cf0d677fd52c116e2e0dfd3884e360970c88c8356a114338500d5bee7};
 : ${PKG_LYNX_VERSION:=2.8.8rel.2};
 : ${PKG_LYNX_URL:=https://ftp.osuosl.org/pub/blfs/conglomeration/lynx/lynx${PKG_LYNX_VERSION}.tar.bz2};
 : ${PKG_LYNX_CFLAGS_CONFIGURE_EXTRA:="-I${PREFIX_NATIVE}/include -I${PREFIX_NATIVE}/include/ncursesw"};
 : ${PKG_LYNX_CONFIGURE_ARGS_EXTRA:=--with-ssl};
 : ${PKG_LYNX_SUBDIR:=lynx2-8-8};
-: ${PKG_MAKE_SHA256SUM:=d6e262bf3601b42d2b1e4ef8310029e1dcf20083c5446b4b7aa67081fdffc589};
-: ${PKG_MAKE_VERSION:=4.2.1};
-: ${PKG_MAKE_URL:=https://ftp.gnu.org/gnu/make/make-${PKG_MAKE_VERSION}.tar.bz2};
-: ${PKG_MAN_DB_SHA256SUM:=08edbc52f24aca3eebac429b5444efd48b9b90b9b84ca0ed5507e5c13ed10f3f};
-: ${PKG_MAN_DB_VERSION:=2.7.6.1};
-: ${PKG_MAN_DB_URL:=http://download.savannah.gnu.org/releases/man-db/man-db-${PKG_MAN_DB_VERSION}.tar.xz};
-: ${PKG_MAN_DB_CFLAGS_BUILD_EXTRA:="-Dprogram_name=program_invocation_name -I${PREFIX_NATIVE}/include"};
-: ${PKG_MC_SHA256SUM:=eb9e56bbb5b2893601d100d0e0293983049b302c5ab61bfb544ad0ee2cc1f2df};
-: ${PKG_MC_VERSION:=4.8.19};
-: ${PKG_MC_URL:=http://ftp.midnight-commander.org/mc-${PKG_MC_VERSION}.tar.xz};
-: ${PKG_MC_CFLAGS_CONFIGURE_EXTRA:="-I${PREFIX_NATIVE}/include -I${PREFIX_NATIVE}/include/ncursesw"};
-: ${PKG_MC_CONFIGURE_ARGS_EXTRA:="--with-screen=ncurses --x-includes=${PREFIX_NATIVE}/include/X11 --x-libraries=${PREFIX_NATIVE}/lib"};
-: ${PKG_MINGW_W64_SHA256SUM:=9bb5cd7df78817377841a63555e73596dc0af4acbb71b09bd48de7cf24aeadd2};
-: ${PKG_MINGW_W64_VERSION:=5.0.1};
-: ${PKG_MINGW_W64_URL:=https://sourceforge.mirrorservice.org/m/mi/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v${PKG_MINGW_W64_VERSION}.tar.bz2};
-: ${PKG_MKSH_SHA256SUM:=8bce3837c386684aa7780f085f1a4dbd5e3e26fb5c528ee0d41ae29af7f39013};
-: ${PKG_MKSH_VERSION:=R54};
-: ${PKG_MKSH_URL:=http://pub.allbsd.org/MirOS/dist/mir/mksh/mksh-${PKG_MKSH_VERSION}.tgz};
-: ${PKG_MKSH_BUILD_STEPS_DISABLE:=install_make:dynamic};
-: ${PKG_MKSH_ENV_VARS_EXTRA:="CC=${TARGET}-gcc:CFLAGS=${PACKAGES_CFLAGS_CONFIGURE:+${PACKAGES_CFLAGS_CONFIGURE} }-DMKSH_NOPROSPECTOFWORK"};
-: ${PKG_MKSH_INSTALL_FILES:="mksh=bin/ /=share/doc/mksh/examples dot.mkshrc=share/doc/mksh/examples/ mksh.1=share/man/man1/"};
-: ${PKG_MKSH_SUBDIR:=mksh};
 : ${PKG_MTR_SHA256SUM:=f2979db9e2f41aa8e6574e7771767c9afe111d9213814eb47f5e1e71876e4382};
 : ${PKG_MTR_VERSION:=0.92};
 : ${PKG_MTR_URL:=ftp://ftp.bitwizard.nl/mtr/mtr-${PKG_MTR_VERSION}.tar.gz};
 : ${PKG_MTR_DISABLED:=1};
-: ${PKG_M4_SHA256SUM:=f2c1e86ca0a404ff281631bdc8377638992744b175afb806e25871a24a934e07};
-: ${PKG_M4_VERSION:=1.4.18};
-: ${PKG_M4_URL:=https://ftp.gnu.org/gnu/m4/m4-${PKG_M4_VERSION}.tar.xz};
-: ${PKG_NANO_SHA256SUM:=220cdf0b29b3d2bcba66e7aaa5b27ed1f2bf53c44192d8e0e0328624da3dbebf};
-: ${PKG_NANO_VERSION:=2.9.0};
-: ${PKG_NANO_URL:=http://www.nano-editor.org/dist/v${PKG_NANO_VERSION%.[0-9]}/nano-${PKG_NANO_VERSION}.tar.gz};
-: ${PKG_NCDU_SHA256SUM:=820e4e4747a2a2ec7a2e9f06d2f5a353516362c22496a10a9834f871b877499a};
-: ${PKG_NCDU_VERSION:=1.12};
-: ${PKG_NCDU_URL:=https://dev.yorhel.nl/download/ncdu-${PKG_NCDU_VERSION}.tar.gz};
 : ${PKG_NGINX_SHA256SUM:=4a667f40f9f3917069db1dea1f2d5baa612f1fa19378aadf71502e846a424610};
 : ${PKG_NGINX_VERSION:=1.11.3};
 : ${PKG_NGINX_URL:=http://nginx.org/download/nginx-${PKG_NGINX_VERSION}.tar.gz};
@@ -766,110 +914,23 @@ LEAF_PACKAGES_PREFIX="${PREFIX_NATIVE}";
 : ${PKG_OPENSSH_URL:=http://artfiles.org/openbsd/OpenSSH/portable/openssh-${PKG_OPENSSH_VERSION}.tar.gz};
 : ${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_STEPS_DISABLE:=install_make:dynamic};
-: ${PKG_P7ZIP_INSTALL_FILES:="bin/7za=bin/"};
 : ${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};
 : ${PKG_PACMAN_CONFIGURE_ARGS_EXTRA:=--disable-doc};
-: ${PKG_PATCH_SHA256SUM:=7436f5a19f93c3ca83153ce9c5cbe4847e97c5d956e57a220121e741f6e7968f};
-: ${PKG_PATCH_VERSION:=2.7.5};
-: ${PKG_PATCH_URL:=https://ftp.gnu.org/gnu/patch/patch-${PKG_PATCH_VERSION}.tar.gz};
-: ${PKG_PATCHUTILS_SHA256SUM:=cf55d4db83ead41188f5b6be16f60f6b76a87d5db1c42f5459d596e81dabe876};
-: ${PKG_PATCHUTILS_VERSION:=0.3.4};
-: ${PKG_PATCHUTILS_URL:=http://cyberelk.net/tim/data/patchutils/stable/patchutils-${PKG_PATCHUTILS_VERSION}.tar.xz};
-: ${PKG_PERL_SHA256SUM:=2b475d0849d54c4250e9cba4241b7b7291cffb45dfd083b677ca7b5d38118f27};
-: ${PKG_PERL_VERSION:=5.22.1};
-: ${PKG_PERL_URL:=http://www.cpan.org/src/5.0/perl-${PKG_PERL_VERSION}.tar.gz};
-: ${PKG_PERL_URLS_GIT:="perl-cross=https://github.com/lalbornoz/perl-cross@master"};
-: ${PKG_PERL_BASE_DIR:=${WORKDIR}/perl-build};
-: ${PKG_PERL_CONFIGURE_ARGS:="-A ccflags=-I${PREFIX_NATIVE}/include --sysroot=${PREFIX_NATIVE} --target=${TARGET}"};
-: ${PKG_PERL_ENV_VARS_EXTRA:="TARGET=${TARGET}"};
-: ${PKG_PERL_MAKEFLAGS_BUILD:=-j1};
-: ${PKG_PERL_SUBDIR:=perl-${PKG_PERL_VERSION}};
-: ${PKG_PROCPS_NG_SHA256SUM:=b1036c109f271c7c50325b11a748236f8e58aa1dbafefb30c995ff1d05b4a1a8};
-: ${PKG_PROCPS_NG_VERSION:=3.3.12};
-: ${PKG_PROCPS_NG_URL:=https://gitlab.com/procps-ng/procps/repository/archive.tar.gz?ref=v${PKG_PROCPS_NG_VERSION}};
-: ${PKG_PROCPS_NG_CFLAGS_CONFIGURE_EXTRA:=-I${PREFIX_NATIVE}/include/ncursesw};
-: ${PKG_PROCPS_NG_SUBDIR:=procps-v${PKG_PROCPS_NG_VERSION}-e0784ddaed30d095bb1d9a8ad6b5a23d10a212c4};
-: ${PKG_PYTHON3_SHA256SUM:=687e067d9f391da645423c7eda8205bae9d35edc0c76ef5218dcbe4cc770d0d7};
-: ${PKG_PYTHON3_VERSION:=3.5.1};
-: ${PKG_PYTHON3_URL:=https://www.python.org/ftp/python/${PKG_PYTHON3_VERSION}/Python-${PKG_PYTHON3_VERSION}.tgz};
-: ${PKG_PYTHON3_CONFIGURE_ARGS:="--build=x86_64 -C --enable-ipv6 --enable-shared --host=${TARGET} --prefix=${PREFIX_NATIVE} --without-ensurepip"};
-: ${PKG_PYTHON3_ENV_VARS_EXTRA:="BLDSHARED=${TARGET}-gcc -shared -mout-dsolib --sysroot=${PREFIX_NATIVE}:CC=${TARGET}-gcc:CFLAGS=--sysroot=${PREFIX_NATIVE}:CPPFLAGS=--sysroot=${PREFIX_NATIVE}:LDFLAGS=-L${PREFIX_NATIVE}/lib"}:
-: ${PKG_PYTHON3_SUBDIR:=Python-${PKG_PYTHON3_VERSION}};
-: ${PKG_QPDF_SHA256SUM:=a9fdc7e94d38fcd3831f37b6e0fe36492bf79aa6d54f8f66062cf7f9c4155233};
-: ${PKG_QPDF_VERSION:=6.0.0};
-: ${PKG_QPDF_URL:=http://sourceforge.mirrorservice.org/q/qp/qpdf/qpdf/${PKG_QPDF_VERSION}/qpdf-${PKG_QPDF_VERSION}.tar.gz};
-: ${PKG_QPDF_BUILD_DIR:=qpdf-${PKG_QPDF_VERSION}};
-: ${PKG_QPDF_CONFIGURE_ARGS_EXTRA:=--with-random=/dev/urandom};
 : ${PKG_RSYNC_SHA256SUM:=ecfa62a7fa3c4c18b9eccd8c16eaddee4bd308a76ea50b5c02a5840f09c0a1c2};
 : ${PKG_RSYNC_VERSION:=3.1.2};
 : ${PKG_RSYNC_URL:=https://download.samba.org/pub/rsync/src/rsync-${PKG_RSYNC_VERSION}.tar.gz};
 : ${PKG_RSYNC_CONFIGURE_ARGS_EXTRA:=--with-included-popt --with-included-zlib};
-: ${PKG_RUBY_SHA256SUM:=ba5ba60e5f1aa21b4ef8e9bf35b9ddb57286cb546aac4b5a28c71f459467e507};
-: ${PKG_RUBY_VERSION:=2.3.0};
-: ${PKG_RUBY_URL:=https://cache.ruby-lang.org/pub/ruby/${PKG_RUBY_VERSION%.*}/ruby-${PKG_RUBY_VERSION}.tar.gz};
-: ${PKG_RUBY_CONFIGURE_ARGS_EXTRA:="--disable-install-rdoc --with-baseruby=${PREFIX}/bin/ruby --with-out-ext=fiddle"};
-: ${PKG_RUBY_MAKEFLAGS_BUILD:=-j1};
-: ${PKG_RXVT_UNICODE_SHA256SUM:=e94628e9bcfa0adb1115d83649f898d6edb4baced44f5d5b769c2eeb8b95addd};
-: ${PKG_RXVT_UNICODE_VERSION:=9.22};
-: ${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_MAKE_INSTALL_VNAME:=PREFIX};
-: ${PKG_SBASE_PREFIX:=${PREFIX_NATIVE}/suckless};
-: ${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_URLS_GIT:="SmallBASIC=https://github.com/smallbasic/SmallBASIC@master"};
-: ${PKG_SMALLBASIC_BUILD_DIR:=SmallBASIC};
-: ${PKG_SMALLBASIC_CFLAGS_CONFIGURE_EXTRA:=-std=gnu99};
 : ${PKG_SOCAT_SHA256SUM:=ce3efc17e3e544876ebce7cd6c85b3c279fda057b2857fcaaf67b9ab8bdaf034};
 : ${PKG_SOCAT_VERSION:=1.7.3.2};
 : ${PKG_SOCAT_URL:=http://www.dest-unreach.org/socat/download/socat-1.7.3.2.tar.gz};
-: ${PKG_ST_SHA256SUM:=f7870d906ccc988926eef2cc98950a99cc78725b685e934c422c03c1234e6000};
-: ${PKG_ST_VERSION:=0.7};
-: ${PKG_ST_URL:=https://dl.suckless.org/st/st-${PKG_ST_VERSION}.tar.gz};
-: ${PKG_ST_BUILD_STEPS_DISABLE:=install_make:dynamic};
-: ${PKG_ST_CFLAGS_BUILD_EXTRA:=${LEAF_PACKAGES_CFLAGS_CONFIGURE} -I${PREFIX_NATIVE}/include/freetype2};
-: ${PKG_ST_INSTALL_FILES:=st=bin/ st.1=share/man/man1/ st.info=bin/};
-: ${PKG_ST_LDFLAGS_BUILD_EXTRA:=-L${PREFIX_NATIVE}/lib -lX11 -lXft -lfreetype -lfontconfig};
-: ${PKG_TAR_SHA256SUM:=cae466e6e58c7292355e7080248f244db3a4cf755f33f4fa25ca7f9a7ed09af0};
-: ${PKG_TAR_VERSION:=1.29};
-: ${PKG_TAR_URL:=https://ftp.gnu.org/gnu/tar/tar-${PKG_TAR_VERSION}.tar.gz};
-: ${PKG_TCSH_SHA256SUM:=b89de7064ab54dac454a266cfe5d8bf66940cb5ed048d0c30674ea62e7ecef9d};
-: ${PKG_TCSH_VERSION:=6.20.00};
-: ${PKG_TCSH_URL:=http://ftp.funet.fi/pub/mirrors/ftp.astron.com/pub/tcsh/tcsh-${PKG_TCSH_VERSION}.tar.gz};
-: ${PKG_THE_SILVER_SEARCHER_SHA256SUM:=d4652bd91c3a05e87a15809c5f3f14ad2e5e1f80185af510e3fa4ad2038c15d4};
-: ${PKG_THE_SILVER_SEARCHER_VERSION:=2.1.0};
-: ${PKG_THE_SILVER_SEARCHER_URL:=http://geoff.greer.fm/ag/releases/the_silver_searcher-${PKG_THE_SILVER_SEARCHER_VERSION}.tar.gz};
 : ${PKG_THTTPD_SHA256SUM:=b1c4bc37ada7c39cc2bcfbf86b3bc05be91be49f8bb4f55379eaff1f66516d7a};
 : ${PKG_THTTPD_VERSION:=2.27};
 : ${PKG_THTTPD_URL:=https://acme.com/software/thttpd/thttpd-${PKG_THTTPD_VERSION}.tar.gz};
 : ${PKG_THTTPD_BUILD_DIR:=thttpd-${PKG_THTTPD_VERSION}};
 : ${PKG_THTTPD_CONFIGURE_ARGS:="--disable-nls --host=${TARGET} --prefix= --target=${TARGET}"};
 : ${PKG_THTTPD_MAKE_INSTALL_VNAME:=prefix};
-: ${PKG_TMUX_SHA256SUM:=55313e132f0f42de7e020bf6323a1939ee02ab79c48634aa07475db41573852b};
-: ${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_UBASE_URLS_GIT:="ubase=http://git.suckless.org/ubase@master"};
-: ${PKG_UBASE_MAKE_INSTALL_VNAME:=PREFIX};
-: ${PKG_UBASE_PREFIX:=${PREFIX_NATIVE}/suckless};
-: ${PKG_UTIL_LINUX_SHA256SUM:=d5950e4b2839d00aa3781f439bfada8091bc6ed8180d8262c53b4e4304e2d299};
-: ${PKG_UTIL_LINUX_VERSION:=2.31};
-: ${PKG_UTIL_LINUX_URL:=https://www.kernel.org/pub/linux/utils/util-linux/v${PKG_UTIL_LINUX_VERSION}/util-linux-${PKG_UTIL_LINUX_VERSION}.tar.gz};
-: ${PKG_UTIL_LINUX_CONFIGURE_ARGS_EXTRA:=--disable-agetty --disable-lslogins --disable-wall --disable-write};
-: ${PKG_VIM_SHA256SUM:=8de19b12cabde17b87f915a05e1855f6ff8404962947c5cf2204cf51f1ce5d67};
-: ${PKG_VIM_VERSION:=7.4.1952};
-: ${PKG_VIM_URL:=https://github.com/vim/vim/archive/v${PKG_VIM_VERSION}.tar.gz};
-: ${PKG_VIM_BUILD_DIR:=vim-${PKG_VIM_VERSION}};
-: ${PKG_VIM_CONFIGURE_ARGS_EXTRA:=--with-tlib=ncursesw};
-: ${PKG_VIM_INSTALL_FILES:=@vim=bin/vi};
-: ${PKG_VIM_MAKEFLAGS_INSTALL_EXTRA:=STRIP=/bin/true};
-: ${PKG_VIM_SUBDIR:=${PKG_VIM_BUILD_DIR}};
 : ${PKG_WEECHAT_SHA256SUM:=3061e57460e0e3e4533551c45ced53b222fe0933848250d0fb7337d9aacfd853};
 : ${PKG_WEECHAT_VERSION:=1.6};
 : ${PKG_WEECHAT_URL:=https://weechat.org/files/src/weechat-${PKG_WEECHAT_VERSION}.tar.gz};
@@ -879,42 +940,24 @@ LEAF_PACKAGES_PREFIX="${PREFIX_NATIVE}";
 : ${PKG_WGET_VERSION:=1.19.2};
 : ${PKG_WGET_URL:=https://ftp.gnu.org/gnu/wget/wget-${PKG_WGET_VERSION}.tar.gz};
 : ${PKG_WGET_CONFIGURE_ARGS_EXTRA:=--with-ssl=openssl};
-: ${PKG_WHICH_SHA256SUM:=f4a245b94124b377d8b49646bf421f9155d36aa7614b6ebf83705d3ffc76eaad};
-: ${PKG_WHICH_VERSION:=2.21};
-: ${PKG_WHICH_URL:=https://ftp.gnu.org/gnu/which/which-${PKG_WHICH_VERSION}.tar.gz};
 : ${PKG_WHOIS_SHA256SUM:=048c3b0fd731e5c777c9cf1e01e0ed7aca387891743a97c5b57b3daa8df524a4};
 : ${PKG_WHOIS_VERSION:=5.2.18};
 : ${PKG_WHOIS_URL:=https://github.com/rfc1036/whois/archive/v${PKG_WHOIS_VERSION}.tar.gz};
 : ${PKG_WHOIS_MAKE_INSTALL_VNAME:=BASEDIR};
 : ${PKG_WHOIS_SUBDIR:=whois-${PKG_WHOIS_VERSION}};
-: ${PKG_XEYES_SHA256SUM:=975e98680cd59e1f9439016386609546ed08c284d0f05a95276f96aca6e8a521};
-: ${PKG_XEYES_VERSION:=1.1.1};
-: ${PKG_XEYES_URL:=https://www.x.org/releases/individual/app/xeyes-${PKG_XEYES_VERSION}.tar.bz2};
-: ${PKG_XWD_SHA256SUM:=3bb396a2268d78de4b1c3e5237a85f7849d3434e87b3cd1f4d57eef614227d79};
-: ${PKG_XWD_VERSION:=1.0.6};
-: ${PKG_XWD_URL:=https://www.x.org/releases/individual/app/xwd-${PKG_XWD_VERSION}.tar.bz2};
-: ${PKG_ZSH_SHA256SUM:=76f82cfd5ce373cf799a03b6f395283f128430db49202e3e3f512fb5a19d6f8a};
-: ${PKG_ZSH_VERSION:=5.3};
-: ${PKG_ZSH_URL:=https://ftp.osuosl.org/pub/blfs/conglomeration/zsh/zsh-${PKG_ZSH_VERSION}.tar.xz};
 
 #
-# Build target minipix
-#
-MINIPIX_CFLAGS_CONFIGURE="${DEFAULT_CFLAGS:+${DEFAULT_CFLAGS} }--sysroot=${PREFIX_NATIVE}";
-MINIPIX_CONFIGURE_ARGS="-C --disable-nls --host=${TARGET} --prefix= --target=${TARGET}";
-MINIPIX_LDFLAGS_CONFIGURE="--sysroot=${PREFIX_NATIVE}";
-MINIPIX_MAKEFLAGS_INSTALL="PREFIX= prefix=";
-MINIPIX_PACKAGES="
-ntctty_flavour_minipix ptycon_flavour_minipix
-gzip_flavour_minipix bzip2_flavour_minipix xz_flavour_minipix
-bash_flavour_minipix coreutils_flavour_minipix tar_flavour_minipix";
-MINIPIX_PREFIX="${PREFIX_MINIPIX}";
-: ${PKG_NTCTTY_FLAVOUR_MINIPIX_CONFIGURE_ARGS:="--prefix= --strict --host=${TARGET}"};
-: ${PKG_NTCTTY_FLAVOUR_MINIPIX_ENV_VARS_EXTRA:="CFLAGS_PATH=-I${PREFIX_NATIVE}/include:LDFLAGS_PATH=-L${PREFIX_NATIVE}/lib"};
-: ${PKG_NTCTTY_FLAVOUR_MINIPIX_INSTALL_TARGET:=install-static-app};
-: ${PKG_PTYCON_FLAVOUR_MINIPIX_CONFIGURE_ARGS:="--prefix= --strict --host=${TARGET}"};
-: ${PKG_PTYCON_FLAVOUR_MINIPIX_ENV_VARS_EXTRA:="CFLAGS_PATH=-I${PREFIX_NATIVE}/include:LDFLAGS_PATH=-L${PREFIX_NATIVE}/lib"};
-: ${PKG_PTYCON_FLAVOUR_MINIPIX_INSTALL_TARGET:=install-static-app};
+# Build target dist_minipix
+#
+DIST_MINIPIX_CFLAGS_CONFIGURE="${DEFAULT_CFLAGS:+${DEFAULT_CFLAGS} }--sysroot=${PREFIX_NATIVE}";
+DIST_MINIPIX_CONFIGURE_ARGS="-C --disable-nls --host=${TARGET} --prefix= --target=${TARGET}";
+DIST_MINIPIX_LDFLAGS_CONFIGURE="--sysroot=${PREFIX_NATIVE}";
+DIST_MINIPIX_MAKEFLAGS_INSTALL="PREFIX= prefix=";
+DIST_MINIPIX_PACKAGES="
+bzip2_flavour_minipix gzip_flavour_minipix xz_flavour_minipix
+bash_flavour_minipix coreutils_flavour_minipix tar_flavour_minipix
+ntctty_flavour_minipix ptycon_flavour_minipix";
+DIST_MINIPIX_PREFIX="${PREFIX_MINIPIX}";
 : ${PKG_BZIP2_FLAVOUR_MINIPIX_BUILD_STEPS_DISABLE:="${PKG_BZIP2_BUILD_STEPS_DISABLE:+${PKG_BZIP2_BUILD_STEPS_DISABLE} }install_make:dynamic"};
 : ${PKG_BZIP2_FLAVOUR_MINIPIX_INSTALL_FILES:="bzip2=bin/ @bzip2=bin/bunzip2 @bzip2=bin/bzcat @bzip2=bin/bzip2recover @bzip2=bin/bzgrep @bzip2=bin/bzmore @bzip2=bin/bzdiff"};
 : ${PKG_BZIP2_FLAVOUR_MINIPIX_LDFLAGS_BUILD_EXTRA:="-static"};
@@ -937,20 +980,35 @@ MINIPIX_PREFIX="${PREFIX_MINIPIX}";
 : ${PKG_TAR_FLAVOUR_MINIPIX_LDFLAGS_BUILD_EXTRA:="-static"};
 : ${PKG_TAR_FLAVOUR_MINIPIX_MAKEFLAGS_BUILD_EXTRA:="SHARED=0"};
 : ${PKG_TAR_FLAVOUR_MINIPIX_MAKEFLAGS_INSTALL:="-C src install-binPROGRAMS"};
+: ${PKG_NTCTTY_FLAVOUR_MINIPIX_CONFIGURE_ARGS:="--prefix= --strict --host=${TARGET}"};
+: ${PKG_NTCTTY_FLAVOUR_MINIPIX_ENV_VARS_EXTRA:="CFLAGS_PATH=-I${PREFIX_NATIVE}/include:LDFLAGS_PATH=-L${PREFIX_NATIVE}/lib"};
+: ${PKG_NTCTTY_FLAVOUR_MINIPIX_INSTALL_TARGET:=install-static-app};
+: ${PKG_PTYCON_FLAVOUR_MINIPIX_CONFIGURE_ARGS:="--prefix= --strict --host=${TARGET}"};
+: ${PKG_PTYCON_FLAVOUR_MINIPIX_ENV_VARS_EXTRA:="CFLAGS_PATH=-I${PREFIX_NATIVE}/include:LDFLAGS_PATH=-L${PREFIX_NATIVE}/lib"};
+: ${PKG_PTYCON_FLAVOUR_MINIPIX_INSTALL_TARGET:=install-static-app};
 
 #
-# Build target dist
+# Build target dist_target
 #
-DIST_NO_LOG_VARS=1;
-DIST_PACKAGES="dist_etc dist_digest dist_tarballs";
+DIST_TARGET_NO_LOG_VARS=1;
+DIST_TARGET_PACKAGES="dist_etc dist_digest dist_tarballs";
 
 #
-# Build meta-targets
+# Build targets
 #
+DEV_TARGET="dev_packages";
+DIST_TARGET="dist_minipix dist_target";
+HOST_TARGET="host_toolchain_deps host_toolchain"
 INVARIANTS_TARGET="invariants";
-DEVROOT_TARGET="host_toolchain_deps host_toolchain native_toolchain_deps native_toolchain runtime";
-DEV_TARGET="${DEVROOT_TARGET} dev_packages";
-WORLD_TARGET="${DEVROOT_TARGET} host_packages lib_packages leaf_packages minipix dist";
-ALL_TARGETS="${WORLD_TARGET} devroot dev world";
+NATIVE_TARGET="native_toolchain_deps native_toolchain native_runtime";
+PACKAGES_DEPS_TARGET="host_packages_deps native_packages_deps native_packages_deps_x11";
+PACKAGES_TARGET="native_packages_cmdline native_packages_dev native_packages_etc native_packages_inet";
+
+#
+# Build meta-targets
+#
+DEV_TARGET="${HOST_TARGET} ${NATIVE_TARGET} ${DEV_TARGET}";
+DEVROOT_TARGET="${HOST_TARGET} ${NATIVE_TARGET}";
+WORLD_TARGET="${HOST_TARGET} ${NATIVE_TARGET} ${PACKAGES_DEPS_TARGET} ${PACKAGES_TARGET} ${DIST_TARGET}";
 
 # vim:filetype=sh textwidth=0
diff --git a/vars/env.vars b/vars/env.vars
index 4177542e..d9e06dd0 100644
--- a/vars/env.vars
+++ b/vars/env.vars
@@ -31,8 +31,7 @@
 	LDFLAGS_BUILD_EXTRA LDFLAGS_CONFIGURE LDFLAGS_CONFIGURE_EXTRA
 	LDFLAGS_INSTALL_EXTRA MAKE_INSTALL_VNAME MAKEFLAGS_BUILD
 	MAKEFLAGS_BUILD_EXTRA MAKEFLAGS_INSTALL MAKEFLAGS_INSTALL_EXTRA
-	NO_LOG_VARS PREFIX_EXTRA SHA256SUM SLIBTOOL SUBDIR TARGET URL
-	URL_TYPE URLS_GIT VERSION"};
+	NO_LOG_VARS SHA256SUM SLIBTOOL SUBDIR TARGET URL URL_TYPE URLS_GIT VERSION"};
 : ${CLEAR_ENV_VARS_EXCEPT:="ARG_VERBOSE ARG_VERBOSE2 ARG_VERBOSE3 DEFAULT_GITROOT_HEAD HOME PATH SHELL TERM TARBALL_SIGN_GPG_KEY USER"};
 : ${CLEAR_PREFIX_DIRS:="bin i686-nt32-midipix include lib lib64 libexec minipix native share tmp x86_64-nt64-midipix"};