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, 13 insertions, 4 deletions

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