build.sh, {subr,vars}/*: general cleanup.

21 files changed, 107 insertions, 115 deletions

diff --git a/vars/apr.vars b/vars/apr.vars
index 055e8c30..6342e358 100644
--- a/vars/apr.vars
+++ b/vars/apr.vars
@@ -1,5 +1,5 @@
 #
-# . ./build.vars and set -o errexit -o noglob are assumed.
+# set -o errexit -o noglob are assumed.
 #
 
 pkg_apr_install_post() {
diff --git a/vars/apr_util.vars b/vars/apr_util.vars
index f6681b83..83564489 100644
--- a/vars/apr_util.vars
+++ b/vars/apr_util.vars
@@ -1,5 +1,5 @@
 #
-# . ./build.vars and set -o errexit -o noglob are assumed.
+# set -o errexit -o noglob are assumed.
 #
 
 pkg_apr_util_install_post() {
diff --git a/vars/build.vars b/vars/build.vars
index 7440b89e..ab8a7d78 100644
--- a/vars/build.vars
+++ b/vars/build.vars
@@ -40,7 +40,7 @@ fi;
 : ${BUILD_LOG_FNAME:=${PREFIX}/build.log};
 : ${BUILD_LOG_LAST_FNAME:=${PREFIX}/build.log.last};
 : ${BUILD_STATUS_IN_PROGRESS_FNAME:=${PREFIX}/BUILD_IN_PROGRESS};
-: ${BUILD_STEPS:="all:abstract disabled:always fetch:main extract:main build_dir:always patch_pre:main autoconf:main patch:main setup_env:always distclean:main configure:main clean:main build:main install:main"};
+: ${BUILD_STEPS:="all:abstract disabled:always fetch:main extract:main build_dir:always patch_pre:main autoconf:main patch:main setup_env:always distclean:optional configure:main clean:optional build:main install:main finish:always"};
 : ${CHECK_PREREQ_CMDS:="aclocal autoconf autopoint awk basename bunzip2 find flex gcc git groff gunzip install ld libtool lzma make makeinfo msgfmt nl nroff openssl paste patch python sed sha256sum sort tar tee tic tr uname wget xz"};
 : ${CHECK_PREREQ_FILES:="/usr/include/gmpxx.h /usr/include/mpc.h /usr/include/mpfr.h"};
 : ${CHECK_PREREQ_FILES_DYNAMIC:='/usr/share/groff/$(groff -v 2>/dev/null | awk '\''/^GNU groff version /{print $NF}'\'')/tmac/e.tmac'};
@@ -48,7 +48,7 @@ fi;
 : ${CHECK_PATH_VARS:="PREFIX PREFIX_NATIVE PREFIX_CROSS DLCACHEDIR WORKDIR"};
 : ${CHECK_UPDATES_SKIP:="gmp mpfr mpc binutils binutils_host pkgconf_host psxtypes pemagine dalist ntcon ntapi psxscl psxscl_strace ntctty ptycon pkgconf libevent libressl"};
 : ${CHECK_UPDATES_SHOW_NEW:=6};
-: ${CLEAR_ENV_VARS_EXCEPT:="ARG_TARBALL ARG_VERBOSE HOME PATH SHELL TERM USER"};
+: ${CLEAR_ENV_VARS_EXCEPT:="ARG_VERBOSE HOME PATH SHELL TERM USER"};
 : ${CLEAR_PREFIX_DIRS:="bin i686-nt32-midipix include lib lib64 libexec minipix native share tmp x86_64-nt64-midipix"};
 : ${DEFAULT_MAKEFLAGS_BUILD:=-j${BUILD_CPUS:=1}};
 : ${GITROOT:=git://midipix.org};
@@ -58,7 +58,7 @@ fi;
 : ${LOG_MSG_INFO_COLOUR:=93};
 : ${LOG_MSG_SUCC_COLOUR:=92};
 : ${LOG_MSG_WARN_COLOUR:=96};
-: ${PKG_BUILD_VARS:="BUILD_CMDLINE BUILD_DIR BUILD_TYPE CFLAGS_BUILD_EXTRA CFLAGS_CONFIGURE CFLAGS_CONFIGURE_EXTRA CFLAGS_INSTALL_EXTRA CONFIG_CACHE_EXTRA CONFIGURE CONFIGURE_ARGS CONFIGURE_ARGS_EXTRA DISABLED ENV_VARS_EXTRA FNAME INSTALL_FILES INSTALL_TARGET INSTALL_TARGET_EXTRA LDFLAGS_BUILD_EXTRA LDFLAGS_CONFIGURE LDFLAGS_CONFIGURE_EXTRA LDFLAGS_INSTALL_EXTRA MAKEFLAGS_BUILD MAKEFLAGS_BUILD_EXTRA MAKEFLAGS_INSTALL MAKEFLAGS_INSTALL_EXTRA NO_CLEAN NO_MAKE_BUILD NO_MAKE_INSTALL PREFIX_EXTRA SHA256SUM SLIBTOOL SUBDIR SUBDIR_CREATE TARGET URL URL_FNAME URL_TYPE URLS_GIT VERSION"};
+: ${PKG_BUILD_VARS:="BUILD_CMDLINE BUILD_DIR BUILD_STEPS BUILD_TYPE CFLAGS_BUILD_EXTRA CFLAGS_CONFIGURE CFLAGS_CONFIGURE_EXTRA CFLAGS_INSTALL_EXTRA CONFIG_CACHE_EXTRA CONFIGURE CONFIGURE_ARGS CONFIGURE_ARGS_EXTRA DISABLED ENV_VARS_EXTRA FNAME INSTALL_FILES INSTALL_TARGET INSTALL_TARGET_EXTRA LDFLAGS_BUILD_EXTRA LDFLAGS_CONFIGURE LDFLAGS_CONFIGURE_EXTRA LDFLAGS_INSTALL_EXTRA MAKEFLAGS_BUILD MAKEFLAGS_BUILD_EXTRA MAKEFLAGS_INSTALL MAKEFLAGS_INSTALL_EXTRA NO_CLEAN NO_MAKE_BUILD NO_MAKE_INSTALL PREFIX_EXTRA SHA256SUM SLIBTOOL SUBDIR SUBDIR_CREATE TARGET URL URL_FNAME URL_TYPE URLS_GIT VERSION"};
 : ${TARBALL_FNAME_PREFIX:=midipix-${ARCH}-${BUILD}.};
 : ${TARBALL_SIGN_GPG_KEY:=};
 : ${TARBALL_CROSS_FNAME_PREFIX:=midipix-${ARCH}-${BUILD}_cross.};
@@ -115,6 +115,7 @@ HOST_TOOLCHAIN_PREFIX="${PREFIX_CROSS}";
 : ${PKG_GCC_STAGE1_CROSS_X86_64_W64_MINGW32_TARGET:=x86_64-w64-mingw32};
 : ${PKG_GCC_STAGE1_VERSION:=4.6.4};
 : ${PKG_PSXSTUB_URLS_GIT:="psxstub=${GITROOT}/psxstub"};
+: ${PKG_PSXSTUB_BUILD_STEPS:="fetch:main install:main"};
 : ${PKG_PSXSTUB_SUBDIR:=psxstub};
 : ${PKG_MUSL_NO_COMPLEX_VERSION:=1.1.12};
 : ${PKG_GCC_RUNTIME_VERSION:=4.6.4};
diff --git a/vars/chainport.vars b/vars/chainport.vars
index b1c0a1be..aa82e227 100644
--- a/vars/chainport.vars
+++ b/vars/chainport.vars
@@ -1,5 +1,5 @@
 #
-# . ./build.vars and set -o errexit -o noglob are assumed.
+# set -o errexit -o noglob are assumed.
 #
 
 pkg_chainport_build() {
diff --git a/vars/check_updates.vars b/vars/check_updates.vars
index 3dc88fd0..8c923b75 100644
--- a/vars/check_updates.vars
+++ b/vars/check_updates.vars
@@ -1,5 +1,5 @@
 #
-# . ./build.vars and set -o errexit -o noglob are assumed.
+# set -o errexit -o noglob are assumed.
 #
 
 pkg_apk_tools_check_updates() {
diff --git a/vars/clang_host.vars b/vars/clang_host.vars
index 199a8633..56793f99 100644
--- a/vars/clang_host.vars
+++ b/vars/clang_host.vars
@@ -1,5 +1,5 @@
 #
-# . ./build.vars and set -o errexit -o noglob are assumed.
+# set -o errexit -o noglob are assumed.
 #
 
 pkg_clang_host_configure_pre() {
diff --git a/vars/cmake.vars b/vars/cmake.vars
index 160c8fcb..bbcfacb6 100644
--- a/vars/cmake.vars
+++ b/vars/cmake.vars
@@ -1,5 +1,5 @@
 #
-# . ./build.vars and set -o errexit -o noglob are assumed.
+# set -o errexit -o noglob are assumed.
 #
 
 pkg_cmake_configure() {
@@ -17,21 +17,22 @@ pkg_cmake_configure() {
 };
 
 pkg_cmake_build() {
+	local _prefix;
 	build_fileop rm ../cmake-${PKG_VERSION}-native-${PKG_TARGET};
 	build_fileop mkdir ../cmake-${PKG_VERSION}-native-${PKG_TARGET};
 	build_fileop cd ${WORKDIR}/cmake-${PKG_VERSION}-native-${PKG_TARGET};
 	rm -f config.cache;
 	log_msg info "Calling cmake...";
-	_pcb_prefix=${PREFIX};
+	_prefix=${PREFIX};
 	env	CFLAGS="-L${PKG_PREFIX}/lib --sysroot=${PKG_PREFIX}"		\
 		PREFIX="" cmake							\
 		-DBZIP2_INCLUDE_DIR=${PKG_PREFIX}/include			\
 		-DBZIP2_LIBRARIES=${PKG_PREFIX}/lib/libbz2.a			\
-		-DCMAKE_AR=${_pcb_prefix}/bin/${AR}				\
-		-DCMAKE_C_COMPILER=${_pcb_prefix}/bin/${CC}			\
-		-DCMAKE_CXX_COMPILER=${_pcb_prefix}/bin/${PKG_TARGET}-g++	\
+		-DCMAKE_AR=${_prefix}/bin/${AR}					\
+		-DCMAKE_C_COMPILER=${_prefix}/bin/${CC}				\
+		-DCMAKE_CXX_COMPILER=${_prefix}/bin/${PKG_TARGET}-g++		\
 		-DCMAKE_INSTALL_PREFIX=						\
-		-DCMAKE_RANLIB=${_pcb_prefix}/bin/${RANLIB}			\
+		-DCMAKE_RANLIB=${_prefix}/bin/${RANLIB}				\
 		-DCMAKE_SYSTEM_NAME=Midipix					\
 		-DCMAKE_USE_SYSTEM_BZIP2=ON					\
 		-DCMAKE_USE_SYSTEM_CURL=ON					\
@@ -53,7 +54,6 @@ pkg_cmake_build() {
 		-DZLIB_INCLUDE_DIR=${PKG_PREFIX}/include 			\
 		-DZLIB_LIBRARY=${PKG_PREFIX}/lib/libz.a				\
 			../cmake-${PKG_VERSION};
-	unset _pcb_prefix;
 	log_msg info "Calling make...";
 	make ${DEFAULT_MAKEFLAGS_BUILD};
 };
diff --git a/vars/cparser.vars b/vars/cparser.vars
index ad4559a2..253a688d 100644
--- a/vars/cparser.vars
+++ b/vars/cparser.vars
@@ -1,5 +1,5 @@
 #
-# . ./build.vars and set -o errexit -o noglob are assumed.
+# set -o errexit -o noglob are assumed.
 #
 
 pkg_cparser_configure_pre() {
diff --git a/vars/gcc.vars b/vars/gcc.vars
index 9d5f82b9..69d02b28 100644
--- a/vars/gcc.vars
+++ b/vars/gcc.vars
@@ -1,10 +1,11 @@
 #
-# . ./build.vars and set -o errexit -o noglob are assumed.
+# set -o errexit -o noglob are assumed.
 # Order: stage1, runtime, libstdcpp_v3, full, native
 # Order: stage1_x86_64_w64_mingw32, native_x86_64_w64_mingw32
 #
 
 pkgp_gcc_setup_env() {
+	local __;
 	export MAKE="make LIBTOOL=slibtool";
 	export	cbb_ldflags_for_target=--sysroot=${PKG_PREFIX}	\
 		cbb_sysroot_for_libgcc=${PKG_PREFIX}		\
@@ -63,7 +64,7 @@ pkgp_gcc_configure() {
 		--enable-threads=posix			\
 		--target=${PKG_TARGET}			\
 		--with-fpmath=sse;
-	set_build_script_done configure clean -build;
+	set_build_script_done ${PKG_NAME} configure -build;
 };
 
 pkg_gcc_stage1_cross_x86_64_w64_mingw32_all() {
@@ -75,6 +76,7 @@ pkg_gcc_stage1_native_x86_64_w64_mingw32_all() {
 };
 
 pkg_gcc_stage1_all() {
+	local __;
 	case ${PKG_NAME} in
 	gcc_stage1)
 		PKG_GCC_VERSION="${PKG_GCC_STAGE1_VERSION}";
@@ -90,12 +92,12 @@ pkg_gcc_stage1_all() {
 		;;
 	esac;
 	# GCC, stage1.
-	if ! is_build_script_done fetch; then
+	if ! is_build_script_done ${PKG_NAME} fetch; then
 		pkg_fetch -git "cbb-gcc-${PKG_GCC_VERSION}=${GITROOT}/cbb/cbb-gcc-${PKG_GCC_VERSION}";
-		set_build_script_done fetch -configure;
+		set_build_script_done ${PKG_NAME} fetch -configure;
 	fi;
 	pkgp_gcc_setup_env ${PKG_GCC_VERSION};
-	if ! is_build_script_done configure; then
+	if ! is_build_script_done ${PKG_NAME} configure; then
 		build_fileop mkdir ${PKG_PREFIX}/include;
 		[ \! -d ${PKG_PREFIX}/usr ] &&			\
 			build_fileop ln_symbolic . ${PKG_PREFIX}/usr;
@@ -128,15 +130,11 @@ pkg_gcc_stage1_all() {
 	else
 		build_fileop cd ${PKG_BUILD_DIR};
 	fi;
-	if ! is_build_script_done clean; then
-		make ${MAKEFLAGS} clean;
-		set_build_script_done clean -build;
-	fi;
-	if ! is_build_script_done build; then
+	if ! is_build_script_done ${PKG_NAME} build; then
 		make ${MAKEFLAGS} all-gcc;
-		set_build_script_done build -install;
+		set_build_script_done ${PKG_NAME} build -install;
 	fi;
-	if ! is_build_script_done install; then
+	if ! is_build_script_done ${PKG_NAME} install; then
 		case ${PKG_NAME} in
 		gcc_stage1)
 			make ${MAKEFLAGS} install-gcc; ;;
@@ -150,8 +148,9 @@ pkg_gcc_stage1_all() {
 			build_fileop ln_symbolic ${PREFIX}/libexec/gcc/${PKG_TARGET}/${PKG_GCC_VERSION}/liblto_plugin.dll.a	\
 				build_fileop ln_symbolic ${PREFIX}/libexec/gcc/${PKG_TARGET}/${PKG_GCC_VERSION}/liblto_plugin.so;
 		fi;
-		set_build_script_done install finish;
+		set_build_script_done ${PKG_NAME} install finish;
 	fi;
+	exit 0;
 };
 
 pkg_gcc_runtime_all() {
@@ -159,14 +158,15 @@ pkg_gcc_runtime_all() {
 	set_build_dir cbb-gcc-${PKG_GCC_RUNTIME_VERSION} cross;
 	build_fileop cd ${PKG_BUILD_DIR};
 	# GCC, compiler runtime.
-	if ! is_build_script_done build; then
+	if ! is_build_script_done ${PKG_NAME} build; then
 		make ${MAKEFLAGS} all-target-libgcc;
-		set_build_script_done build -install;
+		set_build_script_done ${PKG_NAME} build -install;
 	fi;
-	if ! is_build_script_done install; then
+	if ! is_build_script_done ${PKG_NAME} install; then
 		make ${MAKEFLAGS} install-target-libgcc;
-		set_build_script_done install finish;
+		set_build_script_done ${PKG_NAME} install finish;
 	fi;
+	exit 0;
 };
 
 pkg_gcc_libstdcpp_v3_all() {
@@ -174,14 +174,15 @@ pkg_gcc_libstdcpp_v3_all() {
 	set_build_dir cbb-gcc-${PKG_GCC_LIBSTDCPP_V3_VERSION} cross;
 	build_fileop cd ${PKG_BUILD_DIR};
 	# GCC, libstdc++-v3.
-	if ! is_build_script_done build; then
+	if ! is_build_script_done ${PKG_NAME} build; then
 		make ${MAKEFLAGS} all-target-libstdc++-v3;
-		set_build_script_done build -install;
+		set_build_script_done ${PKG_NAME} build -install;
 	fi;
-	if ! is_build_script_done install; then
+	if ! is_build_script_done ${PKG_NAME} install; then
 		make ${MAKEFLAGS} install-target-libstdc++-v3;
-		set_build_script_done install finish;
+		set_build_script_done ${PKG_NAME} install finish;
 	fi;
+	exit 0;
 };
 
 pkg_gcc_full_all() {
@@ -189,14 +190,15 @@ pkg_gcc_full_all() {
 	set_build_dir cbb-gcc-${PKG_GCC_FULL_VERSION} cross;
 	build_fileop cd ${PKG_BUILD_DIR};
 	# GCC, everything else.
-	if ! is_build_script_done build; then
+	if ! is_build_script_done ${PKG_NAME} build; then
 		make ${MAKEFLAGS};
-		set_build_script_done build -install;
+		set_build_script_done ${PKG_NAME} build -install;
 	fi;
-	if ! is_build_script_done install; then
+	if ! is_build_script_done ${PKG_NAME} install; then
 		make ${MAKEFLAGS} install;
-		set_build_script_done install finish;
+		set_build_script_done ${PKG_NAME} install finish;
 	fi;
+	exit 0;
 };
 
 pkg_gcc_native_all() {
@@ -205,7 +207,7 @@ pkg_gcc_native_all() {
 	# GCC, native.
 	set_build_dir cbb-gcc-${PKG_GCC_VERSION} native;
 	pkgp_gcc_setup_env ${PKG_GCC_VERSION};
-	if ! is_build_script_done configure; then
+	if ! is_build_script_done ${PKG_NAME} configure; then
 		build_fileop mkdir ${PKG_PREFIX}/${PKG_TARGET};
 		if [ \! -d ${PKG_PREFIX}/${PKG_TARGET}/usr ]; then
 			build_fileop ln_symbolic . ${PKG_PREFIX}/${PKG_TARGET}/usr;
@@ -227,21 +229,18 @@ pkg_gcc_native_all() {
 	else
 		build_fileop cd ${PKG_BUILD_DIR};
 	fi;
-	if ! is_build_script_done clean; then
-		make ${MAKEFLAGS} clean;
-		set_build_script_done clean -build;
-	fi;
-	if ! is_build_script_done build; then
+	if ! is_build_script_done ${PKG_NAME} build; then
 		make ${MAKEFLAGS} all-gcc;
 		make ${MAKEFLAGS} all-target-libgcc;
 		make ${MAKEFLAGS} all-target-libstdc++-v3;
 		make ${MAKEFLAGS} all;
-		set_build_script_done build -install;
+		set_build_script_done ${PKG_NAME} build -install;
 	fi;
-	if ! is_build_script_done install; then
+	if ! is_build_script_done ${PKG_NAME} install; then
 		make ${MAKEFLAGS} DESTDIR=${PKG_PREFIX} install;
-		set_build_script_done install finish;
+		set_build_script_done ${PKG_NAME} install finish;
 	fi;
+	exit 0;
 };
 
 # vim:filetype=sh
diff --git a/vars/git.vars b/vars/git.vars
index 3948b910..d9d9a4be 100644
--- a/vars/git.vars
+++ b/vars/git.vars
@@ -1,12 +1,13 @@
 #
-# . ./build.vars and set -o errexit -o noglob are assumed.
+# set -o errexit -o noglob are assumed.
 #
 
 pkg_git_install_post() {
+	local __ _new;
 	for __ in $(find ${PKG_PREFIX}/share/man -name Git*::* -type f); do
-		__new="$(echo ${__} | sed "s/::/./g")";
-		echo mv -f ${__} ${__new};
-		mv -f ${__} ${__new};
+		_new="$(echo ${__} | sed "s/::/./g")";
+		echo mv -f ${__} ${_new};
+		mv -f ${__} ${_new};
 	done;
 };
 
diff --git a/vars/libfirm.vars b/vars/libfirm.vars
index b41a53d2..c9f2f33f 100644
--- a/vars/libfirm.vars
+++ b/vars/libfirm.vars
@@ -1,5 +1,5 @@
 #
-# . ./build.vars and set -o errexit -o noglob are assumed.
+# set -o errexit -o noglob are assumed.
 #
 
 pkg_libfirm_configure_pre() {
diff --git a/vars/libxml2.vars b/vars/libxml2.vars
index f3264801..4d4f2696 100644
--- a/vars/libxml2.vars
+++ b/vars/libxml2.vars
@@ -1,5 +1,5 @@
 #
-# . ./build.vars and set -o errexit -o noglob are assumed.
+# set -o errexit -o noglob are assumed.
 #
 
 pkg_libxml2_install_post() {
diff --git a/vars/llvm_host.vars b/vars/llvm_host.vars
index 87341150..c13d31d3 100644
--- a/vars/llvm_host.vars
+++ b/vars/llvm_host.vars
@@ -1,5 +1,5 @@
 #
-# . ./build.vars and set -o errexit -o noglob are assumed.
+# set -o errexit -o noglob are assumed.
 #
 
 pkg_llvm_host_configure() {
diff --git a/vars/mingw_w64.vars b/vars/mingw_w64.vars
index 69b42868..0fd445c6 100644
--- a/vars/mingw_w64.vars
+++ b/vars/mingw_w64.vars
@@ -1,8 +1,9 @@
 #
-# . ./build.vars and set -o errexit -o noglob are assumed.
+# set -o errexit -o noglob are assumed.
 #
 
 pkg_mingw_w64_configure() {
+	local _configure_args;
 	if [ "${ARCH}" = nt32 ]; then
 		_configure_args="--host=i686-nt32-midipix";
 	else
diff --git a/vars/musl.vars b/vars/musl.vars
index ed7444f4..1c50fc74 100644
--- a/vars/musl.vars
+++ b/vars/musl.vars
@@ -1,5 +1,5 @@
 #
-# . ./build.vars and set -o errexit -o noglob are assumed.
+# set -o errexit -o noglob are assumed.
 # Order: no_complex, native, full
 #
 
@@ -20,6 +20,7 @@ pkgp_musl_configure() {
 };
 
 pkg_musl_no_complex_all() {
+	local _install;
 	PKG_MUSL_VERSION="${PKG_MUSL_NO_COMPLEX_VERSION}";
 	# Git clone what we need.
 	pkg_fetch -git "lazy=${GITROOT}/lazy";
@@ -27,37 +28,35 @@ pkg_musl_no_complex_all() {
 	# Musl: build (no-complex)
 	_install=install_no_complex;
 	set_build_dir musl-${PKG_MUSL_VERSION}-${2} cross;
-	if ! is_build_script_done fetch; then
+	if ! is_build_script_done ${PKG_NAME} fetch; then
 		pkg_fetch http://www.musl-libc.org/releases/musl-${PKG_MUSL_VERSION}.tar.gz	\
 			${PKG_MUSL_NO_COMPLEX_SHA256SUM};
 		build_fileop rm mmglue;
 		pkg_fetch -git "mmglue=${GITROOT}/mmglue";
-		set_build_script_done fetch -extract;
+		set_build_script_done ${PKG_NAME} fetch -extract;
 	fi;
-	if ! is_build_script_done extract; then
+	if ! is_build_script_done ${PKG_NAME} extract; then
 		build_fileop rm musl-${PKG_MUSL_VERSION};
 		tar -xf ${DLCACHEDIR}/musl-${PKG_MUSL_VERSION}.tar.gz;
 		set +o noglob; build_fileop cp mmglue/* musl-${PKG_MUSL_VERSION}/; set -o noglob;
-		set_build_script_done extract -configure;
+		set_build_script_done ${PKG_NAME} extract -configure;
 	fi;
-	if ! is_build_script_done configure; then
+	if ! is_build_script_done ${PKG_NAME} configure; then
 		pkgp_musl_configure;
-		set_build_script_done configure clean -build;
+		set_build_script_done ${PKG_NAME} configure -build;
 	else
 		build_fileop cd ${PKG_BUILD_DIR};
 	fi;
-	if ! is_build_script_done clean; then
-		make ${MAKEFLAGS} clean;
-		set_build_script_done clean -build;
-	fi;
-	if ! is_build_script_done build; then
+	if ! is_build_script_done ${PKG_NAME} build; then
 		./lazy	-e ${_install}			\
 			-x build;
-		set_build_script_done build finish;
+		set_build_script_done ${PKG_NAME} build finish;
 	fi;
+	exit 0;
 };
 
 pkg_musl_native_all() {
+	local _install;
 	PKG_MUSL_VERSION="${PKG_MUSL_NATIVE_VERSION}";
 	# Git clone what we need.
 	pkg_fetch -git "lazy=${GITROOT}/lazy";
@@ -65,25 +64,23 @@ pkg_musl_native_all() {
 	# Musl: build (full)
 	_install=install;
 	set_build_dir musl-${PKG_MUSL_VERSION} native;
-	if ! is_build_script_done configure; then
+	if ! is_build_script_done ${PKG_NAME} configure; then
 		pkgp_musl_configure;
-		set_build_script_done configure clean -build;
+		set_build_script_done ${PKG_NAME} configure -build;
 	else
 		build_fileop cd ${PKG_BUILD_DIR};
 	fi;
-	if ! is_build_script_done clean; then
-		make ${MAKEFLAGS} clean;
-		set_build_script_done clean -build;
-	fi;
-	if ! is_build_script_done build; then
+	if ! is_build_script_done ${PKG_NAME} build; then
 		./lazy	-e ${_install}			\
 			-x build;
 		build_fileop ln_symbolic ../lib/libc.so ${PKG_PREFIX}/bin/ldd;
-		set_build_script_done build finish;
+		set_build_script_done ${PKG_NAME} build finish;
 	fi;
+	exit 0;
 };
 
 pkg_musl_full_all() {
+	local _install;
 	PKG_MUSL_VERSION="${PKG_MUSL_FULL_VERSION}";
 	# Git clone what we need.
 	pkg_fetch -git "lazy=${GITROOT}/lazy";
@@ -91,21 +88,18 @@ pkg_musl_full_all() {
 	# Musl: build (full)
 	_install=install;
 	set_build_dir musl-${PKG_MUSL_VERSION} cross;
-	if ! is_build_script_done configure; then
+	if ! is_build_script_done ${PKG_NAME} configure; then
 		pkgp_musl_configure;
-		set_build_script_done configure clean -build;
+		set_build_script_done ${PKG_NAME} configure -build;
 	else
 		build_fileop cd ${PKG_BUILD_DIR};
 	fi;
-	if ! is_build_script_done clean; then
-		make ${MAKEFLAGS} clean;
-		set_build_script_done clean -build;
-	fi;
-	if ! is_build_script_done build; then
+	if ! is_build_script_done ${PKG_NAME} build; then
 		./lazy	-e ${_install}			\
 			-x build;
-		set_build_script_done build finish;
+		set_build_script_done ${PKG_NAME} build finish;
 	fi;
+	exit 0;
 };
 
 # vim:filetype=sh
diff --git a/vars/ncursesw.vars b/vars/ncursesw.vars
index 03118da0..4f404091 100644
--- a/vars/ncursesw.vars
+++ b/vars/ncursesw.vars
@@ -1,8 +1,9 @@
 #
-# . ./build.vars and set -o errexit -o noglob are assumed.
+# set -o errexit -o noglob are assumed.
 #
 
 pkg_ncursesw_install_post() {
+	local __;
 	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			\
diff --git a/vars/nginx.vars b/vars/nginx.vars
index 154c73b4..09cb2012 100644
--- a/vars/nginx.vars
+++ b/vars/nginx.vars
@@ -1,12 +1,11 @@
 #
-# . ./build.vars and set -o errexit -o noglob are assumed.
+# set -o errexit -o noglob are assumed.
 #
 
 pkg_nginx_configure() {
 	export CFLAGS="${PKG_CFLAGS_CONFIGURE} -I${PKG_PREFIX}/include -pipe -W -Wall -Wpointer-arith -Wno-unused-parameter -Werror";
 	export LDFLAGS="${PKG_LDFLAGS_CONFIGURE} -L${PKG_PREFIX}/lib";
 	build_fileop mkdir objs/src objs/src/core objs/src/event objs/src/event/modules objs/src/http objs/src/http/modules objs/src/os/unix;
-	set_build_script_done configure clean -build;
 };
 
 # vim:filetype=sh
diff --git a/vars/perl.vars b/vars/perl.vars
index 3d021fa0..486975b7 100644
--- a/vars/perl.vars
+++ b/vars/perl.vars
@@ -1,23 +1,23 @@
 #
-# . ./build.vars and set -o errexit -o noglob are assumed.
+# set -o errexit -o noglob are assumed.
 #
 
 pkg_perl_extract_post() {
-	for _ppep_fname_src in $(find perl-cross -type f	\
+	local _fname_src _fname_dst _cflag;
+	for _fname_src in $(find perl-cross -type f	\
 			-not -path perl-cross/.git/\* -not -name .gitignore); do
-		_ppep_fname_dst=perl-${PKG_VERSION}${_ppep_fname_src#perl-cross};
-		if [ -f ${_ppep_fname_dst} ]; then
-			mv -- ${_ppep_fname_dst} ${_ppep_fname_dst}.orig;
+		_fname_dst=perl-${PKG_VERSION}${_fname_src#perl-cross};
+		if [ -f ${_fname_dst} ]; then
+			mv -- ${_fname_dst} ${_fname_dst}.orig;
 		fi;
-		if [ ! -d "$(dirname ${_ppep_fname_dst})" ]; then
-			mkdir -p -- $(dirname ${_ppep_fname_dst});
+		if [ ! -d "$(dirname ${_fname_dst})" ]; then
+			mkdir -p -- $(dirname ${_fname_dst});
 		fi;
-		build_fileop cp ${_ppep_fname_src} ${_ppep_fname_dst};
+		build_fileop cp ${_fname_src} ${_fname_dst};
 	done;
-	for _ppep_cflag in ${PKG_CFLAGS_CONFIGURE}; do
-		PKG_CONFIGURE_ARGS="${PKG_CONFIGURE_ARGS:+${PKG_CONFIGURE_ARGS} }-A ccflags=${_ppep_cflag}";
+	for _cflag in ${PKG_CFLAGS_CONFIGURE}; do
+		PKG_CONFIGURE_ARGS="${PKG_CONFIGURE_ARGS:+${PKG_CONFIGURE_ARGS} }-A ccflags=${_cflag}";
 	done;
-	unset _ppep_fname_src _ppep_fname_dst _ppep_cflag;
 };
 
 # vim:filetype=sh
diff --git a/vars/pkgconf_host.vars b/vars/pkgconf_host.vars
index 3435a2c0..ee07fc70 100644
--- a/vars/pkgconf_host.vars
+++ b/vars/pkgconf_host.vars
@@ -1,5 +1,5 @@
 #
-# . ./build.vars and set -o errexit -o noglob are assumed.
+# set -o errexit -o noglob are assumed.
 #
 
 pkg_pkgconf_host_install_post() {
diff --git a/vars/psxstub.vars b/vars/psxstub.vars
index a476bd15..fcf018cd 100644
--- a/vars/psxstub.vars
+++ b/vars/psxstub.vars
@@ -1,18 +1,14 @@
 #
-# . ./build.vars and set -o errexit -o noglob are assumed.
+# set -o errexit -o noglob are assumed.
 #
 
-pkg_psxstub_all() {
-	pkg_fetch;
-	if ! is_build_script_done install; then
-		if [ "${TARGET}" = i686-nt32-midipix ]	\
-		|| [ "${TARGET}" = x86_64-nt64-midipix ]; then
-			build_fileop cd psxstub;
-			make ${MAKEFLAGS} DESTDIR=${PKG_PREFIX} TARGET=${TARGET} install;
-			if [ -e ${PKG_PREFIX}/lib/libpsxscl.a ]; then
-				build_fileop rm ${PKG_PREFIX}/lib/libpsxscl.a;
-			fi;
-			set_build_script_done install finish;
+pkg_psxstub_install() {
+	if [ "${TARGET}" = i686-nt32-midipix ]	\
+	|| [ "${TARGET}" = x86_64-nt64-midipix ]; then
+		build_fileop cd psxstub;
+		make ${MAKEFLAGS} DESTDIR=${PKG_PREFIX} TARGET=${TARGET} install;
+		if [ -e ${PKG_PREFIX}/lib/libpsxscl.a ]; then
+			build_fileop rm ${PKG_PREFIX}/lib/libpsxscl.a;
 		fi;
 	fi;
 };
diff --git a/vars/python3.vars b/vars/python3.vars
index 1c0d8d71..2077d53e 100644
--- a/vars/python3.vars
+++ b/vars/python3.vars
@@ -1,5 +1,5 @@
 #
-# . ./build.vars and set -o errexit -o noglob are assumed.
+# set -o errexit -o noglob are assumed.
 #
 
 pkg_python3_configure_pre() {