[pkgsrc/trunk]: pkgsrc/mk We only need to run the apply-pkgsrc-patches target...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/18f90aadd44e
branches:  trunk
changeset: 493942:18f90aadd44e
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Tue May 17 05:00:06 2005 +0000

description:
We only need to run the apply-pkgsrc-patches target if the patches
directory or the local patches directory exist.  Also, emit the message
informing the user that pkgsrc patches are being applied that was lost
in the previous commit.

diffstat:

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

diffs (28 lines):

diff -r 36f99f339467 -r 18f90aadd44e mk/bsd.pkg.patch.mk
--- a/mk/bsd.pkg.patch.mk       Tue May 17 04:46:55 2005 +0000
+++ b/mk/bsd.pkg.patch.mk       Tue May 17 05:00:06 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.patch.mk,v 1.5 2005/05/17 04:45:53 jlam Exp $
+# $NetBSD: bsd.pkg.patch.mk,v 1.6 2005/05/17 05:00:06 jlam Exp $
 #
 # This Makefile fragment is included by bsd.pkg.mk and defines the
 # relevant variables and targets for the "patch" phase.
@@ -159,7 +159,10 @@
 .if defined(PATCHFILES)
 _PKGSRC_PATCH_TARGETS+=        apply-distribution-patches
 .endif
+.if (defined(PATCHDIR) && exists(${PATCHDIR})) || \
+    (defined(LOCALPATCHES) && exists(${LOCALPATCHES}/${PKGPATH}))
 _PKGSRC_PATCH_TARGETS+=        apply-pkgsrc-patches
+.endif
 
 .PHONY: do-patch
 .if !target(do-patch)
@@ -197,6 +200,7 @@
 .endif
 
 apply-pkgsrc-patches:
+       @${ECHO_MSG} "${_PKGSRC_IN}> Applying pkgsrc patches for ${PKGNAME}"
        ${_PKG_SILENT}${_PKG_DEBUG}                                     \
        set -- `${ECHO} ${_PKGSRC_PATCHES:Q}`;                          \
        fail=;                                                          \