diff options
| author | jlam <jlam@pkgsrc.org> | 2003-09-05 15:00:10 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2003-09-05 15:00:10 +0000 |
| commit | 4263b359d640dcaed4f541188904891ea0d7bb8e (patch) | |
| tree | 99b51e21302f72c4bb9df2f1aa2473f542f337af /mk/bsd.pkg.mk | |
| parent | f976153870041fabce3864204df06072a734ae6f (diff) | |
| download | pkgsrc-4263b359d640dcaed4f541188904891ea0d7bb8e.tar.gz | |
"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 (limited to 'mk/bsd.pkg.mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 7 |
1 files changed, 5 insertions, 2 deletions
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} ; \ |