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

stromnov at macports.org stromnov at macports.org
Sun Oct 4 13:40:17 PDT 2015


Revision: 140901
          https://trac.macports.org/changeset/140901
Author:   stromnov at macports.org
Date:     2015-10-04 13:40:17 -0700 (Sun, 04 Oct 2015)
Log Message:
-----------
py-Pillow: update to version 3.0.0

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	2015-10-04 20:30:29 UTC (rev 140900)
+++ trunk/dports/python/py-Pillow/Portfile	2015-10-04 20:40:17 UTC (rev 140901)
@@ -5,8 +5,8 @@
 PortGroup           python 1.0
 
 name                py-Pillow
-version             2.9.0
-revision            1
+version             3.0.0
+revision            0
 categories-append   devel
 platforms           darwin
 license             BSD
@@ -20,16 +20,14 @@
 long_description    ${description}
 
 homepage            http://github.com/python-imaging/Pillow
-master_sites        https://pypi.python.org/packages/source/P/Pillow/
+master_sites        pypi:[string index ${python.rootname} 0]/${python.rootname}
 
 distname            Pillow-${version}
 
-checksums           rmd160  23913cd093a546d46fb2f7cf34f00305b89596b4 \
-                    sha256  d1db8dfed77547076037d589b598e04f2cbc1a7835d3d3f137bf20c8994854d5
+checksums           rmd160  4bb60362d90dbcc4821fa008d5b01370eaac7261 \
+                    sha256  ad50bef540fe5518a4653c3820452a881b6a042cb0f8bb7657c491c6bd3654bb
 
 if {${name} ne ${subport}} {
-    use_zip             yes
-
     conflicts           py${python.version}-pil
 
     depends_build       port:py${python.version}-setuptools
@@ -50,7 +48,5 @@
 
     livecheck.type      none
 } else {
-    livecheck.type      regex
-    livecheck.url       https://pypi.python.org/pypi/Pillow/json
-    livecheck.regex     {Pillow-(\d+(?:\.\d+)*)\.[tz]}
+    livecheck.type      pypi
 }

Modified: trunk/dports/python/py-Pillow/files/patch-setup.py.diff
===================================================================
--- trunk/dports/python/py-Pillow/files/patch-setup.py.diff	2015-10-04 20:30:29 UTC (rev 140900)
+++ trunk/dports/python/py-Pillow/files/patch-setup.py.diff	2015-10-04 20:40:17 UTC (rev 140901)
@@ -1,6 +1,6 @@
---- setup.py.orig	2014-10-01 23:17:03.000000000 +0400
-+++ setup.py	2014-10-02 11:11:20.000000000 +0400
-@@ -200,44 +200,8 @@
+--- setup.py.orig	2015-10-01 18:27:21.000000000 +0300
++++ setup.py	2015-10-04 23:38:00.000000000 +0300
+@@ -201,44 +201,8 @@
                  "/usr/lib", "python%s" % sys.version[:3], "config"))
  
          elif sys.platform == "darwin":
@@ -47,7 +47,7 @@
  
          elif sys.platform.startswith("linux"):
              arch_tp = (plat.processor(), plat.architecture()[0])
-@@ -337,21 +301,6 @@
+@@ -341,21 +305,6 @@
              else:
                  TCL_ROOT = None
  
@@ -69,34 +69,39 @@
          # on Windows, look for the OpenJPEG libraries in the location that
          # the official installer puts them
          if sys.platform == "win32":
-@@ -575,29 +524,7 @@
-             exts.append(Extension(
+@@ -580,32 +529,9 @@
                  "PIL._webp", ["_webp.c"], libraries=libs, define_macros=defs))
  
--        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 %s" % 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:
+         if feature.tcl and feature.tk:
+-            if sys.platform == "darwin":
+-                # locate Tcl/Tk frameworks
+-                frameworks = []
+-                framework_roots = [
+-                    "/Library/Frameworks",
+-                    "/System/Library/Frameworks"]
+-                for root in framework_roots:
+-                    root_tcl = os.path.join(root, "Tcl.framework")
+-                    root_tk = os.path.join(root, "Tk.framework")
+-                    if (os.path.exists(root_tcl) and os.path.exists(root_tk)):
+-                        print("--- using frameworks at %s" % root)
+-                        frameworks = ["-framework", "Tcl", "-framework", "Tk"]
+-                        dir = os.path.join(root_tcl, "Headers")
+-                        _add_directory(self.compiler.include_dirs, dir, 0)
+-                        dir = os.path.join(root_tk, "Headers")
+-                        _add_directory(self.compiler.include_dirs, dir, 1)
+-                        break
+-                if frameworks:
+-                    exts.append(Extension(
+-                        "PIL._imagingtk", ["_imagingtk.c", "Tk/tkImaging.c"],
+-                        extra_compile_args=frameworks,
+-                        extra_link_args=frameworks))
+-            else:
 -                exts.append(Extension(
 -                    "PIL._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(
-                 "PIL._imagingtk", ["_imagingtk.c", "Tk/tkImaging.c"],
-                 libraries=[feature.tcl, feature.tk]))
+-                    libraries=[feature.tcl, feature.tk]))
++            exts.append(Extension(
++                "PIL._imagingtk", ["_imagingtk.c", "Tk/tkImaging.c"],
++                libraries=[feature.tcl, feature.tk]))
+ 
+         if os.path.isfile("_imagingmath.c"):
+             exts.append(Extension("PIL._imagingmath", ["_imagingmath.c"]))
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20151004/944361c3/attachment.html>


More information about the macports-changes mailing list