svn commit: r363413 - in head/ports-mgmt/portupgrade: . files

[Bryan Drewery]

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