Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/sci
In directory 
sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv11954/10.7/stable/main/finkinfo/sci

Modified Files:
        gnuplot-minimal.info gnuplot-pdfdocs.info gnuplot.info 
Log Message:
Gnew gnuplot.


Index: gnuplot-pdfdocs.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.7/stable/main/finkinfo/sci/gnuplot-pdfdocs.info,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- gnuplot-pdfdocs.info        4 Nov 2012 05:32:03 -0000       1.8
+++ gnuplot-pdfdocs.info        22 Mar 2013 20:19:55 -0000      1.9
@@ -1,13 +1,14 @@
 Package: gnuplot-pdfdocs
-Version: 4.6.1
+Version: 4.6.2
 Revision: 1
 
 Maintainer: Alexander Hansen <alexkhan...@users.sourceforge.net>
 
 Conflicts: gnuplot ( <= 4.2.2-1 ) , gnuplot-nox ( <= 4.2.2-1 )
-BuildDepends: gnuplot-bin, tetex3-base
+BuildDepends: tetex3-base
+Depends: gnuplot-bin
 Source: mirror:sourceforge:gnuplot/gnuplot-%v.tar.gz
-Source-MD5: 4c9a06461f402482c30cf94e267eb877
+Source-MD5: 060e0a77cabb6d6055c5917b0f0b5769
 PatchScript:<<
   perl -pi -e 's/usepackage{latexsym}/usepackage{amssymb}/' tutorial/header.tex
 <<

Index: gnuplot.info
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/sci/gnuplot.info,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- gnuplot.info        25 Feb 2013 02:04:12 -0000      1.18
+++ gnuplot.info        22 Mar 2013 20:19:55 -0000      1.19
@@ -1,7 +1,7 @@
 Info2: <<
 Package: gnuplot%type_pkg[-wx]%type_pkg[-qt]   
-Version: 4.6.1
-Revision: 3
+Version: 4.6.2
+Revision: 1
 Type: v (4.6), -wx (-wxcocoa -wxgtk .), -qt (-qtmac -qtx11 .)
 Maintainer: Alexander Hansen <alexkhan...@users.sourceforge.net>
 Homepage:  http://www.gnuplot.info/
@@ -47,7 +47,7 @@
        gd2-shlibs (>= 2.0.35-11),
        glib2-shlibs (>= 2.22.0-1),
        (%type_raw[-wx] = -wxgtk) gtk+2-shlibs (>= 2.18.0-1),
-       libjpeg8-shlibs,
+       libjpeg9-shlibs,
        libpng15-shlibs,
        lua51-shlibs,
        pango1-xft2-ft219-shlibs (>= 1.24.5-4),
@@ -67,7 +67,7 @@
 BuildDepends: <<
        aquaterm-dev,
        autoconf2.6,
-       automake1.11,
+       automake1.12,
        cairo (>= 1.8.8-3),
        fink (>= 0.32),
        fink-package-precedence,
@@ -77,7 +77,7 @@
        glib2-dev (>= 2.22.0-1),
        glitz,
        libiconv-dev,
-       libjpeg8,
+       libjpeg9,
        libpng15,
        lua51-dev,
        pango1-xft2-ft219-dev (>= 1.24.5-4),
@@ -96,21 +96,16 @@
        plotutils,
        x11
 <<
+
 Source: mirror:sourceforge:%{Ni}/%{Ni}-%v.tar.gz
-Source-MD5: 4c9a06461f402482c30cf94e267eb877
+Source-MD5: 060e0a77cabb6d6055c5917b0f0b5769
 PatchFile: %{Ni}.patch
 PatchFile-MD5: 6066b6bae25263e93f4d56db3d3ee28f
-PatchFile2: %{Ni}-aquaterm.patch
-PatchFile2-MD5: 989a02ec57abb8f6d49880e1fa3aeb49
 PatchScript:<<
-  #!/bin/sh -ev
   perl -pi -e 's/\bClass\b/GP_Class/g' `find src -name \*.c -o -name \*.cpp -o 
-name \*.h`
   perl -pi -e 's/(CXXFLAGS.*ObjC)/\1++/' configure.in
   perl -pi -e 's/sub(subsection aed767)/\1/' docs/%{ni}.texi
   sed 's|@PREFIX@|%p|g' < %{PatchFile} | patch -p1
-  # revert commit that breaks aquaterm plots of bitmap data.
-  cd term
-  patch -R -p0 < %{PatchFile2}
 <<
 
 GCC: 4.0
@@ -255,19 +250,14 @@
 and we don't want to force a dependency.
 
 PDF documentation has been moved to a separate package to avoid having to
-BuildDepend on texlive.
+BuildDepend on tetex or texlive.
 
