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.

14 files changed, 0 insertions, 260 deletions

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