Update of /cvsroot/fink/dists/10.3/unstable/main/finkinfo/graphics
In directory sc8-pr-cvs1:/tmp/cvs-serv14174

Added Files:
        pil-py22.info pil-py22.patch pil-py23.info pil-py23.patch 
Removed Files:
        pil-1.1.2-24.info pil-1.1.2-24.patch 
Log Message:
Proper pil pkgs


--- NEW FILE: pil-py22.info ---
Package: pil-py22
Version: 1.1.4
Revision: 23
Description: Python Imaging Library
DescDetail: <<
The Python Imaging Library (PIL) adds image processing capabilities to
your Python interpreter. This library supports many file formats, and
provides powerful image processing and graphics capabilities.
<<
DescPort: <<
 tk 8.4 not supported, needs a patch to tkImaging.c to compile.
 lots of patches to help it find fink installed libs and headers.
<<
Source: http://effbot.org/downloads/Imaging-%v.tar.gz
Source-MD5: d2c03c25a9a0128832137dd536da88da
BuildDepends: tcltk-dev (>= 8.4.1-1) , libpng3, libjpeg
Depends: python22, tcltk (>= 8.4.1-1), libpng3-shlibs, libjpeg-shlibs
Replaces: pil
Provides: pil
GCC: 3.3
PatchScript: sed 's|@PREFIX@|%p|g' < %a/%n.patch | patch -p1
CompileScript: <<
 (cd libImaging; ./configure %c; make)
 (export CPPFLAGS=""; python2.2 setup.py build)
<<
InstallScript: <<
 #!/bin/sh
 python2.2 setup.py install --prefix=%i
 mkdir -p %i/share/doc/%n
 cp -R Doc/ %i/share/doc/%n/html
 cp -R Scripts %i/share/doc/%n
 cd libImaging
 mkdir -p %i/include/python2.2/PIL
 cp -f ImConfig.h ImPlatform.h Imaging.h %i/include/python2.2/PIL
<<
DocFiles: CHANGES-114 BUILDME CONTENTS README
License: OSI-Approved
Homepage: http://www.pythonware.com/products/pil
Maintainer: Jeffrey Whitaker <[EMAIL PROTECTED]>

--- NEW FILE: pil-py22.patch ---
--- Imaging-1.1.4/libImaging/Makefile.in.orig   Fri Dec 13 05:50:30 2002
+++ Imaging-1.1.4/libImaging/Makefile.in        Fri Dec 13 05:51:31 2002
@@ -24,7 +24,7 @@
 
 DEFS=          @DEFS@
 
-LIBS=          @LIBS@ @LIBM@
+LIBS=          $(LDFLAGS) @LIBS@ @LIBM@
 
 # --------------------------------------------------------------------
 # Other things that are customizable but not by configure
--- Imaging/PIL/Image.py.orig   Wed May  7 06:59:10 2003
+++ Imaging/PIL/Image.py        Wed May  7 07:00:16 2003
@@ -1716,7 +1716,7 @@
         format = "BMP"
         if not command:
             command = "start"
-    elif os.environ.get("OSTYPE") == "darwin":
+    elif sys.platform == "darwin":
         format = "JPEG"
         if not command:
             command = "open -a /Applications/Preview.app"
@@ -1742,7 +1742,7 @@
     if os.name == "nt":
         os.system("%s %s" % (command, file))
         # FIXME: this leaves temporary files around...
-    elif os.environ.get("OSTYPE") == "darwin":
+    elif sys.platform == "darwin":
         # on darwin open returns immediately resulting in the temp
         # file removal while app is opening
         os.system("(%s %s; sleep 20; rm -f %s)&" % (command, file, file))
--- Imaging-1.1.4/setup.py.orig Fri Dec 13 06:06:28 2002
+++ Imaging-1.1.4/setup.py      Fri Dec 13 06:09:38 2002
@@ -30,7 +30,7 @@
 # on Windows, the following is used to control how and where to search
 # for Tcl/Tk files.  None enables automatic searching; to override, set
 # this to a directory name.
-TCLROOT = None
+TCLROOT = "@PREFIX@"
 
 from PIL.Image import VERSION
 
@@ -46,10 +46,10 @@
 LIBRARIES = ["Imaging"]
 
 # Add some standard search spots for MacOSX/darwin
-if os.path.exists('/sw/include'):
-    INCLUDE_DIRS.append('/sw/include')
-if os.path.exists('/sw/lib'):
-    LIBRARY_DIRS.append('/sw/lib')
+if os.path.exists('@PREFIX@/include'):
+    INCLUDE_DIRS.append('@PREFIX@/include')
+if os.path.exists('@PREFIX@/lib'):
+    LIBRARY_DIRS.append('@PREFIX@/lib')
 
 HAVE_LIBJPEG = 0
 HAVE_LIBTIFF = 0
