Update to 0.36.

Parts of PR 105780 by chinsan were used in this commit.

3 files changed, 19 insertions, 27 deletions

diff --git a/devel/p5-IPC-Cmd/Makefile b/devel/p5-IPC-Cmd/Makefile
index 42855398b00a..5a74cef16307 100644
--- a/devel/p5-IPC-Cmd/Makefile
+++ b/devel/p5-IPC-Cmd/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	IPC-Cmd
-PORTVERSION=	0.25
+PORTVERSION=	0.36
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	IPC
@@ -17,8 +17,8 @@ COMMENT=	IPC::Cmd - finding and running system commands made easy
 
 RUN_DEPENDS=	${SITE_PERL}/Locale/Maketext/Simple.pm:${PORTSDIR}/devel/p5-Locale-Maketext-Simple \
 		${SITE_PERL}/Module/Load/Conditional.pm:${PORTSDIR}/devel/p5-Module-Load-Conditional \
-		${SITE_PERL}/IPC/Run.pm:${PORTSDIR}/devel/p5-IPC-Run \
-		${SITE_PERL}/Params/Check.pm:${PORTSDIR}/devel/p5-Params-Check
+		p5-IPC-Run>=0.55:${PORTSDIR}/devel/p5-IPC-Run \
+		p5-Params-Check>=0.20:${PORTSDIR}/devel/p5-Params-Check
 BUILD_DEPENDS=	${RUN_DEPENDS}
 
 PERL_CONFIGURE=	yes
diff --git a/devel/p5-IPC-Cmd/distinfo b/devel/p5-IPC-Cmd/distinfo
index 342c83f0e9b1..d36563d3739a 100644
--- a/devel/p5-IPC-Cmd/distinfo
+++ b/devel/p5-IPC-Cmd/distinfo
@@ -1,3 +1,3 @@
-MD5 (IPC-Cmd-0.25.tar.gz) = 69bb014822594266ca2cbd01aae54912
-SHA256 (IPC-Cmd-0.25.tar.gz) = a5dc8190cfd34ee55e5979eb501d04239470e73fdf2699b19f34640ec5056778
-SIZE (IPC-Cmd-0.25.tar.gz) = 9969
+MD5 (IPC-Cmd-0.36.tar.gz) = 56c6a27022ba5ebc2701364313f751b9
+SHA256 (IPC-Cmd-0.36.tar.gz) = 6488f3b9eab3f15891e5e7f1a881f2c136ec072792796db5193fd750dd01b834
+SIZE (IPC-Cmd-0.36.tar.gz) = 12320
diff --git a/devel/p5-IPC-Cmd/files/patch-IPC-Cmd.pm b/devel/p5-IPC-Cmd/files/patch-IPC-Cmd.pm
index 1befaa9dec3f..d3399f74eb68 100644
--- a/devel/p5-IPC-Cmd/files/patch-IPC-Cmd.pm
+++ b/devel/p5-IPC-Cmd/files/patch-IPC-Cmd.pm
@@ -1,21 +1,13 @@
---- lib/IPC/Cmd.pm	Wed Sep  6 17:34:32 2006
-+++ lib/IPC/Cmd.pm	Thu Sep 21 13:15:15 2006
-@@ -260,8 +260,7 @@ sub _open3_run {
-     ### child process. This stops us from having to pump input
-     ### from ourselves to the childprocess. However, we will need
-     ### to revive the FH afterwards, as IPC::Open3 closes it.
--    my $save_stdin;
--    open $save_stdin, "<&STDIN" or (
-+    open IPC_CMD_SAVE_STDIN, "<&STDIN" or (
-         warn(loc("Could not dup STDIN: %1",$!)),
-         return
-     );
-@@ -317,7 +316,7 @@ sub _open3_run {
-     
-     ### restore STDIN after duping, or STDIN will be closed for
-     ### this current perl process!
--    open STDIN, "<&", $save_stdin or (
-+    open STDIN, "<& IPC_CMD_SAVE_STDIN" or (
-         warn(loc("Could not restore STDIN: %1", $!)),
-         return
-     );        
+$Id$
+
+--- lib/IPC/Cmd.pm.orig	Sat Dec  2 15:55:55 2006
++++ lib/IPC/Cmd.pm	Sat Dec  2 15:56:52 2006
+@@ -597,7 +597,7 @@ sub _system_run { 
+             ### we should re-open this filehandle right now, not
+             ### just dup it
+             if( $redir eq '>&' ) {
+-                open( $fh, '>', File::Spec->devnull ) or (
++                open( $fh, '> ' . File::Spec->devnull ) or (
+                     Carp::carp(loc("Could not reopen '$name': %1", $!)),
+                     return
+                 );