[pkgsrc/trunk]: pkgsrc/mk Separate the message from the do-distribution-patch...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/c2dd33d7a0b2
branches:  trunk
changeset: 495502:c2dd33d7a0b2
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Sun Jun 12 03:59:42 2005 +0000

description:
Separate the message from the do-distribution-patch and do-pkgsrc-patch
targets so that if they're overridden in the package Makefile, the
message is still printed.

diffstat:

 mk/bsd.pkg.patch.mk |  20 +++++++++++++-------
 1 files changed, 13 insertions(+), 7 deletions(-)

diffs (55 lines):

diff -r 1b82c818d954 -r c2dd33d7a0b2 mk/bsd.pkg.patch.mk
--- a/mk/bsd.pkg.patch.mk       Sun Jun 12 03:38:04 2005 +0000
+++ b/mk/bsd.pkg.patch.mk       Sun Jun 12 03:59:42 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.patch.mk,v 1.14 2005/06/12 03:38:04 jlam Exp $
+# $NetBSD: bsd.pkg.patch.mk,v 1.15 2005/06/12 03:59:42 jlam Exp $
 #
 # This Makefile fragment is included by bsd.pkg.mk and defines the
 # relevant variables and targets for the "patch" phase.
@@ -146,11 +146,11 @@
 
 _PKGSRC_PATCH_TARGETS= uptodate-digest
 .if defined(PATCHFILES)
-_PKGSRC_PATCH_TARGETS+=        do-distribution-patch
+_PKGSRC_PATCH_TARGETS+=        distribution-patch-message do-distribution-patch
 .endif
 .if (defined(PATCHDIR) && exists(${PATCHDIR})) || \
     (defined(LOCALPATCHES) && exists(${LOCALPATCHES}/${PKGPATH}))
-_PKGSRC_PATCH_TARGETS+=        do-pkgsrc-patch
+_PKGSRC_PATCH_TARGETS+=        pkgsrc-patch-message do-pkgsrc-patch
 .endif
 
 .PHONY: do-patch
@@ -179,10 +179,13 @@
                ${TOUCH} ${TOUCH_FLAGS} ${_PATCH_COOKIE:Q};             \
        fi
 
-.PHONY: do-distribution-patch
+.PHONY: distribution-patch-message do-distribution-patch
+
+distribution-patch-message:
+       @${ECHO_MSG} "${_PKGSRC_IN}> Applying distribution patches for ${PKGNAME}"
+
 .if !target(do-distribution-patch)
 do-distribution-patch:
-       @${ECHO_MSG} "${_PKGSRC_IN}> Applying distribution patches for ${PKGNAME}"
 .  for i in ${PATCHFILES}
        @${ECHO_PATCH_MSG} "${_PKGSRC_IN}> Applying distribution patch ${i}"
        ${_PKG_SILENT}${_PKG_DEBUG}cd ${_DISTDIR};                      \
@@ -201,10 +204,13 @@
 _PKGSRC_PATCHES+=      ${LOCALPATCHES}/${PKGPATH}/patch-*
 .endif
 
-.PHONY: do-pkgsrc-patch
+.PHONY: pkgsrc-patch-message do-pkgsrc-patch
+
+pkgsrc-patch-message:
+       @${ECHO_MSG} "${_PKGSRC_IN}> Applying pkgsrc patches for ${PKGNAME}"
+
 .if !target(do-pkgsrc-patch)
 do-pkgsrc-patch:
-       @${ECHO_MSG} "${_PKGSRC_IN}> Applying pkgsrc patches for ${PKGNAME}"
        ${_PKG_SILENT}${_PKG_DEBUG}                                     \
        fail=;                                                          \
        patches=${_PKGSRC_PATCHES:Q};                                   \