Fix build with gcc3 using patches provided by Kouichirou Hiratsuka.

Closes PR pkg/22443.

6 files changed, 116 insertions, 1 deletions

diff --git a/graphics/plotutils/distinfo b/graphics/plotutils/distinfo
index 05821f3fbb8..a8c45602e51 100644
--- a/graphics/plotutils/distinfo
+++ b/graphics/plotutils/distinfo
@@ -1,4 +1,9 @@
-$NetBSD: distinfo,v 1.2 2001/04/21 09:54:23 wiz Exp $
+$NetBSD: distinfo,v 1.3 2003/09/09 14:52:54 jmmv Exp $
 
 SHA1 (plotutils-2.4.1.tar.gz) = e39ce89048a578683ad76f3284bb79adfb0adc22
 Size (plotutils-2.4.1.tar.gz) = 3316030 bytes
+SHA1 (patch-aa) = 07279355283c003f1b841a9d071592cc4d9b057e
+SHA1 (patch-ab) = 8c3be941ca51b245937c84716398162fa8a28660
+SHA1 (patch-ac) = 8257da8eecfe299495f956401c5ecf0a7071cf0d
+SHA1 (patch-ad) = 09e4300025b7d10ce79cdade94d2e0f10f7d624f
+SHA1 (patch-ae) = fe78adacfd5e96ffdad2315c1d318f8d8e3fd0de
diff --git a/graphics/plotutils/patches/patch-aa b/graphics/plotutils/patches/patch-aa
new file mode 100644
index 00000000000..e18f6715151
--- /dev/null
+++ b/graphics/plotutils/patches/patch-aa
@@ -0,0 +1,15 @@
+$NetBSD: patch-aa,v 1.4 2003/09/09 14:52:55 jmmv Exp $
+
+--- include/plotter.h.orig	2000-06-28 20:21:36.000000000 +0900
++++ include/plotter.h	2003-09-09 21:21:17.000000000 +0900
+@@ -58,8 +58,9 @@
+ /* Include iostream, stdio support if this is libplotter rather than
+    libplot. */
+ #ifndef NOT_LIBPLOTTER
+-#include <iostream.h>
++#include <iostream>
+ #include <stdio.h>
++using namespace std;
+ #endif
+ 
+ /* THE GLOBAL VARIABLES IN GNU LIBPLOTTER */
diff --git a/graphics/plotutils/patches/patch-ab b/graphics/plotutils/patches/patch-ab
new file mode 100644
index 00000000000..4a0daf733cc
--- /dev/null
+++ b/graphics/plotutils/patches/patch-ab
@@ -0,0 +1,12 @@
+$NetBSD: patch-ab,v 1.1 2003/09/09 14:52:55 jmmv Exp $
+
+--- libplot/i_rle.c.orig	1999-06-28 01:58:10.000000000 +0900
++++ libplot/i_rle.c	2003-09-09 21:23:13.000000000 +0900
+@@ -78,7 +78,7 @@
+   else if (rle->outstream)
+     {
+       rle->outstream->put ((unsigned char)(rle->oblen));
+-      rle->outstream->write (&(rle->oblock[0]), rle->oblen);
++      rle->outstream->write ((const char *)&(rle->oblock[0]), rle->oblen);
+     }
+ #endif  
diff --git a/graphics/plotutils/patches/patch-ac b/graphics/plotutils/patches/patch-ac
new file mode 100644
index 00000000000..9e133a46d54
--- /dev/null
+++ b/graphics/plotutils/patches/patch-ac
@@ -0,0 +1,58 @@
+$NetBSD: patch-ac,v 1.1 2003/09/09 14:52:56 jmmv Exp $
+
+--- libplot/n_write.c.orig	2000-06-16 14:42:13.000000000 +0900
++++ libplot/n_write.c	2003-09-09 21:22:38.000000000 +0900
+@@ -208,7 +208,7 @@
+ 		  linebuf[pos++] = '0';
+ 		if (pos >= MAX_PBM_PIXELS_PER_LINE || i == (width - 1))
+ 		  {
+-		    stream->write (linebuf, pos);
++		    stream->write ((const char *)linebuf, pos);
+ 		    stream->put ('\n');
+ 
+ 		    pos = 0;
+@@ -253,7 +253,7 @@
+ 		  rowbuf[bytecount++] = outbyte;
+ 		}
+ 	      /* emit row of bytes */
+-	      stream->write (rowbuf, bytecount);
++	      stream->write ((const char *)rowbuf, bytecount);
+ 	    }
+ 
+ 	  free (rowbuf);
+@@ -366,7 +366,7 @@
+ 		num_pixels++;
+ 		if (num_pixels >= MAX_PGM_PIXELS_PER_LINE || i == (width - 1))
+ 		  {
+-		    stream->write (linebuf, pos);
++		    stream->write ((const char *)linebuf, pos);
+ 		    stream->put ('\n');
+ 
+ 		    num_pixels = 0;
+@@ -392,7 +392,7 @@
+ 	    {
+ 	      for (i = 0; i < width; i++)
+ 		rowbuf[i] = pixmap[j][i].u.rgb[0];
+-	      stream->write (rowbuf, width);
++	      stream->write ((const char *)rowbuf, width);
+ 	    }
+ 	  free (rowbuf);
+ 	}
+@@ -514,7 +514,7 @@
+ 		num_pixels++;
+ 		if (num_pixels >= MAX_PPM_PIXELS_PER_LINE || i == (width - 1))
+ 		  {
+-		    stream->write (linebuf, pos);
++		    stream->write ((const char *)linebuf, pos);
+ 		    stream->put ('\n');
+ 
+ 		    num_pixels = 0;
+@@ -542,7 +542,7 @@
+ 	      for (i = 0; i < width; i++)
+ 		for (component = 0; component < 3; component++)
+ 		  rowbuf[3 * i + component] = pixmap[j][i].u.rgb[component];
+-	      stream->write (rowbuf, 3 * width);
++	      stream->write ((const char *)rowbuf, 3 * width);
+ 	    }
+ 	  free (rowbuf);
+ 	}
diff --git a/graphics/plotutils/patches/patch-ad b/graphics/plotutils/patches/patch-ad
new file mode 100644
index 00000000000..46bbac9fe0c
--- /dev/null
+++ b/graphics/plotutils/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1 2003/09/09 14:52:56 jmmv Exp $
+
+--- libplot/z_write.c.orig	2000-06-20 13:34:42.000000000 +0900
++++ libplot/z_write.c	2003-09-09 21:22:59.000000000 +0900
+@@ -484,7 +484,7 @@
+   ostream *stream;
+ 
+   stream = (ostream *)png_get_io_ptr (png_ptr);
+-  stream->write (data, length);
++  stream->write ((const char *)data, length);
+ }
+ 
+ static void 
diff --git a/graphics/plotutils/patches/patch-ae b/graphics/plotutils/patches/patch-ae
new file mode 100644
index 00000000000..d8a4be1fecf
--- /dev/null
+++ b/graphics/plotutils/patches/patch-ae
@@ -0,0 +1,12 @@
+$NetBSD: patch-ae,v 1.1 2003/09/09 14:52:57 jmmv Exp $
+
+--- libplot/g_write.c	2000-05-20 01:10:01.000000000 +0900
++++ libplot/g_write.c	2003-09-09 21:23:42.000000000 +0900
+@@ -40,7 +40,7 @@
+     }
+ #ifdef LIBPLOTTER
+   else if (data->outstream)
+-    data->outstream->write(c, n);
++    data->outstream->write((const char *)c, n);
+ #endif
+ }