4 files changed, 27 insertions, 15 deletions

diff --git a/graphics/py-imaging/Makefile b/graphics/py-imaging/Makefile
index e1775c59a824..676ecef33d7f 100644
--- a/graphics/py-imaging/Makefile
+++ b/graphics/py-imaging/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	imaging
-PORTVERSION=	1.1.5
-PORTREVISION=	2
+PORTVERSION=	1.1.6
 CATEGORIES=	graphics python
 MASTER_SITES=	http://effbot.org/downloads/ \
-	        http://www.pythonware.net/storage/
+		http://www.pythonware.net/storage/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	Imaging-${PORTVERSION}
 
@@ -24,12 +23,12 @@ LATEST_LINK=	py-${PORTNAME}
 
 DIST_SUBDIR=	python
 USE_PYTHON=	yes
-USE_PYDISTUTILS=yes
+USE_PYDISTUTILS=	yes
 
 PORTDOCS=	*
 
-DOCDIRS=	${PREFIX}/share/doc/py-imaging
-EXAMPLESDIR=	${PREFIX}/share/examples/py-imaging
+DOCSDIR=	${TARGETDIR}/share/doc/py-${PORTNAME}
+EXAMPLESDIR=	${TARGETDIR}/share/examples/py-${PORTNAME}
 
 OPTIONS=	TKINTER "Build with tkinter for X support" on
 
diff --git a/graphics/py-imaging/distinfo b/graphics/py-imaging/distinfo
index 4420d8d2b66d..7a727d0dd283 100644
--- a/graphics/py-imaging/distinfo
+++ b/graphics/py-imaging/distinfo
@@ -1,3 +1,3 @@
-MD5 (python/Imaging-1.1.5.tar.gz) = a64512e39469213ced0d091b9eba76c0
-SHA256 (python/Imaging-1.1.5.tar.gz) = 14fd700b64d3060e356fc217d8539d1fb468d8688a451f9d6e2faaef1139a58c
-SIZE (python/Imaging-1.1.5.tar.gz) = 429570
+MD5 (python/Imaging-1.1.6.tar.gz) = 3a9b5c20ca52f0a9900512d2c7347622
+SHA256 (python/Imaging-1.1.6.tar.gz) = 7dd7358ab519161967c838df27465282d180a3206f693ba2db64273d688b3f90
+SIZE (python/Imaging-1.1.6.tar.gz) = 435854
diff --git a/graphics/py-imaging/files/patch-setup.py b/graphics/py-imaging/files/patch-setup.py
index 07da8616be1c..154e5762ae04 100644
--- a/graphics/py-imaging/files/patch-setup.py
+++ b/graphics/py-imaging/files/patch-setup.py
@@ -1,6 +1,6 @@
---- ./setup.py	Wed Mar 23 13:16:40 2005
-+++ ./setup.py	Thu Jun 16 13:24:28 2005
-@@ -129,14 +129,25 @@
+--- setup.py.orig	Sun Dec  3 11:37:29 2006
++++ setup.py	Sat Jan 13 07:24:13 2007
+@@ -145,14 +145,25 @@
  
          prefix = sysconfig.get_config_var("prefix")
          if prefix:
diff --git a/graphics/py-imaging/pkg-plist b/graphics/py-imaging/pkg-plist
index 55fd002ac413..bebcd00f43d1 100644
--- a/graphics/py-imaging/pkg-plist
+++ b/graphics/py-imaging/pkg-plist
@@ -3,8 +3,9 @@ bin/pildriver.py
 bin/pilfile.py
 bin/pilfont.py
 bin/pilprint.py
-include/%%PYTHON_VERSION%%/ImPlatform.h
-include/%%PYTHON_VERSION%%/Imaging.h
+%%PYTHON_INCLUDEDIR%%/ImPlatform.h
+%%PYTHON_INCLUDEDIR%%/Imaging.h
+%%PYTHON_SITELIBDIR%%/PIL.pth
 %%PYTHON_SITELIBDIR%%/PIL/ArgImagePlugin.py
 %%PYTHON_SITELIBDIR%%/PIL/ArgImagePlugin.pyc
 %%PYTHON_SITELIBDIR%%/PIL/ArgImagePlugin.pyo
