cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Update to 2.1.3.3.

Browse Source 
A few fixes merged from developing version, patches integrated.
This commit is contained in:
Sergey Matveychuk 2006-08-23 10:02:46 +00:00
parent a69a206e68
commit 9a6aae0de8
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=171253
8 changed files with 8 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ports-mgmt/portupgrade/Makefile
View File

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

6
ports-mgmt/portupgrade/distinfo
View File

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

23
ports-mgmt/portupgrade/files/patch-bin-portupgrade
View File

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

14
ports-mgmt/portupgrade/files/patch-lib-pkgtools.rb
View File

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

3
sysutils/portupgrade/Makefile
View File

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

6
sysutils/portupgrade/distinfo
View File

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

23
sysutils/portupgrade/files/patch-bin-portupgrade
View File

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

14
sysutils/portupgrade/files/patch-lib-pkgtools.rb
View File

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