[pkgsrc/pkgsrc-2009Q1]: pkgsrc/mk/flavor/pkg Pullup ticket #2783 - requested ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/ae63919c3572
branches:  pkgsrc-2009Q1
changeset: 556839:ae63919c3572
user:      tron <tron%pkgsrc.org@localhost>
date:      Sat May 30 20:55:24 2009 +0000

description:
Pullup ticket #2783 - requested by joerg
mk/flavor/pkg: fix update of packages that need to be preserved

Revisions pulled up:
- mk/flavor/pkg/deinstall.mk            1.9
---
Module Name:    pkgsrc
Committed By:   joerg
Date:           Sat May 16 01:34:22 UTC 2009

Modified Files:
        pkgsrc/mk/flavor/pkg: deinstall.mk

Log Message:
Remove preserve packages for make update with -N -f -f and therefore do
not depend on the behavior of older pkg_delete to allow the removal with
simple force.

diffstat:

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

diffs (18 lines):

diff -r 7ab5ea2d6b86 -r ae63919c3572 mk/flavor/pkg/deinstall.mk
--- a/mk/flavor/pkg/deinstall.mk        Sat May 23 21:16:10 2009 +0000
+++ b/mk/flavor/pkg/deinstall.mk        Sat May 30 20:55:24 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: deinstall.mk,v 1.8 2008/03/20 20:02:29 agc Exp $
+# $NetBSD: deinstall.mk,v 1.8.14.1 2009/05/30 20:55:24 tron Exp $
 
 # Set the appropriate flags to pass to pkg_delete(1) based on the value
 # of DEINSTALLDEPENDS (see pkgsrc/mk/install/deinstall.mk).
@@ -19,7 +19,7 @@
 
 .if defined(PKG_PRESERVE)
 .  if defined(_UPDATE_RUNNING) && !empty(_UPDATE_RUNNING:M[yY][eE][sS])
-_PKG_ARGS_DEINSTALL+=  -N -f   # update w/o removing any files
+_PKG_ARGS_DEINSTALL+=  -N -f -f        # update w/o removing any files
 .  endif
 .endif