pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/mk Add a PKGSRC_USE_TOOLS definition to bsd.pkg.check....



details:   https://anonhg.NetBSD.org/pkgsrc/rev/a1f3f7bef94d
branches:  trunk
changeset: 496156:a1f3f7bef94d
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Thu Jun 23 20:51:00 2005 +0000

description:
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:

 mk/bsd.pkg.check.mk |  17 ++++++++++-------
 1 files changed, 10 insertions(+), 7 deletions(-)

diffs (59 lines):

diff -r bcb3330dc523 -r a1f3f7bef94d mk/bsd.pkg.check.mk
--- a/mk/bsd.pkg.check.mk       Thu Jun 23 20:45:34 2005 +0000
+++ b/mk/bsd.pkg.check.mk       Thu Jun 23 20:51:00 2005 +0000
@@ -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_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 @@
        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 @@
                { ${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 @@
                { ${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 @@
                { ${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



Home | Main Index | Thread Index | Old Index