pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/mk/patch Replaced _PKG_SILENT and _PKG_DEBUG with RUN.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/c7bb85e5eb73
branches:  trunk
changeset: 556195:c7bb85e5eb73
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Tue Mar 17 21:43:54 2009 +0000

description:
Replaced _PKG_SILENT and _PKG_DEBUG with RUN.

diffstat:

 mk/patch/patch.mk |  12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diffs (43 lines):

diff -r 5ef1dd43a5d3 -r c7bb85e5eb73 mk/patch/patch.mk
--- a/mk/patch/patch.mk Tue Mar 17 21:40:44 2009 +0000
+++ b/mk/patch/patch.mk Tue Mar 17 21:43:54 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: patch.mk,v 1.17 2007/09/19 08:37:37 rillig Exp $
+# $NetBSD: patch.mk,v 1.18 2009/03/17 21:43:54 rillig Exp $
 #
 # The following variables may be set in a package Makefile and control
 # how pkgsrc patches are applied.
@@ -116,8 +116,8 @@
 ###
 .PHONY: patch-cookie
 patch-cookie:
-       ${_PKG_SILENT}${_PKG_DEBUG}${TEST} ! -f ${_COOKIE.patch} || ${FALSE}
-       ${_PKG_SILENT}${_PKG_DEBUG}                                     \
+       ${RUN} ${TEST} ! -f ${_COOKIE.patch} || ${FALSE}
+       ${RUN}                                                          \
        if ${TEST} -f ${_PATCH_APPLIED_FILE:Q}; then                    \
                ${MV} -f ${_PATCH_APPLIED_FILE:Q} ${_COOKIE.patch:Q};   \
        else                                                            \
@@ -245,11 +245,11 @@
 do-distribution-patch:
 .for i in ${PATCHFILES}
        @${ECHO_PATCH_MSG} "Applying distribution patch ${i}"
-       ${_PKG_SILENT}${_PKG_DEBUG}cd ${_DISTDIR};                      \
+       ${RUN} cd ${_DISTDIR};                                          \
        ${PATCH_DIST_CAT.${i:S/=/--/}} |                                \
        ${PATCH} ${PATCH_DIST_ARGS.${i:S/=/--/}} ||                     \
                { ${ERROR_MSG} "Patch ${i} failed"; ${_PKGSRC_PATCH_FAIL}; }
-       ${_PKG_SILENT}${_PKG_DEBUG}${ECHO} ${_DISTDIR:Q}/${i:Q} >> ${_PATCH_APPLIED_FILE:Q}
+       ${RUN} ${ECHO} ${_DISTDIR:Q}/${i:Q} >> ${_PATCH_APPLIED_FILE:Q}
 .endfor
 
 ######################################################################
@@ -274,7 +274,7 @@
        @${STEP_MSG} "Applying pkgsrc patches for ${PKGNAME}"
 
 do-pkgsrc-patch:
-       ${_PKG_SILENT}${_PKG_DEBUG}                                     \
+       ${RUN}                                                          \
        fail=;                                                          \
        patches=${_PKGSRC_PATCHES:Q};                                   \
        patch_warning() {                                               \



Home | Main Index | Thread Index | Old Index