[24105] trunk/dports/math/gnuplot/files

source_changes at macosforge.org source_changes at macosforge.org
Mon Apr 16 15:16:00 PDT 2007


Revision: 24105
          http://trac.macosforge.org/projects/macports/changeset/24105
Author:   pguyot at kallisys.net
Date:     2007-04-16 15:15:59 -0700 (Mon, 16 Apr 2007)

Log Message:
-----------
math/gnuplot: Add missing patch for the 4.2 update.

Added Paths:
-----------
    trunk/dports/math/gnuplot/files/patch-share-LaTeX-Makefile.in

Removed Paths:
-------------
    trunk/dports/math/gnuplot/files/patch-src-gplt_x11.c
    trunk/dports/math/gnuplot/files/patch-term-pdf.trm
    trunk/dports/math/gnuplot/files/patch-term-tkcanvas.trm

Added: trunk/dports/math/gnuplot/files/patch-share-LaTeX-Makefile.in
===================================================================
--- trunk/dports/math/gnuplot/files/patch-share-LaTeX-Makefile.in	                        (rev 0)
+++ trunk/dports/math/gnuplot/files/patch-share-LaTeX-Makefile.in	2007-04-16 22:15:59 UTC (rev 24105)
@@ -0,0 +1,12 @@
+--- share/LaTeX/Makefile.in.orig	2007-03-05 03:08:39.000000000 +0900
++++ share/LaTeX/Makefile.in	2007-04-15 18:22:54.000000000 +0900
+@@ -334,8 +334,7 @@
+ 	  installdir=`kpsexpand '$$TEXMFLOCAL'/tex/latex/gnuplot |sed "s%^.*share/%$(prefix)/share/%"` ; \
+ 	  $(top_srcdir)/mkinstalldirs $(DESTDIR)$$installdir ; \
+ 	  if [ ! -f $(DESTDIR)$$installdir/gnuplot.cfg ]; then \
+-	    $(INSTALL_DATA) $(srcdir)/gnuplot.cfg $(DESTDIR)$$installdir/gnuplot.cfg && \
+-	    texhash; \
++	    $(INSTALL_DATA) $(srcdir)/gnuplot.cfg $(DESTDIR)$$installdir/gnuplot.cfg; \
+ 	  fi ; \
+ 	  fi
+ 

