[78477] trunk/dports/lang/python26

[jmr at macports.org]

Revision: 78477
          http://trac.macports.org/changeset/78477
Author:   jmr at macports.org
Date:     2011-05-08 19:32:54 -0700 (Sun, 08 May 2011)
Log Message:
-----------
python26: remove tk-related patch that was missed in r74548

Revision Links:
--------------
    http://trac.macports.org/changeset/74548

Modified Paths:
--------------
    trunk/dports/lang/python26/Portfile

Removed Paths:
-------------
    trunk/dports/lang/python26/files/patch-setup.py_tkquartz.diff

Modified: trunk/dports/lang/python26/Portfile
===================================================================
--- trunk/dports/lang/python26/Portfile	2011-05-08 21:10:35 UTC (rev 78476)
+++ trunk/dports/lang/python26/Portfile	2011-05-09 02:32:54 UTC (rev 78477)
@@ -78,14 +78,6 @@
       # http://trac.macports.org/ticket/21559
       system "cd ${worksrcpath} && ed - Modules/posixmodule.c < ${filespath}/posixmodule.c.ed"
    }
-
-   # Check for whether tk is installed for X11 or Quartz (to avoid trying
-   # to link to X11 in the Quartz case, ticket #25221)
-   if {[catch {exec grep "^TK_LIBS.*X11" ${prefix}/lib/tkConfig.sh > /dev/null 2>@1}]} {
-      # Error from grep means not found, so Quartz
-      system "cd ${worksrcpath} && patch -p0 < ${filespath}/patch-setup.py_tkquartz.diff"
-   }
-
 }
 
 build.target            all

Deleted: trunk/dports/lang/python26/files/patch-setup.py_tkquartz.diff
===================================================================
--- trunk/dports/lang/python26/files/patch-setup.py_tkquartz.diff	2011-05-08 21:10:35 UTC (rev 78476)
+++ trunk/dports/lang/python26/files/patch-setup.py_tkquartz.diff	2011-05-09 02:32:54 UTC (rev 78477)
@@ -1,13 +0,0 @@
---- setup.py.orig	2010-03-08 00:08:25.000000000 -0700
-+++ setup.py	2010-06-13 14:19:56.000000000 -0600
-@@ -1636,8 +1636,8 @@
-             libs.append('ld')
- 
-         # Finally, link with the X11 libraries (not appropriate on cygwin)
--        if platform != "cygwin":
--            libs.append('X11')
-+#        if platform != "cygwin":
-+#            libs.append('X11')
- 
-         ext = Extension('_tkinter', ['_tkinter.c', 'tkappinit.c'],
-                         define_macros=[('WITH_APPINIT', 1)] + defs,
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110508/88bf9d25/attachment.html>