pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/mk/pkginstall Replaced _PKG_SILENT and _PKG_DEBUG with...
details: https://anonhg.NetBSD.org/pkgsrc/rev/2174fffb7592
branches: trunk
changeset: 537992:2174fffb7592
user: rillig <rillig%pkgsrc.org@localhost>
date: Wed Jan 23 14:12:32 2008 +0000
description:
Replaced _PKG_SILENT and _PKG_DEBUG with RUN, after making sure that the
additional error checking won't break anything that isn't intended to
break.
diffstat:
mk/pkginstall/bsd.pkginstall.mk | 161 +++++++++++++++++++--------------------
1 files changed, 79 insertions(+), 82 deletions(-)
diffs (truncated from 458 to 300 lines):
diff -r 93c8e73f56f2 -r 2174fffb7592 mk/pkginstall/bsd.pkginstall.mk
--- a/mk/pkginstall/bsd.pkginstall.mk Wed Jan 23 14:07:07 2008 +0000
+++ b/mk/pkginstall/bsd.pkginstall.mk Wed Jan 23 14:12:32 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkginstall.mk,v 1.38 2007/12/13 11:10:42 rillig Exp $
+# $NetBSD: bsd.pkginstall.mk,v 1.39 2008/01/23 14:12:32 rillig Exp $
#
# This Makefile fragment is included by bsd.pkg.mk and implements the
# common INSTALL/DEINSTALL scripts framework. To use the pkginstall
@@ -255,15 +255,15 @@
.endfor
${_INSTALL_USERGROUP_DATAFILE}:
- ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${.TARGET:H}
- ${_PKG_SILENT}${_PKG_DEBUG} \
+ ${RUN}${MKDIR} ${.TARGET:H}
+ ${RUN} \
set -- dummy ${_PKG_GROUPS:C/\:*$//}; shift; \
exec 1>>${.TARGET}; \
while ${TEST} $$# -gt 0; do \
i="$$1"; shift; \
${ECHO} "# GROUP: $$i"; \
done
- ${_PKG_SILENT}${_PKG_DEBUG} \
+ ${RUN} \
set -- dummy ${_PKG_USERS:C/\:*$//}; shift; \
exec 1>>${.TARGET}; \
while ${TEST} $$# -gt 0; do \
@@ -275,11 +275,11 @@
${_INSTALL_USERGROUP_FILE}: \
../../mk/pkginstall/usergroup \
${INSTALL_USERGROUPFUNCS_FILE}
- ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${.TARGET:H}
- ${_PKG_SILENT}${_PKG_DEBUG} \
+ ${RUN}${MKDIR} ${.TARGET:H}
+ ${RUN} \
${SED} -e "/^# platform-specific adduser\/addgroup functions/r${_INSTALL_USERGROUPFUNCS_FILE}" ../../mk/pkginstall/usergroup | \
${SED} ${FILES_SUBST_SED} > ${.TARGET}
- ${_PKG_SILENT}${_PKG_DEBUG} \
+ ${RUN} \
if ${_ZERO_FILESIZE_P} ${_INSTALL_USERGROUP_DATAFILE}; then \
${RM} -f ${.TARGET}; \
${TOUCH} ${TOUCH_ARGS} ${.TARGET}; \
@@ -290,8 +290,8 @@
${_INSTALL_USERGROUP_UNPACKER}: \
${_INSTALL_USERGROUP_FILE} \
${_INSTALL_USERGROUP_DATAFILE}
- ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${.TARGET:H}
- ${_PKG_SILENT}${_PKG_DEBUG} \
+ ${RUN}${MKDIR} ${.TARGET:H}
+ ${RUN} \
exec 1>${.TARGET}; \
${ECHO} "#!${SH}"; \
${ECHO} ""; \
@@ -304,7 +304,7 @@
${ECHO} ""; \
${CAT} ${_INSTALL_USERGROUP_FILE} \
${_INSTALL_USERGROUP_DATAFILE}
- ${_PKG_SILENT}${_PKG_DEBUG}${CHMOD} +x ${.TARGET}
+ ${RUN}${CHMOD} +x ${.TARGET}
.if defined(USERGROUP_PHASE)
. if !empty(USERGROUP_PHASE:M*configure)
@@ -330,7 +330,7 @@
.PHONY: su-create-usergroup
su-create-usergroup: ${_INSTALL_USERGROUP_UNPACKER}
- ${_PKG_SILENT}${_PKG_DEBUG} \
+ ${RUN} \
cd ${_PKGINSTALL_DIR} && \
${SH} ${_INSTALL_USERGROUP_UNPACKER}; \
exitcode=1; \
@@ -371,8 +371,8 @@
_INSTALL_DATA_TMPL+= ${_INSTALL_PERMS_DATAFILE}
${_INSTALL_PERMS_DATAFILE}:
- ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${.TARGET:H}
- ${_PKG_SILENT}${_PKG_DEBUG}${_FUNC_STRIP_PREFIX}; \
+ ${RUN}${MKDIR} ${.TARGET:H}
+ ${RUN}${_FUNC_STRIP_PREFIX}; \
set -- dummy ${SPECIAL_PERMS}; shift; \
exec 1>>${.TARGET}; \
while ${TEST} $$# -gt 0; do \
@@ -384,10 +384,10 @@
${_INSTALL_PERMS_FILE}: ${_INSTALL_PERMS_DATAFILE}
${_INSTALL_PERMS_FILE}: ../../mk/pkginstall/perms
- ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${.TARGET:H}
- ${_PKG_SILENT}${_PKG_DEBUG} \
+ ${RUN}${MKDIR} ${.TARGET:H}
+ ${RUN} \
${SED} ${FILES_SUBST_SED} ../../mk/pkginstall/perms > ${.TARGET}
- ${_PKG_SILENT}${_PKG_DEBUG} \
+ ${RUN} \
if ${_ZERO_FILESIZE_P} ${_INSTALL_PERMS_DATAFILE}; then \
${RM} -f ${.TARGET}; \
${TOUCH} ${TOUCH_ARGS} ${.TARGET}; \
@@ -486,8 +486,8 @@
done
${_INSTALL_FILES_DATAFILE}:
- ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${.TARGET:H}
- ${_PKG_SILENT}${_PKG_DEBUG}${_FUNC_STRIP_PREFIX}; \
+ ${RUN}${MKDIR} ${.TARGET:H}
+ ${RUN}${_FUNC_STRIP_PREFIX}; \
set -- dummy ${RCD_SCRIPTS}; shift; \
exec 1>>${.TARGET}; \
while ${TEST} $$# -gt 0; do \
@@ -496,7 +496,7 @@
egfile="${RCD_SCRIPTS_EXAMPLEDIR}/$$script"; \
${ECHO} "# FILE: $$file cr $$egfile ${RCD_SCRIPTS_MODE}"; \
done
- ${_PKG_SILENT}${_PKG_DEBUG}${_FUNC_STRIP_PREFIX}; \
+ ${RUN}${_FUNC_STRIP_PREFIX}; \
set -- dummy ${CONF_FILES}; shift; \
exec 1>>${.TARGET}; \
while ${TEST} $$# -gt 0; do \
@@ -506,7 +506,7 @@
file=`strip_prefix "$$file"`; \
${ECHO} "# FILE: $$file c $$egfile ${CONF_FILES_MODE}"; \
done
- ${_PKG_SILENT}${_PKG_DEBUG}${_FUNC_STRIP_PREFIX}; \
+ ${RUN}${_FUNC_STRIP_PREFIX}; \
set -- dummy ${REQD_FILES}; shift; \
exec 1>>${.TARGET}; \
while ${TEST} $$# -gt 0; do \
@@ -516,7 +516,7 @@
file=`strip_prefix "$$file"`; \
${ECHO} "# FILE: $$file cf $$egfile ${REQD_FILES_MODE}"; \
done
- ${_PKG_SILENT}${_PKG_DEBUG}${_FUNC_STRIP_PREFIX}; \
+ ${RUN}${_FUNC_STRIP_PREFIX}; \
set -- dummy ${CONF_FILES_PERMS}; shift; \
exec 1>>${.TARGET}; \
while ${TEST} $$# -gt 0; do \
@@ -527,7 +527,7 @@
file=`strip_prefix "$$file"`; \
${ECHO} "# FILE: $$file c $$egfile $$mode $$owner $$group"; \
done
- ${_PKG_SILENT}${_PKG_DEBUG}${_FUNC_STRIP_PREFIX}; \
+ ${RUN}${_FUNC_STRIP_PREFIX}; \
set -- dummy ${REQD_FILES_PERMS}; shift; \
exec 1>>${.TARGET}; \
while ${TEST} $$# -gt 0; do \
@@ -541,10 +541,10 @@
${_INSTALL_FILES_FILE}: ${_INSTALL_FILES_DATAFILE}
${_INSTALL_FILES_FILE}: ../../mk/pkginstall/files
- ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${.TARGET:H}
- ${_PKG_SILENT}${_PKG_DEBUG} \
+ ${RUN}${MKDIR} ${.TARGET:H}
+ ${RUN} \
${SED} ${FILES_SUBST_SED} ../../mk/pkginstall/files > ${.TARGET}
- ${_PKG_SILENT}${_PKG_DEBUG} \
+ ${RUN} \
if ${_ZERO_FILESIZE_P} ${_INSTALL_FILES_DATAFILE}; then \
${RM} -f ${.TARGET}; \
${TOUCH} ${TOUCH_ARGS} ${.TARGET}; \
@@ -589,8 +589,8 @@
_INSTALL_DATA_TMPL+= ${_INSTALL_DIRS_DATAFILE}
${_INSTALL_DIRS_DATAFILE}:
- ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${.TARGET:H}
- ${_PKG_SILENT}${_PKG_DEBUG}${_FUNC_STRIP_PREFIX}; \
+ ${RUN}${MKDIR} ${.TARGET:H}
+ ${RUN}${_FUNC_STRIP_PREFIX}; \
exec 1>>${.TARGET}; \
case ${PKG_SYSCONFSUBDIR:M*:Q}${CONF_FILES:M*:Q}${CONF_FILES_PERMS:M*:Q}"" in \
"") ;; \
@@ -608,13 +608,13 @@
esac; \
;; \
esac
- ${_PKG_SILENT}${_PKG_DEBUG} \
+ ${RUN} \
exec 1>>${.TARGET}; \
case ${RCD_SCRIPTS:M*:Q}"" in \
"") ;; \
*) ${ECHO} "# DIR: ${RCD_SCRIPTS_DIR:S/${PREFIX}\///} m" ;; \
esac
- ${_PKG_SILENT}${_PKG_DEBUG}${_FUNC_STRIP_PREFIX}; \
+ ${RUN}${_FUNC_STRIP_PREFIX}; \
set -- dummy ${MAKE_DIRS}; shift; \
exec 1>>${.TARGET}; \
while ${TEST} $$# -gt 0; do \
@@ -622,7 +622,7 @@
dir=`strip_prefix "$$dir"`; \
${ECHO} "# DIR: $$dir m"; \
done
- ${_PKG_SILENT}${_PKG_DEBUG}${_FUNC_STRIP_PREFIX}; \
+ ${RUN}${_FUNC_STRIP_PREFIX}; \
set -- dummy ${REQD_DIRS}; shift; \
exec 1>>${.TARGET}; \
while ${TEST} $$# -gt 0; do \
@@ -630,7 +630,7 @@
dir=`strip_prefix "$$dir"`; \
${ECHO} "# DIR: $$dir fm"; \
done
- ${_PKG_SILENT}${_PKG_DEBUG}${_FUNC_STRIP_PREFIX}; \
+ ${RUN}${_FUNC_STRIP_PREFIX}; \
set -- dummy ${OWN_DIRS}; shift; \
exec 1>>${.TARGET}; \
while ${TEST} $$# -gt 0; do \
@@ -638,7 +638,7 @@
dir=`strip_prefix "$$dir"`; \
${ECHO} "# DIR: $$dir mo"; \
done
- ${_PKG_SILENT}${_PKG_DEBUG}${_FUNC_STRIP_PREFIX}; \
+ ${RUN}${_FUNC_STRIP_PREFIX}; \
set -- dummy ${MAKE_DIRS_PERMS}; shift; \
exec 1>>${.TARGET}; \
while ${TEST} $$# -gt 0; do \
@@ -647,7 +647,7 @@
dir=`strip_prefix "$$dir"`; \
${ECHO} "# DIR: $$dir m $$mode $$owner $$group"; \
done
- ${_PKG_SILENT}${_PKG_DEBUG}${_FUNC_STRIP_PREFIX}; \
+ ${RUN}${_FUNC_STRIP_PREFIX}; \
set -- dummy ${REQD_DIRS_PERMS}; shift; \
exec 1>>${.TARGET}; \
while ${TEST} $$# -gt 0; do \
@@ -656,7 +656,7 @@
dir=`strip_prefix "$$dir"`; \
${ECHO} "# DIR: $$dir fm $$mode $$owner $$group"; \
done
- ${_PKG_SILENT}${_PKG_DEBUG}${_FUNC_STRIP_PREFIX}; \
+ ${RUN}${_FUNC_STRIP_PREFIX}; \
set -- dummy ${OWN_DIRS_PERMS}; shift; \
exec 1>>${.TARGET}; \
while ${TEST} $$# -gt 0; do \
@@ -668,10 +668,10 @@
${_INSTALL_DIRS_FILE}: ${_INSTALL_DIRS_DATAFILE}
${_INSTALL_DIRS_FILE}: ../../mk/pkginstall/dirs
- ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${.TARGET:H}
- ${_PKG_SILENT}${_PKG_DEBUG} \
+ ${RUN}${MKDIR} ${.TARGET:H}
+ ${RUN} \
${SED} ${FILES_SUBST_SED} ../../mk/pkginstall/dirs > ${.TARGET}
- ${_PKG_SILENT}${_PKG_DEBUG} \
+ ${RUN} \
if ${_ZERO_FILESIZE_P} ${_INSTALL_DIRS_DATAFILE}; then \
${RM} -f ${.TARGET}; \
${TOUCH} ${TOUCH_ARGS} ${.TARGET}; \
@@ -696,17 +696,17 @@
.endif
${_INSTALL_INFO_FILES_DATAFILE}:
- ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${.TARGET:H}
- ${_PKG_SILENT}${_PKG_DEBUG}${RM} -f ${.TARGET}
- ${_PKG_SILENT}${_PKG_DEBUG}${TOUCH} ${TOUCH_ARGS} ${.TARGET}
+ ${RUN}${MKDIR} ${.TARGET:H}
+ ${RUN}${RM} -f ${.TARGET}
+ ${RUN}${TOUCH} ${TOUCH_ARGS} ${.TARGET}
${_INSTALL_INFO_FILES_FILE}: ${_INSTALL_INFO_FILES_DATAFILE}
${_INSTALL_INFO_FILES_FILE}: ../../mk/pkginstall/info-files
- ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${.TARGET:H}
- ${_PKG_SILENT}${_PKG_DEBUG} \
+ ${RUN}${MKDIR} ${.TARGET:H}
+ ${RUN} \
${SED} ${FILES_SUBST_SED} ../../mk/pkginstall/info-files > ${.TARGET}
.if !defined(INFO_FILES)
- ${_PKG_SILENT}${_PKG_DEBUG} \
+ ${RUN} \
if ${_ZERO_FILESIZE_P} ${_INSTALL_INFO_FILES_DATAFILE}; then \
${RM} -f ${.TARGET}; \
${TOUCH} ${TOUCH_ARGS} ${.TARGET}; \
@@ -717,7 +717,7 @@
install-script-data: install-script-data-info-files
install-script-data-info-files:
.if defined(INFO_FILES)
- ${_PKG_SILENT}${_PKG_DEBUG}${_FUNC_STRIP_PREFIX}; \
+ ${RUN}${_FUNC_STRIP_PREFIX}; \
if ${TEST} -x ${INSTALL_FILE}; then \
${INFO_FILES_cmd} | \
while read file; do \
@@ -748,8 +748,8 @@
_INSTALL_DATA_TMPL+= ${_INSTALL_SHELL_DATAFILE}
${_INSTALL_SHELL_DATAFILE}:
- ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${.TARGET:H}
- ${_PKG_SILENT}${_PKG_DEBUG}${_FUNC_STRIP_PREFIX}; \
+ ${RUN}${MKDIR} ${.TARGET:H}
+ ${RUN}${_FUNC_STRIP_PREFIX}; \
set -- dummy ${PKG_SHELL}; shift; \
exec 1>>${.TARGET}; \
while ${TEST} $$# -gt 0; do \
@@ -760,10 +760,10 @@
${_INSTALL_SHELL_FILE}: ${_INSTALL_SHELL_DATAFILE}
${_INSTALL_SHELL_FILE}: ../../mk/pkginstall/shell
- ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${.TARGET:H}
- ${_PKG_SILENT}${_PKG_DEBUG} \
+ ${RUN}${MKDIR} ${.TARGET:H}
+ ${RUN} \
${SED} ${FILES_SUBST_SED} ../../mk/pkginstall/shell > ${.TARGET}
- ${_PKG_SILENT}${_PKG_DEBUG} \
+ ${RUN} \
if ${_ZERO_FILESIZE_P} ${_INSTALL_SHELL_DATAFILE}; then \
Home |
Main Index |
Thread Index |
Old Index