From owner-svn-ports-head@freebsd.org  Sun Jun 12 22:41:05 2016
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 49741AF1E40;
 Sun, 12 Jun 2016 22:41:05 +0000 (UTC)
 (envelope-from bapt@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 1A9D92B66;
 Sun, 12 Jun 2016 22:41:05 +0000 (UTC)
 (envelope-from bapt@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u5CMf4fU089572;
 Sun, 12 Jun 2016 22:41:04 GMT (envelope-from bapt@FreeBSD.org)
Received: (from bapt@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u5CMf4Xx089570;
 Sun, 12 Jun 2016 22:41:04 GMT (envelope-from bapt@FreeBSD.org)
Message-Id: <201606122241.u5CMf4Xx089570@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: bapt set sender to
 bapt@FreeBSD.org using -f
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Sun, 12 Jun 2016 22:41:04 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r416827 - in head/ports-mgmt/pkg: . files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 12 Jun 2016 22:41:05 -0000

Author: bapt
Date: Sun Jun 12 22:41:04 2016
New Revision: 416827
URL: https://svnweb.freebsd.org/changeset/ports/416827

Log:
  Fix pkg upgrade -f

Added:
  head/ports-mgmt/pkg/files/patch-upgrade_f   (contents, props changed)
Modified:
  head/ports-mgmt/pkg/Makefile

Modified: head/ports-mgmt/pkg/Makefile
==============================================================================
--- head/ports-mgmt/pkg/Makefile	Sun Jun 12 21:56:01 2016	(r416826)
+++ head/ports-mgmt/pkg/Makefile	Sun Jun 12 22:41:04 2016	(r416827)
@@ -2,6 +2,7 @@
 
 PORTNAME=	pkg
 DISTVERSION=	1.8.5
+PORTREVISION=	1
 _PKG_VERSION=	${DISTVERSION}
 CATEGORIES=	ports-mgmt
 MASTER_SITES=	\

Added: head/ports-mgmt/pkg/files/patch-upgrade_f
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/ports-mgmt/pkg/files/patch-upgrade_f	Sun Jun 12 22:41:04 2016	(r416827)
@@ -0,0 +1,13 @@
+diff --git libpkg/pkg_jobs_universe.c libpkg/pkg_jobs_universe.c
+index 312591d..c1eb15b 100644
+--- libpkg/pkg_jobs_universe.c
++++ libpkg/pkg_jobs_universe.c
+@@ -1264,7 +1264,7 @@ pkg_jobs_universe_get_upgrade_candidates(struct pkg_jobs_universe *universe,
+ 	if (selected != lp) {
+ 		/* We need to add the whole chain of upgrade candidates */
+ 		for (int i = 0; i < kv_size(candidates); i++) {
+-			pkg_jobs_universe_add_pkg(universe, kv_A(candidates, i), false, NULL);
++			pkg_jobs_universe_add_pkg(universe, kv_A(candidates, i), force, NULL);
+ 		}
+ 	}
+ 	else {