From 2d4f65c5fd9d602b95d406422c23990312d10922 Mon Sep 17 00:00:00 2001
From: joerg <joerg>
Date: Sat, 7 Apr 2012 11:32:29 +0000
Subject: Workaround hangs with Python 2.5 by not using pipes for both stdin
 and stdout.

---
 graphics/py-matplotlib/distinfo         |  4 ++--
 graphics/py-matplotlib/patches/patch-aa | 19 +++++++++++++++++--
 2 files changed, 19 insertions(+), 4 deletions(-)

(limited to 'graphics/py-matplotlib')

diff --git a/graphics/py-matplotlib/distinfo b/graphics/py-matplotlib/distinfo
index 28a3c7a3cc7..a58134024ee 100644
--- a/graphics/py-matplotlib/distinfo
+++ b/graphics/py-matplotlib/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.14 2011/09/08 00:13:31 joerg Exp $
+$NetBSD: distinfo,v 1.15 2012/04/07 11:32:29 joerg Exp $
 
 SHA1 (matplotlib-1.0.1.tar.gz) = c7a832f28a66817626e7a8af21e14ea0e15f4008
 RMD160 (matplotlib-1.0.1.tar.gz) = e3e326f7f31ef995253da483444cb593b8e6753b
 Size (matplotlib-1.0.1.tar.gz) = 13285166 bytes
-SHA1 (patch-aa) = 9e43860c70b8632aa96be68a95f34720ce0ee34a
+SHA1 (patch-aa) = 4c9d8e9a7659ce09c84b0e5a8bdc36d16b2799fe
 SHA1 (patch-ab) = 2c85ef7b1aa9b9a317dd4fbfc7a69921d2241c2f
 SHA1 (patch-agg24-include-agg_renderer_outline_aa.h) = fc7de9efc4563e75634947eac3c3a5a69441f2ce
diff --git a/graphics/py-matplotlib/patches/patch-aa b/graphics/py-matplotlib/patches/patch-aa
index cd8b8499719..4322668f829 100644
--- a/graphics/py-matplotlib/patches/patch-aa
+++ b/graphics/py-matplotlib/patches/patch-aa
@@ -1,8 +1,23 @@
-$NetBSD: patch-aa,v 1.8 2011/02/17 10:33:37 markd Exp $
+$NetBSD: patch-aa,v 1.9 2012/04/07 11:32:29 joerg Exp $
 
 --- setupext.py.orig	2010-07-07 01:41:55.000000000 +0000
 +++ setupext.py
-@@ -344,11 +344,8 @@ def check_for_libpng():
+@@ -201,12 +201,8 @@ else:
+     print_status = print_message = print_raw = print_line
+ 
+ def run_child_process(cmd):
+-    p = subprocess.Popen(cmd, shell=True,
+-                         stdin=subprocess.PIPE,
+-                         stdout=subprocess.PIPE,
+-                         stderr=subprocess.STDOUT,
+-                         close_fds=(sys.platform != 'win32'))
+-    return p.stdin, p.stdout
++    import os
++    return None, os.popen(cmd + " 2>&1")
+ 
+ class CleanUpFile:
+     """CleanUpFile deletes the specified filename when self is destroyed."""
+@@ -344,11 +340,8 @@ def check_for_libpng():
      return True
  
  def add_base_flags(module):
-- 
cgit v1.2.3