<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/f480bf37d5d034fd02b85e0e01f2a38c1ec87f2a">https://github.com/macports/macports-ports/commit/f480bf37d5d034fd02b85e0e01f2a38c1ec87f2a</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit f480bf37d5d034fd02b85e0e01f2a38c1ec87f2a
</span>Author: Renee Otten <reneeotten@macports.org>
AuthorDate: Thu Dec 12 08:42:16 2019 -0500
<span style='display:block; white-space:pre;color:#404040;'> py-Pillow: remove py26 and py3[34] subports
</span>---
python/py-Pillow/Portfile | 31 +---------------
python/py-Pillow/files/patch-setup-3.4.2.py.diff | 47 ------------------------
python/py-Pillow/files/patch-setup-5.4.1.py.diff | 47 ------------------------
3 files changed, 2 insertions(+), 123 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-Pillow/Portfile b/python/py-Pillow/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 502e498..034292f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-Pillow/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-Pillow/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,7 +9,7 @@ categories-append devel
</span> platforms darwin
license BSD
<span style='display:block; white-space:pre;background:#ffe0e0;'>-python.versions 26 27 33 34 35 36 37 38
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+python.versions 27 35 36 37 38
</span>
maintainers {stromnov @stromnov} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,27 +29,6 @@ checksums rmd160 b6a0743f45072e5000f4d985dc1274d32bb7a40b \
</span> if {${name} ne ${subport}} {
conflicts py${python.version}-pil
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[lsearch {26 33} ${python.version}] != -1} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version 3.4.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- master_sites pypi:46/4f/94f6165052774839b4a4af0c72071aa528d5dc8cb8bc6bb43e24a55c10cc \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pypi:[string index ${python.rootname} 0]/${python.rootname}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- distname Pillow-${version}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 40f983f9a57844c8338c1649b3473a8339dd85cf \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 0ee9975c05602e755ff5000232e0335ba30d507f6261922a658ee11b1cec36d1 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 10814666
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[lsearch {34} ${python.version}] != -1} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version 5.4.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- master_sites pypi:[string index ${python.rootname} 0]/${python.rootname}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- distname Pillow-${version}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 457ab4a946c80d739faba6af822258f2fd962014 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 5233664eadfa342c639b9b9977190d64ad7aca4edc51a966394d7e08e7f38a9f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 16016153
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> depends_build-append \
port:py${python.version}-setuptools
depends_lib-append port:py${python.version}-tkinter \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -62,13 +41,7 @@ if {${name} ne ${subport}} {
</span> port:openjpeg \
port:freetype
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[lsearch {26 33} ${python.version}] != -1} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles patch-setup-3.4.2.py.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } elseif {[lsearch {34} ${python.version}] != -1} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles patch-setup-5.4.1.py.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles patch-setup.py.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles patch-setup.py.diff
</span>
post-patch {
reinplace "s|@prefix@|${prefix}|g" ${worksrcpath}/setup.py
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-Pillow/files/patch-setup-3.4.2.py.diff b/python/py-Pillow/files/patch-setup-3.4.2.py.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index ba115b8..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-Pillow/files/patch-setup-3.4.2.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,47 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- setup.py.orig 2016-10-18 15:12:54.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ setup.py 2018-07-21 12:04:06.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -233,42 +233,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sys.version[:3], "config"))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- elif sys.platform == "darwin":
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # attempt to make sure we pick freetype2 over other versions
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- _add_directory(include_dirs, "/sw/include/freetype2")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- _add_directory(include_dirs, "/sw/lib/freetype2/include")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # fink installation directories
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- _add_directory(library_dirs, "/sw/lib")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- _add_directory(include_dirs, "/sw/include")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # darwin ports installation directories
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- _add_directory(library_dirs, "/opt/local/lib")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- _add_directory(include_dirs, "/opt/local/include")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # if Homebrew is installed, use its lib and include directories
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- try:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- prefix = subprocess.check_output(['brew', '--prefix']).strip(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ).decode('latin1')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- except:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # Homebrew not installed
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- prefix = None
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ft_prefix = None
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if prefix:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # add Homebrew's include and lib directories
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- _add_directory(library_dirs, os.path.join(prefix, 'lib'))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- _add_directory(include_dirs, os.path.join(prefix, 'include'))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ft_prefix = os.path.join(prefix, 'opt', 'freetype')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if ft_prefix and os.path.isdir(ft_prefix):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # freetype might not be linked into Homebrew's prefix
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- _add_directory(library_dirs, os.path.join(ft_prefix, 'lib'))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- _add_directory(include_dirs,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- os.path.join(ft_prefix, 'include'))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- else:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # fall back to freetype from XQuartz if
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # Homebrew's freetype is missing
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- _add_directory(library_dirs, "/usr/X11/lib")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- _add_directory(include_dirs, "/usr/X11/include")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _add_directory(library_dirs, "@prefix@/lib")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _add_directory(include_dirs, "@prefix@/include")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- elif sys.platform.startswith("linux"):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- arch_tp = (plat.processor(), plat.architecture()[0])
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-Pillow/files/patch-setup-5.4.1.py.diff b/python/py-Pillow/files/patch-setup-5.4.1.py.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 3061460..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-Pillow/files/patch-setup-5.4.1.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,47 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- setup.py.orig 2019-01-05 09:33:50.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ setup.py 2019-04-10 22:38:03.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -373,42 +373,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sys.version[:3], "config"))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- elif sys.platform == "darwin":
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # attempt to make sure we pick freetype2 over other versions
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- _add_directory(include_dirs, "/sw/include/freetype2")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- _add_directory(include_dirs, "/sw/lib/freetype2/include")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # fink installation directories
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- _add_directory(library_dirs, "/sw/lib")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- _add_directory(include_dirs, "/sw/include")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # darwin ports installation directories
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- _add_directory(library_dirs, "/opt/local/lib")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- _add_directory(include_dirs, "/opt/local/include")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # if Homebrew is installed, use its lib and include directories
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- try:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- prefix = subprocess.check_output(['brew', '--prefix']).strip(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ).decode('latin1')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- except Exception:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # Homebrew not installed
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- prefix = None
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ft_prefix = None
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if prefix:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # add Homebrew's include and lib directories
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- _add_directory(library_dirs, os.path.join(prefix, 'lib'))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- _add_directory(include_dirs, os.path.join(prefix, 'include'))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ft_prefix = os.path.join(prefix, 'opt', 'freetype')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if ft_prefix and os.path.isdir(ft_prefix):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # freetype might not be linked into Homebrew's prefix
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- _add_directory(library_dirs, os.path.join(ft_prefix, 'lib'))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- _add_directory(include_dirs,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- os.path.join(ft_prefix, 'include'))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- else:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # fall back to freetype from XQuartz if
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # Homebrew's freetype is missing
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- _add_directory(library_dirs, "/usr/X11/lib")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- _add_directory(include_dirs, "/usr/X11/include")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _add_directory(library_dirs, "@prefix@/lib")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _add_directory(include_dirs, "@prefix@/include")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- elif sys.platform.startswith("linux") or \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sys.platform.startswith("gnu") or \
</span></pre><pre style='margin:0'>
</pre>