diff options
| author | grant <grant@pkgsrc.org> | 2003-09-28 08:52:13 +0000 |
|---|---|---|
| committer | grant <grant@pkgsrc.org> | 2003-09-28 08:52:13 +0000 |
| commit | d5a8f38186f67aad1e110b8c45c7fe3e91b122f2 (patch) | |
| tree | adfab0459bc3d842ea88fef7965f1f9f316a021b | |
| parent | ed485850eb7fb8ac8ca96300bb093646bbfa53eb (diff) | |
| download | pkgsrc-d5a8f38186f67aad1e110b8c45c7fe3e91b122f2.tar.gz | |
use PKGBASE instead of PKGNAME when printing informational messages
such as "Deinstalling", as this lead to confusing/misleading output
when the (previously) installed pkg has a different version number
than the pkgsrc version.
| -rw-r--r-- | mk/bsd.pkg.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index e160a6f2a55..4a5b413f3a1 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -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. # @@ -3146,7 +3146,7 @@ _SU_TARGET= \ ${ECHO} "*** WARNING *** Running: ${PRE_ROOT_CMD}"; \ ${PRE_ROOT_CMD}; \ 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 }'` ";\ ${SU_CMD} "cd ${.CURDIR}; ${SETENV} PATH=$${PATH}:${SU_CMD_PATH_APPEND} ${MAKE} $$args ${MAKEFLAGS} $$realtarget $$realflags"; \ fi @@ -3229,7 +3229,7 @@ reinstall: deinstall: do-su-deinstall do-su-deinstall: uptodate-pkgtools - @${ECHO_MSG} "${_PKGSRC_IN}> Deinstalling for ${PKGNAME}" + @${ECHO_MSG} "${_PKGSRC_IN}> Deinstalling for ${PKGBASE}" ${_PKG_SILENT}${_PKG_DEBUG} \ realtarget="real-su-deinstall"; \ realflags="DEINSTALLDEPENDS=${DEINSTALLDEPENDS}"; \ |