Update of /cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/sci
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5171

Modified Files:
        plplot.info 
Log Message:
more fixes based on suggestions from Jean-Francois Mertens

Index: plplot.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/sci/plplot.info,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- plplot.info 7 May 2006 00:58:47 -0000       1.12
+++ plplot.info 7 May 2006 20:47:38 -0000       1.13
@@ -1,9 +1,9 @@
 Package: plplot
 Version: 5.6.0
-Revision: 3
+Revision: 4
 Architecture: powerpc
-BuildDepends: readline, gd2, gd2-bin, libjpeg, libpng3, libiconv-dev, x11-dev, 
hdf5, fftw3, system-java14-dev, gcc3.3, aquaterm-dev (>= 1.0.0-2)
-Depends: %N-shlibs (= %v-%r), %N-dev (= %v-%r), tcltk, tcltk-shlibs, python24, 
python, numeric-py24, gd2-shlibs, libjpeg-shlibs, libpng3-shlibs, x11, 
pkgconfig, qhull, system-java14, tcltk-dev, aquaterm (>= 1.0.0-2)
+BuildDepends: readline5, freetype219, libiconv-dev, libncurses5, gd2, gd2-bin, 
libjpeg, libpng3, libiconv-dev, x11-dev, hdf5, fftw3, system-java14-dev, 
gcc3.3, aquaterm-dev (>= 1.0.0-2)
+Depends: %N-shlibs (= %v-%r), %N-dev (= %v-%r), freetype219-shlibs, libiconv, 
tcltk, tcltk-shlibs, python24, python, numeric-py24, gd2-shlibs, 
libjpeg-shlibs, libpng3-shlibs, x11, pkgconfig, qhull, system-java14, 
tcltk-dev, aquaterm (>= 1.0.0-2)
 
 GCC: 3.3
 Source: mirror:sourceforge:plplot/%n-%v.tar.gz
@@ -11,17 +11,24 @@
 
 SetCC: gcc-3.3
 SetCXX: g++-3.3
-#SetCFLAGS: -Wno-long-double
-SetCFLAGS: -Wno-long-double -I%p/include
-SetLDFlags: -L%p/lib -L%p/lib/python2.4/config
 
-ConfigureParams: --mandir=%p/share/man PYTHON_INC_DIR=%p/include/python2.4 
PYTHON=%p/bin/python FREETYPELIBDIR=%p/lib/freetype219/lib 
FREETYPEINCDIR=%p/lib/freetype219/include/freetype2/freetype TCLLIBDIR=%p/lib 
TKLIBDIR=%p/lib GDLIBDIR=%p/lib GDINCDIR=%p/include 
JAVA_HOME=/Library/Java/Home --with-pkg-config --without-rpath 
--build=powerpc-apple-darwin --without-prebuiltdoc --disable-f77 
--disable-wxwidgets --disable-octave --disable-gcw
-#ConfigureParams: --mandir=%p/share/man FREETYPELIBDIR=/usr/X11R6/lib 
FREETYPEINCDIR=/usr/X11R6/include/freetype2 GDLIBDIR=%p/lib GDINCDIR=%p/include 
TCLLIBDIR=%p/lib TKLIBDIR=%p/lib JAVA_HOME=/Library/Java/Home --with-pkg-config 
--without-rpath --build=powerpc-apple-darwin
+SetCFLAGS: -Wno-long-double
+SetLDFlags: -L%p/lib/python2.4/config
 
-#CompileScript: <<
-#   ./configure %c 
- #  make FREETYPEINCCMD="`freetype-config --cflags`"
-#<<
+PatchScript: <<
+ perl -pi -e 's,head \-5,head -n5,' bindings/octave/Makefile*
+ perl -pi -e 's,qhull\/qhull_a.h,\%p\/include\/qhull\/qhull_a.h,' 
lib/nn/delaunay.c src/plgridd.c
+ perl -pi -e 's,aquaterm\/AQTAdapter.h,\%p\/include\/aquaterm\/AQTAdapter.h,' 
drivers/aqt.c
+<<
+
+ConfigureParams: --mandir=%p/share/man 
--with-python-incdir=%p/include/python2.4 
--with-freetype2-libdir=%p/lib/freetype219/lib 
--with-freetype2-incdir=%p/lib/freetype219/include/freetype2 
--with-freetype-font-dir=/usr/X11R6/lib/X11/fonts --with-gd-libdir=%p/lib 
--with-gd-incdir=%p/include --with-java-home=/Library/Java/Home 
--with-pkg-config --without-rpath --build=powerpc-apple-darwin TCLLIBDIR=%p/lib 
TKLIBDIR=%p/lib AQTINCDIR=%p/include/aquaterm --disable-f77 --disable-gcw 
--disable-wxwidgets --disable-octave
+
+CompileScript: <<
+ #!/bin/sh -ex
+ export CPATH=%p/lib/freetype219/include
+ ./configure %c
+ make
+<<
 
 InstallScript: <<
   make install DESTDIR=%d
@@ -33,6 +40,7 @@
 
 SplitOff: <<
    Package: %N-shlibs
+   Depends: freetype219-shlibs, tcltk-shlibs
    Files: <<
       lib/libcsironn.0.0.1.dylib
       lib/libcsironn.0.dylib
@@ -99,8 +107,7 @@
 DescPackaging: <<
 Many thanks to the PLplot folks for helping with packaging. F77 and octave
 support is disabled in this version. This may be fixed in an upcoming
-upstream version. Some paths are added to the LDFLAGS to make sure 
-plplot can find them.
+upstream version.
 
 Depends on plplot-dev and tcltk-dev because these are needed during 
 runtime.



_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

Reply via email to