From 36ab9378686ad6f3783f26696615e33e170e235f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucio=20Andr=C3=A9s=20Illanes=20Albornoz=20=28arab=2C=20vx?=
 =?UTF-8?q?p=29?= <l.illanes@gmx.de>
Date: Mon, 6 Feb 2017 00:55:02 +0100
Subject: build.sh, {subr,vars}/*: general cleanup.

---
 subr/build.subr         | 14 ++++++++++----
 subr/pkg_configure.subr |  3 ---
 subr/pkg_extract.subr   |  3 ---
 subr/pkg_install.subr   |  3 ---
 subr/pkg_patch_pre.subr |  3 ---
 5 files changed, 10 insertions(+), 16 deletions(-)

(limited to 'subr')

diff --git a/subr/build.subr b/subr/build.subr
index e95bf44d..698a71e8 100644
--- a/subr/build.subr
+++ b/subr/build.subr
@@ -75,11 +75,17 @@ install_files() {
 };
 
 is_build_script_done() {
-	local _done_fname="${WORKDIR}/.${1}.${2}";
-	if [ -e "${_done_fname}" ]; then
-		return 0;	# Skip
+	local _done_fname="${WORKDIR}/.${1}.${2}" _restart_at="${2}";
+	if [ -z "${_restart_at}" ]; then
+		if [ -e "${_done_fname}" ]; then
+			return 0;	# Skip
+		else
+			return 1;	# Build
+		fi;
+	elif lmatch "${_restart_at}" , "${2}"; then
+		return 1;		# Build
 	else
-		return 1;	# Build
+		return 0;		# Skip
 	fi;
 };
 
diff --git a/subr/pkg_configure.subr b/subr/pkg_configure.subr
index b631a429..528d3001 100644
--- a/subr/pkg_configure.subr
+++ b/subr/pkg_configure.subr
@@ -4,9 +4,6 @@
 
 pkg_configure() {
 	if [ ${__no_autoconf:-0} -eq 0 ]; then
-		if test_cmd pkg_${PKG_NAME}_configure_pre; then
-			pkg_${PKG_NAME}_configure_pre;
-		fi;
 		CFLAGS="${PKG_CFLAGS_CONFIGURE}${PKG_CFLAGS_CONFIGURE_EXTRA:+ ${PKG_CFLAGS_CONFIGURE_EXTRA}}"\
 		LDFLAGS="${PKG_LDFLAGS_CONFIGURE}${PKG_LDFLAGS_CONFIGURE_EXTRA:+ ${PKG_LDFLAGS_CONFIGURE_EXTRA}}"\
 		${PKG_CONFIGURE}										\
diff --git a/subr/pkg_extract.subr b/subr/pkg_extract.subr
index 95c32d5d..d4766479 100644
--- a/subr/pkg_extract.subr
+++ b/subr/pkg_extract.subr
@@ -24,9 +24,6 @@ pkg_extract() {
 		else
 			tar ${PKG_SUBDIR_CREATE:+-C ${PKG_SUBDIR}} -xf ${DLCACHEDIR}/${PKG_FNAME};
 		fi;
-		if test_cmd pkg_${PKG_NAME}_extract_post; then
-			pkg_${PKG_NAME}_extract_post;
-		fi;
 	fi;
 };
 
diff --git a/subr/pkg_install.subr b/subr/pkg_install.subr
index 673dd92d..727cef8e 100644
--- a/subr/pkg_install.subr
+++ b/subr/pkg_install.subr
@@ -66,9 +66,6 @@ pkg_install() {
 				DESTDIR=${PKG_PREFIX_EXTRA};
 		fi;
 	fi;
-	if test_cmd pkg_${PKG_NAME}_install_post; then
-		pkg_${PKG_NAME}_install_post;
-	fi;
 	pkgp_install_clean_lib;
 	if [ -n "${PKG_INSTALL_FILES}" ]; then
 		(install_files -v ${PKG_PREFIX} ${PKG_INSTALL_FILES});
diff --git a/subr/pkg_patch_pre.subr b/subr/pkg_patch_pre.subr
index 566299a2..64f60f1e 100644
--- a/subr/pkg_patch_pre.subr
+++ b/subr/pkg_patch_pre.subr
@@ -14,9 +14,6 @@ pkg_patch_pre() {
 			patch -b -d ${PKG_SUBDIR} -p1 < ${__};
 		fi;
 	done;
-	if test_cmd pkg_${PKG_NAME}_patch_pre_post; then
-		pkg_${PKG_NAME}_patch_pre_post;
-	fi;
 };
 
 # vim:filetype=sh
-- 
cgit v1.2.3