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, 9 insertions, 2 deletions

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