Update to 3.3.0

Upstream changes:
3.3.0 (2016-07-01)

    Fixed enums for Resolution Unit and Predictor in TiffTags.py #1998 [wiredfool]
    Fix issue converting P mode to LA #1986 [didrix]
    Moved test_j2k_overflow to check_j2k_overflow, prevent DOS of our 32bit testing machines #1995 [wiredfool]
    Skip CRC checks in PNG files when LOAD_TRUNCATED_IMAGES is enabled #1991 [kkopachev]
    Added CMYK mode for opening EPS files #1826 [radarhere]
    Docs: OSX build instruction clarification #1994 [wiredfool]
    Docs: Filter comparison table #1993 [homm]
    Removal of pthread based Incremental.c, new interface for file decoders/encoders to access the python file. Fixes assorted J2k Hangs. #1934 [wiredfool]
    Skip unnecessary passes when resizing #1954 [homm]
    Removed duplicate code in ImagePalette #1832 [radarhere]
    test_imagecms: Reduce precision of extended info due to 32 bit machine precision #1990 [AbdealiJK]
    Binary Tiff Metadata/ICC profile. #1988 [wiredfool]
    Ignore large text blocks in PNG if LOAD_TRUNCATED_IMAGES is enabled #1970 [homm]
    Replace index = index+1 in docs with +=1 [cclauss]
    Skip extra 0xff00 in jpeg #1977 [kkopachev]
    Use bytearray for palette mutable storage #1985 [radarhere, wiredfool]
    Added additional uint modes for Image.fromarray, more extensive tests of fromarray #1984 [mairsbw, wiredfool]
    Fix for program importing PyQt4 when PyQt5 also installed #1942 [hugovk]
    Changed depends/install_*.sh urls to point to github pillow-depends repo #1983 [wiredfool]
    Allow ICC profile from encoderinfo while saving PNGs #1909 [homm]
    Fix integer overflow on ILP32 systems (32-bit Linux). #1975 [lambdafu]
    Change function declaration to match Tcl_CmdProc type #1966 [homm]
    Integer overflow checks on all calls to *alloc #1781 [wiredfool]
    Change equals method on Image so it short circuits #1967 [mattBoros]
    Runtime loading of TCL/TK libraries, eliminating build time dependency. #1932 [matthew-brett]
    Cleanup of transform methods #1941 [homm]
    Fix "Fatal Python error: UNREF invalid object" in debug builds #1936 [wiredfool]
    Setup fixes for Alpine linux #1937 [wiredfool]
    Split resample into horizontal + vertical passes #1933 [homm]
    Box blur with premultiplied alpha #1914 [homm]
    Add libimagequant support in quantize() #1889 [rr-]
    Added internal Premultiplied luminosity (La) mode #1912 [homm]
    Fixed point integer resample #1881 [homm]
    Removed docs/BUILDME script #1924 [radarhere]
    Moved comments to docstrings #1926 [hugovk]
    Include Python.h before wchar.h so _GNU_SOURCE is set consistently #1906 [hugovk]
    Updated example decoder in documentation #1899 [radarhere]
    Added support for GIF comment extension #1896 [radarhere]
    Removed support for pre- 1.5.2 list form of Image info in Image.new #1897 [radarhere]
    Fix typos in TIFF tags #1918 [radarhere]
    Skip tests that require libtiff if it is not installed, fixes #1866 [wiredfool]
    Skip test when icc profile is not available, fixes #1887 [doko42]
    Make deprecated functions raise NotImplementedError instead of Exception. #1862, #1890 [daniel-leicht, radarhere]
    Replaced os.system with subprocess.call in setup.py #1879 [radarhere]
    Corrected Image show documentation #1886 [radarhere]
    Added check for executable permissions to ImageShow #1880 [radarhere]
    Fixed tutorial code and added explanation #1877 [radarhere]
    Added OS X support for ImageGrab grabclipboard #1837 [radarhere]
    Combined duplicate code in ImageTk #1856 [radarhere]
    Added --disable-platform-guessing option to setup.py build extension, #1861 [angeloc]
    Fixed loading Transparent PNGs with a transparent black color #1840 [olt]
    Add support for LA mode in Image.fromarray #1865 [pierriko]
    Make ImageFile load images in read-only mode #1864 [hdante]
    Added _accept hook for XVThumbImagePlugin #1853 [radarhere]
    Test TIFF with LZW compression #1855, TGA RLE file #1854 [hugovk]
    Improved SpiderImagePlugin help text #1863 [radarhere]
    Updated Sphinx project description #1870 [radarhere]
    Remove support for Python 3.0 from _imaging.c #1851 [radarhere]
    Jpeg qtables are unsigned chars #1814, #1921 [thebostik]
    Added additional EXIF tags #1841, TIFF Tags #1821 [radarhere]
    Changed documentation to refer to ImageSequence Iterator #1833 [radarhere]
    Fix Fedora prerequisites in installation docs, depends script #1842 [living180]
    Added _accept hook for PixarImagePlugin #1843 [radarhere]
    Removed outdated scanner classifier #1823 [radarhere]
    Combined identical error messages in _imaging #1825 [radarhere]
    Added debug option for setup.py to trace header and library finding #1790 [wiredfool]
    Fix doc building on travis #1820, #1844 [wiredfool]
    Fix for DIB/BMP images #1813, #1847 [wiredfool]
    Add PixarImagePlugin file extension #1809 [radarhere]
    Catch struct.errors when verifying png files #1805 [wiredfool]
    SpiderImagePlugin: raise an error when seeking in a non-stack file #1794 [radarhere, jmichalon]
    Added Support for 2/4 bpp Tiff Grayscale Images #1789 [zwhfly]
    Removed unused variable from selftest #1788 [radarhere]
    Added warning for as_dict method (deprecated in 3.0.0) #1799 [radarhere]
    Removed powf support for older Python versions #1784 [radarhere]
    Health fixes #1625 #1903 [radarhere]

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(),