From 043a1db6f8e388d6049461b4c8b7de05e55032e6 Mon Sep 17 00:00:00 2001
From: jlam <jlam>
Date: Fri, 5 Sep 2003 15:00:10 +0000
Subject: "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.

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

(limited to 'mk/bsd.pkg.mk')

diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index 765aa2478d7..d35f28b42c0 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -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 @@ real-su-deinstall-flags+=	-v
 .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} ; \
-- 
cgit v1.2.3