Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/sci
In directory vz-cvs-3.sog:/tmp/cvs-serv3904/10.7/stable/main/finkinfo/sci
Modified Files:
gnuplot.info gnuplot.patch
Log Message:
Use upstream patch so that we can blame _them_ if there's a problem. :-)
Index: gnuplot.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/sci/gnuplot.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- gnuplot.patch 6 Jan 2012 17:00:28 -0000 1.5
+++ gnuplot.patch 9 Jan 2012 02:52:58 -0000 1.6
@@ -99,13 +99,42 @@
+
diff -Nurd gnuplot-4.4.4/src/misc.c gnuplot-4.4.4.patched/src/misc.c
--- gnuplot-4.4.4/src/misc.c 2011-05-07 13:54:44.000000000 -0400
-+++ gnuplot-4.4.4.patched/src/misc.c 2012-01-06 11:06:46.000000000 -0500
-@@ -301,7 +301,7 @@
- /* DBT 10-6-98 do not close stdin in the case
- * that "-" is named as a load file
- */
++++ gnuplot-4.4.4.patched/src/misc.c 2012-01-08 21:18:27.000000000 -0500
+@@ -291,18 +291,21 @@
+ lf_pop()
+ {
+ LFS *lf;
++ int argindex;
+
+ if (lf_head == NULL)
+ return (FALSE);
+- else {
+- int argindex;
++
+ lf = lf_head;
+- if (lf->fp != (FILE *) NULL && lf->fp != stdin) {
+- /* DBT 10-6-98 do not close stdin in the case
+- * that "-" is named as a load file
+- */
- (void) fclose(lf->fp);
-+ if (pclose(lf->fp)) (void) fclose(lf->fp);
- }
+- }
++ if (lf->fp == NULL || lf->fp == stdin)
++ /* Do not close stdin in the case that "-" is named as a load file */
++ ;
++#if defined(PIPES)
++ else if (lf->name[0] == '<')
++ pclose(lf->fp);
++#endif
++ else
++ fclose(lf->fp);
for (argindex = 0; argindex < 10; argindex++) {
if (call_args[argindex]) {
+ free(call_args[argindex]);
+@@ -330,7 +333,6 @@
+ lf_head = lf->prev;
+ free((char *) lf);
+ return (TRUE);
+- }
+ }
+
+ /* push onto load_file state stack
Index: gnuplot.info
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/sci/gnuplot.info,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- gnuplot.info 6 Jan 2012 22:32:11 -0000 1.8
+++ gnuplot.info 9 Jan 2012 02:52:58 -0000 1.9
@@ -1,7 +1,7 @@
Info2: <<
Package: gnuplot%type_pkg[-ui]
Version: 4.4.4
-Revision: 4
+Revision: 5
Type: -ui (-nox -nogtk .)
Maintainer: Alexander Hansen <alexkhan...@users.sourceforge.net>
Conflicts: gnuplot, gnuplot-nox, gnuplot-nogtk
@@ -57,7 +57,7 @@
Source: mirror:sourceforge:%{ni}/%{ni}-%v.tar.gz
Source-MD5: 97a43328e81e57ebed7f135ca0c07e82
PatchFile: %{ni}.patch
-PatchFile-MD5: 6354ba9d8c202d54f6ae827d0ad987da
+PatchFile-MD5: 617ad1f1471ab01085384a218f0c2675
PatchScript:<<
perl -pi -e 's/\bClass\b/GP_Class/g' `find src -name \*.c -o -name \*.cpp -o
-name \*.h`
sed 's|@PREFIX@|%p|g' < %{PatchFile} | patch -p1
@@ -203,6 +203,8 @@
4.4.4-4: Used popen() and fclose() without a pclose(), so apply a patch
from Martin Costabel that fixes that.
+
+4.4.4-5: Use upstream patch to fix popen()/fclose() issue.
<<
DescPort: <<
Set DIST_CONTACT to mark Fink maintainer as contact person.
------------------------------------------------------------------------------
Ridiculously easy VDI. With Citrix VDI-in-a-Box, you don't need a complex
infrastructure or vast IT resources to deliver seamless, secure access to
virtual desktops. With this all-in-one solution, easily deploy virtual
desktops for less than the cost of PCs and save 60% on VDI infrastructure
costs. Try it free! http://p.sf.net/sfu/Citrix-VDIinabox
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
