@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2010/12/23 11:44:44 dsainty Exp $
+# $NetBSD: Makefile,v 1.39 2011/01/03 12:17:30 adam Exp $
DISTNAME= Imaging-1.1.7
PKGNAME= ${PYPKGPREFIX}-imaging-1.1.7
@@ -16,13 +16,12 @@
PYDISTUTILSPKG= yes
PY_PATCHPLIST= yes
-FREETYPE_ROOT= "${BUILDLINK_PREFIX.freetype2}/lib","${BUILDLINK_PREFIX.freetype2}/include"
-
-SUBST_CLASSES= ft2
-SUBST_SED.ft2= -e "s;FREETYPE_ROOT = None;FREETYPE_ROOT = ${FREETYPE_ROOT:Q};"
-SUBST_FILES.ft2= setup.py
-SUBST_MESSAGE.ft2= Fixing path to freetype2.
-SUBST_STAGE.ft2= pre-configure
+SUBST_CLASSES= fix-path
+SUBST_MESSAGE.fix-path= Fixing paths.
+SUBST_STAGE.fix-path= pre-configure
+SUBST_FILES.fix-path= setup.py
+SUBST_SED.fix-path= -e 's,/usr/local,${PREFIX},'
+SUBST_SED.fix-path+= -e 's,FREETYPE_ROOT = None,FREETYPE_ROOT = libinclude("${BUILDLINK_PREFIX.freetype2}"),'
INSTALLATION_DIRS= ${PYINC}/PIL
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.13 2010/07/19 17:45:02 drochner Exp $
+$NetBSD: distinfo,v 1.14 2011/01/03 12:17:30 adam Exp $
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-ab) = 563eff2d51db778711946734871f790643851086
+SHA1 (patch-ab) = 4d6b80cf6792c860baf7650b22263c441f057c89
SHA1 (patch-ac) = 2ad2a988c7fdddb34812959ddfd60442282a48ea
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.6 2009/12/11 21:37:31 drochner Exp $
+$NetBSD: patch-ab,v 1.7 2011/01/03 12:17:31 adam Exp $
--- setup.py.orig 2009-11-15 17:06:10.000000000 +0100
+++ setup.py
@@ -14,26 +14,15 @@
def add_directory(path, dir, where=None):
if dir and os.path.isdir(dir) and dir not in path:
-@@ -147,7 +144,7 @@ class pil_build_ext(build_ext):
- add_directory(library_dirs, "/opt/local/lib")
- add_directory(include_dirs, "/opt/local/include")
+@@ -331,7 +328,7 @@ class pil_build_ext(build_ext):
+ "_imagingcms", ["_imagingcms.c"], libraries=["lcms"] + extra
+ ))
-- 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 +205,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")
+- if sys.platform == "darwin":
++ if _tkinter and sys.platform == "darwin":
+ # locate Tcl/Tk frameworks
+ frameworks = []
+ framework_roots = [
@@ -481,7 +478,7 @@ if __name__ == "__main__":
package_dir={"": "PIL"},
packages=[""],