- Update to 20130422

Changes:	https://savannah.gnu.org/forum/forum.php?forum_id=7581
PR:		ports/178039
Submitted by:	Chris Howey <howeyc@gmail.com> (maintainer)

3 files changed, 29 insertions, 42 deletions

diff --git a/sysutils/parallel/Makefile b/sysutils/parallel/Makefile
index 6a4fd4b91955..338d072a271d 100644
--- a/sysutils/parallel/Makefile
+++ b/sysutils/parallel/Makefile
@@ -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.html niceload.html \
 
 .include <bsd.port.options.mk>
 
+.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)
diff --git a/sysutils/parallel/distinfo b/sysutils/parallel/distinfo
index ecb6be358a23..610a0a396b8e 100644
--- a/sysutils/parallel/distinfo
+++ b/sysutils/parallel/distinfo
@@ -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
diff --git a/sysutils/parallel/files/patch-src__parallel b/sysutils/parallel/files/patch-src__parallel
index 1804fc5f4344..00c077baf23e 100644
--- a/sysutils/parallel/files/patch-src__parallel
+++ b/sysutils/parallel/files/patch-src__parallel
@@ -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;