-Remove %i/share/texmf-local to avoid interfering with texlive.
+Remove %i/share/texmf-local to avoid interfering with texlive or tetex.
 
 Rather than use the "arial" font by default as upstream would 
 have us do (from msttcorefonts), set environment variables to use 
 "Arial" from /Library/Fonts.
 
-Revision 3:  
-Revert upstream commit that causes aquaterm not to do bitmap plots properly:
-
-http://gnuplot.cvs.sourceforge.net/viewvc/gnuplot/gnuplot/term/aquaterm.trm?r1=1.43.2.1&r2=1.43.2.2
-
 Patch texinfo source to be compliant with texinfo-5.x.
 <<
 DescPort: <<

Index: gnuplot-minimal.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.7/stable/main/finkinfo/sci/gnuplot-minimal.info,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- gnuplot-minimal.info        24 Feb 2013 16:40:57 -0000      1.5
+++ gnuplot-minimal.info        22 Mar 2013 20:19:55 -0000      1.6
@@ -1,6 +1,6 @@
 Info2: <<
 Package: gnuplot-minimal
-Version: 4.6.1
+Version: 4.6.2
 Revision: 1
 Type: base (gnuplot), v (4.6)
 Maintainer: Alexander Hansen <alexkhan...@users.sourceforge.net>
@@ -39,7 +39,7 @@
        emacsen-common,
        freetype219-shlibs (>= 2.3.12-1),
        libiconv,
-       libjpeg8-shlibs,
+       libjpeg9-shlibs,
        libpng14-shlibs,
        lua51-shlibs,
        pdflib6-shlibs
@@ -47,13 +47,13 @@
 BuildDepends: <<
        aquaterm-dev,
        autoconf2.6,
-       automake1.11,
+       automake1.12,
        fink (>= 0.32),
        fink-package-precedence,
        freetype219 (>= 2.3.12-1),
        gd2-nox (>= 2.0.35-9),
        libiconv-dev,
-       libjpeg8,
+       libjpeg9,
        libpng14,
        lua51-dev,
        pdflib6,
@@ -61,11 +61,12 @@
 <<
 
 Source: mirror:sourceforge:%type_raw[base]/%type_raw[base]-%v.tar.gz
-Source-MD5: 4c9a06461f402482c30cf94e267eb877
+Source-MD5: 060e0a77cabb6d6055c5917b0f0b5769
 PatchFile: gnuplot.patch
 PatchFile-MD5: 6066b6bae25263e93f4d56db3d3ee28f
 PatchScript:<<
   perl -pi -e 's/\bClass\b/GP_Class/g' `find src -name \*.c -o -name \*.cpp -o 
-name \*.h`
+  perl -pi -e 's/sub(subsection aed767)/\1/' docs/%type_raw[base].texi
   sed 's|@PREFIX@|%p|g' < %{PatchFile} | patch -p1
 <<
 
@@ -185,9 +186,18 @@
 env GNUPLOT_DEFAULT_GDFONT="Verdana" gnuplot
 <<
 DescPackaging: <<
+'gnuplot' is a shell script that sets Fink's environment variables and 
+invokes the real gnuplot binary (renamed to gnuplotx).
+
 Set DIST_CONTACT to mark Fink maintainer as contact person as per the license.
 (that plus our revision tag suffices)
 
+Install the configuration for epslatex terminal manually in the
+PostInstScript because the upstream build system will run
+kpsexpand and texhash if those are present and thereby create .debs 
+that are different depending on whether or not a TeX distro is installed,
+and we don't want to force a dependency.
+
 PDF documentation has been moved to a separate package to avoid having to
 BuildDepend on tetex or texlive.
 
@@ -196,20 +206,13 @@
 Rather than use the "arial" font by default as upstream would 
 have us do (from msttcorefonts), set environment variables to use 
 "Arial" from /Library/Fonts.
+
+Patch texinfo source to be compliant with texinfo-5.x.
 <<
 DescPort: <<
 Use the builtin "readline" because gnuplot's license isn't GPL2 compatible,
 and we can't distribute it if it links to a GNU readline.
 If there are any license issues those are upstream's fault!
-
-'gnuplot' is a shell script that sets Fink's environment variables and 
-invokes the real gnuplot binary (renamed to gnuplotx).
-
-Install the configuration for epslatex terminal manually in the
-PostInstScript because the upstream build system will run
-kpsexpand and texhash if those are present and thereby create .debs 
-that are different depending on whether or not a TeX distro is installed,
-and we don't want to force a dependency.
 <<
 
 Splitoff: <<


------------------------------------------------------------------------------
Everyone hates slow websites. So do we.
Make your web apps faster with AppDynamics
Download AppDynamics Lite for free today:
http://p.sf.net/sfu/appdyn_d2d_mar
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to