 @@ -1,42 +1,44 @@
-# $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
 CONFLICTS+=	${PYPKGPREFIX}-imaging-[0-9]*
 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
 # leads to a buggy one). Disable the test for now.
 #do-test:
 #	${RUN}cd ${WRKSRC};${PKGSRC_SETENV} ${TEST_ENV} ${PYTHONBIN} selftest.py
 .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"
 .include "../../lang/python/egg.mk"
 .include "../../mk/jpeg.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

 @@ -1,14 +1,14 @@
-@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
 ${PYSITELIB}/PIL/BmpImagePlugin.py
 ${PYSITELIB}/PIL/BmpImagePlugin.pyc
 ${PYSITELIB}/PIL/BmpImagePlugin.pyo
 ${PYSITELIB}/PIL/BufrStubImagePlugin.py
 ${PYSITELIB}/PIL/BufrStubImagePlugin.pyc
 ${PYSITELIB}/PIL/BufrStubImagePlugin.pyo
 ${PYSITELIB}/PIL/ContainerIO.py
 ${PYSITELIB}/PIL/ContainerIO.pyc
 ${PYSITELIB}/PIL/ContainerIO.pyo
 ${PYSITELIB}/PIL/CurImagePlugin.py
 @@ -163,27 +163,26 @@ ${PYSITELIB}/PIL/McIdasImagePlugin.pyc
 ${PYSITELIB}/PIL/McIdasImagePlugin.pyo
 ${PYSITELIB}/PIL/MicImagePlugin.py
 ${PYSITELIB}/PIL/MicImagePlugin.pyc
 ${PYSITELIB}/PIL/MicImagePlugin.pyo
 ${PYSITELIB}/PIL/MpegImagePlugin.py
 ${PYSITELIB}/PIL/MpegImagePlugin.pyc
 ${PYSITELIB}/PIL/MpegImagePlugin.pyo
 ${PYSITELIB}/PIL/MpoImagePlugin.py
 ${PYSITELIB}/PIL/MpoImagePlugin.pyc
 ${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
 ${PYSITELIB}/PIL/PSDraw.py
 ${PYSITELIB}/PIL/PSDraw.pyc
 ${PYSITELIB}/PIL/PSDraw.pyo
 ${PYSITELIB}/PIL/PaletteFile.py
 ${PYSITELIB}/PIL/PaletteFile.pyc
 ${PYSITELIB}/PIL/PaletteFile.pyo
 ${PYSITELIB}/PIL/PalmImagePlugin.py
 ${PYSITELIB}/PIL/PalmImagePlugin.pyc
 ${PYSITELIB}/PIL/PalmImagePlugin.pyo
 ${PYSITELIB}/PIL/PcdImagePlugin.py
 @@ -267,15 +266,16 @@ ${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
 ${PYSITELIB}/PIL/_webp.so
 ${PYSITELIB}/PIL/features.py
 ${PYSITELIB}/PIL/features.pyc
 ${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

 @@ -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
+SHA1 (Pillow-4.0.0.tar.gz) = ad2e2faac93f4ff1a17f4bca602bfc87f77c793d
-RMD160 (Pillow-3.4.2.tar.gz) = 40f983f9a57844c8338c1649b3473a8339dd85cf
+RMD160 (Pillow-4.0.0.tar.gz) = 018edb6030851a4ae17eba1ec9e0b03933b4922b
-SHA512 (Pillow-3.4.2.tar.gz) = a8b6711d28ad94f568e836f3eca313cf5c4277a5c9dd6accdb1cc2b0abdc47cd79bd850baf96e33a24a251e8011b67e80d2bea0395105a8c03e198d4caa70e47
+SHA512 (Pillow-4.0.0.tar.gz) = 61d4f5d0264289074b073ba2f531a9d94d5de4cbec1bfe12606454076dacd50c926934d364d6fb2336ab74d59a09a37b88a47620d7b76db565b3637db09a5b04
-Size (Pillow-3.4.2.tar.gz) = 10814666 bytes
+Size (Pillow-4.0.0.tar.gz) = 11077480 bytes
-SHA1 (patch-setup.py) = 329a628cef8ec752d7829e3a317379a6577e4b3a
+SHA1 (patch-setup.py) = 585f78d03e4f0cc658d3752fa80bfc245b32f8a6

 @@ -1,28 +1,28 @@
-$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):
+@@ -99,11 +99,7 @@ def _read(file):
-     return open(file, 'rb').read()
+         return fp.read()
 -try:
 -    import _tkinter
 -except (ImportError, OSError):
 -    # pypy emits an oserror
 -    _tkinter = None
 +_tkinter = None
  NAME = 'Pillow'
- PILLOW_VERSION = '3.4.2'
+ PILLOW_VERSION = '4.0.0'
-@@ -746,7 +742,6 @@ setup(name=NAME,
+@@ -771,7 +767,6 @@ try:
-       ext_modules=[Extension("PIL._imaging", ["_imaging.c"])],
+           ext_modules=[Extension("PIL._imaging", ["_imaging.c"])],
-       include_package_data=True,
+           include_package_data=True,
-       packages=find_packages(),
+           packages=find_packages(),
--      scripts=glob.glob("Scripts/*.py"),
+-          scripts=glob.glob("Scripts/*.py"),
-       test_suite='nose.collector',
+           install_requires=['olefile'],
-       keywords=["Imaging", ],
+           test_suite='nose.collector',
-       license='Standard PIL License',
+           keywords=["Imaging", ],