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.

1 files changed, 10 insertions, 3 deletions

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"};