6 files changed, 37 insertions, 12 deletions

diff --git a/graphics/py-imaging/Makefile b/graphics/py-imaging/Makefile
index ab4a38d1e5f2..e85e70160eed 100644
--- a/graphics/py-imaging/Makefile
+++ b/graphics/py-imaging/Makefile
@@ -6,11 +6,9 @@
 #
 
 PORTNAME=	imaging
-PORTVERSION=	1.1.3
+PORTVERSION=	1.1.4
 CATEGORIES=	graphics python
-MASTER_SITES=	http://www.pythonware.com/downloads/ \
-		ftp://www.python.org/pub/python/src/ \
-		ftp://ftp.cwi.nl/pub/python/src/
+MASTER_SITES=	http://effbot.org/downloads/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	Imaging-${PORTVERSION}
 
diff --git a/graphics/py-imaging/distinfo b/graphics/py-imaging/distinfo
index 6a18feda6e7d..139371e0054c 100644
--- a/graphics/py-imaging/distinfo
+++ b/graphics/py-imaging/distinfo
@@ -1 +1 @@
-MD5 (python/Imaging-1.1.3.tar.gz) = 563471981376e06b3278ad713a07e2a8
+MD5 (python/Imaging-1.1.4.tar.gz) = d2c03c25a9a0128832137dd536da88da
diff --git a/graphics/py-imaging/files/Setup b/graphics/py-imaging/files/Setup
index 7e7f2cbb62cb..aa2692a24e15 100644
--- a/graphics/py-imaging/files/Setup
+++ b/graphics/py-imaging/files/Setup
@@ -1,4 +1,4 @@
 *shared*
 
 _imaging _imaging.c decode.c encode.c map.c display.c outline.c path.c -IlibImaging libImaging/libImaging.a -I${PREFIX}/include -L${PREFIX}/lib -ljpeg -lz
-_imagingtk _imagingtk.c Tk/tkImaging.c -IlibImaging -I${X11BASE}/include -I${PREFIX}/include/tcl8.3 -I${PREFIX}/include/tk8.3 -L${PREFIX}/lib -ltk83 -ltcl83 -L${X11BASE}/lib -lX11
+_imagingtk _imagingtk.c Tk/tkImaging.c -IlibImaging -I${X11BASE}/include -I${PREFIX}/include/tcl8.4 -I${PREFIX}/include/tk8.4 -L${PREFIX}/lib -ltk84 -ltcl84 -L${X11BASE}/lib -lX11
diff --git a/graphics/py-imaging/files/patch-Makefile.pre.in b/graphics/py-imaging/files/patch-Makefile.pre.in
index 2341dfb617b4..21d12ce9f926 100644
--- a/graphics/py-imaging/files/patch-Makefile.pre.in
+++ b/graphics/py-imaging/files/patch-Makefile.pre.in
@@ -1,5 +1,5 @@
---- ../Makefile.pre.in~	Thu May  3 12:57:38 2001
-+++ ../Makefile.pre.in	Thu Jan 10 09:02:03 2002
+--- ../Makefile.pre.in.orig	Wed Apr 23 00:11:24 2003
++++ ../Makefile.pre.in	Sat Aug  2 13:56:42 2003
 @@ -92,7 +92,7 @@
  TARGET=		python
  
@@ -9,3 +9,12 @@
  
  # Add more -I and -D options here
  CFLAGS=		$(OPT) -I$(INCLUDEPY) -I$(EXECINCLUDEPY) $(DEFS)
+@@ -117,7 +117,7 @@
+ SGI_ABI=	@SGI_ABI@
+ OPT=		@OPT@
+ LDFLAGS=	@LDFLAGS@
+-DEFS=		@DEFS@
++DEFS=
+ LIBS=		@LIBS@
+ LIBM=		@LIBM@
+ LIBC=		@LIBC@
diff --git a/graphics/py-imaging/pkg-descr b/graphics/py-imaging/pkg-descr
index 9f261503fe4f..b5e91e5032fc 100644
--- a/graphics/py-imaging/pkg-descr
+++ b/graphics/py-imaging/pkg-descr
@@ -5,7 +5,7 @@ image processing capabilities.
 
 The main distribution site for this software is:
 
