aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBryan Drewery <bdrewery@FreeBSD.org>2014-10-13 17:06:35 +0000
committerBryan Drewery <bdrewery@FreeBSD.org>2014-10-13 17:06:35 +0000
commitfcd27ca2c1a2166e17f48b3ed99508cfacca4be7 (patch)
tree34ae798d6d73d8f30ba36ba4dede72e8190704c4
parent15d72280d88da23a1e3624a9bada119959f4ed83 (diff)
downloadports-fcd27ca2c1a2166e17f48b3ed99508cfacca4be7.tar.gz
ports-fcd27ca2c1a2166e17f48b3ed99508cfacca4be7.zip
MFH: r370240
- Update to checkin 2161660, which matches 2.4.13 - Update @dir usage Changes: * portinstall/upgrade -P[P] now supported with pkgng * pkg_fetch now supports pkgng * Fixed pkg-1.3 delete support to not recurse * Fixed portupgrade -b support with pkgng * Improved portsclean performance with pkgng (#59) * Use service(8) for rc script restarting * Show command executions with PORTUPGRADE_DEBUG in environment * Deprecate rc script handling in lieu of pkg's HANDLE_RC_SCRIPTS in pkg.conf
Notes
Notes: svn path=/branches/2014Q4/; revision=370796
-rw-r--r--ports-mgmt/portupgrade-devel/Makefile6
-rw-r--r--ports-mgmt/portupgrade-devel/distinfo4
-rw-r--r--ports-mgmt/portupgrade-devel/files/patch-bin__pkg_glob10
-rw-r--r--ports-mgmt/portupgrade-devel/pkg-plist11
4 files changed, 6 insertions, 25 deletions
diff --git a/ports-mgmt/portupgrade-devel/Makefile b/ports-mgmt/portupgrade-devel/Makefile
index da365d530762..7b42ea09d964 100644
--- a/ports-mgmt/portupgrade-devel/Makefile
+++ b/ports-mgmt/portupgrade-devel/Makefile
@@ -2,8 +2,8 @@
# $FreeBSD$
PORTNAME= portupgrade
-PORTVERSION= 20140524
-PORTREVISION= 2
+PORTVERSION= 20141006
+PORTREVISION= 0
PORTEPOCH= 3
CATEGORIES= ports-mgmt
MASTER_SITES= GH \
@@ -23,7 +23,7 @@ USES= uidfix
USE_GITHUB= yes
GH_ACCOUNT= freebsd
GH_PROJECT= portupgrade
-GH_COMMIT= 352086b
+GH_COMMIT= 2161660
GH_TAGNAME= ${GH_COMMIT}
DIST_SUBDIR= ${PORTNAME}
diff --git a/ports-mgmt/portupgrade-devel/distinfo b/ports-mgmt/portupgrade-devel/distinfo
index 47463a9f668a..8cfc30b05bb3 100644
--- a/ports-mgmt/portupgrade-devel/distinfo
+++ b/ports-mgmt/portupgrade-devel/distinfo
@@ -1,2 +1,2 @@
-SHA256 (portupgrade/freebsd-portupgrade-20140524-0-g352086b.tar.gz) = 80c76da88848a5d7d9b5867e77f025ca029f12590a6c50bd75985263efa341b1
-SIZE (portupgrade/freebsd-portupgrade-20140524-0-g352086b.tar.gz) = 107125
+SHA256 (portupgrade/freebsd-portupgrade-20141006-0-g2161660.tar.gz) = 9b773754d634f39ed81ed451536a0dbed8a89f8d2097509cd80defb612c45898
+SIZE (portupgrade/freebsd-portupgrade-20141006-0-g2161660.tar.gz) = 107785
diff --git a/ports-mgmt/portupgrade-devel/files/patch-bin__pkg_glob b/ports-mgmt/portupgrade-devel/files/patch-bin__pkg_glob
deleted file mode 100644
index 4d48182d4d63..000000000000
--- a/ports-mgmt/portupgrade-devel/files/patch-bin__pkg_glob
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./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
diff --git a/ports-mgmt/portupgrade-devel/pkg-plist b/ports-mgmt/portupgrade-devel/pkg-plist
index ba70dc610066..4b8223b23c3f 100644
--- a/ports-mgmt/portupgrade-devel/pkg-plist
+++ b/ports-mgmt/portupgrade-devel/pkg-plist
@@ -1,6 +1,4 @@
-@exec /bin/mkdir -p %D/lib/compat/pkg
-@dirrmtry lib/compat/pkg
-@dirrmtry lib/compat
+@dir lib/compat/pkg
man/man1/pkg_deinstall.1.gz
man/man1/pkg_fetch.1.gz
man/man1/pkg_glob.1.gz
@@ -46,19 +44,12 @@ sbin/portversion
%%RUBY_SITELIBDIR%%/pkgtools/portsdb.rb
%%RUBY_SITELIBDIR%%/pkgtools/revision.rb
%%RUBY_SITELIBDIR%%/pkgtools.rb
-@dirrm %%RUBY_SITELIBDIR%%/pkgtools
@unexec if cmp -s %D/etc/pkgtools.conf %D/etc/pkgtools.conf.sample; then rm -f %D/etc/pkgtools.conf; fi
etc/pkgtools.conf.sample
@exec [ -f %B/pkgtools.conf ] || cp %B/%f %B/pkgtools.conf
etc/pkgtools.status-pkg.sh
share/zsh/site-functions/_pkgtools
-@dirrmtry share/zsh/site-functions
-@dirrmtry share/zsh
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bash/complete.sample
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tcsh/complete.sample
%%PORTDOCS%%%%DOCSDIR%%/NEWS.md
%%PORTDOCS%%%%DOCSDIR%%/README.md
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/bash
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/tcsh
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%