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

Modified Files:
      Tag: pangocairo-branch
        gnuplot.info 
Log Message:
build fixes, dep update

Index: gnuplot.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/gnuplot.info,v
retrieving revision 1.4.2.10
retrieving revision 1.4.2.11
diff -u -d -r1.4.2.10 -r1.4.2.11
--- gnuplot.info        29 Apr 2008 00:19:11 -0000      1.4.2.10
+++ gnuplot.info        2 May 2008 17:15:32 -0000       1.4.2.11
@@ -1,28 +1,60 @@
 Info2: <<
 Package: gnuplot%type_pkg[-nox]
 Version: 4.2.3
-Revision: 2
+Revision: 12
 Type: -nox (boolean)
 Maintainer: Alexander Hansen <[EMAIL PROTECTED]>
-BuildConflicts: ccache-default
 Conflicts: gnuplot, gnuplot-nox
 Replaces: gnuplot, gnuplot-nox
-Depends: << 
-libpng3-shlibs,
-texinfo,
-aquaterm, aquaterm-shlibs,
-readline5-shlibs,
-pdflib6-shlibs,
-(%type_raw[-nox] != -nox) x11, 
-ncurses, libncurses5-shlibs, 
-(%type_raw[-nox] != -nox) gd2-shlibs, 
-libjpeg-shlibs, 
-(%type_raw[-nox] = -nox) freetype219-shlibs,
-(%type_raw[-nox] != -nox) app-defaults, 
-(%type_raw[-nox] != -nox) plotutils-shlibs, 
-(%type_raw[-nox] != -nox) plotutils
+Depends: <<
+       (%type_raw[-nox] != -nox) app-defaults,
+       aquaterm,
+       (%type_raw[-nox] != -nox) atk1-shlibs,
+       (%type_raw[-nox] != -nox) cairo-shlibs,
+       (%type_raw[-nox] != -nox) fontconfig2-shlibs,
+       freetype219-shlibs,
+       (%type_raw[-nox] != -nox) gd2-shlibs,
+       (%type_raw[-nox] != -nox) glib2-shlibs,
+       (%type_raw[-nox] != -nox) gtk+2-shlibs,
+       (%type_raw[-nox] != -nox) libgettext3-shlibs,
+       (%type_raw[-nox] != -nox) libggi2,
+       libiconv,
+       libjpeg-shlibs,
+       libncurses5-shlibs,
+       libpng3-shlibs,
+       ncurses,
+       (%type_raw[-nox] != -nox) pango1-xft2-ft219-shlibs,
+       pdflib6-shlibs,
+       (%type_raw[-nox] != -nox) plotutils,
+       readline5-shlibs,
+       texinfo,
+       (%type_raw[-nox] != -nox) wxgtk2.8-shlibs,
+       (%type_raw[-nox] != -nox) x11
+<<
+BuildDepends: <<
+       aquaterm-dev,
+       (%type_raw[-nox] != -nox) atk1,
+       (%type_raw[-nox] != -nox) cairo,
+       fink (>= 0.24.12),
+       (%type_raw[-nox] != -nox) fontconfig2-dev,
+       freetype219,
+       (%type_raw[-nox] != -nox) gd2,
+       (%type_raw[-nox] = -nox) gd2-nox,
+       (%type_raw[-nox] != -nox) glib2-dev,
+       (%type_raw[-nox] != -nox) gtk+2-dev,
+       (%type_raw[-nox] != -nox) libgettext3-dev,
+       (%type_raw[-nox] != -nox) libggi2-dev,
+       libiconv-dev,
+       libjpeg,
+       libncurses5,
+       libpng3,
+       (%type_raw[-nox] != -nox) pango1-xft2-ft219-dev,
+       pdflib6,
+       (%type_raw[-nox] != -nox) plotutils-dev,
+       readline5,
+       (%type_raw[-nox] != -nox) wxgtk2.8,
+       (%type_raw[-nox] != -nox) x11-dev
 <<
-BuildDepends: libpng3, pdflib6, readline5, libncurses5, (%type_raw[-nox] != 
-nox) x11-dev, aquaterm-dev, (%type_raw[-nox] != -nox) gd2, (%type_raw[-nox] = 
-nox) gd2-nox, libjpeg, libiconv-dev, fink (>= 0.24.12), (%type_raw[-nox] = 
-nox) freetype219, plotutils-dev 
 GCC: 4.0
 Source: mirror:sourceforge:%{ni}/%{ni}-%v.tar.gz
 Source-MD5: 6b6d22662df5101b308c465a722c43ce
