diff options
| author | Sergey Matveychuk <sem@FreeBSD.org> | 2006-08-23 10:02:46 +0000 |
|---|---|---|
| committer | Sergey Matveychuk <sem@FreeBSD.org> | 2006-08-23 10:02:46 +0000 |
| commit | 9a6aae0de82e6331e159bd16e8db8dc79694608f (patch) | |
| tree | 24f27b5a8b81adf45519266b21893d9361e451c2 /ports-mgmt/portupgrade | |
| parent | Update to v0.0.12 (diff) | |
- Update to 2.1.3.3.
A few fixes merged from developing version, patches integrated.
Notes
Notes:
svn path=/head/; revision=171253
Diffstat (limited to 'ports-mgmt/portupgrade')
| -rw-r--r-- | ports-mgmt/portupgrade/Makefile | 3 | ||||
| -rw-r--r-- | ports-mgmt/portupgrade/distinfo | 6 | ||||
| -rw-r--r-- | ports-mgmt/portupgrade/files/patch-bin-portupgrade | 23 | ||||
| -rw-r--r-- | ports-mgmt/portupgrade/files/patch-lib-pkgtools.rb | 14 |
4 files changed, 4 insertions, 42 deletions
diff --git a/ports-mgmt/portupgrade/Makefile b/ports-mgmt/portupgrade/Makefile index 4e833e679c66..50bf0b68c104 100644 --- a/ports-mgmt/portupgrade/Makefile +++ b/ports-mgmt/portupgrade/Makefile @@ -6,8 +6,7 @@ # PORTNAME= portupgrade -PORTVERSION= 2.1.3.2 -PORTREVISION= 3 +PORTVERSION= 2.1.3.3 PORTEPOCH= 2 CATEGORIES= sysutils MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ diff --git a/ports-mgmt/portupgrade/distinfo b/ports-mgmt/portupgrade/distinfo index 13062faa194c..713c6bd1567b 100644 --- a/ports-mgmt/portupgrade/distinfo +++ b/ports-mgmt/portupgrade/distinfo @@ -1,3 +1,3 @@ -MD5 (pkgtools-2.1.3.2.tar.bz2) = 6aba29ca7fbe0a936d3df5ae8ad1f155 -SHA256 (pkgtools-2.1.3.2.tar.bz2) = 77173dd6e3907520d65a198e97c8a8d9c7dde1bfd5a1e5731ea3c368d072c7ab -SIZE (pkgtools-2.1.3.2.tar.bz2) = 110098 +MD5 (pkgtools-2.1.3.3.tar.bz2) = a69852c762fc98928b30e2561990c574 +SHA256 (pkgtools-2.1.3.3.tar.bz2) = 3a4c7c8f543f54e8c24e8181a90ce5786557c16e20b8f682bb41d21f12707df4 +SIZE (pkgtools-2.1.3.3.tar.bz2) = 110181 diff --git a/ports-mgmt/portupgrade/files/patch-bin-portupgrade b/ports-mgmt/portupgrade/files/patch-bin-portupgrade deleted file mode 100644 index f714446db4c2..000000000000 --- a/ports-mgmt/portupgrade/files/patch-bin-portupgrade +++ /dev/null @@ -1,23 +0,0 @@ ---- bin/portupgrade.orig Sat Jul 1 10:40:10 2006 -+++ bin/portupgrade Wed Aug 9 21:06:53 2006 -@@ -900,8 +900,7 @@ - def get_make_env(origin, is_new = false) - $make_env_table ||= compile_config_table(config_value(:MAKE_ENV)) - -- envset = lookup_config_table($make_env_table, origin, nil) or -- return Array.new -+ envset = (lookup_config_table($make_env_table, origin, nil) or Array.new) - - make_env = $make_env.dup - if make_env.empty? -@@ -1471,6 +1470,10 @@ - - Dir.chdir(portdir) { - $fetch_cmd = `make -V FETCH_CMD`.chomp -+ -+ if ! STDOUT.tty? -+ cmdargs << "FETCH_BEFORE_ARGS=-q" -+ end - - if $fetch_only - cmdargs << '-DBATCH' << '-DPACKAGE_BUILDING' 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 b88b84db28d4..000000000000 --- a/ports-mgmt/portupgrade/files/patch-lib-pkgtools.rb +++ /dev/null @@ -1,14 +0,0 @@ ---- lib/pkgtools.rb.orig Sun Jul 23 18:50:49 2006 -+++ lib/pkgtools.rb Sun Jul 23 18:50:59 2006 -@@ -486,10 +486,8 @@ - def logged_command(file, args) - if !file - args -- elsif STDIN.tty? -- ['/usr/bin/script', '-qa', file, *args] - else -- ['/bin/sh', '-c', sprintf('%s >>%s 2>&1', shelljoin(*args), shelljoin(file))] -+ ['/usr/bin/script', '-qa', file, *args] - end - end - |