Fix build on -current

PR:		55351
Submitted by:	Glenn Johnson <gjohnson@srrc.ars.usda.gov>

25 files changed, 1355 insertions, 6 deletions

diff --git a/graphics/plotutils/Makefile b/graphics/plotutils/Makefile
index 402e2725d7b4..18a68053abd3 100644
--- a/graphics/plotutils/Makefile
+++ b/graphics/plotutils/Makefile
@@ -26,6 +26,8 @@ INSTALLS_SHLIB=	yes
 
 MAN1=		ode.1 plot.1 plotfont.1 spline.1 tek2plot.1
 
+INFO=	libxmi plotutils
+
 pre-patch:
 	@${PERL} -pi -e 's|-lXm |\$$\{MOTIFLIB\} |g' ${WRKSRC}/configure
 
diff --git a/graphics/plotutils/files/patch-include_plotter.h b/graphics/plotutils/files/patch-include_plotter.h
new file mode 100644
index 000000000000..fdf142c955ef
--- /dev/null
+++ b/graphics/plotutils/files/patch-include_plotter.h
@@ -0,0 +1,353 @@
+
+$FreeBSD$
+
+--- include/plotter.h.orig	Wed Jun 28 06:21:36 2000
++++ include/plotter.h	Thu Aug  7 11:48:12 2003
+@@ -58,8 +58,8 @@
+ /* Include iostream, stdio support if this is libplotter rather than
+    libplot. */
+ #ifndef NOT_LIBPLOTTER
+-#include <iostream.h>
+-#include <stdio.h>
++#include <iostream>
++#include <cstdio>
+ #endif
+ 
+ /* THE GLOBAL VARIABLES IN GNU LIBPLOTTER */
+@@ -680,9 +680,9 @@
+   FILE *outfp;			/* stdio-style output stream if any */
+   FILE *errfp;			/* stdio-style error stream if any */
+ #ifndef NOT_LIBPLOTTER
+-  istream *instream;		/* C++-style input stream if any */
+-  ostream *outstream;		/* C++-style output stream if any */
+-  ostream *errstream;		/* C++-style error stream if any */
++  std::istream *instream;	/* C++-style input stream if any */
++  std::ostream *outstream;	/* C++-style output stream if any */
++  std::ostream *errstream;	/* C++-style error stream if any */
+ #endif /* not NOT_LIBPLOTTER */
+ 
+   /* device driver parameters (i.e., instance copies of class variables) */
+@@ -898,14 +898,15 @@
+   /* PLOTTER CTORS (old-style, not thread-safe) */
+   Plotter (FILE *infile, FILE *outfile, FILE *errfile);
+   Plotter (FILE *outfile);
+-  Plotter (istream& in, ostream& out, ostream& err);
+-  Plotter (ostream& out);
++  Plotter (std::istream& in, std::ostream& out, std::ostream& err);
++  Plotter (std::ostream& out);
+   Plotter ();
+   /* PLOTTER CTORS (new-style, thread-safe) */
+   Plotter (FILE *infile, FILE *outfile, FILE *errfile, PlotterParams &params);
+   Plotter (FILE *outfile, PlotterParams &params);
+-  Plotter (istream& in, ostream& out, ostream& err, PlotterParams &params);
+-  Plotter (ostream& out, PlotterParams &params);
++  Plotter (std::istream& in, std::ostream& out, std::ostream& err, 
++	   PlotterParams &params);
++  Plotter (std::ostream& out, PlotterParams &params);
+   Plotter (PlotterParams &params);
+   /* PLOTTER DTOR */
+   virtual ~Plotter ();
+@@ -1487,14 +1488,14 @@
+   /* ctors (old-style, not thread-safe) */
+   MetaPlotter (FILE *infile, FILE *outfile, FILE *errfile);
+   MetaPlotter (FILE *outfile);
+-  MetaPlotter (istream& in, ostream& out, ostream& err);
+-  MetaPlotter (ostream& out);
++  MetaPlotter (std::istream& in, std::ostream& out, std::ostream& err);
++  MetaPlotter (std::ostream& out);
+   MetaPlotter ();
+   /* ctors (new-style, thread-safe) */
+   MetaPlotter (FILE *infile, FILE *outfile, FILE *errfile, PlotterParams &params);
+   MetaPlotter (FILE *outfile, PlotterParams &params);
+-  MetaPlotter (istream& in, ostream& out, ostream& err, PlotterParams &params);
+-  MetaPlotter (ostream& out, PlotterParams &params);
++  MetaPlotter (std::istream& in, std::ostream& out, std::ostream& err, PlotterParams &params);
++  MetaPlotter (std::ostream& out, PlotterParams &params);
+   MetaPlotter (PlotterParams &params);
+   /* dtor */
+   virtual ~MetaPlotter ();
+@@ -1566,14 +1567,14 @@
+   /* ctors (old-style, not thread-safe) */
+   BitmapPlotter (FILE *infile, FILE *outfile, FILE *errfile);
+   BitmapPlotter (FILE *outfile);
+-  BitmapPlotter (istream& in, ostream& out, ostream& err);
+-  BitmapPlotter (ostream& out);
++  BitmapPlotter (std::istream& in, std::ostream& out, std::ostream& err);
++  BitmapPlotter (std::ostream& out);
+   BitmapPlotter ();
+   /* ctors (new-style, thread-safe) */
+   BitmapPlotter (FILE *infile, FILE *outfile, FILE *errfile, PlotterParams &params);
+   BitmapPlotter (FILE *outfile, PlotterParams &params);
+-  BitmapPlotter (istream& in, ostream& out, ostream& err, PlotterParams &params);
+-  BitmapPlotter (ostream& out, PlotterParams &params);
++  BitmapPlotter (std::istream& in, std::ostream& out, std::ostream& err, PlotterParams &params);
++  BitmapPlotter (std::ostream& out, PlotterParams &params);
+   BitmapPlotter (PlotterParams &params);
+   /* dtor */
+   virtual ~BitmapPlotter ();
+@@ -1613,14 +1614,14 @@
+   /* ctors (old-style, not thread-safe) */
+   TekPlotter (FILE *infile, FILE *outfile, FILE *errfile);
+   TekPlotter (FILE *outfile);
+-  TekPlotter (istream& in, ostream& out, ostream& err);
+-  TekPlotter (ostream& out);
++  TekPlotter (std::istream& in, std::ostream& out, std::ostream& err);
++  TekPlotter (std::ostream& out);
+   TekPlotter ();
+   /* ctors (new-style, thread-safe) */
+   TekPlotter (FILE *infile, FILE *outfile, FILE *errfile, PlotterParams &params);
+   TekPlotter (FILE *outfile, PlotterParams &params);
+-  TekPlotter (istream& in, ostream& out, ostream& err, PlotterParams &params);
+-  TekPlotter (ostream& out, PlotterParams &params);
++  TekPlotter (std::istream& in, std::ostream& out, std::ostream& err, PlotterParams &params);
++  TekPlotter (std::ostream& out, PlotterParams &params);
+   TekPlotter (PlotterParams &params);
+   /* dtor */
+   virtual ~TekPlotter ();
+@@ -1665,14 +1666,14 @@
+   /* ctors (old-style, not thread-safe) */
+   ReGISPlotter (FILE *infile, FILE *outfile, FILE *errfile);
+   ReGISPlotter (FILE *outfile);
+-  ReGISPlotter (istream& in, ostream& out, ostream& err);
+-  ReGISPlotter (ostream& out);
++  ReGISPlotter (std::istream& in, std::ostream& out, std::ostream& err);
++  ReGISPlotter (std::ostream& out);
+   ReGISPlotter ();
+   /* ctors (new-style, thread-safe) */
+   ReGISPlotter (FILE *infile, FILE *outfile, FILE *errfile, PlotterParams &params);
+   ReGISPlotter (FILE *outfile, PlotterParams &params);
+-  ReGISPlotter (istream& in, ostream& out, ostream& err, PlotterParams &params);
+-  ReGISPlotter (ostream& out, PlotterParams &params);
++  ReGISPlotter (std::istream& in, std::ostream& out, std::ostream& err, PlotterParams &params);
++  ReGISPlotter (std::ostream& out, PlotterParams &params);
+   ReGISPlotter (PlotterParams &params);
+   /* dtor */
+   virtual ~ReGISPlotter ();
+@@ -1716,14 +1717,14 @@
+   /* ctors (old-style, not thread-safe) */
+   HPGLPlotter (FILE *infile, FILE *outfile, FILE *errfile);
+   HPGLPlotter (FILE *outfile);
+-  HPGLPlotter (istream& in, ostream& out, ostream& err);
+-  HPGLPlotter (ostream& out);
++  HPGLPlotter (std::istream& in, std::ostream& out, std::ostream& err);
++  HPGLPlotter (std::ostream& out);
+   HPGLPlotter ();
+   /* ctors (new-style, thread-safe) */
+   HPGLPlotter (FILE *infile, FILE *outfile, FILE *errfile, PlotterParams &params);
+   HPGLPlotter (FILE *outfile, PlotterParams &params);
+-  HPGLPlotter (istream& in, ostream& out, ostream& err, PlotterParams &params);
+-  HPGLPlotter (ostream& out, PlotterParams &params);
++  HPGLPlotter (std::istream& in, std::ostream& out, std::ostream& err, PlotterParams &params);
++  HPGLPlotter (std::ostream& out, PlotterParams &params);
+   HPGLPlotter (PlotterParams &params);
+   /* dtor */
+   virtual ~HPGLPlotter ();
+@@ -1812,14 +1813,14 @@
+   /* ctors (old-style, not thread-safe) */
+   PCLPlotter (FILE *infile, FILE *outfile, FILE *errfile);
+   PCLPlotter (FILE *outfile);
+-  PCLPlotter (istream& in, ostream& out, ostream& err);
+-  PCLPlotter (ostream& out);
++  PCLPlotter (std::istream& in, std::ostream& out, std::ostream& err);
++  PCLPlotter (std::ostream& out);
+   PCLPlotter ();
+   /* ctors (new-style, thread-safe) */
+   PCLPlotter (FILE *infile, FILE *outfile, FILE *errfile, PlotterParams &params);
+   PCLPlotter (FILE *outfile, PlotterParams &params);
+-  PCLPlotter (istream& in, ostream& out, ostream& err, PlotterParams &params);
+-  PCLPlotter (ostream& out, PlotterParams &params);
++  PCLPlotter (std::istream& in, std::ostream& out, std::ostream& err, PlotterParams &params);
++  PCLPlotter (std::ostream& out, PlotterParams &params);
+   PCLPlotter (PlotterParams &params);
+   /* dtor */
+   virtual ~PCLPlotter ();
+@@ -1843,14 +1844,14 @@
+   /* ctors (old-style, not thread-safe) */
+   FigPlotter (FILE *infile, FILE *outfile, FILE *errfile);
+   FigPlotter (FILE *outfile);
+-  FigPlotter (istream& in, ostream& out, ostream& err);
+-  FigPlotter (ostream& out);
++  FigPlotter (std::istream& in, std::ostream& out, std::ostream& err);
++  FigPlotter (std::ostream& out);
+   FigPlotter ();
+   /* ctors (new-style, thread-safe) */
+   FigPlotter (FILE *infile, FILE *outfile, FILE *errfile, PlotterParams &params);
+   FigPlotter (FILE *outfile, PlotterParams &params);
+-  FigPlotter (istream& in, ostream& out, ostream& err, PlotterParams &params);
+-  FigPlotter (ostream& out, PlotterParams &params);
++  FigPlotter (std::istream& in, std::ostream& out, std::ostream& err, PlotterParams &params);
++  FigPlotter (std::ostream& out, PlotterParams &params);
+   FigPlotter (PlotterParams &params);
+   /* dtor */
+   virtual ~FigPlotter ();
+@@ -1893,14 +1894,14 @@
+   /* ctors (old-style, not thread-safe) */
+   CGMPlotter (FILE *infile, FILE *outfile, FILE *errfile);
+   CGMPlotter (FILE *outfile);
+-  CGMPlotter (istream& in, ostream& out, ostream& err);
+-  CGMPlotter (ostream& out);
++  CGMPlotter (std::istream& in, std::ostream& out, std::ostream& err);
++  CGMPlotter (std::ostream& out);
+   CGMPlotter ();
+   /* ctors (new-style, thread-safe) */
+   CGMPlotter (FILE *infile, FILE *outfile, FILE *errfile, PlotterParams &params);
+   CGMPlotter (FILE *outfile, PlotterParams &params);
+-  CGMPlotter (istream& in, ostream& out, ostream& err, PlotterParams &params);
+-  CGMPlotter (ostream& out, PlotterParams &params);
++  CGMPlotter (std::istream& in, std::ostream& out, std::ostream& err, PlotterParams &params);
++  CGMPlotter (std::ostream& out, PlotterParams &params);
+   CGMPlotter (PlotterParams &params);
+   /* dtor */
+   virtual ~CGMPlotter ();
+@@ -1978,14 +1979,14 @@
+   /* ctors (old-style, not thread-safe) */
+   PSPlotter (FILE *infile, FILE *outfile, FILE *errfile);
+   PSPlotter (FILE *outfile);
+-  PSPlotter (istream& in, ostream& out, ostream& err);
+-  PSPlotter (ostream& out);
++  PSPlotter (std::istream& in, std::ostream& out, std::ostream& err);
++  PSPlotter (std::ostream& out);
+   PSPlotter ();
+   /* ctors (new-style, thread-safe) */
+   PSPlotter (FILE *infile, FILE *outfile, FILE *errfile, PlotterParams &params);
+   PSPlotter (FILE *outfile, PlotterParams &params);
+-  PSPlotter (istream& in, ostream& out, ostream& err, PlotterParams &params);
+-  PSPlotter (ostream& out, PlotterParams &params);
++  PSPlotter (std::istream& in, std::ostream& out, std::ostream& err, PlotterParams &params);
++  PSPlotter (std::ostream& out, PlotterParams &params);
+   PSPlotter (PlotterParams &params);
+   /* dtor */
+   virtual ~PSPlotter ();
+@@ -2019,14 +2020,14 @@
+   /* ctors (old-style, not thread-safe) */
+   AIPlotter (FILE *infile, FILE *outfile, FILE *errfile);
+   AIPlotter (FILE *outfile);
+-  AIPlotter (istream& in, ostream& out, ostream& err);
+-  AIPlotter (ostream& out);
++  AIPlotter (std::istream& in, std::ostream& out, std::ostream& err);
++  AIPlotter (std::ostream& out);
+   AIPlotter ();
+   /* ctors (new-style, thread-safe) */
+   AIPlotter (FILE *infile, FILE *outfile, FILE *errfile, PlotterParams &params);
+   AIPlotter (FILE *outfile, PlotterParams &params);
+-  AIPlotter (istream& in, ostream& out, ostream& err, PlotterParams &params);
+-  AIPlotter (ostream& out, PlotterParams &params);
++  AIPlotter (std::istream& in, std::ostream& out, std::ostream& err, PlotterParams &params);
++  AIPlotter (std::ostream& out, PlotterParams &params);
+   AIPlotter (PlotterParams &params);
+   /* dtor */
+   virtual ~AIPlotter ();
+@@ -2078,14 +2079,14 @@
+   /* ctors (old-style, not thread-safe) */
+   SVGPlotter (FILE *infile, FILE *outfile, FILE *errfile);
+   SVGPlotter (FILE *outfile);
+-  SVGPlotter (istream& in, ostream& out, ostream& err);
+-  SVGPlotter (ostream& out);
++  SVGPlotter (std::istream& in, std::ostream& out, std::ostream& err);
++  SVGPlotter (std::ostream& out);
+   SVGPlotter ();
+   /* ctors (new-style, thread-safe) */
+   SVGPlotter (FILE *infile, FILE *outfile, FILE *errfile, PlotterParams &params);
+   SVGPlotter (FILE *outfile, PlotterParams &params);
+-  SVGPlotter (istream& in, ostream& out, ostream& err, PlotterParams &params);
+-  SVGPlotter (ostream& out, PlotterParams &params);
++  SVGPlotter (std::istream& in, std::ostream& out, std::ostream& err, PlotterParams &params);
++  SVGPlotter (std::ostream& out, PlotterParams &params);
+   SVGPlotter (PlotterParams &params);
+   /* dtor */
+   virtual ~SVGPlotter ();
+@@ -2122,14 +2123,14 @@
+   /* ctors (old-style, not thread-safe) */
+   PNMPlotter (FILE *infile, FILE *outfile, FILE *errfile);
+   PNMPlotter (FILE *outfile);
+-  PNMPlotter (istream& in, ostream& out, ostream& err);
+-  PNMPlotter (ostream& out);
++  PNMPlotter (std::istream& in, std::ostream& out, std::ostream& err);
++  PNMPlotter (std::ostream& out);
+   PNMPlotter ();
+   /* ctors (new-style, thread-safe) */
+   PNMPlotter (FILE *infile, FILE *outfile, FILE *errfile, PlotterParams &params);
+   PNMPlotter (FILE *outfile, PlotterParams &params);
+-  PNMPlotter (istream& in, ostream& out, ostream& err, PlotterParams &params);
+-  PNMPlotter (ostream& out, PlotterParams &params);
++  PNMPlotter (std::istream& in, std::ostream& out, std::ostream& err, PlotterParams &params);
++  PNMPlotter (std::ostream& out, PlotterParams &params);
+   PNMPlotter (PlotterParams &params);
+   /* dtor */
+   virtual ~PNMPlotter ();
+@@ -2161,14 +2162,14 @@
+   /* ctors (old-style, not thread-safe) */
+   PNGPlotter (FILE *infile, FILE *outfile, FILE *errfile);
+   PNGPlotter (FILE *outfile);
+-  PNGPlotter (istream& in, ostream& out, ostream& err);
+-  PNGPlotter (ostream& out);
++  PNGPlotter (std::istream& in, std::ostream& out, std::ostream& err);
++  PNGPlotter (std::ostream& out);
+   PNGPlotter ();
+   /* ctors (new-style, thread-safe) */
+   PNGPlotter (FILE *infile, FILE *outfile, FILE *errfile, PlotterParams &params);
+   PNGPlotter (FILE *outfile, PlotterParams &params);
+-  PNGPlotter (istream& in, ostream& out, ostream& err, PlotterParams &params);
+-  PNGPlotter (ostream& out, PlotterParams &params);
++  PNGPlotter (std::istream& in, std::ostream& out, std::ostream& err, PlotterParams &params);
++  PNGPlotter (std::ostream& out, PlotterParams &params);
+   PNGPlotter (PlotterParams &params);
+   /* dtor */
+   virtual ~PNGPlotter ();
+@@ -2196,14 +2197,14 @@
+   /* ctors (old-style, not thread-safe) */
+   GIFPlotter (FILE *infile, FILE *outfile, FILE *errfile);
+   GIFPlotter (FILE *outfile);
+-  GIFPlotter (istream& in, ostream& out, ostream& err);
+-  GIFPlotter (ostream& out);
++  GIFPlotter (std::istream& in, std::ostream& out, std::ostream& err);
++  GIFPlotter (std::ostream& out);
+   GIFPlotter ();
+   /* ctors (new-style, thread-safe) */
+   GIFPlotter (FILE *infile, FILE *outfile, FILE *errfile, PlotterParams &params);
+   GIFPlotter (FILE *outfile, PlotterParams &params);
+-  GIFPlotter (istream& in, ostream& out, ostream& err, PlotterParams &params);
+-  GIFPlotter (ostream& out, PlotterParams &params);
++  GIFPlotter (std::istream& in, std::ostream& out, std::ostream& err, PlotterParams &params);
++  GIFPlotter (std::ostream& out, PlotterParams &params);
+   GIFPlotter (PlotterParams &params);
+   /* dtor */
+   virtual ~GIFPlotter ();
+@@ -2270,14 +2271,14 @@
+   /* ctors (old-style, not thread-safe) */
+   XDrawablePlotter (FILE *infile, FILE *outfile, FILE *errfile);
+   XDrawablePlotter (FILE *outfile);
+-  XDrawablePlotter (istream& in, ostream& out, ostream& err);
+-  XDrawablePlotter (ostream& out);
++  XDrawablePlotter (std::istream& in, std::ostream& out, std::ostream& err);
++  XDrawablePlotter (std::ostream& out);
+   XDrawablePlotter ();
+   /* ctors (new-style, thread-safe) */
+   XDrawablePlotter (FILE *infile, FILE *outfile, FILE *errfile, PlotterParams &params);
+   XDrawablePlotter (FILE *outfile, PlotterParams &params);
+-  XDrawablePlotter (istream& in, ostream& out, ostream& err, PlotterParams &params);
+-  XDrawablePlotter (ostream& out, PlotterParams &params);
++  XDrawablePlotter (std::istream& in, std::ostream& out, std::ostream& err, PlotterParams &params);
++  XDrawablePlotter (std::ostream& out, PlotterParams &params);
+   XDrawablePlotter (PlotterParams &params);
+   /* dtor */
+   virtual ~XDrawablePlotter ();
+@@ -2345,14 +2346,14 @@
+   /* ctors (old-style, not thread-safe) */
+   XPlotter (FILE *infile, FILE *outfile, FILE *errfile);
+   XPlotter (FILE *outfile);
+-  XPlotter (istream& in, ostream& out, ostream& err);
+-  XPlotter (ostream& out);
++  XPlotter (std::istream& in, std::ostream& out, std::ostream& err);
++  XPlotter (std::ostream& out);
+   XPlotter ();
+   /* ctors (new-style, thread-safe) */
+   XPlotter (FILE *infile, FILE *outfile, FILE *errfile, PlotterParams &params);
+   XPlotter (FILE *outfile, PlotterParams &params);
+-  XPlotter (istream& in, ostream& out, ostream& err, PlotterParams &params);
+-  XPlotter (ostream& out, PlotterParams &params);
++  XPlotter (std::istream& in, std::ostream& out, std::ostream& err, PlotterParams &params);
++  XPlotter (std::ostream& out, PlotterParams &params);
+   XPlotter (PlotterParams &params);
+   /* dtor */
+   virtual ~XPlotter ();
diff --git a/graphics/plotutils/files/patch-libplot_a__defplot.c b/graphics/plotutils/files/patch-libplot_a__defplot.c
new file mode 100644
index 000000000000..46fb4a9f0210
--- /dev/null
+++ b/graphics/plotutils/files/patch-libplot_a__defplot.c
@@ -0,0 +1,37 @@
+
+$FreeBSD$
+
+--- libplot/a_defplot.c.orig	Wed Jun 28 11:53:44 2000
++++ libplot/a_defplot.c	Thu Aug  7 11:48:12 2003
+@@ -224,13 +224,13 @@
+   _a_initialize ();
+ }
+ 
+-AIPlotter::AIPlotter (istream& in, ostream& out, ostream& err)
++AIPlotter::AIPlotter (std::istream& in, std::ostream& out, std::ostream& err)
+ 	: Plotter (in, out, err)
+ {
+   _a_initialize ();
+ }
+ 
+-AIPlotter::AIPlotter (ostream& out)
++AIPlotter::AIPlotter (std::ostream& out)
+ 	: Plotter (out)
+ {
+   _a_initialize ();
+@@ -253,13 +253,13 @@
+   _a_initialize ();
+ }
+ 
+-AIPlotter::AIPlotter (istream& in, ostream& out, ostream& err, PlotterParams &parameters)
++AIPlotter::AIPlotter (std::istream& in, std::ostream& out, std::ostream& err, PlotterParams &parameters)
+ 	: Plotter (in, out, err, parameters)
+ {
+   _a_initialize ();
+ }
+ 
+-AIPlotter::AIPlotter (ostream& out, PlotterParams &parameters)
++AIPlotter::AIPlotter (std::ostream& out, PlotterParams &parameters)
+ 	: Plotter (out, parameters)
+ {
+   _a_initialize ();
diff --git a/graphics/plotutils/files/patch-libplot_b__defplot.c b/graphics/plotutils/files/patch-libplot_b__defplot.c
new file mode 100644
index 000000000000..ce5364bc9bbf
--- /dev/null
+++ b/graphics/plotutils/files/patch-libplot_b__defplot.c
@@ -0,0 +1,37 @@
+
+$FreeBSD$
+
+--- libplot/b_defplot.c.orig	Mon Jun 19 22:14:29 2000
++++ libplot/b_defplot.c	Thu Aug  7 11:48:12 2003
+@@ -215,13 +215,13 @@
+   _b_initialize ();
+ }
+ 
+-BitmapPlotter::BitmapPlotter (istream& in, ostream& out, ostream& err)
++BitmapPlotter::BitmapPlotter (std::istream& in, std::ostream& out, std::ostream& err)
+ 	: Plotter (in, out, err)
+ {
+   _b_initialize ();
+ }
+ 
+-BitmapPlotter::BitmapPlotter (ostream& out)
++BitmapPlotter::BitmapPlotter (std::ostream& out)
+ 	: Plotter (out)
+ {
+   _b_initialize ();
+@@ -244,13 +244,13 @@
+   _b_initialize ();
+ }
+ 
+-BitmapPlotter::BitmapPlotter (istream& in, ostream& out, ostream& err, PlotterParams &parameters)
++BitmapPlotter::BitmapPlotter (std::istream& in, std::ostream& out, std::ostream& err, PlotterParams &parameters)
+ 	: Plotter (in, out, err, parameters)
+ {
+   _b_initialize ();
+ }
+ 
+-BitmapPlotter::BitmapPlotter (ostream& out, PlotterParams &parameters)
++BitmapPlotter::BitmapPlotter (std::ostream& out, PlotterParams &parameters)
+ 	: Plotter (out, parameters)
+ {
+   _b_initialize ();
diff --git a/graphics/plotutils/files/patch-libplot_c__defplot.c b/graphics/plotutils/files/patch-libplot_c__defplot.c
new file mode 100644
index 000000000000..9d055a0cbf6f
--- /dev/null
+++ b/graphics/plotutils/files/patch-libplot_c__defplot.c
@@ -0,0 +1,37 @@
+
+$FreeBSD$
+
+--- libplot/c_defplot.c.orig	Thu Jun 29 10:37:52 2000
++++ libplot/c_defplot.c	Thu Aug  7 11:48:12 2003
+@@ -1767,13 +1767,13 @@
+   _c_initialize ();
+ }
+ 
+-CGMPlotter::CGMPlotter (istream& in, ostream& out, ostream& err)
++CGMPlotter::CGMPlotter (std::istream& in, std::ostream& out, std::ostream& err)
+ 	: Plotter (in, out, err)
+ {
+   _c_initialize ();
+ }
+ 
+-CGMPlotter::CGMPlotter (ostream& out)
++CGMPlotter::CGMPlotter (std::ostream& out)
+ 	: Plotter (out)
+ {
+   _c_initialize ();
+@@ -1796,13 +1796,13 @@
+   _c_initialize ();
+ }
+ 
+-CGMPlotter::CGMPlotter (istream& in, ostream& out, ostream& err, PlotterParams &parameters)
++CGMPlotter::CGMPlotter (std::istream& in, std::ostream& out, std::ostream& err, PlotterParams &parameters)
+ 	: Plotter (in, out, err, parameters)
+ {
+   _c_initialize ();
+ }
+ 
+-CGMPlotter::CGMPlotter (ostream& out, PlotterParams &parameters)
++CGMPlotter::CGMPlotter (std::ostream& out, PlotterParams &parameters)
+ 	: Plotter (out, parameters)
+ {
+   _c_initialize ();
diff --git a/graphics/plotutils/files/patch-libplot_f__defplot.c b/graphics/plotutils/files/patch-libplot_f__defplot.c
new file mode 100644
index 000000000000..2d0909a69737
--- /dev/null
+++ b/graphics/plotutils/files/patch-libplot_f__defplot.c
@@ -0,0 +1,37 @@
+
+$FreeBSD$
+
+--- libplot/f_defplot.c.orig	Sun Jul  2 00:08:13 2000
++++ libplot/f_defplot.c	Thu Aug  7 11:48:12 2003
+@@ -191,13 +191,13 @@
+   _f_initialize ();
+ }
+ 
+-FigPlotter::FigPlotter (istream& in, ostream& out, ostream& err)
++FigPlotter::FigPlotter (std::istream& in, std::ostream& out, std::ostream& err)
+ 	: Plotter (in, out, err)
+ {
+   _f_initialize ();
+ }
+ 
+-FigPlotter::FigPlotter (ostream& out)
++FigPlotter::FigPlotter (std::ostream& out)
+ 	: Plotter (out)
+ {
+   _f_initialize ();
+@@ -220,13 +220,13 @@
+   _f_initialize ();
+ }
+ 
+-FigPlotter::FigPlotter (istream& in, ostream& out, ostream& err, PlotterParams &parameters)
++FigPlotter::FigPlotter (std::istream& in, std::ostream& out, std::ostream& err, PlotterParams &parameters)
+ 	: Plotter (in, out, err, parameters)
+ {
+   _f_initialize ();
+ }
+ 
+-FigPlotter::FigPlotter (ostream& out, PlotterParams &parameters)
++FigPlotter::FigPlotter (std::ostream& out, PlotterParams &parameters)
+ 	: Plotter (out, parameters)
+ {
+   _f_initialize ();
diff --git a/graphics/plotutils/files/patch-libplot_g__defplot.c b/graphics/plotutils/files/patch-libplot_g__defplot.c
new file mode 100644
index 000000000000..32f57bd7d9cf
--- /dev/null
+++ b/graphics/plotutils/files/patch-libplot_g__defplot.c
@@ -0,0 +1,41 @@
+
+$FreeBSD$
+
+--- libplot/g_defplot.c.orig	Sun Jun 18 17:24:16 2000
++++ libplot/g_defplot.c	Thu Aug  7 11:48:12 2003
+@@ -392,7 +392,7 @@
+   _g_initialize ();
+ }
+ 
+-Plotter::Plotter (istream& in, ostream& out, ostream& err)
++Plotter::Plotter (std::istream& in, std::ostream& out, std::ostream& err)
+ {
+   /* create PlotterData structure, install it in Plotter */
+   _plotter->data = (plPlotterData *)_plot_xmalloc (sizeof(plPlotterData));
+@@ -420,7 +420,7 @@
+   _g_initialize ();
+ }
+ 
+-Plotter::Plotter (ostream& out)
++Plotter::Plotter (std::ostream& out)
+ {
+   /* create PlotterData structure, install it in Plotter */
+   _plotter->data = (plPlotterData *)_plot_xmalloc (sizeof(plPlotterData));
+@@ -498,7 +498,7 @@
+   _g_initialize ();
+ }
+ 
+-Plotter::Plotter (istream& in, ostream& out, ostream& err, PlotterParams &plotter_params)
++Plotter::Plotter (std::istream& in, std::ostream& out, std::ostream& err, PlotterParams &plotter_params)
+ {
+   /* create PlotterData structure, install it in Plotter */
+   _plotter->data = (plPlotterData *)_plot_xmalloc (sizeof(plPlotterData));
+@@ -524,7 +524,7 @@
+   _g_initialize ();
+ }
+ 
+-Plotter::Plotter (ostream& out, PlotterParams &plotter_params)
++Plotter::Plotter (std::ostream& out, PlotterParams &plotter_params)
+ {
+   /* create PlotterData structure, install it in Plotter */
+   _plotter->data = (plPlotterData *)_plot_xmalloc (sizeof(plPlotterData));
diff --git a/graphics/plotutils/files/patch-libplot_g__write.c b/graphics/plotutils/files/patch-libplot_g__write.c
new file mode 100644
index 000000000000..f903fef88450
--- /dev/null
+++ b/graphics/plotutils/files/patch-libplot_g__write.c
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- libplot/g_write.c.orig	Fri May 19 11:10:01 2000
++++ libplot/g_write.c	Thu Aug  7 11:48:12 2003
+@@ -40,7 +40,7 @@
+     }
+ #ifdef LIBPLOTTER
+   else if (data->outstream)
+-    data->outstream->write(c, n);
++    data->outstream->write((const char*)c, n);
+ #endif
+ }
+ 
diff --git a/graphics/plotutils/files/patch-libplot_h__defplot.c b/graphics/plotutils/files/patch-libplot_h__defplot.c
new file mode 100644
index 000000000000..12844d043bd5
--- /dev/null
+++ b/graphics/plotutils/files/patch-libplot_h__defplot.c
@@ -0,0 +1,69 @@
+
+$FreeBSD$
+
+--- libplot/h_defplot.c.orig	Sun Jul  2 15:03:52 2000
++++ libplot/h_defplot.c	Thu Aug  7 11:48:12 2003
+@@ -805,13 +805,13 @@
+   _h_initialize ();
+ }
+ 
+-HPGLPlotter::HPGLPlotter (istream& in, ostream& out, ostream& err)
++HPGLPlotter::HPGLPlotter (std::istream& in, std::ostream& out, std::ostream& err)
+ 	: Plotter (in, out, err)
+ {
+   _h_initialize ();
+ }
+ 
+-HPGLPlotter::HPGLPlotter (ostream& out)
++HPGLPlotter::HPGLPlotter (std::ostream& out)
+ 	: Plotter (out)
+ {
+   _h_initialize ();
+@@ -834,13 +834,13 @@
+   _h_initialize ();
+ }
+ 
+-HPGLPlotter::HPGLPlotter (istream& in, ostream& out, ostream& err, PlotterParams &parameters)
++HPGLPlotter::HPGLPlotter (std::istream& in, std::ostream& out, std::ostream& err, PlotterParams &parameters)
+ 	: Plotter (in, out, err, parameters)
+ {
+   _h_initialize ();
+ }
+ 
+-HPGLPlotter::HPGLPlotter (ostream& out, PlotterParams &parameters)
++HPGLPlotter::HPGLPlotter (std::ostream& out, PlotterParams &parameters)
+ 	: Plotter (out, parameters)
+ {
+   _h_initialize ();
+@@ -875,13 +875,13 @@
+   _q_initialize ();
+ }
+ 
+-PCLPlotter::PCLPlotter (istream& in, ostream& out, ostream& err)
++PCLPlotter::PCLPlotter (std::istream& in, std::ostream& out, std::ostream& err)
+ 	: HPGLPlotter (in, out, err)
+ {
+   _q_initialize ();
+ }
+ 
+-PCLPlotter::PCLPlotter (ostream& out)
++PCLPlotter::PCLPlotter (std::ostream& out)
+ 	: HPGLPlotter (out)
+ {
+   _q_initialize ();
+@@ -904,13 +904,13 @@
+   _q_initialize ();
+ }
+ 
+-PCLPlotter::PCLPlotter (istream& in, ostream& out, ostream& err, PlotterParams &parameters)
++PCLPlotter::PCLPlotter (std::istream& in, std::ostream& out, std::ostream& err, PlotterParams &parameters)
+ 	: HPGLPlotter (in, out, err, parameters)
+ {
+   _q_initialize ();
+ }
+ 
+-PCLPlotter::PCLPlotter (ostream& out, PlotterParams &parameters)
++PCLPlotter::PCLPlotter (std::ostream& out, PlotterParams &parameters)
+ 	: HPGLPlotter (out, parameters)
+ {
+   _q_initialize ();
diff --git a/graphics/plotutils/files/patch-libplot_i__defplot.c b/graphics/plotutils/files/patch-libplot_i__defplot.c
new file mode 100644
index 000000000000..d6bc6083c31e
--- /dev/null
+++ b/graphics/plotutils/files/patch-libplot_i__defplot.c
@@ -0,0 +1,37 @@
+
+$FreeBSD$
+
+--- libplot/i_defplot.c.orig	Thu Jun  8 23:11:11 2000
++++ libplot/i_defplot.c	Thu Aug  7 11:48:12 2003
+@@ -292,13 +292,13 @@
+   _i_initialize ();
+ }
+ 
+-GIFPlotter::GIFPlotter (istream& in, ostream& out, ostream& err)
++GIFPlotter::GIFPlotter (std::istream& in, std::ostream& out, std::ostream& err)
+ 	: Plotter (in, out, err)
+ {
+   _i_initialize ();
+ }
+ 
+-GIFPlotter::GIFPlotter (ostream& out)
++GIFPlotter::GIFPlotter (std::ostream& out)
+ 	: Plotter (out)
+ {
+   _i_initialize ();
+@@ -321,13 +321,13 @@
+   _i_initialize ();
+ }
+ 
+-GIFPlotter::GIFPlotter (istream& in, ostream& out, ostream& err, PlotterParams &parameters)
++GIFPlotter::GIFPlotter (std::istream& in, std::ostream& out, std::ostream& err, PlotterParams &parameters)
+ 	: Plotter (in, out, err, parameters)
+ {
+   _i_initialize ();
+ }
+ 
+-GIFPlotter::GIFPlotter (ostream& out, PlotterParams &parameters)
++GIFPlotter::GIFPlotter (std::ostream& out, PlotterParams &parameters)
+ 	: Plotter (out, parameters)
+ {
+   _i_initialize ();
diff --git a/graphics/plotutils/files/patch-libplot_i__rle.c b/graphics/plotutils/files/patch-libplot_i__rle.c
new file mode 100644
index 000000000000..862969ff4e23
--- /dev/null
+++ b/graphics/plotutils/files/patch-libplot_i__rle.c
@@ -0,0 +1,23 @@
+
+$FreeBSD$
+
+--- libplot/i_rle.c.orig	Sun Jun 27 11:58:10 1999
++++ libplot/i_rle.c	Thu Aug  7 11:48:12 2003
+@@ -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  
+ 
+@@ -416,7 +416,7 @@
+ /* create new RLE struct, which writes to a specified stream */
+ rle_out *
+ #ifdef LIBPLOTTER
+-_rle_init (FILE *fp, ostream *out, int bit_depth)
++_rle_init (FILE *fp, std::ostream *out, int bit_depth)
+ #else
+ #ifdef _HAVE_PROTOS
+ _rle_init (FILE *fp, int bit_depth)
diff --git a/graphics/plotutils/files/patch-libplot_i__rle.h b/graphics/plotutils/files/patch-libplot_i__rle.h
new file mode 100644
index 000000000000..0ce670281f63
--- /dev/null
+++ b/graphics/plotutils/files/patch-libplot_i__rle.h
@@ -0,0 +1,23 @@
+
+$FreeBSD$
+
+--- libplot/i_rle.h.orig	Wed Mar  3 20:05:38 1999
++++ libplot/i_rle.h	Thu Aug  7 11:48:12 2003
+@@ -35,7 +35,7 @@
+   int obits;
+   FILE *ofile;
+ #ifdef LIBPLOTTER
+-  ostream *outstream;
++  std::ostream *outstream;
+ #endif
+   unsigned char oblock[256];
+   int oblen;
+@@ -43,7 +43,7 @@
+ 
+ /* create, initialize, and return a new RLE output structure */
+ #ifdef LIBPLOTTER
+-extern rle_out *_rle_init ____P((FILE *fp, ostream *out, int bit_depth));
++extern rle_out *_rle_init ____P((FILE *fp, std::ostream *out, int bit_depth));
+ #else
+ extern rle_out *_rle_init ____P((FILE *fp, int bit_depth));
+ #endif
diff --git a/graphics/plotutils/files/patch-libplot_m__defplot.c b/graphics/plotutils/files/patch-libplot_m__defplot.c
new file mode 100644
index 000000000000..26bec89e4f88
--- /dev/null
+++ b/graphics/plotutils/files/patch-libplot_m__defplot.c
@@ -0,0 +1,37 @@
+
+$FreeBSD$
+
+--- libplot/m_defplot.c.orig	Mon Jun 19 00:10:36 2000
++++ libplot/m_defplot.c	Thu Aug  7 11:48:12 2003
+@@ -204,13 +204,13 @@
+   _m_initialize ();
+ }
+ 
+-MetaPlotter::MetaPlotter (istream& in, ostream& out, ostream& err)
++MetaPlotter::MetaPlotter (std::istream& in, std::ostream& out, std::ostream& err)
+ 	: Plotter (in, out, err)
+ {
+   _m_initialize ();
+ }
+ 
+-MetaPlotter::MetaPlotter (ostream& out)
++MetaPlotter::MetaPlotter (std::ostream& out)
+ 	: Plotter (out)
+ {
+   _m_initialize ();
+@@ -233,13 +233,13 @@
+   _m_initialize ();
+ }
+ 
+-MetaPlotter::MetaPlotter (istream& in, ostream& out, ostream& err, PlotterParams &parameters)
++MetaPlotter::MetaPlotter (std::istream& in, std::ostream& out, std::ostream& err, PlotterParams &parameters)
+ 	: Plotter (in, out, err, parameters)
+ {
+   _m_initialize ();
+ }
+ 
+-MetaPlotter::MetaPlotter (ostream& out, PlotterParams &parameters)
++MetaPlotter::MetaPlotter (std::ostream& out, PlotterParams &parameters)
+ 	: Plotter (out, parameters)
+ {
+   _m_initialize ();
diff --git a/graphics/plotutils/files/patch-libplot_m__emit.c b/graphics/plotutils/files/patch-libplot_m__emit.c
new file mode 100644
index 000000000000..57ca69043189
--- /dev/null
+++ b/graphics/plotutils/files/patch-libplot_m__emit.c
@@ -0,0 +1,23 @@
+
+$FreeBSD$
+
+--- libplot/m_emit.c.orig	Mon Jun 19 22:02:48 2000
++++ libplot/m_emit.c	Thu Aug  7 11:48:12 2003
+@@ -66,7 +66,7 @@
+       if (_plotter->meta_portable_output)
+ 	(*(_plotter->data->outstream)) << ' ' << x;
+       else
+-	_plotter->data->outstream->write((char *)&x, sizeof(int));
++	_plotter->data->outstream->write((const char *)&x, sizeof(int));
+     }
+ #endif
+ }
+@@ -107,7 +107,7 @@
+ 	  float f;
+ 	  
+ 	  f = FROUND(x);
+-	  _plotter->data->outstream->write((char *)&f, sizeof(float));
++	  _plotter->data->outstream->write((const char *)&f, sizeof(float));
+ 	}
+     }
+ #endif
diff --git a/graphics/plotutils/files/patch-libplot_n__defplot.c b/graphics/plotutils/files/patch-libplot_n__defplot.c
new file mode 100644
index 000000000000..b7cc77f1eee2
--- /dev/null
+++ b/graphics/plotutils/files/patch-libplot_n__defplot.c
@@ -0,0 +1,37 @@
+
+$FreeBSD$
+
+--- libplot/n_defplot.c.orig	Thu Jun  1 14:14:43 2000
++++ libplot/n_defplot.c	Thu Aug  7 11:48:12 2003
+@@ -115,13 +115,13 @@
+   _n_initialize ();
+ }
+ 
+-PNMPlotter::PNMPlotter (istream& in, ostream& out, ostream& err)
++PNMPlotter::PNMPlotter (std::istream& in, std::ostream& out, std::ostream& err)
+ 	: BitmapPlotter (in, out, err)
+ {
+   _n_initialize ();
+ }
+ 
+-PNMPlotter::PNMPlotter (ostream& out)
++PNMPlotter::PNMPlotter (std::ostream& out)
+ 	: BitmapPlotter (out)
+ {
+   _n_initialize ();
+@@ -144,13 +144,13 @@
+   _n_initialize ();
+ }
+ 
+-PNMPlotter::PNMPlotter (istream& in, ostream& out, ostream& err, PlotterParams &parameters)
++PNMPlotter::PNMPlotter (std::istream& in, std::ostream& out, std::ostream& err, PlotterParams &parameters)
+ 	: BitmapPlotter (in, out, err, parameters)
+ {
+   _n_initialize ();
+ }
+ 
+-PNMPlotter::PNMPlotter (ostream& out, PlotterParams &parameters)
++PNMPlotter::PNMPlotter (std::ostream& out, PlotterParams &parameters)
+ 	: BitmapPlotter (out, parameters)
+ {
+   _n_initialize ();
diff --git a/graphics/plotutils/files/patch-libplot_n__write.c b/graphics/plotutils/files/patch-libplot_n__write.c
new file mode 100644
index 000000000000..570b6a16cf75
--- /dev/null
+++ b/graphics/plotutils/files/patch-libplot_n__write.c
@@ -0,0 +1,187 @@
+
+$FreeBSD$
+
+--- libplot/n_write.c.orig	Thu Aug  7 12:13:44 2003
++++ libplot/n_write.c	Thu Aug  7 12:39:26 2003
+@@ -106,11 +106,11 @@
+   int height = _plotter->b_yn;  
+   FILE *fp = _plotter->data->outfp;
+ #ifdef LIBPLOTTER
+-  ostream *stream = _plotter->data->outstream;
++  std::ostream *outstream = _plotter->data->outstream;
+ #endif
+ 
+ #ifdef LIBPLOTTER
+-  if (fp == NULL && stream == NULL)
++  if (fp == NULL && outstream == NULL)
+     return;
+ #else
+   if (fp == NULL)
+@@ -186,14 +186,14 @@
+ 	}
+     }
+ #ifdef LIBPLOTTER
+-  else if (stream)
++  else if (outstream)
+     {
+       if (portable)			/* emit ascii format */
+ 	{
+ 	  unsigned char linebuf[MAX_PBM_PIXELS_PER_LINE];
+ 	  int pos = 0;		/* position in line buffer */
+ 
+-	  (*stream) << "\
++	  (*outstream) << "\
+ P1\n\
+ # CREATOR: GNU libplot drawing library, version " 
+ 		 << PL_LIBPLOT_VER_STRING << '\n'
+@@ -208,8 +208,8 @@
+ 		  linebuf[pos++] = '0';
+ 		if (pos >= MAX_PBM_PIXELS_PER_LINE || i == (width - 1))
+ 		  {
+-		    stream->write (linebuf, pos);
+-		    stream->put ('\n');
++		    outstream->write ((const char*)linebuf, pos);
++		    outstream->put ('\n');
+ 
+ 		    pos = 0;
+ 		  }
+@@ -221,7 +221,7 @@
+ 	  unsigned char outbyte, set;
+ 	  unsigned char *rowbuf;
+ 
+-	  (*stream) << "\
++	  (*outstream) << "\
+ P4\n\
+ # CREATOR: GNU libplot drawing library, version " 
+ 		 << PL_LIBPLOT_VER_STRING << '\n'
+@@ -253,7 +253,7 @@
+ 		  rowbuf[bytecount++] = outbyte;
+ 		}
+ 	      /* emit row of bytes */
+-	      stream->write (rowbuf, bytecount);
++	      outstream->write ((const char*)rowbuf, bytecount);
+ 	    }
+ 
+ 	  free (rowbuf);
+@@ -278,11 +278,11 @@
+   int height = _plotter->b_yn;  
+   FILE *fp = _plotter->data->outfp;
+ #ifdef LIBPLOTTER
+-  ostream *stream = _plotter->data->outstream;
++  std::ostream *outstream = _plotter->data->outstream;
+ #endif
+ 
+ #ifdef LIBPLOTTER
+-  if (fp == NULL && stream == NULL)
++  if (fp == NULL && outstream == NULL)
+     return;
+ #else
+   if (fp == NULL)
+@@ -342,7 +342,7 @@
+ 	}
+     }
+ #ifdef LIBPLOTTER
+-  else if (stream)
++  else if (outstream)
+     {
+       if (portable)			/* emit ascii format */
+ 	{
+@@ -351,7 +351,7 @@
+ 	  int pos = 0;
+ 	  int num_pixels = 0;
+ 
+-	  (*stream) << "\
++	  (*outstream) << "\
+ P2\n\
+ # CREATOR: GNU libplot drawing library, version " 
+ 		 << PL_LIBPLOT_VER_STRING << '\n'
+@@ -366,8 +366,8 @@
+ 		num_pixels++;
+ 		if (num_pixels >= MAX_PGM_PIXELS_PER_LINE || i == (width - 1))
+ 		  {
+-		    stream->write (linebuf, pos);
+-		    stream->put ('\n');
++		    outstream->write ((const char*)linebuf, pos);
++		    outstream->put ('\n');
+ 
+ 		    num_pixels = 0;
+ 		    pos = 0;
+@@ -380,7 +380,7 @@
+ 	{
+ 	  unsigned char *rowbuf;
+ 	  
+-	  (*stream) << "\
++	  (*outstream) << "\
+ P5\n\
+ # CREATOR: GNU libplot drawing library, version " 
+ 		 << PL_LIBPLOT_VER_STRING << '\n'
+@@ -392,7 +392,7 @@
+ 	    {
+ 	      for (i = 0; i < width; i++)
+ 		rowbuf[i] = pixmap[j][i].u.rgb[0];
+-	      stream->write (rowbuf, width);
++	      outstream->write ((const char*)rowbuf, width);
+ 	    }
+ 	  free (rowbuf);
+ 	}
+@@ -416,11 +416,11 @@
+   int height = _plotter->b_yn;  
+   FILE *fp = _plotter->data->outfp;
+ #ifdef LIBPLOTTER
+-  ostream *stream = _plotter->data->outstream;
++  std::ostream *outstream = _plotter->data->outstream;
+ #endif
+ 
+ #ifdef LIBPLOTTER
+-  if (fp == NULL && stream == NULL)
++  if (fp == NULL && outstream == NULL)
+     return;
+ #else
+   if (fp == NULL)
+@@ -486,7 +486,7 @@
+ 	}
+     }
+ #ifdef LIBPLOTTER
+-  else if (stream)
++  else if (outstream)
+     {
+       if (portable)			/* emit ascii format */
+ 	{
+@@ -495,7 +495,7 @@
+ 	  int pos = 0;
+ 	  int num_pixels = 0;
+ 
+-	  (*stream) << "\
++	  (*outstream) << "\
+ P3\n\
+ # CREATOR: GNU libplot drawing library, version " 
+ 		 << PL_LIBPLOT_VER_STRING << '\n'
+@@ -514,8 +514,8 @@
+ 		num_pixels++;
+ 		if (num_pixels >= MAX_PPM_PIXELS_PER_LINE || i == (width - 1))
+ 		  {
+-		    stream->write (linebuf, pos);
+-		    stream->put ('\n');
++		    outstream->write ((const char*)linebuf, pos);
++		    outstream->put ('\n');
+ 
+ 		    num_pixels = 0;
+ 		    pos = 0;
+@@ -529,7 +529,7 @@
+ 	  unsigned char *rowbuf;
+ 	  int component;
+ 	  
+-	  (*stream) << "\
++	  (*outstream) << "\
+ P6\n\
+ # CREATOR: GNU libplot drawing library, version " 
+ 		 << PL_LIBPLOT_VER_STRING << '\n'
+@@ -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);
++	      outstream->write ((const char*)rowbuf, 3 * width);
+ 	    }
+ 	  free (rowbuf);
+ 	}
diff --git a/graphics/plotutils/files/patch-libplot_p__defplot.c b/graphics/plotutils/files/patch-libplot_p__defplot.c
new file mode 100644
index 000000000000..6a54bb540c76
--- /dev/null
+++ b/graphics/plotutils/files/patch-libplot_p__defplot.c
@@ -0,0 +1,37 @@
+
+$FreeBSD$
+
+--- libplot/p_defplot.c.orig	Wed Jun 28 11:53:50 2000
++++ libplot/p_defplot.c	Thu Aug  7 11:48:12 2003
+@@ -782,13 +782,13 @@
+   _p_initialize ();
+ }
+ 
+-PSPlotter::PSPlotter (istream& in, ostream& out, ostream& err)
++PSPlotter::PSPlotter (std::istream& in, std::ostream& out, std::ostream& err)
+ 	: Plotter (in, out, err)
+ {
+   _p_initialize ();
+ }
+ 
+-PSPlotter::PSPlotter (ostream& out)
++PSPlotter::PSPlotter (std::ostream& out)
+ 	: Plotter (out)
+ {
+   _p_initialize ();
+@@ -811,13 +811,13 @@
+   _p_initialize ();
+ }
+ 
+-PSPlotter::PSPlotter (istream& in, ostream& out, ostream& err, PlotterParams &parameters)
++PSPlotter::PSPlotter (std::istream& in, std::ostream& out, std::ostream& err, PlotterParams &parameters)
+ 	: Plotter (in, out, err, parameters)
+ {
+   _p_initialize ();
+ }
+ 
+-PSPlotter::PSPlotter (ostream& out, PlotterParams &parameters)
++PSPlotter::PSPlotter (std::ostream& out, PlotterParams &parameters)
+ 	: Plotter (out, parameters)
+ {
+   _p_initialize ();
diff --git a/graphics/plotutils/files/patch-libplot_r__defplot.c b/graphics/plotutils/files/patch-libplot_r__defplot.c
new file mode 100644
index 000000000000..521e00b854de
--- /dev/null
+++ b/graphics/plotutils/files/patch-libplot_r__defplot.c
@@ -0,0 +1,37 @@
+
+$FreeBSD$
+
+--- libplot/r_defplot.c.orig	Mon Jun 19 23:39:42 2000
++++ libplot/r_defplot.c	Thu Aug  7 11:48:12 2003
+@@ -170,13 +170,13 @@
+   _r_initialize ();
+ }
+ 
+-ReGISPlotter::ReGISPlotter (istream& in, ostream& out, ostream& err)
++ReGISPlotter::ReGISPlotter (std::istream& in, std::ostream& out, std::ostream& err)
+ 	: Plotter (in, out, err)
+ {
+   _r_initialize ();
+ }
+ 
+-ReGISPlotter::ReGISPlotter (ostream& out)
++ReGISPlotter::ReGISPlotter (std::ostream& out)
+ 	: Plotter (out)
+ {
+   _r_initialize ();
+@@ -199,13 +199,13 @@
+   _r_initialize ();
+ }
+ 
+-ReGISPlotter::ReGISPlotter (istream& in, ostream& out, ostream& err, PlotterParams &parameters)
++ReGISPlotter::ReGISPlotter (std::istream& in, std::ostream& out, std::ostream& err, PlotterParams &parameters)
+ 	: Plotter (in, out, err, parameters)
+ {
+   _r_initialize ();
+ }
+ 
+-ReGISPlotter::ReGISPlotter (ostream& out, PlotterParams &parameters)
++ReGISPlotter::ReGISPlotter (std::ostream& out, PlotterParams &parameters)
+ 	: Plotter (out, parameters)
+ {
+   _r_initialize ();
diff --git a/graphics/plotutils/files/patch-libplot_s__defplot.c b/graphics/plotutils/files/patch-libplot_s__defplot.c
new file mode 100644
index 000000000000..79c40653687b
--- /dev/null
+++ b/graphics/plotutils/files/patch-libplot_s__defplot.c
@@ -0,0 +1,37 @@
+
+$FreeBSD$
+
+--- libplot/s_defplot.c.orig	Sun Jul  2 18:20:20 2000
++++ libplot/s_defplot.c	Thu Aug  7 11:48:12 2003
+@@ -196,13 +196,13 @@
+   _s_initialize ();
+ }
+ 
+-SVGPlotter::SVGPlotter (istream& in, ostream& out, ostream& err)
++SVGPlotter::SVGPlotter (std::istream& in, std::ostream& out, std::ostream& err)
+ 	: Plotter (in, out, err)
+ {
+   _s_initialize ();
+ }
+ 
+-SVGPlotter::SVGPlotter (ostream& out)
++SVGPlotter::SVGPlotter (std::ostream& out)
+ 	: Plotter (out)
+ {
+   _s_initialize ();
+@@ -225,13 +225,13 @@
+   _s_initialize ();
+ }
+ 
+-SVGPlotter::SVGPlotter (istream& in, ostream& out, ostream& err, PlotterParams &parameters)
++SVGPlotter::SVGPlotter (std::istream& in, std::ostream& out, std::ostream& err, PlotterParams &parameters)
+ 	: Plotter (in, out, err, parameters)
+ {
+   _s_initialize ();
+ }
+ 
+-SVGPlotter::SVGPlotter (ostream& out, PlotterParams &parameters)
++SVGPlotter::SVGPlotter (std::ostream& out, PlotterParams &parameters)
+ 	: Plotter (out, parameters)
+ {
+   _s_initialize ();
diff --git a/graphics/plotutils/files/patch-libplot_t__defplot.c b/graphics/plotutils/files/patch-libplot_t__defplot.c
new file mode 100644
index 000000000000..4b90a293713f
--- /dev/null
+++ b/graphics/plotutils/files/patch-libplot_t__defplot.c
@@ -0,0 +1,37 @@
+
+$FreeBSD$
+
+--- libplot/t_defplot.c.orig	Mon Jun  5 22:20:07 2000
++++ libplot/t_defplot.c	Thu Aug  7 11:48:12 2003
+@@ -195,13 +195,13 @@
+   _t_initialize ();
+ }
+ 
+-TekPlotter::TekPlotter (istream& in, ostream& out, ostream& err)
++TekPlotter::TekPlotter (std::istream& in, std::ostream& out, std::ostream& err)
+ 	: Plotter (in, out, err)
+ {
+   _t_initialize ();
+ }
+ 
+-TekPlotter::TekPlotter (ostream& out)
++TekPlotter::TekPlotter (std::ostream& out)
+ 	: Plotter (out)
+ {
+   _t_initialize ();
+@@ -224,13 +224,13 @@
+   _t_initialize ();
+ }
+ 
+-TekPlotter::TekPlotter (istream& in, ostream& out, ostream& err, PlotterParams &parameters)
++TekPlotter::TekPlotter (std::istream& in, std::ostream& out, std::ostream& err, PlotterParams &parameters)
+ 	: Plotter (in, out, err, parameters)
+ {
+   _t_initialize ();
+ }
+ 
+-TekPlotter::TekPlotter (ostream& out, PlotterParams &parameters)
++TekPlotter::TekPlotter (std::ostream& out, PlotterParams &parameters)
+ 	: Plotter (out, parameters)
+ {
+   _t_initialize ();
diff --git a/graphics/plotutils/files/patch-libplot_x__defplot.c b/graphics/plotutils/files/patch-libplot_x__defplot.c
new file mode 100644
index 000000000000..1164c2c4387c
--- /dev/null
+++ b/graphics/plotutils/files/patch-libplot_x__defplot.c
@@ -0,0 +1,37 @@
+
+$FreeBSD$
+
+--- libplot/x_defplot.c.orig	Sun Jun 18 17:30:02 2000
++++ libplot/x_defplot.c	Thu Aug  7 11:48:12 2003
+@@ -226,13 +226,13 @@
+   _x_initialize ();
+ }
+ 
+-XDrawablePlotter::XDrawablePlotter (istream& in, ostream& out, ostream& err)
++XDrawablePlotter::XDrawablePlotter (std::istream& in, std::ostream& out, std::ostream& err)
+ 	: Plotter (in, out, err)
+ {
+   _x_initialize ();
+ }
+ 
+-XDrawablePlotter::XDrawablePlotter (ostream& out)
++XDrawablePlotter::XDrawablePlotter (std::ostream& out)
+ 	: Plotter (out)
+ {
+   _x_initialize ();
+@@ -255,13 +255,13 @@
+   _x_initialize ();
+ }
+ 
+-XDrawablePlotter::XDrawablePlotter (istream& in, ostream& out, ostream& err, PlotterParams &parameters)
++XDrawablePlotter::XDrawablePlotter (std::istream& in, std::ostream& out, std::ostream& err, PlotterParams &parameters)
+ 	: Plotter (in, out, err, parameters)
+ {
+   _x_initialize ();
+ }
+ 
+-XDrawablePlotter::XDrawablePlotter (ostream& out, PlotterParams &parameters)
++XDrawablePlotter::XDrawablePlotter (std::ostream& out, PlotterParams &parameters)
+ 	: Plotter (out, parameters)
+ {
+   _x_initialize ();
diff --git a/graphics/plotutils/files/patch-libplot_y__defplot.c b/graphics/plotutils/files/patch-libplot_y__defplot.c
new file mode 100644
index 000000000000..3f64e64f7cc2
--- /dev/null
+++ b/graphics/plotutils/files/patch-libplot_y__defplot.c
@@ -0,0 +1,41 @@
+
+$FreeBSD$
+
+--- libplot/y_defplot.c.orig	Sun Jun 18 17:29:45 2000
++++ libplot/y_defplot.c	Thu Aug  7 11:48:12 2003
+@@ -265,7 +265,7 @@
+   /* add to _xplotters sparse array */
+ }
+ 
+-XPlotter::XPlotter (istream& in, ostream& out, ostream& err)
++XPlotter::XPlotter (std::istream& in, std::ostream& out, std::ostream& err)
+ 	: XDrawablePlotter (in, out, err)
+ {
+   _y_initialize ();
+@@ -273,7 +273,7 @@
+   /* add to _xplotters sparse array */
+ }
+ 
+-XPlotter::XPlotter (ostream& out)
++XPlotter::XPlotter (std::ostream& out)
+ 	: XDrawablePlotter (out)
+ {
+   _y_initialize ();
+@@ -304,7 +304,7 @@
+   /* add to _xplotters sparse array */
+ }
+ 
+-XPlotter::XPlotter (istream& in, ostream& out, ostream& err, PlotterParams &parameters)
++XPlotter::XPlotter (std::istream& in, std::ostream& out, std::ostream& err, PlotterParams &parameters)
+ 	: XDrawablePlotter (in, out, err, parameters)
+ {
+   _y_initialize ();
+@@ -312,7 +312,7 @@
+   /* add to _xplotters sparse array */
+ }
+ 
+-XPlotter::XPlotter (ostream& out, PlotterParams &parameters)
++XPlotter::XPlotter (std::ostream& out, PlotterParams &parameters)
+ 	: XDrawablePlotter (out, parameters)
+ {
+   _y_initialize ();
diff --git a/graphics/plotutils/files/patch-libplot_z__defplot.c b/graphics/plotutils/files/patch-libplot_z__defplot.c
new file mode 100644
index 000000000000..3d2291e2ac82
--- /dev/null
+++ b/graphics/plotutils/files/patch-libplot_z__defplot.c
@@ -0,0 +1,37 @@
+
+$FreeBSD$
+
+--- libplot/z_defplot.c.orig	Thu Jun  8 23:12:29 2000
++++ libplot/z_defplot.c	Thu Aug  7 11:48:12 2003
+@@ -132,13 +132,13 @@
+   _z_initialize ();
+ }
+ 
+-PNGPlotter::PNGPlotter (istream& in, ostream& out, ostream& err)
++PNGPlotter::PNGPlotter (std::istream& in, std::ostream& out, std::ostream& err)
+ 	: BitmapPlotter (in, out, err)
+ {
+   _z_initialize ();
+ }
+ 
+-PNGPlotter::PNGPlotter (ostream& out)
++PNGPlotter::PNGPlotter (std::ostream& out)
+ 	: BitmapPlotter (out)
+ {
+   _z_initialize ();
+@@ -161,13 +161,13 @@
+   _z_initialize ();
+ }
+ 
+-PNGPlotter::PNGPlotter (istream& in, ostream& out, ostream& err, PlotterParams &parameters)
++PNGPlotter::PNGPlotter (std::istream& in, std::ostream& out, std::ostream& err, PlotterParams &parameters)
+ 	: BitmapPlotter (in, out, err, parameters)
+ {
+   _z_initialize ();
+ }
+ 
+-PNGPlotter::PNGPlotter (ostream& out, PlotterParams &parameters)
++PNGPlotter::PNGPlotter (std::ostream& out, PlotterParams &parameters)
+ 	: BitmapPlotter (out, parameters)
+ {
+   _z_initialize ();
diff --git a/graphics/plotutils/files/patch-libplot_z__write.c b/graphics/plotutils/files/patch-libplot_z__write.c
new file mode 100644
index 000000000000..e00bb2ce9625
--- /dev/null
+++ b/graphics/plotutils/files/patch-libplot_z__write.c
@@ -0,0 +1,98 @@
+
+$FreeBSD$
+
+--- libplot/z_write.c.orig	Thu Aug  7 12:40:31 2003
++++ libplot/z_write.c	Thu Aug  7 12:49:08 2003
+@@ -83,12 +83,12 @@
+   void *error_ptr;
+   png_error_ptr error_fn_ptr, warn_fn_ptr;
+ #ifdef LIBPLOTTER
+-  ostream *stream = _plotter->data->outstream;
+-  ostream *errorstream = _plotter->data->errstream;
++  std::ostream *outstream = _plotter->data->outstream;
++  std::ostream *errstream = _plotter->data->errstream;
+ #endif
+ 
+ #ifdef LIBPLOTTER
+-  if (fp == (FILE *)NULL && stream == (ostream *)NULL)
++  if (fp == (FILE *)NULL && outstream == (std::ostream *)NULL)
+     return 0;
+ #else
+   if (fp == (FILE *)NULL)
+@@ -102,11 +102,11 @@
+ 
+   /* work out libpng error handling (i.e. callback functions and data) */
+ #ifdef LIBPLOTTER
+-  if (errorstream)
++  if (errstream)
+     {
+       error_fn_ptr = _our_error_fn_stream;
+       warn_fn_ptr = _our_warn_fn_stream;
+-      error_ptr = (void *)errorstream;
++      error_ptr = (void *)errstream;
+     }
+   else if (errorfp)
+     {
+@@ -158,11 +158,11 @@
+     }
+   
+ #ifdef LIBPLOTTER
+-  if (stream)
++  if (outstream)
+     {
+       /* use custom write and flush functions, defined below */
+       png_set_write_fn (png_ptr, 
+-			(void *)stream,
++			(void *)outstream,
+ 			(png_rw_ptr)_our_write_fn, 
+ 			(png_flush_ptr)_our_IO_flush_fn);
+     }
+@@ -481,28 +481,28 @@
+ static void 
+ _our_write_fn (png_struct *png_ptr, png_byte *data, png_size_t length)
+ {
+-  ostream *stream;
++    std::ostream *outstream;
+ 
+-  stream = (ostream *)png_get_io_ptr (png_ptr);
+-  stream->write (data, length);
++  outstream = (std::ostream *)png_get_io_ptr (png_ptr);
++  outstream->write ((const char*)data, length);
+ }
+ 
+ static void 
+ _our_IO_flush_fn (png_struct *png_ptr)
+ {
+-  ostream *stream;
++    std::ostream *outstream;
+ 
+-  stream = (ostream *)png_get_io_ptr (png_ptr);
+-  stream->flush ();
++  outstream = (std::ostream *)png_get_io_ptr (png_ptr);
++  outstream->flush ();
+ }
+ 
+ /* custom error and warning handlers (for streams) */
+ static void 
+ _our_error_fn_stream (png_struct *png_ptr, const char *data)
+ {
+-  ostream *errstream;
++    std::ostream *errstream;
+ 
+-  errstream = (ostream *)png_get_error_ptr (png_ptr);
++  errstream = (std::ostream *)png_get_error_ptr (png_ptr);
+   if (errstream)
+     {
+ #ifdef PTHREAD_SUPPORT
+@@ -526,9 +526,9 @@
+ static void 
+ _our_warn_fn_stream (png_struct *png_ptr, const char *data)
+ {
+-  ostream *errstream;
++    std::ostream *errstream;
+ 
+-  errstream = (ostream *)png_get_error_ptr (png_ptr);
++  errstream = (std::ostream *)png_get_error_ptr (png_ptr);
+   if (errstream)
+     {
+ #ifdef PTHREAD_SUPPORT
diff --git a/graphics/plotutils/pkg-plist b/graphics/plotutils/pkg-plist
index 2f995a2e5d5f..f35f0f900069 100644
--- a/graphics/plotutils/pkg-plist
+++ b/graphics/plotutils/pkg-plist
@@ -10,12 +10,6 @@ include/plot.h
 include/plotcompat.h
 include/plotter.h
 include/xmi.h
-@unexec install-info --delete %D/info/libxmi.info %D/info/dir
-info/libxmi.info
-@exec install-info %D/info/libxmi.info %D/info/dir
-@unexec install-info --delete %D/info/plotutils.info %D/info/dir
-info/plotutils.info
-@exec install-info %D/info/plotutils.info %D/info/dir
 lib/libplot.a
 lib/libplot.so
 lib/libplot.so.4