Merge {groups,vars}/ w/ extended ${PKG_INSTALL_V2} DSL.

files/{autoconf_2_64_host,busybox,install_strip_host,libxml2,pkgconf,{pkgconf,python2,rpm,texinfo}_host}/*, etc/{busyboxconfig,python2.7-config}: added/moved.
groups/000.host_tools.group:auto{conf_2_64,make_1_11_6}_host:${PKG_INSTALL_FILES_V2}: merged.
groups/000.host_tools.group:install_strip_host:${PKG_BUILD_STEPS_DISABLE}: disable "build install_make install_rpm".
groups/000.host_tools.group:install_strip_host:${PKG_INSTALL_FILES_V2}: merged.
groups/000.host_tools.group:pkgconf_host:${PKG_INSTALL_FILES_V2}: merged.
groups/010.host_deps.group:chainport_host:${PKG_BUILD_STEPS_DISABLE}: disable "build install_make install_rpm".
groups/010.host_deps.group:chainport_host:${PKG_PREFIX}: removed.
groups/010.host_deps.group:{chainport,clzip,cmake,dbus,libffi,libzip,mdso,ncursesw,perk,python[23],texinfo,tzdb}_host:${PKG_INSTALL_FILES_V2}: merged/updated.
groups/020.host_deps_rpm.group:rpm_host:${PKG_INSTALL_FILES_V2}: merged.
groups/030.host_toolchain.group:{binutils,ldso,nasm}_host:${PKG_INSTALL_FILES_V2}: merged/updated.
groups/100.native_tools.group:{mdso,perk,pkgconf}:${PKG_INSTALL_FILES_V2}: merged.
groups/110.native_toolchain.group:binutils:${PKG_INSTALL_FILES_V2}: merged.
groups/120.native_runtime.group:{ldso,ntux,psxscl_strace}:${PKG_INSTALL_FILES_V2}: updated.
groups/211.native_packages_cmdline.group:{busybox,dash.dos2unix,mksh,ninvaders,openbsd_baseutils,pixz,tree,terminally_tetris}:${PKG_INSTALL_FILES_V2}: merged/updated.
groups/221.native_packages_dev.group:{gdb,lua,python3}:${PKG_INSTALL_FILES_V2}: updated.
groups/231.native_packages_etc.group:{apr_util,bochs,bzip2,clzip,doomgeneric,hastyhex,john,ncursesw,p7zip,vim}:${PKG_INSTALL_FILES_V2}: updated.
groups/251.native_packages_lib.group:{lib{ffi,jpeg_turbo,solv,ssh,xml2,zip},nettle,wolfssl}:${PKG_INSTALL_FILES_V2}: merged/updated.
groups/251.native_packages_lib.group:nettle:${PKG_CONFIG_CACHE_EXTRA}: merged.
groups/261.native_packages_x11.group:{glew,st}:${PKG_INSTALL_FILES_V2}: updated.
groups/800.minipix.group:{bash,bzip2,dash,dropbear}_minipix:${PKG_INSTALL_FILES_V2}: updated.
vars/{{autoconf_2_64,automake_1_11_6,chainport,dbus,install_strip,nasm,pkgconf,rpm,texinfo,tzdb}_host,nettle,pkgconf{,_host}}.vars: deleted.

36 files changed, 226 insertions, 318 deletions

diff --git a/files/autoconf_2_64_host/bin/%[FNAME]-2.64 b/files/autoconf_2_64_host/bin/%[FNAME]-2.64
new file mode 100755
index 00000000..ec8896cc
--- /dev/null
+++ b/files/autoconf_2_64_host/bin/%[FNAME]-2.64
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+AUTOTOOL_COMMAND="${0##*/}"; AUTOTOOL_COMMAND="${AUTOTOOL_COMMAND%-2.64}";
+PREFIX=""; [ ${PREFIX:="${0%/*}"} = "${0}" ] && PREFIX="."; PREFIX="${PREFIX:+${PREFIX}/}..";
+export ACLOCAL="${ACLOCAL:-${PREFIX}/binaclocal-1.11}";
+export AC_MACRODIR="${AC_MACRODIR:-${PREFIX}/share/autoconf-2.64}";
+export AUTOCONF="${AUTOCONF:-${PREFIX}/libexec/autoconf-2.64/autoconf}";
+export AUTOHEADER="${AUTOHEADER:-${PREFIX}/libexec/autoconf-2.64/autoheader}";
+export AUTOM4TE="${AUTOM4TE:-${PREFIX}/libexec/autoconf-2.64/autom4te}";
+export AUTOM4TE_CFG="${AUTOM4TE_CFG:-${PREFIX}/share/autoconf-2.64/autom4te.cfg}";
+export autom4te_perllibdir="${autom4te_perllibdir:-${PREFIX}/share/autoconf-2.64}";
+export AUTOMAKE="${AUTOMAKE:-${PREFIX}/bin/automake-1.11}";
+export AUTOPOINT="${AUTOPOINT:-${PREFIX}/libexec/autoconf-2.64/autopoint}";
+export LIBTOOLIZE="${LIBTOOLIZE:-${PREFIX}/libexec/autoconf-2.64/libtoolize}";
+
+AUTOTOOL_COMMAND="${PREFIX}/libexec/autoconf-2.64/${AUTOTOOL_COMMAND}"; unset PREFIX;
+exec "${AUTOTOOL_COMMAND}" "${@}";
diff --git a/etc/busyboxconfig b/files/busybox/busyboxconfig
index 8ab89eb5..8ab89eb5 100644
--- a/etc/busyboxconfig
+++ b/files/busybox/busyboxconfig
diff --git a/files/install_strip_host/bin/%[_target]-install-strip b/files/install_strip_host/bin/%[_target]-install-strip
new file mode 100755
index 00000000..57a1b330
--- /dev/null
+++ b/files/install_strip_host/bin/%[_target]-install-strip
@@ -0,0 +1,2 @@
+#!/bin/sh
+install -s "${@}";
diff --git a/files/libxml2/bin/%[_target]-xml2-config b/files/libxml2/bin/%[_target]-xml2-config
new file mode 100644
index 00000000..fe809143
--- /dev/null
+++ b/files/libxml2/bin/%[_target]-xml2-config
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+PREFIX=""; [ ${PREFIX:="${0%/*}"} = "${0}" ] && PREFIX="."; PREFIX="${PREFIX:+${PREFIX}/}..";
+case "${1}" in
+--cflags)	printf "-I${PREFIX}/include/libxml2\n"; ;;
+--libs)		printf "-L${PREFIX}/lib -lxml2 -lz -llzma -lpthread -lm\n"; ;;
+esac;
diff --git a/files/pkgconf/bin/%[_target]-pkg-config b/files/pkgconf/bin/%[_target]-pkg-config
new file mode 100644
index 00000000..dd6328fc
--- /dev/null
+++ b/files/pkgconf/bin/%[_target]-pkg-config
@@ -0,0 +1,8 @@
+#!/bin/sh
+PREFIX=""; [ ${PREFIX:="${0%/*}"} = "${0}" ] && PREFIX="."; PREFIX="${PREFIX:+${PREFIX}/}..";
+if [ "${#}" -eq 1 ]\
+&& [ "x${1}" = "x--version" ]; then
+	"${PREFIX}/bin/pkgconf" --version;
+else
+	"${PREFIX}/bin/pkgconf" --define-variable=prefix="${PREFIX%/}/" --keep-system-cflags "${@}";
+fi;
diff --git a/files/pkgconf_host b/files/pkgconf_host
new file mode 120000
index 00000000..243cd47f
--- /dev/null
+++ b/files/pkgconf_host
@@ -0,0 +1 @@
+pkgconf
\ No newline at end of file
diff --git a/etc/python2.7-config b/files/python2_host/bin/python2.7-config
index ebfd6c82..5888c816 100755
--- a/etc/python2.7-config
+++ b/files/python2_host/bin/python2.7-config
@@ -5,7 +5,7 @@ set -eu
 for arg ; do
 	case "$arg" in
 		--version)
-			printf 'Python 2.7.18'
+			printf 'Python 2.7.15'
 			;;
 
 		--includes)
