diff options
author | rillig <rillig@pkgsrc.org> | 2009-03-17 22:13:36 +0000 |
---|---|---|
committer | rillig <rillig@pkgsrc.org> | 2009-03-17 22:13:36 +0000 |
commit | b1bf3ebab8403b377b3bebfbae35a5ac2bd645fa (patch) | |
tree | c5bfefb9f4e5413721bf7ce328e51684838cf5bd | |
parent | 25c04e4c1e4627af915fef22b0028873ca53e571 (diff) | |
download | pkgsrc-b1bf3ebab8403b377b3bebfbae35a5ac2bd645fa.tar.gz |
Replaced _PKG_SILENT and _PKG_DEBUG with RUN.
-rw-r--r-- | mk/fetch/fetch.mk | 14 | ||||
-rw-r--r-- | mk/flavor/pkg/check.mk | 11 | ||||
-rw-r--r-- | mk/flavor/pkg/views.mk | 6 | ||||
-rw-r--r-- | mk/fuse.buildlink3.mk | 4 | ||||
-rw-r--r-- | mk/oss.builtin.mk | 4 | ||||
-rw-r--r-- | mk/package/bsd.package.mk | 4 | ||||
-rw-r--r-- | mk/package/package.mk | 8 | ||||
-rw-r--r-- | mk/plist/plist.mk | 4 | ||||
-rw-r--r-- | mk/plist/print-plist.mk | 9 | ||||
-rw-r--r-- | mk/tools/autoconf.mk | 4 | ||||
-rw-r--r-- | mk/tools/bsd.tools.mk | 8 | ||||
-rw-r--r-- | mk/tools/create.mk | 9 | ||||
-rw-r--r-- | mk/tools/intltool.mk | 4 |
13 files changed, 42 insertions, 47 deletions
diff --git a/mk/fetch/fetch.mk b/mk/fetch/fetch.mk index 9165efbef53..c3000adcb60 100644 --- a/mk/fetch/fetch.mk +++ b/mk/fetch/fetch.mk @@ -1,4 +1,4 @@ -# $NetBSD: fetch.mk,v 1.41 2009/02/17 10:42:45 joerg Exp $ +# $NetBSD: fetch.mk,v 1.42 2009/03/17 22:13:36 rillig Exp $ _MASTER_SITE_BACKUP= ${MASTER_SITE_BACKUP:=${DIST_SUBDIR}${DIST_SUBDIR:D/}} _MASTER_SITE_OVERRIDE= ${MASTER_SITE_OVERRIDE:=${DIST_SUBDIR}${DIST_SUBDIR:D/}} @@ -249,8 +249,8 @@ _FETCH_ARGS+= -d ${DIST_SUBDIR} .PHONY: do-fetch-file do-fetch-file: .USE @${STEP_MSG} "Fetching ${.TARGET:T}" - ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${.TARGET:H} - ${_PKG_SILENT}${_PKG_DEBUG} \ + ${RUN} ${MKDIR} ${.TARGET:H} + ${RUN} \ for d in "" ${DIST_PATH:S/:/ /g}; do \ case $$d in \ ""|${DISTDIR}) continue ;; \ @@ -262,12 +262,12 @@ do-fetch-file: .USE ${LN} -s $$file ${.TARGET}; \ fi; \ done - ${_PKG_SILENT}${_PKG_DEBUG}set -e; \ + ${RUN} \ unsorted_sites="${SITES.${.TARGET:T:S/=/--/}}"; \ sites="${_ORDERED_SITES} ${_MASTER_SITE_BACKUP}"; \ cd ${.TARGET:H:S/\/${DIST_SUBDIR}$//} && \ ${_FETCH_CMD} ${_FETCH_ARGS} ${.TARGET:T} $$sites - ${_PKG_SILENT}${_PKG_DEBUG} \ + ${RUN} \ if ${TEST} ! -f ${.TARGET}; then \ ${ERROR_MSG} "Could not fetch the following file:"; \ ${ERROR_MSG} " ${.TARGET:T}"; \ @@ -302,9 +302,9 @@ mirror-distfiles: fetch .if !target(show-distfiles) show-distfiles: . if defined(PKG_FAIL_REASON) - ${_PKG_SILENT}${_PKG_DEBUG}${DO_NADA} + ${RUN} ${DO_NADA} . else - ${_PKG_SILENT}${_PKG_DEBUG} \ + ${RUN} \ for file in "" ${_CKSUMFILES}; do \ if [ "X$$file" = "X" ]; then continue; fi; \ ${ECHO} $$file; \ diff --git a/mk/flavor/pkg/check.mk b/mk/flavor/pkg/check.mk index ec2bec21110..52cf51da8a4 100644 --- a/mk/flavor/pkg/check.mk +++ b/mk/flavor/pkg/check.mk @@ -1,4 +1,4 @@ -# $NetBSD: check.mk,v 1.10 2009/02/11 14:34:36 joerg Exp $ +# $NetBSD: check.mk,v 1.11 2009/03/17 22:13:36 rillig Exp $ # # _flavor-check-vulnerable: @@ -6,7 +6,7 @@ # file exists. # _flavor-check-vulnerable: .PHONY - ${_PKG_SILENT}${_PKG_DEBUG} \ + ${RUN}\ _PKGVULNDIR=`${_EXTRACT_PKGVULNDIR}`; \ vulnfile=$$_PKGVULNDIR/pkg-vulnerabilities; \ if ${TEST} ! -f "$$vulnfile"; then \ @@ -16,8 +16,5 @@ _flavor-check-vulnerable: .PHONY exit 0; \ fi; \ ${PHASE_MSG} "Checking for vulnerabilities in ${PKGNAME}"; \ - ${AUDIT_PACKAGES} ${_AUDIT_PACKAGES_CMD} ${AUDIT_PACKAGES_FLAGS} ${PKGNAME}; \ - if ${TEST} "$$?" -ne 0; then \ - ${ERROR_MSG} "Define ALLOW_VULNERABLE_PACKAGES in mk.conf or IGNORE_URLS in audit-packages.conf(5) if this package is absolutely essential."; \ - ${FALSE}; \ - fi + ${AUDIT_PACKAGES} ${_AUDIT_PACKAGES_CMD} ${AUDIT_PACKAGES_FLAGS} ${PKGNAME} \ + || ${FAIL_MSG} "Define ALLOW_VULNERABLE_PACKAGES in mk.conf or IGNORE_URLS in audit-packages.conf(5) if this package is absolutely essential." diff --git a/mk/flavor/pkg/views.mk b/mk/flavor/pkg/views.mk index a7739fd66c5..64af105986c 100644 --- a/mk/flavor/pkg/views.mk +++ b/mk/flavor/pkg/views.mk @@ -1,4 +1,4 @@ -# $NetBSD: views.mk,v 1.5 2007/01/05 18:52:08 rillig Exp $ +# $NetBSD: views.mk,v 1.6 2009/03/17 22:13:36 rillig Exp $ # By default, all packages attempt to link into the views. .if ${PKG_INSTALLATION_TYPE} == "pkgviews" @@ -36,7 +36,7 @@ build-views: su-target @${STEP_MSG} "Building views for ${PKGNAME}" su-build-views: - ${_PKG_SILENT}${_PKG_DEBUG} \ + ${RUN} \ ${MKDIR} ${LOCALBASE}; \ for v in ${PKGVIEWS}; do \ case "$$v" in \ @@ -78,7 +78,7 @@ remove-views: su-target @${STEP_MSG} "Removing ${PKGNAME} from views" su-remove-views: - ${_PKG_SILENT}${_PKG_DEBUG} \ + ${RUN} \ for v in "" ${PKGVIEWS}; do \ ${TEST} -n "$$v" || continue; \ case "$$v" in \ diff --git a/mk/fuse.buildlink3.mk b/mk/fuse.buildlink3.mk index 5aeef805370..c737a4187dc 100644 --- a/mk/fuse.buildlink3.mk +++ b/mk/fuse.buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: fuse.buildlink3.mk,v 1.8 2007/10/17 10:43:38 rillig Exp $ +# $NetBSD: fuse.buildlink3.mk,v 1.9 2009/03/17 22:13:36 rillig Exp $ # # Makefile fragment for packages using the FUSE framework. # @@ -28,7 +28,7 @@ override-message-fuse-pkgconfig: @${STEP_MSG} "Magical transformations for fuse on NetBSD." override-fuse-pkgconfig: - ${_PKG_SILENT}${_PKG_DEBUG}set -e; \ + ${RUN} \ ${MKDIR} ${BLKDIR_PKGCFG}; \ { \ ${ECHO} "prefix=/usr"; \ diff --git a/mk/oss.builtin.mk b/mk/oss.builtin.mk index 0bb5d4d6e7b..b56f14f4a9b 100644 --- a/mk/oss.builtin.mk +++ b/mk/oss.builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: oss.builtin.mk,v 1.2 2006/04/06 06:23:06 reed Exp $ +# $NetBSD: oss.builtin.mk,v 1.3 2009/03/17 22:13:36 rillig Exp $ BUILTIN_PKG:= oss @@ -77,7 +77,7 @@ BUILDLINK_TRANSFORM+= rm:-lossaudio BUILDLINK_TARGETS+= buildlink-oss-soundcard-h .PHONY: buildlink-oss-soundcard-h buildlink-oss-soundcard-h: - ${_PKG_SILENT}${_PKG_DEBUG} \ + ${RUN} \ sys_soundcard_h=${BUILDLINK_DIR}/include/sys/soundcard.h; \ soundcard_h=${BUILDLINK_PREFIX.oss}/include/soundcard.h; \ if ${TEST} ! -f $${sys_soundcard_h} -a -f $${soundcard_h}; then \ diff --git a/mk/package/bsd.package.mk b/mk/package/bsd.package.mk index 8cf93f1e49b..686e5fd8ec1 100644 --- a/mk/package/bsd.package.mk +++ b/mk/package/bsd.package.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.package.mk,v 1.10 2008/01/04 01:46:27 rillig Exp $ +# $NetBSD: bsd.package.mk,v 1.11 2009/03/17 22:13:36 rillig Exp $ # # This Makefile fragment is included by bsd.pkg.mk and provides all # variables and targets related to binary packages. @@ -50,4 +50,4 @@ repackage: package-clean package ### phase so that the "package" target may be re-invoked. ### package-clean: - ${_PKG_SILENT}${_PKG_DEBUG}${RM} -f ${_COOKIE.package} + ${RUN} ${RM} -f ${_COOKIE.package} diff --git a/mk/package/package.mk b/mk/package/package.mk index 896ea070cbb..6a752acb600 100644 --- a/mk/package/package.mk +++ b/mk/package/package.mk @@ -1,4 +1,4 @@ -# $NetBSD: package.mk,v 1.19 2007/03/08 23:33:35 rillig Exp $ +# $NetBSD: package.mk,v 1.20 2009/03/17 22:13:36 rillig Exp $ # # This file provides the code for the "package" phase. # @@ -69,9 +69,9 @@ package-message: ### .PHONY: package-cookie package-cookie: - ${_PKG_SILENT}${_PKG_DEBUG}${TEST} ! -f ${_COOKIE.package} || ${FALSE} - ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${_COOKIE.package:H} - ${_PKG_SILENT}${_PKG_DEBUG}${ECHO} ${PKGNAME} > ${_COOKIE.package} + ${RUN} ${TEST} ! -f ${_COOKIE.package} || ${FALSE} + ${RUN} ${MKDIR} ${_COOKIE.package:H} + ${RUN} ${ECHO} ${PKGNAME} > ${_COOKIE.package} ###################################################################### ### The targets below are run with elevated privileges. diff --git a/mk/plist/plist.mk b/mk/plist/plist.mk index 0bc9add44fb..4682993a274 100644 --- a/mk/plist/plist.mk +++ b/mk/plist/plist.mk @@ -1,4 +1,4 @@ -# $NetBSD: plist.mk,v 1.38 2008/10/30 18:48:13 joerg Exp $ +# $NetBSD: plist.mk,v 1.39 2009/03/17 22:13:36 rillig Exp $ # # This Makefile fragment handles the creation of PLISTs for use by # pkg_create(8). @@ -264,7 +264,7 @@ ${PLIST}: # for list of keywords see pkg_create(1) ${_PLIST_NOKEYWORDS}: ${PLIST} - ${_PKG_SILENT}${_PKG_DEBUG} ${AWK} < ${PLIST} > ${.TARGET} ' \ + ${RUN} ${AWK} < ${PLIST} > ${.TARGET} ' \ BEGIN { \ FILTER="@("; \ FILTER=FILTER"cd|cwd|src|exec|unexec|mode|option";\ diff --git a/mk/plist/print-plist.mk b/mk/plist/print-plist.mk index 55527ab28a9..a6604866746 100644 --- a/mk/plist/print-plist.mk +++ b/mk/plist/print-plist.mk @@ -1,4 +1,4 @@ -# $NetBSD: print-plist.mk,v 1.16 2008/07/23 23:46:26 seb Exp $ +# $NetBSD: print-plist.mk,v 1.17 2009/03/17 22:13:36 rillig Exp $ ### ### Automatic PLIST generation @@ -139,9 +139,8 @@ _PRINT_PLIST_LIBTOOLIZE_FILTER?= ${CAT} .PHONY: print-PLIST .if !target(print-PLIST) print-PLIST: - ${_PKG_SILENT}${_PKG_DEBUG}\ - ${ECHO} '@comment $$'NetBSD'$$' - ${_PKG_SILENT}${_PKG_DEBUG}\ + ${RUN} ${ECHO} '@comment $$'NetBSD'$$' + ${RUN}\ shlib_type=${SHLIB_TYPE:Q}; \ case $$shlib_type in \ "a.out") genlinks=1 ;; \ @@ -175,7 +174,7 @@ print-PLIST: next; \ } \ { print $$0; }' - ${_PKG_SILENT}${_PKG_DEBUG}\ + ${RUN}\ for i in `${_PRINT_PLIST_DIRS_CMD} \ | ${SORT} -r \ | ${AWK} ' \ diff --git a/mk/tools/autoconf.mk b/mk/tools/autoconf.mk index c33f86d9eaf..60f33ddc236 100644 --- a/mk/tools/autoconf.mk +++ b/mk/tools/autoconf.mk @@ -1,4 +1,4 @@ -# $NetBSD: autoconf.mk,v 1.14 2006/12/15 13:15:07 martti Exp $ +# $NetBSD: autoconf.mk,v 1.15 2009/03/17 22:13:36 rillig Exp $ # # Copyright (c) 2005 The NetBSD Foundation, Inc. # All rights reserved. @@ -206,7 +206,7 @@ LIBTOOL_M4_OVERRIDE?= libtool.m4 */libtool.m4 */*/libtool.m4 .PHONY: tools-libtool-m4-override tools-libtool-m4-override: .for _pattern_ in ${LIBTOOL_M4_OVERRIDE} - ${_PKG_SILENT}${_PKG_DEBUG} \ + ${RUN} \ cd ${WRKSRC}; \ for cfile in ${_pattern_:S/libtool.m4$/configure/}; do \ if ${TEST} -f "$$cfile"; then \ diff --git a/mk/tools/bsd.tools.mk b/mk/tools/bsd.tools.mk index eaae98cd9e9..d82e26b261d 100644 --- a/mk/tools/bsd.tools.mk +++ b/mk/tools/bsd.tools.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.tools.mk,v 1.49 2008/01/04 01:46:27 rillig Exp $ +# $NetBSD: bsd.tools.mk,v 1.50 2009/03/17 22:13:36 rillig Exp $ # # Copyright (c) 2005, 2006 The NetBSD Foundation, Inc. # All rights reserved. @@ -118,9 +118,9 @@ tools-message: ### .PHONY: tools-cookie tools-cookie: - ${_PKG_SILENT}${_PKG_DEBUG}${TEST} ! -f ${_COOKIE.tools} || ${FALSE} - ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${_COOKIE.tools:H} - ${_PKG_SILENT}${_PKG_DEBUG}${ECHO} ${USE_TOOLS:Q} > ${_COOKIE.tools} + ${RUN} ${TEST} ! -f ${_COOKIE.tools} || ${FALSE} + ${RUN} ${MKDIR} ${_COOKIE.tools:H} + ${RUN} ${ECHO} ${USE_TOOLS:Q} > ${_COOKIE.tools} ###################################################################### ### override-tools (PRIVATE) diff --git a/mk/tools/create.mk b/mk/tools/create.mk index e4796b87aaf..cccfa736e0d 100644 --- a/mk/tools/create.mk +++ b/mk/tools/create.mk @@ -1,4 +1,4 @@ -# $NetBSD: create.mk,v 1.3 2008/02/13 09:11:01 rillig Exp $ +# $NetBSD: create.mk,v 1.4 2009/03/17 22:13:36 rillig Exp $ # # Copyright (c) 2005, 2006 The NetBSD Foundation, Inc. # All rights reserved. @@ -148,9 +148,8 @@ TOOLS_SCRIPT_DFLT.${_t_}= \ override-tools: ${TOOLS_CMD.${_t_}} ${TOOLS_CMD.${_t_}}: - ${_PKG_SILENT}${_PKG_DEBUG}${TEST} -d ${.TARGET:H:Q} || \ - ${MKDIR} ${.TARGET:H:Q} - ${_PKG_SILENT}${_PKG_DEBUG} \ + ${RUN} ${TEST} -d ${.TARGET:H:Q} || ${MKDIR} ${.TARGET:H:Q} + ${RUN} \ if ${TEST} -n ${TOOLS_SCRIPT.${_t_}:Q}""; then \ create=wrapper; \ script=${TOOLS_SCRIPT.${_t_}:Q}; \ @@ -183,7 +182,7 @@ ${TOOLS_CMD.${_t_}}: ;; \ esac . for _a_ in ${TOOLS_ALIASES.${_t_}} - ${_PKG_SILENT}${_PKG_DEBUG} \ + ${RUN} \ ${TEST} ${.TARGET:Q} = ${.TARGET:H:Q}/${_a_} || \ ${LN} -fs ${.TARGET:T:Q} ${.TARGET:H:Q}/${_a_} . endfor diff --git a/mk/tools/intltool.mk b/mk/tools/intltool.mk index 7b8fb1cd653..5a3352465d6 100644 --- a/mk/tools/intltool.mk +++ b/mk/tools/intltool.mk @@ -1,4 +1,4 @@ -# $NetBSD: intltool.mk,v 1.4 2008/12/05 08:25:15 wiz Exp $ +# $NetBSD: intltool.mk,v 1.5 2009/03/17 22:13:36 rillig Exp $ # # Copyright (c) 2006 The NetBSD Foundation, Inc. # All rights reserved. @@ -84,7 +84,7 @@ override-message-intltool: .PHONY: override-intltool-${_t_} override-intltool: override-intltool-${_t_} override-intltool-${_t_}: - ${_PKG_SILENT}${_PKG_DEBUG}set -e; \ + ${RUN} \ cd ${WRKSRC}; for f in ${_t_} */${_t_} */*/${_t_}; do \ if ${TEST} -f "$$f"; then \ ${RM} -f $$f; \ |