--5gxpn/Q6ypwruk0T
Content-Type: multipart/mixed; boundary="69pVuxX8awAiJ7fD"
Content-Disposition: inline


--69pVuxX8awAiJ7fD
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

Todd Vierling wrote:

> What you use for DEPENDS_TARGET shouldn't matter; the "-N -f" is still
> missing.  You should know the drill (<grin>):  What are the *full* contents
> of mk.conf?

UPDATE_RUNNING was not carried over to the run of "make deinstall" after
the switch to root, see the definition of _SU_TARGET in bsd.pkg.mk and
the attached patch.

Please commit if it is ok, I cannot do so until tomorrow evening.

ciao
     Klaus

--69pVuxX8awAiJ7fD
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="mk.diff"

Index: bsd.pkg.mk
===================================================================
RCS file: /cvsroot/pkgsrc/mk/bsd.pkg.mk,v
retrieving revision 1.1769
diff -u -b -u -r1.1769 bsd.pkg.mk
--- bsd.pkg.mk	29 Nov 2005 22:18:38 -0000	1.1769
+++ bsd.pkg.mk	30 Nov 2005 23:34:33 -0000
@@ -2764,6 +2764,9 @@
 		if [ "X${PKG_DEBUG_LEVEL}" != X"" ]; then		\
 			args="$$args PKG_DEBUG_LEVEL=${PKG_DEBUG_LEVEL}"; \
 		fi;							\
+		if [ "X${UPDATE_RUNNING}" != X"" ]; then		\
+			args="$$args UPDATE_RUNNING=${UPDATE_RUNNING}"; \
+		fi;							\
 		if [ "X${PRE_ROOT_CMD}" != "X${TRUE}" ]; then		\
 			${ECHO} "*** WARNING *** Running: ${PRE_ROOT_CMD}"; \
 			${PRE_ROOT_CMD};				\

--69pVuxX8awAiJ7fD--

--5gxpn/Q6ypwruk0T
Content-Type: application/pgp-signature
Content-Disposition: inline

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2 (NetBSD)

iQDVAwUBQ445uL8bKdk++2QmAQLyJgX+N1ty4D07wVAFlao3fK+5ysam78WVxw0g
m3+cWdaSPQmkhw3Yay+Wal6gGGGECvbxZ1yTdI6kyEPnLlm1b+cliLAvopjCHCrM
r+WYwOB9gb461TjrFI9BEmL9e6T3u9elaB8DRalICDoLOpey/fp1NGa+/MuF2L0t
XP7Z/a5vTO92YhJEiRNA1a6FjCVpxP1tceDfT8uNc3UkO2VP41j1LQ8soNI57s+m
ta3x8fLvVKGhgJxe6R65D2kltgvl58Gz
=9gnK
-----END PGP SIGNATURE-----

--5gxpn/Q6ypwruk0T--