-	http://www.pythonware.com
+WWW:	http://www.pythonware.com/products/pil/index.htm
 
 The PIL handbook is not included in this distribution; to get the
 latest version, check:
diff --git a/graphics/py-imaging/pkg-plist b/graphics/py-imaging/pkg-plist
index 9bb9090e1d1c..1e92eee07f18 100644
--- a/graphics/py-imaging/pkg-plist
+++ b/graphics/py-imaging/pkg-plist
@@ -22,6 +22,9 @@ lib/%%PYTHON_VERSION%%/site-packages/PIL/DcxImagePlugin.pyo
 lib/%%PYTHON_VERSION%%/site-packages/PIL/EpsImagePlugin.py
 lib/%%PYTHON_VERSION%%/site-packages/PIL/EpsImagePlugin.pyc
 lib/%%PYTHON_VERSION%%/site-packages/PIL/EpsImagePlugin.pyo
+lib/%%PYTHON_VERSION%%/site-packages/PIL/ExifTags.py
+lib/%%PYTHON_VERSION%%/site-packages/PIL/ExifTags.pyc
+lib/%%PYTHON_VERSION%%/site-packages/PIL/ExifTags.pyo
 lib/%%PYTHON_VERSION%%/site-packages/PIL/FliImagePlugin.py
 lib/%%PYTHON_VERSION%%/site-packages/PIL/FliImagePlugin.pyc
 lib/%%PYTHON_VERSION%%/site-packages/PIL/FliImagePlugin.pyo
@@ -58,6 +61,9 @@ lib/%%PYTHON_VERSION%%/site-packages/PIL/Image.pyo
 lib/%%PYTHON_VERSION%%/site-packages/PIL/ImageChops.py
 lib/%%PYTHON_VERSION%%/site-packages/PIL/ImageChops.pyc
 lib/%%PYTHON_VERSION%%/site-packages/PIL/ImageChops.pyo
+lib/%%PYTHON_VERSION%%/site-packages/PIL/ImageColor.py
+lib/%%PYTHON_VERSION%%/site-packages/PIL/ImageColor.pyc
+lib/%%PYTHON_VERSION%%/site-packages/PIL/ImageColor.pyo
 lib/%%PYTHON_VERSION%%/site-packages/PIL/ImageDraw.py
 lib/%%PYTHON_VERSION%%/site-packages/PIL/ImageDraw.pyc
 lib/%%PYTHON_VERSION%%/site-packages/PIL/ImageDraw.pyo
@@ -76,6 +82,9 @@ lib/%%PYTHON_VERSION%%/site-packages/PIL/ImageFilter.pyo
 lib/%%PYTHON_VERSION%%/site-packages/PIL/ImageFont.py
 lib/%%PYTHON_VERSION%%/site-packages/PIL/ImageFont.pyc
 lib/%%PYTHON_VERSION%%/site-packages/PIL/ImageFont.pyo
+lib/%%PYTHON_VERSION%%/site-packages/PIL/ImageGrab.py
+lib/%%PYTHON_VERSION%%/site-packages/PIL/ImageGrab.pyc
+lib/%%PYTHON_VERSION%%/site-packages/PIL/ImageGrab.pyo
 lib/%%PYTHON_VERSION%%/site-packages/PIL/ImageOps.py
 lib/%%PYTHON_VERSION%%/site-packages/PIL/ImageOps.pyc
 lib/%%PYTHON_VERSION%%/site-packages/PIL/ImageOps.pyo
@@ -94,6 +103,9 @@ lib/%%PYTHON_VERSION%%/site-packages/PIL/ImageStat.pyo
 lib/%%PYTHON_VERSION%%/site-packages/PIL/ImageTk.py
 lib/%%PYTHON_VERSION%%/site-packages/PIL/ImageTk.pyc
 lib/%%PYTHON_VERSION%%/site-packages/PIL/ImageTk.pyo
