aboutsummaryrefslogtreecommitdiff
path: root/sysutils/parallel
diff options
context:
space:
mode:
authorPawel Pekala <pawel@FreeBSD.org>2013-01-04 19:56:03 +0000
committerPawel Pekala <pawel@FreeBSD.org>2013-01-04 19:56:03 +0000
commit2338cf57c26273615e84e44cd0502529fde729cd (patch)
tree0ab77826a3a61b456b608cc07eddf6b6942d4b2e /sysutils/parallel
parent49c71dd63c389df791b890c04dc338b3be06840b (diff)
downloadports-2338cf57c26273615e84e44cd0502529fde729cd.tar.gz
ports-2338cf57c26273615e84e44cd0502529fde729cd.zip
- Update to version 20121122 [1]
- Don't use port name in COMMENT Release Notes: http://savannah.gnu.org/forum/forum.php?forum_id=7460 PR: ports/174645 [1] Submitted by: Chris Howey <howeyc@gmail.com> (maintainer)
Notes
Notes: svn path=/head/; revision=309937
Diffstat (limited to 'sysutils/parallel')
-rw-r--r--sysutils/parallel/Makefile4
-rw-r--r--sysutils/parallel/distinfo4
-rw-r--r--sysutils/parallel/files/patch-src__parallel59
3 files changed, 42 insertions, 25 deletions
diff --git a/sysutils/parallel/Makefile b/sysutils/parallel/Makefile
index f7c566f11a3d..faf809f8e825 100644
--- a/sysutils/parallel/Makefile
+++ b/sysutils/parallel/Makefile
@@ -2,12 +2,12 @@
# $FreeBSD$
PORTNAME= parallel
-PORTVERSION= 20121122
+PORTVERSION= 20121222
CATEGORIES= sysutils
MASTER_SITES= GNU
MAINTAINER= howeyc@gmail.com
-COMMENT= GNU parallel is a shell tool for executing jobs in parallel
+COMMENT= Shell tool for executing jobs in parallel
LICENSE= GPLv3
diff --git a/sysutils/parallel/distinfo b/sysutils/parallel/distinfo
index 07a1383b34fe..20ca0ce2664e 100644
--- a/sysutils/parallel/distinfo
+++ b/sysutils/parallel/distinfo
@@ -1,2 +1,2 @@
-SHA256 (parallel-20121122.tar.bz2) = 0315336141612ba2ec1f76e6c8c58a72f4531777c96b79b91ef64b3980be584f
-SIZE (parallel-20121122.tar.bz2) = 236294
+SHA256 (parallel-20121222.tar.bz2) = 0ce96ad4e36734baae7ce6c8d99d004810fbfdf5209d6f86d5b5fc9a92dc17f8
+SIZE (parallel-20121222.tar.bz2) = 237603
diff --git a/sysutils/parallel/files/patch-src__parallel b/sysutils/parallel/files/patch-src__parallel
index ac11b7850ca7..1804fc5f4344 100644
--- a/sysutils/parallel/files/patch-src__parallel
+++ b/sysutils/parallel/files/patch-src__parallel
@@ -1,28 +1,45 @@
---- ./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) {
-+ $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;
+--- ./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;
- } 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) {
-+ 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;
+- $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 {
- ::warning("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;
+- }
+- }
+- 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 {