diff options
| -rw-r--r-- | ports-mgmt/portupgrade/Makefile | 7 | ||||
| -rw-r--r-- | ports-mgmt/portupgrade/distinfo | 5 | ||||
| -rw-r--r-- | ports-mgmt/portupgrade/files/patch-bin-portupgrade | 37 | ||||
| -rw-r--r-- | ports-mgmt/portupgrade/files/patch-bin-portversion | 10 | ||||
| -rw-r--r-- | ports-mgmt/portupgrade/files/patch-lib-pkgtools.rb | 11 | ||||
| -rw-r--r-- | ports-mgmt/portupgrade/pkg-descr | 1 |
6 files changed, 6 insertions, 65 deletions
diff --git a/ports-mgmt/portupgrade/Makefile b/ports-mgmt/portupgrade/Makefile index b39a3b5695a2..f13941959fa1 100644 --- a/ports-mgmt/portupgrade/Makefile +++ b/ports-mgmt/portupgrade/Makefile @@ -6,11 +6,11 @@ # PORTNAME= portupgrade -PORTVERSION= 2.4.6 -PORTREVISION= 4 +PORTVERSION= 2.4.7 +PORTREVISION= 0 PORTEPOCH= 2 CATEGORIES= ports-mgmt -MASTER_SITES= SF/${PORTNAME}/pkgtools/${PORTVERSION} +MASTER_SITES= ftp://ftp.SpringDaemons.com/soft/ DISTNAME= pkgtools-${DISTVERSION} MAINTAINER= ruby@FreeBSD.org @@ -23,7 +23,6 @@ CONFLICTS= portupgrade-devel-* USE_BZIP2= yes USE_RUBY= yes -USE_RUBY_FEATURES= optparse ruby18 USE_LDCONFIG= ${PREFIX}/lib/compat/pkg diff --git a/ports-mgmt/portupgrade/distinfo b/ports-mgmt/portupgrade/distinfo index d6d1bfc1a1d9..61fe35a3cdfd 100644 --- a/ports-mgmt/portupgrade/distinfo +++ b/ports-mgmt/portupgrade/distinfo @@ -1,3 +1,2 @@ -MD5 (pkgtools-2.4.6.tar.bz2) = 27212bb588eee60c39219ea740d4a4e0 -SHA256 (pkgtools-2.4.6.tar.bz2) = facf4423595df81e8647c179a61d1a4e2caff29e8b334cf680afcdf710dbd5eb -SIZE (pkgtools-2.4.6.tar.bz2) = 114708 +SHA256 (pkgtools-2.4.7.tar.bz2) = 701fdfa66a35dabd13dc10c5e9706c57f5c53d417733b659ed22d150060958a5 +SIZE (pkgtools-2.4.7.tar.bz2) = 114948 diff --git a/ports-mgmt/portupgrade/files/patch-bin-portupgrade b/ports-mgmt/portupgrade/files/patch-bin-portupgrade deleted file mode 100644 index d085c4bbb022..000000000000 --- a/ports-mgmt/portupgrade/files/patch-bin-portupgrade +++ /dev/null @@ -1,37 +0,0 @@ ---- bin/portupgrade.orig 2008-07-01 20:32:25.000000000 +0900 -+++ bin/portupgrade 2010-03-12 17:58:41.298887026 +0900 -@@ -597,6 +597,7 @@ - exit 1 - end - -+ list -= [''] - list.each do |i| - if i == first - $task_options[i][:origin] = $origin -@@ -654,12 +655,12 @@ - upgrade_tasks -= not_need_upgrade - - # Check dependencies for updates -+ depends -= [''] - if $upward_recursive - STDERR.print '[Exclude up-to-date packages ' - not_need_upgrade = [] - depends.each do |task| - STDERR.print '.' -- next if task == '' - begin - pkg = PkgInfo.new(task) - rescue ArgumentError => e -@@ -827,8 +828,12 @@ - # Returns: - # Set: all recursive depends list - def get_all_depends(origin, parents_list = nil) -+ if $use_packages_only -+ depends_vars = %w{LIB_DEPENDS RUN_DEPENDS} -+ else - depends_vars = %w{FETCH_DEPENDS EXTRACT_DEPENDS PATCH_DEPENDS - BUILD_DEPENDS LIB_DEPENDS RUN_DEPENDS} -+ end - - unless $depends.has_key?(origin) - depends = Set.new diff --git a/ports-mgmt/portupgrade/files/patch-bin-portversion b/ports-mgmt/portupgrade/files/patch-bin-portversion deleted file mode 100644 index 454d208a3aac..000000000000 --- a/ports-mgmt/portupgrade/files/patch-bin-portversion +++ /dev/null @@ -1,10 +0,0 @@ ---- bin/portversion.orig 2009-04-09 15:40:42.000000000 +0400 -+++ bin/portversion 2009-04-09 15:41:15.000000000 +0400 -@@ -151,6 +151,7 @@ - opts.def_option("-v", "--verbose", "Be verbose") { - |$verbose| - $verbose_output = :verbose -+ $display = :fullname - } - - opts.def_option("-x", "--exclude=GLOB", "Exclude packages matching the specified glob#{NEXTLINE}pattern") { diff --git a/ports-mgmt/portupgrade/files/patch-lib-pkgtools.rb b/ports-mgmt/portupgrade/files/patch-lib-pkgtools.rb deleted file mode 100644 index c7f6e20c9eac..000000000000 --- a/ports-mgmt/portupgrade/files/patch-lib-pkgtools.rb +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/pkgtools.rb.orig 2009-03-31 19:59:37.000000000 +0400 -+++ lib/pkgtools.rb 2009-03-31 20:00:11.000000000 +0400 -@@ -1165,7 +1165,7 @@ - STDERR.puts "uname(1) could be broken - cannot parse the output: #{uname}" - end - -- def pkg_site_mirror(root = ENV['PACKAGEROOT'] || 'ftp://ftp.FreeBSD.org') -+ def pkg_site_mirror(root = ENV['PACKAGEROOT'] || 'ftp://ftp.FreeBSD.org/') - sprintf('%s/pub/FreeBSD/ports/%s/packages-%s/', - root, OS_PLATFORM, OS_PKGBRANCH) - end diff --git a/ports-mgmt/portupgrade/pkg-descr b/ports-mgmt/portupgrade/pkg-descr index 2bf58d4ca2e4..e8560e535c1d 100644 --- a/ports-mgmt/portupgrade/pkg-descr +++ b/ports-mgmt/portupgrade/pkg-descr @@ -17,6 +17,7 @@ pkg_fetch: Fetches packages from a remote site. pkg_glob: Expands package globs. pkg_which: Checks which package a file came from quickly. pkgdb: Manages and searches the package database. +pkgdu: Display a disk usage for installed packages. Author: Akinori MUSHA <knu@FreeBSD.org> (Not the current maintainer) Maintainer: freebsd-ruby mailing list <ruby@FreeBSD.org> |