From owner-svn-ports-head@FreeBSD.ORG Fri Oct 25 13:35:58 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]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 43093848; Fri, 25 Oct 2013 13:35:58 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 217342775; Fri, 25 Oct 2013 13:35:58 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9PDZv3P074023; Fri, 25 Oct 2013 13:35:58 GMT (envelope-from sunpoet@svn.freebsd.org) Received: (from sunpoet@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9PDZvXq074020; Fri, 25 Oct 2013 13:35:57 GMT (envelope-from sunpoet@svn.freebsd.org) Message-Id: <201310251335.r9PDZvXq074020@svn.freebsd.org> From: Sunpoet Po-Chuan Hsieh Date: Fri, 25 Oct 2013 13:35:57 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r331576 - 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: Fri, 25 Oct 2013 13:35:58 -0000 Author: sunpoet Date: Fri Oct 25 13:35:57 2013 New Revision: 331576 URL: http://svnweb.freebsd.org/changeset/ports/331576 Log: - Update to 20131022 - While I'm here, convert to new options helper and support STAGEDIR Changes: https://savannah.gnu.org/forum/forum.php?forum_id=7761 PR: ports/183249 Submitted by: Chris Howey (maintainer) Modified: head/sysutils/parallel/Makefile head/sysutils/parallel/distinfo head/sysutils/parallel/files/patch-src__parallel (contents, props changed) Modified: head/sysutils/parallel/Makefile ============================================================================== --- head/sysutils/parallel/Makefile Fri Oct 25 13:31:18 2013 (r331575) +++ head/sysutils/parallel/Makefile Fri Oct 25 13:35:57 2013 (r331576) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= parallel -PORTVERSION= 20130922 +PORTVERSION= 20131022 CATEGORIES= sysutils MASTER_SITES= GNU @@ -17,23 +17,22 @@ CONFLICTS= moreutils-parallel-[0-9]* CONFIGURE_ARGS= --docdir="${DOCSDIR}" GNU_CONFIGURE= yes -NO_STAGE= yes +#NO_STAGE= yes USE_BZIP2= yes USES= perl5 -MAN1= niceload.1 parallel.1 parallel_tutorial.1 sem.1 sql.1 -PLIST_FILES= bin/niceload bin/parallel bin/sem bin/sql +PLIST_FILES= bin/niceload bin/parallel bin/sem bin/sql \ + man/man1/niceload.1.gz man/man1/parallel.1.gz \ + man/man1/parallel_tutorial.1.gz man/man1/sem.1.gz man/man1/sql.1.gz PORTDOCS= niceload.html niceload.pdf niceload.texi \ parallel.html parallel.pdf parallel.texi \ parallel_tutorial.html parallel_tutorial.pdf parallel_tutorial.texi \ sem.html sem.pdf sem.texi \ sql.html sql.pdf sql.texi -.include +DOCS_BUILD_DEPENDS= ${LOCALBASE}/bin/pod2texi:${PORTSDIR}/print/texinfo -.if ${PORT_OPTIONS:MDOCS} -BUILD_DEPENDS+= ${LOCALBASE}/bin/pod2texi:${PORTSDIR}/print/texinfo -.endif +.include post-patch: .if empty(PORT_OPTIONS:MDOCS) Modified: head/sysutils/parallel/distinfo ============================================================================== --- head/sysutils/parallel/distinfo Fri Oct 25 13:31:18 2013 (r331575) +++ head/sysutils/parallel/distinfo Fri Oct 25 13:35:57 2013 (r331576) @@ -1,2 +1,2 @@ -SHA256 (parallel-20130922.tar.bz2) = e8fa0e4dd06781aa90f4567493ae61233b8db6a1b35257f8d229f9efd737b909 -SIZE (parallel-20130922.tar.bz2) = 769344 +SHA256 (parallel-20131022.tar.bz2) = 93280c7a03c18b07685157af36f2dfc82bbc59828acbdfe86ed27171a442b6f9 +SIZE (parallel-20131022.tar.bz2) = 772831 Modified: head/sysutils/parallel/files/patch-src__parallel ============================================================================== --- head/sysutils/parallel/files/patch-src__parallel Fri Oct 25 13:31:18 2013 (r331575) +++ head/sysutils/parallel/files/patch-src__parallel Fri Oct 25 13:35:57 2013 (r331576) @@ -1,28 +1,35 @@ ---- ./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 @@ +--- ./src/parallel.orig 2013-10-21 15:31:40.000000000 -0500 ++++ ./src/parallel 2013-10-23 15:11:54.000000000 -0500 +@@ -5538,29 +5538,13 @@ # 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; +- # Disk cache of max command line length +- my $len_cache = $ENV{'HOME'} . "/.parallel/tmp/linelen-" . ::hostname(); +- my $cached_limit; +- if(-e $len_cache) { +- open(my $fh, "<", $len_cache) || ::die_bug("Cannot read $len_cache"); +- $cached_limit = <$fh>; +- close $fh; +- } else { +- $cached_limit = real_max_length(); +- # If $HOME is write protected: Do not fail +- mkdir($ENV{'HOME'} . "/.parallel"); +- mkdir($ENV{'HOME'} . "/.parallel/tmp"); +- open(my $fh, ">", $len_cache); +- print $fh $cached_limit; +- close $fh; +- } +- $Limits::Command::line_max_len = $cached_limit; ++ $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::max_chars); -- } -- if($opt::max_chars <= $Limits::Command::line_max_len) { -- $Limits::Command::line_max_len = $opt::max_chars; -- } else { -+ if($opt::max_chars > $Limits::Command::line_max_len) { +- if($opt::max_chars <= $cached_limit) { ++ 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"); -+ } else { -+ $Limits::Command::line_max_len = $opt::max_chars; +- "should be < $cached_limit.\n"); ++ "should be < $Limits::Command::line_max_len.\n"); } -- } else { -- $Limits::Command::line_max_len = real_max_length(); } } - return $Limits::Command::line_max_len;