4 files changed, 26 insertions, 24 deletions
diff --git a/graphics/py-Pillow/Makefile b/graphics/py-Pillow/Makefile
index 50cf52d8756..0e71a397e22 100644
--- a/graphics/py-Pillow/Makefile
+++ b/graphics/py-Pillow/Makefile
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.29 2016/11/06 15:05:30 adam Exp $
+# $NetBSD: Makefile,v 1.30 2017/01/29 12:46:45 adam Exp $
 
-DISTNAME=	Pillow-3.4.2
+DISTNAME=	Pillow-4.0.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	graphics python
 MASTER_SITES=	${MASTER_SITE_PYPI:=P/Pillow/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://python-pillow.github.io/
+HOMEPAGE=	http://python-pillow.org/
 COMMENT=	Python Imaging Library (Fork)
 LICENSE=	hpnd
 
@@ -20,6 +20,7 @@ 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}"),'
@@ -34,6 +35,7 @@ SUBST_SED.fix-path+=	-e 's,LCMS_ROOT = None,LCMS_ROOT = _lib_include("${BUILDLIN
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/lcms2/buildlink3.mk"
+.include "../../graphics/libimagequant/buildlink3.mk"
 .include "../../graphics/libwebp/buildlink3.mk"
 .include "../../graphics/openjpeg/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
diff --git a/graphics/py-Pillow/PLIST b/graphics/py-Pillow/PLIST
index 2601955c664..44b4775c643 100644
--- a/graphics/py-Pillow/PLIST
+++ b/graphics/py-Pillow/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2016/08/13 08:07:22 wen Exp $
+@comment $NetBSD: PLIST,v 1.11 2017/01/29 12:46:45 adam Exp $
 ${PYSITELIB}/PIL/BdfFontFile.py
 ${PYSITELIB}/PIL/BdfFontFile.pyc
 ${PYSITELIB}/PIL/BdfFontFile.pyo
@@ -173,7 +173,6 @@ ${PYSITELIB}/PIL/MpoImagePlugin.pyo
 ${PYSITELIB}/PIL/MspImagePlugin.py
 ${PYSITELIB}/PIL/MspImagePlugin.pyc
 ${PYSITELIB}/PIL/MspImagePlugin.pyo
-${PYSITELIB}/PIL/OleFileIO-README.md
 ${PYSITELIB}/PIL/OleFileIO.py
 ${PYSITELIB}/PIL/OleFileIO.pyc
 ${PYSITELIB}/PIL/OleFileIO.pyo
@@ -277,5 +276,6 @@ ${PYSITELIB}/PIL/features.pyo
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
 ${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
+${PYSITELIB}/${EGG_INFODIR}/requires.txt
 ${PYSITELIB}/${EGG_INFODIR}/top_level.txt
 ${PYSITELIB}/${EGG_INFODIR}/zip-safe
diff --git a/graphics/py-Pillow/distinfo b/graphics/py-Pillow/distinfo
index 9143a4e9295..1ab2857230c 100644
--- a/graphics/py-Pillow/distinfo
+++ b/graphics/py-Pillow/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.22 2016/11/06 15:05:30 adam Exp $
+$NetBSD: distinfo,v 1.23 2017/01/29 12:46:45 adam Exp $
 
-SHA1 (Pillow-3.4.2.tar.gz) = 0915c36e3607b3caafcd387e0bb6da63a6bc7d5a
-RMD160 (Pillow-3.4.2.tar.gz) = 40f983f9a57844c8338c1649b3473a8339dd85cf
-SHA512 (Pillow-3.4.2.tar.gz) = a8b6711d28ad94f568e836f3eca313cf5c4277a5c9dd6accdb1cc2b0abdc47cd79bd850baf96e33a24a251e8011b67e80d2bea0395105a8c03e198d4caa70e47
-Size (Pillow-3.4.2.tar.gz) = 10814666 bytes
-SHA1 (patch-setup.py) = 329a628cef8ec752d7829e3a317379a6577e4b3a
+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
diff --git a/graphics/py-Pillow/patches/patch-setup.py b/graphics/py-Pillow/patches/patch-setup.py
index 272dc26a4c6..f17e0198c48 100644
--- a/graphics/py-Pillow/patches/patch-setup.py
+++ b/graphics/py-Pillow/patches/patch-setup.py
@@ -1,12 +1,12 @@
-$NetBSD: patch-setup.py,v 1.9 2016/11/06 15:05:30 adam Exp $
+$NetBSD: patch-setup.py,v 1.10 2017/01/29 12:46:45 adam Exp $
 
 * Prevent to detect optional tkinter.
 * Disable demo programs.
 
---- setup.py.orig	2016-10-18 19:12:54.000000000 +0000
+--- setup.py.orig	2017-01-02 11:47:11.000000000 +0000
 +++ setup.py
-@@ -103,11 +103,7 @@ def _read(file):
-     return open(file, 'rb').read()
+@@ -99,11 +99,7 @@ def _read(file):
+         return fp.read()
  
  
 -try:
@@ -17,12 +17,12 @@ $NetBSD: patch-setup.py,v 1.9 2016/11/06 15:05:30 adam Exp $
 +_tkinter = None
  
  NAME = 'Pillow'
- PILLOW_VERSION = '3.4.2'
-@@ -746,7 +742,6 @@ setup(name=NAME,
-       ext_modules=[Extension("PIL._imaging", ["_imaging.c"])],
-       include_package_data=True,
-       packages=find_packages(),
--      scripts=glob.glob("Scripts/*.py"),
-       test_suite='nose.collector',
-       keywords=["Imaging", ],
-       license='Standard PIL License',
+ PILLOW_VERSION = '4.0.0'
+@@ -771,7 +767,6 @@ try:
+           ext_modules=[Extension("PIL._imaging", ["_imaging.c"])],
+           include_package_data=True,
+           packages=find_packages(),
+-          scripts=glob.glob("Scripts/*.py"),
+           install_requires=['olefile'],
+           test_suite='nose.collector',
+           keywords=["Imaging", ],