summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--graphics/py-imaging/Makefile7
-rw-r--r--graphics/py-imaging/PLIST17
-rw-r--r--graphics/py-imaging/distinfo8
-rw-r--r--graphics/py-imagingtk/Makefile7
-rw-r--r--graphics/py-imagingtk/distinfo10
-rw-r--r--graphics/py-imagingtk/patches/patch-aa14
6 files changed, 37 insertions, 26 deletions
diff --git a/graphics/py-imaging/Makefile b/graphics/py-imaging/Makefile
index d0faec174df..24afd0f7252 100644
--- a/graphics/py-imaging/Makefile
+++ b/graphics/py-imaging/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.28 2007/02/22 19:26:36 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2007/03/23 20:47:56 drochner Exp $
-DISTNAME= Imaging-1.1.5
-PKGNAME= ${PYPKGPREFIX}-imaging-1.1.5
-PKGREVISION= 2
+DISTNAME= Imaging-1.1.6
+PKGNAME= ${PYPKGPREFIX}-imaging-1.1.6
CATEGORIES= graphics python
MASTER_SITES= http://effbot.org/downloads/
diff --git a/graphics/py-imaging/PLIST b/graphics/py-imaging/PLIST
index ac121d9e8c6..1dc34e006f4 100644
--- a/graphics/py-imaging/PLIST
+++ b/graphics/py-imaging/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2007/01/20 15:17:20 joerg Exp $
+@comment $NetBSD: PLIST,v 1.9 2007/03/23 20:47:57 drochner Exp $
${PYINC}/PIL/ImPlatform.h
${PYINC}/PIL/Imaging.h
${PYSITELIB}/PIL.pth
@@ -83,6 +83,9 @@ ${PYSITELIB}/PIL/ImageColor.pyo
${PYSITELIB}/PIL/ImageDraw.py
${PYSITELIB}/PIL/ImageDraw.pyc
${PYSITELIB}/PIL/ImageDraw.pyo
+${PYSITELIB}/PIL/ImageDraw2.py
+${PYSITELIB}/PIL/ImageDraw2.pyc
+${PYSITELIB}/PIL/ImageDraw2.pyo
${PYSITELIB}/PIL/ImageEnhance.py
${PYSITELIB}/PIL/ImageEnhance.pyc
${PYSITELIB}/PIL/ImageEnhance.pyo
@@ -104,6 +107,12 @@ ${PYSITELIB}/PIL/ImageGL.pyo
${PYSITELIB}/PIL/ImageGrab.py
${PYSITELIB}/PIL/ImageGrab.pyc
${PYSITELIB}/PIL/ImageGrab.pyo
+${PYSITELIB}/PIL/ImageMath.py
+${PYSITELIB}/PIL/ImageMath.pyc
+${PYSITELIB}/PIL/ImageMath.pyo
+${PYSITELIB}/PIL/ImageMode.py
+${PYSITELIB}/PIL/ImageMode.pyc
+${PYSITELIB}/PIL/ImageMode.pyo
${PYSITELIB}/PIL/ImageOps.py
${PYSITELIB}/PIL/ImageOps.pyc
${PYSITELIB}/PIL/ImageOps.pyo
@@ -113,6 +122,9 @@ ${PYSITELIB}/PIL/ImagePalette.pyo
${PYSITELIB}/PIL/ImagePath.py
${PYSITELIB}/PIL/ImagePath.pyc
${PYSITELIB}/PIL/ImagePath.pyo
+${PYSITELIB}/PIL/ImageQt.py
+${PYSITELIB}/PIL/ImageQt.pyc
+${PYSITELIB}/PIL/ImageQt.pyo
${PYSITELIB}/PIL/ImageSequence.py
${PYSITELIB}/PIL/ImageSequence.pyc
${PYSITELIB}/PIL/ImageSequence.pyo
@@ -226,5 +238,6 @@ ${PYSITELIB}/PIL/__init__.pyc
${PYSITELIB}/PIL/__init__.pyo
${PYSITELIB}/PIL/_imaging.so
${PYSITELIB}/PIL/_imagingft.so
-@dirrm ${PYINC}/PIL
+${PYSITELIB}/PIL/_imagingmath.so
@dirrm ${PYSITELIB}/PIL
+@dirrm ${PYINC}/PIL
diff --git a/graphics/py-imaging/distinfo b/graphics/py-imaging/distinfo
index 3deb98d216d..68e1aec7237 100644
--- a/graphics/py-imaging/distinfo
+++ b/graphics/py-imaging/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.10 2007/01/20 15:17:20 joerg Exp $
+$NetBSD: distinfo,v 1.11 2007/03/23 20:47:57 drochner Exp $
-SHA1 (python/Imaging-1.1.5.tar.gz) = 06705b31b534a15aef827bccc87dceb9ebc51b9f
-RMD160 (python/Imaging-1.1.5.tar.gz) = 99ca581f2f96d1112f6c36eccdf96da1ac014a04
-Size (python/Imaging-1.1.5.tar.gz) = 429570 bytes
+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
diff --git a/graphics/py-imagingtk/Makefile b/graphics/py-imagingtk/Makefile
index 025a5003a6c..0be56ea0305 100644
--- a/graphics/py-imagingtk/Makefile
+++ b/graphics/py-imagingtk/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.21 2007/02/22 19:26:36 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2007/03/23 20:47:57 drochner Exp $
#
-DISTNAME= Imaging-1.1.5
-PKGNAME= ${PYPKGPREFIX}-imagingtk-1.1.5
-PKGREVISION= 1
+DISTNAME= Imaging-1.1.6
+PKGNAME= ${PYPKGPREFIX}-imagingtk-1.1.6
CATEGORIES= graphics python
MASTER_SITES= http://effbot.org/downloads/
diff --git a/graphics/py-imagingtk/distinfo b/graphics/py-imagingtk/distinfo
index 40dd38018db..e04a18c8fb7 100644
--- a/graphics/py-imagingtk/distinfo
+++ b/graphics/py-imagingtk/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.7 2005/10/12 14:48:44 drochner Exp $
+$NetBSD: distinfo,v 1.8 2007/03/23 20:47:58 drochner Exp $
-SHA1 (python/Imaging-1.1.5.tar.gz) = 06705b31b534a15aef827bccc87dceb9ebc51b9f
-RMD160 (python/Imaging-1.1.5.tar.gz) = 99ca581f2f96d1112f6c36eccdf96da1ac014a04
-Size (python/Imaging-1.1.5.tar.gz) = 429570 bytes
-SHA1 (patch-aa) = 1576267cd4274307d7f680c1e834930477e7603f
+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-aa) = 1bd23b386fc9b42a20e6f67689a5277a6912e9a7
diff --git a/graphics/py-imagingtk/patches/patch-aa b/graphics/py-imagingtk/patches/patch-aa
index 9c6a1114d57..36e62569643 100644
--- a/graphics/py-imagingtk/patches/patch-aa
+++ b/graphics/py-imagingtk/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.2 2005/10/12 14:48:44 drochner Exp $
+$NetBSD: patch-aa,v 1.3 2007/03/23 20:47:58 drochner Exp $
---- setup.py.orig 2005-03-23 19:16:40.000000000 +0100
+--- setup.py.orig 2006-12-03 12:37:29.000000000 +0100
+++ setup.py
-@@ -177,9 +177,6 @@ class pil_build_ext(build_ext):
+@@ -193,9 +193,6 @@ class pil_build_ext(build_ext):
#
# add standard directories
@@ -12,7 +12,7 @@ $NetBSD: patch-aa,v 1.2 2005/10/12 14:48:44 drochner Exp $
add_directory(library_dirs, "/usr/lib")
add_directory(include_dirs, "/usr/include")
-@@ -210,7 +207,7 @@ class pil_build_ext(build_ext):
+@@ -226,7 +223,7 @@ class pil_build_ext(build_ext):
if find_library_file(self, "tiff"):
feature.tiff = "tiff"
@@ -20,8 +20,8 @@ $NetBSD: patch-aa,v 1.2 2005/10/12 14:48:44 drochner Exp $
+ if 0:
# look for freetype2 include files
freetype_version = 0
- for dir in include_dirs:
-@@ -265,9 +262,10 @@ class pil_build_ext(build_ext):
+ for dir in self.compiler.include_dirs:
+@@ -281,9 +278,10 @@ class pil_build_ext(build_ext):
if struct.unpack("h", "\0\1")[0] == 1:
defs.append(("WORDS_BIGENDIAN", None))
@@ -35,7 +35,7 @@ $NetBSD: patch-aa,v 1.2 2005/10/12 14:48:44 drochner Exp $
#
# additional libraries
-@@ -430,10 +428,10 @@ if __name__ == "__main__":
+@@ -448,10 +446,10 @@ if __name__ == "__main__":
license="Python (MIT style)",
long_description=DESCRIPTION,
name=NAME,