Attachment 130667 Details for Bug 174645 – file.diff

[patch] file.diff

file.diff (text/plain), 4.11 KB, created by howeyc on 2012-12-22 21:20:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: howeyc

Created: 2012-12-22 21:20:00 UTC

Size: 4.11 KB

patch

obsolete

>diff -ruN parallel.bak/Makefile parallel/Makefile
>--- parallel.bak/Makefile	2012-12-04 17:45:36.000000000 -0600
>+++ parallel/Makefile	2012-12-22 14:47:43.000000000 -0600
>@@ -2,7 +2,7 @@
> # $FreeBSD: ports/sysutils/parallel/Makefile,v 1.30 2012/12/04 23:45:36 svnexp Exp $
> 
> PORTNAME=	parallel
>-PORTVERSION=	20121122
>+PORTVERSION=	20121222
> CATEGORIES=	sysutils
> MASTER_SITES=	GNU
> 
>diff -ruN parallel.bak/distinfo parallel/distinfo
>--- parallel.bak/distinfo	2012-12-04 17:45:36.000000000 -0600
>+++ parallel/distinfo	2012-12-22 14:47:46.000000000 -0600
>@@ -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 -ruN parallel.bak/files/patch-src__parallel parallel/files/patch-src__parallel
>--- parallel.bak/files/patch-src__parallel	2012-08-23 02:31:06.000000000 -0500
>+++ parallel/files/patch-src__parallel	2012-12-22 15:04:09.000000000 -0600
>@@ -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 {

Actions: View | Diff

Attachments on bug 174645: 130667