diff options
| author | Frederic Culot <culot@FreeBSD.org> | 2012-08-23 07:31:06 +0000 |
|---|---|---|
| committer | Frederic Culot <culot@FreeBSD.org> | 2012-08-23 07:31:06 +0000 |
| commit | 46d3956fa730651090cc41aecd036e8be9537d17 (patch) | |
| tree | 985b715504ce1c84a35c4c30bd40422653bd5479 /sysutils/parallel | |
| parent | c8da02e9afa0463587af2d2d92b689f636c7a921 (diff) | |
Notes
Diffstat (limited to 'sysutils/parallel')
| -rw-r--r-- | sysutils/parallel/Makefile | 2 | ||||
| -rw-r--r-- | sysutils/parallel/distinfo | 4 | ||||
| -rw-r--r-- | sysutils/parallel/files/patch-src__parallel | 64 |
3 files changed, 18 insertions, 52 deletions
diff --git a/sysutils/parallel/Makefile b/sysutils/parallel/Makefile index 2717ea16cf70..71d9b1589f9f 100644 --- a/sysutils/parallel/Makefile +++ b/sysutils/parallel/Makefile @@ -6,7 +6,7 @@ # PORTNAME= parallel -PORTVERSION= 20120622 +PORTVERSION= 20120822 CATEGORIES= sysutils MASTER_SITES= GNU diff --git a/sysutils/parallel/distinfo b/sysutils/parallel/distinfo index 4a6cb2a6b788..46bf10db047e 100644 --- a/sysutils/parallel/distinfo +++ b/sysutils/parallel/distinfo @@ -1,2 +1,2 @@ -SHA256 (parallel-20120622.tar.bz2) = bfdbb4a66835eacce2bffde23f5e0f12b4e99ced5e348b5f69b7aa97d0123869 -SIZE (parallel-20120622.tar.bz2) = 228881 +SHA256 (parallel-20120822.tar.bz2) = 4762e0a47337c457bf4c2d16372fce4f6399de9441ac34d32b4e436d1ab26949 +SIZE (parallel-20120822.tar.bz2) = 231076 diff --git a/sysutils/parallel/files/patch-src__parallel b/sysutils/parallel/files/patch-src__parallel index b1d897a6c96e..ac11b7850ca7 100644 --- a/sysutils/parallel/files/patch-src__parallel +++ b/sysutils/parallel/files/patch-src__parallel @@ -1,62 +1,28 @@ ---- src/parallel.orig 2011-08-22 07:17:43.000000000 +0800 -+++ src/parallel 2011-08-22 23:51:57.455272434 +0800 -@@ -4073,28 +4073,42 @@ - - # Maximal command line length (for -m and -X) - sub max_length { -- # Find the max_length of a command line and cache it -- # Returns: -- # number of chars on the longest command line allowed -+ # FreeBSD code: +--- ./src/parallel.orig 2012-08-22 21:25:08.000000000 -0500 ++++ ./src/parallel 2012-08-22 21:25:24.000000000 -0500 +@@ -4571,21 +4571,15 @@ + # Returns: + # number of chars on the longest command line allowed if(not $Limits::Command::line_max_len) { -- if($::opt_s) { ++ $Limits::Command::line_max_len = `getconf ARG_MAX` - 1024; + 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); -+ $Limits::Command::line_max_len = `getconf ARG_MAX` - 1024; -+ if ($::opt_s) { -+ if ($::opt_s > $Limits::Command::line_max_len) { -+ print STDERR "$Global::progname: ", -+ "you are setting value for -s greater than $Limits::Command::line_max_len\n"; ++ if($::opt_s > $Limits::Command::line_max_len) { ++ print STDERR "$Global::progname: ", ++ "you are setting value for -s greater than $Limits::Command::line_max_len\n"; } -- if($::opt_s <= $Limits::Command::line_max_len) { -- $Limits::Command::line_max_len = $::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"; -- } +- ::warning("Value for -s option ", +- "should be < $Limits::Command::line_max_len.\n"); + } - } else { - $Limits::Command::line_max_len = real_max_length(); -+ $Limits::Command::line_max_len = $::opt_s; } } return $Limits::Command::line_max_len; -+ -+# ORIGINAL code: -+# # Find the max_length of a command line and cache it -+# # 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 { |