Changes 4.1.0:

- Close files after loading if possible
- Fix Image Access to be reloadable when embedding the Python interpreter
- Fetch DPI from EXIF if not specified in JPEG header
- Removed winbuild checksum verification
- Git: Set ContainerIO test file as binary
- Remove superfluous import of FixTk
- Fix import of tkinter/Tkinter
- Pure Python Decoders, including Python decoder to fix for MSP images
- Reorganized GifImagePlugin
- Doc: Reordered operating systems in Compatibility Matrix
- Test: Additional tests for BurfStub, Eps, Container, GribStub, IPTC, Wmf, XVThumb, ImageDraw, ImageMorph ImageShow
- Health fixes
- Test: Correctness tests ContainerIO, XVThumbImagePlugin, BufrStubImagePlugin, GribStubImagePlugin, FitsStubImagePlugin, Hdf5StubImagePlugin, PixarImageFile, PsdImageFile
- Remove unused imports
- Replaced KeyError catch with dictionary get method
- Test: Removed unrunnable code in test_image_toqimage
- Removed use of spaces in TIFF kwargs names, deprecated in 2.7
- Removed deprecated ImageDraw setink, setfill, setfont methods
- Send unwanted subprocess output to /dev/null
- Fix division by zero when creating 0x0 image from numpy array
- Test: Added matrix convert tests
- Replaced broken URL to partners.adobe.com
- Removed unused private functions in setup.py and build_dep.py
- Test: Fixed Qt tests for QT5 and saving 1 bit PNG
- Test: docker builds for Arch and Debian Stretch
- Updated libwebp to 0.6.0 on appveyor
- More explicit error message when saving to a file with invalid extension
- Docs: Update some http urls to https
- Preserve aux/alpha channels when performing Imagecms transforms
- Test linear and radial gradient effects
- Test ImageDraw.Outline and and ImageDraw.Shape
- Added PySide to ImageQt documentation
- BUG: Empty image mode no longer causes a crash
- Exclude .travis and contents from manifest
- Remove 'MIT-like' from license
- Tests: Add tests for several Image operations
- PNG: Moved iCCP chunk before PLTE chunk when saving as PNG, restricted chunks known value/ordering
- Default to inch-interpretation for missing ResolutionUnit in TiffImagePlugin
- Bug: Fixed segfault when using ImagingTk on pypy
- Bug: Fixed Integer overflow using ImagingTk on 32 bit platforms
- Tests: Added docker images for testing alternate platforms. See also https://github.com/python-pillow/docker-images.
- Removed PIL 1.0 era TK readme that concerns Windows 95/NT
- Prevent `nose -v` printing docstrings
- Replaced absolute PIL imports with relative imports
- Added context managers for file handling
- Expose registered file extensions in Image
- Make mode descriptor cache initialization thread-safe.
- Updated Windows test dependencies: Freetype 2.7.1, zlib 1.2.11
- Followed upstream pngquant packaging reorg to libimagquant
- Fix invalid string escapes
- Add test for crop operation with no argument

3 files changed, 15 insertions, 27 deletions

diff --git a/graphics/py-Pillow/Makefile b/graphics/py-Pillow/Makefile
index b186e710dcb..8e7a3c8744f 100644
--- a/graphics/py-Pillow/Makefile
+++ b/graphics/py-Pillow/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.32 2017/02/28 15:20:06 ryoon Exp $
+# $NetBSD: Makefile,v 1.33 2017/04/16 08:11:16 adam Exp $
 
-DISTNAME=	Pillow-4.0.0
+DISTNAME=	Pillow-4.1.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=	2
 CATEGORIES=	graphics python
 MASTER_SITES=	${MASTER_SITE_PYPI:=P/Pillow/}
 
@@ -11,23 +10,12 @@ HOMEPAGE=	http://python-pillow.org/
 COMMENT=	Python Imaging Library (Fork)
 LICENSE=	hpnd
 
+USE_TOOLS+=	pkg-config
+
 CONFLICTS+=	${PYPKGPREFIX}-imaging-[0-9]*
 
 DEPENDS+=	${PYPKGPREFIX}-olefile-*:../../devel/py-olefile
 
