diff options
| author | Martin Wilke <miwi@FreeBSD.org> | 2011-01-31 11:38:55 +0000 |
|---|---|---|
| committer | Martin Wilke <miwi@FreeBSD.org> | 2011-01-31 11:38:55 +0000 |
| commit | 6cc92f69649efd1ce0333088f62d14905a82343e (patch) | |
| tree | ff8ec0c4bc8d5e260af57341bd8b32ddb66276ce /sysutils | |
| parent | df55677c9eaa71b6bffd11d4223049da46390ed8 (diff) | |
| download | ports-6cc92f69649efd1ce0333088f62d14905a82343e.tar.gz ports-6cc92f69649efd1ce0333088f62d14905a82343e.zip | |
- Update to 20110122
PR: 154398
Submitted by: maintainer
Feature safe: yes
Notes
Notes:
svn path=/head/; revision=268479
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/parallel/Makefile | 2 | ||||
| -rw-r--r-- | sysutils/parallel/distinfo | 4 | ||||
| -rw-r--r-- | sysutils/parallel/files/patch-src__parallel | 87 |
3 files changed, 90 insertions, 3 deletions
diff --git a/sysutils/parallel/Makefile b/sysutils/parallel/Makefile index 3d85ead5d414..f7475c328088 100644 --- a/sysutils/parallel/Makefile +++ b/sysutils/parallel/Makefile @@ -6,7 +6,7 @@ # PORTNAME= parallel -PORTVERSION= 20101222 +PORTVERSION= 20110122 CATEGORIES= sysutils MASTER_SITES= GNU diff --git a/sysutils/parallel/distinfo b/sysutils/parallel/distinfo index 6243b1ea6a8b..3e572f867323 100644 --- a/sysutils/parallel/distinfo +++ b/sysutils/parallel/distinfo @@ -1,2 +1,2 @@ -SHA256 (parallel-20101222.tar.bz2) = 6465f0eacaa133819bafe02eac14669a2c4eeedd67be21798f3f29ecacc49596 -SIZE (parallel-20101222.tar.bz2) = 151264 +SHA256 (parallel-20110122.tar.bz2) = 6c5a6f245d2ce3b315f878b22472c620fbf1906e65dd3b223a5be79ca1085634 +SIZE (parallel-20110122.tar.bz2) = 157049 diff --git a/sysutils/parallel/files/patch-src__parallel b/sysutils/parallel/files/patch-src__parallel new file mode 100644 index 000000000000..6c1d80e25855 --- /dev/null +++ b/sysutils/parallel/files/patch-src__parallel @@ -0,0 +1,87 @@ +--- ./src/parallel.orig 2011-01-22 15:37:41.000000000 -0700 ++++ ./src/parallel 2011-01-30 11:39:53.000000000 -0700 +@@ -2077,14 +2077,20 @@ + sub no_of_cpus_freebsd { + # Returns: + # Number of physical CPUs on FreeBSD +- my $no_of_cpus = `sysctl hw.ncpu 2>/dev/null | awk '{ print \$2 }'`; ++ my $no_of_cpus = ++ (`sysctl -a dev.cpu | grep \%parent | awk '{ print \$2 }' | uniq | wc -l | awk '{ print \$1 }'` ++ or ++ `sysctl hw.ncpu 2>/dev/null | awk '{ print \$2 }'`); + return $no_of_cpus; + } + + sub no_of_cores_freebsd { + # Returns: + # Number of CPU cores on FreeBSD +- my $no_of_cores = `sysctl -a hw 2>/dev/null | grep -w logicalcpu | awk '{ print \$2 }'`; ++ my $no_of_cores = ++ (`sysctl hw.ncpu 2>/dev/null | awk '{ print \$2 }'` ++ or ++ `sysctl -a hw 2>/dev/null | grep -w logicalcpu | awk '{ print \$2 }'`); + return $no_of_cores; + } + +@@ -3455,28 +3461,40 @@ + + # Maximal command line length (for -m and -X) + sub max_length { +- # Find the max_length of a command line +- # Returns: +- # number of chars on the longest command line allowed +- if(not $Limits::Command::line_max_len) { +- if($::opt_s) { +- if(is_acceptable_command_line_length($::opt_s)) { +- $Limits::Command::line_max_len = $::opt_s; +- } else { +- # -s is too long: Find the correct +- $Limits::Command::line_max_len = binary_find_max_length(0,$::opt_s); +- } +- if($::opt_s <= $Limits::Command::line_max_len) { +- $Limits::Command::line_max_len = $::opt_s; +- } else { +- print STDERR "$Global::progname: ", +- "value for -s option should be < $Limits::Command::line_max_len\n"; +- } +- } else { +- $Limits::Command::line_max_len = real_max_length(); +- } ++ # FreeBSD code: ++ my $limit = `getconf ARG_MAX` - 1024; ++ if ($::opt_s) { ++ if ($::opt_s > $limit) { ++ print STDERR "$Global::progname: ", ++ "you are setting value for -s greater than $limit\n"; ++ } ++ $limit = $::opt_s; + } +- return $Limits::Command::line_max_len; ++ return $limit; ++ ++# ORIGINAL code: ++# # Find the max_length of a command line ++# # Returns: ++# # number of chars on the longest command line allowed ++# if(not $Limits::Command::line_max_len) { ++# if($::opt_s) { ++# if(is_acceptable_command_line_length($::opt_s)) { ++# $Limits::Command::line_max_len = $::opt_s; ++# } else { ++# # -s is too long: Find the correct ++# $Limits::Command::line_max_len = binary_find_max_length(0,$::opt_s); ++# } ++# if($::opt_s <= $Limits::Command::line_max_len) { ++# $Limits::Command::line_max_len = $::opt_s; ++# } else { ++# print STDERR "$Global::progname: ", ++# "value for -s option should be < $Limits::Command::line_max_len\n"; ++# } ++# } else { ++# $Limits::Command::line_max_len = real_max_length(); ++# } ++# } ++# return $Limits::Command::line_max_len; + } + + sub real_max_length { |