Changeset 68792 for trunk/dports

Timestamp:

Jun 13, 2010, 8:49:38 PM (14 years ago)

Author:

blb@…

Message:

lang/python26 - do not link in X11 when tk is installed with +quartz, ticket #25221

Location:

trunk/dports/lang/python26

Files:

• Portfile (modified) (2 diffs)
• files/patch-setup.py_tkquartz.diff (added)

trunk/dports/lang/python26/Portfile

@@ -6 +6 @@
 name                    python26
 version                 2.6.5
-revision                1
+revision                2
 set major               [lindex [split $version .] 0]
 set branch              [join [lrange [split ${version} .] 0 1] .]
@@ -79 +79 @@
       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} results options]} {
+      # Error from grep means not found, so Quartz
+      system "cd ${worksrcpath} && patch -p0 < ${filespath}/patch-setup.py_tkquartz.diff"
+   }
+
 }