From owner-svn-ports-head@FreeBSD.ORG  Tue Jul 29 23:41:20 2014
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id A2DA053E;
 Tue, 29 Jul 2014 23:41:20 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::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 900922718;
 Tue, 29 Jul 2014 23:41:20 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s6TNfKJV038409;
 Tue, 29 Jul 2014 23:41:20 GMT
 (envelope-from bdrewery@svn.freebsd.org)
Received: (from bdrewery@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s6TNfKMS038407;
 Tue, 29 Jul 2014 23:41:20 GMT
 (envelope-from bdrewery@svn.freebsd.org)
Message-Id: <201407292341.s6TNfKMS038407@svn.freebsd.org>
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Tue, 29 Jul 2014 23:41:20 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r363413 - in head/ports-mgmt/portupgrade: . 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.18
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://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: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 29 Jul 2014 23:41:20 -0000

Author: bdrewery
Date: Tue Jul 29 23:41:19 2014
New Revision: 363413
URL: http://svnweb.freebsd.org/changeset/ports/363413
QAT: https://qat.redports.org/buildarchive/r363413/

Log:
  Quick fix for pkg-1.3 delete handling. It now requires -f to not automatically
  recurse.

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

Modified: head/ports-mgmt/portupgrade/Makefile
==============================================================================
--- head/ports-mgmt/portupgrade/Makefile	Tue Jul 29 23:40:17 2014	(r363412)
+++ head/ports-mgmt/portupgrade/Makefile	Tue Jul 29 23:41:19 2014	(r363413)
@@ -3,7 +3,7 @@
 
 PORTNAME=	portupgrade
 PORTVERSION=	2.4.12
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	2
 CATEGORIES=	ports-mgmt
 MASTER_SITES=	SF/portupgrade/pkgtools/dist/ \

Added: head/ports-mgmt/portupgrade/files/patch-bin__pkg_glob
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/ports-mgmt/portupgrade/files/patch-bin__pkg_glob	Tue Jul 29 23:41:19 2014	(r363413)
@@ -0,0 +1,10 @@
+--- ./bin/pkg_glob.orig	2014-07-29 18:39:52.706051787 -0500
++++ ./bin/pkg_glob	2014-07-29 18:40:31.759049595 -0500
+@@ -415,6 +415,7 @@
+   return true if $noexecute
+ 
+   if $pkgdb.with_pkgng?
++    $pkg_delete_args.push '-f'
+     cmdargs = [PkgDB::command(:pkg), 'delete', *$pkg_delete_args] << pkgname
+   else
+     cmdargs = [PkgDB::command(:pkg_delete), *$pkg_delete_args] << pkgname