@@ -86,6 +87,9 @@ include/%%PYTHON_VERSION%%/Imaging.h
 %%PYTHON_SITELIBDIR%%/PIL/ImageDraw.py
 %%PYTHON_SITELIBDIR%%/PIL/ImageDraw.pyc
 %%PYTHON_SITELIBDIR%%/PIL/ImageDraw.pyo
+%%PYTHON_SITELIBDIR%%/PIL/ImageDraw2.py
+%%PYTHON_SITELIBDIR%%/PIL/ImageDraw2.pyc
+%%PYTHON_SITELIBDIR%%/PIL/ImageDraw2.pyo
 %%PYTHON_SITELIBDIR%%/PIL/ImageEnhance.py
 %%PYTHON_SITELIBDIR%%/PIL/ImageEnhance.pyc
 %%PYTHON_SITELIBDIR%%/PIL/ImageEnhance.pyo
@@ -107,6 +111,12 @@ include/%%PYTHON_VERSION%%/Imaging.h
 %%PYTHON_SITELIBDIR%%/PIL/ImageGrab.py
 %%PYTHON_SITELIBDIR%%/PIL/ImageGrab.pyc
 %%PYTHON_SITELIBDIR%%/PIL/ImageGrab.pyo
+%%PYTHON_SITELIBDIR%%/PIL/ImageMath.py
+%%PYTHON_SITELIBDIR%%/PIL/ImageMath.pyc
+%%PYTHON_SITELIBDIR%%/PIL/ImageMath.pyo
+%%PYTHON_SITELIBDIR%%/PIL/ImageMode.py
+%%PYTHON_SITELIBDIR%%/PIL/ImageMode.pyc
+%%PYTHON_SITELIBDIR%%/PIL/ImageMode.pyo
 %%PYTHON_SITELIBDIR%%/PIL/ImageOps.py
 %%PYTHON_SITELIBDIR%%/PIL/ImageOps.pyc
 %%PYTHON_SITELIBDIR%%/PIL/ImageOps.pyo
@@ -116,6 +126,9 @@ include/%%PYTHON_VERSION%%/Imaging.h
 %%PYTHON_SITELIBDIR%%/PIL/ImagePath.py
 %%PYTHON_SITELIBDIR%%/PIL/ImagePath.pyc
 %%PYTHON_SITELIBDIR%%/PIL/ImagePath.pyo
+%%PYTHON_SITELIBDIR%%/PIL/ImageQt.py
+%%PYTHON_SITELIBDIR%%/PIL/ImageQt.pyc
+%%PYTHON_SITELIBDIR%%/PIL/ImageQt.pyo
 %%PYTHON_SITELIBDIR%%/PIL/ImageSequence.py
 %%PYTHON_SITELIBDIR%%/PIL/ImageSequence.pyc
 %%PYTHON_SITELIBDIR%%/PIL/ImageSequence.pyo
@@ -229,8 +242,8 @@ include/%%PYTHON_VERSION%%/Imaging.h
 %%PYTHON_SITELIBDIR%%/PIL/__init__.pyo
 %%PYTHON_SITELIBDIR%%/PIL/_imaging.so
 %%PYTHON_SITELIBDIR%%/PIL/_imagingft.so
+%%PYTHON_SITELIBDIR%%/PIL/_imagingmath.so
 %%TKINTER%%%%PYTHON_SITELIBDIR%%/PIL/_imagingtk.so
-%%PYTHON_SITELIBDIR%%/PIL.pth
 @dirrm %%PYTHON_SITELIBDIR%%/PIL
 %%EXAMPLESDIR%%/README
 %%EXAMPLESDIR%%/enhancer.py