+lib/%%PYTHON_VERSION%%/site-packages/PIL/ImageTransform.py
+lib/%%PYTHON_VERSION%%/site-packages/PIL/ImageTransform.pyc
+lib/%%PYTHON_VERSION%%/site-packages/PIL/ImageTransform.pyo
 lib/%%PYTHON_VERSION%%/site-packages/PIL/ImageWin.py
 lib/%%PYTHON_VERSION%%/site-packages/PIL/ImageWin.pyc
 lib/%%PYTHON_VERSION%%/site-packages/PIL/ImageWin.pyo
@@ -127,6 +139,9 @@ lib/%%PYTHON_VERSION%%/site-packages/PIL/PSDraw.pyo
 lib/%%PYTHON_VERSION%%/site-packages/PIL/PaletteFile.py
 lib/%%PYTHON_VERSION%%/site-packages/PIL/PaletteFile.pyc
 lib/%%PYTHON_VERSION%%/site-packages/PIL/PaletteFile.pyo
+lib/%%PYTHON_VERSION%%/site-packages/PIL/PalmImagePlugin.py
+lib/%%PYTHON_VERSION%%/site-packages/PIL/PalmImagePlugin.pyc
+lib/%%PYTHON_VERSION%%/site-packages/PIL/PalmImagePlugin.pyo
 lib/%%PYTHON_VERSION%%/site-packages/PIL/PcdImagePlugin.py
 lib/%%PYTHON_VERSION%%/site-packages/PIL/PcdImagePlugin.pyc
 lib/%%PYTHON_VERSION%%/site-packages/PIL/PcdImagePlugin.pyo
@@ -169,18 +184,21 @@ lib/%%PYTHON_VERSION%%/site-packages/PIL/TiffImagePlugin.pyo
 lib/%%PYTHON_VERSION%%/site-packages/PIL/TiffTags.py
 lib/%%PYTHON_VERSION%%/site-packages/PIL/TiffTags.pyc
 lib/%%PYTHON_VERSION%%/site-packages/PIL/TiffTags.pyo
+lib/%%PYTHON_VERSION%%/site-packages/PIL/WalImageFile.py
+lib/%%PYTHON_VERSION%%/site-packages/PIL/WalImageFile.pyc
+lib/%%PYTHON_VERSION%%/site-packages/PIL/WalImageFile.pyo
 lib/%%PYTHON_VERSION%%/site-packages/PIL/WmfImagePlugin.py
 lib/%%PYTHON_VERSION%%/site-packages/PIL/WmfImagePlugin.pyc
 lib/%%PYTHON_VERSION%%/site-packages/PIL/WmfImagePlugin.pyo
+lib/%%PYTHON_VERSION%%/site-packages/PIL/XVThumbImagePlugin.py
+lib/%%PYTHON_VERSION%%/site-packages/PIL/XVThumbImagePlugin.pyc
+lib/%%PYTHON_VERSION%%/site-packages/PIL/XVThumbImagePlugin.pyo
 lib/%%PYTHON_VERSION%%/site-packages/PIL/XbmImagePlugin.py
 lib/%%PYTHON_VERSION%%/site-packages/PIL/XbmImagePlugin.pyc
 lib/%%PYTHON_VERSION%%/site-packages/PIL/XbmImagePlugin.pyo
 lib/%%PYTHON_VERSION%%/site-packages/PIL/XpmImagePlugin.py
 lib/%%PYTHON_VERSION%%/site-packages/PIL/XpmImagePlugin.pyc
 lib/%%PYTHON_VERSION%%/site-packages/PIL/XpmImagePlugin.pyo
-lib/%%PYTHON_VERSION%%/site-packages/PIL/XVThumbImagePlugin.py
-lib/%%PYTHON_VERSION%%/site-packages/PIL/XVThumbImagePlugin.pyc
-lib/%%PYTHON_VERSION%%/site-packages/PIL/XVThumbImagePlugin.pyo
 lib/%%PYTHON_VERSION%%/site-packages/PIL/__init__.py
 lib/%%PYTHON_VERSION%%/site-packages/PIL/__init__.pyc
 lib/%%PYTHON_VERSION%%/site-packages/PIL/__init__.pyo