Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/graphics
In directory vz-cvs-3.sog:/tmp/cvs-serv24560/stable/main/finkinfo/graphics

Modified Files:
        asymptote.info 
Added Files:
        pil-systempython.info pil-systempython.patch 
Log Message:
Update asymptote to 2.15. Move to stable. Update pil-systempython, too.



Index: asymptote.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/stable/main/finkinfo/graphics/asymptote.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- asymptote.info      21 Sep 2009 05:16:57 -0000      1.3
+++ asymptote.info      28 Apr 2012 12:00:59 -0000      1.4
@@ -1,21 +1,35 @@
 Package: asymptote
-Version: 1.42
+Version: 2.15
 Revision: 1
 Source: mirror:sourceforge:%n/%n-%v.src.tgz
-Source-MD5: d852054eac10f81f60bcc899bf8e1069
+Source-MD5: 1adb969a4d7b17a3ae98728d1956bd77
 SourceDirectory: %n-%v
 License: GPL
-BuildDepends: readline5, libncurses5, fftw3, gc, gsl, tetex-base
-Depends: readline5-shlibs, libncurses5-shlibs, fftw3-shlibs, gc-shlibs, 
gsl-shlibs
+BuildDepends: libsigsegv2, readline5, libncurses5, fftw3, gc, gsl, texlive-base
+Depends: libsigsegv2-shlibs, readline5-shlibs, libncurses5-shlibs, 
fftw3-shlibs, gc-shlibs, gsl-shlibs, movie15, pil-systempython25
 SetCFLAGS: -Os
+PatchScript: <<
+ perl -pi -e "s|import 
getopt,sys,signal|$&\nsys.path[1]='%p/Library/Python/2.5/site-packages/PIL'|" 
GUI/xasy.py
+ perl -pi -e 's|\-\-no\-var\-tracking||' configure
+<<
+InfoTest: <<
+    TestScript: make check || exit 2
+<<
 CompileScript: <<
- ./configure %c --mandir=%p/share/man --enable-gc=system 
--with-latex=%p/etc/texmf.local/tex/latex
+#!/bin/sh -ev
+ ./configure %c --mandir=%p/share/man --enable-gc=system 
--with-latex=%p/etc/texmf.local/tex/latex 
-with-context=%p/etc/texmf.local/tex/context
  make all
 <<
 InstallScript: <<
+#!/bin/sh -ev
  make install DESTDIR=%d
+ # rescue the info file from subdirectory
+ mv %i/share/info/asymptote/asymptote.info %i/share/info/
+ rmdir %i/share/info/asymptote
+ perl -pi -e 's|asymptote/asymptote|asymptote|' %i/share/info/asymptote.info
 <<
-DocFiles: README LICENSE
+DocFiles: README LICENSE ChangeLog ReleaseNotes
+InfoDocs: asy-faq.info asymptote.info
 PostInstScript:  if [ -f %p/bin/mktexlsr ]; then %p/bin/mktexlsr 
%p/etc/texmf.local; fi
 PostRmScript:    if [ -f %p/bin/mktexlsr ]; then %p/bin/mktexlsr 
%p/etc/texmf.local; fi
 Description: Script-based vector graphics language
@@ -26,12 +40,26 @@
  typesetting that LaTeX does for scientific text.
 <<
 DescUsage: <<
- The GUI "xasy" is a Python script. It runs with whatever "python"
- executable comes first in your PATH. It works both with the 
- system python (using aqua graphics) and with Fink's python
- (using X11 graphics), so you can choose which one you want to 
- use, by either manipulating your PATH, or by simply installing
- or uninstalling Fink's "python" package.  
+ The GUI "xasy" is a Python script. 
+ It runs with whatever "python" executable comes first in your PATH. 
+ It works both with the system python (using aqua graphics, 
+ better-looking but not-quite functional) and with Fink's python 
+ (using X11 graphics, ugly but better-working). 
+ So you can choose which one you want to 
+ use, by either manipulating your PATH, for example running
+ 
+   env PATH=/usr/bin:$PATH xasy
+ 
+ for aqua graphics, 
+ or by simply installing or uninstalling Fink's "python" package.  
+<<
+DescPort: <<
+ This version uses the system OpenGL and GLUT frameworks for 3D effects.
+ It also uses the movie15 latex style.
+
+ The xasy python script now crashes if it does not find the PIL library. 
+ We depend therefore on pil-systempython25. This seems to work with both
+ the system python and Fink's python2.5 to python2.7.
 <<
 Maintainer: Martin Costabel <costa...@wanadoo.fr>
 Homepage: http://asymptote.sourceforge.net

