pkgsrc-Users archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

Re: make update failing with "a different version ... is already installed"



How about apply the following patch?
I feel that even if USE_DESTDIR=yes, target based DEPENDS_TARGET setting should 
be preferred.
(and replace-destdir target should be fixed, because if DEPENDS_TARGET=replace 
and depending packages
 is not installed yet, it will not work as expected).

Index: depends/bsd.depends.mk
===================================================================
RCS file: /cvsroot/pkgsrc/mk/depends/bsd.depends.mk,v
retrieving revision 1.21
diff -u -r1.21 bsd.depends.mk
--- depends/bsd.depends.mk      4 May 2011 09:49:34 -0000       1.21
+++ depends/bsd.depends.mk      2 Aug 2011 08:28:53 -0000
@@ -22,9 +22,7 @@
 # dependencies.  This variable is user-settable in /etc/mk.conf.
 #
 .if !defined(DEPENDS_TARGET)
-.  if !empty(USE_DESTDIR:M[Yy][Ee][Ss]) || make(package) || 
make(package-install)
-DEPENDS_TARGET=                package-install
-.  elif make(update)
+.  if make(update)
 .    if defined(UPDATE_TARGET) && (${UPDATE_TARGET} == "replace")
 DEPENDS_TARGET=                ${UPDATE_TARGET}
 .    else
@@ -32,6 +30,8 @@
 .    endif
 .  elif make(bin-install) || make(su-bin-install)
 DEPENDS_TARGET=                bin-install
+.  elif !empty(USE_DESTDIR:M[Yy][Ee][Ss]) || make(package) || 
make(package-install)
+DEPENDS_TARGET=                package-install
 .  else
 DEPENDS_TARGET=                reinstall
 .  endif


--
OBATA Akio / obache%NetBSD.org@localhost


Home | Main Index | Thread Index | Old Index