Replaced _PKG_SILENT and _PKG_DEBUG with RUN.

NetBSD · Feb 7, 2008 · 22dcefe · 22dcefe
1 parent 63a160e
commit 22dcefe
Show file tree

Hide file tree

Showing 24 changed files with 120 additions and 122 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 <[email protected]>
@@ -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