--- NEW FILE: pil-systempython.info ---
Info2: <<
Package: pil-systempython%type_pkg[python]
Type: python (2.5 2.6 2.7)
Distribution: (%type_pkg[python] = 26) 10.6, (%type_pkg[python] = 26) 10.7, 
(%type_pkg[python] = 27) 10.7
Version: 1.1.7
Revision: 5
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.
<<
Source: http://effbot.org/downloads/Imaging-%v.tar.gz
Source-MD5: fc14a54e1ce02a0225be8854bfba478e
BuildDepends: lcms, libpng15, libjpeg8, freetype219, fink (>=0.30)
Depends: lcms-shlibs, libpng15-shlibs, libjpeg8-shlibs, freetype219-shlibs
NoSetCPPFLAGS: true
NoSetLDFLAGS: true
Replaces: pil, pil-systempython25, pil-systempython26, pil-systempython27
Provides: pil
PatchFile: %{ni}.patch
PatchFile-MD5: d4940dfb66a0168b61eb0c33dea352e5
PatchScript: <<
  sed 's|@PREFIX@|%p|g' < %{PatchFile} | patch -p1
<<
CompileScript: <<
 ARCHFLAGS=" " /usr/bin/python%type_raw[python] setup.py build
<<
InstallScript: <<
 #!/bin/sh -ev
 /usr/bin/python%type_raw[python] setup.py install --prefix=%p --root=%d 
--install-purelib=%p/Library/Python/%type_raw[python]/site-packages 
--install-platlib=%p/Library/Python/%type_raw[python]/site-packages
 mkdir -p %i/share/doc/%n
 cp -R Docs/ %i/share/doc/%n/html
 cp -R Scripts %i/share/doc/%n
 mkdir -p 
%i/Library/Python/%type_raw[python]/include/python%type_raw[python]/PIL
 cp -f libImaging/ImPlatform.h libImaging/Imaging.h 
%i/Library/Python/%type_raw[python]/include/python%type_raw[python]/PIL
<<
InfoTest: <<
    TestScript: <<
        #!/bin/bash -ev
        export PYTHONPATH=`ls -d %b/build/lib*`
        /usr/bin/python selftest.py || exit 2
    <<
<<
DocFiles: CHANGES BUILDME CONTENTS README
DescUsage: <<
 If you want to load PIL modules with commands like

 from PIL import Image

 you have to set the environment variable PYTHONPATH
 (or from inside python, the variable sys.path[1]) to

 %p/Library/Python/%type_raw[python]/site-packages
 
 If, however,  you want to run a script that uses only

 import Image

 then you need to set PYTHONPATH to
 %p/Library/Python/%type_raw[python]/site-packages/PIL:$PYTHONPATH
<<
License: OSI-Approved
Homepage: http://www.pythonware.com/products/pil
Maintainer: Martin Costabel <costa...@users.sourceforge.net>
<<


--- NEW FILE: pil-systempython.patch ---
diff -ur Imaging-1.1.7/setup.py Imaging-1.1.7_corr/setup.py
--- Imaging-1.1.7/setup.py      2009-11-15 17:06:10.000000000 +0100
+++ Imaging-1.1.7_corr/setup.py 2011-09-07 13:59:32.000000000 +0200
@@ -137,23 +137,12 @@
                 ))
 
         elif sys.platform == "darwin":
-            # attempt to make sure we pick freetype2 over other versions
-            add_directory(include_dirs, "/sw/include/freetype2")
-            add_directory(include_dirs, "/sw/lib/freetype2/include")
             # fink installation directories
-            add_directory(library_dirs, "/sw/lib")
-            add_directory(include_dirs, "/sw/include")
-            # darwin ports installation directories
-            add_directory(library_dirs, "/opt/local/lib")
-            add_directory(include_dirs, "/opt/local/include")
+            add_directory(library_dirs, "@PREFIX@/lib")
+            add_directory(include_dirs, "@PREFIX@/include")
 
-        add_directory(library_dirs, "/usr/local/lib")
         # FIXME: check /opt/stuff directories here?
 
-        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"))
 
         #
         # locate tkinter libraries
@@ -208,8 +197,11 @@
                 add_directory(include_dirs, tcl_dir)
 
         # standard locations
-        add_directory(library_dirs, "/usr/local/lib")
-        add_directory(include_dirs, "/usr/local/include")
+
+        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, "/usr/lib")
         add_directory(include_dirs, "/usr/include")
@@ -262,7 +254,7 @@
                 feature.freetype = "freetype"
                 feature.freetype_version = freetype_version
                 if dir:
-                    add_directory(self.compiler.include_dirs, dir, 0)
+                    add_directory(self.compiler.include_dirs, dir, 1)
 
         if find_include_file(self, "lcms.h"):
             if find_library_file(self, "lcms"):
@@ -335,7 +327,6 @@
             # locate Tcl/Tk frameworks
             frameworks = []
             framework_roots = [
-                "/Library/Frameworks",
                 "/System/Library/Frameworks"
                 ]
             for root in framework_roots:


------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to