[56896] trunk/dports/lang/python31/files/patch-setup.py.diff

[jmr at macports.org]

Revision: 56896
          http://trac.macports.org/changeset/56896
Author:   jmr at macports.org
Date:     2009-09-02 20:56:17 -0700 (Wed, 02 Sep 2009)
Log Message:
-----------
python31: avoid using system X11

Modified Paths:
--------------
    trunk/dports/lang/python31/files/patch-setup.py.diff

Modified: trunk/dports/lang/python31/files/patch-setup.py.diff
===================================================================
--- trunk/dports/lang/python31/files/patch-setup.py.diff	2009-09-03 03:47:20 UTC (rev 56895)
+++ trunk/dports/lang/python31/files/patch-setup.py.diff	2009-09-03 03:56:17 UTC (rev 56896)
@@ -1,6 +1,15 @@
---- setup.py.orig	2008-09-29 18:15:45.000000000 -0600
-+++ setup.py	2008-11-30 23:13:09.000000000 -0700
-@@ -1156,13 +1156,7 @@
+--- setup.py.orig	2009-05-24 03:13:14.000000000 +1000
++++ setup.py	2009-09-03 13:51:47.000000000 +1000
+@@ -1265,7 +1265,7 @@
+         # For 8.4a2, the X11 headers are not included. Rather than include a
+         # complicated search, this is a hard-coded path. It could bail out
+         # if X11 libs are not found...
+-        include_dirs.append('/usr/X11R6/include')
++        #include_dirs.append('/usr/X11R6/include')
+         frameworks = ['-framework', 'Tcl', '-framework', 'Tk']
+ 
+         # All existing framework builds of Tcl/Tk don't support 64-bit
+@@ -1300,13 +1300,7 @@
      def detect_tkinter(self, inc_dirs, lib_dirs):
          # The _tkinter module.
  
@@ -14,3 +23,31 @@
  
          # Assume we haven't found any of the libraries or include files
          # The versions with dots are used on Unix, and the versions without
+@@ -1354,17 +1348,17 @@
+         if platform == 'sunos5':
+             include_dirs.append('/usr/openwin/include')
+             added_lib_dirs.append('/usr/openwin/lib')
+-        elif os.path.exists('/usr/X11R6/include'):
+-            include_dirs.append('/usr/X11R6/include')
+-            added_lib_dirs.append('/usr/X11R6/lib64')
+-            added_lib_dirs.append('/usr/X11R6/lib')
+-        elif os.path.exists('/usr/X11R5/include'):
+-            include_dirs.append('/usr/X11R5/include')
+-            added_lib_dirs.append('/usr/X11R5/lib')
+-        else:
++        #elif os.path.exists('/usr/X11R6/include'):
++        #    include_dirs.append('/usr/X11R6/include')
++        #    added_lib_dirs.append('/usr/X11R6/lib64')
++        #    added_lib_dirs.append('/usr/X11R6/lib')
++        #elif os.path.exists('/usr/X11R5/include'):
++        #    include_dirs.append('/usr/X11R5/include')
++        #    added_lib_dirs.append('/usr/X11R5/lib')
++        #else:
+             # Assume default location for X11
+-            include_dirs.append('/usr/X11/include')
+-            added_lib_dirs.append('/usr/X11/lib')
++        #    include_dirs.append('/usr/X11/include')
++        #    added_lib_dirs.append('/usr/X11/lib')
+ 
+         # If Cygwin, then verify that X is installed before proceeding
+         if platform == 'cygwin':
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090902/4a5199fe/attachment.html>