diff options
| -rw-r--r-- | ports-mgmt/portupgrade/Makefile | 4 | ||||
| -rw-r--r-- | ports-mgmt/portupgrade/distinfo | 4 | ||||
| -rw-r--r-- | ports-mgmt/portupgrade/files/patch-bin__pkg_glob | 10 | ||||
| -rw-r--r-- | ports-mgmt/portupgrade/pkg-message | 14 | ||||
| -rw-r--r-- | ports-mgmt/portupgrade/pkg-plist | 12 |
5 files changed, 5 insertions, 39 deletions
diff --git a/ports-mgmt/portupgrade/Makefile b/ports-mgmt/portupgrade/Makefile index 3ce03fca5bc9..4d1425d5e769 100644 --- a/ports-mgmt/portupgrade/Makefile +++ b/ports-mgmt/portupgrade/Makefile @@ -2,8 +2,8 @@ # $FreeBSD$ PORTNAME= portupgrade -PORTVERSION= 2.4.12 -PORTREVISION= 2 +PORTVERSION= 2.4.13 +PORTREVISION= 0 PORTEPOCH= 2 CATEGORIES= ports-mgmt MASTER_SITES= SF/portupgrade/pkgtools/dist/ \ diff --git a/ports-mgmt/portupgrade/distinfo b/ports-mgmt/portupgrade/distinfo index de384ba69b96..5278cb878c44 100644 --- a/ports-mgmt/portupgrade/distinfo +++ b/ports-mgmt/portupgrade/distinfo @@ -1,2 +1,2 @@ -SHA256 (portupgrade/pkgtools-2.4.12.tar.bz2) = 5b389fc877798d5948698923daf2d166fa724ba9d932505253398fc7721e1d82 -SIZE (portupgrade/pkgtools-2.4.12.tar.bz2) = 85928 +SHA256 (portupgrade/pkgtools-2.4.13.tar.bz2) = ddcca87ea5324f54e68774757697980272077d176086fd5957b8b0338d10c06e +SIZE (portupgrade/pkgtools-2.4.13.tar.bz2) = 86529 diff --git a/ports-mgmt/portupgrade/files/patch-bin__pkg_glob b/ports-mgmt/portupgrade/files/patch-bin__pkg_glob deleted file mode 100644 index 2dbce9aca7f8..000000000000 --- a/ports-mgmt/portupgrade/files/patch-bin__pkg_glob +++ /dev/null @@ -1,10 +0,0 @@ ---- ./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 diff --git a/ports-mgmt/portupgrade/pkg-message b/ports-mgmt/portupgrade/pkg-message deleted file mode 100644 index 2b9b612df4c2..000000000000 --- a/ports-mgmt/portupgrade/pkg-message +++ /dev/null @@ -1,14 +0,0 @@ ------------------------------------------------------------------------------- - Fill ALT_PKGDEP section in pkgtools.conf file for portupgrade to be - aware of alternative dependencies you use. - E.g. - ALT_PKGDEP = { - # Use the -nox11 port when another port depends on category/portexample - 'category/portexample' => 'category/portexample-nox11', - } - - Note also, portupgrade knows nothing about how to handle ports with - different suffixes (E.g. -nox11). So you should explicitly define - variables (E.g. WITHOUT_X11=yes) for the ports in /etc/make.conf or - pkgtools.conf (MAKE_ARGS section) files. ------------------------------------------------------------------------------- diff --git a/ports-mgmt/portupgrade/pkg-plist b/ports-mgmt/portupgrade/pkg-plist index 1e14136d5bf4..129679dc0e02 100644 --- a/ports-mgmt/portupgrade/pkg-plist +++ b/ports-mgmt/portupgrade/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 @@ -32,7 +30,6 @@ sbin/portsclean sbin/portsdb sbin/portupgrade sbin/portversion -@exec /bin/mkdir -p %D/%%RUBY_SITELIBDIR%%/pkgtools %%RUBY_SITELIBDIR%%/pkgtools/pkg.rb %%RUBY_SITELIBDIR%%/pkgtools/pkgdb.rb %%RUBY_SITELIBDIR%%/pkgtools/pkgdbtools.rb @@ -46,17 +43,10 @@ sbin/portversion %%RUBY_SITELIBDIR%%/pkgtools/portsdb.rb %%RUBY_SITELIBDIR%%/pkgtools/revision.rb %%RUBY_SITELIBDIR%%/pkgtools.rb -@dirrm %%RUBY_SITELIBDIR%%/pkgtools @sample etc/pkgtools.conf.sample etc/pkgtools.status-pkg.sh share/zsh/site-functions/_pkgtools -@dirrmtry share/zsh/site-functions -@dirrmtry share/zsh %%EXAMPLESDIR%%/bash/complete.sample %%EXAMPLESDIR%%/tcsh/complete.sample %%PORTDOCS%%%%DOCSDIR%%/NEWS.md %%PORTDOCS%%%%DOCSDIR%%/README.md -@dirrm %%EXAMPLESDIR%%/bash -@dirrm %%EXAMPLESDIR%%/tcsh -@dirrm %%EXAMPLESDIR%% -%%PORTDOCS%%@dirrm %%DOCSDIR%% |