From owner-svn-ports-head@FreeBSD.ORG Mon Apr 22 19:20:18 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 1207568D; Mon, 22 Apr 2013 19:20:18 +0000 (UTC) (envelope-from culot@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id E88191FA0; Mon, 22 Apr 2013 19:20:17 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r3MJKHxG069309; Mon, 22 Apr 2013 19:20:17 GMT (envelope-from culot@svn.freebsd.org) Received: (from culot@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r3MJKHNe069306; Mon, 22 Apr 2013 19:20:17 GMT (envelope-from culot@svn.freebsd.org) Message-Id: <201304221920.r3MJKHNe069306@svn.freebsd.org> From: Frederic Culot Date: Mon, 22 Apr 2013 19:20:17 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r316267 - in head/sysutils/parallel: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 22 Apr 2013 19:20:18 -0000 Author: culot Date: Mon Apr 22 19:20:17 2013 New Revision: 316267 URL: http://svnweb.freebsd.org/changeset/ports/316267 Log: - Update to 20130422 Changes: https://savannah.gnu.org/forum/forum.php?forum_id=7581 PR: ports/178039 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 Mon Apr 22 19:07:36 2013 (r316266) +++ head/sysutils/parallel/Makefile Mon Apr 22 19:20:17 2013 (r316267) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= parallel -PORTVERSION= 20130222 +PORTVERSION= 20130422 CATEGORIES= sysutils MASTER_SITES= GNU @@ -27,6 +27,10 @@ PORTDOCS= parallel.html sem.html sql.htm .include +.if ${PORT_OPTIONS:MDOCS} +BUILD_DEPENDS+= pod2texi:${PORTSDIR}/print/texinfo +.endif + post-patch: @${REINPLACE_CMD} -e '1 s|/usr/bin/perl|${PERL}|' ${WRKSRC}/src/parallel .if empty(PORT_OPTIONS:MDOCS) Modified: head/sysutils/parallel/distinfo ============================================================================== --- head/sysutils/parallel/distinfo Mon Apr 22 19:07:36 2013 (r316266) +++ head/sysutils/parallel/distinfo Mon Apr 22 19:20:17 2013 (r316267) @@ -1,2 +1,2 @@ -SHA256 (parallel-20130222.tar.bz2) = ebd3a66ff96bfcb00812c08a856bdf0f02e3de8864613283917775f5551e20ef -SIZE (parallel-20130222.tar.bz2) = 240077 +SHA256 (parallel-20130422.tar.bz2) = 3090bb1ce3d56fe8c844a6ba4faa2ada69554f50c2ec46bdcd5d382d9a61cf2b +SIZE (parallel-20130422.tar.bz2) = 241817 Modified: head/sysutils/parallel/files/patch-src__parallel ============================================================================== --- head/sysutils/parallel/files/patch-src__parallel Mon Apr 22 19:07:36 2013 (r316266) +++ head/sysutils/parallel/files/patch-src__parallel Mon Apr 22 19:20:17 2013 (r316267) @@ -1,45 +1,28 @@ ---- ./src/parallel.orig 2012-12-22 14:56:17.000000000 -0600 -+++ ./src/parallel 2012-12-22 14:58:55.000000000 -0600 -@@ -4790,29 +4790,19 @@ - package Limits::Command; - - # 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 -- 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; +--- ./src/parallel.orig 2013-04-21 21:50:21.000000000 -0500 ++++ ./src/parallel 2013-04-21 21:56:46.000000000 -0500 +@@ -5072,21 +5072,14 @@ + # Returns: + # number of chars on the longest command line allowed + if(not $Limits::Command::line_max_len) { ++ $Limits::Command::line_max_len = `getconf ARG_MAX` - 1024; + if($opt::max_chars) { +- if(is_acceptable_command_line_length($opt::max_chars)) { +- $Limits::Command::line_max_len = $opt::max_chars; - } 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 = binary_find_max_length(0,$opt::max_chars); - } -- if($opt::s <= $Limits::Command::line_max_len) { -- $Limits::Command::line_max_len = $opt::s; +- if($opt::max_chars <= $Limits::Command::line_max_len) { +- $Limits::Command::line_max_len = $opt::max_chars; - } else { -- ::warning("Value for -s option ", -- "should be < $Limits::Command::line_max_len.\n"); -- } ++ if($opt::max_chars > $Limits::Command::line_max_len) { + ::warning("Value for -s option ", + "should be < $Limits::Command::line_max_len.\n"); ++ } else { ++ $Limits::Command::line_max_len = $opt::max_chars; + } - } else { - $Limits::Command::line_max_len = real_max_length(); -- } -- } -- return $Limits::Command::line_max_len; -+sub max_length { -+ # FreeBSD code: -+ if(not $Limits::Command::line_max_len) { -+ $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"; -+ } -+ $Limits::Command::line_max_len = $opt::s; -+ } -+ } -+ return $Limits::Command::line_max_len; - } - - sub real_max_length { + } + } + return $Limits::Command::line_max_len;