kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Replaced _PKG_SILENT and _PKG_DEBUG with RUN.

Browse source
This commit is contained in:
rillig 2008-11-29 13:54:45 +00:00
parent 2116a707f4
commit 57fbd43ec4
2 changed files with 21 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
mk/flavor/pkg/install.mk
View file

@ -1,4 +1,4 @@
# $NetBSD: install.mk,v 1.12 2007/08/10 04:03:23 jlam Exp $
# $NetBSD: install.mk,v 1.13 2008/11/29 13:54:45 rillig Exp $
#
# _flavor-check-conflicts:
# Checks for conflicts between the package and installed packages.
@ -20,16 +20,16 @@
#
_flavor-check-conflicts: .PHONY error-check
${_PKG_SILENT}${_PKG_DEBUG}${RM} -f ${WRKDIR}/.CONFLICTS
${RUN}${RM} -f ${WRKDIR}/.CONFLICTS
.for _conflict_ in ${CONFLICTS}
${_PKG_SILENT}${_PKG_DEBUG} \
${RUN} \
found="`${_PKG_BEST_EXISTS} ${_conflict_:Q} || ${TRUE}`"; \
case "$$found" in \
"") ;; \
*) ${ECHO} "$$found" >> ${WRKDIR}/.CONFLICTS ;; \
esac
.endfor
${_PKG_SILENT}${_PKG_DEBUG} \
${RUN} \
${TEST} -f ${WRKDIR}/.CONFLICTS || exit 0; \
exec 1>${ERROR_DIR}/${.TARGET}; \
${ECHO} "${PKGNAME} conflicts with installed package(s):"; \
@ -39,7 +39,7 @@ _flavor-check-conflicts: .PHONY error-check
${RM} -f ${WRKDIR}/.CONFLICTS
_flavor-check-installed: .PHONY error-check
${_PKG_SILENT}${_PKG_DEBUG} \
${RUN} \
found="`${_PKG_BEST_EXISTS} ${PKGWILDCARD:Q} || ${TRUE}`"; \
${TEST} -n "$$found" || exit 0; \
exec 1>${ERROR_DIR}/${.TARGET}; \
@ -59,15 +59,15 @@ _REGISTER_DEPENDENCIES= \
_flavor-register: .PHONY _flavor-generate-metadata ${_RDEPENDS_FILE}
@${STEP_MSG} "Registering installation for ${PKGNAME}"
${_PKG_SILENT}${_PKG_DEBUG}${RM} -fr ${_PKG_DBDIR}/${PKGNAME}
${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${_PKG_DBDIR}/${PKGNAME}
${_PKG_SILENT}${_PKG_DEBUG}${CP} ${PKG_DB_TMPDIR}/* ${_PKG_DBDIR}/${PKGNAME}
${_PKG_SILENT}${_PKG_DEBUG}${PKG_ADMIN} add ${PKGNAME}
${_PKG_SILENT}${_PKG_DEBUG} \
${RUN}${RM} -fr ${_PKG_DBDIR}/${PKGNAME}
${RUN}${MKDIR} ${_PKG_DBDIR}/${PKGNAME}
${RUN}${CP} ${PKG_DB_TMPDIR}/* ${_PKG_DBDIR}/${PKGNAME}
${RUN}${PKG_ADMIN} add ${PKGNAME}
${RUN} \
case ${_AUTOMATIC:Q}"" in \
[yY][eE][sS]) ${PKG_ADMIN} set automatic=yes ${PKGNAME} ;; \
esac
${_PKG_SILENT}${_PKG_DEBUG}${_FULL_DEPENDS_CMD} | \
${RUN}${_FULL_DEPENDS_CMD} | \
${SORT} -u | ${_REGISTER_DEPENDENCIES} ${PKGNAME}
_flavor-install-clean: .PHONY _flavor-clean-metadata

20
mk/flavor/pkg/utility.mk
View file

@ -1,19 +1,19 @@
# $NetBSD: utility.mk,v 1.10 2008/02/18 14:30:40 obache Exp $
# $NetBSD: utility.mk,v 1.11 2008/11/29 13:54:45 rillig Exp $
# The 'info' target can be used to display information about a package.
.PHONY: info
info:
${_PKG_SILENT}${_PKG_DEBUG}${PKG_INFO} "${PKGWILDCARD}"
${RUN}${PKG_INFO} "${PKGWILDCARD}"
# The 'check' target can be used to check an installed package.
.PHONY: check
check:
${_PKG_SILENT}${_PKG_DEBUG}${PKG_ADMIN} check "${PKGWILDCARD}"
${RUN}${PKG_ADMIN} check "${PKGWILDCARD}"
# The 'list' target can be used to list the files installed by a package.
.PHONY: list
list:
${_PKG_SILENT}${_PKG_DEBUG}${PKG_INFO} -L "${PKGWILDCARD}"
${RUN}${PKG_INFO} -L "${PKGWILDCARD}"
######################################################################
###
@ -27,9 +27,9 @@ list:
#
show-downlevel: .PHONY
.if defined(PKG_FAIL_REASON)
${_PKG_SILENT}${_PKG_DEBUG}${DO_NADA}
${RUN}${DO_NADA}
.else
${_PKG_SILENT}${_PKG_DEBUG} \
${RUN} \
found="`${_PKG_BEST_EXISTS} \"${PKGWILDCARD}\" || ${TRUE}`"; \
if [ "X$$found" != "X" -a "X$$found" != "X${PKGNAME}" ]; then \
${ECHO} "${PKGBASE} package: $$found installed, pkgsrc version ${PKGNAME}"; \
@ -43,7 +43,7 @@ show-downlevel: .PHONY
.PHONY: show-installed-depends
show-installed-depends: # will not be removed
.if !empty(DEPENDS)
${_PKG_SILENT}${_PKG_DEBUG} \
${RUN} \
for i in ${DEPENDS:C/:.*$//:Q:S/\ / /g} ; do \
echo "$$i =>" `${_PKG_BEST_EXISTS} "$$i"`; \
done
@ -52,7 +52,7 @@ show-installed-depends: # will not be removed
.PHONY: show-needs-update
show-needs-update: _about-to-be-removed
.if !empty(DEPENDS)
${_PKG_SILENT}${_PKG_DEBUG} \
${RUN} \
${_DEPENDS_WALK_CMD} -r ${PKGPATH} | \
while read i; do \
cd ${PKGSRCDIR}/$$i; \
@ -69,9 +69,9 @@ show-needs-update: _about-to-be-removed
.PHONY: show-pkgsrc-dir
show-pkgsrc-dir: _about-to-be-removed
.if defined(PKG_FAIL_REASON)
${_PKG_SILENT}${_PKG_DEBUG}${DO_NADA}
${RUN}${DO_NADA}
.else
${_PKG_SILENT}${_PKG_DEBUG} \
${RUN} \
found="`${_PKG_BEST_EXISTS} \"${PKGWILDCARD}\" || ${TRUE}`"; \
if [ "X$$found" != "X" ]; then \
${ECHO} ${PKGPATH}; \