Refactors build steps along the sequence {setup,fetch,configure,build,install}.

subr/mode_check_updates.subr: seperated into check_updates.sh.
subr/post_{copy_etc,sha256sums,tarballs}.subr: absorbed into `dist' target.

18 files changed, 197 insertions, 57 deletions

diff --git a/vars/apr.vars b/vars/apr.vars
index a36daa44..de302737 100644
--- a/vars/apr.vars
+++ b/vars/apr.vars
@@ -2,12 +2,12 @@
 # set -o errexit -o noglob are assumed.
 #
 
-pkg_apr_install_post() {
+pkg_apr_install_make_post() {
 	sed	-e 's,echo "\$APR_BUILD_DIR/libtool",echo '"${PREFIX}"'/bin/slibtool,'					\
 		-e 's,echo "\${installbuilddir}/libtool",echo '"${PREFIX}"'/bin/slibtool,'				\
 		-e 's,flags="\$flags -I\$includedir \$EXTRA_INCLUDES",flags="-I'"${PKG_PREFIX}"'/include/apr-1",'	\
-			"${PKG_PREFIX}/bin/apr-1-config" > "${PREFIX}/bin/${PKG_TARGET}-apr-1-config";
-	chmod +x "${PREFIX}/bin/${PKG_TARGET}-apr-1-config";
+			"${PWD}/../destdir/bin/apr-1-config" > "${PWD}/../destdir/bin/${PKG_TARGET}-apr-1-config";
+	chmod +x "${PWD}/../destdir/bin/${PKG_TARGET}-apr-1-config";
 };
 
 # vim:filetype=sh
diff --git a/vars/build.vars b/vars/build.vars
index 936ef723..19e817b5 100644
--- a/vars/build.vars
+++ b/vars/build.vars
@@ -3,7 +3,7 @@
 #
 INVARIANTS_PACKAGES="chainport";
 : ${PKG_CHAINPORT_URLS_GIT:="chainport=${DEFAULT_GITROOT}/ports/chainport"};
-: ${PKG_CHAINPORT_BUILD_STEPS_DISABLE:="build:main configure:main install:main"};
+: ${PKG_CHAINPORT_BUILD_STEPS_DISABLE:="configure:dynamic build:dynamic install_make:dynamic install:dynamic"};
 
 #
 # Build target host_toolchain
@@ -24,7 +24,7 @@ HOST_TOOLCHAIN_PREFIX="${PREFIX_CROSS}";
 : ${PKG_PERK_HOST_PREFIX:=${PREFIX}};
 : ${PKG_MDSO_HOST_URLS_GIT:="mdso=${DEFAULT_GITROOT}/mdso"};
 : ${PKG_MDSO_HOST_CONFIGURE_ARGS:="--prefix=/usr"};
-: ${PKG_MDSO_HOST_INSTALL_FILES:="@mdso=bin/${TARGET}-mdso bin/mdso=${TARGET}/bin/mdso"};
+: ${PKG_MDSO_HOST_INSTALL_FILES:="@mdso=bin/${TARGET}-mdso /=${TARGET}/bin bin/mdso=${TARGET}/bin/mdso"};
 : ${PKG_MDSO_HOST_PREFIX:=${PREFIX}};
 : ${PKG_BINUTILS_HOST_SHA256SUM:=250d3b2925c6b211fb16173b0b25bc091c58829fbcad3eb849645e0af52cf7fa};
 : ${PKG_BINUTILS_HOST_VERSION:=2.24.51};
@@ -47,7 +47,7 @@ HOST_TOOLCHAIN_PREFIX="${PREFIX_CROSS}";
 : ${PKG_GCC_STAGE1_BASE_DIR:=${WORKDIR}};
 : ${PKG_PSXSTUB_URLS_GIT:="psxstub=${DEFAULT_GITROOT}/psxstub"};
 : ${PKG_PSXSTUB_BUILD_DIR:=psxstub};
-: ${PKG_PSXSTUB_BUILD_STEPS_DISABLE:=build:main};
+: ${PKG_PSXSTUB_BUILD_STEPS_DISABLE:=build:dynamic};
 : ${PKG_MUSL_NO_COMPLEX_VERSION:=1.1.12};
 : ${PKG_MUSL_NO_COMPLEX_BASE_DIR:=${WORKDIR}};
 : ${PKG_GCC_RUNTIME_VERSION:=4.6.4};
@@ -58,10 +58,9 @@ HOST_TOOLCHAIN_PREFIX="${PREFIX_CROSS}";
 : ${PKG_GCC_LIBSTDCPP_V3_BASE_DIR:=${WORKDIR}};
 : ${PKG_GCC_FULL_VERSION:=4.6.4};
 : ${PKG_GCC_FULL_BASE_DIR:=${WORKDIR}};
-: ${PKG_INSTALL_STRIP_HOST_BUILD_STEPS_DISABLE:="fetch:main extract:main build:main"};
 : ${PKG_INSTALL_STRIP_HOST_URL:=none};
 : ${PKG_PSXTYPES_HOST_URLS_GIT:=psxtypes=${DEFAULT_GITROOT}/psxtypes};
-: ${PKG_PSXTYPES_HOST_BUILD_STEPS_DISABLE:=build:main};
+: ${PKG_PSXTYPES_HOST_BUILD_STEPS_DISABLE:=build:dynamic};
 : ${PKG_LDSO_HOST_URLS_GIT:=pemagine=${DEFAULT_GITROOT}/pemagine};
 : ${PKG_LDSO_HOST_BUILD_TYPE:=cross};
 : ${PKG_LDSO_HOST_CFLAGS_CONFIGURE_EXTRA:="-O0 -DPE_LDSO -I${PREFIX_CROSS}/include"};
@@ -133,7 +132,7 @@ NATIVE_TOOLCHAIN_PREFIX="${PREFIX_NATIVE}";
 : ${PKG_GCC_STAGE1_NATIVE_X86_64_W64_MINGW32_BASE_DIR:=${WORKDIR}};
 : ${PKG_MDSO_URLS_GIT:="mdso=${DEFAULT_GITROOT}/mdso"};
 : ${PKG_MDSO_CONFIGURE_ARGS:="--prefix=/usr --target=${TARGET}"};
-: ${PKG_MDSO_INSTALL_FILES:="@mdso=bin/${TARGET}-mdso @../../bin/mdso=${TARGET}/bin/mdso"};
+: ${PKG_MDSO_INSTALL_FILES:="@mdso=bin/${TARGET}-mdso /=${TARGET}/bin @../../bin/mdso=${TARGET}/bin/mdso"};
 
 #
 # Build target runtime
@@ -154,7 +153,7 @@ RUNTIME_PREFIX="${PREFIX_NATIVE}";
 : ${PKG_LDSO_URLS_GIT:=pemagine=${DEFAULT_GITROOT}/pemagine};
 : ${PKG_LDSO_CFLAGS_CONFIGURE_EXTRA:="-O0 -DPE_LDSO"};
 : ${PKG_LDSO_CONFIGURE_ARGS_EXTRA:=--disable-shared};
-: ${PKG_LDSO_INSTALL_FILES:="@../../lib/libldso.a=${TARGET}/lib/libldso.a"};
+: ${PKG_LDSO_INSTALL_FILES:="/=${TARGET}/lib @../../lib/libldso.a=${TARGET}/lib/libldso.a"};
 : ${PKG_LDSO_MAKEFLAGS_BUILD_EXTRA:=STATIC_LIB_NAME=libldso.a};
 : ${PKG_LDSO_MAKEFLAGS_INSTALL_EXTRA:=STATIC_LIB_NAME=libldso.a};
 : ${PKG_NTCON_URLS_GIT:=ntcon=${DEFAULT_GITROOT}/ntcon};
@@ -165,10 +164,9 @@ RUNTIME_PREFIX="${PREFIX_NATIVE}";
 : ${PKG_PSXSCL_CFLAGS_CONFIGURE_EXTRA:=-O0};
 : ${PKG_PSXSCL_INSTALL_TARGET_EXTRA:=install-lib};
 : ${PKG_PSXSCL_STRACE_URLS_GIT:=psxscl=${DEFAULT_GITROOT_HEAD}/psxscl};
+: ${PKG_PSXSCL_STRACE_BUILD_STEPS_DISABLE:=install_make:dynamic};
 : ${PKG_PSXSCL_STRACE_CFLAGS_CONFIGURE_EXTRA:="-DPSX_INTERNAL_STRACE -O0"};
 : ${PKG_PSXSCL_STRACE_INSTALL_FILES:="/=lib/psxscl_strace lib/libpsxscl.so=lib/psxscl_strace/"};
-: ${PKG_PSXSCL_STRACE_NO_INSTALL_LIBS:=1};
-: ${PKG_PSXSCL_STRACE_NO_MAKE_INSTALL:=1};
 : ${PKG_NTCTTY_URLS_GIT:=ntctty=${DEFAULT_GITROOT_HEAD}/ntctty};
 : ${PKG_NTCTTY_CFLAGS_CONFIGURE_EXTRA:=-O0};
 : ${PKG_PTYCON_URLS_GIT:=ptycon=${DEFAULT_GITROOT_HEAD}/ptycon};
@@ -194,6 +192,7 @@ HOST_PACKAGES_PREFIX="${PREFIX}";
 : ${PKG_CMAKE_HOST_VERSION:=3.6.3};
 : ${PKG_CMAKE_HOST_URL:=https://cmake.org/files/v${PKG_CMAKE_HOST_VERSION%.*}/cmake-${PKG_CMAKE_HOST_VERSION}.tar.gz};
 : ${PKG_CMAKE_HOST_CONFIGURE_ARGS:="--parallel=${DEFAULT_BUILD_CPUS} --prefix=${PREFIX}"};
+: ${PKG_CMAKE_HOST_DISABLED:=1};
 : ${PKG_LLVM_HOST_SHA256SUM:=6e82ce4adb54ff3afc18053d6981b6aed1406751b8742582ed50f04b5ab475f9};
 : ${PKG_LLVM_HOST_VERSION:=3.8.1};
 : ${PKG_LLVM_HOST_URL:=http://releases.llvm.org/${PKG_LLVM_HOST_VERSION}/llvm-${PKG_LLVM_HOST_VERSION}.src.tar.xz};
@@ -211,7 +210,7 @@ HOST_PACKAGES_PREFIX="${PREFIX}";
 : ${PKG_GLIB_HOST_SHA256SUM:=fe22998ff0394ec31e6e5511c379b74011bee61a4421bca7fcab223dfbe0fc6a};
 : ${PKG_GLIB_HOST_VERSION:=2.54.0};
 : ${PKG_GLIB_HOST_URL:=http://ftp.gnome.org/pub/GNOME/sources/glib/${PKG_GLIB_HOST_VERSION%.[0-9]}/glib-${PKG_GLIB_HOST_VERSION}.tar.xz};
-: ${PKG_GLIB_HOST_BUILD_STEPS_DISABLE:=patch:main};
+: ${PKG_GLIB_HOST_BUILD_STEPS_DISABLE:=configure_patch:dynamic};
 : ${PKG_GLIB_HOST_CONFIGURE_ARGS_EXTRA:="--disable-dtrace --disable-libelf --disable-libmount"};
 : ${PKG_GLIB_HOST_ENV_VARS_EXTRA:=LIBFFI_CFLAGS=-I${PREFIX}/lib/libffi-${PKG_LIBFFI_HOST_VERSION}/include:LIBFFI_LIBS=-L${PREFIX}/lib64 -lffi};
 : ${PKG_GLIB_HOST_MAKEFLAGS_BUILD_EXTRA:=-j1};
@@ -224,7 +223,7 @@ HOST_PACKAGES_PREFIX="${PREFIX}";
 : ${PKG_RUBY_HOST_SHA256SUM:=ba5ba60e5f1aa21b4ef8e9bf35b9ddb57286cb546aac4b5a28c71f459467e507};
 : ${PKG_RUBY_HOST_VERSION:=2.3.0};
 : ${PKG_RUBY_HOST_URL:=https://cache.ruby-lang.org/pub/ruby/${PKG_RUBY_HOST_VERSION%.*}/ruby-${PKG_RUBY_HOST_VERSION}.tar.gz};
-: ${PKG_RUBY_HOST_BUILD_STEPS_DISABLE:=patch:main};
+: ${PKG_RUBY_HOST_BUILD_STEPS_DISABLE:=configure_patch:dynamic};
 : ${PKG_RUBY_HOST_CFLAGS_CONFIGURE:="-g0 -O1"};
 : ${PKG_RUBY_HOST_CONFIGURE_ARGS_EXTRA:="--disable-install-rdoc --with-out-ext=fiddle"};
 
@@ -270,11 +269,11 @@ LIB_PACKAGES_PREFIX="${PREFIX_NATIVE}";
 : ${PKG_BZIP2_SHA256SUM:=a2848f34fcd5d6cf47def00461fcb528a0484d8edef8208d6d2e2909dc61d9cd};
 : ${PKG_BZIP2_VERSION:=1.0.6};
 : ${PKG_BZIP2_URL:=http://www.bzip.org/1.0.6/bzip2-${PKG_BZIP2_VERSION}.tar.gz};
+: ${PKG_BZIP2_BUILD_STEPS_DISABLE:=build_clean:variant};
 : ${PKG_BZIP2_CFLAGS_BUILD_EXTRA:=${LIB_PACKAGES_CFLAGS_CONFIGURE}};
 : ${PKG_BZIP2_INSTALL_FILES:="@bzdiff=bin/bzcmp @bzgrep=bin/bzegrep @bzgrep=bin/bzfgrep @bzmore=bin/bzless libbz2.so.1.0=lib/ libbz2.so.1.0.6=lib/"};
 : ${PKG_BZIP2_MAKEFLAGS_BUILD_EXTRA:=-f Makefile-libbz2_so};
 : ${PKG_BZIP2_MAKE_INSTALL_VNAME:=PREFIX};
-: ${PKG_BZIP2_NO_CLEAN:=1};
 : ${PKG_CURL_SHA256SUM:=7f8240048907e5030f67be0a6129bc4b333783b9cca1391026d700835a788dde};
 : ${PKG_CURL_VERSION:=7.51.0};
 : ${PKG_CURL_URL:=https://curl.haxx.se/download/curl-${PKG_CURL_VERSION}.tar.bz2};
@@ -414,6 +413,7 @@ LIB_PACKAGES_PREFIX="${PREFIX_NATIVE}";
 : ${PKG_CMAKE_URL:=https://cmake.org/files/v${PKG_CMAKE_VERSION%.*}/cmake-${PKG_CMAKE_VERSION}.tar.gz};
 : ${PKG_CMAKE_CFLAGS_CONFIGURE_EXTRA:="-g0 -O2"};
 : ${PKG_CMAKE_CONFIGURE_ARGS:="--parallel=${DEFAULT_BUILD_CPUS} --prefix="};
+: ${PKG_CMAKE_DISABLED:=1};
 
 : ${PKG_INPUTPROTO_SHA256SUM:=893a6af55733262058a27b38eeb1edc733669f01d404e8581b167f03c03ef31d};
 : ${PKG_INPUTPROTO_VERSION:=2.3.2};
@@ -595,12 +595,12 @@ LEAF_PACKAGES_PREFIX="${PREFIX_NATIVE}";
 : ${PKG_CHICKEN_SHA256SUM:=e3dc2b8f95b6a3cd59c85b5bb6bdb2bd9cefc45b5d536a20cad74e3c63f4ad89};
 : ${PKG_CHICKEN_VERSION:=4.11.0};
 : ${PKG_CHICKEN_URL:=https://code.call-cc.org/releases/4.11.0/chicken-${PKG_CHICKEN_VERSION}.tar.gz};
+: ${PKG_CHICKEN_BUILD_STEPS_DISABLE:=build_clean:variant};
 : ${PKG_CHICKEN_MAKEFLAGS_BUILD:="PLATFORM=midipix-${ARCH} PREFIX=${PREFIX_NATIVE} TARGET_PREFIX=${PREFIX_NATIVE} C_COMPILER=${TARGET}-gcc HOSTSYSTEM=${TARGET}"};
 : ${PKG_CHICKEN_MAKEFLAGS_BUILD_EXTRA_DEBUG:=DEBUGBUILD=1};
 : ${PKG_CHICKEN_MAKEFLAGS_BUILD_EXTRA_RELEASE:=DEBUGBUILD=0};
 : ${PKG_CHICKEN_MAKE_INSTALL_VNAME:=TARGET_PREFIX};
 : ${PKG_CHICKEN_MAKEFLAGS_INSTALL:="PLATFORM=midipix-${ARCH} PREFIX=${PREFIX_NATIVE} C_COMPILER=${TARGET}-gcc HOSTSYSTEM=${TARGET} CROSS_CHICKEN=1"};
-: ${PKG_CHICKEN_NO_CLEAN:=1};
 : ${PKG_COREUTILS_SHA256SUM:=1117b1a16039ddd84d51a9923948307cfa28c2cea03d1a2438742253df0a0c65};
 : ${PKG_COREUTILS_VERSION:=8.28};
 : ${PKG_COREUTILS_URL:=https://ftp.gnu.org/gnu/coreutils/coreutils-${PKG_COREUTILS_VERSION}.tar.xz};
@@ -638,8 +638,8 @@ LEAF_PACKAGES_PREFIX="${PREFIX_NATIVE}";
 : ${PKG_FIGLET_SHA256SUM:=bf88c40fd0f077dab2712f54f8d39ac952e4e9f2e1882f1195be9e5e4257417d};
 : ${PKG_FIGLET_VERSION:=2.2.5};
 : ${PKG_FIGLET_URL:=ftp://ftp.figlet.org/pub/figlet/program/unix/figlet-${PKG_FIGLET_VERSION}.tar.gz};
+: ${PKG_FIGLET_BUILD_STEPS_DISABLE:=build_clean:variant};
 : ${PKG_FIGLET_MAKEFLAGS_BUILD:=CC=${TARGET}-gcc LD=${TARGET}-gcc};
-: ${PKG_FIGLET_NO_CLEAN:=1};
 : ${PKG_FILE_SHA256SUM:=8639dc4d1b21e232285cd483604afc4a6ee810710e00e579dbe9591681722b50};
 : ${PKG_FILE_VERSION:=5.32};
 : ${PKG_FILE_URL:=ftp://ftp.astron.com/pub/file/file-${PKG_FILE_VERSION}.tar.gz};
@@ -686,11 +686,11 @@ LEAF_PACKAGES_PREFIX="${PREFIX_NATIVE}";
 : ${PKG_JOHN_SHA256SUM:=952cf68369fb5b27f2d112ce7ca1eb16b975c85cbce8c658abb8bc5a20e1b266};
 : ${PKG_JOHN_VERSION:=1.8.0};
 : ${PKG_JOHN_URL:=http://www.openwall.com/john/j/john-${PKG_JOHN_VERSION}.tar.xz};
+: ${PKG_JOHN_BUILD_STEPS_DISABLE:=install_make:dynamic};
 : ${PKG_JOHN_DISABLED:=$(if [ "${ARCH}" = "nt32" ]; then echo 1; fi)};
 : ${PKG_JOHN_INSTALL_FILES:="run/john=bin/ run/mailer=bin/ run/makechr=bin/ run/relbench=bin/ run/unafs=bin/ run/unique=bin/ run/unshadow=bin/ /=share/john run/ascii.chr=share/john/ run/digits.chr=share/john/ run/john.conf=share/john/ run/lm_ascii.chr=share/john/ run/password.lst=share/john/"};
 : ${PKG_JOHN_MAKEFLAGS_BUILD_EXTRA_DEBUG:="-C src midipix-x86-64"};
 : ${PKG_JOHN_MAKEFLAGS_BUILD_EXTRA_RELEASE:="-C src midipix-x86-64 LDFLAGS_DEBUG=-s"};
-: ${PKG_JOHN_NO_MAKE_INSTALL:=1};
 : ${PKG_JOHN_SUBDIR:=john-${PKG_JOHN_VERSION}};
 : ${PKG_LDNS_SHA256SUM:=c19f5b1b4fb374cfe34f4845ea11b1e0551ddc67803bd6ddd5d2a20f0997a6cc};
 : ${PKG_LDNS_VERSION:=1.7.0};
@@ -737,10 +737,9 @@ LEAF_PACKAGES_PREFIX="${PREFIX_NATIVE}";
 : ${PKG_MKSH_SHA256SUM:=8bce3837c386684aa7780f085f1a4dbd5e3e26fb5c528ee0d41ae29af7f39013};
 : ${PKG_MKSH_VERSION:=R54};
 : ${PKG_MKSH_URL:=http://pub.allbsd.org/MirOS/dist/mir/mksh/mksh-${PKG_MKSH_VERSION}.tgz};
-: ${PKG_MKSH_BUILD_CMDLINE:="sh Build.sh"};
+: ${PKG_MKSH_BUILD_STEPS_DISABLE:=install_make:dynamic};
 : ${PKG_MKSH_ENV_VARS_EXTRA:="CC=${TARGET}-gcc:CFLAGS=${PACKAGES_CFLAGS_CONFIGURE:+${PACKAGES_CFLAGS_CONFIGURE} }-DMKSH_NOPROSPECTOFWORK"};
 : ${PKG_MKSH_INSTALL_FILES:="mksh=bin/ /=share/doc/mksh/examples dot.mkshrc=share/doc/mksh/examples/ mksh.1=share/man/man1/"};
-: ${PKG_MKSH_NO_MAKE_INSTALL:=1};
 : ${PKG_MKSH_SUBDIR:=mksh};
 : ${PKG_MTR_SHA256SUM:=f2979db9e2f41aa8e6574e7771767c9afe111d9213814eb47f5e1e71876e4382};
 : ${PKG_MTR_VERSION:=0.92};
@@ -774,8 +773,8 @@ LEAF_PACKAGES_PREFIX="${PREFIX_NATIVE}";
 : ${PKG_OPENSSH_CONFIGURE_ARGS_EXTRA_DEBUG:=--disable-strip};
 : ${PKG_OPENSSH_INSTALL_TARGET:=install-nokeys};
 : ${PKG_P7ZIP_URLS_GIT:="p7zip-midipix.git=https://github.com/lalbornoz/p7zip-midipix.git@master"};
+: ${PKG_P7ZIP_BUILD_STEPS_DISABLE:=install_make:dynamic};
 : ${PKG_P7ZIP_INSTALL_FILES:="bin/7za=bin/"};
-: ${PKG_P7ZIP_NO_MAKE_INSTALL:=1};
 : ${PKG_PACMAN_SHA256SUM:=84599e2ee2158134fd704f1cd681ea46e021165bed4df5f002aa1748caef9e7b};
 : ${PKG_PACMAN_VERSION:=5.0.1};
 : ${PKG_PACMAN_URL:=https://projects.archlinux.org/pacman.git/snapshot/pacman-${PKG_PACMAN_VERSION}.tar.gz};
@@ -840,10 +839,10 @@ LEAF_PACKAGES_PREFIX="${PREFIX_NATIVE}";
 : ${PKG_ST_SHA256SUM:=f7870d906ccc988926eef2cc98950a99cc78725b685e934c422c03c1234e6000};
 : ${PKG_ST_VERSION:=0.7};
 : ${PKG_ST_URL:=https://dl.suckless.org/st/st-${PKG_ST_VERSION}.tar.gz};
+: ${PKG_ST_BUILD_STEPS_DISABLE:=install_make:dynamic};
 : ${PKG_ST_CFLAGS_BUILD_EXTRA:=${LEAF_PACKAGES_CFLAGS_CONFIGURE} -I${PREFIX_NATIVE}/include/freetype2};
 : ${PKG_ST_INSTALL_FILES:=st=bin/ st.1=share/man/man1/ st.info=bin/};
 : ${PKG_ST_LDFLAGS_BUILD_EXTRA:=-L${PREFIX_NATIVE}/lib -lX11 -lXft -lfreetype -lfontconfig};
-: ${PKG_ST_NO_MAKE_INSTALL:=1};
 : ${PKG_TAR_SHA256SUM:=cae466e6e58c7292355e7080248f244db3a4cf755f33f4fa25ca7f9a7ed09af0};
 : ${PKG_TAR_VERSION:=1.29};
 : ${PKG_TAR_URL:=https://ftp.gnu.org/gnu/tar/tar-${PKG_TAR_VERSION}.tar.gz};
@@ -877,7 +876,6 @@ LEAF_PACKAGES_PREFIX="${PREFIX_NATIVE}";
 : ${PKG_VIM_VERSION:=7.4.1952};
 : ${PKG_VIM_URL:=https://github.com/vim/vim/archive/v${PKG_VIM_VERSION}.tar.gz};
 : ${PKG_VIM_BUILD_DIR:=vim-${PKG_VIM_VERSION}};
-: ${PKG_VIM_CONFIG_CACHE_EXTRA:=${PKG_VIM_BUILD_DIR}/src/auto};
 : ${PKG_VIM_CONFIGURE_ARGS_EXTRA:=--with-tlib=ncursesw};
 : ${PKG_VIM_ENV_VARS_EXTRA:=PKG_CONFIG=${PREFIX}/bin/${TARGET}-pkg-config};
 : ${PKG_VIM_INSTALL_FILES:=@vim=bin/vi};
@@ -930,10 +928,10 @@ MINIPIX_PREFIX="${PREFIX_MINIPIX}";
 : ${PKG_PTYCON_FLAVOUR_MINIPIX_CONFIGURE_ARGS:="--prefix= --strict --host=${TARGET}"};
 : ${PKG_PTYCON_FLAVOUR_MINIPIX_ENV_VARS_EXTRA:="CFLAGS_PATH=-I${PREFIX_NATIVE}/include:LDFLAGS_PATH=-L${PREFIX_NATIVE}/lib"};
 : ${PKG_PTYCON_FLAVOUR_MINIPIX_INSTALL_TARGET:=install-static-app};
+: ${PKG_BZIP2_FLAVOUR_MINIPIX_BUILD_STEPS_DISABLE:="${PKG_BZIP2_BUILD_STEPS_DISABLE:+${PKG_BZIP2_BUILD_STEPS_DISABLE} }install_make:dynamic"};
 : ${PKG_BZIP2_FLAVOUR_MINIPIX_INSTALL_FILES:="bzip2=bin/ @bzip2=bin/bunzip2 @bzip2=bin/bzcat @bzip2=bin/bzip2recover @bzip2=bin/bzgrep @bzip2=bin/bzmore @bzip2=bin/bzdiff"};
 : ${PKG_BZIP2_FLAVOUR_MINIPIX_LDFLAGS_BUILD_EXTRA:="-static"};
 : ${PKG_BZIP2_FLAVOUR_MINIPIX_MAKEFLAGS_BUILD_EXTRA:="-f Makefile"};
-: ${PKG_BZIP2_FLAVOUR_MINIPIX_NO_MAKE_INSTALL:=1};
 : ${PKG_BZIP2_FLAVOUR_MINIPIX_PREFIX:=${PREFIX_MINIPIX}};
 : ${PKG_GZIP_FLAVOUR_MINIPIX_LDFLAGS_BUILD_EXTRA:="-static"};
 : ${PKG_GZIP_FLAVOUR_MINIPIX_LDFLAGS_INSTALL_EXTRA:="-static"};
@@ -943,7 +941,7 @@ MINIPIX_PREFIX="${PREFIX_MINIPIX}";
 : ${PKG_XZ_FLAVOUR_MINIPIX_PREFIX:=${PREFIX_MINIPIX}};
 : ${PKG_BASH_CONFIGURE_ARGS_EXTRA:="--without-bash-malloc --with-curses"};
 : ${PKG_BASH_FLAVOUR_MINIPIX_CONFIGURE_ARGS_EXTRA:="--enable-static-link --without-bash-malloc --with-curses"};
-: ${PKG_BASH_FLAVOUR_MINIPIX_NO_MAKE_INSTALL:=1};
+: ${PKG_BASH_FLAVOUR_MINIPIX_BUILD_STEPS_DISABLE:=install_make:dynamic};
 : ${PKG_BASH_FLAVOUR_MINIPIX_INSTALL_FILES:="bash=bin/ bashbug=bin/"};
 : ${PKG_COREUTILS_FLAVOUR_MINIPIX_LDFLAGS_BUILD_EXTRA:="-static"};
 : ${PKG_COREUTILS_FLAVOUR_MINIPIX_MAKEFLAGS_BUILD_EXTRA:="SHARED=0"};
@@ -954,11 +952,16 @@ MINIPIX_PREFIX="${PREFIX_MINIPIX}";
 : ${PKG_TAR_FLAVOUR_MINIPIX_MAKEFLAGS_INSTALL:="-C src install-binPROGRAMS"};
 
 #
+# Build target dist
+#
+DIST_PACKAGES="dist_etc dist_digest dist_tarballs";
+
+#
 # Build meta-targets
 #
 DEVROOT_TARGET="host_toolchain native_toolchain runtime";
 DEV_TARGET="${DEVROOT_TARGET} dev_packages";
-WORLD_TARGET="${DEVROOT_TARGET} host_packages lib_packages leaf_packages minipix";
+WORLD_TARGET="${DEVROOT_TARGET} host_packages lib_packages leaf_packages minipix dist";
 ALL_TARGETS="${WORLD_TARGET} devroot dev world";
 
 # vim:filetype=sh textwidth=0
diff --git a/vars/cmake.vars b/vars/cmake.vars
index 40f3d85d..4b302e39 100644
--- a/vars/cmake.vars
+++ b/vars/cmake.vars
@@ -38,14 +38,14 @@ pkg_cmake_configure() {
 		"../cmake-${PKG_VERSION}";
 };
 
-pkg_cmake_install_pre() {
+pkg_cmake_install_make_pre() {
 	if [ ! -e cmake_install.cmake.orig ]; then
 		sed -i.orig '/^\s*set(CMAKE_INSTALL_PREFIX ".*")$/s/".*"/""/'	\
 			cmake_install.cmake;
 	fi;
 };
 
-pkg_cmake_host_install_pre() {
+pkg_cmake_host_install_make_pre() {
 	pkg_cmake_install_pre;
 };
 
diff --git a/vars/dist_digest.subr b/vars/dist_digest.subr
new file mode 100644
index 00000000..1b98fb6d
--- /dev/null
+++ b/vars/dist_digest.subr
@@ -0,0 +1,21 @@
+#
+# set -o errexit -o noglob are assumed.
+#
+
+dist_digest_all() {
+	local __;
+	if [ "${ARG_TARBALL:-0}" -eq 1 ]; then
+		log_msg info "Compiling SHA256 sums...";
+		if [ -e "${PREFIX}/SHA256SUMS" ]; then
+			build_fileop mv "${PREFIX}/SHA256SUMS" "${PREFIX}/SHA256SUMS.last";
+		fi;
+		(cd "${PREFIX}";
+		for __ in $(find "${PREFIX_NATIVE#${PREFIX}/}" -type f -perm /a=x	\
+				\( -path "${PREFIX_NATIVE#${PREFIX}/}/bin/*" -or	\
+				   -path "${PREFIX_NATIVE#${PREFIX}/}/lib/*" \)); do
+			sha256sum "${__}";
+		done > "${PREFIX}/SHA256SUMS");
+	fi;
+};
+
+# vim:filetype=sh
diff --git a/vars/dist_etc.subr b/vars/dist_etc.subr
new file mode 100644
index 00000000..e7e0a92a
--- /dev/null
+++ b/vars/dist_etc.subr
@@ -0,0 +1,11 @@
+#
+# set -o errexit -o noglob are assumed.
+#
+
+dist_etc_all() {
+	tar -C etc -cpf - midipix.sh README midipix_shortcut.vbs	|\
+	tar -C ${PREFIX} -xpf -;
+	chmod +x ${PREFIX}/midipix.sh;
+};
+
+# vim:filetype=sh
diff --git a/vars/dist_tarballs.subr b/vars/dist_tarballs.subr
new file mode 100644
index 00000000..7cf075a0
--- /dev/null
+++ b/vars/dist_tarballs.subr
@@ -0,0 +1,94 @@
+#
+# set -o errexit -o noglob are assumed.
+#
+
+postp_tarball_dist() {
+	TARBALL_FNAME="${TARBALL_FNAME_PREFIX}${BUILD_USER}@${BUILD_HNAME}-${BUILD_DATE_START}.tar.${TARBALL_SUFFIX}";
+	tar -cpf - $(find . -maxdepth 2 -mindepth 1 -type d				\
+			-not -path ./${PREFIX_BASENAME} 				\
+			-not -path ./${PREFIX_BASENAME}.bak				\
+			-not -path ./${PREFIX_BASENAME}.bak/\*				\
+			-not -path ./tmp -not -path ./tmp/\*)				\
+		midipix_shortcut.vbs midipix.sh	README SHA256SUMS			|\
+	"${TARBALL_COMPRESS_CMD}" ${TARBALL_COMPRESS_ARGS} -c > "${TARBALL_FNAME}";
+	log_msg info "Finished building binary distribution tarball.";
+	if [ -x "$(which gpg 2>/dev/null)" -a -n "${TARBALL_SIGN_GPG_KEY}" ] &&		\
+				gpg --list-keys "${TARBALL_SIGN_GPG_KEY}" >/dev/null 2>&1; then
+		gpg --armor --passphrase-file /dev/null					\
+			--local-user "${TARBALL_SIGN_GPG_KEY}" --sign "${TARBALL_FNAME}";
+		log_msg info "Signed binary distribution tarball.";
+	fi;
+};
+
+postp_tarball_toolchain() {
+	TARBALL_CROSS_FNAME="${TARBALL_CROSS_FNAME_PREFIX}${BUILD_USER}@${BUILD_HNAME}-${BUILD_DATE_START}.tar.${TARBALL_SUFFIX}";
+	tar -cpf - bin include lib lib64 libexec share "${TARGET}"			|\
+	"${TARBALL_COMPRESS_CMD}" ${TARBALL_COMPRESS_ARGS} -c > "${TARBALL_CROSS_FNAME}";
+	log_msg info "Finished building toolchain tarball.";
+	if [ -x "$(which gpg 2>/dev/null)" -a -n "${TARBALL_SIGN_GPG_KEY}" ] &&		\
+				gpg --list-keys "${TARBALL_SIGN_GPG_KEY}" >/dev/null 2>&1; then
+		gpg --armor --passphrase-file /dev/null					\
+			--local-user "${TARBALL_SIGN_GPG_KEY}" --sign "${TARBALL_CROSS_FNAME}";
+		log_msg info "Signed toolchain tarball.";
+	fi;
+};
+
+postp_tarball_minipix() {
+	TARBALL_MINIPIX_FNAME="${TARBALL_MINIPIX_FNAME_PREFIX}${BUILD_USER}@${BUILD_HNAME}-${BUILD_DATE_START}.tar.${TARBALL_SUFFIX}";
+	tar -cpf - minipix 								\
+		midipix_shortcut.vbs midipix.sh README					|\
+	"${TARBALL_COMPRESS_CMD}" ${TARBALL_COMPRESS_ARGS} -c > "${TARBALL_MINIPIX_FNAME}";
+	log_msg info "Finished building binary Minipix distribution tarball.";
+	if [ -x "$(which gpg 2>/dev/null)" -a -n "${TARBALL_SIGN_GPG_KEY}" ] &&		\
+				gpg --list-keys "${TARBALL_SIGN_GPG_KEY}" >/dev/null 2>&1; then
+		gpg --armor --passphrase-file /dev/null					\
+			--local-user "${TARBALL_SIGN_GPG_KEY}" --sign "${TARBALL_MINIPIX_FNAME}";
+		log_msg info "Signed binary Minipix distribution tarball.";
+	fi;
+};
+
+postp_tarball_src() {
+	TARBALL_SRC_FNAME="${TARBALL_SRC_FNAME_PREFIX}${BUILD_USER}@${BUILD_HNAME}-${BUILD_DATE_START}.tar.${TARBALL_SUFFIX}";
+	log_msg info "Building source tarball...";
+	tar -cpf - $(find tmp -mindepth 2 -maxdepth 2				\
+		-not -path tmp/.\*						\
+		-not -path tmp/ntctty/.git					\
+		-not -path tmp/psxscl/.git					\
+		-not -path tmp/ptycon/.git)					|\
+	"${TARBALL_COMPRESS_CMD}" ${TARBALL_COMPRESS_ARGS} -c > "${TARBALL_SRC_FNAME}";
+	log_msg info "Finished building source tarball.";
+	if [ -x "$(which gpg 2>/dev/null)" -a -n "${TARBALL_SIGN_GPG_KEY}" ] &&	\
+				gpg --list-keys "${TARBALL_SIGN_GPG_KEY}" >/dev/null 2>&1; then
+		gpg --armor --passphrase-file /dev/null				\
+			--local-user "${TARBALL_SIGN_GPG_KEY}" --sign "${TARBALL_SRC_FNAME}";
+		log_msg info "Signed source tarball.";
+	fi;
+};
+
+dist_tarballs_all() {
+	if [ "${ARG_TARBALL:-0}" -eq 1 ]; then
+		log_msg info "Building distribution tarballs...";
+		case "${TARBALL_SUFFIX}" in
+		bz2)	if [ -n "$(which pbzip2 2>/dev/null)" ]; then
+				TARBALL_COMPRESS_CMD="pbzip2";
+			else
+				TARBALL_COMPRESS_CMD="bzip2";
+			fi; ;;
+		gz)	if [ -n "$(which pigz 2>/dev/null)" ]; then
+				TARBALL_COMPRESS_CMD="pigz";
+			else
+				TARBALL_COMPRESS_CMD="gzip";
+			fi; ;;
+		xz)	TARBALL_COMPRESS_CMD="xz";
+			TARBALL_COMPRESS_ARGS="-T0"; ;;
+		*)	log_msg failexit "Unknown tarball suffix \`.${TARBALL_SUFFIX}'.";
+		esac;
+		build_fileop cd "${PREFIX}"; PREFIX_BASENAME="${PREFIX_NATIVE##*/}";
+		postp_tarball_dist; postp_tarball_toolchain; postp_tarball_minipix;
+		if [ "${BUILD}" = "debug" ]; then
+			postp_tarball_src;
+		fi;
+	fi;
+};
+
+# vim:filetype=sh
diff --git a/vars/env.vars b/vars/env.vars
index cf6ac9d1..818f87f9 100644
--- a/vars/env.vars
+++ b/vars/env.vars
@@ -16,22 +16,23 @@
 : ${PREFIX_CROSS:=${PREFIX}/${TARGET}};
 : ${DLCACHEDIR:=${PREFIX_ROOT}/dlcache};
 : ${WORKDIR:=${PREFIX}/tmp};
-: ${BUILD_STEPS:="disabled:always setup_vars:always setup_env:always
-	all:abstract fetch:main extract:main clone:main
-	patch_pre:main build_dir:always work_dir:always
-	autoconf:main patch:main configure:main clean:optional build:main
-	install_pre:main install:main strip:main finish:always"};
-: ${PKG_BUILD_VARS:="BASE_DIR BUILD_CMDLINE BUILD_DIR BUILD_STEPS_DISABLE
-	BUILD_TYPE CFLAGS_BUILD_EXTRA CFLAGS_CONFIGURE CFLAGS_CONFIGURE_EXTRA
-	CFLAGS_INSTALL_EXTRA CONFIG_CACHE_EXTRA CONFIGURE CONFIGURE_ARGS
+: ${BUILD_STEPS:="setup_vars:invariant setup_env:invariant all:all
+	fetch_wget:dynamic fetch_git:dynamic fetch_extract:dynamic fetch_subdirs:invariant fetch:virtual
+	configure_patch_pre:dynamic configure_autotools:dynamic configure_patch:dynamic configure:dynamic
+	build_clean:variant build:dynamic
+	install_subdirs:dynamic install_make:dynamic install_files:dynamic install_libs:dynamic
+	install_pkgconfig:dynamic install_purge_la:dynamic install_strip:dynamic install:dynamic
+	finish:invariant"};
+: ${PKG_BUILD_VARS:="BASE_DIR BUILD_DIR BUILD_STEPS_DISABLE BUILD_TYPE
+	CFLAGS_BUILD_EXTRA CFLAGS_CONFIGURE CFLAGS_CONFIGURE_EXTRA
+	CFLAGS_INSTALL_EXTRA CONFIGURE CONFIGURE_ARGS
 	CONFIGURE_ARGS_EXTRA CXXFLAGS_CONFIGURE_EXTRA DISABLED
 	ENV_VARS_EXTRA INSTALL_FILES INSTALL_TARGET INSTALL_TARGET_EXTRA
 	LDFLAGS_BUILD_EXTRA LDFLAGS_CONFIGURE LDFLAGS_CONFIGURE_EXTRA
 	LDFLAGS_INSTALL_EXTRA MAKE_INSTALL_VNAME MAKEFLAGS_BUILD
 	MAKEFLAGS_BUILD_EXTRA MAKEFLAGS_INSTALL MAKEFLAGS_INSTALL_EXTRA
-	NO_CLEAN NO_INSTALL_LIBS NO_MAKE_INSTALL PREFIX_EXTRA SHA256SUM 
-	SLIBTOOL SUBDIR TARGET URL URL_TYPE URLS_GIT VERSION"};
-: ${CLEAR_ENV_VARS_EXCEPT:="ARG_VERBOSE GITROOT_HEAD HOME PATH SHELL TERM TARBALL_SIGN_GPG_KEY USER"};
+	PREFIX_EXTRA SHA256SUM SLIBTOOL SUBDIR TARGET URL URL_TYPE URLS_GIT VERSION"};
+: ${CLEAR_ENV_VARS_EXCEPT:="ARG_VERBOSE DEFAULT_GITROOT_HEAD HOME PATH SHELL TERM TARBALL_SIGN_GPG_KEY USER"};
 : ${CLEAR_PREFIX_DIRS:="bin i686-nt32-midipix include lib lib64 libexec minipix native share tmp x86_64-nt64-midipix"};
 
 # Default flags
diff --git a/vars/gcc.vars b/vars/gcc.vars
index bcb092ed..12902647 100644
--- a/vars/gcc.vars
+++ b/vars/gcc.vars
@@ -97,7 +97,7 @@ pkg_gcc_stage1_all() {
 	esac;
 	# GCC, stage1.
 	if ! is_build_script_done "${PKG_NAME}" fetch "${_restart_at}"; then
-		pkg_fetch -git "cbb-gcc-${PKG_GCC_VERSION}=${GITROOT}/cbb/cbb-gcc-${PKG_GCC_VERSION}";
+		pkg_fetch_git "cbb-gcc-${PKG_GCC_VERSION}=${DEFAULT_GITROOT}/cbb/cbb-gcc-${PKG_GCC_VERSION}";
 		set_build_script_done "${PKG_NAME}" fetch -patch;
 	fi;
 	if ! is_build_script_done "${PKG_NAME}" patch "${_restart_at}"; then
diff --git a/vars/install_strip_host.vars b/vars/install_strip_host.vars
index f8d6ca8e..081226bd 100644
--- a/vars/install_strip_host.vars
+++ b/vars/install_strip_host.vars
@@ -2,7 +2,7 @@
 # set -o errexit -o noglob are assumed.
 #
 
-pkg_install_strip_host_install() {
+pkg_install_strip_host_all() {
 	if [ -e "${PREFIX}/bin/${TARGET}-install-strip" ]; then
 		build_fileop rm "${PREFIX}/bin/${TARGET}-install-strip";
 	fi;
diff --git a/vars/libfirm.vars b/vars/libfirm.vars
index 59ed78f1..7b3556d4 100644
--- a/vars/libfirm.vars
+++ b/vars/libfirm.vars
@@ -12,12 +12,12 @@ pkg_cparser_configure_pre() {
 	export LDFLAGS_PATH="-L../../sysroot/lib";
 };
 
-pkg_libfirm_install() {
+pkg_libfirm_install_make() {
 	make ${MAKEFLAGS} DESTDIR=../../sysroot install;
 	make ${MAKEFLAGS} DESTDIR="${PREFIX_NATIVE}" install;
 };
 
-pkg_cparser_install() {
+pkg_cparser_install_make() {
 	make ${MAKEFLAGS} DESTDIR=../../sysroot install;
 	make ${MAKEFLAGS} DESTDIR="${PREFIX_NATIVE}" install;
 };
diff --git a/vars/libxml2.vars b/vars/libxml2.vars
index f0bd0f02..1952c2d6 100644
--- a/vars/libxml2.vars
+++ b/vars/libxml2.vars
@@ -2,7 +2,7 @@
 # set -o errexit -o noglob are assumed.
 #
 
-pkg_libxml2_install_post() {
+pkg_libxml2_install_make_post() {
 	if [ -e "${PREFIX}/bin/${TARGET}-xml2-config" ]; then
 		build_fileop rm "${PREFIX}/bin/${TARGET}-xml2-config";
 	fi;
diff --git a/vars/musl.vars b/vars/musl.vars
index ce0110cb..c9d21883 100644
--- a/vars/musl.vars
+++ b/vars/musl.vars
@@ -23,16 +23,16 @@ pkg_musl_no_complex_all() {
 	local _install _restart_at="${1}";
 	PKG_MUSL_VERSION="${PKG_MUSL_NO_COMPLEX_VERSION}";
 	# Git clone what we need.
-	pkg_fetch -git "lazy=${GITROOT}/lazy";
+	pkg_fetch_git "lazy=${DEFAULT_GITROOT}/lazy";
 	export lz_arch="${ARCH}" lz_cflags_debug="-O2" lz_target="${TARGET}";
 	# Musl: build (no-complex)
 	_install=install_no_complex;
 	set_build_dir "musl-${PKG_MUSL_VERSION}" cross;
 	if ! is_build_script_done "${PKG_NAME}" fetch "${_restart_at}"; then
-		pkg_fetch "http://www.musl-libc.org/releases/musl-${PKG_MUSL_VERSION}.tar.gz"	\
+		pkg_fetch_wget "http://www.musl-libc.org/releases/musl-${PKG_MUSL_VERSION}.tar.gz"	\
 			"${PKG_MUSL_NO_COMPLEX_SHA256SUM}";
 		build_fileop rm "${PKG_BASE_DIR}/mmglue";
-		pkg_fetch -git "mmglue=${GITROOT}/mmglue";
+		pkg_fetch_git "mmglue=${DEFAULT_GITROOT}/mmglue";
 		set_build_script_done "${PKG_NAME}" fetch -extract;
 	fi;
 	if ! is_build_script_done "${PKG_NAME}" extract "${_restart_at}"; then
@@ -60,7 +60,7 @@ pkg_musl_native_all() {
 	local _install _restart_at="${1}";
 	PKG_MUSL_VERSION="${PKG_MUSL_NATIVE_VERSION}";
 	# Git clone what we need.
-	pkg_fetch -git "lazy=${GITROOT}/lazy";
+	pkg_fetch_git "lazy=${DEFAULT_GITROOT}/lazy";
 	export lz_arch="${ARCH}" lz_cflags_debug="-O2" lz_target="${TARGET}";
 	# Musl: build (full)
 	_install=install;
@@ -83,7 +83,7 @@ pkg_musl_full_all() {
 	local _install _restart_at="${1}";
 	PKG_MUSL_VERSION="${PKG_MUSL_FULL_VERSION}";
 	# Git clone what we need.
-	pkg_fetch -git "lazy=${GITROOT}/lazy";
+	pkg_fetch_git "lazy=${DEFAULT_GITROOT}/lazy";
 	export lz_arch="${ARCH}" lz_cflags_debug="-O2" lz_target="${TARGET}";
 	# Musl: build (full)
 	_install=install;
diff --git a/vars/perl.vars b/vars/perl.vars
index edfd111b..a011debb 100644
--- a/vars/perl.vars
+++ b/vars/perl.vars
@@ -2,7 +2,7 @@
 # set -o errexit -o noglob are assumed.
 #
 
-pkg_perl_extract_post() {
+pkg_perl_fetch_extract_post() {
 	local _fname_src _fname_dst _cflag;
 	(build_fileop cd "${WORKDIR}";
 	for _fname_src in $(find perl-cross -type f	\
diff --git a/vars/pkgconf_host.vars b/vars/pkgconf_host.vars
index 8f77adf7..bde06b1e 100644
--- a/vars/pkgconf_host.vars
+++ b/vars/pkgconf_host.vars
@@ -2,7 +2,7 @@
 # set -o errexit -o noglob are assumed.
 #
 
-pkg_pkgconf_host_install_post() {
+pkg_pkgconf_host_install_make_post() {
 	if [ -e "${PREFIX}/bin/${TARGET}-pkg-config" ]; then
 		build_fileop rm "${PREFIX}/bin/${TARGET}-pkg-config";
 	fi;
@@ -17,7 +17,7 @@ EOF
 	build_fileop rm "${PREFIX}/bin/pkg-config";
 };
 
-pkg_pkgconf_install_post() {
+pkg_pkgconf_install_make_post() {
 	if [ -e "${PREFIX_NATIVE}/bin/pkg-config" ]; then
 		build_fileop rm "${PREFIX_NATIVE}/bin/pkg-config";
 	fi;
diff --git a/vars/psxstub.vars b/vars/psxstub.vars
index dbdb0a24..af4bfd9f 100644
--- a/vars/psxstub.vars
+++ b/vars/psxstub.vars
@@ -2,7 +2,7 @@
 # set -o errexit -o noglob are assumed.
 #
 
-pkg_psxstub_install() {
+pkg_psxstub_install_make() {
 	if [ "${TARGET}" = i686-nt32-midipix ]	\
 	|| [ "${TARGET}" = x86_64-nt64-midipix ]; then
 		build_fileop cd "${PKG_BASE_DIR}/psxstub";
diff --git a/vars/ruby.vars b/vars/ruby.vars
index 649f619a..55ba881d 100644
--- a/vars/ruby.vars
+++ b/vars/ruby.vars
@@ -2,15 +2,15 @@
 # set -o errexit -o noglob are assumed.
 #
 
-pkg_ruby_install_pre() {
+pkg_ruby_install_make_pre() {
 	if [ ! -e rbconfig.rb.orig ]; then
 		sed -i.orig '/^\s*CONFIG\["prefix"\]\s*=.*$/s/=.*$/= ""/'	\
 			rbconfig.rb;
 	fi;
 };
 
-pkg_ruby_host_install_pre() {
-	pkg_ruby_install_pre;
+pkg_ruby_host_install_make_pre() {
+	pkg_ruby_install_make_pre;
 };
 
 # vim:filetype=sh
diff --git a/vars/vim.vars b/vars/vim.vars
new file mode 100644
index 00000000..0e0ab509
--- /dev/null
+++ b/vars/vim.vars
@@ -0,0 +1,10 @@
+#
+# set -o errexit -o noglob are assumed.
+#
+
+pkg_vim_configure_pre() {
+	build_fileop cp "${MIDIPIX_BUILD_PWD}/etc/config.cache"	\
+		"${PKG_BASE_DIR}/${PKG_SUBDIR}/src/auto";
+};
+
+# vim:filetype=sh
diff --git a/vars/xz_flavour_minipix.vars b/vars/xz_flavour_minipix.vars
index 6b2c2685..18820f1d 100644
--- a/vars/xz_flavour_minipix.vars
+++ b/vars/xz_flavour_minipix.vars
@@ -2,7 +2,7 @@
 # set -o errexit -o noglob are assumed.
 #
 
-pkg_xz_flavour_minipix_install() {
+pkg_xz_flavour_minipix_install_make() {
 	make LIBTOOL=slibtool -C src/lzmainfo install-binPROGRAMS DESTDIR=${PREFIX_MINIPIX};
 	make LIBTOOL=slibtool -C src/scripts install-nodist_binSCRIPTS DESTDIR=${PREFIX_MINIPIX};
 	make LIBTOOL=slibtool -C src/xz install-binPROGRAMS DESTDIR=${PREFIX_MINIPIX};