- Update to 1.1.5

PR:		ports/82327
Submitted by:	Geoffrey Mainland <mainland@apeiron.net>

1 files changed, 27 insertions, 48 deletions

diff --git a/graphics/py-imaging/files/patch-setup.py b/graphics/py-imaging/files/patch-setup.py
index 8c341248cddf..07da8616be1c 100644
--- a/graphics/py-imaging/files/patch-setup.py
+++ b/graphics/py-imaging/files/patch-setup.py
@@ -1,51 +1,30 @@
---- ../setup.py.orig	Fri May  9 05:00:56 2003
-+++ ../setup.py	Wed Aug  6 10:40:45 2003
-@@ -51,6 +51,9 @@
- if os.path.exists('/sw/lib'):
-     LIBRARY_DIRS.append('/sw/lib')
+--- ./setup.py	Wed Mar 23 13:16:40 2005
++++ ./setup.py	Thu Jun 16 13:24:28 2005
+@@ -129,14 +129,25 @@
  
-+INCLUDE_DIRS.append(os.path.join(os.getenv("PREFIX"), "include"))
-+LIBRARY_DIRS.append(os.path.join(os.getenv("PREFIX"), "lib"))
-+
- HAVE_LIBJPEG = 0
- HAVE_LIBTIFF = 0
- HAVE_LIBZ = 0
-@@ -126,7 +129,13 @@
-     pass
- else:
-     INCLUDE_DIRS = ["libImaging"]
-+    INCLUDE_DIRS.append(os.path.join(os.getenv("X11BASE"), "include"))
-+    INCLUDE_DIRS.append(os.path.join(os.getenv("PREFIX"),
-+									 "include/tcl%s" % TCL_VERSION))
-+    INCLUDE_DIRS.append(os.path.join(os.getenv("PREFIX"),
-+									 "include/tk%s" % TCL_VERSION))
-     LIBRARY_DIRS = ["libImaging"]
-+    LIBRARY_DIRS.append(os.path.join(os.getenv("PREFIX"), "lib"))
-     LIBRARIES = ["Imaging"]
-     EXTRA_COMPILE_ARGS = None
-     EXTRA_LINK_ARGS = None
-@@ -206,7 +215,8 @@
+         prefix = sysconfig.get_config_var("prefix")
+         if prefix:
+-            add_directory(library_dirs, os.path.join(prefix, "lib"))
+-            add_directory(include_dirs, os.path.join(prefix, "include"))
++            add_directory(library_dirs,
++                          os.path.join(os.getenv("PREFIX"), "lib"))
++            add_directory(include_dirs,
++                          os.path.join(os.getenv("PREFIX"), "include"))
++            add_directory(include_dirs,
++                          os.path.join(os.getenv("X11BASE"), "include"))
  
-         if not tk_framework_found:
-             # assume the libraries are installed in the default location
--            LIBRARIES.extend(["tk" + TCL_VERSION, "tcl" + TCL_VERSION])
-+            version = TCL_VERSION[0] + TCL_VERSION[2]
-+            LIBRARIES.extend(["tk" + version, "tcl" + version])
-             HAVE_TCLTK = 1
+         #
+         # locate tkinter libraries
  
-     if HAVE_TCLTK:
-@@ -266,6 +276,14 @@
-         # FIXME: search for libraries
-         LIBRARIES.append("freetype")
-         INCLUDE_DIRS.append("/usr/include/freetype2")
-+    elif os.path.isdir("/usr/local/include/freetype2"):
-+        # assume that the freetype library is installed in a
-+        # standard location
-+        # FIXME: search for libraries
-+        LIBRARIES.append("freetype")
-+        INCLUDE_DIRS.append("/usr/local/include")
-+        INCLUDE_DIRS.append("/usr/local/include/freetype2")
-+        LIBRARY_DIRS.append("/usr/local/lib")
-     elif os.path.isdir("/sw/include/freetype2"):
-         # assume that the freetype library is installed in a
-         # standard location
+         if _tkinter:
+             TCL_VERSION = _tkinter.TCL_VERSION[:3]
++            TK_VERSION = _tkinter.TK_VERSION[:3]
++            add_directory(include_dirs,
++                          os.path.join(os.getenv("PREFIX"),
++                                       "include/tcl%s" % TCL_VERSION))
++            add_directory(include_dirs,
++                          os.path.join(os.getenv("PREFIX"),
++                                       "include/tk%s" % TK_VERSION))
+ 
+         if _tkinter and not TCL_ROOT:
+             # we have Tkinter but the TCL_ROOT variable was not set;