summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--graphics/py-Pillow/Makefile4
-rw-r--r--graphics/py-Pillow/PLIST6
-rw-r--r--graphics/py-Pillow/distinfo12
-rw-r--r--graphics/py-Pillow/patches/patch-setup.py13
4 files changed, 19 insertions, 16 deletions
diff --git a/graphics/py-Pillow/Makefile b/graphics/py-Pillow/Makefile
index dd440220fa1..7f3ece0529d 100644
--- a/graphics/py-Pillow/Makefile
+++ b/graphics/py-Pillow/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.26 2016/06/01 12:33:51 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2016/08/13 08:07:22 wen Exp $
-DISTNAME= Pillow-3.2.0
+DISTNAME= Pillow-3.3.0
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
CATEGORIES= graphics python
MASTER_SITES= ${MASTER_SITE_PYPI:=P/Pillow/}
diff --git a/graphics/py-Pillow/PLIST b/graphics/py-Pillow/PLIST
index 17d915f3dd7..2601955c664 100644
--- a/graphics/py-Pillow/PLIST
+++ b/graphics/py-Pillow/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2016/04/21 08:13:50 leot Exp $
+@comment $NetBSD: PLIST,v 1.10 2016/08/13 08:07:22 wen Exp $
${PYSITELIB}/PIL/BdfFontFile.py
${PYSITELIB}/PIL/BdfFontFile.pyc
${PYSITELIB}/PIL/BdfFontFile.pyo
@@ -263,6 +263,10 @@ ${PYSITELIB}/PIL/_imagingcms.so
${PYSITELIB}/PIL/_imagingft.so
${PYSITELIB}/PIL/_imagingmath.so
${PYSITELIB}/PIL/_imagingmorph.so
+${PYSITELIB}/PIL/_imagingtk.so
+${PYSITELIB}/PIL/_tkinter_finder.py
+${PYSITELIB}/PIL/_tkinter_finder.pyc
+${PYSITELIB}/PIL/_tkinter_finder.pyo
${PYSITELIB}/PIL/_util.py
${PYSITELIB}/PIL/_util.pyc
${PYSITELIB}/PIL/_util.pyo
diff --git a/graphics/py-Pillow/distinfo b/graphics/py-Pillow/distinfo
index f0a2e075dfe..730edf9bd4a 100644
--- a/graphics/py-Pillow/distinfo
+++ b/graphics/py-Pillow/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.19 2016/04/21 08:13:50 leot Exp $
+$NetBSD: distinfo,v 1.20 2016/08/13 08:07:22 wen Exp $
-SHA1 (Pillow-3.2.0.tar.gz) = 5381cdd06dc00a86b0221110c768d7b49c27dc56
-RMD160 (Pillow-3.2.0.tar.gz) = 939da559db631891347adbeb27c81b531b9dd602
-SHA512 (Pillow-3.2.0.tar.gz) = 3ce55370a63fa2edd8b471f81aa7696f39d02a4a171d5f1f44cc19a31eb670e311e7f7aee166604958ed8817a890115bf6c783099747cabc311cac8ac7e03f79
-Size (Pillow-3.2.0.tar.gz) = 10306543 bytes
-SHA1 (patch-setup.py) = 00c18f45f50cd88e39aa57f2c5ec1db59fde1b15
+SHA1 (Pillow-3.3.0.tar.gz) = b115d02fde8e3df7feb2e17c98b5689cade49a89
+RMD160 (Pillow-3.3.0.tar.gz) = 260f57f65e0607f5df6845799556d855b8851bab
+SHA512 (Pillow-3.3.0.tar.gz) = fc8b899f6663099b2cf365dcb28cc06f05b0fc074eb8c32c8d2a63ab796af3416331965feb5ca63d447f2b596bed2f61ddc66b846b40ebc140a637e75e304bf6
+Size (Pillow-3.3.0.tar.gz) = 10578950 bytes
+SHA1 (patch-setup.py) = a7f7d3a1087230fe0d5d0a581b2baf0f3a28dce3
diff --git a/graphics/py-Pillow/patches/patch-setup.py b/graphics/py-Pillow/patches/patch-setup.py
index 68f438136a1..84fafd2b9d4 100644
--- a/graphics/py-Pillow/patches/patch-setup.py
+++ b/graphics/py-Pillow/patches/patch-setup.py
@@ -1,15 +1,14 @@
-$NetBSD: patch-setup.py,v 1.6 2016/04/21 08:13:50 leot Exp $
+$NetBSD: patch-setup.py,v 1.7 2016/08/13 08:07:22 wen Exp $
* Prevent to detect optional tkinter.
* Disable demo programs.
---- setup.py.orig 2016-04-01 13:10:57.000000000 +0000
+--- setup.py.orig 2016-08-13 07:58:03.000000000 +0000
+++ setup.py
-@@ -80,12 +80,7 @@ def _lib_include(root):
- def _read(file):
+@@ -103,11 +103,7 @@ def _read(file):
return open(file, 'rb').read()
--
+
-try:
- import _tkinter
-except (ImportError, OSError):
@@ -18,8 +17,8 @@ $NetBSD: patch-setup.py,v 1.6 2016/04/21 08:13:50 leot Exp $
+_tkinter = None
NAME = 'Pillow'
- PILLOW_VERSION = '3.2.0'
-@@ -760,7 +755,6 @@ setup(name=NAME,
+ PILLOW_VERSION = '3.3.0'
+@@ -746,7 +742,6 @@ setup(name=NAME,
ext_modules=[Extension("PIL._imaging", ["_imaging.c"])],
include_package_data=True,
packages=find_packages(),