[pkgsrc/trunk]: pkgsrc/mk "make deinstall" now tries to just delete this part...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/95b45e955855
branches:  trunk
changeset: 460842:95b45e955855
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Fri Sep 05 15:00:10 2003 +0000

description:
"make deinstall" now tries to just delete this particular package first
before trying to delete all packages with the same PKGBASE.  This is better
semantics in a pkgviews world.

diffstat:

 mk/bsd.pkg.mk |  7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diffs (21 lines):

diff -r a115c271394f -r 95b45e955855 mk/bsd.pkg.mk
--- a/mk/bsd.pkg.mk     Fri Sep 05 13:54:13 2003 +0000
+++ b/mk/bsd.pkg.mk     Fri Sep 05 15:00:10 2003 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.pkg.mk,v 1.1260 2003/09/05 11:34:26 jlam Exp $
+#      $NetBSD: bsd.pkg.mk,v 1.1261 2003/09/05 15:00:10 jlam Exp $
 #
 # This file is in the public domain.
 #
@@ -3246,7 +3246,10 @@
 .PHONY: real-su-deinstall
 real-su-deinstall:
        ${_PKG_SILENT}${_PKG_DEBUG}                                     \
-       found="`${PKG_INFO} -e \"${PKGWILDCARD}\" || ${TRUE}`";         \
+       found="`${PKG_INFO} -e \"${PKGNAME}\" || ${TRUE}`";             \
+       case "$$found" in                                               \
+       "") found="`${PKG_INFO} -e \"${PKGWILDCARD}\" || ${TRUE}`" ;;   \
+       esac;                                                           \
        if [ "$$found" != "" ]; then                                    \
                ${ECHO} Running ${PKG_DELETE} ${real-su-deinstall-flags} $$found ; \
                ${PKG_DELETE} ${real-su-deinstall-flags} $$found || ${TRUE} ; \