diff options
| author | jlam <jlam@pkgsrc.org> | 2005-06-23 20:51:00 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2005-06-23 20:51:00 +0000 |
| commit | 1cae80d83e11298a6e4bfda89e2674101105dca4 (patch) | |
| tree | eb845bae72ab4c79fb7859e03dea7f2bd25290d6 /mk | |
| parent | df8c47b2f25e46a438bcf63e46e57de341c4ce8c (diff) | |
| download | pkgsrc-1cae80d83e11298a6e4bfda89e2674101105dca4.tar.gz | |
Add a PKGSRC_USE_TOOLS definition to bsd.pkg.check.mk that notes the
tools that are used in the targets. Also, replace "diff" with ${DIFF}.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.check.mk | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/mk/bsd.pkg.check.mk b/mk/bsd.pkg.check.mk index 8e20c1f0fb2..1d154fa9df3 100644 --- a/mk/bsd.pkg.check.mk +++ b/mk/bsd.pkg.check.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.check.mk,v 1.3 2005/06/23 18:12:20 jlam Exp $ +# $NetBSD: bsd.pkg.check.mk,v 1.4 2005/06/23 20:51:00 jlam Exp $ # # This Makefile fragment is included by bsd.pkg.mk and defines the # relevant variables and targets the for various install-time "check" @@ -42,6 +42,9 @@ CHECK_FILES?= no CHECK_FILES_STRICT?= no CHECK_WRKREF?= no +PKGSRC_USE_TOOLS+= awk cat cmp diff echo find grep rm sed test \ + touch true + ########################################################################### ### check-files ########################################################### ########################################################################### @@ -191,7 +194,7 @@ ${_CHECK_FILES_COOKIE.prefix}: then \ { exit 0; }; \ fi; \ - diff -u ${_CHECK_FILES_PRE.prefix} ${_CHECK_FILES_POST.prefix} \ + ${DIFF} -u ${_CHECK_FILES_PRE.prefix} ${_CHECK_FILES_POST.prefix} \ > ${WRKDIR}/.files.diff || ${TRUE}; \ ${GREP} '^+/' ${WRKDIR}/.files.diff | ${SED} "s|^+||" | ${SORT} \ > ${WRKDIR}/.files.added; \ @@ -211,7 +214,7 @@ ${_CHECK_FILES_COOKIE.prefix}: { ${ECHO} "*** The PLIST does not match installed files!"; \ ${ECHO} " The following files were not expected" \ "in ${PREFIX}:"; \ - diff -u ${WRKDIR}/.files.expected ${WRKDIR}/.files.added \ + ${DIFF} -u ${WRKDIR}/.files.expected ${WRKDIR}/.files.added \ | ${GREP} '^+[^+]' | ${SED} "s|^+| |"; \ } >> ${.TARGET}; \ fi @@ -236,8 +239,8 @@ ${_CHECK_FILES_COOKIE.sysconfdir}: { ${ECHO} "*** The package has modified ${PKG_SYSCONFDIR}" \ "contents directly!"; \ ${ECHO} " The offending files/directories are:"; \ - diff -u ${_CHECK_FILES_PRE.sysconfdir} \ - ${_CHECK_FILES_POST.sysconfdir} \ + ${DIFF} -u ${_CHECK_FILES_PRE.sysconfdir} \ + ${_CHECK_FILES_POST.sysconfdir} \ | ${GREP} '^+[^+]' | ${SED} "s|^+| |"; \ } > ${.TARGET}; \ fi @@ -259,8 +262,8 @@ ${_CHECK_FILES_COOKIE.varbase}: { ${ECHO} "*** The package has modified ${VARBASE}" \ "contents directly!"; \ ${ECHO} " The offending files/directories are:"; \ - diff -u ${_CHECK_FILES_PRE.varbase} \ - ${_CHECK_FILES_POST.varbase} \ + ${DIFF} -u ${_CHECK_FILES_PRE.varbase} \ + ${_CHECK_FILES_POST.varbase} \ | ${GREP} '^+[^+]' | ${SED} "s|^+| |"; \ } > ${.TARGET}; \ fi |