summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorbad <bad@pkgsrc.org>2012-10-01 09:54:18 +0000
committerbad <bad@pkgsrc.org>2012-10-01 09:54:18 +0000
commit13d42a619b58426742b19ab5e97dfe564b292bde (patch)
treea296a68d254a678c4998d1b8ab6cad11512c5d3f /mk
parent58347d0c07e4903243c5e2e0189b193005d4a351 (diff)
downloadpkgsrc-13d42a619b58426742b19ab5e97dfe564b292bde.tar.gz
Apply patch from OBATA Akio to stop "make update" failing with "a different
version ... is already installed". <http://mail-index.netbsd.org/pkgsrc-users/2011/08/02/msg014770.html> This makes "make update" usable for me again. Thanks Obata-san!
Diffstat (limited to 'mk')
-rw-r--r--mk/depends/bsd.depends.mk8
1 files changed, 4 insertions, 4 deletions
diff --git a/mk/depends/bsd.depends.mk b/mk/depends/bsd.depends.mk
index 9e29c1d4774..6ca4604ba59 100644
--- a/mk/depends/bsd.depends.mk
+++ b/mk/depends/bsd.depends.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.depends.mk,v 1.22 2011/10/15 00:23:08 reed Exp $
+# $NetBSD: bsd.depends.mk,v 1.23 2012/10/01 09:54:18 bad Exp $
#
# This Makefile fragment is included by bsd.pkg.mk and provides all
# variables and targets related to dependencies.
@@ -22,9 +22,7 @@ SKIP_DEPENDS?= no
# 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 @@ DEPENDS_TARGET= update
. 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