fixed gnuplot

diff --git a/packages/science/gnuplot/header_order.patch b/packages/science/gnuplot/header_order.patch
new file mode 100644 (file)
index 0000000..9e0f4b4
--- /dev/null
+++ b/packages/science/gnuplot/header_order.patch
@@ -0,0 +1,44 @@
+--- ./src/term.h       2004-04-13 19:24:02.000000000 +0200
++++ ./src/term.h.new   2004-05-05 11:16:41.216200736 +0200
+@@ -270,6 +270,20 @@
+ /****************************************************************************/
+ /* These terminals can be used on any system */
+ 
++/* NOTE THAT PNG AND JPEG SUPPORT REQUIRE SEPARATE LIBRARIES */
++/* There are 2 flavors of PNG support                                        */
++/* If you are using an old version of libgd in order to get true GIF support */
++/* then the best we can do is use a separate poor-quality PNG driver png.trm */
++/* But if you are using a newer libgd then it provides full blown support    */
++/* for both PNG and JPEG in term/gd.trm                                      */
++#ifdef HAVE_LIBPNG
++# if defined(HAVE_GD_PNG) || defined(HAVE_GD_JPEG)
++#  include "gd.trm"
++# else
++#  include "png.trm"
++# endif
++#endif
++
+ #ifdef X11
+ # include "x11.trm"           /* X Window System */
+ # include "xlib.trm"          /* dumps x11 commands to gpoutfile */
+@@ -351,20 +365,6 @@
+ # include "pdf.trm"
+ #endif
+ 
+-/* NOTE THAT PNG AND JPEG SUPPORT REQUIRE SEPARATE LIBRARIES */
+-/* There are 2 flavors of PNG support                                        */
+-/* If you are using an old version of libgd in order to get true GIF support */
+-/* then the best we can do is use a separate poor-quality PNG driver png.trm */
+-/* But if you are using a newer libgd then it provides full blown support    */
+-/* for both PNG and JPEG in term/gd.trm                                      */
+-#ifdef HAVE_LIBPNG
+-# if defined(HAVE_GD_PNG) || defined(HAVE_GD_JPEG)
+-#  include "gd.trm"
+-# else
+-#  include "png.trm"
+-# endif
+-#endif
+-
+ /* postscript */
+ #include "post.trm"
+ 

diff --git a/packages/science/gnuplot/pdflib.patch b/packages/science/gnuplot/pdflib.patch
index aef822f..d341235 100644 (file)
--- a/packages/science/gnuplot/pdflib.patch
+++ b/packages/science/gnuplot/pdflib.patch
@@ -5,7 +5,7 @@
  
      /*open new PDF file */ 
 -    if (PDF_open_fp(myPDF, gpoutfile) == -1)
-+    if (PDF_open_file(myPDF, gpoutfile) == -1)
++    if (PDF_open_file(myPDF, outstr) == -1)
        int_error(NO_CARET, "Error:cannot open PDF file .\n");
  
  #ifdef PDF_DONT_COMPRESS