summaryrefslogtreecommitdiff
path: root/graphics
diff options
context:
space:
mode:
authorobache <obache@pkgsrc.org>2013-12-28 02:53:46 +0000
committerobache <obache@pkgsrc.org>2013-12-28 02:53:46 +0000
commita54d64a9a41fb07c952f0a9b04fdcedc9414a993 (patch)
tree5a271c0106ea0eb7fa5f0407222cb513a49ad443 /graphics
parenta4dafe4e0220c108e28ddaf6ea0c220be09871c6 (diff)
downloadpkgsrc-a54d64a9a41fb07c952f0a9b04fdcedc9414a993.tar.gz
Exactly disable detection of unwanted optional tkinter support.
Bump PKGREVISION.
Diffstat (limited to 'graphics')
-rw-r--r--graphics/py-Pillow/Makefile12
-rw-r--r--graphics/py-Pillow/PLIST8
-rw-r--r--graphics/py-Pillow/distinfo3
-rw-r--r--graphics/py-Pillow/patches/patch-setup.py36
4 files changed, 43 insertions, 16 deletions
diff --git a/graphics/py-Pillow/Makefile b/graphics/py-Pillow/Makefile
index aec86233ca5..d6901a98439 100644
--- a/graphics/py-Pillow/Makefile
+++ b/graphics/py-Pillow/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2013/12/27 11:08:04 dholland Exp $
+# $NetBSD: Makefile,v 1.4 2013/12/28 02:53:46 obache Exp $
#
DISTNAME= Pillow-2.2.1
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= graphics python
MASTER_SITES= https://pypi.python.org/packages/source/P/Pillow/
EXTRACT_SUFX= .zip
@@ -14,20 +14,16 @@ COMMENT= Python Imaging Library (Fork)
CONFLICTS+= ${PYPKGPREFIX}-imaging-[0-9]*
-PYTHON_SELF_CONFLICT= yes
PYTHON_VERSIONS_INCLUDE_3X= yes
-ALL_ENV+= C_INCLUDE_PATH=${BUILDLINK_PREFIX.freetype2}/include
-ALL_ENV+= LIBRARY_PATH=${BUILDLINK_PREFIX.freetype2}/lib
-
-DEPENDS+= ${PYPKGPREFIX}-Tk-[0-9]*:../../x11/py-Tk
+MAKE_ENV+= C_INCLUDE_PATH=${BUILDLINK_PREFIX.freetype2}/include
+MAKE_ENV+= LIBRARY_PATH=${BUILDLINK_PREFIX.freetype2}/lib
.include "../../devel/zlib/buildlink3.mk"
.include "../../graphics/freetype2/buildlink3.mk"
.include "../../graphics/lcms/buildlink3.mk"
.include "../../graphics/libwebp/buildlink3.mk"
.include "../../graphics/tiff/buildlink3.mk"
-.include "../../x11/tk/buildlink3.mk"
.include "../../lang/python/egg.mk"
.include "../../mk/jpeg.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/py-Pillow/PLIST b/graphics/py-Pillow/PLIST
index ae4b74d413c..4b5c0ac8191 100644
--- a/graphics/py-Pillow/PLIST
+++ b/graphics/py-Pillow/PLIST
@@ -1,9 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2013/12/27 10:02:35 dholland Exp $
-bin/pilconvert.py
-bin/pildriver.py
-bin/pilfile.py
-bin/pilfont.py
-bin/pilprint.py
+@comment $NetBSD: PLIST,v 1.3 2013/12/28 02:53:46 obache Exp $
${PYSITELIB}/PIL/ArgImagePlugin.py
${PYSITELIB}/PIL/ArgImagePlugin.pyc
${PYSITELIB}/PIL/ArgImagePlugin.pyo
@@ -254,7 +249,6 @@ ${PYSITELIB}/PIL/_imaging.so
${PYSITELIB}/PIL/_imagingcms.so
${PYSITELIB}/PIL/_imagingft.so
${PYSITELIB}/PIL/_imagingmath.so
-${PYSITELIB}/PIL/_imagingtk.so
${PYSITELIB}/PIL/_util.py
${PYSITELIB}/PIL/_util.pyc
${PYSITELIB}/PIL/_util.pyo
diff --git a/graphics/py-Pillow/distinfo b/graphics/py-Pillow/distinfo
index f0173af4d11..d8f00b39228 100644
--- a/graphics/py-Pillow/distinfo
+++ b/graphics/py-Pillow/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.1 2013/12/07 12:56:52 obache Exp $
+$NetBSD: distinfo,v 1.2 2013/12/28 02:53:46 obache Exp $
SHA1 (Pillow-2.2.1.zip) = 94999c2b598d19b3f26ddc8f77530f8babab8bd0
RMD160 (Pillow-2.2.1.zip) = 7750b2a81b0963576febc069628548626269fdd6
Size (Pillow-2.2.1.zip) = 2231597 bytes
+SHA1 (patch-setup.py) = b70e3bec9f5c266a4864404a3a69f2da7b5e05c7
diff --git a/graphics/py-Pillow/patches/patch-setup.py b/graphics/py-Pillow/patches/patch-setup.py
new file mode 100644
index 00000000000..dc7f07d9846
--- /dev/null
+++ b/graphics/py-Pillow/patches/patch-setup.py
@@ -0,0 +1,36 @@
+$NetBSD: patch-setup.py,v 1.1 2013/12/28 02:53:47 obache Exp $
+
+* prevent to detect optional tkinter
+
+--- setup.py.orig 2013-10-02 04:07:08.000000000 +0000
++++ setup.py
+@@ -75,10 +75,7 @@ def _lib_include(root):
+ def _read(file):
+ return open(file, 'rb').read()
+
+-try:
+- import _tkinter
+-except ImportError:
+- _tkinter = None
++_tkinter = None
+
+
+ NAME = 'Pillow'
+@@ -432,7 +429,7 @@ class pil_build_ext(build_ext):
+ exts.append(Extension(
+ "PIL._webp", ["_webp.c"], libraries=libs, define_macros=defs))
+
+- if sys.platform == "darwin":
++ if _tkinter and sys.platform == "darwin":
+ # locate Tcl/Tk frameworks
+ frameworks = []
+ framework_roots = [
+@@ -598,7 +595,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",],
+ license='Standard PIL License',