From owner-svn-ports-all@FreeBSD.ORG Thu Aug 23 07:31:07 2012 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3689D1065670; Thu, 23 Aug 2012 07:31:07 +0000 (UTC) (envelope-from culot@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 21AD58FC0C; Thu, 23 Aug 2012 07:31:07 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q7N7V6LW080181; Thu, 23 Aug 2012 07:31:06 GMT (envelope-from culot@svn.freebsd.org) Received: (from culot@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q7N7V6tc080177; Thu, 23 Aug 2012 07:31:06 GMT (envelope-from culot@svn.freebsd.org) Message-Id: <201208230731.q7N7V6tc080177@svn.freebsd.org> From: Frederic Culot Date: Thu, 23 Aug 2012 07:31:06 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r302981 - in head/sysutils/parallel: . files X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 23 Aug 2012 07:31:07 -0000 Author: culot Date: Thu Aug 23 07:31:06 2012 New Revision: 302981 URL: http://svn.freebsd.org/changeset/ports/302981 Log: - Update to 20120822 Changes: http://savannah.gnu.org/forum/forum.php?forum_id=7345 PR: ports/170908 Submitted by: Chris Howey (maintainer) Modified: head/sysutils/parallel/Makefile head/sysutils/parallel/distinfo head/sysutils/parallel/files/patch-src__parallel Modified: head/sysutils/parallel/Makefile ============================================================================== --- head/sysutils/parallel/Makefile Thu Aug 23 06:48:09 2012 (r302980) +++ head/sysutils/parallel/Makefile Thu Aug 23 07:31:06 2012 (r302981) @@ -6,7 +6,7 @@ # PORTNAME= parallel -PORTVERSION= 20120622 +PORTVERSION= 20120822 CATEGORIES= sysutils MASTER_SITES= GNU Modified: head/sysutils/parallel/distinfo ============================================================================== --- head/sysutils/parallel/distinfo Thu Aug 23 06:48:09 2012 (r302980) +++ head/sysutils/parallel/distinfo Thu Aug 23 07:31:06 2012 (r302981) @@ -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 Modified: head/sysutils/parallel/files/patch-src__parallel ============================================================================== --- head/sysutils/parallel/files/patch-src__parallel Thu Aug 23 06:48:09 2012 (r302980) +++ head/sysutils/parallel/files/patch-src__parallel Thu Aug 23 07:31:06 2012 (r302981) @@ -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 {