Replaced _PKG_SILENT and _PKG_DEBUG with RUN.

7 files changed, 23 insertions, 25 deletions

diff --git a/mk/configure/cmake.mk b/mk/configure/cmake.mk
index 7e87d77dcec..509b0aa3724 100644
--- a/mk/configure/cmake.mk
+++ b/mk/configure/cmake.mk
@@ -1,4 +1,4 @@
-# $NetBSD: cmake.mk,v 1.2 2007/12/18 10:18:39 markd Exp $
+# $NetBSD: cmake.mk,v 1.3 2008/02/07 21:36:13 rillig Exp $
 
 _CMAKE_DIR=	${BUILDLINK_DIR}/cmake-Modules
 
@@ -26,9 +26,7 @@ do-configure-pre-hook: cmake-copy-module-tree
 
 .PHONY: cmake-copy-module-tree
 cmake-copy-module-tree:
-	${_PKG_SILENT}${_PKG_DEBUG}set -e;				\
-        cd ${PKGSRCDIR}/mk; ${CP} -R cmake-Modules ${_CMAKE_DIR}
-	
+	${RUN} cd ${PKGSRCDIR}/mk; ${CP} -R cmake-Modules ${_CMAKE_DIR}
 
 ######################################################################
 ### cmake-dependencies-rewrite (PRIVATE)
@@ -47,7 +45,7 @@ do-configure-post-hook: cmake-dependencies-rewrite
 cmake-dependencies-rewrite:
 	@${STEP_MSG} "Rewrite cmake Dependencies files"
 .if defined(CMAKE_DEPENDENCIES_REWRITE) && !empty(CMAKE_DEPENDENCIES_REWRITE)
-	${_PKG_SILENT}${_PKG_DEBUG}set -e;				\
+	${RUN} \
 	cd ${WRKSRC};							\
 	for file in ${CMAKE_DEPENDENCIES_REWRITE}; do			\
 		${TEST} -f "$$file" || continue;			\
diff --git a/mk/configure/config-override.mk b/mk/configure/config-override.mk
index d3f4dee31ae..e3ee5286977 100644
--- a/mk/configure/config-override.mk
+++ b/mk/configure/config-override.mk
@@ -1,4 +1,4 @@
-# $NetBSD: config-override.mk,v 1.5 2006/11/05 12:40:01 rillig Exp $
+# $NetBSD: config-override.mk,v 1.6 2008/02/07 21:36:13 rillig Exp $
 
 ######################################################################
 ### config-{guess,sub,rpath}-override (PRIVATE)
@@ -30,14 +30,14 @@ _SCRIPT.config-${_sub_}-override=					\
 config-${_sub_}-override:
 	@${STEP_MSG} "Replacing config-${_sub_} with pkgsrc versions"
 .  if defined(${_OVERRIDE_VAR.${_sub_}}) && !empty(${_OVERRIDE_VAR.${_sub_}})
-	${_PKG_SILENT}${_PKG_DEBUG}set -e;				\
+	${RUN} \
 	cd ${WRKSRC};							\
 	for file in ${${_OVERRIDE_VAR.${_sub_}}}; do			\
 		[ -f "$$file" ] || [ -h "$$file" ] || continue;		\
 		${_SCRIPT.${.TARGET}};					\
 	done
 .  else
-	${_PKG_SILENT}${_PKG_DEBUG}set -e;				\
+	${RUN} \
 	cd ${WRKSRC};							\
 	depth=0; pattern=config.${_sub_};				\
 	while [ $$depth -le ${OVERRIDE_DIRDEPTH.config-${_sub_}} ]; do	\
diff --git a/mk/configure/configure.mk b/mk/configure/configure.mk
index 71115545107..f0297ec5871 100644
--- a/mk/configure/configure.mk
+++ b/mk/configure/configure.mk
@@ -1,4 +1,4 @@
-# $NetBSD: configure.mk,v 1.22 2008/01/04 01:46:26 rillig Exp $
+# $NetBSD: configure.mk,v 1.23 2008/02/07 21:36:13 rillig Exp $
 #
 # = Package-settable variables =
 #
@@ -203,7 +203,7 @@ _CONFIGURE_SCRIPT_ENV+=	${CONFIGURE_ENV}
 .PHONY: do-configure-script
 do-configure-script:
 .for _dir_ in ${CONFIGURE_DIRS}
