diff options
| author | jlam <jlam@pkgsrc.org> | 2007-08-15 13:56:24 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2007-08-15 13:56:24 +0000 |
| commit | 3ff1bf7b408690f2577591c7780f33cf92193de1 (patch) | |
| tree | b39c3812c8c0a6ac7aeb0c9ba941493ef70c4828 /mk/patch | |
| parent | f06179504e61f0d180fa6c3d0e232367cc4d2f04 (diff) | |
| download | pkgsrc-3ff1bf7b408690f2577591c7780f33cf92193de1.tar.gz | |
Use a flag to the checksum script to tell it whether we're checking
a distfile or a pkgsrc patch. It's simple, cleaner, less magic, etc.
(duh!).
While here, I notice that _CHECKSUM_CMD was already being defined in
mk/checksum/checksum.mk (as it should be), so update the definition
from mk/patch/patch.mk and remove it from patch.mk.
Diffstat (limited to 'mk/patch')
| -rw-r--r-- | mk/patch/patch.mk | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/mk/patch/patch.mk b/mk/patch/patch.mk index 772eed5caef..4bb0a685f63 100644 --- a/mk/patch/patch.mk +++ b/mk/patch/patch.mk @@ -1,4 +1,4 @@ -# $NetBSD: patch.mk,v 1.13 2007/08/14 21:25:10 jlam Exp $ +# $NetBSD: patch.mk,v 1.14 2007/08/15 13:56:25 jlam Exp $ # # The following variables may be set in a package Makefile and control # how pkgsrc patches are applied. @@ -261,11 +261,6 @@ _PKGSRC_PATCHES+= ${PATCHDIR}/patch-* _PKGSRC_PATCHES+= ${LOCALPATCHES}/${PKGPATH}/* .endif -_CHECKSUM_CMD= ${SETENV} DIGEST=${TOOLS_DIGEST:Q} CAT=${TOOLS_CAT:Q} \ - ECHO=${TOOLS_ECHO:Q} SED=${TOOLS_SED:Q} \ - TEST=${TOOLS_TEST:Q} \ - ${SH} ${PKGSRCDIR}/mk/checksum/checksum - pkgsrc-patch-message: @${STEP_MSG} "Applying pkgsrc patches for ${PKGNAME}" @@ -293,7 +288,7 @@ do-pkgsrc-patch: continue; \ fi; \ ${ECHO_PATCH_MSG} "Verifying $$i"; \ - if ${_CHECKSUM_CMD} ${DISTINFO_FILE} $$i >/dev/null 2>&1; then \ + if ${_CHECKSUM_CMD} -p ${DISTINFO_FILE} $$i >/dev/null 2>&1; then \ cksum_result=0; \ else \ cksum_result=$$?; \ |