diff options
author | drochner <drochner@pkgsrc.org> | 2009-12-11 21:40:30 +0000 |
---|---|---|
committer | drochner <drochner@pkgsrc.org> | 2009-12-11 21:40:30 +0000 |
commit | d8092778a69cde9944ec7b61f72799ed86581158 (patch) | |
tree | cc189c1292a5ba8ed18f5abf87008e1b6350f869 | |
parent | c020490eef0392a4902a34a772b3ee818529a1da (diff) | |
download | pkgsrc-d8092778a69cde9944ec7b61f72799ed86581158.tar.gz |
sync w/ base pkg
-rw-r--r-- | graphics/py-imagingtk/Makefile | 13 | ||||
-rw-r--r-- | graphics/py-imagingtk/PLIST | 4 | ||||
-rw-r--r-- | graphics/py-imagingtk/distinfo | 10 | ||||
-rw-r--r-- | graphics/py-imagingtk/patches/patch-aa | 83 |
4 files changed, 86 insertions, 24 deletions
diff --git a/graphics/py-imagingtk/Makefile b/graphics/py-imagingtk/Makefile index eb099ab914c..fced02f1f36 100644 --- a/graphics/py-imagingtk/Makefile +++ b/graphics/py-imagingtk/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.23 2009/08/26 19:57:48 sno Exp $ +# $NetBSD: Makefile,v 1.24 2009/12/11 21:40:30 drochner Exp $ # -DISTNAME= Imaging-1.1.6 -PKGNAME= ${PYPKGPREFIX}-imagingtk-1.1.6 -PKGREVISION= 1 +DISTNAME= Imaging-1.1.7 +PKGNAME= ${PYPKGPREFIX}-imagingtk-1.1.7 CATEGORIES= graphics python MASTER_SITES= http://effbot.org/downloads/ @@ -17,13 +16,15 @@ BUILDLINK_API_DEPENDS.python20+= python20>=2.0.1nb4 PY_PATCHPLIST= yes PLIST_SUBST+= PYPKGPREFIX=${PYPKGPREFIX:Q} +PKG_DESTDIR_SUPPORT= user-destdir post-install: - ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/${PYPKGPREFIX}-imaging + ${INSTALL_DATA_DIR} \ + ${DESTDIR}${PREFIX}/share/examples/${PYPKGPREFIX}-imaging (cd ${WRKSRC}/Scripts; \ ${INSTALL_DATA} enhancer.py painter.py player.py \ thresholder.py viewer.py \ - ${PREFIX}/share/examples/${PYPKGPREFIX}-imaging ) + ${DESTDIR}${PREFIX}/share/examples/${PYPKGPREFIX}-imaging ) .include "../../lang/python/extension.mk" .include "../../graphics/py-imaging/buildlink3.mk" diff --git a/graphics/py-imagingtk/PLIST b/graphics/py-imagingtk/PLIST index 676b6550bd3..d65284d5062 100644 --- a/graphics/py-imagingtk/PLIST +++ b/graphics/py-imagingtk/PLIST @@ -1,9 +1,7 @@ -@comment $NetBSD: PLIST,v 1.4 2009/06/14 17:59:26 joerg Exp $ +@comment $NetBSD: PLIST,v 1.5 2009/12/11 21:40:30 drochner Exp $ ${PYSITELIB}/PIL/_imagingtk.so share/examples/${PYPKGPREFIX}-imaging/enhancer.py share/examples/${PYPKGPREFIX}-imaging/painter.py share/examples/${PYPKGPREFIX}-imaging/player.py share/examples/${PYPKGPREFIX}-imaging/thresholder.py share/examples/${PYPKGPREFIX}-imaging/viewer.py -@comment ${PYSITELIB}/PIL -@comment belongs to py-imaging, do not remove it here. diff --git a/graphics/py-imagingtk/distinfo b/graphics/py-imagingtk/distinfo index e04a18c8fb7..f284a00059c 100644 --- a/graphics/py-imagingtk/distinfo +++ b/graphics/py-imagingtk/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.8 2007/03/23 20:47:58 drochner Exp $ +$NetBSD: distinfo,v 1.9 2009/12/11 21:40:30 drochner Exp $ -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 +SHA1 (python/Imaging-1.1.7.tar.gz) = 76c37504251171fda8da8e63ecb8bc42a69a5c81 +RMD160 (python/Imaging-1.1.7.tar.gz) = 9af570fe100e250a4860314341fe3e6d695d7fde +Size (python/Imaging-1.1.7.tar.gz) = 498749 bytes +SHA1 (patch-aa) = 8cdb73394732265e81d8a99e8457b43e7f39e78f diff --git a/graphics/py-imagingtk/patches/patch-aa b/graphics/py-imagingtk/patches/patch-aa index 36e62569643..fb9d31a28bd 100644 --- a/graphics/py-imagingtk/patches/patch-aa +++ b/graphics/py-imagingtk/patches/patch-aa @@ -1,18 +1,36 @@ -$NetBSD: patch-aa,v 1.3 2007/03/23 20:47:58 drochner Exp $ +$NetBSD: patch-aa,v 1.4 2009/12/11 21:40:30 drochner Exp $ ---- setup.py.orig 2006-12-03 12:37:29.000000000 +0100 +--- setup.py.orig 2009-11-15 17:06:10.000000000 +0100 +++ setup.py -@@ -193,9 +193,6 @@ class pil_build_ext(build_ext): - # - # add standard directories +@@ -85,6 +85,7 @@ except ImportError: + from distutils import sysconfig + from distutils.core import Extension, setup + from distutils.command.build_ext import build_ext ++from distutils.command.install import install + + try: + import _tkinter +@@ -147,7 +148,7 @@ class pil_build_ext(build_ext): + add_directory(library_dirs, "/opt/local/lib") + add_directory(include_dirs, "/opt/local/include") - add_directory(library_dirs, "/usr/local/lib") ++# add_directory(library_dirs, "/usr/local/lib") + # FIXME: check /opt/stuff directories here? + + prefix = sysconfig.get_config_var("prefix") +@@ -208,8 +209,8 @@ class pil_build_ext(build_ext): + add_directory(include_dirs, tcl_dir) + + # standard locations +- add_directory(library_dirs, "/usr/local/lib") - add_directory(include_dirs, "/usr/local/include") -- ++# add_directory(library_dirs, "/usr/local/lib") ++# add_directory(include_dirs, "/usr/local/include") + add_directory(library_dirs, "/usr/lib") add_directory(include_dirs, "/usr/include") - -@@ -226,7 +223,7 @@ class pil_build_ext(build_ext): +@@ -243,7 +244,7 @@ class pil_build_ext(build_ext): if find_library_file(self, "tiff"): feature.tiff = "tiff" @@ -21,7 +39,20 @@ $NetBSD: patch-aa,v 1.3 2007/03/23 20:47:58 drochner Exp $ # look for freetype2 include files freetype_version = 0 for dir in self.compiler.include_dirs: -@@ -281,9 +278,10 @@ class pil_build_ext(build_ext): +@@ -264,9 +265,9 @@ class pil_build_ext(build_ext): + if dir: + add_directory(self.compiler.include_dirs, dir, 0) + +- if find_include_file(self, "lcms.h"): +- if find_library_file(self, "lcms"): +- feature.lcms = "lcms" ++# if find_include_file(self, "lcms.h"): ++# if find_library_file(self, "lcms"): ++# feature.lcms = "lcms" + + if _tkinter and find_include_file(self, "tk.h"): + # the library names may vary somewhat (e.g. tcl84 or tcl8.4) +@@ -302,9 +303,10 @@ class pil_build_ext(build_ext): if struct.unpack("h", "\0\1")[0] == 1: defs.append(("WORDS_BIGENDIAN", None)) @@ -35,7 +66,39 @@ $NetBSD: patch-aa,v 1.3 2007/03/23 20:47:58 drochner Exp $ # # additional libraries -@@ -448,10 +446,10 @@ if __name__ == "__main__": +@@ -360,8 +362,8 @@ class pil_build_ext(build_ext): + libraries=[feature.tcl, feature.tk] + )) + +- if os.path.isfile("_imagingmath.c"): +- exts.append(Extension("_imagingmath", ["_imagingmath.c"])) ++# if os.path.isfile("_imagingmath.c"): ++# exts.append(Extension("_imagingmath", ["_imagingmath.c"])) + + self.extensions[:] = exts + +@@ -445,6 +447,10 @@ class pil_build_ext(build_ext): + if m.group(1) < "1.2.3": + return m.group(1) + ++class pkgsrcinstall(install): ++ def initialize_options(self): ++ install.initialize_options(self) ++ self.install_path_file = 0 + # + # build! + +@@ -470,7 +476,8 @@ if __name__ == "__main__": + "Topic :: Multimedia :: Graphics :: Graphics Conversion", + "Topic :: Multimedia :: Graphics :: Viewers", + ], +- cmdclass = {"build_ext": pil_build_ext}, ++ cmdclass = {"build_ext": pil_build_ext, ++ "install": pkgsrcinstall}, + description=DESCRIPTION, + download_url=DOWNLOAD_URL % (NAME, VERSION), + ext_modules = [Extension("_imaging", ["_imaging.c"])], # dummy +@@ -478,10 +485,10 @@ if __name__ == "__main__": license="Python (MIT style)", long_description=DESCRIPTION, name=NAME, |