-	${_PKG_SILENT}${_PKG_DEBUG}${_ULIMIT_CMD}			\
+	${RUN}${_ULIMIT_CMD}						\
 	cd ${WRKSRC} && cd ${_dir_} &&					\
 	${SETENV} ${_CONFIGURE_SCRIPT_ENV}				\
 		${CONFIG_SHELL} ${CONFIG_SHELL_FLAGS}			\
@@ -222,7 +222,7 @@ _CONFIGURE_IMAKE_ENV+=	${SCRIPTS_ENV}
 .PHONY: do-configure-imake
 do-configure-imake:
 .for _dir_ in ${CONFIGURE_DIRS}
-	${_PKG_SILENT}${_PKG_DEBUG}					\
+	${RUN}								\
 	cd ${WRKSRC} && cd ${_dir_} &&					\
 	${SETENV} ${_CONFIGURE_IMAKE_ENV} ${XMKMF}
 .endfor
@@ -240,7 +240,7 @@ _CONFIGURE_CMAKE_ENV+=	${CONFIGURE_ENV}
 .PHONY: do-configure-cmake
 do-configure-cmake:
 .for _dir_ in ${CONFIGURE_DIRS}
-	${_PKG_SILENT}${_PKG_DEBUG}${_ULIMIT_CMD}			\
+	${RUN}${_ULIMIT_CMD}						\
 	cd ${WRKSRC} && cd ${_dir_} &&					\
 	${SETENV} ${_CONFIGURE_CMAKE_ENV}				\
 		cmake ${CMAKE_ARGS} ${CMAKE_ARG_PATH}
diff --git a/mk/configure/gnu-configure.mk b/mk/configure/gnu-configure.mk
index 0853673e090..8386c7e7812 100644
--- a/mk/configure/gnu-configure.mk
+++ b/mk/configure/gnu-configure.mk
@@ -1,4 +1,4 @@
-# $NetBSD: gnu-configure.mk,v 1.6 2007/08/01 16:14:17 joerg Exp $
+# $NetBSD: gnu-configure.mk,v 1.7 2008/02/07 21:36:13 rillig Exp $
 
 _VARGROUPS+=			gnu-configure
 _USER_VARS.gnu-configure=	# none
@@ -89,14 +89,14 @@ configure-scripts-override:
 	@${STEP_MSG} "Modifying GNU configure scripts to avoid --recheck"
 .if defined(CONFIGURE_SCRIPTS_OVERRIDE) && !empty(CONFIGURE_SCRIPTS_OVERRIDE)
 	@echo HERE
-	${_PKG_SILENT}${_PKG_DEBUG}set -e;				\
+	${RUN} \
 	cd ${WRKSRC};							\
 	for file in ${CONFIGURE_SCRIPTS_OVERRIDE}; do			\
 		${TEST} -f "$$file" || continue;			\
 		${_SCRIPT.${.TARGET}};					\
 	done
 .else
-	${_PKG_SILENT}${_PKG_DEBUG}set -e;				\
+	${RUN} \
 	cd ${WRKSRC};							\
 	depth=0; pattern=${CONFIGURE_SCRIPT:T};				\
 	while ${TEST} $$depth -le ${OVERRIDE_DIRDEPTH.configure}; do	\
diff --git a/mk/configure/install-sh-override.mk b/mk/configure/install-sh-override.mk
index dde7e0a42d0..1564aae0602 100644
--- a/mk/configure/install-sh-override.mk
+++ b/mk/configure/install-sh-override.mk
@@ -1,4 +1,4 @@
-# $NetBSD: install-sh-override.mk,v 1.1 2007/07/12 18:59:15 jlam Exp $
+# $NetBSD: install-sh-override.mk,v 1.2 2008/02/07 21:36:13 rillig Exp $
 
 ######################################################################
 ### install-sh-override (PRIVATE)
@@ -22,7 +22,7 @@ _SCRIPT.install-sh-override=						\
 install-sh-override:
 	@${STEP_MSG} "Replacing install-sh with pkgsrc version"
 .if defined(INSTALL_SH_OVERRIDE) && !empty(INSTALL_SH_OVERRIDE)