@@ -63,6 +63,8 @@
         lib = m.group(1)
         if lib == "JPEG":
             HAVE_LIBJPEG = 1
+            INCLUDE_DIRS.append("@PREFIX@/include")
+            LIBRARY_DIRS.append("@PREFIX@/lib")
             if sys.platform == "win32":
                 LIBRARIES.append("jpeg")
                 INCLUDE_DIRS.append(JPEGDIR)
@@ -71,6 +73,8 @@
                 LIBRARIES.append("jpeg")
         elif lib == "TIFF":
             HAVE_LIBTIFF = 1
+            INCLUDE_DIRS.append("@PREFIX@/include")
+            LIBRARY_DIRS.append("@PREFIX@/lib")
             LIBRARIES.append("tiff")
         elif lib == "Z":
             HAVE_LIBZ = 1
@@ -204,10 +208,15 @@
                 EXTRA_LINK_ARGS = frameworks
                 HAVE_TCLTK = 1
 
+        tk_framework_found = 0
         if not tk_framework_found:
             # assume the libraries are installed in the default location
             LIBRARIES.extend(["tk" + TCL_VERSION, "tcl" + TCL_VERSION])
             HAVE_TCLTK = 1
+            INCLUDE_DIRS.append(os.path.join(TCLROOT, "include"))
+            LIBRARY_DIRS.append(os.path.join(TCLROOT, "lib"))
+            INCLUDE_DIRS.append("/usr/X11R6/include")
+            LIBRARY_DIRS.append("/usr/X11R6/lib")
 
     if HAVE_TCLTK:
         MODULES.append(
@@ -266,13 +275,13 @@
         # FIXME: search for libraries
         LIBRARIES.append("freetype")
         INCLUDE_DIRS.append("/usr/include/freetype2")
-    elif os.path.isdir("/sw/include/freetype2"):
+    elif os.path.isdir("@PREFIX@/include/freetype2"):
         # assume that the freetype library is installed in a
         # standard location
         # FIXME: search for libraries
         LIBRARIES.append("freetype")
-        INCLUDE_DIRS.append("/sw/include/freetype2")
-        LIBRARY_DIRS.append("/sw/lib")
+        INCLUDE_DIRS.append("@PREFIX@/include/freetype2")
+        LIBRARY_DIRS.append("@PREFIX@/lib")
     else:
         have_freetype = 0
 

--- NEW FILE: pil-py23.info ---
Package: pil-py23
Version: 1.1.4
Revision: 23
Description: Python Imaging Library
DescDetail: <<
The Python Imaging Library (PIL) adds image processing capabilities to
your Python interpreter. This library supports many file formats, and
provides powerful image processing and graphics capabilities.
<<
DescPort: <<
 tk 8.4 not supported, needs a patch to tkImaging.c to compile.
 lots of patches to help it find fink installed libs and headers.
<<
Source: http://effbot.org/downloads/Imaging-%v.tar.gz
Source-MD5: d2c03c25a9a0128832137dd536da88da
BuildDepends: tcltk-dev (>= 8.4.1-1) , libpng3, libjpeg
Depends: python23, tcltk (>= 8.4.1-1), libpng3-shlibs, libjpeg-shlibs
Replaces: pil
Provides: pil
GCC: 3.3
PatchScript: sed 's|@PREFIX@|%p|g' < %a/%n.patch | patch -p1
CompileScript: <<
 (cd libImaging; ./configure %c; make)
 (export CPPFLAGS=""; python2.3 setup.py build)
<<
InstallScript: <<
 #!/bin/sh
 python2.3 setup.py install --prefix=%i
 mkdir -p %i/share/doc/%n
 cp -R Doc/ %i/share/doc/%n/html
 cp -R Scripts %i/share/doc/%n
 cd libImaging
 mkdir -p %i/include/python2.3/PIL
 cp -f ImConfig.h ImPlatform.h Imaging.h %i/include/python2.3/PIL
<<
DocFiles: CHANGES-114 BUILDME CONTENTS README
License: OSI-Approved
Homepage: http://www.pythonware.com/products/pil
Maintainer: Jeffrey Whitaker <[EMAIL PROTECTED]>

--- NEW FILE: pil-py23.patch ---
--- Imaging-1.1.4/libImaging/Makefile.in.orig   Fri Dec 13 05:50:30 2002
+++ Imaging-1.1.4/libImaging/Makefile.in        Fri Dec 13 05:51:31 2002
@@ -24,7 +24,7 @@
 
 DEFS=          @DEFS@
 
-LIBS=          @LIBS@ @LIBM@
+LIBS=          $(LDFLAGS) @LIBS@ @LIBM@
 
 # --------------------------------------------------------------------
 # Other things that are customizable but not by configure
--- Imaging/PIL/Image.py.orig   Wed May  7 06:59:10 2003
+++ Imaging/PIL/Image.py        Wed May  7 07:00:16 2003
@@ -1716,7 +1716,7 @@
         format = "BMP"
         if not command:
             command = "start"
-    elif os.environ.get("OSTYPE") == "darwin":
+    elif sys.platform == "darwin":
         format = "JPEG"
         if not command:
             command = "open -a /Applications/Preview.app"
@@ -1742,7 +1742,7 @@
     if os.name == "nt":
         os.system("%s %s" % (command, file))
         # FIXME: this leaves temporary files around...
-    elif os.environ.get("OSTYPE") == "darwin":
+    elif sys.platform == "darwin":
         # on darwin open returns immediately resulting in the temp
         # file removal while app is opening
         os.system("(%s %s; sleep 20; rm -f %s)&" % (command, file, file))
--- Imaging-1.1.4/setup.py.orig Fri Dec 13 06:06:28 2002
+++ Imaging-1.1.4/setup.py      Fri Dec 13 06:09:38 2002
@@ -30,7 +30,7 @@
 # on Windows, the following is used to control how and where to search
 # for Tcl/Tk files.  None enables automatic searching; to override, set
 # this to a directory name.
-TCLROOT = None
+TCLROOT = "@PREFIX@"
 
 from PIL.Image import VERSION
 
@@ -46,10 +46,10 @@
 LIBRARIES = ["Imaging"]
 
 # Add some standard search spots for MacOSX/darwin
-if os.path.exists('/sw/include'):
-    INCLUDE_DIRS.append('/sw/include')
-if os.path.exists('/sw/lib'):
-    LIBRARY_DIRS.append('/sw/lib')
+if os.path.exists('@PREFIX@/include'):
+    INCLUDE_DIRS.append('@PREFIX@/include')
+if os.path.exists('@PREFIX@/lib'):
+    LIBRARY_DIRS.append('@PREFIX@/lib')
 
 HAVE_LIBJPEG = 0
 HAVE_LIBTIFF = 0
@@ -63,6 +63,8 @@
         lib = m.group(1)
         if lib == "JPEG":
             HAVE_LIBJPEG = 1
+            INCLUDE_DIRS.append("@PREFIX@/include")
+            LIBRARY_DIRS.append("@PREFIX@/lib")
             if sys.platform == "win32":
                 LIBRARIES.append("jpeg")
                 INCLUDE_DIRS.append(JPEGDIR)
@@ -71,6 +73,8 @@
                 LIBRARIES.append("jpeg")
         elif lib == "TIFF":
             HAVE_LIBTIFF = 1
+            INCLUDE_DIRS.append("@PREFIX@/include")
+            LIBRARY_DIRS.append("@PREFIX@/lib")
             LIBRARIES.append("tiff")
         elif lib == "Z":
             HAVE_LIBZ = 1
@@ -204,10 +208,15 @@
                 EXTRA_LINK_ARGS = frameworks
                 HAVE_TCLTK = 1
 
+        tk_framework_found = 0
         if not tk_framework_found:
             # assume the libraries are installed in the default location
             LIBRARIES.extend(["tk" + TCL_VERSION, "tcl" + TCL_VERSION])
             HAVE_TCLTK = 1
+            INCLUDE_DIRS.append(os.path.join(TCLROOT, "include"))
+            LIBRARY_DIRS.append(os.path.join(TCLROOT, "lib"))
+            INCLUDE_DIRS.append("/usr/X11R6/include")
+            LIBRARY_DIRS.append("/usr/X11R6/lib")
 
     if HAVE_TCLTK:
         MODULES.append(
@@ -266,13 +275,13 @@
         # FIXME: search for libraries
         LIBRARIES.append("freetype")
         INCLUDE_DIRS.append("/usr/include/freetype2")
-    elif os.path.isdir("/sw/include/freetype2"):
+    elif os.path.isdir("@PREFIX@/include/freetype2"):
         # assume that the freetype library is installed in a
         # standard location
         # FIXME: search for libraries
         LIBRARIES.append("freetype")
-        INCLUDE_DIRS.append("/sw/include/freetype2")
-        LIBRARY_DIRS.append("/sw/lib")
+        INCLUDE_DIRS.append("@PREFIX@/include/freetype2")
+        LIBRARY_DIRS.append("@PREFIX@/lib")
     else:
         have_freetype = 0
 

--- pil-1.1.2-24.info DELETED ---

--- pil-1.1.2-24.patch DELETED ---




-------------------------------------------------------
This SF.net email is sponsored by: The SF.net Donation Program.
Do you like what SourceForge.net is doing for the Open
Source Community?  Make a contribution, and help us add new
features and functionality. Click here: http://sourceforge.net/donate/
_______________________________________________
Fink-commits mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/fink-commits

Reply via email to