Revision

74208

Author

jwa@macports.org

Date

2010-12-07 09:05:30 -0800 (Tue, 07 Dec 2010)

Log Message

add missing patches, fix patch problems, change setup.py patch lines to lessen offsets

Modified Paths

• trunk/dports/lang/python27/files/patch-setup.py.diff
• trunk/dports/lang/python27/files/posixmodule.c.ed

Diff

--- trunk/dports/lang/python27/files/patch-setup.py.diff	2010-12-07 15:37:14 UTC (rev 74207)
+++ trunk/dports/lang/python27/files/patch-setup.py.diff	2010-12-07 17:05:30 UTC (rev 74208)
@@ -1,6 +1,6 @@
 --- setup.py.orig	2009-04-01 05:20:48.000000000 +1100
 +++ setup.py	2009-09-03 10:20:32.000000000 +1000
-@@ -1494,7 +1496,7 @@
+@@ -1637,7 +1637,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...
@@ -9,7 +9,7 @@
          frameworks = ['-framework', 'Tcl', '-framework', 'Tk']
  
          # All existing framework builds of Tcl/Tk don't support 64-bit
-@@ -1529,13 +1531,7 @@
+@@ -1677,13 +1677,7 @@
      def detect_tkinter(self, inc_dirs, lib_dirs):
          # The _tkinter module.
  
@@ -23,7 +23,7 @@
  
          # Assume we haven't found any of the libraries or include files
          # The versions with dots are used on Unix, and the versions without
-@@ -1583,17 +1579,17 @@
+@@ -1731,17 +1727,17 @@
          if platform == 'sunos5':
              include_dirs.append('/usr/openwin/include')
              added_lib_dirs.append('/usr/openwin/lib')

--- trunk/dports/lang/python27/files/posixmodule.c.ed	2010-12-07 15:37:14 UTC (rev 74207)
+++ trunk/dports/lang/python27/files/posixmodule.c.ed	2010-12-07 17:05:30 UTC (rev 74208)
@@ -28,8 +28,6 @@
         if (n < 0) {
             errno = EINVAL;
 .
-/else {/s//} else {/
-/PyInt_FromLong((long)grouplist\[i\]);/s//PyInt_FromLong((long)(int)grouplist[i]);/
 /return result;/i
     if (grouplist) free(grouplist);
 .