Revision: 118430 https://trac.macports.org/changeset/118430 Author: stromnov@macports.org Date: 2014-04-02 01:30:59 -0700 (Wed, 02 Apr 2014) Log Message: ----------- py-Pillow: update to version 2.4.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 2014-04-02 07:44:35 UTC (rev 118429) +++ trunk/dports/python/py-Pillow/Portfile 2014-04-02 08:30:59 UTC (rev 118430) @@ -5,7 +5,7 @@ PortGroup python 1.0 name py-Pillow -version 2.3.1 +version 2.4.0 revision 0 categories-append devel platforms darwin @@ -24,8 +24,8 @@ distname Pillow-${version} -checksums rmd160 2b7d757eda7366e16f975bf3102823103ef65884 \ - sha256 014b9277c76e1e57ea3227ca9fb36f3d9ca3d2680cf11a01f4f900048c68c75f +checksums rmd160 2692fee280a9abc595ebbb8df6d6a73f5c83667a \ + sha256 2865c68b3a5638466b1837bf4a67c447e0cfdf7463309a068aad0e90aa03f58a if {${name} ne ${subport}} { use_zip yes @@ -39,6 +39,7 @@ port:tiff \ port:lcms \ port:webp \ + port:openjpeg \ port:freetype patchfiles patch-setup.py.diff @@ -47,6 +48,8 @@ reinplace "s|@prefix@|${prefix}|g" ${worksrcpath}/setup.py } + #build.args-append --enable-zlib + livecheck.type none } else { livecheck.type regex Modified: trunk/dports/python/py-Pillow/files/patch-setup.py.diff =================================================================== --- trunk/dports/python/py-Pillow/files/patch-setup.py.diff 2014-04-02 07:44:35 UTC (rev 118429) +++ trunk/dports/python/py-Pillow/files/patch-setup.py.diff 2014-04-02 08:30:59 UTC (rev 118430) @@ -1,6 +1,6 @@ ---- setup.py.orig 2014-01-02 02:51:27.000000000 +0400 -+++ setup.py 2014-01-02 03:15:11.000000000 +0400 -@@ -192,28 +192,8 @@ +--- setup.py.orig 2014-04-01 18:21:44.000000000 +0400 ++++ setup.py 2014-04-02 12:16:12.000000000 +0400 +@@ -196,34 +196,8 @@ "/usr/lib", "python%s" % sys.version[:3], "config")) elif sys.platform == "darwin": @@ -13,9 +13,7 @@ - # 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: @@ -24,17 +22,27 @@ - prefix = prefix.strip() - _add_directory(library_dirs, os.path.join(prefix, 'lib')) - _add_directory(include_dirs, os.path.join(prefix, 'include')) +- +- # freetype2 is a key-only brew under opt/ +- _add_directory(library_dirs, os.path.join(prefix, 'opt', 'freetype', 'lib')) +- _add_directory(include_dirs, os.path.join(prefix, 'opt', 'freetype', 'include')) - except: - pass # homebrew not installed +- +- # freetype2 ships with X11 (after homebrew, so that homebrew freetype is preferred) +- _add_directory(library_dirs, "/usr/X11/lib") +- _add_directory(include_dirs, "/usr/X11/include") + _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]): -@@ -276,19 +256,6 @@ + arch_tp = (plat.processor(), plat.architecture()[0]) +@@ -315,21 +289,6 @@ + else: + TCL_ROOT = None - # add standard directories - +- # add standard directories +- - # look for tcl specific subdirectory (e.g debian) - if _tkinter: - tcl_dir = "/usr/include/tcl" + TCL_VERSION @@ -48,10 +56,10 @@ - _add_directory(library_dirs, "/usr/lib") - _add_directory(include_dirs, "/usr/include") - - # - # insert new dirs *before* default libs, to avoid conflicts - # between Python PYD stub libs and real libraries -@@ -446,29 +413,7 @@ + # on Windows, look for the OpenJPEG libraries in the location that + # the official installed puts them + if sys.platform == "win32": +@@ -507,29 +466,7 @@ exts.append(Extension( "PIL._webp", ["_webp.c"], libraries=libs, define_macros=defs))