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-gtk2/distinfo               |  4 ++--
 graphics/py-matplotlib-gtk2/patches/patch-aa       | 19 +++++++++++++++--
 graphics/py-matplotlib-tk/distinfo                 |  4 ++--
 graphics/py-matplotlib-tk/patches/patch-aa         | 19 +++++++++++++++--
 graphics/py-matplotlib/distinfo                    |  4 ++--
 graphics/py-matplotlib/patches/patch-aa            | 19 +++++++++++++++--
 graphics/py-pyfits/distinfo                        |  3 ++-
 .../patches/patch-stsci_distutils_hack.py          | 24 ++++++++++++++++++++++
 8 files changed, 83 insertions(+), 13 deletions(-)
 create mode 100644 graphics/py-pyfits/patches/patch-stsci_distutils_hack.py

(limited to 'graphics')

diff --git a/graphics/py-matplotlib-gtk2/distinfo b/graphics/py-matplotlib-gtk2/distinfo
index 0d8a3cc89d9..8a08029ad89 100644
--- a/graphics/py-matplotlib-gtk2/distinfo
+++ b/graphics/py-matplotlib-gtk2/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.7 2011/09/08 13:53:45 joerg Exp $
+$NetBSD: distinfo,v 1.8 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) = 611a55383e4d343f220f6bdb814629b22e70848d
+SHA1 (patch-aa) = 159f1c30276014e2aef83c9c3c0e2a0f6746690c
 SHA1 (patch-ab) = 4bc5d9fa3d8f6236794c2e76f63f1bc45e3948ec
 SHA1 (patch-agg24-include-agg_renderer_outline_aa.h) = fc7de9efc4563e75634947eac3c3a5a69441f2ce
diff --git a/graphics/py-matplotlib-gtk2/patches/patch-aa b/graphics/py-matplotlib-gtk2/patches/patch-aa
index 7069feb1667..4c84cab0a47 100644
--- a/graphics/py-matplotlib-gtk2/patches/patch-aa
+++ b/graphics/py-matplotlib-gtk2/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.6 2011/02/17 10:33:38 markd Exp $
+$NetBSD: patch-aa,v 1.7 2012/04/07 11:32:29 joerg Exp $
 
 --- setupext.py.orig	2010-07-07 01:41:55.000000000 +0000
 +++ setupext.py
@@ -20,7 +20,22 @@ $NetBSD: patch-aa,v 1.6 2011/02/17 10:33:38 markd Exp $
             'backend': None,
             'basedirlist': None}
  
-@@ -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):
diff --git a/graphics/py-matplotlib-tk/distinfo b/graphics/py-matplotlib-tk/distinfo
index 62f8d61a153..9a69f35e7d9 100644
--- a/graphics/py-matplotlib-tk/distinfo
+++ b/graphics/py-matplotlib-tk/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.6 2011/09/08 13:53:46 joerg Exp $
+$NetBSD: distinfo,v 1.7 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) = 611a55383e4d343f220f6bdb814629b22e70848d
+SHA1 (patch-aa) = 159f1c30276014e2aef83c9c3c0e2a0f6746690c
 SHA1 (patch-ab) = 4bc5d9fa3d8f6236794c2e76f63f1bc45e3948ec
 SHA1 (patch-agg24-include-agg_renderer_outline_aa.h) = fc7de9efc4563e75634947eac3c3a5a69441f2ce
diff --git a/graphics/py-matplotlib-tk/patches/patch-aa b/graphics/py-matplotlib-tk/patches/patch-aa
index 055a301d993..a319c58ada0 100644
--- a/graphics/py-matplotlib-tk/patches/patch-aa
+++ b/graphics/py-matplotlib-tk/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.4 2011/02/17 10:33:39 markd Exp $
+$NetBSD: patch-aa,v 1.5 2012/04/07 11:32:30 joerg Exp $
 
 --- setupext.py.orig	2010-07-07 01:41:55.000000000 +0000
 +++ setupext.py
@@ -20,7 +20,22 @@ $NetBSD: patch-aa,v 1.4 2011/02/17 10:33:39 markd Exp $
             'backend': None,
             'basedirlist': None}
  
-@@ -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):
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):
diff --git a/graphics/py-pyfits/distinfo b/graphics/py-pyfits/distinfo
index 75a771c2981..f44af4ac345 100644
--- a/graphics/py-pyfits/distinfo
+++ b/graphics/py-pyfits/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.2 2011/03/11 14:55:43 drochner Exp $
+$NetBSD: distinfo,v 1.3 2012/04/07 11:32:30 joerg Exp $
 
 SHA1 (pyfits-2.4.0.tar.gz) = 5a0c9c7fd058fc44a22f1c00682461ecf4ebc3c1
 RMD160 (pyfits-2.4.0.tar.gz) = 3256f2111db7c994f1deb7d6ec37cb6a2a003fb0
 Size (pyfits-2.4.0.tar.gz) = 284236 bytes
 SHA1 (patch-aa) = b1d6964efdee73628f716e37e0dc1c18d17e7610
+SHA1 (patch-stsci_distutils_hack.py) = de3664947c9f194f518d6a3d45d778104cbce7a0
diff --git a/graphics/py-pyfits/patches/patch-stsci_distutils_hack.py b/graphics/py-pyfits/patches/patch-stsci_distutils_hack.py
new file mode 100644
index 00000000000..8f3123b5e06
--- /dev/null
+++ b/graphics/py-pyfits/patches/patch-stsci_distutils_hack.py
@@ -0,0 +1,24 @@
+$NetBSD: patch-stsci_distutils_hack.py,v 1.1 2012/04/07 11:32:30 joerg Exp $
+
+--- stsci_distutils_hack.py.orig	2010-04-14 11:20:48.000000000 +0000
++++ stsci_distutils_hack.py
+@@ -237,8 +237,8 @@ def __get_svn_rev__(path):
+     try:
+         # with popen3,  stderr goes into a pipe where we ignore it,
+         # This means the user does not see errors.
+-        cmd = 'svnversion '+path
+-        (sin, sout, serr) = os.popen3(cmd)
++        cmd = 'svnversion %s 2>/dev/null' % path
++        sout = os.popen(cmd)
+ 
+         # pick up the first line of output
+         m=sout.read().strip()
+@@ -261,7 +261,7 @@ def __get_full_info__(path):
+     try:
+         # with popen3,  stderr goes into a pipe where we ignore it,
+         # This means the user does not see errors.
+-        (sin, sout, serr) = os.popen3('svn info %s' % path)
++        sout = os.popen('svn info %s 2>/dev/null' % path)
+ 
+         # pick up all the lines of output
+         info = [l.strip() for l in sout.readlines()]
-- 
cgit v1.2.3