summaryrefslogtreecommitdiff
path: root/mk/check
diff options
context:
space:
mode:
authorrillig <rillig@pkgsrc.org>2008-02-07 21:36:13 +0000
committerrillig <rillig@pkgsrc.org>2008-02-07 21:36:13 +0000
commit66736dde432e2cdb365944402f721936c08348de (patch)
tree973e3df0794e543a4054e86e507ec10f4c40a685 /mk/check
parenta91164cb4327396d3c1376e523193cbfffe8a613 (diff)
downloadpkgsrc-66736dde432e2cdb365944402f721936c08348de.tar.gz
Replaced _PKG_SILENT and _PKG_DEBUG with RUN.
Diffstat (limited to 'mk/check')
-rw-r--r--mk/check/check-files.mk40
-rw-r--r--mk/check/check-shlibs.mk8
-rw-r--r--mk/check/check-wrkref.mk4
3 files changed, 26 insertions, 26 deletions
diff --git a/mk/check/check-files.mk b/mk/check/check-files.mk
index b4e09210621..7dd5ac6a865 100644
--- a/mk/check/check-files.mk
+++ b/mk/check/check-files.mk
@@ -1,4 +1,4 @@
-# $NetBSD: check-files.mk,v 1.21 2008/01/23 14:30:59 rillig Exp $
+# $NetBSD: check-files.mk,v 1.22 2008/02/07 21:36:13 rillig Exp $
#
# This file checks that the list of installed files matches the PLIST.
# For that purpose it records the file list of LOCALBASE before and
@@ -178,7 +178,7 @@ check-files-post-message:
@${STEP_MSG} "Generating post-install file lists"
${_CHECK_FILES_PRE.prefix} ${_CHECK_FILES_POST.prefix}:
- ${_PKG_SILENT}${_PKG_DEBUG} \
+ ${RUN} \
${FIND} ${DESTDIR}${PREFIX}/. \( -type f -o -type l \) -print 2>/dev/null \
| ${SED} -e 's,/\./,/,' \
| ${_CHECK_FILES_SKIP_FILTER} \
@@ -186,7 +186,7 @@ ${_CHECK_FILES_PRE.prefix} ${_CHECK_FILES_POST.prefix}:
|| ${TRUE}
${_CHECK_FILES_PRE.sysconfdir} ${_CHECK_FILES_POST.sysconfdir}:
- ${_PKG_SILENT}${_PKG_DEBUG} \
+ ${RUN} \
${FIND} ${DESTDIR}${PKG_SYSCONFDIR}/. -print 2>/dev/null \
| ${SED} -e 's,/\./,/,' \
| ${_CHECK_FILES_SKIP_FILTER} \
@@ -194,7 +194,7 @@ ${_CHECK_FILES_PRE.sysconfdir} ${_CHECK_FILES_POST.sysconfdir}:
|| ${TRUE}
${_CHECK_FILES_PRE.varbase} ${_CHECK_FILES_POST.varbase}:
- ${_PKG_SILENT}${_PKG_DEBUG} \
+ ${RUN} \
${FIND} ${DESTDIR}${VARBASE}/. -print 2>/dev/null \
| ${SED} -e 's,/\./,/,' \
| ${_CHECK_FILES_SKIP_FILTER} \
@@ -239,28 +239,28 @@ _CHECK_FILES_MISSING_REAL= ${WRKDIR}/.check_files_missing_real
_CHECK_FILES_EXTRA= ${WRKDIR}/.check_files_extra
${_CHECK_FILES_DIFF}: ${_CHECK_FILES_PRE.prefix} ${_CHECK_FILES_POST.prefix}
- ${_PKG_SILENT}${_PKG_DEBUG} \
+ ${RUN} \
${DIFF} -u ${_CHECK_FILES_PRE.prefix} \
${_CHECK_FILES_POST.prefix} \
> ${.TARGET} || ${TRUE}
${_CHECK_FILES_ADDED}: ${_CHECK_FILES_DIFF}
- ${_PKG_SILENT}${_PKG_DEBUG} \
+ ${RUN} \
${GREP} '^+/' ${_CHECK_FILES_DIFF} | ${SED} "s|^+||" | ${SORT} \
> ${.TARGET}
${_CHECK_FILES_DELETED}: ${_CHECK_FILES_DIFF}
- ${_PKG_SILENT}${_PKG_DEBUG} \
+ ${RUN} \
${GREP} '^-/' ${_CHECK_FILES_DIFF} | ${SED} "s|^-||" | ${SORT} \
> ${.TARGET}
${_CHECK_FILES_EXPECTED}: plist
- ${_PKG_SILENT}${_PKG_DEBUG} \
+ ${RUN} \
${GREP} '^[^@]' ${PLIST} | ${SED} "s|^|${DESTDIR}${PREFIX}/|" | ${SORT} \
> ${.TARGET}
${_CHECK_FILES_MISSING}: ${_CHECK_FILES_EXPECTED} ${_CHECK_FILES_ADDED}
- ${_PKG_SILENT}${_PKG_DEBUG} \
+ ${RUN} \
${DIFF} -u ${_CHECK_FILES_EXPECTED} ${_CHECK_FILES_ADDED} | \
${GREP} '^-[^-]' | ${SED} "s|^-||" | \
while read file; do \
@@ -268,21 +268,21 @@ ${_CHECK_FILES_MISSING}: ${_CHECK_FILES_EXPECTED} ${_CHECK_FILES_ADDED}
done > ${.TARGET}
${_CHECK_FILES_MISSING_REAL}: ${_CHECK_FILES_MISSING}
- ${_PKG_SILENT}${_PKG_DEBUG} \
+ ${RUN} \
${CAT} ${_CHECK_FILES_MISSING} | ${_CHECK_FILES_SKIP_FILTER} \
> ${.TARGET} || ${TRUE}
${_CHECK_FILES_MISSING_SKIP}: \
${_CHECK_FILES_MISSING} \
${_CHECK_FILES_MISSING_REAL}
- ${_PKG_SILENT}${_PKG_DEBUG} \
+ ${RUN} \
${DIFF} -u ${_CHECK_FILES_MISSING} \
${_CHECK_FILES_MISSING_REAL} | \
${GREP} '^-[^-]' | ${SED} "s|^-||" \
> ${.TARGET}
${_CHECK_FILES_EXTRA}: ${_CHECK_FILES_EXPECTED} ${_CHECK_FILES_ADDED}
- ${_PKG_SILENT}${_PKG_DEBUG} \
+ ${RUN} \
${DIFF} -u ${_CHECK_FILES_EXPECTED} ${_CHECK_FILES_ADDED} | \
${GREP} '^+[^+]' | ${SED} "s|^+||" | \
while read file; do \
@@ -295,28 +295,28 @@ ${_CHECK_FILES_ERRMSG.prefix}: \
${_CHECK_FILES_MISSING_REAL} \
${_CHECK_FILES_MISSING_SKIP} \
${_CHECK_FILES_EXTRA}
- ${_PKG_SILENT}${_PKG_DEBUG}${RM} -f ${.TARGET}
- ${_PKG_SILENT}${_PKG_DEBUG} \
+ ${RUN}${RM} -f ${.TARGET}
+ ${RUN} \
if ${_NONZERO_FILESIZE_P} ${_CHECK_FILES_DELETED}; then \
${ECHO} "The following files have been deleted" \
"from ${PREFIX}!"; \
${SED} "s|^| |" ${_CHECK_FILES_DELETED}; \
fi >> ${.TARGET}
- ${_PKG_SILENT}${_PKG_DEBUG} \
+ ${RUN} \
if ${_NONZERO_FILESIZE_P} ${_CHECK_FILES_MISSING_REAL}; then \
${ECHO} "************************************************************"; \
${ECHO} "The following files are in the" \
"PLIST but not in ${PREFIX}:"; \
${SED} "s|^| |" ${_CHECK_FILES_MISSING_REAL}; \
fi >> ${.TARGET}
- ${_PKG_SILENT}${_PKG_DEBUG} \
+ ${RUN} \
if ${_NONZERO_FILESIZE_P} ${_CHECK_FILES_EXTRA}; then \
${ECHO} "************************************************************"; \
${ECHO} "The following files are in" \
"${PREFIX} but not in the PLIST:"; \
${SED} "s|^| |" ${_CHECK_FILES_EXTRA}; \
fi >> ${.TARGET}
- ${_PKG_SILENT}${_PKG_DEBUG} \
+ ${RUN} \
if ${_NONZERO_FILESIZE_P} ${_CHECK_FILES_MISSING_SKIP}; then \
${ECHO} "************************************************************"; \
${ECHO} "The following files are in both the" \
@@ -330,7 +330,7 @@ ${_CHECK_FILES_ERRMSG.prefix}: \
${_CHECK_FILES_ERRMSG.sysconfdir}: \
${_CHECK_FILES_PRE.sysconfdir} \
${_CHECK_FILES_POST.sysconfdir}
- ${_PKG_SILENT}${_PKG_DEBUG} \
+ ${RUN} \
if ${CMP} -s ${_CHECK_FILES_PRE.sysconfdir} \
${_CHECK_FILES_POST.sysconfdir}; then \
${DO_NADA}; \
@@ -350,7 +350,7 @@ ${_CHECK_FILES_ERRMSG.sysconfdir}: \
${_CHECK_FILES_ERRMSG.varbase}: \
${_CHECK_FILES_PRE.varbase} \
${_CHECK_FILES_POST.varbase}
- ${_PKG_SILENT}${_PKG_DEBUG} \
+ ${RUN} \
if ${CMP} -s ${_CHECK_FILES_PRE.varbase} \
${_CHECK_FILES_POST.varbase}; then \
${DO_NADA}; \
@@ -371,7 +371,7 @@ ${_CHECK_FILES_ERRMSG.varbase}: \
.PHONY: check-files-clean
check-clean: check-files-clean
check-files-clean:
- ${_PKG_SILENT}${_PKG_DEBUG} \
+ ${RUN} \
${RM} -f ${_CHECK_FILES_ERRMSGS} \
${_CHECK_FILES_PRE} ${_CHECK_FILES_POST} \
${_CHECK_FILES_DIFF} ${_CHECK_FILES_ADDED} \
diff --git a/mk/check/check-shlibs.mk b/mk/check/check-shlibs.mk
index 6264bc336cd..22783994cac 100644
--- a/mk/check/check-shlibs.mk
+++ b/mk/check/check-shlibs.mk
@@ -1,4 +1,4 @@
-# $NetBSD: check-shlibs.mk,v 1.13 2008/01/16 14:03:31 joerg Exp $
+# $NetBSD: check-shlibs.mk,v 1.14 2008/02/07 21:36:13 rillig Exp $
#
# This file verifies that all libraries used by the package can be found
# at run-time.
@@ -53,7 +53,7 @@ CHECK_SHLIBS_ELF_ENV+= WRKDIR=${WRKDIR:Q}
_check-shlibs: error-check .PHONY
@${STEP_MSG} "Checking for missing run-time search paths in ${PKGNAME}"
${RUN} rm -f ${ERROR_DIR}/${.TARGET}
- ${_PKG_SILENT}${_PKG_DEBUG} \
+ ${RUN} \
cd ${DESTDIR:Q}${PREFIX:Q}; \
${_CHECK_SHLIBS_FILELIST_CMD} | \
${EGREP} -h ${_CHECK_SHLIBS_ERE:Q} | \
@@ -63,7 +63,7 @@ _check-shlibs: error-check .PHONY
_check-shlibs: error-check .PHONY
@${STEP_MSG} "Checking for missing run-time search paths in ${PKGNAME}"
${RUN} rm -f ${ERROR_DIR}/${.TARGET}
- ${_PKG_SILENT}${_PKG_DEBUG} \
+ ${RUN} \
exec 1>${ERROR_DIR}/${.TARGET}; \
case ${LDD:Q}"" in \
"") ldd=`${TYPE} ldd 2>/dev/null | ${AWK} '{ print $$NF }'` ;; \
@@ -77,7 +77,7 @@ _check-shlibs: error-check .PHONY
err=`$$ldd $$file 2>&1 | ${GREP} "not found" || ${TRUE}`; \
${TEST} -z "$$err" || ${ECHO} "${DESTDIR}${PREFIX}/$$file: $$err"; \
done
- ${_PKG_SILENT}${_PKG_DEBUG} \
+ ${RUN} \
exec 1>>${ERROR_DIR}/${.TARGET}; \
if ${_NONZERO_FILESIZE_P} ${ERROR_DIR}/${.TARGET}; then \
${ECHO} "*** The programs/libs shown above will not find the listed"; \
diff --git a/mk/check/check-wrkref.mk b/mk/check/check-wrkref.mk
index 637dd72e7a0..44a846cbcdc 100644
--- a/mk/check/check-wrkref.mk
+++ b/mk/check/check-wrkref.mk
@@ -1,4 +1,4 @@
-# $NetBSD: check-wrkref.mk,v 1.15 2007/09/13 09:52:46 rillig Exp $
+# $NetBSD: check-wrkref.mk,v 1.16 2008/02/07 21:36:13 rillig Exp $
#
# This file checks that the installed files don't contain any strings
# that point to the directory where the package had been built, to make
@@ -69,7 +69,7 @@ privileged-install-hook: _check-wrkref
_check-wrkref: error-check .PHONY
@${STEP_MSG} "Checking for work-directory references in ${PKGNAME}"
${RUN} rm -f ${ERROR_DIR}/${.TARGET}
- ${_PKG_SILENT}${_PKG_DEBUG} \
+ ${RUN} \
exec 1>${ERROR_DIR}/${.TARGET}; \
cd ${DESTDIR}${PREFIX}; \
${_CHECK_WRKREF_FILELIST_CMD} | ${SORT} | \