Deleted: trunk/dports/math/gnuplot/files/patch-src-gplt_x11.c
===================================================================
--- trunk/dports/math/gnuplot/files/patch-src-gplt_x11.c	2007-04-16 19:34:48 UTC (rev 24104)
+++ trunk/dports/math/gnuplot/files/patch-src-gplt_x11.c	2007-04-16 22:15:59 UTC (rev 24105)
@@ -1,63 +0,0 @@
---- foo/src/gplt_x11.c.orig	2005-06-20 20:45:43.000000000 -0700
-+++ foo/src/gplt_x11.c	2005-06-20 20:49:22.000000000 -0700
-@@ -515,8 +515,8 @@
- static unsigned int dep;		/* depth */
- 
- static Bool Mono = 0, Gray = 0, Rv = 0, Clear = 0;
--static char Name[64] = "gnuplot";
--static char Class[64] = "Gnuplot";
-+static char X_Name[64] = "gnuplot";
-+static char X_Class[64] = "Gnuplot";
- 
- static int cx = 0, cy = 0;
- 
-@@ -3891,13 +3891,13 @@
- 
-     while (++Argv, --Argc > 0) {
- 	if (!strcmp(*Argv, "-name") && Argc > 1) {
--	    strncpy(Name, Argv[1], sizeof(Name) - 1);
--	    strncpy(Class, Argv[1], sizeof(Class) - 1);
-+	    strncpy(X_Name, Argv[1], sizeof(X_Name) - 1);
-+	    strncpy(X_Class, Argv[1], sizeof(X_Class) - 1);
- 	    /* just in case */
--	    Name[sizeof(Name) - 1] = NUL;
--	    Class[sizeof(Class) - 1] = NUL;
--	    if (Class[0] >= 'a' && Class[0] <= 'z')
--		Class[0] -= 0x20;
-+	    X_Name[sizeof(X_Name) - 1] = NUL;
-+	    X_Class[sizeof(X_Class) - 1] = NUL;
-+	    if (X_Class[0] >= 'a' && X_Class[0] <= 'z')
-+		X_Class[0] -= 0x20;
- 	}
-     }
-     Argc = argc;
-@@ -3906,7 +3906,7 @@
- /*---parse command line---------------------------------------------------*/
- 
-     XrmInitialize();
--    XrmParseCommand(&dbCmd, options, Nopt, Name, &Argc, Argv);
-+    XrmParseCommand(&dbCmd, options, Nopt, X_Name, &Argc, Argv);
-     if (Argc > 1) {
- #ifdef PIPE_IPC
- 	if (!strcmp(Argv[1], "-noevents")) {
-@@ -4129,9 +4129,9 @@
- {
-     char name[128], class[128], *rc;
- 
--    strcpy(name, Name);
-+    strcpy(name, X_Name);
-     strcat(name, resource);
--    strcpy(class, Class);
-+    strcpy(class, X_Class);
-     strcat(class, resource);
-     rc = XrmGetResource(xrdb, name, class, type, &value)
- 	? (char *) value.addr : (char *) 0;
-@@ -4614,7 +4614,7 @@
- #undef TEMP_NUM_LEN
-     if (!plot->titlestring) {
- 	int orig_len;
--	if (!title) title = Class;
-+	if (!title) title = X_Class;
- 	orig_len = strlen(title);
- 	/* memory for text, white space, number and terminating \0 */
- 	if ((plot->titlestring = (char *) malloc(orig_len + ((orig_len && plot->plot_number) ? 1 : 0) + strlen(numstr) - strlen(ICON_TEXT) + 1))) {

Deleted: trunk/dports/math/gnuplot/files/patch-term-pdf.trm
===================================================================
--- trunk/dports/math/gnuplot/files/patch-term-pdf.trm	2007-04-16 19:34:48 UTC (rev 24104)
+++ trunk/dports/math/gnuplot/files/patch-term-pdf.trm	2007-04-16 22:15:59 UTC (rev 24105)
@@ -1,25 +0,0 @@
---- foo/term/pdf.trm.old	2004-04-11 00:55:17.000000000 +0900
-+++ foo/term/pdf.trm	2006-09-17 12:24:04.000000000 +0900
-@@ -342,8 +342,11 @@
-     if (!myPDF)
- 	myPDF = PDF_new();
- 
--    /*open new PDF file */ 
--    if (PDF_open_fp(myPDF, gpoutfile) == -1)
-+    /*open new PDF file */
-+    if (outstr == NULL) {
-+    int_error(NO_CARET, "Error:cannot write PDF to stdout .\n");
-+    }
-+    if (PDF_open_file(myPDF, outstr) == -1)
- 	int_error(NO_CARET, "Error:cannot open PDF file .\n");
- 
- #ifdef PDF_DONT_COMPRESS
-@@ -352,7 +355,7 @@
-     PDF_set_value(myPDF, "compress", 0);
- #endif
- 
--    PDF_set_info(myPDF,"Creator","gnuplot-3.8e");
-+    PDF_set_info(myPDF,"Creator","gnuplot-4.0");
-     PDF_set_info(myPDF,"Author","Hans-Bernhard Broeker"); /* FIXME: put in username? */
-     PDF_set_info(myPDF,"Title","gnuplot diagram"); /* FIXME: use 'set title', if any ? */
-     

Deleted: trunk/dports/math/gnuplot/files/patch-term-tkcanvas.trm
===================================================================
--- trunk/dports/math/gnuplot/files/patch-term-tkcanvas.trm	2007-04-16 19:34:48 UTC (rev 24104)
+++ trunk/dports/math/gnuplot/files/patch-term-tkcanvas.trm	2007-04-16 22:15:59 UTC (rev 24105)
@@ -1,11 +0,0 @@
---- foo/term/tkcanvas.trm.orig	Sun Feb  8 15:19:23 2004
-+++ foo/term/tkcanvas.trm	Sun Feb  8 16:10:36 2004
-@@ -117,7 +117,7 @@
- /* gadgets.c */
- extern int xleft, xright, ybot, ytop;
- /* command.c */
--extern TBOOLEAN is_3d_plot;
-+/* extern TBOOLEAN is_3d_plot; */
- 
- /* static int tk_angle = 0; unused, for now */
- static int tk_lastx;

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070416/da85a0fb/attachment.html


More information about the macports-changes mailing list