@@ -32,10 +64,25 @@
   perl -pi -e 's/\bClass\b/GP_Class/g' `find src -name \*.c -o -name \*.cpp -o 
-name \*.h`
   sed -e 's,@FINKPREFIX@,%p,g' %{PatchFile} | patch -p1 
 <<
-ConfigureParams: --mandir='${prefix}/share/man'  --libexecdir='${prefix}/lib' 
--infodir='${prefix}/share/info' --with-readline=gnu (%type_raw[-nox] = -nox) 
--without-x --disable-dependency-tracking --without-tutorial --with-plot=%p 
--disable-wxwidgets
-#TODO
-# See about getting wx terminal support working
-#PKG_CONFIG_PATH="%p/lib/pango-ft219/lib/pkgconfig:%p/lib/fontconfig2/lib/pkgconfig:%p/lib/freetype219/lib/pkgconfig:%p/lib/pkgconfig:$PKG_CONFIG_PATH"
 FREETYPE_CONFIG=%p/lib/freetype219/bin/freetype-config
+ConfigureParams: <<
+ --mandir='${prefix}/share/man' --libexecdir='${prefix}/lib' 
--infodir='${prefix}/share/info' \
+ --disable-dependency-tracking --without-tutorial --with-readline=gnu \
+ (%type_raw[-nox] = -nox) --without-x (%type_raw[-nox] != -nox) --with-plot=%p 
\
+ (%type_raw[-nox] != -nox) --with-ggi=%p (%type_raw[-nox] = -nox) 
--disable-wxwidgets \
+ --with-kpsexpand --enable-history-file --enable-thin-splines --enable-rgip
+<<
+CompileScript: <<
+ #!/bin/sh -ev
+ export CCACHE_DISABLE=1
+ export CPATH=%p/include
+ export 
PKG_CONFIG_PATH=%p/lib/fontconfig2/lib/pkgconfig:%p/lib/freetype219/lib/pkgconfig:$PKG_CONFIG_PATH
+ if [ "%type_raw[-nox]" == "." ]
+       then export 
PKG_CONFIG_PATH=%p/lib/pango-ft219/lib/pkgconfig:$PKG_CONFIG_PATH
+ fi
+ export FREETYPE_CONFIG=%p/lib/freetype219/bin/freetype-config
+ ./configure %c
+ make
+<<
 InstallScript: <<
  #!/bin/sh -ev
  make install DESTDIR=%d
@@ -62,16 +109,12 @@
  install %b/share/LaTeX/gnuplot.cfg %i/etc/texmf.local/latex/gnuplot
 <<
 PostInstScript:<<
-if [ -f %p/bin/kpsexpand ]; then %p/bin/kpsexpand 
%p/etc/texmf.local/latex/gnuplot; 
-fi
-if [ -f %p/bin/texhash ]; then %p/bin/texhash 
%p/etc/texmf.local/latex/gnuplot; 
-fi
+ if [ -f %p/bin/kpsexpand ]; then %p/bin/kpsexpand 
%p/etc/texmf.local/latex/gnuplot; fi
+ if [ -f %p/bin/texhash ]; then %p/bin/texhash 
%p/etc/texmf.local/latex/gnuplot; fi
 <<
 PreRmScript:<<
-if [ -f %p/bin/kpsexpand ]; then %p/bin/kpsexpand 
%p/etc/texmf.local/latex/gnuplot; 
-fi
-if [ -f %p/bin/texhash ]; then %p/bin/texhash 
%p/etc/texmf.local/latex/gnuplot; 
-fi
+ if [ -f %p/bin/kpsexpand ]; then %p/bin/kpsexpand 
%p/etc/texmf.local/latex/gnuplot; fi
+ if [ -f %p/bin/texhash ]; then %p/bin/texhash 
%p/etc/texmf.local/latex/gnuplot; fi
 <<
 
 DocFiles: BUGS INSTALL FAQ README NEWS ChangeLog Copyright


-------------------------------------------------------------------------
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference 
Don't miss this year's exciting event. There's still time to save $100. 
Use priority code J8TL2D2. 
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to