- 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
This commit is contained in:
Bryan Drewery 2014-10-06 22:53:47 +00:00
parent 36586af30c
commit 42e89c245c
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=370240
4 changed files with 6 additions and 25 deletions

View file

@ -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}

View file

@ -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

View file

@ -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

View file

@ -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%%