summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--graphics/py-Pillow/Makefile6
-rw-r--r--graphics/py-Pillow/PLIST12
-rw-r--r--graphics/py-Pillow/distinfo10
-rw-r--r--graphics/py-Pillow/patches/patch-setup.py12
4 files changed, 19 insertions, 21 deletions
diff --git a/graphics/py-Pillow/Makefile b/graphics/py-Pillow/Makefile
index 8ca6a1d278c..fea1fb3b830 100644
--- a/graphics/py-Pillow/Makefile
+++ b/graphics/py-Pillow/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.9 2014/04/18 13:00:49 obache Exp $
+# $NetBSD: Makefile,v 1.9.2.1 2014/08/22 17:10:56 tron Exp $
-DISTNAME= Pillow-2.4.0
+DISTNAME= Pillow-2.5.3
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
CATEGORIES= graphics python
MASTER_SITES= https://pypi.python.org/packages/source/P/Pillow/
EXTRACT_SUFX= .zip
MAINTAINER= obache@NetBSD.org
-HOMEPAGE= http://python-imaging.github.io/
+HOMEPAGE= http://python-pillow.github.io/
COMMENT= Python Imaging Library (Fork)
CONFLICTS+= ${PYPKGPREFIX}-imaging-[0-9]*
diff --git a/graphics/py-Pillow/PLIST b/graphics/py-Pillow/PLIST
index 6f8612bce1f..3a46e588925 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.4.2.1 2014/08/22 17:10:56 tron 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..c0f911eaa60 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.5.2.1 2014/08/22 17:10:56 tron 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.3.zip) = 28a46c07404926c406faffa187c6f6b9b5028e21
+RMD160 (Pillow-2.5.3.zip) = f10cda34a62022edf3bfe626096b6bc009a74dc8
+Size (Pillow-2.5.3.zip) = 6873222 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..550f6658bd4 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.2.2.1 2014/08/22 17:10:57 tron 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',