diff options
| author | jlam <jlam@pkgsrc.org> | 2005-06-12 03:59:42 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2005-06-12 03:59:42 +0000 |
| commit | 55c85320ca3e54049dbc8ca91f2dbf56efde38f6 (patch) | |
| tree | b0e32431c9ed1110910c0e700702e2dae6a60ece | |
| parent | 7969727e46b5a5c2b783f071575058c27f6f136a (diff) | |
| download | pkgsrc-55c85320ca3e54049dbc8ca91f2dbf56efde38f6.tar.gz | |
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.
| -rw-r--r-- | mk/bsd.pkg.patch.mk | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/mk/bsd.pkg.patch.mk b/mk/bsd.pkg.patch.mk index a73beab8fb1..752916331ce 100644 --- a/mk/bsd.pkg.patch.mk +++ b/mk/bsd.pkg.patch.mk @@ -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 @@ PATCH_DIST_CAT.${i:S/=/--/}?= { patchfile=${i}; ${PATCH_DIST_CAT}; } _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 @@ _GENERATE_PATCH_COOKIE= \ ${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+= ${PATCHDIR}/patch-* _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}; \ |