pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/mk use PKGBASE instead of PKGNAME when printing inform...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/58706295aec8
branches:  trunk
changeset: 462212:58706295aec8
user:      grant <grant%pkgsrc.org@localhost>
date:      Sun Sep 28 08:52:13 2003 +0000

description:
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.

diffstat:

 mk/bsd.pkg.mk |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r c80b935f91b2 -r 58706295aec8 mk/bsd.pkg.mk
--- a/mk/bsd.pkg.mk     Sun Sep 28 05:27:06 2003 +0000
+++ b/mk/bsd.pkg.mk     Sun Sep 28 08:52:13 2003 +0000
@@ -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 @@
                        ${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 @@
 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}";               \



Home | Main Index | Thread Index | Old Index