Update Pillow to 2.5.0.

2.5.0 (2014-07-01)
------------------

- Imagedraw rewrite
  [terseus, wiredfool]

- Add support for multithreaded test execution
  [wiredfool]

- Prevent shell injection #748
  [mbrown1413, wiredfool]

- Support for Resolution in BMP files #734
  [gcq]

- Fix error in setup.py for Python 3
  [matthew-brett]

- Pyroma fix and add Python 3.4 to setup metadata #742
  [wirefool]

- Top level flake8 fixes #741
  [aclark]

- Remove obsolete Animated Raster Graphics (ARG) support
  [hugovk]

- Fix test_imagedraw failures #727
  [cgohlke]

- Fix AttributeError: class Image has no attribute 'DEBUG' #726
  [cgohlke]

- Fix msvc warning: 'inline' : macro redefinition #725
  [cgohlke]

- Cleanup #654
  [dvska, hugovk, wiredfool]

- 16-bit monochrome support for JPEG2000
  [videan42]

- Fixed ImagePalette.save
  [brightpisces]

- Support JPEG qtables
  [csinchok]

- Add binary morphology addon
  [dov, wiredfool]

- Decompression bomb protection
  [hugovk]

- Put images in a single directory
  [hugovk]

- Support OpenJpeg 2.1
  [al45tair]

- Remove unistd.h #include for all platforms
  [wiredfool]

- Use unittest for tests
  [hugovk]

- ImageCms fixes
  [hugovk]

- Added more ImageDraw tests
  [hugovk]

- Added tests for Spider files
  [hugovk]

- Use libtiff to write any compressed tiff files
  [wiredfool]

- Support for pickling Image objects
  [hugovk]

- Fixed resolution handling for EPS thumbnails
  [eliempje]

