[57935] trunk/dports/python/py26-pil

[blb at macports.org]

Revision: 57935
          http://trac.macports.org/changeset/57935
Author:   blb at macports.org
Date:     2009-09-18 23:59:09 -0700 (Fri, 18 Sep 2009)
Log Message:
-----------
python/py26-pil - make sure to link against MacPorts Tcl and Tk, not system ones

Modified Paths:
--------------
    trunk/dports/python/py26-pil/Portfile
    trunk/dports/python/py26-pil/files/patch-setup.py

Modified: trunk/dports/python/py26-pil/Portfile
===================================================================
--- trunk/dports/python/py26-pil/Portfile	2009-09-19 06:53:39 UTC (rev 57934)
+++ trunk/dports/python/py26-pil/Portfile	2009-09-19 06:59:09 UTC (rev 57935)
@@ -5,6 +5,7 @@
 
 name            py26-pil
 version         1.1.6
+revision        1
 license         MIT
 maintainers     jmr openmaintainer
 description     Python Imaging Library

Modified: trunk/dports/python/py26-pil/files/patch-setup.py
===================================================================
--- trunk/dports/python/py26-pil/files/patch-setup.py	2009-09-19 06:53:39 UTC (rev 57934)
+++ trunk/dports/python/py26-pil/files/patch-setup.py	2009-09-19 06:59:09 UTC (rev 57935)
@@ -1,6 +1,6 @@
---- setup.py	2005-03-23 19:16:40.000000000 +0100
-+++ setup.py	2005-07-11 18:50:55.000000000 +0200
-@@ -28,11 +28,11 @@
+--- setup.py.orig	2006-12-03 04:37:29.000000000 -0700
++++ setup.py	2009-09-18 19:58:45.000000000 -0600
+@@ -34,11 +34,11 @@
  #
  # TIFF_ROOT = libinclude("/opt/tiff")
  
@@ -17,3 +17,35 @@
  
  # FIXME: add mechanism to explicitly *disable* the use of a library
  
+@@ -302,30 +302,7 @@
+                 "_imagingtiff", ["_imagingtiff.c"], libraries=["tiff"]
+                 ))
+ 
+-        if sys.platform == "darwin":
+-            # locate Tcl/Tk frameworks
+-            frameworks = []
+-            framework_roots = [
+-                "/Library/Frameworks",
+-                "/System/Library/Frameworks"
+-                ]
+-            for root in framework_roots:
+-                if (os.path.exists(os.path.join(root, "Tcl.framework")) and
+-                    os.path.exists(os.path.join(root, "Tk.framework"))):
+-                    print "--- using frameworks at", root
+-                    frameworks = ["-framework", "Tcl", "-framework", "Tk"]
+-                    dir = os.path.join(root, "Tcl.framework", "Headers")
+-                    add_directory(self.compiler.include_dirs, dir, 0)
+-                    dir = os.path.join(root, "Tk.framework", "Headers")
+-                    add_directory(self.compiler.include_dirs, dir, 1)
+-                    break
+-            if frameworks:
+-                exts.append(Extension(
+-                    "_imagingtk", ["_imagingtk.c", "Tk/tkImaging.c"],
+-                    extra_compile_args=frameworks, extra_link_args=frameworks
+-                    ))
+-                feature.tcl = feature.tk = 1 # mark as present
+-        elif feature.tcl and feature.tk:
++        if feature.tcl and feature.tk:
+             exts.append(Extension(
+                 "_imagingtk", ["_imagingtk.c", "Tk/tkImaging.c"],
+                 libraries=[feature.tcl, feature.tk]
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090918/70395a34/attachment-0001.html>