From 57fbd43ec4b0d54930a6ed90949aedb693ef5cc3 Mon Sep 17 00:00:00 2001
From: rillig <rillig@pkgsrc.org>
Date: Sat, 29 Nov 2008 13:54:45 +0000
Subject: [PATCH] Replaced _PKG_SILENT and _PKG_DEBUG with RUN.

---
 mk/flavor/pkg/install.mk | 22 +++++++++++-----------
 mk/flavor/pkg/utility.mk | 20 ++++++++++----------
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/mk/flavor/pkg/install.mk b/mk/flavor/pkg/install.mk
index 5b8f8020426d..0eeadc9309f8 100644
--- a/mk/flavor/pkg/install.mk
+++ b/mk/flavor/pkg/install.mk
@@ -1,4 +1,4 @@
-# $NetBSD: install.mk,v 1.12 2007/08/10 04:03:23 jlam Exp $
+# $NetBSD: install.mk,v 1.13 2008/11/29 13:54:45 rillig Exp $
 #
 # _flavor-check-conflicts:
 #	Checks for conflicts between the package and installed packages.
@@ -20,16 +20,16 @@
 #
 
 _flavor-check-conflicts: .PHONY error-check
-	${_PKG_SILENT}${_PKG_DEBUG}${RM} -f ${WRKDIR}/.CONFLICTS
+	${RUN}${RM} -f ${WRKDIR}/.CONFLICTS
 .for _conflict_ in ${CONFLICTS}
-	${_PKG_SILENT}${_PKG_DEBUG}					\
+	${RUN}								\
 	found="`${_PKG_BEST_EXISTS} ${_conflict_:Q} || ${TRUE}`";	\
 	case "$$found" in						\
 	"")	;;							\
 	*)	${ECHO} "$$found" >> ${WRKDIR}/.CONFLICTS ;;		\
 	esac
 .endfor
-	${_PKG_SILENT}${_PKG_DEBUG}					\
+	${RUN}								\
 	${TEST} -f ${WRKDIR}/.CONFLICTS || exit 0;			\
 	exec 1>${ERROR_DIR}/${.TARGET};					\
 	${ECHO} "${PKGNAME} conflicts with installed package(s):";	\
@@ -39,7 +39,7 @@ _flavor-check-conflicts: .PHONY error-check
 	${RM} -f ${WRKDIR}/.CONFLICTS
 
 _flavor-check-installed: .PHONY error-check
-	${_PKG_SILENT}${_PKG_DEBUG}					\
+	${RUN}								\
 	found="`${_PKG_BEST_EXISTS} ${PKGWILDCARD:Q} || ${TRUE}`";	\
 	${TEST} -n "$$found" || exit 0;					\
 	exec 1>${ERROR_DIR}/${.TARGET};					\
@@ -59,15 +59,15 @@ _REGISTER_DEPENDENCIES=							\
 
 _flavor-register: .PHONY _flavor-generate-metadata ${_RDEPENDS_FILE}
 	@${STEP_MSG} "Registering installation for ${PKGNAME}"