- Fixed rendering of some binary EPS files (Issue #302)
  [eliempje]

- Rename variables not to use built-in function names
  [hugovk]

- Ignore junk JPEG markers
  [hugovk]

- Change default interpolation for Image.thumbnail to Image.ANTIALIAS
  [hugovk]

- Add tests and fixes for saving PDFs
  [hugovk]

- Remove transparency resource after P->RGBA conversion
  [hugovk]

- Clean up preprocessor cruft for Windows
  [CounterPillow]

- Adjust Homebrew freetype detection logic
  [jacknagel]

- Added Image.close, context manager support.
  [wiredfool]

- Added support for 16 bit PGM files.
  [wiredfool]

- Updated OleFileIO to version 0.30 from upstream
  [hugovk]

- Added support for additional TIFF floating point format
  [Hijackal]

- Have the tempfile use a suffix with a dot
  [wiredfool]

- Fix variable name used for transparency manipulations
  [nijel]

4 files changed, 18 insertions, 20 deletions

diff --git a/graphics/py-Pillow/Makefile b/graphics/py-Pillow/Makefile
index 8ca6a1d278c..220f769986d 100644
--- a/graphics/py-Pillow/Makefile
+++ b/graphics/py-Pillow/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.9 2014/04/18 13:00:49 obache Exp $
+# $NetBSD: Makefile,v 1.10 2014/07/06 12:15:53 obache Exp $
 
-DISTNAME=	Pillow-2.4.0
+DISTNAME=	Pillow-2.5.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	graphics python
 MASTER_SITES=	https://pypi.python.org/packages/source/P/Pillow/
diff --git a/graphics/py-Pillow/PLIST b/graphics/py-Pillow/PLIST
index 6f8612bce1f..3201a0bc1da 100644
--- a/graphics/py-Pillow/PLIST
+++ b/graphics/py-Pillow/PLIST
@@ -1,7 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2014/04/18 13:00:49 obache Exp $
-${PYSITELIB}/PIL/ArgImagePlugin.py
-${PYSITELIB}/PIL/ArgImagePlugin.pyc
-${PYSITELIB}/PIL/ArgImagePlugin.pyo
+@comment $NetBSD: PLIST,v 1.5 2014/07/06 12:15:53 obache Exp $
 ${PYSITELIB}/PIL/BdfFontFile.py
 ${PYSITELIB}/PIL/BdfFontFile.pyc
 ${PYSITELIB}/PIL/BdfFontFile.pyo
@@ -110,6 +107,9 @@ ${PYSITELIB}/PIL/ImageMath.pyo
 ${PYSITELIB}/PIL/ImageMode.py
 ${PYSITELIB}/PIL/ImageMode.pyc
 ${PYSITELIB}/PIL/ImageMode.pyo
+${PYSITELIB}/PIL/ImageMorph.py
+${PYSITELIB}/PIL/ImageMorph.pyc
+${PYSITELIB}/PIL/ImageMorph.pyo
 ${PYSITELIB}/PIL/ImageOps.py
 ${PYSITELIB}/PIL/ImageOps.pyc
 ${PYSITELIB}/PIL/ImageOps.pyo
@@ -256,13 +256,11 @@ ${PYSITELIB}/PIL/_imaging.so
 ${PYSITELIB}/PIL/_imagingcms.so
 ${PYSITELIB}/PIL/_imagingft.so
 ${PYSITELIB}/PIL/_imagingmath.so
+${PYSITELIB}/PIL/_imagingmorph.so
 ${PYSITELIB}/PIL/_util.py
 ${PYSITELIB}/PIL/_util.pyc
 ${PYSITELIB}/PIL/_util.pyo
 ${PYSITELIB}/PIL/_webp.so
-${PYSITELIB}/PIL/tests.py
-${PYSITELIB}/PIL/tests.pyc
-${PYSITELIB}/PIL/tests.pyo
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
 ${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
diff --git a/graphics/py-Pillow/distinfo b/graphics/py-Pillow/distinfo
index b865d75e2e3..b870365fd16 100644
--- a/graphics/py-Pillow/distinfo
+++ b/graphics/py-Pillow/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.5 2014/04/18 13:00:49 obache Exp $
+$NetBSD: distinfo,v 1.6 2014/07/06 12:15:53 obache Exp $
 
-SHA1 (Pillow-2.4.0.zip) = 43fcfb95a6190a86b56ec7c5872a5b4634a46c1d
-RMD160 (Pillow-2.4.0.zip) = 2692fee280a9abc595ebbb8df6d6a73f5c83667a
-Size (Pillow-2.4.0.zip) = 6519873 bytes
-SHA1 (patch-setup.py) = c7d2e6eddcc64369dc4605f806a360cc244dbcf0
+SHA1 (Pillow-2.5.0.zip) = da34cddb18a91bf9e4bd09a924b5e5dbf3d17348
+RMD160 (Pillow-2.5.0.zip) = d962dbf1664b3c21a68ee82b2d7da9c0a9489e55
+Size (Pillow-2.5.0.zip) = 6871587 bytes
+SHA1 (patch-setup.py) = 1e60096e3a00613a6fd114e2f658a9689eb78844
diff --git a/graphics/py-Pillow/patches/patch-setup.py b/graphics/py-Pillow/patches/patch-setup.py
index 51fba5835cc..3e0e5b09a1e 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.2 2014/04/18 13:00:49 obache Exp $
+$NetBSD: patch-setup.py,v 1.3 2014/07/06 12:15:53 obache Exp $
 
 * Prevent to detect optional tkinter.
 * Disable demo programs.
 
---- setup.py.orig	2014-04-01 09:21:44.000000000 +0000
+--- setup.py.orig	2014-06-30 22:42:26.000000000 +0000
 +++ setup.py
-@@ -79,11 +79,7 @@ def _lib_include(root):
+@@ -82,11 +82,7 @@ def _lib_include(root):
  def _read(file):
      return open(file, 'rb').read()
  
@@ -18,7 +18,7 @@ $NetBSD: patch-setup.py,v 1.2 2014/04/18 13:00:49 obache Exp $
  
  
  NAME = 'Pillow'
-@@ -507,7 +503,7 @@ class pil_build_ext(build_ext):
+@@ -570,7 +566,7 @@ class pil_build_ext(build_ext):
              exts.append(Extension(
                  "PIL._webp", ["_webp.c"], libraries=libs, define_macros=defs))
  
@@ -27,12 +27,12 @@ $NetBSD: patch-setup.py,v 1.2 2014/04/18 13:00:49 obache Exp $
              # locate Tcl/Tk frameworks
              frameworks = []
              framework_roots = [
-@@ -673,7 +669,7 @@ setup(
+@@ -746,7 +742,7 @@ setup(
      ext_modules=[Extension("PIL._imaging", ["_imaging.c"])],
      include_package_data=True,
      packages=find_packages(),
 -    scripts=glob.glob("Scripts/pil*.py"),
 +#    scripts=glob.glob("Scripts/pil*.py"),
      test_suite='PIL.tests',
-     keywords=["Imaging",],
+     keywords=["Imaging", ],
      license='Standard PIL License',