-	${_PKG_SILENT}${_PKG_DEBUG}set -e;				\
+	${RUN} \
 	cd ${WRKSRC};							\
 	set -- dummy ${INSTALL_SH_OVERRIDE}; shift;			\
 	while [ $$# -gt 0 ]; do						\
@@ -31,7 +31,7 @@ install-sh-override:
 		${_SCRIPT.${.TARGET}};					\
 	done
 .else
-	${_PKG_SILENT}${_PKG_DEBUG}set -e;				\
+	${RUN} \
 	cd ${WRKSRC};							\
 	depth=0; pattern=install-sh;					\
 	while [ $$depth -le ${OVERRIDE_DIRDEPTH.install-sh} ]; do	\
diff --git a/mk/configure/libtool-override.mk b/mk/configure/libtool-override.mk
index 8696673938b..5519d7f0246 100644
--- a/mk/configure/libtool-override.mk
+++ b/mk/configure/libtool-override.mk
@@ -1,4 +1,4 @@
-# $NetBSD: libtool-override.mk,v 1.9 2006/11/05 12:40:01 rillig Exp $
+# $NetBSD: libtool-override.mk,v 1.10 2008/02/07 21:36:13 rillig Exp $
 
 ######################################################################
 ### {libtool,shlibtool}-override (PRIVATE)
@@ -29,7 +29,7 @@ _SCRIPT.${_script_}-override=						\
 libtool-override:
 	@${STEP_MSG} "Modifying libtool scripts to use pkgsrc libtool"
 .if defined(LIBTOOL_OVERRIDE)
-	${_PKG_SILENT}${_PKG_DEBUG}set -e;				\
+	${RUN} \
 	cd ${WRKSRC};							\
 	set -- dummy ${LIBTOOL_OVERRIDE}; shift;			\
 	while [ $$# -gt 0 ]; do						\
@@ -38,7 +38,7 @@ libtool-override:
 		${_SCRIPT.${.TARGET}};					\
 	done
 .else
-	${_PKG_SILENT}${_PKG_DEBUG}set -e;				\
+	${RUN} \
 	cd ${WRKSRC};							\
 	depth=0; pattern=libtool;					\
 	while [ $$depth -le ${OVERRIDE_DIRDEPTH.libtool} ]; do		\
@@ -54,7 +54,7 @@ libtool-override:
 shlibtool-override:
 	@${STEP_MSG} "Modifying libtool scripts to use pkgsrc shlibtool"
 .if defined(SHLIBTOOL_OVERRIDE) && !empty(SHLIBTOOL_OVERRIDE)
-	${_PKG_SILENT}${_PKG_DEBUG}set -e;				\
+	${RUN} \
 	cd ${WRKSRC};							\
 	set -- dummy ${SHLIBTOOL_OVERRIDE}; shift;			\
 	while [ $$# -gt 0 ]; do						\
@@ -63,7 +63,7 @@ shlibtool-override:
 		${_SCRIPT.${.TARGET}};					\
 	done
 .else
-	${_PKG_SILENT}${_PKG_DEBUG}set -e;				\
+	${RUN} \
 	cd ${WRKSRC};							\
 	depth=0; pattern=libtool;					\
 	while [ $$depth -le ${OVERRIDE_DIRDEPTH.shlibtool} ]; do	\
diff --git a/mk/configure/replace-interpreter.mk b/mk/configure/replace-interpreter.mk
index 76eebb4384a..a43dfd22887 100644
--- a/mk/configure/replace-interpreter.mk
+++ b/mk/configure/replace-interpreter.mk
@@ -1,4 +1,4 @@
-# $NetBSD: replace-interpreter.mk,v 1.8 2007/11/28 08:48:11 rillig Exp $
+# $NetBSD: replace-interpreter.mk,v 1.9 2008/02/07 21:36:13 rillig Exp $
 
 # This file provides common templates for replacing #! interpreters
 # in script files.
@@ -87,7 +87,7 @@ replace-interpreter:
 .for _lang_ in ${REPLACE_INTERPRETER}
 .  if defined(REPLACE_FILES.${_lang_}) && !empty(REPLACE_FILES.${_lang_}:M*)
 	@${STEP_MSG} "Replacing ${_lang_:S/^sys-//} interpreter in "${REPLACE_FILES.${_lang_}:M*:Q}"."
-	${_PKG_SILENT}${_PKG_DEBUG} set -eu;				\
+	${RUN} set -u; \
 	cd ${WRKSRC};							\
 	for f in ${REPLACE_FILES.${_lang_}}; do				\
 		if [ -f "$${f}" ]; then					\