diff --git a/files/rpm_host/lib/rpm/elfdeps b/files/rpm_host/lib/rpm/elfdeps
new file mode 100755
index 00000000..b23e5561
--- /dev/null
+++ b/files/rpm_host/lib/rpm/elfdeps
@@ -0,0 +1 @@
+#!/bin/true
diff --git a/files/texinfo_host/bin/makeinfo b/files/texinfo_host/bin/makeinfo
new file mode 100755
index 00000000..8204ac43
--- /dev/null
+++ b/files/texinfo_host/bin/makeinfo
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+PREFIX=""; [ ${PREFIX:="${0%/*}"} = "${0}" ] && PREFIX="."; PREFIX="${PREFIX:+${PREFIX}/}..";
+export PERL5LIB="${PREFIX}/share/texinfo:${PREFIX}/share/texinfo/lib/libintl-perl/lib:${PREFIX}/share/texinfo/lib/Text-Unidecode/lib:${PREFIX}/share/texinfo/lib/Unicode-EastAsianWidth/lib";
+"${PREFIX}/bin/makeinfo.dist" "${@}";
diff --git a/groups/000.host_tools.group b/groups/000.host_tools.group
index 7ec354bc..310dee5e 100644
--- a/groups/000.host_tools.group
+++ b/groups/000.host_tools.group
@@ -17,6 +17,22 @@ HOST_TOOLS_PREFIX="${PREFIX}";
 : ${PKG_AUTOCONF_2_64_HOST_SHA256SUM:=32d977213320b8ae76c71175305301197f2b0e04e72d70694bc3d3e2ae6c7248};
 : ${PKG_AUTOCONF_2_64_HOST_VERSION:=2.64};
 : ${PKG_AUTOCONF_2_64_HOST_URL:=https://ftp.gnu.org/gnu/autoconf/autoconf-${PKG_AUTOCONF_2_64_HOST_VERSION}.tar.xz};
+: ${PKG_AUTOCONF_2_64_HOST_INSTALL_FILES_V2:="
+	/=libexec/autoconf-2.64
+	!bin/%<*>=libexec/autoconf-2.64/%[FNAME]
+	+%[_files]/bin/\%[FNAME]-2.64=bin/autoconf-2.64
+	+%[_files]/bin/\%[FNAME]-2.64=bin/autoheader-2.64
+	+%[_files]/bin/\%[FNAME]-2.64=bin/autom4te-2.64
+	+%[_files]/bin/\%[FNAME]-2.64=bin/autoreconf-2.64
+	+%[_files]/bin/\%[FNAME]-2.64=bin/autoscan-2.64
+	+%[_files]/bin/\%[FNAME]-2.64=bin/autoupdate-2.64
+	+%[_files]/bin/\%[FNAME]-2.64=bin/ifnames-2.64
+	!share/autoconf-2.64/autom4te.cfg=share/autoconf/autom4te.cfg
+	-=share/autoconf-2.64/
+	!share/autoconf=share/autoconf-2.64/
+	-=share/info/dir
+	!share/info/%<*.info>=share/info/%[FNAME%.info]-2.64.info
+	!share/man/man1/%<*.1>=share/man/man1/%[FNAME%.1]-2.64.1"};
 : ${PKG_AUTOMAKE_HOST_DEPENDS:="autoconf_host pkgconf_host slibtool_host"};
 : ${PKG_AUTOMAKE_HOST_SHA256SUM:=ff2bf7656c4d1c6fdda3b8bebb21f09153a736bcba169aaf65eab25fa113bf3a};
 : ${PKG_AUTOMAKE_HOST_VERSION:=1.16.3};
@@ -25,13 +41,24 @@ HOST_TOOLS_PREFIX="${PREFIX}";
 : ${PKG_AUTOMAKE_1_11_6_HOST_SHA256SUM:=1ffbc6cc41f0ea6c864fbe9485b981679dc5e350f6c4bc6c3512f5a4226936b5};
 : ${PKG_AUTOMAKE_1_11_6_HOST_VERSION:=1.11.6};
 : ${PKG_AUTOMAKE_1_11_6_HOST_URL:=https://ftp.gnu.org/gnu/automake/automake-${PKG_AUTOMAKE_1_11_6_HOST_VERSION}.tar.xz};
+: ${PKG_AUTOMAKE_1_11_6_HOST_INSTALL_FILES_V2:="
+	-=bin/%<*-1.11>
+	!bin/%<*>=bin/%[FNAME]-1.11
+	-=share/info/dir
+	!share/doc/automake=share/doc/automake-1.11.6
+	!share/info/%<*.info*>=share/info/%[FNAME%.info*]-1.11.6.%[FNAME#*.]
+	!share/man/man1/%<*.1>=share/man/man1/%[FNAME%.1]-1.11.6.1"};
 : ${PKG_GETTEXT_TINY_HOST_DEPENDS:="pkgconf_host slibtool_host"};
 : ${PKG_GETTEXT_TINY_HOST_SHA256SUM:=29cc165e27e83d2bb3760118c2368eadab550830d962d758e51bd36eb860f383};
 : ${PKG_GETTEXT_TINY_HOST_VERSION:=0.3.2};
 : ${PKG_GETTEXT_TINY_HOST_URL:=https://toolchains.bootlin.com/downloads/releases/sources/gettext-tiny-${PKG_GETTEXT_TINY_HOST_VERSION}/gettext-tiny-${PKG_GETTEXT_TINY_HOST_VERSION}.tar.gz};
 : ${PKG_GETTEXT_TINY_HOST_BUILD_DIR:=gettext-tiny-${PKG_GETTEXT_TINY_HOST_VERSION}};
 : ${PKG_GETTEXT_TINY_HOST_MAKEFLAGS_BUILD_EXTRA:="prefix=${PREFIX}"};
+: ${PKG_INSTALL_STRIP_HOST_BUILD_STEPS_DISABLE:="build install_make install_rpm"};
 : ${PKG_INSTALL_STRIP_HOST_NO_LOG_VARS:=1};
+: ${PKG_INSTALL_STRIP_HOST_INSTALL_FILES_V2:="
+	+%[_files]/bin/\%[_target]-install-strip=bin/%[_target]-install-strip
+	m0755=bin/%[_target]-install-strip"};
 : ${PKG_LIBTOOL_HOST_DEPENDS:="autoconf_host automake_host pkgconf_host slibtool_host"}:
 : ${PKG_LIBTOOL_HOST_SHA256SUM:=7c87a8c2c8c0fc9cd5019e402bed4292462d00a718a7cd5f11218153bf28b26f};
 : ${PKG_LIBTOOL_HOST_VERSION:=2.4.6};
@@ -46,6 +73,10 @@ HOST_TOOLS_PREFIX="${PREFIX}";
 : ${PKG_PKGCONF_HOST_VERSION:=1.8.0};
 : ${PKG_PKGCONF_HOST_URL:=https://distfiles.dereferenced.org/pkgconf/pkgconf-${PKG_PKGCONF_HOST_VERSION}.tar.xz};
 : ${PKG_PKGCONF_HOST_CONFIGURE_ARGS:="--prefix=${PREFIX} --with-system-libdir=${PREFIX_NATIVE}/lib --with-system-includedir=${PREFIX_NATIVE}/include --with-pkg-config-dir=${PREFIX_NATIVE}/lib/pkgconfig --with-personality-dir=${PREFIX_NATIVE}/share/pkgconfig/personality.d"};
+: ${PKG_PKGCONF_HOST_INSTALL_FILES_V2:="
+	@pkgconf=bin/pkg-config
+	+%[_files]/bin/\%[_target]-pkg-config=bin/%[_target]-pkg-config
+	m0755=bin/%[_target]-pkg-config"};
 : ${PKG_SLIBTOOL_HOST_URLS_GIT:="slibtool=${DEFAULT_GITROOT}/slibtool"};
 : ${PKG_SLIBTOOL_HOST_CONFIGURE_ARGS:=--prefix=};
 : ${PKG_TPAX_HOST_URLS_GIT:="tpax=https://git.midipix.org/tpax@main"};
diff --git a/groups/010.host_deps.group b/groups/010.host_deps.group
index 01ca1c0b..d9e44a14 100644
--- a/groups/010.host_deps.group
+++ b/groups/010.host_deps.group
@@ -51,9 +51,11 @@ HOST_DEPS_PREFIX="${PREFIX}";
 : ${PKG_CA_CERTIFICATES_HOST_ENV_VARS_EXTRA:="HOST_CC=gcc"};
 : ${PKG_CA_CERTIFICATES_HOST_VARS_FILE:="vars/ca_certificates.vars"};
 : ${PKG_CHAINPORT_HOST_URLS_GIT:="chainport=${DEFAULT_GITROOT}/ports/chainport"};
-: ${PKG_CHAINPORT_HOST_BUILD_STEPS_DISABLE:="build"};
+: ${PKG_CHAINPORT_HOST_BUILD_STEPS_DISABLE:="build install_make install_rpm"};
 : ${PKG_CHAINPORT_HOST_NO_LOG_VARS:=1};
-: ${PKG_CHAINPORT_HOST_PREFIX:=${PREFIX}};
+: ${PKG_CHAINPORT_HOST_INSTALL_FILES_V2:="
+	-=%[_workdir]/chainport
+	+../chainport=%[_workdir]/chainport"};
 : ${PKG_CLANG_HOST_DEPENDS:="llvm_host"};
 : ${PKG_CLANG_HOST_SHA256SUM:=4cd3836dfb4b88b597e075341cae86d61c63ce3963e45c7fe6a8bf59bb382cdf};
 : ${PKG_CLANG_HOST_VERSION:=3.8.1};
@@ -71,7 +73,7 @@ HOST_DEPS_PREFIX="${PREFIX}";
 : ${PKG_CLZIP_HOST_VERSION:=1.11};
 : ${PKG_CLZIP_HOST_URL:=http://download.savannah.gnu.org/releases/lzip/clzip/clzip-${PKG_CLZIP_HOST_VERSION}.tar.gz};
 : ${PKG_CLZIP_HOST_IN_TREE:=1};
-: ${PKG_CLZIP_HOST_INSTALL_FILES:="@clzip=bin/lzip"};
+: ${PKG_CLZIP_HOST_INSTALL_FILES_V2:="@clzip=bin/lzip"};
 : ${PKG_CMAKE_HOST_DEPENDS:="bzip2_host musl_fts_host ncurses_host"};
 : ${PKG_CMAKE_HOST_SHA256SUM:=dc1246c4e6d168ea4d6e042cfba577c1acd65feea27e56f5ff37df920c30cae0};
 : ${PKG_CMAKE_HOST_VERSION:=3.7.2};
@@ -81,12 +83,15 @@ HOST_DEPS_PREFIX="${PREFIX}";
 	-DCURSES_NCURSES_LIBRARY=${PREFIX}/lib/libncurses.so
 	-DLIBMD_LIBRARY=
 "};
-: ${PKG_CMAKE_HOST_INSTALL_FILES:="../cmake-${PKG_CMAKE_HOST_VERSION}/Modules/Platform/BSDOS.cmake=share/cmake-${PKG_CMAKE_HOST_VERSION%.*}/Modules/Platform/Midipix.cmake"};
+: ${PKG_CMAKE_HOST_INSTALL_FILES_V2:="+../cmake-${PKG_CMAKE_HOST_VERSION}/Modules/Platform/BSDOS.cmake=share/cmake-${PKG_CMAKE_HOST_VERSION%.*}/Modules/Platform/Midipix.cmake"};
 : ${PKG_DBUS_HOST_DEPENDS:="expat_host"};
 : ${PKG_DBUS_HOST_VERSION:=1.11.20};
 : ${PKG_DBUS_HOST_URL:=https://dbus.freedesktop.org/releases/dbus/dbus-${PKG_DBUS_HOST_VERSION}.tar.gz};
 : ${PKG_DBUS_HOST_SHA256SUM:=7fd9d0536f7ec2f2afc94b84d5b5487f88c464e8d47c661d8e0b54aa83974bfa};
 : ${PKG_DBUS_HOST_CONFIGURE_ARGS_EXTRA:="--disable-tests --with-dbus-daemondir=/bin"};
+: ${PKG_DBUS_HOST_INSTALL_FILES_V2:="
+	-=etc/%<*>
+	-=var/%<*>"};
 : ${PKG_EXPAT_HOST_SHA256SUM:=caa34f99b6e3bcea8502507eb6549a0a84510b244a748dfb287271b2d47467a9};
 : ${PKG_EXPAT_HOST_VERSION:=2.3.0};
 : ${PKG_EXPAT_HOST_URL:=http://download.openpkg.org/components/cache/expat/expat-${PKG_EXPAT_HOST_VERSION}.tar.xz};
@@ -141,7 +146,9 @@ HOST_DEPS_PREFIX="${PREFIX}";
 : ${PKG_LIBFFI_HOST_SHA256SUM:=d06ebb8e1d9a22d19e38d63fdb83954253f39bedc5d46232a05645685722ca37};
 : ${PKG_LIBFFI_HOST_VERSION:=3.2.1};
 : ${PKG_LIBFFI_HOST_URL:=ftp://sourceware.org/pub/libffi/libffi-${PKG_LIBFFI_HOST_VERSION}.tar.gz};
-: ${PKG_LIBFFI_HOST_INSTALL_FILES:="@../lib/libffi-3.2.1/include/ffi.h=include/ffi.h @../lib/libffi-3.2.1/include/ffitarget.h=include/ffitarget.h"};
+: ${PKG_LIBFFI_HOST_INSTALL_FILES_V2:="
+	@../lib/libffi-3.2.1/include/ffi.h=include/ffi.h
+	@../lib/libffi-3.2.1/include/ffitarget.h=include/ffitarget.h"};
 : ${PKG_LIBFFI_HOST_PATCHES_EXTRA:="${BUILD_WORKDIR}/chainport/patches/libffi/libffi-${PKG_LIBFFI_HOST_VERSION}.midipix.patch"};
 : ${PKG_LIBRESSL_HOST_SHA256SUM:=a471565b36ccd1a70d0bd7d37c6e95c43a26a62829b487d9d2cdebfe58be3066};
 : ${PKG_LIBRESSL_HOST_VERSION:=3.3.3};
@@ -157,8 +164,7 @@ HOST_DEPS_PREFIX="${PREFIX}";
 : ${PKG_LIBZIP_HOST_URL:=https://libzip.org/download/libzip-${PKG_LIBZIP_HOST_VERSION}.tar.xz};
 : ${PKG_LIBZIP_HOST_CMAKE_ARGS_EXTRA:="
 	-DENABLE_GNUTLS=:BOOL=OFF
-	-DENABLE_MBEDTLS=:BOOL=OFF
-"};
+	-DENABLE_MBEDTLS=:BOOL=OFF"};
 : ${PKG_LLVM_HOST_SHA256SUM:=6e82ce4adb54ff3afc18053d6981b6aed1406751b8742582ed50f04b5ab475f9};
 : ${PKG_LLVM_HOST_VERSION:=3.8.1};
 : ${PKG_LLVM_HOST_URL:=http://releases.llvm.org/${PKG_LLVM_HOST_VERSION}/llvm-${PKG_LLVM_HOST_VERSION}.src.tar.xz};
@@ -175,7 +181,10 @@ HOST_DEPS_PREFIX="${PREFIX}";
 	-Wno-dev"};
 : ${PKG_MDSO_HOST_URLS_GIT:="mdso=${DEFAULT_GITROOT}/mdso"};
 : ${PKG_MDSO_HOST_CONFIGURE_ARGS:="--prefix="};
-: ${PKG_MDSO_HOST_INSTALL_FILES:="@mdso=bin/${DEFAULT_TARGET}-mdso /=${DEFAULT_TARGET}/bin bin/mdso=${DEFAULT_TARGET}/bin/mdso"};
+: ${PKG_MDSO_HOST_INSTALL_FILES_V2:="
+	@mdso=bin/${DEFAULT_TARGET}-mdso
+	/=${DEFAULT_TARGET}/bin
+	+bin/mdso=${DEFAULT_TARGET}/bin/mdso"};
 : ${PKG_MPACKAGE_HOST_URLS_GIT:=mpackage=${DEFAULT_GITROOT}/mpackage};
 : ${PKG_MPACKAGE_HOST_MAKEFLAGS_BUILD:="DESTDIR=${PREFIX_NATIVE}"};
 : ${PKG_MPACKAGE_HOST_IN_TREE:=1};
@@ -200,7 +209,7 @@ HOST_DEPS_PREFIX="${PREFIX}";
 : ${PKG_NCURSESW_HOST_VERSION:=6.1};
 : ${PKG_NCURSESW_HOST_URL:=https://ftp.gnu.org/gnu/ncurses/ncurses-${PKG_NCURSESW_HOST_VERSION}.tar.gz};
 : ${PKG_NCURSESW_HOST_CONFIGURE_ARGS_EXTRA:="--enable-pc-files --with-pkg-config-libdir=${PREFIX}/lib/pkgconfig --with-manpages --with-progs --with-shared --with-termlib --without-ada --without-tests --enable-widec --without-pthread"};
-: ${PKG_NCURSESW_HOST_INSTALL_FILES:=@ncursesw/ncurses.h=include/ncurses.h};
+: ${PKG_NCURSESW_HOST_INSTALL_FILES_V2:="@ncursesw/ncurses.h=include/ncurses.h"};
 : ${PKG_PCRE_HOST_DEPENDS:="bzip2_host"};
 : ${PKG_PCRE_HOST_SHA256SUM:=91e762520003013834ac1adb4a938d53b22a216341c061b0cf05603b290faf6b};
 : ${PKG_PCRE_HOST_VERSION:=8.43};
@@ -208,7 +217,7 @@ HOST_DEPS_PREFIX="${PREFIX}";
 : ${PKG_PERK_HOST_DEPENDS:="mdso_host"};
 : ${PKG_PERK_HOST_URLS_GIT:="perk=${DEFAULT_GITROOT}/perk"};
 : ${PKG_PERK_HOST_CONFIGURE_ARGS:="--prefix="};
-: ${PKG_PERK_HOST_INSTALL_FILES:="@perk=bin/${DEFAULT_TARGET}-perk"};
+: ${PKG_PERK_HOST_INSTALL_FILES_V2:="@perk=bin/${DEFAULT_TARGET}-perk"};
 : ${PKG_PERK_HOST_CFLAGS_CONFIGURE:="-I${PREFIX}/include"};
 : ${PKG_PYTHON2_HOST_DEPENDS:="bzip2_host expat_host gdbm_host libffi_host readline_host libz_host ncurses_host ncursesw_host sqlite3_host"};
 : ${PKG_PYTHON2_HOST_SHA256SUM:=b62c0e7937551d0cc02b8fd5cb0f544f9405bafc9a54d3808ed4594812edef43};
@@ -220,6 +229,7 @@ HOST_DEPS_PREFIX="${PREFIX}";
 : ${PKG_PYTHON2_HOST_CONFIGURE:=build/sbpython2/configure};
 : ${PKG_PYTHON2_HOST_CONFIGURE_ARGS:="--source-dir=../../Python-${PKG_PYTHON2_HOST_VERSION} --prefix=${PREFIX}"};
 : ${PKG_PYTHON2_HOST_CONFIGURE_TYPE:="sofort"};
+: ${PKG_PYTHON2_HOST_INSTALL_FILES_V2:="+%[_files]/bin/python2.7-config=bin/%[FNAME]"};
 : ${PKG_PYTHON2_HOST_MAKEFLAGS_INSTALL_EXTRA:="PREFIX= EXEC_PREFIX= BINDIR=/bin SBINDIR=/sbin LIBDIR=/lib INCLUDEDIR=/include OLDINCLUDEDIR=/include MANDIR=/share/man DOCDIR=/share/doc LIBEXECDIR=/libexec"};
 : ${PKG_PYTHON2_HOST_SUBDIR:=Python-${PKG_PYTHON2_HOST_VERSION}};
 : ${PKG_PYTHON3_HOST_DEPENDS:="bzip2_host expat_host gdbm_host libffi_host readline_host libressl_host libz_host ncurses_host ncursesw_host sqlite3_host xz_host"};
@@ -232,7 +242,7 @@ HOST_DEPS_PREFIX="${PREFIX}";
 : ${PKG_PYTHON3_HOST_CONFIGURE:=build/sbpython3/configure};
 : ${PKG_PYTHON3_HOST_CONFIGURE_ARGS:="--source-dir=../../Python-${PKG_PYTHON3_HOST_VERSION} --prefix=${PREFIX}"};
 : ${PKG_PYTHON3_HOST_CONFIGURE_TYPE:="sofort"};
-: ${PKG_PYTHON3_HOST_INSTALL_FILES:="@python3=bin/python"};
+: ${PKG_PYTHON3_HOST_INSTALL_FILES_V2:="@python3=bin/python"};
 : ${PKG_PYTHON3_HOST_MAKEFLAGS_INSTALL_EXTRA:="PREFIX= EXEC_PREFIX= BINDIR=/bin SBINDIR=/sbin LIBDIR=/lib INCLUDEDIR=/include OLDINCLUDEDIR=/include MANDIR=/share/man DOCDIR=/share/doc LIBEXECDIR=/libexec"};
 : ${PKG_PYTHON3_HOST_SUBDIR:=Python-${PKG_PYTHON3_HOST_VERSION}};
 : ${PKG_READLINE_HOST_DEPENDS:="ncurses_host ncursestw_host ncursesw_host"};
@@ -263,12 +273,17 @@ HOST_DEPS_PREFIX="${PREFIX}";
 : ${PKG_TEXINFO_HOST_SHA256SUM:=988403c1542d15ad044600b909997ba3079b10e03224c61188117f3676b02caa};
 : ${PKG_TEXINFO_HOST_VERSION:=6.7};
 : ${PKG_TEXINFO_HOST_URL:=https://ftp.gnu.org/gnu/texinfo/texinfo-${PKG_TEXINFO_HOST_VERSION}.tar.xz};
+: ${PKG_TEXINFO_HOST_INSTALL_FILES_V2:="
+	!bin/makeinfo=bin/makeinfo.dist
+	+%[_files]/bin/makeinfo=bin/makeinfo
+	m0755=bin/makeinfo"};
 : ${PKG_TEXINFO_HOST_LIBTOOL:=rdlibtool};
 : ${PKG_TZDB_HOST_DEPENDS:="clzip_host"};
 : ${PKG_TZDB_HOST_SHA256SUM:=b1c23c7825f5f842e6e1ddb702efe85b1c22bdf0e41815b927cfc04a28372962};
 : ${PKG_TZDB_HOST_VERSION:=2018e};
 : ${PKG_TZDB_HOST_URL:=https://data.iana.org/time-zones/releases/tzdb-${PKG_TZDB_HOST_VERSION}.tar.lz};
 : ${PKG_TZDB_HOST_BUILD_DIR:="tzdb-${PKG_TZDB_HOST_VERSION}"};
+: ${PKG_TZDB_HOST_INSTALL_FILES_V2:="-=etc/%<*>"};
 : ${PKG_UTIL_LINUX_HOST_DEPENDS:="ncursesw_host"};
 : ${PKG_UTIL_LINUX_HOST_SHA256SUM:=37de03dbb98cdeffdf9e754122b0aca2a9bbdc19769f6570dfcb6f123643bf53};
 : ${PKG_UTIL_LINUX_HOST_VERSION:=2.36.1};
diff --git a/groups/020.host_deps_rpm.group b/groups/020.host_deps_rpm.group
index a1770bb1..984a8ea6 100644
--- a/groups/020.host_deps_rpm.group
+++ b/groups/020.host_deps_rpm.group
@@ -27,6 +27,10 @@ HOST_DEPS_RPM_PREFIX="${PREFIX}";
 : ${PKG_RPM_HOST_URL:=http://ftp.rpm.org/releases/rpm-${PKG_RPM_HOST_VERSION%.*}.x/rpm-${PKG_RPM_HOST_VERSION}.tar.bz2};
 : ${PKG_RPM_HOST_CFLAGS_CONFIGURE:="-I${PREFIX}/include -I${PREFIX}/include/dbus-1.0 -I${PREFIX}/lib/dbus-1.0/include"};
 : ${PKG_RPM_HOST_CONFIGURE_ARGS_EXTRA:="--enable-bdb=no --enable-ndb --with-crypto=openssl --with-vendor=midipix --without-lua"};
+: ${PKG_RPM_HOST_INSTALL_FILES_V2:="
+	+%[_files]/lib/rpm/elfdeps=lib/rpm/elfdeps
+	m0755=lib/rpm/elfdeps
+	-=var/%<*>"};
 : ${PKG_RPM_HOST_LDFLAGS_CONFIGURE:="-L${PREFIX}/lib"};
 
 # vim:filetype=sh textwidth=0
diff --git a/groups/030.host_toolchain.group b/groups/030.host_toolchain.group
index 87a83706..09bf01d6 100644
--- a/groups/030.host_toolchain.group
+++ b/groups/030.host_toolchain.group
@@ -17,7 +17,9 @@ HOST_TOOLCHAIN_PREFIX="${PREFIX_CROSS}";
 : ${PKG_BINUTILS_HOST_URL:=ftp://sourceware.org/pub/binutils/snapshots/binutils-${PKG_BINUTILS_HOST_VERSION}.tar.bz2};
 : ${PKG_BINUTILS_HOST_CFLAGS_CONFIGURE:="-I${PREFIX}/include -g2 -O0"};
 : ${PKG_BINUTILS_HOST_CONFIGURE_ARGS:="--disable-werror --enable-deterministic-archives --prefix=${PREFIX} --target=${DEFAULT_TARGET} --with-sysroot=${PREFIX_CROSS}"};
-: ${PKG_BINUTILS_HOST_INSTALL_FILES:="@${DEFAULT_TARGET}-windmc=bin/windmc @${DEFAULT_TARGET}-windres=bin/windres"};
+: ${PKG_BINUTILS_HOST_INSTALL_FILES_V2:="
+	@%[_target]-windmc=bin/windmc
+	@%[_target]-windres=bin/windres"};
 : ${PKG_BINUTILS_HOST_LDFLAGS_CONFIGURE:="-L${PREFIX}/lib -Wl,-rpath,${PREFIX}/lib"};
 : ${PKG_BINUTILS_HOST_LIBTOOL:=slibtool-static};
 : ${PKG_BINUTILS_HOST_MAKEFLAGS_INSTALL_EXTRA:="PREFIX= prefix="};
@@ -84,7 +86,7 @@ HOST_TOOLCHAIN_PREFIX="${PREFIX_CROSS}";
 : ${PKG_LDSO_HOST_BUILD_TYPE:=cross};
 : ${PKG_LDSO_HOST_CFLAGS_CONFIGURE_EXTRA:="-O0 -DPE_LDSO -I${PREFIX_CROSS}/include"};
 : ${PKG_LDSO_HOST_CONFIGURE_ARGS:="--prefix= --target=${DEFAULT_TARGET} --disable-shared"};
-: ${PKG_LDSO_HOST_INSTALL_FILES:="@../${DEFAULT_TARGET}/lib/libldso.a=${PREFIX}/lib/libldso.a"};
+: ${PKG_LDSO_HOST_INSTALL_FILES_V2:="@../%[_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:=STATIC_LIB_NAME=libldso.a};
 : ${PKG_MPC_HOST_DEPENDS:="gmp_host mpfr_host"};
@@ -127,6 +129,7 @@ HOST_TOOLCHAIN_PREFIX="${PREFIX_CROSS}";
 : ${PKG_NASM_HOST_VERSION:=2.14.02};
 : ${PKG_NASM_HOST_URL:=http://www.nasm.us/pub/nasm/releasebuilds/${PKG_NASM_HOST_VERSION}/nasm-${PKG_NASM_HOST_VERSION}.tar.xz};
 : ${PKG_NASM_HOST_CFLAGS_CONFIGURE_EXTRA:=-DCOFF_MIDIPIX};
+: ${PKG_NASM_HOST_INSTALL_FILES_V2:="!bin/%<*>=bin/%[_target]-%[FNAME]"};
 : ${PKG_NASM_HOST_PREFIX:=${PREFIX}};
 : ${PKG_PSXSTUB_HOST_DEPENDS:="gcc_stage1_host"};
 : ${PKG_PSXSTUB_HOST_URLS_GIT:="psxstub=${DEFAULT_GITROOT}/psxstub"};
diff --git a/groups/100.native_tools.group b/groups/100.native_tools.group
index 98d07fbd..c8a6c130 100644
--- a/groups/100.native_tools.group
+++ b/groups/100.native_tools.group
@@ -10,17 +10,24 @@ NATIVE_TOOLS_PKG_CONFIG_LIBDIR="${PREFIX_NATIVE}/lib/pkgconfig";
 NATIVE_TOOLS_PREFIX="${PREFIX_NATIVE}";
 : ${PKG_MDSO_URLS_GIT:="mdso=${DEFAULT_GITROOT}/mdso"};
 : ${PKG_MDSO_CONFIGURE_ARGS:="--prefix= --target=${DEFAULT_TARGET}"};
-: ${PKG_MDSO_INSTALL_FILES:="@mdso=bin/${DEFAULT_TARGET}-mdso /=${DEFAULT_TARGET}/bin @../../bin/mdso=${DEFAULT_TARGET}/bin/mdso"};
+: ${PKG_MDSO_INSTALL_FILES_V2:="
+	@mdso=bin/${DEFAULT_TARGET}-mdso
+	/=${DEFAULT_TARGET}/bin
+	@../../bin/mdso=${DEFAULT_TARGET}/bin/mdso"};
 : ${PKG_PERK_DEPENDS:="mdso"};
 : ${PKG_PERK_URLS_GIT:="perk=${DEFAULT_GITROOT}/perk"};
 : ${PKG_PERK_CFLAGS_CONFIGURE:="-I${PREFIX_NATIVE}/include"};
 : ${PKG_PERK_CONFIGURE_ARGS:="--prefix= --target=${DEFAULT_TARGET}"};
-: ${PKG_PERK_INSTALL_FILES:="@perk=bin/${DEFAULT_TARGET}-perk"};
+: ${PKG_PERK_INSTALL_FILES_V2:="@perk=bin/${DEFAULT_TARGET}-perk"};
 : ${PKG_PKGCONF_SHA256SUM:=ef9c7e61822b7cb8356e6e9e1dca58d9556f3200d78acab35e4347e9d4c2bbaf};
 : ${PKG_PKGCONF_VERSION:=1.9.0};
 : ${PKG_PKGCONF_URL:=https://distfiles.dereferenced.org/pkgconf/pkgconf-${PKG_PKGCONF_HOST_VERSION}.tar.xz};
 : ${PKG_PKGCONF_CONFIGURE_ARGS:="--prefix= --host=${DEFAULT_TARGET} --with-sysroot=${PREFIX_NATIVE}"};
-: ${PKG_PKGCONF_INSTALL_FILES:=/=lib/pkgconfig};
+: ${PKG_PKGCONF_INSTALL_FILES_V2:="
+	@pkgconf=bin/pkg-config
+	+%[_files]/bin/\%[_target]-pkg-config=bin/%[_target]-pkg-config
+	m0755=bin/%[_target]-pkg-config
+	/=lib/pkgconfig"};
 : ${PKG_SLIBTOOL_URLS_GIT:="slibtool=git://midipix.org/slibtool"};
 : ${PKG_SLIBTOOL_CONFIGURE_ARGS:="--host=${DEFAULT_TARGET} --prefix= --target=${DEFAULT_TARGET}"};
 : ${PKG_TPAX_URLS_GIT:="tpax=https://git.midipix.org/tpax@main"};
diff --git a/groups/110.native_toolchain.group b/groups/110.native_toolchain.group
index 43afb52e..6bac8753 100644
--- a/groups/110.native_toolchain.group
+++ b/groups/110.native_toolchain.group
@@ -12,6 +12,11 @@ NATIVE_TOOLCHAIN_PREFIX="${PREFIX_NATIVE}";
 : ${PKG_BINUTILS_CONFIGURE_ARGS_EXTRA:="--enable-deterministic-archives --with-libelf=${PREFIX_NATIVE} --with-gmp=${PREFIX_NATIVE} --with-mpc=${PREFIX_NATIVE} --with-mpfr=${PREFIX_NATIVE} --with-sysroot=/"};
 : ${PKG_BINUTILS_CFLAGS_CONFIGURE:="-isystem ${PREFIX_NATIVE}/include -Wno-error=cpp"};
 : ${PKG_BINUTILS_LDFLAGS_CONFIGURE:="-L${PREFIX_NATIVE}/lib"};
+: ${PKG_BINUTILS_INSTALL_FILES_V2:="
+	+%[_builddir]/bfd/bfd.h=include/%[FNAME]
+	+%[_builddir]/bfd/.libs/libbfd.a=lib/%[FNAME]
+	+%[_subdir]/include/ansidecl.h=include/%[FNAME]
+	+%[_subdir]/include/symcat.h=include/%[FNAME]"};
 : ${PKG_BINUTILS_PATCHES_EXTRA:="${BUILD_WORKDIR}/chainport/patches/binutils/binutils-${PKG_BINUTILS_VERSION}.midipix.patch"};
 : ${PKG_BINUTILS_LIBTOOL:=slibtool-static};
 : ${PKG_BINUTILS_MINGW32_SHA256SUM:=250d3b2925c6b211fb16173b0b25bc091c58829fbcad3eb849645e0af52cf7fa};
diff --git a/groups/120.native_runtime.group b/groups/120.native_runtime.group
index 07364f21..2fe70f2a 100644
--- a/groups/120.native_runtime.group
+++ b/groups/120.native_runtime.group
@@ -17,7 +17,9 @@ NATIVE_RUNTIME_PREFIX="${PREFIX_NATIVE}";
 : ${PKG_LDSO_URLS_GIT:=pemagine=${DEFAULT_GITROOT}/pemagine};
 : ${PKG_LDSO_CFLAGS_CONFIGURE_EXTRA:="-O0 -DPE_LDSO"};
 : ${PKG_LDSO_CONFIGURE_ARGS_EXTRA:=--disable-shared};
-: ${PKG_LDSO_INSTALL_FILES:="/=${DEFAULT_TARGET}/lib @../../lib/libldso.a=${DEFAULT_TARGET}/lib/libldso.a"};
+: ${PKG_LDSO_INSTALL_FILES_V2:="
+	/=${DEFAULT_TARGET}/lib
+	@../../lib/libldso.a=${DEFAULT_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_NTAPI_DEPENDS:="dalist ldso pemagine psxtypes"};
@@ -33,7 +35,7 @@ NATIVE_RUNTIME_PREFIX="${PREFIX_NATIVE}";
 : ${PKG_NTUX_DEPENDS:="dalist ldso ntapi pemagine psxscl"};
 : ${PKG_NTUX_URLS_GIT:=ntux=${DEFAULT_GITROOT}/ntux};
 : ${PKG_NTUX_CFLAGS_CONFIGURE_EXTRA:=-O0};
-: ${PKG_NTUX_HOST_INSTALL_FILES:="ntux/bin/ntux=bin/ntux"};
+: ${PKG_NTUX_HOST_INSTALL_FILES_V2:="+ntux/bin/ntux=bin/%[FNAME]"};
 : ${PKG_PEMAGINE_DEPENDS:="ldso psxtypes"};
 : ${PKG_PEMAGINE_URLS_GIT:=pemagine=${DEFAULT_GITROOT}/pemagine};
 : ${PKG_PEMAGINE_CFLAGS_CONFIGURE_EXTRA:=-O0};
@@ -47,7 +49,9 @@ NATIVE_RUNTIME_PREFIX="${PREFIX_NATIVE}";
 : ${PKG_PSXSCL_STRACE_URLS_GIT:=psxscl=${DEFAULT_GITROOT_HEAD}/psxscl};
 : ${PKG_PSXSCL_STRACE_BUILD_STEPS_DISABLE:=install_make};
 : ${PKG_PSXSCL_STRACE_CFLAGS_CONFIGURE_EXTRA:="-DPSX_EXTENDED_STRACE -O0"};
-: ${PKG_PSXSCL_STRACE_INSTALL_FILES:="/=lib/debug ../obj/lib/libpsxscl.so=lib/debug/"};
+: ${PKG_PSXSCL_STRACE_INSTALL_FILES_V2:="
+	/=lib/debug
+	+../obj/lib/libpsxscl.so=lib/debug/%[FNAME]"};
 : ${PKG_PSXSCL_STRACE_MIRRORS_GIT:="skip"};
 : ${PKG_PSXTYPES_URLS_GIT:=psxtypes=${DEFAULT_GITROOT}/psxtypes};
 : ${PKG_PSXTYPES_MAKEFLAGS_BUILD:="DESTDIR=${PREFIX_NATIVE}"};
diff --git a/groups/211.native_packages_cmdline.group b/groups/211.native_packages_cmdline.group
index 9012181b..d51ce532 100644
--- a/groups/211.native_packages_cmdline.group
+++ b/groups/211.native_packages_cmdline.group
@@ -28,6 +28,9 @@ the_silver_searcher toilet tree terminally_tetris ubase which zsh")";
 : ${PKG_BUSYBOX_URL:=https://busybox.net/downloads/busybox-${PKG_BUSYBOX_VERSION}.tar.bz2};
 : ${PKG_BUSYBOX_DESTDIR:=destdir/busybox};
 : ${PKG_BUSYBOX_IN_TREE=1};
+: ${PKG_BUSYBOX_INSTALL_FILES_V2:="
+	+%[_builddir]/_install/bin/%<*>=bin/%[FNAME]
+	+%[_builddir]/_install/lib/libbusybox.so.${PKG_BUSYBOX_VERSION}=lib/%[FNAME]"};
 : ${PKG_BUSYBOX_PREFIX:=${PREFIX_NATIVE}/busybox};
 : ${PKG_CABEXTRACT_DEPENDS:="libmspack"};
 : ${PKG_CABEXTRACT_SHA256SUM:=afc253673c8ef316b4d5c29cc4aa8445844bee14afffbe092ee9469405851ca7};
@@ -55,7 +58,7 @@ the_silver_searcher toilet tree terminally_tetris ubase which zsh")";
 : ${PKG_DASH_VERSION:=0.5.11.4};
 : ${PKG_DASH_URL:=https://git.kernel.org/pub/scm/utils/dash/dash.git/snapshot/dash-${PKG_DASH_VERSION}.tar.gz};
 : ${PKG_DASH_CONFIGURE_ARGS_EXTRA:="--disable-glob --enable-fnmatch"};
-: ${PKG_DASH_INSTALL_FILES:=@dash=bin/sh};
+: ${PKG_DASH_INSTALL_FILES_V2:="@dash=bin/sh"};
 : ${PKG_DATAMASH_SHA256SUM:=574a592bb90c5ae702ffaed1b59498d5e3e7466a8abf8530c5f2f3f11fa4adb3};
 : ${PKG_DATAMASH_VERSION:=1.7};
 : ${PKG_DATAMASH_URL:=https://ftp.gnu.org/gnu/datamash/datamash-${PKG_DATAMASH_VERSION}.tar.gz};
@@ -64,7 +67,11 @@ the_silver_searcher toilet tree terminally_tetris ubase which zsh")";
 : ${PKG_DOS2UNIX_URL:=http://waterlan.home.xs4all.nl/dos2unix/dos2unix-${PKG_DOS2UNIX_VERSION}.tar.gz};
 : ${PKG_DOS2UNIX_CFLAGS_BUILD_EXTRA:=${NATIVE_PACKAGES_CFLAGS_CONFIGURE}};
 : ${PKG_DOS2UNIX_IN_TREE:=1};
-: ${PKG_DOS2UNIX_INSTALL_FILES:="../dos2unix-${PKG_DOS2UNIX_VERSION}/dos2unix=bin/ ../dos2unix-${PKG_DOS2UNIX_VERSION}/unix2dos=bin/ @dos2unix=bin/mac2unix @unix2dos=bin/unix2mac"};
+: ${PKG_DOS2UNIX_INSTALL_FILES_V2:="
+	+../dos2unix-${PKG_DOS2UNIX_VERSION}/dos2unix=bin/%[FNAME]
+	+../dos2unix-${PKG_DOS2UNIX_VERSION}/unix2dos=bin/%[FNAME]
+	@dos2unix=bin/mac2unix
+	@unix2dos=bin/unix2mac"};
 : ${PKG_ED_SHA256SUM:=71de39883c25b6fab44add80635382a10c9bf154515b94729f4a6529ddcc5e54};
 : ${PKG_ED_VERSION:=1.17};
 : ${PKG_ED_URL:=https://ftp.gnu.org/gnu/ed/ed-${PKG_ED_VERSION}.tar.lz};
@@ -106,7 +113,11 @@ the_silver_searcher toilet tree terminally_tetris ubase which zsh")";
 : ${PKG_MKSH_URL:="https://sources.voidlinux.org/mksh-${PKG_MKSH_VERSION}/mksh-${PKG_MKSH_VERSION}.tgz http://pub.allbsd.org/MirOS/dist/mir/mksh/mksh-${PKG_MKSH_VERSION}.tgz"};
 : ${PKG_MKSH_BUILD_STEPS_DISABLE:=install_make};
 : ${PKG_MKSH_ENV_VARS_EXTRA:="CC=${DEFAULT_TARGET}-gcc"};
-: ${PKG_MKSH_INSTALL_FILES:="../mksh/mksh=bin/ /=share/doc/mksh/examples ../mksh/dot.mkshrc=share/doc/mksh/examples/ ../mksh/mksh.1=share/man/man1/"};
+: ${PKG_MKSH_INSTALL_FILES_V2:="
+	+../mksh/mksh=bin/%[FNAME]
+	/=share/doc/mksh/examples
+	+../mksh/dot.mkshrc=share/doc/mksh/examples/%[FNAME]
+	+../mksh/mksh.1=share/man/man1/%[FNAME]"};
 : ${PKG_MKSH_IN_TREE:=1};
 : ${PKG_MKSH_SUBDIR:=mksh};
 : ${PKG_MOON_BUGGY_DEPENDS:="ncurses"};
@@ -141,7 +152,7 @@ the_silver_searcher toilet tree terminally_tetris ubase which zsh")";
 : ${PKG_NINVADERS_BUILD_DIR:=ninvaders-${PKG_NINVADERS_VERSION}};
 : ${PKG_NINVADERS_BUILD_STEPS_DISABLE:=install_make};
 : ${PKG_NINVADERS_CFLAGS_BUILD_EXTRA:="-g3 -O0 -I${PREFIX_NATIVE}/include -I${PREFIX_NATIVE}/include/ncurses"};
-: ${PKG_NINVADERS_INSTALL_FILES:="../ninvaders-0.1.1/nInvaders=bin/"};
+: ${PKG_NINVADERS_INSTALL_FILES_V2:="+../ninvaders-${PKG_NINVADERS_VERSION}/nInvaders=bin/%[FNAME]"};
 : ${PKG_NINVADERS_IN_TREE:=1};
 : ${PKG_NINVADERS_MAKEFLAGS_BUILD:="LIBS=-Wl,-L${PREFIX_NATIVE}/lib,-lncurses,-ltinfo"};
 : ${PKG_NINVADERS_SUBDIR:=ninvaders-${PKG_NINVADERS_VERSION}};
@@ -150,7 +161,9 @@ the_silver_searcher toilet tree terminally_tetris ubase which zsh")";
 : ${PKG_OPENBSD_BASEUTILS_BUILD_DIR:=baseutils};
 : ${PKG_OPENBSD_BASEUTILS_BUILD_STEPS_DISABLE:=install_make};
 : ${PKG_OPENBSD_BASEUTILS_CFLAGS_BUILD:="${NATIVE_PACKAGES_CFLAGS_CONFIGURE}"};
-: ${PKG_OPENBSD_BASEUTILS_INSTALL_FILES:="../baseutils/pax/pax=bin/ ../baseutils/pax/cpio.1=share/man/man1/ ../baseutils/pax/pax.1=share/man/man1/ ../baseutils/pax/tar.1=share/man/man1/"};
+: ${PKG_OPENBSD_BASEUTILS_INSTALL_FILES_V2:="
+	+../baseutils/pax/pax=bin/%[FNAME]
+	+../baseutils/pax/%<*.1>=share/man/man1/%[FNAME]"};
 : ${PKG_OPENBSD_BASEUTILS_MAKE_SUBDIRS:="libopenbsd pax"};
 : ${PKG_PROFANITY_DEPENDS:="libffi libstrophe libgcrypt libz glib gpgme ncursesw curl readline sqlite3"};
 : ${PKG_PROFANITY_SHA256SUM:=23f7b2e5c6cf85913b9e7a228802bca9ecb1d1cf3bf8f8f285e9676176a24902};
@@ -162,7 +175,7 @@ the_silver_searcher toilet tree terminally_tetris ubase which zsh")";
 : ${PKG_PIXZ_VERSION:=1.0.7};
 : ${PKG_PIXZ_URL:=https://github.com/vasi/pixz/releases/download/v${PKG_PIXZ_VERSION}/pixz-${PKG_PIXZ_VERSION}.tar.xz};
 : ${PKG_PIXZ_CONFIG_CACHE_EXTRA:="ac_cv_file_src_pixz_1=yes"};
-: ${PKG_PIXZ_INSTALL_FILES:="../pixz-${PKG_PIXZ_VERSION}/src/pixz.1=share/man/man1/"};
+: ${PKG_PIXZ_INSTALL_FILES_V2:="+../pixz-${PKG_PIXZ_VERSION}/src/pixz.1=share/man/man1/%[FNAME]"};
 : ${PKG_PV_SHA256SUM:=608ef935f7a377e1439c181c4fc188d247da10d51a19ef79bcdee5043b0973f1};
 : ${PKG_PV_VERSION:=1.6.6};
 : ${PKG_PV_URL:=http://www.ivarch.com/programs/sources/pv-${PKG_PV_VERSION}.tar.bz2};
@@ -217,13 +230,17 @@ rc_cv_sysv_sigcld=no"};
 : ${PKG_TREE_VERSION:=1.8.0};
 : ${PKG_TREE_URL:=http://mama.indstate.edu/users/ice/tree/src/tree-${PKG_TREE_VERSION}.tgz};
 : ${PKG_TREE_BUILD_STEPS_DISABLE:=install_make};
-: ${PKG_TREE_INSTALL_FILES:="../tree-${PKG_TREE_VERSION}/tree=bin/ ../tree-${PKG_TREE_VERSION}/doc/tree.1=share/man/man1"};
+: ${PKG_TREE_INSTALL_FILES_V2:="
+	../tree-${PKG_TREE_VERSION}/tree=bin/%[FNAME]
+	../tree-${PKG_TREE_VERSION}/doc/tree.1=share/man/man1/%[FNAME]"};
 : ${PKG_TREE_IN_TREE:=1};
 : ${PKG_TERMINALLY_TETRIS_DEPENDS:="ncurses"};
 : ${PKG_TERMINALLY_TETRIS_URLS_GIT:=terminally_tetris=https://github.com/thecardkid/terminally-tetris.git@master};
 : ${PKG_TERMINALLY_TETRIS_BUILD_STEPS_DISABLE:=install_make};
 : ${PKG_TERMINALLY_TETRIS_CFLAGS_BUILD_EXTRA:="-std=gnu99 -g3 -O0 -I${PREFIX_NATIVE}/include -I${PREFIX_NATIVE}/include/ncurses"};
-: ${PKG_TERMINALLY_TETRIS_INSTALL_FILES:="../terminally_tetris/build/ttetris=bin/ ../terminally_tetris/man/ttetris.1=share/man/man1/"};
+: ${PKG_TERMINALLY_TETRIS_INSTALL_FILES_V2:="
+	../terminally_tetris/build/ttetris=bin/%[FNAME]
+	../terminally_tetris/man/ttetris.1=share/man/man1/%[FNAME]"};
 : ${PKG_TERMINALLY_TETRIS_IN_TREE:=1};
 : ${PKG_TERMINALLY_TETRIS_LDFLAGS_BUILD_EXTRA:="-L${PREFIX_NATIVE}/lib -lncurses -Wl,--as-needed -ltinfo -Wl,--no-as-needed"};
 : ${PKG_TERMINALLY_TETRIS_MAKEFLAGS_BUILD_EXTRA:=C=${DEFAULT_TARGET}-gcc};
diff --git a/groups/221.native_packages_dev.group b/groups/221.native_packages_dev.group
index f50a73cd..b665893b 100644
--- a/groups/221.native_packages_dev.group
+++ b/groups/221.native_packages_dev.group
@@ -50,7 +50,7 @@ ac_cv_prog_gnu_m4_gnu=yes"};
 : ${PKG_GDB_CONFIGURE_ARGS_EXTRA:="--with-system-libiberty --with-system-readline --with-system-zlib --with-python=${PWD}/etc/python2.7-config"};
 : ${PKG_GDB_CXXFLAGS_CONFIGURE_EXTRA:="--sysroot=${PREFIX_NATIVE} -g3 -O0 --include=stdc-predef.h -I${PREFIX_NATIVE}/include/python2.7 -L${PREFIX_NATIVE}/lib"};
 : ${PKG_GDB_ENV_VARS_EXTRA:="CFLAGS_FOR_TARGET=-g3 -O0 --include=stdc-predef.h -I${PREFIX_NATIVE}/include/python2.7 --sysroot=${PREFIX_NATIVE}:LDFLAGS_FOR_TARGET=--sysroot=${PREFIX_NATIVE}"};
-: ${PKG_GDB_INSTALL_FILES:="../obj/gdb/.libs/gdb=bin/gdb"};
+: ${PKG_GDB_INSTALL_FILES_V2:="../obj/gdb/.libs/gdb=bin/gdb"};
 : ${PKG_GDB_LIBTOOL:=rdlibtool};
 : ${PKG_GDB_MAKEFLAGS_BUILD_EXTRA:="SYSROOT_FLAGS=--sysroot=${PREFIX_NATIVE}"};
 : ${PKG_GDB_PATCHES_EXTRA:="${BUILD_WORKDIR}/chainport/patches/gdb/gdb-${PKG_GDB_VERSION}.midipix.patch"};
@@ -64,7 +64,7 @@ ac_cv_prog_gnu_m4_gnu=yes"};
 : ${PKG_LUA_IN_TREE:=1};
 : ${PKG_LUA_CONFIGURE_ARGS_EXTRA:="--with-readline --with-compat-module"};
 : ${PKG_LUA_FORCE_AUTORECONF:=1};
-: ${PKG_LUA_INSTALL_FILES:=@liblua.so=lib/liblua.so.0};
+: ${PKG_LUA_INSTALL_FILES_V2:="@liblua.so=lib/liblua.so.0"};
 : ${PKG_INDENT_SHA256SUM:=b745a5dfc68f86a483d7f96dc1cda7aafd1e78ecba3c7d8ad304709e91e1defb};
 : ${PKG_INDENT_VERSION:=2.2.12};
 : ${PKG_INDENT_URL:=https://ftp.gnu.org/gnu/indent/indent-${PKG_INDENT_VERSION}.tar.xz};
@@ -137,7 +137,7 @@ make_cv_synchronous_posix_spawn=yes"};
 : ${PKG_PYTHON3_CONFIGURE_ARGS:="--source-dir=../../Python-${PKG_PYTHON3_VERSION} --sysroot=${PREFIX_NATIVE} --prefix= --target=${DEFAULT_TARGET}"};
 : ${PKG_PYTHON3_CONFIGURE_TYPE:="sofort"};
 : ${PKG_PYTHON3_SOFORT_NATIVE_CFLAGS_EXTRA:="-std=c99 -D_XOPEN_SOURCE=700"};
-: ${PKG_PYTHON3_INSTALL_FILES:="@python3=bin/python"};
+: ${PKG_PYTHON3_INSTALL_FILES_V2:="@python3=bin/python"};
 : ${PKG_PYTHON3_SUBDIR:=Python-${PKG_PYTHON3_VERSION}};
 : ${PKG_RUBY_SHA256SUM:=ba5ba60e5f1aa21b4ef8e9bf35b9ddb57286cb546aac4b5a28c71f459467e507};
 : ${PKG_RUBY_VERSION:=2.3.0};
diff --git a/groups/231.native_packages_etc.group b/groups/231.native_packages_etc.group
index c35c77f5..ac3e4622 100644
--- a/groups/231.native_packages_etc.group
+++ b/groups/231.native_packages_etc.group
@@ -28,7 +28,7 @@ zstd")";
 : ${PKG_APR_UTIL_URL:=https://archive.apache.org/dist/apr/apr-util-${PKG_APR_UTIL_VERSION}.tar.bz2};
 : ${PKG_APR_UTIL_ENV_VARS_EXTRA:="LDADD_dbd_sqlite3=-lsqlite3 -lapr-1 -L.libs -laprutil-1:LDADD_crypto_openssl=-lcrypto -lssl -lapr-1 -L.libs -laprutil-1"};
 : ${PKG_APR_UTIL_CONFIGURE_ARGS_EXTRA:="--with-crypto --with-apr=${BUILD_WORKDIR}/apr-native-${DEFAULT_TARGET}/obj"};
-: ${PKG_APR_UTIL_INSTALL_FILES:=bin/apu-1-config=${PREFIX}/bin/${DEFAULT_TARGET}-apu-1-config};
+: ${PKG_APR_UTIL_INSTALL_FILES_V2:="+bin/apu-1-config=%[_prefix_host]/bin/%[_target]-%[FNAME]"};
 : ${PKG_APR_UTIL_MAKEFLAGS_BUILD:="-j1"};
 : ${PKG_BDWGC_DEPENDS:="libatomic_ops"};
 : ${PKG_BDWGC_URLS_GIT:="bdwgc=https://github.com/ivmai/bdwgc@master"};
@@ -43,13 +43,21 @@ zstd")";
 : ${PKG_BOCHS_URL:=https://fossies.org/linux/misc/bochs-${PKG_BOCHS_VERSION}.tar.gz};
 : ${PKG_BOCHS_CONFIGURE_ARGS_EXTRA:="--disable-docbook --without-x11 --without-wx --without-sdl2 --with-term --with-sdl --enable-idle-hack"};
 : ${PKG_BOCHS_CXXFLAGS_CONFIGURE_EXTRA:="-D_LARGEFILE64_SOURCE -I${PREFIX_NATIVE}/include/ncurses"};
-: ${PKG_BOCHS_INSTALL_FILES:="../obj/.libs/bochs=bin/ ../obj/.libs/bximage=bin/"};
+: ${PKG_BOCHS_INSTALL_FILES_V2:="
+	+../obj/.libs/bochs=bin/%[FNAME]
+	+../obj/.libs/bximage=bin/%[FNAME]"};
 : ${PKG_BOCHS_LDFLAGS_CONFIGURE_EXTRA:="-L${PREFIX_NATIVE}/lib"};
 : ${PKG_BOCHS_MAKEFLAGS_BUILD:="LIBS=-Wl,-ltinfo"};
 : ${PKG_BZIP2_SHA256SUM:=ab5a03176ee106d3f0fa90e381da478ddae405918153cca248e682cd0c4a2269};
 : ${PKG_BZIP2_VERSION:=1.0.8};
 : ${PKG_BZIP2_URL:=https://sourceware.org/pub/bzip2/bzip2-${PKG_BZIP2_VERSION}.tar.gz};
-: ${PKG_BZIP2_INSTALL_FILES:="@bzdiff=bin/bzcmp @bzgrep=bin/bzegrep @bzgrep=bin/bzfgrep @bzmore=bin/bzless ../bzip2-${PKG_BZIP2_VERSION}/libbz2.so.1=lib/ ../bzip2-${PKG_BZIP2_VERSION}/libbz2.so.1.0.8=lib/"};
+: ${PKG_BZIP2_INSTALL_FILES_V2:="
+	@bzdiff=bin/bzcmp
+	@bzgrep=bin/bzegrep
+	@bzgrep=bin/bzfgrep
+	@bzmore=bin/bzless
+	+../bzip2-${PKG_BZIP2_VERSION}/libbz2.so.1=lib/%[FNAME]
+	+../bzip2-${PKG_BZIP2_VERSION}/libbz2.so.1.0.8=lib/%[FNAME]"};
 : ${PKG_BZIP2_IN_TREE:=1};
 : ${PKG_BZIP2_MAKEFLAGS_BUILD_EXTRA:=-f Makefile-libbz2_so};
 : ${PKG_BZIP2_MAKE_INSTALL_VNAME:=PREFIX};
@@ -61,7 +69,7 @@ zstd")";
 : ${PKG_CLZIP_VERSION:=1.12};
 : ${PKG_CLZIP_URL:=https://download.savannah.gnu.org/releases/lzip/clzip/clzip-${PKG_CLZIP_VERSION}.tar.gz};
 : ${PKG_CLZIP_CONFIGURE_ARGS:="CC=${DEFAULT_TARGET}-gcc --prefix="};
-: ${PKG_CLZIP_INSTALL_FILES:="@clzip=bin/lzip"};
+: ${PKG_CLZIP_INSTALL_FILES_V2:="@clzip=bin/lzip"};
 : ${PKG_CLZIP_IN_TREE:=1};
 : ${PKG_CMAKE_DEPENDS:="curl libarchive libuv libz ncurses"};
 : ${PKG_CMAKE_SHA256SUM:=dc1246c4e6d168ea4d6e042cfba577c1acd65feea27e56f5ff37df920c30cae0};
@@ -120,7 +128,7 @@ zstd")";
 : ${PKG_DOOMGENERIC_CFLAGS_BUILD_EXTRA:="-DWINAPI_ANSI_DEFAULT -I${PREFIX_NATIVE}/include/w32api.ports"};
 : ${PKG_DOOMGENERIC_LDFLAGS_BUILD_EXTRA:="-L${PREFIX_NATIVE}/lib/w32lib"};
 : ${PKG_DOOMGENERIC_BUILD_STEPS_DISABLE:=install_make};
-: ${PKG_DOOMGENERIC_INSTALL_FILES:="../doomgeneric/doomgeneric/doomgeneric=bin/"};
+: ${PKG_DOOMGENERIC_INSTALL_FILES_V2:="+../doomgeneric/doomgeneric/doomgeneric=bin/%[FNAME]"};
 : ${PKG_EMACS_DEPENDS:="freetype gnutls libjpeg_turbo libz ncurses"};
 : ${PKG_EMACS_SHA256SUM:=1cf4fc240cd77c25309d15e18593789c8dbfba5c2b44d8f77c886542300fd32c};
 : ${PKG_EMACS_VERSION:=26.1};
@@ -186,7 +194,7 @@ zstd")";
 : ${PKG_HASTYHEX_IN_TREE:=1};
 : ${PKG_HASTYHEX_CFLAGS_BUILD_EXTRA:="-g3 -O0 -ansi -pedantic -funroll-loops"};
 : ${PKG_HASTYHEX_BUILD_STEPS_DISABLE:=install_make};
-: ${PKG_HASTYHEX_INSTALL_FILES:="../hastyhex/hastyhex=bin/"};
+: ${PKG_HASTYHEX_INSTALL_FILES_V2:="+../hastyhex/hastyhex=bin/%[FNAME]"};
 : ${PKG_HEXCURSE_DEPENDS:="ncurses"};
 : ${PKG_HEXCURSE_URLS_GIT:="hexcurse=https://github.com/LonnyGomes/hexcurse@master"};
 : ${PKG_HEXCURSE_CFLAGS_CONFIGURE_EXTRA:=-I${PREFIX_NATIVE}/include/ncurses};
@@ -235,7 +243,20 @@ gl_cv_func_getopt_gnu=yes"};
 : ${PKG_JOHN_BUILD_STEPS_DISABLE:=install_make};
 : ${PKG_JOHN_DISABLED_NT32:=1};
 : ${PKG_JOHN_IN_TREE:=1};
-: ${PKG_JOHN_INSTALL_FILES:="../john-${PKG_JOHN_VERSION}/run/john=bin/ ../john-${PKG_JOHN_VERSION}/run/mailer=bin/ ../john-${PKG_JOHN_VERSION}/run/makechr=bin/ ../john-${PKG_JOHN_VERSION}/run/relbench=bin/ ../john-${PKG_JOHN_VERSION}/run/unafs=bin/ ../john-${PKG_JOHN_VERSION}/run/unique=bin/ ../john-${PKG_JOHN_VERSION}/run/unshadow=bin/ /=share/john ../john-${PKG_JOHN_VERSION}/run/ascii.chr=share/john/ ../john-${PKG_JOHN_VERSION}/run/digits.chr=share/john/ ../john-${PKG_JOHN_VERSION}/run/john.conf=share/john/ ../john-${PKG_JOHN_VERSION}/run/lm_ascii.chr=share/john/ ../john-${PKG_JOHN_VERSION}/run/password.lst=share/john/"};
+: ${PKG_JOHN_INSTALL_FILES_V2:="
+	/=share/john
+	+../john-${PKG_JOHN_VERSION}/run/john=bin/%[FNAME]
+	+../john-${PKG_JOHN_VERSION}/run/mailer=bin/%[FNAME]
+	+../john-${PKG_JOHN_VERSION}/run/makechr=bin/%[FNAME]
+	+../john-${PKG_JOHN_VERSION}/run/relbench=bin/%[FNAME]
+	+../john-${PKG_JOHN_VERSION}/run/unafs=bin/%[FNAME]
+	+../john-${PKG_JOHN_VERSION}/run/unique=bin/%[FNAME]
+	+../john-${PKG_JOHN_VERSION}/run/unshadow=bin/%[FNAME]
+	+../john-${PKG_JOHN_VERSION}/run/ascii.chr=share/john/%[FNAME]
+	+../john-${PKG_JOHN_VERSION}/run/digits.chr=share/john/%[FNAME]
+	+../john-${PKG_JOHN_VERSION}/run/john.conf=share/john/%[FNAME]
+	+../john-${PKG_JOHN_VERSION}/run/lm_ascii.chr=share/john/%[FNAME]
+	+../john-${PKG_JOHN_VERSION}/run/password.lst=share/john/%[FNAME]"};
 : ${PKG_JOHN_MAKEFLAGS_BUILD_EXTRA:="-C src midipix-x86-64"};
 : ${PKG_LBREAKOUT2_DEPENDS:="sdl1 libz libpng"};
 : ${PKG_LBREAKOUT2_SHA256SUM:=9104d6175553da3442dc6a5fc407a669e2f5aff3eedc5d30409eb003b7a78d6f};
@@ -317,7 +338,7 @@ gl_cv_func_getopt_gnu=yes"};
 : ${PKG_NCURSESW_VERSION:=6.1};
 : ${PKG_NCURSESW_URL:=https://ftp.gnu.org/gnu/ncurses/ncurses-${PKG_NCURSESW_VERSION}.tar.gz};
 : ${PKG_NCURSESW_CONFIGURE_ARGS_EXTRA:="--enable-pc-files --with-pkg-config-libdir=${PREFIX_NATIVE}/lib/pkgconfig --with-manpages --with-progs --with-shared --with-termlib --without-ada --without-tests --enable-widec --without-pthread"};
-: ${PKG_NCURSESW_INSTALL_FILES:=@ncursesw/ncurses.h=include/ncurses.h};
+: ${PKG_NCURSESW_INSTALL_FILES_V2:="@ncursesw/ncurses.h=include/ncurses.h"};
 : ${PKG_NPTH_SHA256SUM:=1393abd9adcf0762d34798dc34fdcf4d0d22a8410721e76f1e3afcd1daa4e2d1};
 : ${PKG_NPTH_VERSION:=1.6};
 : ${PKG_NPTH_URL:=https://www.gnupg.org/ftp/gcrypt/npth/npth-${PKG_NPTH_VERSION}.tar.bz2};
@@ -345,7 +366,7 @@ gl_cv_func_getopt_gnu=yes"};
 : ${PKG_P7ZIP_URLS_GIT:="p7zip-midipix.git=https://github.com/lalbornoz/p7zip-midipix.git@master"};
 : ${PKG_P7ZIP_BUILD_STEPS_DISABLE:=install_make};
 : ${PKG_P7ZIP_IN_TREE:=1};
-: ${PKG_P7ZIP_INSTALL_FILES:="../p7zip-midipix.git/bin/7za=bin/"};
+: ${PKG_P7ZIP_INSTALL_FILES_V2:="+../p7zip-midipix.git/bin/7za=bin/%[FNAME]"};
 : ${PKG_PCRE_DEPENDS:="bzip2 libz"};
 : ${PKG_PCRE_SHA256SUM:=4dae6fdcd2bb0bb6c37b5f97c33c2be954da743985369cddac3546e3218bffb8};
 : ${PKG_PCRE_VERSION:=8.45};
@@ -474,7 +495,7 @@ ac_cv_prog_NCURSESW6_CONFIG=%PREFIX%/bin/ncursesw6-config"};
 : ${PKG_VIM_URL:=https://github.com/vim/vim/archive/v${PKG_VIM_VERSION}.tar.gz};
 : ${PKG_VIM_CONFIGURE_ARGS_EXTRA:="--enable-gui=no --with-tlib=tinfow --without-x"};
 : ${PKG_VIM_IN_TREE:=1};
-: ${PKG_VIM_INSTALL_FILES:=@vim=bin/vi};
+: ${PKG_VIM_INSTALL_FILES_V2:="@vim=bin/vi"};
 : ${PKG_VIM_MAKEFLAGS_INSTALL_EXTRA:=STRIP=/bin/true};
 : ${PKG_VIM_SUBDIR:=vim-${PKG_VIM_VERSION}};
 : ${PKG_VORBIS_TOOLS_DEPENDS:="curl libflac libogg libvorbis"};
diff --git a/groups/251.native_packages_lib.group b/groups/251.native_packages_lib.group
index 65c3e7eb..365771cc 100644
--- a/groups/251.native_packages_lib.group
+++ b/groups/251.native_packages_lib.group
@@ -83,7 +83,9 @@ sdl1_image sdl1_ttf sdl2 sdl2_image sdl2_ttf wolfssl")";
 : ${PKG_LIBFFI_URL:=ftp://sourceware.org/pub/libffi/libffi-${PKG_LIBFFI_VERSION}.tar.gz};
 : ${PKG_LIBFFI_CFLAGS_CONFIGURE_EXTRA:=-D_WIN64};
 : ${PKG_LIBFFI_ENV_VARS_EXTRA:="MAKE=make LIBTOOL=slibtool"};
-: ${PKG_LIBFFI_INSTALL_FILES:="lib/libffi-${PKG_LIBFFI_VERSION}/include/ffi.h=include/ffi.h lib/libffi-${PKG_LIBFFI_VERSION}/include/ffitarget.h=include/ffitarget.h"};
+: ${PKG_LIBFFI_INSTALL_FILES_V2:="
+	+lib/libffi-${PKG_LIBFFI_VERSION}/include/ffi.h=include/%[FNAME]
+	+lib/libffi-${PKG_LIBFFI_VERSION}/include/ffitarget.h=include/%[FNAME]"};
 : ${PKG_LIBFFI_PATCHES_EXTRA:="${BUILD_WORKDIR}/chainport/patches/libffi/libffi-${PKG_LIBFFI_VERSION}.midipix.patch"};
 : ${PKG_LIBFIRM_URLS_GIT:="libfirm=http://pp.info.uni-karlsruhe.de/git/libfirm.git@master bfirm=${DEFAULT_GITROOT}/compilers/bfirm@main"};
 : ${PKG_LIBFIRM_BASE_DIR:=${BUILD_WORKDIR}/cparser+libfirm-native-${DEFAULT_TARGET}};
@@ -121,8 +123,7 @@ gcry_cv_visibility_attribute=yes"};
 	-DCMAKE_ASM_NASM_COMPILER=${PREFIX}/bin/${DEFAULT_TARGET}-nasm
 	-DCMAKE_ASM_NASM_OBJECT_FORMAT=win64
 	-DWITH_SIMD=OFF
-	-DWITH_JPEG8=ON
-"};
+	-DWITH_JPEG8=ON"};
 : ${PKG_LIBKSBA_DEPENDS:="libgpg_error"};
 : ${PKG_LIBKSBA_SHA256SUM:=dad683e6f2d915d880aa4bed5cea9a115690b8935b78a1bbe01669189307a48b};
 : ${PKG_LIBKSBA_VERSION:=1.6.0};
@@ -212,8 +213,7 @@ ksba_cv_visibility_attribute=yes"};
 	-DRPMIO_LIBRARY=${PREFIX_NATIVE}/lib/librpmio.so
 	-DWITH_LIBXML2:BOOL=ON
 	-DZLIB_INCLUDE_DIR=${PREFIX_NATIVE}/include
-	-DZLIB_LIBRARY=${PREFIX_NATIVE}/lib/libz.a
-"};
+	-DZLIB_LIBRARY=${PREFIX_NATIVE}/lib/libz.a"};
 : ${PKG_LIBSSH_DEPENDS:="libz"};
 : ${PKG_LIBSSH_SHA256SUM:=acffef2da98e761fc1fd9c4fddde0f3af60ab44c4f5af05cd1b2d60a3fa08718};
 : ${PKG_LIBSSH_VERSION:=0.9.5};
@@ -224,9 +224,7 @@ ksba_cv_visibility_attribute=yes"};
 	-DWITH_GCRYPT=ON
 	-DWITH_SYMBOL_VERSIONING=OFF
 	-DZLIB_INCLUDE_DIR=${PREFIX_NATIVE}/include
-	-DZLIB_LIBRARY=${PREFIX_NATIVE}/lib/libz.lib.a
-
-"};
+	-DZLIB_LIBRARY=${PREFIX_NATIVE}/lib/libz.lib.a"};
 : ${PKG_LIBSTROPHE_DEPENDS:="libressl expat"};
 : ${PKG_LIBSTROPHE_SHA256SUM:=cf1a363ae6df88ccd97292d4e859b7680d8bac79347b53a9dc8f095456b7a02d};
 : ${PKG_LIBSTROPHE_VERSION=0.10.1};
@@ -268,6 +266,9 @@ ksba_cv_visibility_attribute=yes"};
 : ${PKG_LIBXML2_VERSION:=2.9.10};
 : ${PKG_LIBXML2_URL:=ftp://xmlsoft.org/libxml2/libxml2-${PKG_LIBXML2_VERSION}.tar.gz};
 : ${PKG_LIBXML2_CONFIGURE_ARGS_EXTRA:="--with-python=no"};
+: ${PKG_LIBXML2_INSTALL_FILES_V2:="
+	+%[_files]/bin/\%[_target]-xml2-config=bin/%[_target]-xml2-config
+	m0755=bin/%[_target]-xml2-config"};
 : ${PKG_LIBXSLT_DEPENDS:="libxml2 libgcrypt"};
 : ${PKG_LIBXSLT_SHA256SUM:=98b1bd46d6792925ad2dfe9a87452ea2adebf69dcb9919ffd55bf926a7f93f7f};
 : ${PKG_LIBXSLT_VERSION:=1.1.34};
@@ -297,8 +298,7 @@ ksba_cv_visibility_attribute=yes"};
 	-DOPENSSL_CRYPTO_LIBRARY=${PREFIX_NATIVE}/lib/libcrypto.lib.a
 	-DOPENSSL_SSL_LIBRARY=${PREFIX_NATIVE}/lib/libssl.lib.a
 	-DZLIB_INCLUDE_DIR=${PREFIX_NATIVE}/include
-	-DZLIB_LIBRARY=${PREFIX_NATIVE}/lib/libz.a
-"};
+	-DZLIB_LIBRARY=${PREFIX_NATIVE}/lib/libz.a"};
 : ${PKG_LZO_SHA256SUM:=c0f892943208266f9b6543b3ae308fab6284c5c90e627931446fb49b4221a072};
 : ${PKG_LZO_VERSION:=2.10};
 : ${PKG_LZO_URL:=https://www.oberhumer.com/opensource/lzo/download/lzo-${PKG_LZO_VERSION}.tar.gz};
@@ -307,6 +307,8 @@ ksba_cv_visibility_attribute=yes"};
 : ${PKG_NETTLE_URL:=https://ftp.gnu.org/gnu/nettle/nettle-${PKG_NETTLE_VERSION}.tar.gz};
 : ${PKG_NETTLE_CONFIGURE_ARGS_EXTRA:=--disable-fat};
 : ${PKG_NETTLE_CFLAGS_CONFIGURE_EXTRA:=-std=gnu99};
+: ${PKG_NETTLE_CONFIG_CACHE_EXTRA:="nettle_cv_asm_underscore=no"};
+: ${PKG_NETTLE_INSTALL_FILES_V2:="m0755=lib/%<lib*.so>"};
 : ${PKG_NETTLE_MAKEFLAGS_BUILD:=-j1};
 : ${PKG_READLINE_DEPENDS:="ncurses ncursestw ncursesw"};
 : ${PKG_READLINE_SHA256SUM:=f8ceb4ee131e3232226a17f51b164afc46cd0b9e6cef344be87c65962cb82b02};
@@ -374,6 +376,8 @@ ksba_cv_visibility_attribute=yes"};
 : ${PKG_WOLFSSL_URL:=https://github.com/wolfSSL/wolfssl/archive/v${PKG_WOLFSSL_VERSION}-stable.tar.gz};
 : ${PKG_WOLFSSL_CONFIGURE_ARGS_EXTRA:="--enable-distro --with-libz=${PREFIX_NATIVE}"};
 : ${PKG_WOLFSSL_SUBDIR:=wolfssl-${PKG_WOLFSSL_VERSION}-stable};
-: ${PKG_WOLFSSL_INSTALL_FILES:="../obj/wolfssl/options.h=include/wolfssl/options.h ../obj/cyassl/options.h=include/cyassl/options.h"};
+: ${PKG_WOLFSSL_INSTALL_FILES_V2:="
+	+../obj/cyassl/options.h=include/cyassl/%[FNAME]
+	+../obj/wolfssl/options.h=include/wolfssl/%[FNAME]"};
 
 # vim:filetype=sh textwidth=0
diff --git a/groups/261.native_packages_x11.group b/groups/261.native_packages_x11.group
index 37a767f7..c5ce51ca 100644
--- a/groups/261.native_packages_x11.group
+++ b/groups/261.native_packages_x11.group
@@ -49,7 +49,11 @@ xeyes xorgproto Xrender xterm xtrans xwd xwin")";
 : ${PKG_GLEW_URL:=https://ftp.osuosl.org/pub/blfs/conglomeration/glew/glew-${PKG_GLEW_VERSION}.tgz};
 : ${PKG_GLEW_BUILD_STEPS_DISABLE:=install_make};
 : ${PKG_GLEW_CFLAGS_BUILD_EXTRA:=-Iinclude};
-: ${PKG_GLEW_INSTALL_FILES:="../glew-${PKG_GLEW_VERSION}/lib/libGLEW.lib.a=lib/ ../glew-${PKG_GLEW_VERSION}/lib/libGLEW.so=lib/ ../glew-${PKG_GLEW_VERSION}/lib/libGLEW.so.${PKG_GLEW_VERSION}=lib/ ../glew-${PKG_GLEW_VERSION}/lib/libGLEW.so.${PKG_GLEW_VERSION%.*}=lib/ ../glew-${PKG_GLEW_VERSION}/lib/libGLEW.a=lib/ ../glew-${PKG_GLEW_VERSION}/bin/glewinfo=bin/ ../glew-${PKG_GLEW_VERSION}/bin/visualinfo=bin/"};
+: ${PKG_GLEW_INSTALL_FILES_V2:="
+	+../glew-${PKG_GLEW_VERSION}/bin/glewinfo=bin/%[FNAME]
+	+../glew-${PKG_GLEW_VERSION}/bin/visualinfo=bin/%[FNAME]
+	+../glew-${PKG_GLEW_VERSION}/lib/libGLEW.%<*>=lib/%[FNAME]
+"};
 : ${PKG_GLEW_IN_TREE:=1};
 : ${PKG_GLEW_MAKEFLAGS_BUILD_EXTRA:="SYSTEM=midipix STRIP= LD=${DEFAULT_TARGET}-gcc CC=${DEFAULT_TARGET}-gcc CFLAGS=-isystem${PREFIX_NATIVE}/include LDFLAGS.EXTRA=-L${PREFIX_NATIVE}/lib"};
 : ${PKG_GTK2_DEPENDS:="atk cairo freetype gdk glib libX11 pango Xrender"};
@@ -196,7 +200,10 @@ xeyes xorgproto Xrender xterm xtrans xwd xwin")";
 : ${PKG_ST_BUILD_STEPS_DISABLE:=install_make};
 : ${PKG_ST_CFLAGS_BUILD_EXTRA:="-I${PREFIX_NATIVE}/include/freetype2 -I${PREFIX_NATIVE}/include"};
 : ${PKG_ST_IN_TREE:=1};
-: ${PKG_ST_INSTALL_FILES:=../st-${PKG_ST_VERSION}/st=bin/ ../st-${PKG_ST_VERSION}/st.1=share/man/man1/ ../st-${PKG_ST_VERSION}/st.info=bin/};
+: ${PKG_ST_INSTALL_FILES_V2:="
+	+../st-${PKG_ST_VERSION}/st=bin/%[FNAME]
+	+../st-${PKG_ST_VERSION}/st.info=share/info/%[FNAME]
+	+../st-${PKG_ST_VERSION}/st.1=share/man/man1/%[FNAME]"};
 : ${PKG_ST_LDFLAGS_BUILD_EXTRA:=-L${PREFIX_NATIVE}/lib -lX11 -lXft -lfreetype -lfontconfig};
 : ${PKG_UTIL_MACROS_SHA256SUM:=d7e43376ad220411499a79735020f9d145fdc159284867e99467e0d771f3e712};
 : ${PKG_UTIL_MACROS_VERSION:=1.19.2};
diff --git a/groups/800.minipix.group b/groups/800.minipix.group
index d7470d7a..f5db9617 100644
--- a/groups/800.minipix.group
+++ b/groups/800.minipix.group
@@ -26,20 +26,29 @@ MINIPIX_RPM_DISABLE=1;
 # 3rd party packages
 : ${PKG_BASH_MINIPIX_INHERIT_FROM:=bash};
 : ${PKG_BASH_MINIPIX_BUILD_STEPS_DISABLE:=install_make};
-: ${PKG_BASH_MINIPIX_INSTALL_FILES:="../obj/bash=bin/ ../obj/bashbug=bin/"};
+: ${PKG_BASH_MINIPIX_INSTALL_FILES_V2:="
+	+../obj/bash=bin/%[FNAME]
+	+../obj/bashbug=bin/%[FNAME]"};
 : ${PKG_BZIP2_MINIPIX_INHERIT_FROM:=bzip2};
 : ${PKG_BZIP2_MINIPIX_BUILD_STEPS_DISABLE:="install_make"};
-: ${PKG_BZIP2_MINIPIX_INSTALL_FILES:="../bzip2-${PKG_BZIP2_VERSION}/bzip2=bin/ @bzip2=bin/bunzip2 @bzip2=bin/bzcat @bzip2=bin/bzip2recover @bzip2=bin/bzgrep @bzip2=bin/bzmore @bzip2=bin/bzdiff"};
+: ${PKG_BZIP2_MINIPIX_INSTALL_FILES_V2:="
+	+../bzip2-${PKG_BZIP2_VERSION}/bzip2=bin/%[FNAME]
+	@bzip2=bin/bunzip2
+	@bzip2=bin/bzcat
+	@bzip2=bin/bzdiff
+	@bzip2=bin/bzgrep
+	@bzip2=bin/bzip2recover
+	@bzip2=bin/bzmore"};
 : ${PKG_BZIP2_MINIPIX_MAKEFLAGS_BUILD_EXTRA:="-f Makefile"};
 : ${PKG_CA_CERTIFICATES_MINIPIX_INHERIT_FROM:=ca_certificates};
 : ${PKG_COREUTILS_MINIPIX_INHERIT_FROM:=coreutils};
 : ${PKG_COREUTILS_MINIPIX_INSTALL_TARGET:=install-binPROGRAMS};
 : ${PKG_COREUTILS_MINIPIX_MAKEFLAGS_INSTALL_EXTRA:=INSTALL_PROGRAM=${DEFAULT_TARGET}-install-strip};
 : ${PKG_DASH_MINIPIX_INHERIT_FROM:=dash};
-: ${PKG_DASH_MINIPIX_INSTALL_FILES:=bin/dash=bin/sh};
+: ${PKG_DASH_MINIPIX_INSTALL_FILES_V2:="+bin/dash=bin/sh"};
 : ${PKG_DIFFUTILS_MINIPIX_INHERIT_FROM:=diffutils};
 : ${PKG_DROPBEAR_MINIPIX_INHERIT_FROM:=dropbear};
-: ${PKG_DROPBEAR_MINIPIX_INSTALL_FILES:=sbin/dropbear=bin/dropbear};
+: ${PKG_DROPBEAR_MINIPIX_INSTALL_FILES_V2:="+sbin/dropbear=bin/%[FNAME]"};
 : ${PKG_FINDUTILS_MINIPIX_INHERIT_FROM:=findutils};
 : ${PKG_GAWK_MINIPIX_INHERIT_FROM:=gawk};
 : ${PKG_GDB_MINIPIX_INHERIT_FROM:=gdb};
diff --git a/vars/autoconf_2_64_host.vars b/vars/autoconf_2_64_host.vars
deleted file mode 100644
index 31166de1..00000000
--- a/vars/autoconf_2_64_host.vars
+++ /dev/null
@@ -1,54 +0,0 @@
-#
-# set +o errexit -o noglob -o nounset is assumed.
-#
-
-: ${PKG_AUTOCONF_2_64_HOST_INSTALL_FILES:="					\
-	/=libexec/autoconf-2.64							\
-	!bin/autoconf=libexec/autoconf-2.64/					\
-	!bin/autoheader=libexec/autoconf-2.64/					\
-	!bin/autom4te=libexec/autoconf-2.64/					\
-	!bin/autoreconf=libexec/autoconf-2.64/					\
-	!bin/autoscan=libexec/autoconf-2.64/					\
-	!bin/autoupdate=libexec/autoconf-2.64/					\
-	!bin/ifnames=libexec/autoconf-2.64/					\
-	!share/autoconf-2.64/autom4te.cfg=share/autoconf/			\
-	-share/autoconf-2.64/							\
-	!share/autoconf=share/autoconf-2.64/					\
-	-share/info/dir								\
-	!share/info/autoconf.info=share/info/autoconf-2.64.info			\
-	!share/info/standards.info=share/info/standards-2.64.info		\
-	!share/man/man1/autoconf.1=share/man/man1/autoconf-2.64.1		\
-	!share/man/man1/autoheader.1=share/man/man1/autoheader-2.64.1		\
-	!share/man/man1/autom4te.1=share/man/man1/autom4te-2.64.1		\
-	!share/man/man1/autoreconf.1=share/man/man1/autoreconf-2.64.1		\
-	!share/man/man1/autoscan.1=share/man/man1/autoscan-2.64.1		\
-	!share/man/man1/autoupdate.1=share/man/man1/autoupdate-2.64.1		\
-	!share/man/man1/config.guess.1=share/man/man1/config.guess-2.64.1	\
-	!share/man/man1/config.sub.1=share/man/man1/config.sub-2.64.1		\
-	!share/man/man1/ifnames.1=share/man/man1/ifnames-2.64.1			\
-"};
-
-pkg_autoconf_2_64_host_install_files_post() {
-	local _bin_fname="" _fname="";
-
-	for _bin_fname in $(find "${PKG_DESTDIR}/libexec/autoconf-${PKG_VERSION}" -type f -perm /0111); do
-		cat >"${PKG_DESTDIR}/bin/${_bin_fname##*/}-${PKG_VERSION}" <<EOF
-#!/bin/sh
-export ACLOCAL="\${ACLOCAL:-\${0%/*}/aclocal-1.11}";
-export AC_MACRODIR="\${AC_MACRODIR:-\${0%/*}/../share/autoconf-${PKG_VERSION}}";
-export AUTOCONF="\${AUTOCONF:-\${0%/*}/../libexec/autoconf-${PKG_VERSION}/autoconf}";
-export AUTOHEADER="\${AUTOHEADER:-\${0%/*}/../libexec/autoconf-${PKG_VERSION}/autoheader}";
-export AUTOM4TE="\${AUTOM4TE:-\${0%/*}/../libexec/autoconf-${PKG_VERSION}/autom4te}";
-export AUTOM4TE_CFG="\${AUTOM4TE_CFG:-\${0%/*}/../share/autoconf-${PKG_VERSION}/autom4te.cfg}";
-export autom4te_perllibdir="\${autom4te_perllibdir:-\${0%/*}/../share/autoconf-${PKG_VERSION}}";
-export AUTOMAKE="\${AUTOMAKE:-\${0%/*}/automake-1.11}";
-export AUTOPOINT="\${AUTOPOINT:-\${0%/*}/../libexec/autoconf-${PKG_VERSION}/autopoint}";
-export LIBTOOLIZE="\${LIBTOOLIZE:-\${0%/*}/../libexec/autoconf-${PKG_VERSION}/libtoolize}";
-exec "\${0%/*}/../libexec/autoconf-${PKG_VERSION}/${_bin_fname##*/}" "\${@}";
-EOF
-		[ "${?}" -ne 0 ] && return 1;
-		rtl_fileop chmod 0755 "${PKG_DESTDIR}/bin/${_bin_fname##*/}-${PKG_VERSION}" || return 1;
-	done;
-};
-
-# vim:filetype=sh textwidth=0
diff --git a/vars/automake_1_11_6_host.vars b/vars/automake_1_11_6_host.vars
deleted file mode 100644
index f042e118..00000000
--- a/vars/automake_1_11_6_host.vars
+++ /dev/null
@@ -1,29 +0,0 @@
-#
-# set +o errexit -o noglob -o nounset is assumed.
-#
-
-pkg_automake_1_11_6_host_install_make_post() {
-	local _fname="" _fname_base="";
-
-	for _fname in $(find "${PKG_DESTDIR}/bin" -type f -perm /0111 -name "*-${PKG_VERSION%.*}"); do
-		_fname_base="${_fname##*/}";
-		rtl_fileop ln_symbolic "${_fname_base%%-[0-9]*}-${PKG_VERSION}" "${_fname}";
-	done;
-	for _fname in	\
-			$(find "${PKG_DESTDIR}/bin" -type f -perm /0111 -not -name "*-${PKG_VERSION%.*}")		\
-			"${PKG_DESTDIR}/share/doc/automake"; do
-		rtl_fileop mv "${_fname}" "${_fname}-${PKG_VERSION}" || return 1;
-	done;
-	for _fname in $(find "${PKG_DESTDIR}/share/man" -type f -name "*-${PKG_VERSION%.*}.[0-9]*"); do
-		_fname_base="${_fname##*/}";
-		rtl_fileop ln_symbolic "${_fname_base%%-[0-9]*}-${PKG_VERSION}.${_fname_base##*.}" "${_fname}";
-	done;
-	rtl_fileop rm "${PKG_DESTDIR}/share/info/dir";
-	for _fname in	\
-			$(find "${PKG_DESTDIR}/share/man" -type f -name "*.[0-9]*" -not -name "*-${PKG_VERSION%.*}")	\
-			$(find "${PKG_DESTDIR}/share/info" -type f -name "*.info*"); do
-		rtl_fileop mv "${_fname}" "${_fname%.*}-${PKG_VERSION}.${_fname##*.}";
-	done;
-};
-
-# vim:filetype=sh textwidth=0
diff --git a/vars/binutils.vars b/vars/binutils.vars
index 92370be7..a6907df4 100644
--- a/vars/binutils.vars
+++ b/vars/binutils.vars
@@ -2,13 +2,6 @@
 # set +o errexit -o noglob -o nounset is assumed.
 #
 
-pkg_binutils_build_install_make() {
-	rtl_fileop cp "${PKG_BUILD_DIR}/bfd/bfd.h" "${PKG_DESTDIR}/include";
-	rtl_fileop cp "${PKG_BUILD_DIR}/bfd/libbfd.a" "${PKG_DESTDIR}/lib";
-	rtl_fileop cp "../${PKG_SUBDIR}/include/ansidecl.h" "${PKG_DESTDIR}/include";
-	rtl_fileop cp "../${PKG_SUBDIR}/include/symcat.h" "${PKG_DESTDIR}/include";
-};
-
 pkg_binutils_configure_patch_post() {
 	local _overlay_dname="${BUILD_WORKDIR}/chainport/overlay/m${PKG_NAME%%_*}";
 	if [ -d "${_overlay_dname}" ]\
diff --git a/vars/busybox.vars b/vars/busybox.vars
index e526fc00..d510ffba 100644
--- a/vars/busybox.vars
+++ b/vars/busybox.vars
@@ -6,13 +6,4 @@ pkg_busybox_configure() {
 	rtl_fileop cp "${MIDIPIX_BUILD_PWD}/etc/busyboxconfig" "${PKG_BUILD_DIR}/.config";
 };
 
-pkg_busybox_install_make_post() {
-	set +o noglob;
-        if ! rtl_fileop cp "${PKG_BUILD_DIR}/_install/bin/"* "${PKG_DESTDIR}/bin/"\
-	|| ! rtl_fileop cp "${PKG_BUILD_DIR}/_install/lib/libbusybox.so.${PKG_VERSION}" "${PKG_DESTDIR}/lib/"; then
-		set -o noglob; return 1;
-	fi;
-	set -o noglob;
-};
-
 # vim:filetype=sh textwidth=0
diff --git a/vars/chainport_host.vars b/vars/chainport_host.vars
deleted file mode 100644
index 40dd3516..00000000
--- a/vars/chainport_host.vars
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-# set +o errexit -o noglob -o nounset is assumed.
-#
-
-pkg_chainport_host_install_make() {
-	if ! rtl_fileop rm "${BUILD_WORKDIR}/chainport"\
-	|| ! rtl_fileop cp ../chainport "${BUILD_WORKDIR}/chainport"; then
-		return 1;
-	fi;
-};
-
-# vim:filetype=sh textwidth=0
diff --git a/vars/dbus_host.vars b/vars/dbus_host.vars
deleted file mode 100644
index dc22cb2b..00000000
--- a/vars/dbus_host.vars
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# set +o errexit -o noglob -o nounset is assumed.
-#
-
-pkg_dbus_host_install_pre() {
-	rtl_fileop rm "${PKG_DESTDIR}/etc" "${PKG_DESTDIR}/var";
-};
-
-# vim:filetype=sh textwidth=0
diff --git a/vars/install_strip_host.vars b/vars/install_strip_host.vars
deleted file mode 100644
index 668ebff2..00000000
--- a/vars/install_strip_host.vars
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# set +o errexit -o noglob -o nounset is assumed.
-#
-
-pkg_install_strip_host_all() {
-	if [ -e "${PREFIX}/bin/${PKG_TARGET}-install-strip" ]\
-	&& ! rtl_fileop rm "${PREFIX}/bin/${PKG_TARGET}-install-strip"; then
-		return 1;
-	fi;
-	if ! rtl_fileop mkdir "${PREFIX}/bin"	\
-	|| ! cat > "${PREFIX}/bin/${PKG_TARGET}-install-strip" <<EOF
-#!/bin/sh
-install -s "\${@}";
-EOF
-	then
-		return 1;
-	elif ! rtl_fileop chmod +x "${PREFIX}/bin/${PKG_TARGET}-install-strip"; then
-		return 1;
-	else
-		ex_pkg_state_set "${PKG_NAME}" finish;
-	fi;
-};
-
-# vim:filetype=sh textwidth=0
diff --git a/vars/nasm_host.vars b/vars/nasm_host.vars
deleted file mode 100644
index 922eedd0..00000000
--- a/vars/nasm_host.vars
+++ /dev/null
@@ -1,14 +0,0 @@
-#
-# set +o errexit -o noglob -o nounset is assumed.
-#
-
-pkg_nasm_host_install_make_post() {
-	local _fname="";
-	for _fname in bin/nasm bin/ndisasm share/man/man1/nasm.1 share/man/man1/ndisasm.1; do
-		if ! rtl_fileop mv "${PKG_DESTDIR}/${_fname}" "${PKG_DESTDIR}/${_fname%/*}/${PKG_TARGET}-${_fname##*/}"; then
-			return 1;
-		fi;
-	done;
-};
-
-# vim:filetype=sh textwidth=0
diff --git a/vars/nettle.vars b/vars/nettle.vars
deleted file mode 100644
index faf43d64..00000000
--- a/vars/nettle.vars
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-# set +o errexit -o noglob -o nounset is assumed.
-#
-
-: ${PKG_NETTLE_CONFIG_CACHE_EXTRA:="
-nettle_cv_asm_underscore=no"};
-
-pkg_nettle_install_make_post() {
-	set +o noglob;
-	if ! rtl_fileop chmod +x "${PKG_DESTDIR}/lib/"lib*.so*; then
-		set -o noglob; return 1;
-	fi;
-	set -o noglob;
-};
-
-# vim:filetype=sh textwidth=0
diff --git a/vars/pkgconf.vars b/vars/pkgconf.vars
deleted file mode 120000
index d727fef5..00000000
--- a/vars/pkgconf.vars
+++ /dev/null
@@ -1 +0,0 @@
-pkgconf_host.vars
\ No newline at end of file
diff --git a/vars/pkgconf_host.vars b/vars/pkgconf_host.vars
deleted file mode 100644
index 54497bb8..00000000
--- a/vars/pkgconf_host.vars
+++ /dev/null
@@ -1,40 +0,0 @@
-#
-# set +o errexit -o noglob -o nounset is assumed.
-#
-
-pkg_pkgconf_host_install_make_post() {
-	if [ -e "${PKG_DESTDIR}/bin/${PKG_TARGET}-pkg-config" ]; then
-		if ! rtl_fileop rm "${PKG_DESTDIR}/bin/${PKG_TARGET}-pkg-config"; then
-			return 1;
-		fi;
-	fi;
-	if ! cat > "${PKG_DESTDIR}/bin/${PKG_TARGET}-pkg-config" <<EOF
-#!/bin/sh
-if [ -z "\${PREFIX_NATIVE}" ]; then
-	PREFIX_NATIVE="${PREFIX_NATIVE}";
-fi;
-if [ "\${#}" -eq 1 ]\
-&& [ "x\${1}" = "x--version" ]; then
-	"\$(dirname "\${0}")"/pkgconf --version;
-else
-	"\$(dirname "\${0}")"/pkgconf --define-variable=prefix="\${PREFIX_NATIVE%/}/" --keep-system-cflags "\${@}";
-fi;
-EOF
-	then
-		return 1;
-	elif ! rtl_fileop chmod +x "${PKG_DESTDIR}/bin/${PKG_TARGET}-pkg-config"\
-	||   ! rtl_fileop rm "${PKG_DESTDIR}/bin/pkg-config"; then
-		return 1;
-	fi;
-};
-
-pkg_pkgconf_install_make_pre() {
-	if [ -e "${PKG_DESTDIR}/bin/pkg-config" ]; then
-		if ! rtl_fileop rm "${PKG_DESTDIR}/bin/pkg-config"; then
-			return 1;
-		fi;
-	fi;
-	rtl_fileop ln_symbolic pkgconf "${PKG_DESTDIR}/bin/pkg-config";
-};
-
-# vim:filetype=sh textwidth=0
diff --git a/vars/rpm_host.vars b/vars/rpm_host.vars
deleted file mode 100644
index ddb1fbd3..00000000
--- a/vars/rpm_host.vars
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-# set +o errexit -o noglob -o nounset is assumed.
-#
-
-pkg_rpm_host_install_pre() {
-	if ! printf "%s" "#!/bin/true" > "${PKG_DESTDIR}/lib/rpm/elfdeps"\
-	|| ! rtl_fileop chmod +x "${PKG_DESTDIR}/lib/rpm/elfdeps"\
-	|| ! rtl_fileop rm "${PKG_DESTDIR}/var"; then
-		return 1;
-	fi;
-};
-
-# vim:filetype=sh textwidth=0
diff --git a/vars/texinfo_host.vars b/vars/texinfo_host.vars
deleted file mode 100644
index 12795622..00000000
--- a/vars/texinfo_host.vars
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# set +o errexit -o noglob -o nounset is assumed.
-#
-
-pkg_texinfo_host_install_make_post() {
-	if [ -e "${PKG_DESTDIR}/bin/makeinfo" ]; then
-		if ! rtl_fileop mv "${PKG_DESTDIR}/bin/makeinfo" "${PKG_DESTDIR}/bin/makeinfo.dist"; then
-			return 1;
-		fi;
-	fi;
-	if ! cat > "${PKG_DESTDIR}/bin/makeinfo" <<EOF
-#!/bin/sh
-export PERL5LIB="${PREFIX}/share/texinfo:${PREFIX}/share/texinfo/lib/libintl-perl/lib:${PREFIX}/share/texinfo/lib/Text-Unidecode/lib:${PREFIX}/share/texinfo/lib/Unicode-EastAsianWidth/lib";
-makeinfo.dist "\${@}";
-EOF
-then
-		return 1;
-	else
-		rtl_fileop chmod +x "${PKG_DESTDIR}/bin/makeinfo";
-	fi;
-};
-
-# vim:filetype=sh textwidth=0
diff --git a/vars/tzdb_host.vars b/vars/tzdb_host.vars
deleted file mode 100644
index 080cbf59..00000000
--- a/vars/tzdb_host.vars
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# set +o errexit -o noglob -o nounset is assumed.
-#
-
-pkg_tzdb_host_install_pre() {
-	rtl_fileop rm "${PKG_DESTDIR}/etc";
-};
-
-# vim:filetype=sh textwidth=0