-	${_PKG_SILENT}${_PKG_DEBUG}${RM} -fr ${_PKG_DBDIR}/${PKGNAME}
-	${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${_PKG_DBDIR}/${PKGNAME}
-	${_PKG_SILENT}${_PKG_DEBUG}${CP} ${PKG_DB_TMPDIR}/* ${_PKG_DBDIR}/${PKGNAME}
-	${_PKG_SILENT}${_PKG_DEBUG}${PKG_ADMIN} add ${PKGNAME}
-	${_PKG_SILENT}${_PKG_DEBUG}					\
+	${RUN}${RM} -fr ${_PKG_DBDIR}/${PKGNAME}
+	${RUN}${MKDIR} ${_PKG_DBDIR}/${PKGNAME}
+	${RUN}${CP} ${PKG_DB_TMPDIR}/* ${_PKG_DBDIR}/${PKGNAME}
+	${RUN}${PKG_ADMIN} add ${PKGNAME}
+	${RUN}								\
 	case ${_AUTOMATIC:Q}"" in					\
 	[yY][eE][sS])	${PKG_ADMIN} set automatic=yes ${PKGNAME} ;;	\
 	esac
-	${_PKG_SILENT}${_PKG_DEBUG}${_FULL_DEPENDS_CMD} |		\
+	${RUN}${_FULL_DEPENDS_CMD} |					\
 		${SORT} -u | ${_REGISTER_DEPENDENCIES} ${PKGNAME}
 
 _flavor-install-clean: .PHONY _flavor-clean-metadata
diff --git a/mk/flavor/pkg/utility.mk b/mk/flavor/pkg/utility.mk
index 8396b0ce49cd..e436e8196eb2 100644
--- a/mk/flavor/pkg/utility.mk
+++ b/mk/flavor/pkg/utility.mk
@@ -1,19 +1,19 @@
-# $NetBSD: utility.mk,v 1.10 2008/02/18 14:30:40 obache Exp $
+# $NetBSD: utility.mk,v 1.11 2008/11/29 13:54:45 rillig Exp $
 
 # The 'info' target can be used to display information about a package.
 .PHONY: info
 info:
-	${_PKG_SILENT}${_PKG_DEBUG}${PKG_INFO} "${PKGWILDCARD}"
+	${RUN}${PKG_INFO} "${PKGWILDCARD}"
 
 # The 'check' target can be used to check an installed package.
 .PHONY: check
 check:
-	${_PKG_SILENT}${_PKG_DEBUG}${PKG_ADMIN} check "${PKGWILDCARD}"
+	${RUN}${PKG_ADMIN} check "${PKGWILDCARD}"
 
 # The 'list' target can be used to list the files installed by a package.
 .PHONY: list
 list:
-	${_PKG_SILENT}${_PKG_DEBUG}${PKG_INFO} -L "${PKGWILDCARD}"
+	${RUN}${PKG_INFO} -L "${PKGWILDCARD}"
 
 ######################################################################
 ###
@@ -27,9 +27,9 @@ list:
 #
 show-downlevel: .PHONY
 .if defined(PKG_FAIL_REASON)
-	${_PKG_SILENT}${_PKG_DEBUG}${DO_NADA}
+	${RUN}${DO_NADA}
 .else
-	${_PKG_SILENT}${_PKG_DEBUG}					\
+	${RUN}								\
 	found="`${_PKG_BEST_EXISTS} \"${PKGWILDCARD}\" || ${TRUE}`";	\
 	if [ "X$$found" != "X" -a "X$$found" != "X${PKGNAME}" ]; then	\
 		${ECHO} "${PKGBASE} package: $$found installed, pkgsrc version ${PKGNAME}"; \
@@ -43,7 +43,7 @@ show-downlevel: .PHONY
 .PHONY: show-installed-depends
 show-installed-depends: # will not be removed
 .if !empty(DEPENDS)
-	${_PKG_SILENT}${_PKG_DEBUG}					\
+	${RUN}								\
 	for i in ${DEPENDS:C/:.*$//:Q:S/\ / /g} ; do			\
 		echo "$$i =>" `${_PKG_BEST_EXISTS} "$$i"`;		\
 	done
@@ -52,7 +52,7 @@ show-installed-depends: # will not be removed
 .PHONY: show-needs-update
 show-needs-update: _about-to-be-removed
 .if !empty(DEPENDS)
-	${_PKG_SILENT}${_PKG_DEBUG}					\
+	${RUN}								\
 	${_DEPENDS_WALK_CMD} -r ${PKGPATH} |				\
 	while read i; do						\
 		cd ${PKGSRCDIR}/$$i;					\
@@ -69,9 +69,9 @@ show-needs-update: _about-to-be-removed
 .PHONY: show-pkgsrc-dir
 show-pkgsrc-dir: _about-to-be-removed
 .if defined(PKG_FAIL_REASON)
-	${_PKG_SILENT}${_PKG_DEBUG}${DO_NADA}
+	${RUN}${DO_NADA}
 .else
-	${_PKG_SILENT}${_PKG_DEBUG}					\
+	${RUN}								\
 	found="`${_PKG_BEST_EXISTS} \"${PKGWILDCARD}\" || ${TRUE}`";	\
 	if [ "X$$found" != "X" ]; then					\
 		${ECHO} ${PKGPATH};					\