Replaced _PKG_SILENT and _PKG_DEBUG with RUN.

24 files changed, 120 insertions, 122 deletions

diff --git a/mk/bsd.pkg.barrier.mk b/mk/bsd.pkg.barrier.mk
index 343f63e67b3..8347af807f2 100644
--- a/mk/bsd.pkg.barrier.mk
+++ b/mk/bsd.pkg.barrier.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.barrier.mk,v 1.15 2007/11/30 18:54:40 rillig Exp $
+# $NetBSD: bsd.pkg.barrier.mk,v 1.16 2008/02/07 21:36:13 rillig Exp $
 
 _COOKIE.barrier=	${WRKDIR}/.barrier_cookie
 
@@ -63,7 +63,7 @@ barrier: ${_BARRIER_PRE_TARGETS} ${_COOKIE.barrier}
 .  if defined(PKG_VERBOSE)
 	@${PHASE_MSG} "Invoking \`\`"${_BARRIER_CMDLINE_TARGETS:Q}"'' after barrier for ${PKGNAME}"
 .  endif
-	${_PKG_SILENT}${_PKG_DEBUG}					\
+	${RUN}					\
 	cd ${.CURDIR}							\
 	&& ${RECURSIVE_MAKE} ${MAKEFLAGS} _PKGSRC_BARRIER=yes ALLOW_VULNERABLE_PACKAGES= ${_BARRIER_CMDLINE_TARGETS} \
 	|| {								\
@@ -82,5 +82,5 @@ barrier: ${_BARRIER_PRE_TARGETS} ${_COOKIE.barrier}
 ### barrier-cookie creates the "barrier" cookie file.
 ###
 ${_COOKIE.barrier}:
-	${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${.TARGET:H}
-	${_PKG_SILENT}${_PKG_DEBUG}${ECHO} ${PKGNAME} > ${.TARGET}
+	${RUN}${MKDIR} ${.TARGET:H}
+	${RUN}${ECHO} ${PKGNAME} > ${.TARGET}
diff --git a/mk/bsd.pkg.debug.mk b/mk/bsd.pkg.debug.mk
index c34813799e7..d4b8d4c11d1 100644
--- a/mk/bsd.pkg.debug.mk
+++ b/mk/bsd.pkg.debug.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.debug.mk,v 1.20 2007/09/27 12:49:14 rillig Exp $
+# $NetBSD: bsd.pkg.debug.mk,v 1.21 2008/02/07 21:36:13 rillig Exp $
 #
 # Public targets:
 #
@@ -42,7 +42,7 @@ debug: \
 
 _show-dbginfo-file-versions:
 	@${PRINTF} "File versions:\\n"
-	${_PKG_SILENT}${_PKG_DEBUG} set -e;				\
+	${RUN} \
 	sedexpr='s,^.*\([$$]NetBSD:[^$$]*\$$\).*,\1,p';			\
 	${FIND} * -type f -print					\
 	| while read fname; do						\
@@ -73,7 +73,7 @@ _show-dbginfo-configure:
 
 _show-dbginfo-config.status:
 .if !empty(CONFIGURE_DIRS:M*)
-	${_PKG_SILENT}${_PKG_DEBUG} set -e;				\
+	${RUN} \
 	if ${TEST} -d ${WRKSRC:Q}; then cd ${WRKSRC:Q};			\
 	for cs in ${CONFIGURE_DIRS:=/config.status}; do			\
 	  if ${TEST} ! -f "$${cs}"; then continue; fi;			\
@@ -97,7 +97,7 @@ _show-dbginfo-config.status:
 
 _show-dbginfo-config.h:
 .if !empty(CONFIGURE_DIRS:M*)
-	${_PKG_SILENT}${_PKG_DEBUG} set -e;				\
+	${RUN} \
 	[ -d ${WRKSRC} ] || exit 0;					\
 	print_config_h() {						\
 	  printf "%s:\\n" "`pwd`/$$1";					\
diff --git a/mk/bsd.pkg.error.mk b/mk/bsd.pkg.error.mk
index ab76a5f03e6..504c6638daf 100644
--- a/mk/bsd.pkg.error.mk
+++ b/mk/bsd.pkg.error.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.error.mk,v 1.3 2006/10/06 19:05:43 rillig Exp $
+# $NetBSD: bsd.pkg.error.mk,v 1.4 2008/02/07 21:36:13 rillig Exp $
 
 ERROR_DIR=		${WRKDIR}/.error
 WARNING_DIR=		${WRKDIR}/.warning
@@ -14,7 +14,7 @@ DELAYED_WARNING_MSG?=	${ECHO} >> ${WARNING_DIR}/${.TARGET:T:C/^[.]*//:Q}
 
 makedirs: ${ERROR_DIR} ${WARNING_DIR} ${_ERROR_DONE_DIR} ${_WARNING_DONE_DIR}
 ${ERROR_DIR} ${WARNING_DIR} ${_ERROR_DONE_DIR} ${_WARNING_DONE_DIR}:
-	${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${.TARGET}
+	${RUN}${MKDIR} ${.TARGET}
 
 .PHONY: error-check
 
@@ -28,7 +28,7 @@ ${ERROR_DIR} ${WARNING_DIR} ${_ERROR_DONE_DIR} ${_WARNING_DONE_DIR}:
 ### directory, then the target will fail.
 ###
 error-check: .USE
-	${_PKG_SILENT}${_PKG_DEBUG}					\
+	${RUN}					\
 	${RM} -f ${WARNING_DIR}/*.tmp;					\
 	${TEST} -d ${WARNING_DIR} || exit 0;				\
 	cd ${WARNING_DIR};						\
@@ -39,7 +39,7 @@ error-check: .USE
 	${CAT} ./* | ${WARNING_CAT};					\
 	${MV} -f ./* ${_WARNING_DONE_DIR}
 
-	${_PKG_SILENT}${_PKG_DEBUG}					\
+	${RUN}					\
 	${RM} -f ${ERROR_DIR}/*.tmp;					\
 	${TEST} -d ${ERROR_DIR} || exit 0;				\
 	cd ${ERROR_DIR};						\
@@ -59,4 +59,4 @@ error-check: .USE
 ### error-clean removes the error and warning directory and files.
 ###
 error-clean:
-	${_PKG_SILENT}${_PKG_DEBUG}${RM} -fr ${ERROR_DIR} ${WARNING_DIR}
+	${RUN}${RM} -fr ${ERROR_DIR} ${WARNING_DIR}
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index 7ef3b653954..4244561da1f 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.pkg.mk,v 1.1935 2008/01/16 01:01:26 joerg Exp $
+#	$NetBSD: bsd.pkg.mk,v 1.1936 2008/02/07 21:36:13 rillig Exp $
 #
 # This file is in the public domain.
 #
@@ -805,14 +805,14 @@ PKG_ERROR_HANDLER.${_class_}?=	{					\
 #
 .for _phase_ in ${_ALL_PHASES}
 ${_MAKEVARS_MK.${_phase_}}: ${WRKDIR}
-	${_PKG_SILENT}${_PKG_DEBUG}${RM} -f ${.TARGET}.tmp
+	${RUN}${RM} -f ${.TARGET}.tmp
 .  for _var_ in ${MAKEVARS:O:u}
 .    if defined(${_var_})
-	${_PKG_SILENT}${_PKG_DEBUG}					\
+	${RUN}					\
 	${ECHO} ${_var_}"=	"${${_var_}:Q} >> ${.TARGET}.tmp
 .    endif
 .  endfor
-	${_PKG_SILENT}${_PKG_DEBUG}					\
+	${RUN}					\
 	if ${TEST} -f ${.TARGET}.tmp; then				\
 		( ${ECHO} ".if !defined(_MAKEVARS_MK)";			\
 		  ${ECHO} "_MAKEVARS_MK=	defined";		\
@@ -823,7 +823,7 @@ ${_MAKEVARS_MK.${_phase_}}: ${WRKDIR}
 		) > ${.TARGET};						\
 		${RM} -f ${.TARGET}.tmp;				\
 	fi
-	${_PKG_SILENT}${_PKG_DEBUG}${TOUCH} ${TOUCH_FLAGS} ${.TARGET}
+	${RUN}${TOUCH} ${TOUCH_FLAGS} ${.TARGET}
 .endfor
 
 .if make(pbulk-index) || make(pbulk-index-item) || make(pbulk-save-wrkdir)
diff --git a/mk/bsd.pkg.readme.mk b/mk/bsd.pkg.readme.mk
index 4260ee0f433..5da9ec52fe8 100644
--- a/mk/bsd.pkg.readme.mk
+++ b/mk/bsd.pkg.readme.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.readme.mk,v 1.16 2008/01/03 20:51:21 adrianp Exp $
+# $NetBSD: bsd.pkg.readme.mk,v 1.17 2008/02/07 21:36:13 rillig Exp $
 #
 # This Makefile fragment is included by bsd.pkg.mk and encapsulates the
 # code to produce README.html files in each package directory.
@@ -239,7 +239,7 @@ SED_HOMEPAGE_EXPR=	-e 's|%%HOMEPAGE%%||'
 #
 .PHONY: show-vulnerabilities-html
 show-vulnerabilities-html:
-	${_PKG_SILENT}${_PKG_DEBUG}					\
+	${RUN}					\
 	if ${PKG_ADMIN} pmatch 'pkg_install<20070714' pkg_install-${PKGTOOLS_VERSION}; then \
 		if [ -f ${PKGVULNDIR}/pkg-vulnerabilities ]; then	\
 			${AWK} '/^${PKGBASE}[-<>=]+[0-9]/ { gsub("\<", "\\&lt;", $$1);	\
diff --git a/mk/bsd.pkg.update.mk b/mk/bsd.pkg.update.mk
index 6775d1f8610..fa79d2f2d6a 100644
--- a/mk/bsd.pkg.update.mk
+++ b/mk/bsd.pkg.update.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.update.mk,v 1.13 2007/09/07 16:47:05 rillig Exp $
+# $NetBSD: bsd.pkg.update.mk,v 1.14 2008/02/07 21:36:13 rillig Exp $
 #
 # This Makefile fragment is included by bsd.pkg.mk and contains the targets
 # and variables for "make update".
@@ -60,7 +60,7 @@ update:
 .  endif
 .endif
 	${RUN} ${RECURSIVE_MAKE} ${MAKEFLAGS} ${UPDATE_TARGET} KEEP_WRKDIR=YES DEPENDS_TARGET=${DEPENDS_TARGET:Q}
-	${_PKG_SILENT}${_PKG_DEBUG}					\
+	${RUN}					\
 	[ ! -s ${_DDIR} ] || for dep in `${CAT} ${_DDIR}` ; do		\
 		(if cd ../.. && cd "$${dep}" ; then			\
 			${PHASE_MSG} "Installing in $${dep}" &&		\
@@ -83,7 +83,7 @@ update:
 .PHONY: clean-update
 clean-update:
 	${RUN} ${RECURSIVE_MAKE} ${MAKEFLAGS} update-create-ddir
-	${_PKG_SILENT}${_PKG_DEBUG}					\
+	${RUN}					\
 	if [ -s ${_DDIR} ] ; then					\
 		for dep in `${CAT} ${_DDIR}` ; do			\
 			(if cd ../.. && cd "$${dep}" ; then		\
diff --git a/mk/build/bsd.build.mk b/mk/build/bsd.build.mk
index c45c4689844..7a647a5ae4a 100644
--- a/mk/build/bsd.build.mk
+++ b/mk/build/bsd.build.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.build.mk,v 1.10 2008/01/04 01:46:26 rillig Exp $
+# $NetBSD: bsd.build.mk,v 1.11 2008/02/07 21:36:13 rillig Exp $
 #
 # This Makefile fragment is included by bsd.pkg.mk and provides all
 # variables and targets related to building sources for a package.
@@ -51,6 +51,6 @@ build: barrier
 ###
 .PHONY: build-cookie
 build-cookie:
-	${_PKG_SILENT}${_PKG_DEBUG}${TEST} ! -f ${_COOKIE.build} || ${FALSE}
-	${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${_COOKIE.build:H}
-	${_PKG_SILENT}${_PKG_DEBUG}${ECHO} ${PKGNAME} > ${_COOKIE.build}
+	${RUN}${TEST} ! -f ${_COOKIE.build} || ${FALSE}
+	${RUN}${MKDIR} ${_COOKIE.build:H}
+	${RUN}${ECHO} ${PKGNAME} > ${_COOKIE.build}
diff --git a/mk/build/build.mk b/mk/build/build.mk
index 5ec43257f52..37f0cd14d62 100644
--- a/mk/build/build.mk
+++ b/mk/build/build.mk
@@ -1,4 +1,4 @@
-# $NetBSD: build.mk,v 1.15 2007/12/01 11:11:54 rillig Exp $
+# $NetBSD: build.mk,v 1.16 2008/02/07 21:36:13 rillig Exp $
 #
 # This file defines what happens in the build phase, excluding the
 # self-test, which is defined in test.mk.
@@ -141,7 +141,7 @@ build-check-interactive:
 .if !target(do-build)
 do-build:
 .  for _dir_ in ${BUILD_DIRS}
-	${_PKG_SILENT}${_PKG_DEBUG}${_ULIMIT_CMD}			\
+	${RUN}${_ULIMIT_CMD}			\
 	cd ${WRKSRC} && cd ${_dir_} &&					\
 	${BUILD_MAKE_CMD} ${BUILD_TARGET}
 .  endfor
@@ -161,7 +161,7 @@ BUILD_ENV_SHELL?=	${SH}
 .if defined(_PKGSRC_BARRIER)
 build-env: .PHONY configure
 	@${STEP_MSG} "Entering the build environment for ${PKGNAME}"
-	${_PKG_SILENT}${_PKG_DEBUG}					\
+	${RUN}					\
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${BUILD_ENV_SHELL}
 .else
 build-env: barrier
diff --git a/mk/build/test.mk b/mk/build/test.mk
index a0f31ea7396..be98b5ec3c2 100644
--- a/mk/build/test.mk
+++ b/mk/build/test.mk
@@ -1,4 +1,4 @@
-# $NetBSD: test.mk,v 1.13 2007/12/01 11:11:54 rillig Exp $
+# $NetBSD: test.mk,v 1.14 2008/02/07 21:36:13 rillig Exp $
 #
 # After the "build" phase, many packages provide some sort of self-test
 # that can be run on the not-yet installed package. To enable these
@@ -129,7 +129,7 @@ test-check-interactive:
 .  if defined(TEST_TARGET) && !empty(TEST_TARGET)
 do-test:
 .    for _dir_ in ${TEST_DIRS}
-	${_PKG_SILENT}${_PKG_DEBUG}${_ULIMIT_CMD}			\
+	${RUN}${_ULIMIT_CMD}			\
 	cd ${WRKSRC} && cd ${_dir_} &&					\
 	${TEST_MAKE_CMD} ${TEST_TARGET}
 .    endfor
@@ -156,6 +156,6 @@ post-test:
 ###
 .PHONY: test-cookie
 test-cookie:
-	${_PKG_SILENT}${_PKG_DEBUG}${TEST} ! -f ${_COOKIE.test} || ${FALSE}
-	${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${_COOKIE.test:H}
-	${_PKG_SILENT}${_PKG_DEBUG}${ECHO} ${PKGNAME} > ${_COOKIE.test}
+	${RUN}${TEST} ! -f ${_COOKIE.test} || ${FALSE}
+	${RUN}${MKDIR} ${_COOKIE.test:H}
+	${RUN}${ECHO} ${PKGNAME} > ${_COOKIE.test}
diff --git a/mk/buildlink3/bsd.buildlink3.mk b/mk/buildlink3/bsd.buildlink3.mk
index eb690fa886f..a9745437894 100644
--- a/mk/buildlink3/bsd.buildlink3.mk
+++ b/mk/buildlink3/bsd.buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.buildlink3.mk,v 1.199 2007/12/05 21:36:43 tron Exp $
+# $NetBSD: bsd.buildlink3.mk,v 1.200 2008/02/07 21:36:13 rillig Exp $
 #
 # Copyright (c) 2004 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -497,14 +497,14 @@ LIBS+=		${_flag_}
 .PHONY: buildlink-directories
 do-buildlink: buildlink-directories
 buildlink-directories:
-	${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${BUILDLINK_DIR}
-	${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${BUILDLINK_BINDIR}
+	${RUN}${MKDIR} ${BUILDLINK_DIR}
+	${RUN}${MKDIR} ${BUILDLINK_BINDIR}
 .if defined(USE_X11) && ${X11_TYPE} != "modular"
-	${_PKG_SILENT}${_PKG_DEBUG}${RM} -f ${BUILDLINK_X11_DIR}
-	${_PKG_SILENT}${_PKG_DEBUG}${LN} -sf ${BUILDLINK_DIR} ${BUILDLINK_X11_DIR}
+	${RUN}${RM} -f ${BUILDLINK_X11_DIR}
+	${RUN}${LN} -sf ${BUILDLINK_DIR} ${BUILDLINK_X11_DIR}
 .endif
-	${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${BUILDLINK_DIR}/include
-	${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${BUILDLINK_DIR}/lib${LIBABISUFFIX}
+	${RUN}${MKDIR} ${BUILDLINK_DIR}/include
+	${RUN}${MKDIR} ${BUILDLINK_DIR}/lib${LIBABISUFFIX}
 
 # The following variables are all optionally defined and control which
 # package files are symlinked into ${BUILDLINK_DIR} and how their names
@@ -546,12 +546,12 @@ buildlink-${_pkg_}: ${_BLNK_TARGETS.${_pkg_}}
 
 .PHONY: buildlink-${_pkg_}-message
 buildlink-${_pkg_}-message:
-	${_PKG_SILENT}${_PKG_DEBUG}					\
+	${RUN}					\
 	${ECHO_BUILDLINK_MSG} "=> Linking ${_pkg_} files into ${BUILDLINK_DIR}."
 
 .PHONY: buildlink-${_pkg_}-cookie
 buildlink-${_pkg_}-cookie:
-	${_PKG_SILENT}${_PKG_DEBUG}					\
+	${RUN}					\
 	${TOUCH} ${TOUCH_FLAGS} ${_BLNK_COOKIE.${_pkg_}}
 
 .  if (${PKG_INSTALLATION_TYPE} == "pkgviews") &&			\
@@ -581,7 +581,7 @@ _BLNK_FILES_CMD.${_pkg_}+=	)
 _BLNK_FILES_CMD.${_pkg_}+=	| ${SORT} -u
 
 ${_BLNK_COOKIE.${_pkg_}}:
-	${_PKG_SILENT}${_PKG_DEBUG}					\
+	${RUN}					\
 	case ${BUILDLINK_PREFIX.${_pkg_}} in				\
 	*not_found)							\
 		${ERROR_MSG} "${_pkg_} is not installed; can't buildlink files."; \
@@ -1059,8 +1059,8 @@ _WRAP_EXTRA_ARGS.LIBTOOL+=	${_BLNK_LDFLAGS}
 _WRAP_EXTRA_ARGS.SHLIBTOOL+=	${_BLNK_LDFLAGS}
 
 ${WRAPPER_TMPDIR}/libtool-fix-la: ${BUILDLINK_SRCDIR}/libtool-fix-la
-	${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${.TARGET:H}
-	${_PKG_SILENT}${_PKG_DEBUG}${CAT} ${.ALLSRC}			\
+	${RUN}${MKDIR} ${.TARGET:H}
+	${RUN}${CAT} ${.ALLSRC}			\
 		| ${SED} -e "s|@_BLNK_WRAP_LT_UNTRANSFORM_SED@|"${_BLNK_WRAP_LT_UNTRANSFORM_SED:Q}"|g" \
 			 -e "s|@BUILDLINK_DIR@|${BUILDLINK_DIR}|g"	\
 			 -e "s|@DEPOTBASE@|${DEPOTBASE}|g"		\
@@ -1075,32 +1075,32 @@ ${WRAPPER_TMPDIR}/libtool-fix-la: ${BUILDLINK_SRCDIR}/libtool-fix-la
 		| ${_WRAP_SH_CRUNCH_FILTER} > ${.TARGET}
 
 ${WRAPPER_TMPDIR}/buildcmd-libtool: ${BUILDLINK_SRCDIR}/buildcmd-libtool
-	${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${.TARGET:H}
-	${_PKG_SILENT}${_PKG_DEBUG}${CAT} ${.ALLSRC}			\
+	${RUN}${MKDIR} ${.TARGET:H}
+	${RUN}${CAT} ${.ALLSRC}			\
 		| ${_WRAP_SH_CRUNCH_FILTER} > ${.TARGET}
 
 ${WRAPPER_TMPDIR}/cleanup-libtool:					\
 		${BUILDLINK_SRCDIR}/cleanup-libtool			\
 		${_BLNK_LIBTOOL_FIX_LA}
-	${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${.TARGET:H}
-	${_PKG_SILENT}${_PKG_DEBUG}					\
+	${RUN}${MKDIR} ${.TARGET:H}
+	${RUN}					\
 	${CAT} ${BUILDLINK_SRCDIR}/cleanup-libtool			\
 		| ${SED} -e "s|@_BLNK_LIBTOOL_FIX_LA@|"${_BLNK_LIBTOOL_FIX_LA:Q}"|g" \
 		| ${_WRAP_SH_CRUNCH_FILTER} > ${.TARGET}
 
 ${WRAPPER_TMPDIR}/cmd-sink-libtool: ${BUILDLINK_SRCDIR}/cmd-sink-libtool
-	${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${.TARGET:H}
-	${_PKG_SILENT}${_PKG_DEBUG}${CAT} ${.ALLSRC}			\
+	${RUN}${MKDIR} ${.TARGET:H}
+	${RUN}${CAT} ${.ALLSRC}			\
 		| ${_WRAP_SH_CRUNCH_FILTER} > ${.TARGET}
 
 ${WRAPPER_TMPDIR}/scan-libtool: ${BUILDLINK_SRCDIR}/scan-libtool
-	${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${.TARGET:H}
-	${_PKG_SILENT}${_PKG_DEBUG}${CAT} ${.ALLSRC}			\
+	${RUN}${MKDIR} ${.TARGET:H}
+	${RUN}${CAT} ${.ALLSRC}			\
 		| ${_WRAP_SH_CRUNCH_FILTER} > ${.TARGET}
 
 ${WRAPPER_TMPDIR}/transform-libtool: ${BUILDLINK_SRCDIR}/transform-libtool
-	${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${.TARGET:H}
-	${_PKG_SILENT}${_PKG_DEBUG}${CAT} ${.ALLSRC}			\
+	${RUN}${MKDIR} ${.TARGET:H}
+	${RUN}${CAT} ${.ALLSRC}			\
 		| ${SED} -e "s|@BUILDLINK_DIR@|${BUILDLINK_DIR}|g"	\
 			 -e "s|@WRKSRC@|${WRKSRC}|g"			\
 			 -e "s|@BASENAME@|"${BASENAME:Q}"|g"		\
diff --git a/mk/bulk/bsd.bulk-pkg.mk b/mk/bulk/bsd.bulk-pkg.mk
index 4ea229e46c3..4cf2e0cdafd 100644
--- a/mk/bulk/bsd.bulk-pkg.mk
+++ b/mk/bulk/bsd.bulk-pkg.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.bulk-pkg.mk,v 1.148 2008/01/04 15:49:07 rillig Exp $
+#	$NetBSD: bsd.bulk-pkg.mk,v 1.149 2008/02/07 21:36:13 rillig Exp $
 
 #
 # Copyright (c) 1999, 2000 Hubert Feyrer <hubertf@NetBSD.org>
@@ -550,7 +550,7 @@ bulk-package:
 	fi;								\
 	exit $$exitcode
 .if ${BULKFILESDIR} != ${PKGSRCDIR}
-	${_PKG_SILENT}${_PKG_DEBUG}					\
+	${RUN}					\
 	${RMDIR} ${_BULK_PKGLOGDIR:Q} 2>/dev/null 1>&2 || ${TRUE}
 .endif
 
diff --git a/mk/check/check-files.mk b/mk/check/check-files.mk
index b4e09210621..7dd5ac6a865 100644
--- a/mk/check/check-files.mk
+++ b/mk/check/check-files.mk
@@ -1,4 +1,4 @@
-# $NetBSD: check-files.mk,v 1.21 2008/01/23 14:30:59 rillig Exp $
+# $NetBSD: check-files.mk,v 1.22 2008/02/07 21:36:13 rillig Exp $
 #
 # This file checks that the list of installed files matches the PLIST.
 # For that purpose it records the file list of LOCALBASE before and
@@ -178,7 +178,7 @@ check-files-post-message:
 	@${STEP_MSG} "Generating post-install file lists"
 
 ${_CHECK_FILES_PRE.prefix} ${_CHECK_FILES_POST.prefix}:
-	${_PKG_SILENT}${_PKG_DEBUG}					\
+	${RUN}					\
 	${FIND} ${DESTDIR}${PREFIX}/. \( -type f -o -type l \) -print 2>/dev/null \
 		| ${SED} -e 's,/\./,/,'					\
 		| ${_CHECK_FILES_SKIP_FILTER}				\
@@ -186,7 +186,7 @@ ${_CHECK_FILES_PRE.prefix} ${_CHECK_FILES_POST.prefix}:
                 || ${TRUE}
 
 ${_CHECK_FILES_PRE.sysconfdir} ${_CHECK_FILES_POST.sysconfdir}:
-	${_PKG_SILENT}${_PKG_DEBUG}					\
+	${RUN}					\
 	${FIND} ${DESTDIR}${PKG_SYSCONFDIR}/. -print 2>/dev/null	\
 		| ${SED} -e 's,/\./,/,'					\
 		| ${_CHECK_FILES_SKIP_FILTER} 				\
@@ -194,7 +194,7 @@ ${_CHECK_FILES_PRE.sysconfdir} ${_CHECK_FILES_POST.sysconfdir}:
 		|| ${TRUE}
 
 ${_CHECK_FILES_PRE.varbase} ${_CHECK_FILES_POST.varbase}:
-	${_PKG_SILENT}${_PKG_DEBUG}					\
+	${RUN}					\
 	${FIND} ${DESTDIR}${VARBASE}/. -print 2>/dev/null		\
 		| ${SED} -e 's,/\./,/,'					\
 		| ${_CHECK_FILES_SKIP_FILTER} 				\
@@ -239,28 +239,28 @@ _CHECK_FILES_MISSING_REAL=	${WRKDIR}/.check_files_missing_real
 _CHECK_FILES_EXTRA=		${WRKDIR}/.check_files_extra
 
 ${_CHECK_FILES_DIFF}: ${_CHECK_FILES_PRE.prefix} ${_CHECK_FILES_POST.prefix}
-	${_PKG_SILENT}${_PKG_DEBUG}					\
+	${RUN}					\
 	${DIFF} -u ${_CHECK_FILES_PRE.prefix}				\
 		  ${_CHECK_FILES_POST.prefix}				\
 		> ${.TARGET} || ${TRUE}
 
 ${_CHECK_FILES_ADDED}: ${_CHECK_FILES_DIFF}
-	${_PKG_SILENT}${_PKG_DEBUG}					\
+	${RUN}					\
 	${GREP} '^+/' ${_CHECK_FILES_DIFF} | ${SED} "s|^+||" | ${SORT}	\
 		> ${.TARGET}
 
 ${_CHECK_FILES_DELETED}: ${_CHECK_FILES_DIFF}
-	${_PKG_SILENT}${_PKG_DEBUG}					\
+	${RUN}					\
 	${GREP} '^-/' ${_CHECK_FILES_DIFF} | ${SED} "s|^-||" | ${SORT}	\
 		> ${.TARGET}
 
 ${_CHECK_FILES_EXPECTED}: plist
-	${_PKG_SILENT}${_PKG_DEBUG}					\
+	${RUN}					\
 	${GREP} '^[^@]' ${PLIST} | ${SED} "s|^|${DESTDIR}${PREFIX}/|" | ${SORT}	\
 		> ${.TARGET}
 
 ${_CHECK_FILES_MISSING}: ${_CHECK_FILES_EXPECTED} ${_CHECK_FILES_ADDED}
-	${_PKG_SILENT}${_PKG_DEBUG}					\
+	${RUN}					\
 	${DIFF} -u ${_CHECK_FILES_EXPECTED} ${_CHECK_FILES_ADDED} |	\
 	${GREP} '^-[^-]' | ${SED} "s|^-||" |				\
 	while read file; do						\
@@ -268,21 +268,21 @@ ${_CHECK_FILES_MISSING}: ${_CHECK_FILES_EXPECTED} ${_CHECK_FILES_ADDED}
 	done > ${.TARGET}
 
 ${_CHECK_FILES_MISSING_REAL}: ${_CHECK_FILES_MISSING}
-	${_PKG_SILENT}${_PKG_DEBUG}					\
+	${RUN}					\
 	${CAT} ${_CHECK_FILES_MISSING} | ${_CHECK_FILES_SKIP_FILTER}	\
 		> ${.TARGET} || ${TRUE}
 
 ${_CHECK_FILES_MISSING_SKIP}:						\
 		${_CHECK_FILES_MISSING}					\
 		${_CHECK_FILES_MISSING_REAL}
-	${_PKG_SILENT}${_PKG_DEBUG}					\
+	${RUN}					\
 	${DIFF} -u ${_CHECK_FILES_MISSING}				\
 		   ${_CHECK_FILES_MISSING_REAL} |			\
 	${GREP} '^-[^-]' | ${SED} "s|^-||"				\
 		> ${.TARGET}
 
 ${_CHECK_FILES_EXTRA}: ${_CHECK_FILES_EXPECTED} ${_CHECK_FILES_ADDED}
-	${_PKG_SILENT}${_PKG_DEBUG}					\
+	${RUN}					\
 	${DIFF} -u  ${_CHECK_FILES_EXPECTED} ${_CHECK_FILES_ADDED} |	\
 	${GREP} '^+[^+]' | ${SED} "s|^+||" |				\
 	while read file; do						\
@@ -295,28 +295,28 @@ ${_CHECK_FILES_ERRMSG.prefix}:						\
 		${_CHECK_FILES_MISSING_REAL}				\
 		${_CHECK_FILES_MISSING_SKIP}				\
 		${_CHECK_FILES_EXTRA}
-	${_PKG_SILENT}${_PKG_DEBUG}${RM} -f ${.TARGET}
-	${_PKG_SILENT}${_PKG_DEBUG}					\
+	${RUN}${RM} -f ${.TARGET}
+	${RUN}					\
 	if ${_NONZERO_FILESIZE_P} ${_CHECK_FILES_DELETED}; then		\
 		${ECHO} "The following files have been deleted"		\
 			"from ${PREFIX}!";				\
 		${SED} "s|^|        |" ${_CHECK_FILES_DELETED};		\
 	fi >> ${.TARGET}
-	${_PKG_SILENT}${_PKG_DEBUG}					\
+	${RUN}					\
 	if ${_NONZERO_FILESIZE_P} ${_CHECK_FILES_MISSING_REAL}; then	\
 		${ECHO} "************************************************************"; \
 		${ECHO} "The following files are in the"		\
 			"PLIST but not in ${PREFIX}:";			\
 		${SED} "s|^|        |" ${_CHECK_FILES_MISSING_REAL};	\
 	fi >> ${.TARGET}
-	${_PKG_SILENT}${_PKG_DEBUG}					\
+	${RUN}					\
 	if ${_NONZERO_FILESIZE_P} ${_CHECK_FILES_EXTRA}; then		\
 		${ECHO} "************************************************************"; \
 		${ECHO} "The following files are in"			\
 			"${PREFIX} but not in the PLIST:";		\
 		${SED} "s|^|        |" ${_CHECK_FILES_EXTRA};		\
 	fi >> ${.TARGET}
-	${_PKG_SILENT}${_PKG_DEBUG}					\
+	${RUN}					\
 	if ${_NONZERO_FILESIZE_P} ${_CHECK_FILES_MISSING_SKIP}; then	\
 		${ECHO} "************************************************************"; \
 		${ECHO} "The following files are in both the"		\
@@ -330,7 +330,7 @@ ${_CHECK_FILES_ERRMSG.prefix}:						\
 ${_CHECK_FILES_ERRMSG.sysconfdir}:					\
 		${_CHECK_FILES_PRE.sysconfdir}				\
 		${_CHECK_FILES_POST.sysconfdir}
-	${_PKG_SILENT}${_PKG_DEBUG}					\
+	${RUN}					\
 	if ${CMP} -s ${_CHECK_FILES_PRE.sysconfdir}			\
 		     ${_CHECK_FILES_POST.sysconfdir}; then		\
 		${DO_NADA};						\
@@ -350,7 +350,7 @@ ${_CHECK_FILES_ERRMSG.sysconfdir}:					\
 ${_CHECK_FILES_ERRMSG.varbase}:						\
 		${_CHECK_FILES_PRE.varbase}				\
 		${_CHECK_FILES_POST.varbase}
-	${_PKG_SILENT}${_PKG_DEBUG}					\
+	${RUN}					\
 	if ${CMP} -s ${_CHECK_FILES_PRE.varbase}			\
 		       ${_CHECK_FILES_POST.varbase}; then		\
 		${DO_NADA};						\
@@ -371,7 +371,7 @@ ${_CHECK_FILES_ERRMSG.varbase}:						\
 .PHONY: check-files-clean
 check-clean: check-files-clean
 check-files-clean:
-	${_PKG_SILENT}${_PKG_DEBUG}					\
+	${RUN}					\
 	${RM} -f ${_CHECK_FILES_ERRMSGS}				\
 		${_CHECK_FILES_PRE} ${_CHECK_FILES_POST}		\
 		${_CHECK_FILES_DIFF} ${_CHECK_FILES_ADDED}		\
diff --git a/mk/check/check-shlibs.mk b/mk/check/check-shlibs.mk
index 6264bc336cd..22783994cac 100644
--- a/mk/check/check-shlibs.mk
+++ b/mk/check/check-shlibs.mk
@@ -1,4 +1,4 @@
-# $NetBSD: check-shlibs.mk,v 1.13 2008/01/16 14:03:31 joerg Exp $
+# $NetBSD: check-shlibs.mk,v 1.14 2008/02/07 21:36:13 rillig Exp $
 #
 # This file verifies that all libraries used by the package can be found
 # at run-time.
@@ -53,7 +53,7 @@ CHECK_SHLIBS_ELF_ENV+=	WRKDIR=${WRKDIR:Q}
 _check-shlibs: error-check .PHONY
 	@${STEP_MSG} "Checking for missing run-time search paths in ${PKGNAME}"
 	${RUN} rm -f ${ERROR_DIR}/${.TARGET}
-	${_PKG_SILENT}${_PKG_DEBUG}					\
+	${RUN}					\
 	cd ${DESTDIR:Q}${PREFIX:Q};					\
 	${_CHECK_SHLIBS_FILELIST_CMD} |					\
 	${EGREP} -h ${_CHECK_SHLIBS_ERE:Q} |				\
@@ -63,7 +63,7 @@ _check-shlibs: error-check .PHONY
 _check-shlibs: error-check .PHONY
 	@${STEP_MSG} "Checking for missing run-time search paths in ${PKGNAME}"
 	${RUN} rm -f ${ERROR_DIR}/${.TARGET}
-	${_PKG_SILENT}${_PKG_DEBUG}					\
+	${RUN}					\
 	exec 1>${ERROR_DIR}/${.TARGET};					\
 	case ${LDD:Q}"" in						\
 	"")	ldd=`${TYPE} ldd 2>/dev/null | ${AWK} '{ print $$NF }'` ;; \
@@ -77,7 +77,7 @@ _check-shlibs: error-check .PHONY
 		err=`$$ldd $$file 2>&1 | ${GREP} "not found" || ${TRUE}`; \
 		${TEST} -z "$$err" || ${ECHO} "${DESTDIR}${PREFIX}/$$file: $$err"; \
 	done
-	${_PKG_SILENT}${_PKG_DEBUG}					\
+	${RUN}					\
 	exec 1>>${ERROR_DIR}/${.TARGET};				\
 	if ${_NONZERO_FILESIZE_P} ${ERROR_DIR}/${.TARGET}; then		\
 		${ECHO} "*** The programs/libs shown above will not find the listed"; \
diff --git a/mk/check/check-wrkref.mk b/mk/check/check-wrkref.mk
index 637dd72e7a0..44a846cbcdc 100644
--- a/mk/check/check-wrkref.mk
+++ b/mk/check/check-wrkref.mk
@@ -1,4 +1,4 @@
-# $NetBSD: check-wrkref.mk,v 1.15 2007/09/13 09:52:46 rillig Exp $
+# $NetBSD: check-wrkref.mk,v 1.16 2008/02/07 21:36:13 rillig Exp $
 #
 # This file checks that the installed files don't contain any strings
 # that point to the directory where the package had been built, to make
@@ -69,7 +69,7 @@ privileged-install-hook: _check-wrkref
 _check-wrkref: error-check .PHONY
 	@${STEP_MSG} "Checking for work-directory references in ${PKGNAME}"
 	${RUN} rm -f ${ERROR_DIR}/${.TARGET}
-	${_PKG_SILENT}${_PKG_DEBUG}					\
+	${RUN}					\
 	exec 1>${ERROR_DIR}/${.TARGET};					\
 	cd ${DESTDIR}${PREFIX};						\
 	${_CHECK_WRKREF_FILELIST_CMD} | ${SORT} |			\
diff --git a/mk/compiler.mk b/mk/compiler.mk
index 16a7e53b051..d67afbaeab9 100644
--- a/mk/compiler.mk
+++ b/mk/compiler.mk
@@ -1,4 +1,4 @@
-# $NetBSD: compiler.mk,v 1.64 2007/10/17 10:43:37 rillig Exp $
+# $NetBSD: compiler.mk,v 1.65 2008/02/07 21:36:13 rillig Exp $
 #
 # This Makefile fragment implements handling for supported C/C++/Fortran
 # compilers.
@@ -173,8 +173,8 @@ ${_FAIL_WRAPPER.FC}: fail-wrapper
 
 .PHONY: fail-wrapper
 fail-wrapper: .USE
-	${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${.TARGET:H}
-	${_PKG_SILENT}${_PKG_DEBUG}					\
+	${RUN}${MKDIR} ${.TARGET:H}
+	${RUN}					\
 	exec 1>${.TARGET};						\
 	${ECHO} '#!'${TOOLS_SHELL:Q};					\
 	${ECHO} 'wrapperlog="$${TOOLS_WRAPPER_LOG-'${_TOOLS_WRAP_LOG:Q}'}"'; \
@@ -185,7 +185,7 @@ fail-wrapper: .USE
 	${ECHO} '${ECHO} "ERROR: To use this compiler, you have to add $$lang to" 1>&2'; \
 	${ECHO} '${ECHO} "ERROR: USE_LANGUAGES in the package Makefile." 1>&2'; \
 	${ECHO} 'exit 1'
-	${_PKG_SILENT}${_PKG_DEBUG}${CHMOD} +x ${.TARGET}
+	${RUN}${CHMOD} +x ${.TARGET}
 
 .if empty(USE_LANGUAGES:Mc) && empty(USE_LANGUAGES:Mobjc)
 PKG_CC:=		${_FAIL_WRAPPER.CC}
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					\
diff --git a/mk/depends/bsd.depends.mk b/mk/depends/bsd.depends.mk
index b08eaa376e1..3559aa5d943 100644
--- a/mk/depends/bsd.depends.mk
+++ b/mk/depends/bsd.depends.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.depends.mk,v 1.15 2008/01/04 01:46:27 rillig Exp $
+# $NetBSD: bsd.depends.mk,v 1.16 2008/02/07 21:36:13 rillig Exp $
 #
 # This Makefile fragment is included by bsd.pkg.mk and provides all
 # variables and targets related to dependencies.
@@ -87,8 +87,8 @@ install-depends: depends depends-clean
 ### target so that "depends" may be re-invoked.
 ###
 depends-clean:
-	${_PKG_SILENT}${_PKG_DEBUG}${RM} -f ${_COOKIE.depends}
-	${_PKG_SILENT}${_PKG_DEBUG}					\
+	${RUN}${RM} -f ${_COOKIE.depends}
+	${RUN}					\
 	${RMDIR} -p ${_COOKIE.depends:H} 2>/dev/null || ${TRUE}
 
 ######################################################################
@@ -99,9 +99,9 @@ depends-clean:
 ###
 .PHONY: depends-cookie
 depends-cookie:
-	${_PKG_SILENT}${_PKG_DEBUG}${TEST} ! -f ${_COOKIE.depends} || ${FALSE}
-	${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${_COOKIE.depends:H}
-	${_PKG_SILENT}${_PKG_DEBUG}${TOUCH} ${TOUCH_ARGS} ${_COOKIE.depends}
+	${RUN}${TEST} ! -f ${_COOKIE.depends} || ${FALSE}
+	${RUN}${MKDIR} ${_COOKIE.depends:H}
+	${RUN}${TOUCH} ${TOUCH_ARGS} ${_COOKIE.depends}
 
 # show-depends:
 #	Prints a list of dependencies.
diff --git a/mk/djbware.mk b/mk/djbware.mk
index 239ffcfbaa7..a3c3aafc94c 100644
--- a/mk/djbware.mk
+++ b/mk/djbware.mk
@@ -1,4 +1,4 @@
-# $NetBSD: djbware.mk,v 1.20 2007/10/17 10:43:37 rillig Exp $
+# $NetBSD: djbware.mk,v 1.21 2008/02/07 21:36:13 rillig Exp $
 #
 # Makefile fragment for packages with djb-style build machinery
 #
@@ -55,7 +55,7 @@ INSTALL_TARGET?=	setup check ${DJB_INSTALL_TARGETS}
 
 .if !defined(NO_CONFIGURE) && !target(do-configure)
 do-configure:
-	${_PKG_SILENT}${_PKG_DEBUG}cd ${DJB_CONFIG_DIR};		\
+	${RUN}cd ${DJB_CONFIG_DIR};		\
 	for i in conf-*; do ${CP} $${i} $${i}.orig_dist; done;		\
 	[ -f ${DJB_CONFIG_HOME} ] && \
 		${ECHO} ${DJB_CONFIG_PREFIX} > ${DJB_CONFIG_HOME};	\