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

use PKGBASE instead of PKGNAME when printing informational messages

Browse source 
such as "Deinstalling", as this lead to confusing/misleading output
when the (previously) installed pkg has a different version number
than the pkgsrc version.
This commit is contained in:
grant 2003-09-28 08:52:13 +00:00
parent ed485850eb
commit d5a8f38186
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
mk/bsd.pkg.mk
View file

@ -1,4 +1,4 @@
# $NetBSD: bsd.pkg.mk,v 1.1290 2003/09/25 02:25:12 danw Exp $ # $NetBSD: bsd.pkg.mk,v 1.1291 2003/09/28 08:52:13 grant Exp $
# #
# This file is in the public domain. # This file is in the public domain.
# #
@ -3146,7 +3146,7 @@ _SU_TARGET= \
${ECHO} "*** WARNING *** Running: ${PRE_ROOT_CMD}"; \ ${ECHO} "*** WARNING *** Running: ${PRE_ROOT_CMD}"; \
${PRE_ROOT_CMD}; \ ${PRE_ROOT_CMD}; \
fi; \ fi; \
${ECHO_MSG} "${_PKGSRC_IN}> Becoming root@`${HOSTNAME_CMD}` to $$action ${PKGNAME}."; \ ${ECHO_MSG} "${_PKGSRC_IN}> Becoming root@`${HOSTNAME_CMD}` to $$action ${PKGBASE}."; \
${ECHO_MSG} -n "`${ECHO} ${SU_CMD} | ${AWK} '{ print $$1 }'` ";\ ${ECHO_MSG} -n "`${ECHO} ${SU_CMD} | ${AWK} '{ print $$1 }'` ";\
${SU_CMD} "cd ${.CURDIR}; ${SETENV} PATH=$${PATH}:${SU_CMD_PATH_APPEND} ${MAKE} $$args ${MAKEFLAGS} $$realtarget $$realflags"; \ ${SU_CMD} "cd ${.CURDIR}; ${SETENV} PATH=$${PATH}:${SU_CMD_PATH_APPEND} ${MAKE} $$args ${MAKEFLAGS} $$realtarget $$realflags"; \
fi fi
@ -3229,7 +3229,7 @@ reinstall:
deinstall: do-su-deinstall deinstall: do-su-deinstall
do-su-deinstall: uptodate-pkgtools do-su-deinstall: uptodate-pkgtools
@${ECHO_MSG} "${_PKGSRC_IN}> Deinstalling for ${PKGNAME}" @${ECHO_MSG} "${_PKGSRC_IN}> Deinstalling for ${PKGBASE}"
${_PKG_SILENT}${_PKG_DEBUG} \ ${_PKG_SILENT}${_PKG_DEBUG} \
realtarget="real-su-deinstall"; \ realtarget="real-su-deinstall"; \
realflags="DEINSTALLDEPENDS=${DEINSTALLDEPENDS}"; \ realflags="DEINSTALLDEPENDS=${DEINSTALLDEPENDS}"; \