aboutsummaryrefslogtreecommitdiffstats
path: root/ports-mgmt
diff options
context:
space:
mode:
authorbdrewery <bdrewery@FreeBSD.org>2014-07-30 07:44:19 +0800
committerbdrewery <bdrewery@FreeBSD.org>2014-07-30 07:44:19 +0800
commit93e22ecc1a1cf5ab991aa3b25dfb113703fd7caf (patch)
treed18510465316fb3d90d71c9575e605a9d3652989 /ports-mgmt
parent19f7362703b0fc318450ee1c63eab8a11fc64a06 (diff)
downloadfreebsd-ports-gnome-93e22ecc1a1cf5ab991aa3b25dfb113703fd7caf.tar.gz
freebsd-ports-gnome-93e22ecc1a1cf5ab991aa3b25dfb113703fd7caf.tar.zst
freebsd-ports-gnome-93e22ecc1a1cf5ab991aa3b25dfb113703fd7caf.zip
Quick fix for pkg-1.3 delete handling. It now requires -f to not automatically
recurse.
Diffstat (limited to 'ports-mgmt')
-rw-r--r--ports-mgmt/portupgrade-devel/Makefile2
-rw-r--r--ports-mgmt/portupgrade-devel/files/patch-bin__pkg_glob10
2 files changed, 11 insertions, 1 deletions
diff --git a/ports-mgmt/portupgrade-devel/Makefile b/ports-mgmt/portupgrade-devel/Makefile
index 210373a193b8..da365d530762 100644
--- a/ports-mgmt/portupgrade-devel/Makefile
+++ b/ports-mgmt/portupgrade-devel/Makefile
@@ -3,7 +3,7 @@
PORTNAME= portupgrade
PORTVERSION= 20140524
-PORTREVISION= 1
+PORTREVISION= 2
PORTEPOCH= 3
CATEGORIES= ports-mgmt
MASTER_SITES= GH \
diff --git a/ports-mgmt/portupgrade-devel/files/patch-bin__pkg_glob b/ports-mgmt/portupgrade-devel/files/patch-bin__pkg_glob
new file mode 100644
index 000000000000..4d48182d4d63
--- /dev/null
+++ b/ports-mgmt/portupgrade-devel/files/patch-bin__pkg_glob
@@ -0,0 +1,10 @@
+--- ./bin/pkg_glob.orig 2014-07-29 18:43:42.604036006 -0500
++++ ./bin/pkg_glob 2014-07-29 18:43:59.499573325 -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