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

- Update to 20120822

Browse Source 
Changes:	http://savannah.gnu.org/forum/forum.php?forum_id=7345
PR:		ports/170908
Submitted by:	Chris Howey <howeyc@gmail.com> (maintainer)
This commit is contained in:
Frederic Culot 2012-08-23 07:31:06 +00:00
parent c8da02e9af
commit 46d3956fa7
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=302981
3 changed files with 18 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sysutils/parallel/Makefile
View File

@ -6,7 +6,7 @@
#
PORTNAME= parallel
PORTVERSION= 20120622
PORTVERSION= 20120822
CATEGORIES= sysutils
MASTER_SITES= GNU

4
sysutils/parallel/distinfo
View File

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

64
sysutils/parallel/files/patch-src__parallel
View File

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