-SUBST_CLASSES+=		fix-path
-SUBST_MESSAGE.fix-path=	Fixing paths.
-SUBST_STAGE.fix-path=	pre-configure
-SUBST_FILES.fix-path=	setup.py
-SUBST_SED.fix-path=	-e 's,/usr/pkg,${PREFIX},'
-SUBST_SED.fix-path+=	-e 's,JPEG_ROOT = None,JPEG_ROOT = _lib_include("${BUILDLINK_PREFIX.jpeg}"),'
-SUBST_SED.fix-path+=	-e 's,JPEG2K_ROOT = None,JPEG2K_ROOT = _lib_include("${BUILDLINK_PREFIX.openjpeg}"),'
-SUBST_SED.fix-path+=	-e 's,ZLIB_ROOT = None,ZLIB_ROOT = _lib_include("${BUILDLINK_PREFIX.zlib}"),'
-SUBST_SED.fix-path+=	-e 's,IMAGEQUANT_ROOT = None,IMAGEQUANT_ROOT = _lib_include("${BUILDLINK_PREFIX.libimagequant}"),'
-SUBST_SED.fix-path+=	-e 's,TIFF_ROOT = None,TIFF_ROOT = _lib_include("${BUILDLINK_PREFIX.tiff}"),'
-SUBST_SED.fix-path+=	-e 's,FREETYPE_ROOT = None,FREETYPE_ROOT = _lib_include("${BUILDLINK_PREFIX.freetype2}"),'
-SUBST_SED.fix-path+=	-e 's,LCMS_ROOT = None,LCMS_ROOT = _lib_include("${BUILDLINK_PREFIX.lcms2}"),'
-
 # XXX: (automatically) testing Pillow fails because it is builded on a
 # separate directory (build/lib.*/PIL/). Manually cp(1) all the files to PIL/
 # fixes that (but implementing a similar distutils.cmd logic here can easily
diff --git a/graphics/py-Pillow/distinfo b/graphics/py-Pillow/distinfo
index 1ab2857230c..be7a1fb427e 100644
--- a/graphics/py-Pillow/distinfo
+++ b/graphics/py-Pillow/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.23 2017/01/29 12:46:45 adam Exp $
+$NetBSD: distinfo,v 1.24 2017/04/16 08:11:16 adam Exp $
 
-SHA1 (Pillow-4.0.0.tar.gz) = ad2e2faac93f4ff1a17f4bca602bfc87f77c793d
-RMD160 (Pillow-4.0.0.tar.gz) = 018edb6030851a4ae17eba1ec9e0b03933b4922b
-SHA512 (Pillow-4.0.0.tar.gz) = 61d4f5d0264289074b073ba2f531a9d94d5de4cbec1bfe12606454076dacd50c926934d364d6fb2336ab74d59a09a37b88a47620d7b76db565b3637db09a5b04
-Size (Pillow-4.0.0.tar.gz) = 11077480 bytes
-SHA1 (patch-setup.py) = 585f78d03e4f0cc658d3752fa80bfc245b32f8a6
+SHA1 (Pillow-4.1.0.tar.gz) = 145c859d03d64ff67fd97f9379ffa9fd68e4d7bc
+RMD160 (Pillow-4.1.0.tar.gz) = 739ee0c718939bfda84930ac8b9eed7792f4a32e
+SHA512 (Pillow-4.1.0.tar.gz) = aaa91e8908a65c8acd661de3f074a26e42a3b7c168276f6da4c58636fe3b5ee2b16614ad2e7efcf219a4f5e5fb70d75ae7fba775fb96c3b7ee92b53353b06845
+Size (Pillow-4.1.0.tar.gz) = 11257676 bytes
+SHA1 (patch-setup.py) = 0a2126b5322f24558107d068eed4fbe9ece6d377
diff --git a/graphics/py-Pillow/patches/patch-setup.py b/graphics/py-Pillow/patches/patch-setup.py
index f17e0198c48..0a3ccf4973f 100644
--- a/graphics/py-Pillow/patches/patch-setup.py
+++ b/graphics/py-Pillow/patches/patch-setup.py
@@ -1,11 +1,11 @@
-$NetBSD: patch-setup.py,v 1.10 2017/01/29 12:46:45 adam Exp $
+$NetBSD: patch-setup.py,v 1.11 2017/04/16 08:11:17 adam Exp $
 
 * Prevent to detect optional tkinter.
 * Disable demo programs.
 
---- setup.py.orig	2017-01-02 11:47:11.000000000 +0000
+--- setup.py.orig	2017-04-04 18:14:25.000000000 +0000
 +++ setup.py
-@@ -99,11 +99,7 @@ def _read(file):
+@@ -95,11 +95,7 @@ def _read(file):
          return fp.read()
  
  
@@ -17,8 +17,8 @@ $NetBSD: patch-setup.py,v 1.10 2017/01/29 12:46:45 adam Exp $
 +_tkinter = None
  
  NAME = 'Pillow'
- PILLOW_VERSION = '4.0.0'
-@@ -771,7 +767,6 @@ try:
+ PILLOW_VERSION = '4.1.0'
+@@ -736,7 +732,6 @@ try:
            ext_modules=[Extension("PIL._imaging", ["_imaging.c"])],
            include_package_data=True,
            packages=find_packages(),