[pkgsrc/trunk]: pkgsrc/mk/install Make sure that _UPDATE_RUNNING=YES is passe...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/90a7d3e1f6a9
branches:  trunk
changeset: 560716:90a7d3e1f6a9
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Wed Jun 17 12:54:57 2009 +0000

description:
Make sure that _UPDATE_RUNNING=YES is passed down to su-deinstall for
PKG_PRESERVE packages (e.g. pkg_install). Otherwise an old version of
pkg_install is not removed from pkgdb.

diffstat:

 mk/flavor/pkg/deinstall.mk |  4 +++-
 mk/install/deinstall.mk    |  4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diffs (36 lines):

diff -r 14bb779dd458 -r 90a7d3e1f6a9 mk/flavor/pkg/deinstall.mk
--- a/mk/flavor/pkg/deinstall.mk        Wed Jun 17 10:33:36 2009 +0000
+++ b/mk/flavor/pkg/deinstall.mk        Wed Jun 17 12:54:57 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: deinstall.mk,v 1.9 2009/05/16 01:34:22 joerg Exp $
+# $NetBSD: deinstall.mk,v 1.10 2009/06/17 12:54:57 joerg Exp $
 
 # Set the appropriate flags to pass to pkg_delete(1) based on the value
 # of DEINSTALLDEPENDS (see pkgsrc/mk/install/deinstall.mk).
@@ -20,6 +20,8 @@
 .if defined(PKG_PRESERVE)
 .  if defined(_UPDATE_RUNNING) && !empty(_UPDATE_RUNNING:M[yY][eE][sS])
 _PKG_ARGS_DEINSTALL+=  -N -f -f        # update w/o removing any files
+
+MAKEFLAGS.su-deinstall+=       _UPDATE_RUNNING=YES
 .  endif
 .endif
 
diff -r 14bb779dd458 -r 90a7d3e1f6a9 mk/install/deinstall.mk
--- a/mk/install/deinstall.mk   Wed Jun 17 10:33:36 2009 +0000
+++ b/mk/install/deinstall.mk   Wed Jun 17 12:54:57 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: deinstall.mk,v 1.9 2007/08/20 10:59:05 joerg Exp $
+# $NetBSD: deinstall.mk,v 1.10 2009/06/17 12:54:57 joerg Exp $
 
 # DEINSTALLDEPENDS controls whether dependencies and dependents are also
 # removed when a package is de-installed.  The valid values are:
@@ -40,7 +40,7 @@
 acquire-deinstall-lock: acquire-localbase-lock
 release-deinstall-lock: release-localbase-lock
 
-MAKEFLAGS.su-deinstall=        DEINSTALLDEPENDS=${DEINSTALLDEPENDS}
+MAKEFLAGS.su-deinstall+=       DEINSTALLDEPENDS=${DEINSTALLDEPENDS}
 
 ######################################################################
 ### reinstall (PUBLIC)