update to 1.1.7

changes: misc bugfixes and improvements, too much to list here, see
the CHANGES file for details

4 files changed, 37 insertions, 20 deletions

diff --git a/graphics/py-imaging/Makefile b/graphics/py-imaging/Makefile
index c6ee78b2ee6..86ddfe4a9a0 100644
--- a/graphics/py-imaging/Makefile
+++ b/graphics/py-imaging/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.34 2009/08/26 19:56:42 sno Exp $
+# $NetBSD: Makefile,v 1.35 2009/12/11 21:37:30 drochner Exp $
 
-DISTNAME=	Imaging-1.1.6
-PKGNAME=	${PYPKGPREFIX}-imaging-1.1.6
-PKGREVISION=	1
+DISTNAME=	Imaging-1.1.7
+PKGNAME=	${PYPKGPREFIX}-imaging-1.1.7
 CATEGORIES=	graphics python
-MASTER_SITES=	http://effbot.org/downloads/
+MASTER_SITES=	http://effbot.org/media/downloads/
 
 MAINTAINER=	tsarna@NetBSD.org
 HOMEPAGE=	http://www.pythonware.com/products/pil/
@@ -32,6 +31,7 @@ post-install:
 
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
+.include "../../graphics/lcms/buildlink3.mk"
 .include "../../lang/python/extension.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/py-imaging/PLIST b/graphics/py-imaging/PLIST
index 5ba9e5da9ee..333aa0c33f4 100644
--- a/graphics/py-imaging/PLIST
+++ b/graphics/py-imaging/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2009/06/14 17:59:26 joerg Exp $
+@comment $NetBSD: PLIST,v 1.11 2009/12/11 21:37:30 drochner Exp $
 ${PYINC}/PIL/ImPlatform.h
 ${PYINC}/PIL/Imaging.h
 ${PYSITELIB}/PIL.pth
@@ -77,6 +77,9 @@ ${PYSITELIB}/PIL/Image.pyo
 ${PYSITELIB}/PIL/ImageChops.py
 ${PYSITELIB}/PIL/ImageChops.pyc
 ${PYSITELIB}/PIL/ImageChops.pyo
+${PYSITELIB}/PIL/ImageCms.py
+${PYSITELIB}/PIL/ImageCms.pyc
+${PYSITELIB}/PIL/ImageCms.pyo
 ${PYSITELIB}/PIL/ImageColor.py
 ${PYSITELIB}/PIL/ImageColor.pyc
 ${PYSITELIB}/PIL/ImageColor.pyo
@@ -128,6 +131,9 @@ ${PYSITELIB}/PIL/ImageQt.pyo
 ${PYSITELIB}/PIL/ImageSequence.py
 ${PYSITELIB}/PIL/ImageSequence.pyc
 ${PYSITELIB}/PIL/ImageSequence.pyo
+${PYSITELIB}/PIL/ImageShow.py
+${PYSITELIB}/PIL/ImageShow.pyc
+${PYSITELIB}/PIL/ImageShow.pyo
 ${PYSITELIB}/PIL/ImageStat.py
 ${PYSITELIB}/PIL/ImageStat.pyc
 ${PYSITELIB}/PIL/ImageStat.pyo
@@ -237,5 +243,6 @@ ${PYSITELIB}/PIL/__init__.py
 ${PYSITELIB}/PIL/__init__.pyc
 ${PYSITELIB}/PIL/__init__.pyo
 ${PYSITELIB}/PIL/_imaging.so
+${PYSITELIB}/PIL/_imagingcms.so
 ${PYSITELIB}/PIL/_imagingft.so
 ${PYSITELIB}/PIL/_imagingmath.so
diff --git a/graphics/py-imaging/distinfo b/graphics/py-imaging/distinfo
index 68e1aec7237..a616072eae9 100644
--- a/graphics/py-imaging/distinfo
+++ b/graphics/py-imaging/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.11 2007/03/23 20:47:57 drochner Exp $
+$NetBSD: distinfo,v 1.12 2009/12/11 21:37:30 drochner Exp $
 
-SHA1 (python/Imaging-1.1.6.tar.gz) = 952d241e4af8ba09f74e6926108b7c0c748d0f89
-RMD160 (python/Imaging-1.1.6.tar.gz) = 336bb92482eb833e5bb1c9e8c1e585c9bdc338d1
-Size (python/Imaging-1.1.6.tar.gz) = 435854 bytes
-SHA1 (patch-ab) = 8f2738dd72765490ea124e508331c2b7596d687e
+SHA1 (python/Imaging-1.1.7.tar.gz) = 76c37504251171fda8da8e63ecb8bc42a69a5c81
+RMD160 (python/Imaging-1.1.7.tar.gz) = 9af570fe100e250a4860314341fe3e6d695d7fde
+Size (python/Imaging-1.1.7.tar.gz) = 498749 bytes
+SHA1 (patch-ab) = 563eff2d51db778711946734871f790643851086
diff --git a/graphics/py-imaging/patches/patch-ab b/graphics/py-imaging/patches/patch-ab
index b67e66a795c..ac31bd6aaa9 100644
--- a/graphics/py-imaging/patches/patch-ab
+++ b/graphics/py-imaging/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.5 2007/01/20 15:17:20 joerg Exp $
+$NetBSD: patch-ab,v 1.6 2009/12/11 21:37:31 drochner Exp $
 
---- setup.py.orig	2005-03-23 19:16:40.000000000 +0100
+--- setup.py.orig	2009-11-15 17:06:10.000000000 +0100
 +++ setup.py
-@@ -79,10 +79,7 @@ from distutils import sysconfig
+@@ -86,10 +86,7 @@ from distutils import sysconfig
  from distutils.core import Extension, setup
  from distutils.command.build_ext import build_ext
  
@@ -14,17 +14,27 @@ $NetBSD: patch-ab,v 1.5 2007/01/20 15:17:20 joerg Exp $
  
  def add_directory(path, dir, where=None):
      if dir and os.path.isdir(dir) and dir not in path:
-@@ -177,9 +174,6 @@ class pil_build_ext(build_ext):
-         #
-         # add standard directories
+@@ -147,7 +144,7 @@ class pil_build_ext(build_ext):
+             add_directory(library_dirs, "/opt/local/lib")
+             add_directory(include_dirs, "/opt/local/include")
  
 -        add_directory(library_dirs, "/usr/local/lib")
++#        add_directory(library_dirs, "/usr/local/lib")
+         # FIXME: check /opt/stuff directories here?
+ 
+         prefix = sysconfig.get_config_var("prefix")
+@@ -208,8 +205,8 @@ class pil_build_ext(build_ext):
+                 add_directory(include_dirs, tcl_dir)
+ 
+         # standard locations
+-        add_directory(library_dirs, "/usr/local/lib")
 -        add_directory(include_dirs, "/usr/local/include")
--
++#        add_directory(library_dirs, "/usr/local/lib")
++#        add_directory(include_dirs, "/usr/local/include")
+ 
          add_directory(library_dirs, "/usr/lib")
          add_directory(include_dirs, "/usr/include")
- 
-@@ -433,7 +427,7 @@ if __name__ == "__main__":
+@@ -481,7 +478,7 @@ if __name__ == "__main__":
          package_dir={"": "PIL"},
          packages=[""],
          platforms="Python 1.5.2 and later.",