[111861] trunk/dports/python/py-Pillow

[stromnov at macports.org]

Revision: 111861
          https://trac.macports.org/changeset/111861
Author:   stromnov at macports.org
Date:     2013-10-04 05:36:48 -0700 (Fri, 04 Oct 2013)
Log Message:
-----------
py-Pillow: update to version 2.2.1

Modified Paths:
--------------
    trunk/dports/python/py-Pillow/Portfile
    trunk/dports/python/py-Pillow/files/patch-setup.py.diff

Modified: trunk/dports/python/py-Pillow/Portfile
===================================================================
--- trunk/dports/python/py-Pillow/Portfile	2013-10-04 12:26:06 UTC (rev 111860)
+++ trunk/dports/python/py-Pillow/Portfile	2013-10-04 12:36:48 UTC (rev 111861)
@@ -5,7 +5,7 @@
 PortGroup           python 1.0
 
 name                py-Pillow
-version             2.1.0
+version             2.2.1
 revision            0
 categories-append   devel
 platforms           darwin
@@ -24,8 +24,8 @@
 
 distname            Pillow-${version}
 
-checksums           rmd160  0472271299a2c212e85a5a2377329820cdab34b0 \
-                    sha256  c733088b9a6f856386d3fcff8c54b3c1bc623a69f7481348fe36320513d98076
+checksums           rmd160  7750b2a81b0963576febc069628548626269fdd6 \
+                    sha256  a8440145d6e08db16f2a03b134b057c4524809e18a06cc8fe0e5e885dc4d8969
 
 if {$subport != $name} {
     use_zip             yes

Modified: trunk/dports/python/py-Pillow/files/patch-setup.py.diff
===================================================================
--- trunk/dports/python/py-Pillow/files/patch-setup.py.diff	2013-10-04 12:26:06 UTC (rev 111860)
+++ trunk/dports/python/py-Pillow/files/patch-setup.py.diff	2013-10-04 12:36:48 UTC (rev 111861)
@@ -1,6 +1,6 @@
---- setup.py.orig	2013-07-01 12:30:18.000000000 +0400
-+++ setup.py	2013-07-10 01:42:04.000000000 +0400
-@@ -157,18 +157,9 @@
+--- setup.py.orig	2013-10-04 16:29:47.000000000 +0400
++++ setup.py	2013-10-04 16:34:11.000000000 +0400
+@@ -165,28 +165,8 @@
                  "/usr/lib", "python%s" % sys.version[:3], "config"))
  
          elif sys.platform == "darwin":
@@ -10,28 +10,38 @@
 -            # fink installation directories
 -            _add_directory(library_dirs, "/sw/lib")
 -            _add_directory(include_dirs, "/sw/include")
-             # darwin ports installation directories
+-            # darwin ports installation directories
 -            _add_directory(library_dirs, "/opt/local/lib")
 -            _add_directory(include_dirs, "/opt/local/include")
 -            # freetype2 ships with X11
 -            _add_directory(library_dirs, "/usr/X11/lib")
 -            _add_directory(include_dirs, "/usr/X11/include")
+-            # if homebrew is installed, use its lib and include directories
+-            import subprocess
+-            try:
+-                prefix = subprocess.check_output(['brew', '--prefix'])
+-                if prefix:
+-                    prefix = prefix.strip()
+-                    _add_directory(library_dirs, os.path.join(prefix, 'lib'))
+-                    _add_directory(include_dirs, os.path.join(prefix, 'include'))
+-            except:
+-                pass # homebrew not installed
 +            _add_directory(library_dirs, "@prefix@/lib")
 +            _add_directory(include_dirs, "@prefix@/include")
- 
+                     
          elif sys.platform.startswith("linux"):
              for platform_ in (plat.processor(), plat.architecture()[0]):
-@@ -193,9 +184,6 @@
+@@ -211,9 +191,6 @@
              # work ;-)
              self.add_multiarch_paths()
  
 -        _add_directory(library_dirs, "/usr/local/lib")
 -        # FIXME: check /opt/stuff directories here?
 -
-         prefix = sysconfig.get_config_var("prefix")
-         if prefix:
-             _add_directory(library_dirs, os.path.join(prefix, "lib"))
-@@ -233,19 +221,6 @@
+         # include, rpath, if set as environment variables:
+         for k in 'C_INCLUDE_PATH INCLUDE'.split():
+             if k in os.environ:
+@@ -262,19 +239,6 @@
  
          # add standard directories
  
@@ -51,9 +61,9 @@
          #
          # insert new dirs *before* default libs, to avoid conflicts
          # between Python PYD stub libs and real libraries
-@@ -389,29 +364,7 @@
+@@ -432,29 +396,7 @@
              exts.append(Extension(
-                 "PIL._webp", ["_webp.c"], libraries=["webp"]))
+                 "PIL._webp", ["_webp.c"], libraries=libs, define_macros=defs))
  
 -        if sys.platform == "darwin":
 -            # locate Tcl/Tk frameworks
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20131004/9bb311ee/attachment-0001.html>