53 files changed, 33 insertions, 23 deletions

diff --git a/313.ncursesw.vars b/313.ncursesw.vars
new file mode 100644
index 00000000..50024dec
--- /dev/null
+++ b/313.ncursesw.vars
@@ -0,0 +1,18 @@
+#
+# . ./build.vars and set -o errexit -o noglob are assumed.
+#
+
+pkg_ncursesw_install_post() {
+	for __ in 	\
+			bin/captoinfo bin/clear bin/infocmp bin/infotocap bin/ncursesw6-config	\
+			bin/reset bin/tabs bin/tic bin/toe bin/tput bin/tset			\
+			lib/libformw* lib/libmenuw* lib/libncursesw* lib/libpanelw*		\
+			share/man share/tabset share/terminfo; do
+		set +o noglob;
+		echo cp -pr ${PKG_PREFIX}/${__} ${PREFIX_MINIPIX}/${__%%/*};
+		cp -pr ${PKG_PREFIX}/${__} ${PREFIX_MINIPIX}/${__%%/*};
+		set -o noglob;
+	done;
+};
+
+# vim:filetype=sh
diff --git a/342.bash_static.build b/342.bzip2.build
index 52bb82e5..52bb82e5 120000
--- a/342.bash_static.build
+++ b/342.bzip2.build
diff --git a/343.bzip2.build b/343.coreutils.build
index 52bb82e5..52bb82e5 120000
--- a/343.bzip2.build
+++ b/343.coreutils.build
diff --git a/344.coreutils.build b/345.cron.build
index 52bb82e5..52bb82e5 120000
--- a/344.coreutils.build
+++ b/345.cron.build
diff --git a/345.coreutils_static.build b/346.curl.build
index 52bb82e5..52bb82e5 120000
--- a/345.coreutils_static.build
+++ b/346.curl.build
diff --git a/346.cron.build b/347.dash.build
index 52bb82e5..52bb82e5 120000
--- a/346.cron.build
+++ b/347.dash.build
diff --git a/347.curl.build b/348.diffutils.build
index 52bb82e5..52bb82e5 120000
--- a/347.curl.build
+++ b/348.diffutils.build
diff --git a/348.dash.build b/349.ed.build
index 52bb82e5..52bb82e5 120000
--- a/348.dash.build
+++ b/349.ed.build
diff --git a/349.diffutils.build b/350.file.build
index 52bb82e5..52bb82e5 120000
--- a/349.diffutils.build
+++ b/350.file.build
diff --git a/350.ed.build b/351.findutils.build
index 52bb82e5..52bb82e5 120000
--- a/350.ed.build
+++ b/351.findutils.build
diff --git a/351.file.build b/352.gawk.build
index 52bb82e5..52bb82e5 120000
--- a/351.file.build
+++ b/352.gawk.build
diff --git a/352.findutils.build b/353.git.build
index 52bb82e5..52bb82e5 120000
--- a/352.findutils.build
+++ b/353.git.build
diff --git a/353.gawk.build b/354.grep.build
index 52bb82e5..52bb82e5 120000
--- a/353.gawk.build
+++ b/354.grep.build
diff --git a/354.git.build b/355.hexcurse.build
index 52bb82e5..52bb82e5 120000
--- a/354.git.build
+++ b/355.hexcurse.build
diff --git a/355.grep.build b/356.htop.build
index 52bb82e5..52bb82e5 120000
--- a/355.grep.build
+++ b/356.htop.build
diff --git a/356.hexcurse.build b/357.inetutils.build
index 52bb82e5..52bb82e5 120000
--- a/356.hexcurse.build
+++ b/357.inetutils.build
diff --git a/357.htop.build b/358.irssi.build
index 52bb82e5..52bb82e5 120000
--- a/357.htop.build
+++ b/358.irssi.build
diff --git a/358.inetutils.build b/359.less.build
index 52bb82e5..52bb82e5 120000
--- a/358.inetutils.build
+++ b/359.less.build
diff --git a/359.irssi.build b/360.lua.build
index 52bb82e5..52bb82e5 120000
--- a/359.irssi.build
+++ b/360.lua.build
diff --git a/360.less.build b/361.lynx.build
index 52bb82e5..52bb82e5 120000
--- a/360.less.build
+++ b/361.lynx.build
diff --git a/361.lua.build b/362.man_db.build
index 52bb82e5..52bb82e5 120000
--- a/361.lua.build
+++ b/362.man_db.build
diff --git a/362.lynx.build b/363.make.build
index 52bb82e5..52bb82e5 120000
--- a/362.lynx.build
+++ b/363.make.build
diff --git a/363.man_db.build b/364.mc.build
index 52bb82e5..52bb82e5 120000
--- a/363.man_db.build
+++ b/364.mc.build
diff --git a/364.make.build b/365.mksh.build
index 52bb82e5..52bb82e5 120000
--- a/364.make.build
+++ b/365.mksh.build
diff --git a/365.mc.build b/366.nano.build
index 52bb82e5..52bb82e5 120000
--- a/365.mc.build
+++ b/366.nano.build
diff --git a/366.mksh.build b/367.netcat.build
index 52bb82e5..52bb82e5 120000
--- a/366.mksh.build
+++ b/367.netcat.build
diff --git a/367.nano.build b/368.openssh.build
index 52bb82e5..52bb82e5 120000
--- a/367.nano.build
+++ b/368.openssh.build
diff --git a/368.netcat.build b/369.pacman.build
index 52bb82e5..52bb82e5 120000
--- a/368.netcat.build
+++ b/369.pacman.build
diff --git a/369.openssh.build b/370.patch.build
index 52bb82e5..52bb82e5 120000
--- a/369.openssh.build
+++ b/370.patch.build
diff --git a/370.pacman.build b/371.perl.build
index 52bb82e5..52bb82e5 120000
--- a/370.pacman.build
+++ b/371.perl.build
diff --git a/372.perl.vars b/371.perl.vars
index 853bef90..853bef90 100644
--- a/372.perl.vars
+++ b/371.perl.vars
diff --git a/371.patch.build b/372.procps_ng.build
index 52bb82e5..52bb82e5 120000
--- a/371.patch.build
+++ b/372.procps_ng.build
diff --git a/372.perl.build b/373.python3.build
index 52bb82e5..52bb82e5 120000
--- a/372.perl.build
+++ b/373.python3.build
diff --git a/374.python3.vars b/373.python3.vars
index 9cdc016f..9cdc016f 100644
--- a/374.python3.vars
+++ b/373.python3.vars
diff --git a/373.procps_ng.build b/374.rsync.build
index 52bb82e5..52bb82e5 120000
--- a/373.procps_ng.build
+++ b/374.rsync.build
diff --git a/374.python3.build b/375.rxvt_unicode.build
index 52bb82e5..52bb82e5 120000
--- a/374.python3.build
+++ b/375.rxvt_unicode.build
diff --git a/375.rsync.build b/376.sed.build
index 52bb82e5..52bb82e5 120000
--- a/375.rsync.build
+++ b/376.sed.build
diff --git a/376.rxvt_unicode.build b/377.tar.build
index 52bb82e5..52bb82e5 120000
--- a/376.rxvt_unicode.build
+++ b/377.tar.build
diff --git a/377.sed.build b/378.tcsh.build
index 52bb82e5..52bb82e5 120000
--- a/377.sed.build
+++ b/378.tcsh.build
diff --git a/378.tar.build b/379.the_silver_searcher.build
index 52bb82e5..52bb82e5 120000
--- a/378.tar.build
+++ b/379.the_silver_searcher.build
diff --git a/379.tcsh.build b/380.tmux.build
index 52bb82e5..52bb82e5 120000
--- a/379.tcsh.build
+++ b/380.tmux.build
diff --git a/380.the_silver_searcher.build b/381.util_linux.build
index 52bb82e5..52bb82e5 120000
--- a/380.the_silver_searcher.build
+++ b/381.util_linux.build
diff --git a/381.tmux.build b/382.vim.build
index 52bb82e5..52bb82e5 120000
--- a/381.tmux.build
+++ b/382.vim.build
diff --git a/382.util_linux.build b/383.which.build
index 52bb82e5..52bb82e5 120000
--- a/382.util_linux.build
+++ b/383.which.build
diff --git a/383.vim.build b/384.whois.build
index 52bb82e5..52bb82e5 120000
--- a/383.vim.build
+++ b/384.whois.build
diff --git a/384.which.build b/385.xeyes.build
index 52bb82e5..52bb82e5 120000
--- a/384.which.build
+++ b/385.xeyes.build
diff --git a/385.whois.build b/386.xwd.build
index 52bb82e5..52bb82e5 120000
--- a/385.whois.build
+++ b/386.xwd.build
diff --git a/387.xwd.build b/387.xwd.build
deleted file mode 120000
index 52bb82e5..00000000
--- a/387.xwd.build
+++ /dev/null
@@ -1 +0,0 @@
-pkg.build
\ No newline at end of file
diff --git a/386.xeyes.build b/387.zsh.build
index 52bb82e5..52bb82e5 120000
--- a/386.xeyes.build
+++ b/387.zsh.build
diff --git a/388.zsh.build b/388.zsh.build
deleted file mode 120000
index 52bb82e5..00000000
--- a/388.zsh.build
+++ /dev/null
@@ -1 +0,0 @@
-pkg.build
\ No newline at end of file
diff --git a/build.sh b/build.sh
index b0e1a0bd..a09f1b3a 100755
--- a/build.sh
+++ b/build.sh
@@ -95,12 +95,18 @@ if [ ${ARG_CLEAN:-0} -eq 1 ]; then
 fi;
 
 # Create directory hierarchy and usr -> . symlinks.
-insecure_mkdir ${PREFIX} ${PREFIX_MINIPIX} ${PREFIX_NATIVE} ${PREFIX_CROSS} ${PREFIX_TARGET}/lib ${DLCACHEDIR} ${WORKDIR};
+insecure_mkdir ${PREFIX} ${PREFIX_NATIVE} ${PREFIX_CROSS} ${PREFIX_TARGET}/lib ${DLCACHEDIR} ${WORKDIR};
 for __ in ${PREFIX}/usr ${PREFIX_NATIVE}/usr; do
 	if [ ! -L "${__}" ]; then
 		secure_rm "${__}"; ln -sf -- . "${__}";
 	fi;
 done;
+insecure_mkdir ${PREFIX_MINIPIX}/bin;
+for __ in lib libexec share; do
+	if [ ! -e ${PREFIX_MINIPIX}/${__} ]; then
+		ln -sf bin ${PREFIX_MINIPIX}/${__};
+	fi;
+done;
 
 if [ -e ${BUILD_LOG_FNAME} ]; then
 	mv -- ${BUILD_LOG_FNAME} ${BUILD_LOG_LAST_FNAME};
diff --git a/build.vars b/build.vars
index f9653144..3a7f1c8c 100644
--- a/build.vars
+++ b/build.vars
@@ -45,7 +45,7 @@ export PATH="${PREFIX}/bin${PATH:+:${PATH}}";
 : ${CHECK_PREREQ_FILES:="/usr/include/gmpxx.h /usr/include/mpc.h /usr/include/mpfr.h"};
 : ${CHECK_PATH_VARS:="PREFIX PREFIX_NATIVE PREFIX_CROSS DLCACHEDIR WORKDIR"};
 : ${CLEAR_ENV_VARS_EXCEPT:="ARG_TARBALL ARG_VERBOSE HOME PATH SHELL TERM USER"};
-: ${CLEAR_PREFIX_DIRS:="bin i686-nt32-midipix include lib lib64 libexec native share tmp x86_64-nt64-midipix"};
+: ${CLEAR_PREFIX_DIRS:="bin i686-nt32-midipix include lib lib64 libexec minipix native share tmp x86_64-nt64-midipix"};
 : ${GITROOT:=git://midipix.org};
 : ${GITROOT_HEAD:=git://midipix.org};
 : ${LOG_ENV_VARS:="HOME PATH SHELL USER GITROOT ARCH BUILD PKG_LVL0_CFLAGS_CONFIGURE PKG_LVL1_CFLAGS_CONFIGURE PKG_LVL2_CFLAGS_CONFIGURE PKG_LVL3_CFLAGS_CONFIGURE PREFIX PREFIX_NATIVE PREFIX_CROSS WORKDIR"};
@@ -131,7 +131,7 @@ PKG_LVL3_MAKEFLAGS_INSTALL="DESTDIR=${PREFIX_NATIVE}";
 : ${PKG_GMP_SHA256SUM:=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160};
 : ${PKG_GMP_URL:=https://gmplib.org/download/gmp/gmp-${PKG_GMP_VERSION}.tar.bz2};
 : ${PKG_GMP_CONFIGURE_ARGS_EXTRA:=--disable-assembly};
-: ${PKG_GMP_PREFIX_EXTRA:=DESTDIR=${PREFIX_CROSS}};
+: ${PKG_GMP_PREFIX_EXTRA:=${PREFIX_CROSS}};
 : ${PKG_LIBELF_VERSION:=0.8.13};
 : ${PKG_LIBELF_SHA256SUM:=591a9b4ec81c1f2042a97aa60564e0cb79d041c52faa7416acb38bc95bd2c76d};
 : ${PKG_LIBELF_URL:=http://www.mr511.de/software/libelf-${PKG_LIBELF_VERSION}.tar.gz};
@@ -141,12 +141,12 @@ PKG_LVL3_MAKEFLAGS_INSTALL="DESTDIR=${PREFIX_NATIVE}";
 : ${PKG_MPC_SHA256SUM:=ed5a815cfea525dc778df0cb37468b9c1b554aaf30d9328b1431ca705b7400ff};
 : ${PKG_MPC_URL:=ftp://ftp.gnu.org/gnu/mpc/mpc-${PKG_MPC_VERSION}.tar.gz};
 : ${PKG_MPC_CONFIGURE_ARGS_EXTRA:=--with-gmp=${PREFIX_NATIVE} --with-mpfr=${PREFIX_NATIVE}};
-: ${PKG_MPC_PREFIX_EXTRA:=DESTDIR=${PREFIX_CROSS}};
+: ${PKG_MPC_PREFIX_EXTRA:=${PREFIX_CROSS}};
 : ${PKG_MPFR_VERSION:=3.1.2};
 : ${PKG_MPFR_SHA256SUM:=79c73f60af010a30a5c27a955a1d2d01ba095b72537dab0ecaad57f5a7bb1b6b};
 : ${PKG_MPFR_URL:=ftp://ftp.gnu.org/gnu/mpfr/mpfr-${PKG_MPFR_VERSION}.tar.bz2};
 : ${PKG_MPFR_CONFIGURE_ARGS_EXTRA:=--with-gmp=${PREFIX_NATIVE}};
-: ${PKG_MPFR_PREFIX_EXTRA:=DESTDIR=${PREFIX_CROSS}};
+: ${PKG_MPFR_PREFIX_EXTRA:=${PREFIX_CROSS}};
 : ${PKG_MUSL_VERSION:=1.1.12};
 : ${PKG_MUSL_SHA256SUM:=720b83c7e276b4b679c0bffe9509340d5f81fd601508e607e708177df0d31c0e};
 : ${PKG_MUSL_URL:=http://www.musl-libc.org/releases/musl-${PKG_MUSL_VERSION}.tar.gz};
@@ -169,7 +169,7 @@ PKG_LVL3_MAKEFLAGS_INSTALL="DESTDIR=${PREFIX_NATIVE}";
 : ${PKG_NTCON_URL:=${GITROOT}/ntcon};
 : ${PKG_NTCTTY_URL:=${GITROOT_HEAD}/ntctty};
 : ${PKG_NTCTTY_CFLAGS_CONFIGURE_EXTRA:=-O0};
-: ${PKG_NTCTTY_PREFIX_EXTRA:=DESTDIR=${PREFIX_MINIPIX}};
+: ${PKG_NTCTTY_PREFIX_EXTRA:=${PREFIX_MINIPIX}};
 : ${PKG_PEMAGINE_URL:=${GITROOT}/pemagine};
 : ${PKG_PEMAGINE_CFLAGS_CONFIGURE_EXTRA:=-O0};
 : ${PKG_PSXSCL_URL:=${GITROOT_HEAD}/psxscl};
@@ -255,7 +255,6 @@ PKG_LVL3_MAKEFLAGS_INSTALL="DESTDIR=${PREFIX_NATIVE}";
 : ${PKG_NCURSESW_BUILD_DIR:=ncursesw-${PKG_NCURSESW_VERSION}-native-${TARGET}};
 : ${PKG_NCURSESW_CONFIGURE_ARGS_EXTRA:="--enable-pc-files --program-prefix= --with-pkg-config-libdir=${PREFIX_NATIVE}/lib/pkgconfig --with-shared --with-manpages --with-progs --without-tests --enable-widec --without-pthread"};
 : ${PKG_NCURSESW_INSTALL_FILES:=@ncursesw/ncurses.h=include/ncurses.h};
-: ${PKG_NCURSESW_PREFIX_EXTRA:=DESTDIR=${PREFIX_MINIPIX}};
 : ${PKG_PCRE_VERSION:=8.39};
 : ${PKG_PCRE_SHA256SUM:=ccdf7e788769838f8285b3ee672ed573358202305ee361cfec7a4a4fb005bbc7};
 : ${PKG_PCRE_URL:=ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-${PKG_PCRE_VERSION}.tar.gz};
@@ -355,22 +354,11 @@ PKG_LVL3_MAKEFLAGS_INSTALL="DESTDIR=${PREFIX_NATIVE}";
 : ${PKG_BASH_SHA256SUM:=afc687a28e0e24dc21b988fa159ff9dbcf6b7caa92ade8645cc6d5605cd024d4};
 : ${PKG_BASH_URL:=https://ftp.gnu.org/gnu/bash/bash-${PKG_BASH_VERSION}.tar.gz};
 : ${PKG_BASH_CONFIGURE_ARGS_EXTRA:="--without-bash-malloc --with-curses"};
-: ${PKG_BASH_STATIC_VERSION:=4.3};
-: ${PKG_BASH_STATIC_SHA256SUM:=afc687a28e0e24dc21b988fa159ff9dbcf6b7caa92ade8645cc6d5605cd024d4};
-: ${PKG_BASH_STATIC_URL:=https://ftp.gnu.org/gnu/bash/bash-${PKG_BASH_VERSION}.tar.gz};
-: ${PKG_BASH_STATIC_CONFIGURE_ARGS_EXTRA:="--enable-static-link --without-bash-malloc --with-curses"};
-: ${PKG_BASH_STATIC_MAKEFLAGS_INSTALL:="DESTDIR=${PREFIX_MINIPIX}/"};
-: ${PKG_BASH_STATIC_PREFIX=${PREFIX_MINIPIX}};
+: ${PKG_BASH_PREFIX_EXTRA:=${PREFIX_MINIPIX}};
 : ${PKG_COREUTILS_VERSION:=8.23};
 : ${PKG_COREUTILS_SHA256SUM:=ec43ca5bcfc62242accb46b7f121f6b684ee21ecd7d075059bf650ff9e37b82d};
 : ${PKG_COREUTILS_URL:=https://ftp.gnu.org/gnu/coreutils/coreutils-${PKG_COREUTILS_VERSION}.tar.xz};
-: ${PKG_COREUTILS_STATIC_VERSION:=8.23};
-: ${PKG_COREUTILS_STATIC_SHA256SUM:=ec43ca5bcfc62242accb46b7f121f6b684ee21ecd7d075059bf650ff9e37b82d};
-: ${PKG_COREUTILS_STATIC_URL:=https://ftp.gnu.org/gnu/coreutils/coreutils-${PKG_COREUTILS_VERSION}.tar.xz};
-: ${PKG_COREUTILS_STATIC_LDFLAGS_BUILD_EXTRA:=-static};
-: ${PKG_COREUTILS_STATIC_MAKEFLAGS_BUILD_EXTRA:=SHARED=0};
-: ${PKG_COREUTILS_STATIC_MAKEFLAGS_INSTALL:="DESTDIR=${PREFIX_MINIPIX}/"};
-: ${PKG_COREUTILS_STATIC_PREFIX=${PREFIX_MINIPIX}};
+: ${PKG_COREUTILS_PREFIX_EXTRA:=${PREFIX_MINIPIX}};
 : ${PKG_CRON_URL:=git://anonscm.debian.org/pkg-cron/pkg-cron.git};
 : ${PKG_CRON_URL_TYPE:=git};
 : ${PKG_CRON_BUILD_DIR:=pkg-cron.git};
diff --git a/pkg.build b/pkg.build
index edf2d2d1..ed01aacd 100644
--- a/pkg.build
+++ b/pkg.build
@@ -186,7 +186,7 @@ if ! is_build_script_done install; then
 					"${PKG_LDFLAGS_INSTALL_EXTRA:+LDFLAGS+=${PKG_LDFLAGS_INSTALL_EXTRA}}"	\
 					"${PKG_RANLIB_INSTALL:+RANLIB=${PKG_RANLIB_INSTALL}}"			\
 					${PKG_INSTALL_TARGET:=install}			\
-					${__};
+					${__:+DESTDIR=${__}};
 			done;
 		fi;
 		if test_cmd pkg_${PKG_NAME}_install_post; then