19 files changed, 565 insertions, 0 deletions
diff --git a/graphics/ivtools/patches/patch-ab b/graphics/ivtools/patches/patch-ab
new file mode 100644
index 00000000000..153dd3f546a
--- /dev/null
+++ b/graphics/ivtools/patches/patch-ab
@@ -0,0 +1,22 @@
+$NetBSD: patch-ab,v 1.1 2003/11/18 21:09:18 markd Exp $
+
+--- configure.orig	2003-10-23 07:16:29.000000000 +1300
++++ configure
+@@ -1643,7 +1643,7 @@ if eval "test \"`echo '$''{'ac_cv_lib_$a
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_save_LIBS="$LIBS"
+-LIBS="-lstdc++  $LIBS"
++LIBS="-lstdc++ -lm  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+ #line 1649 "configure"
+ #include "confdefs.h"
+@@ -1684,7 +1684,7 @@ if eval "test \"`echo '$''{'ac_cv_lib_$a
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_save_LIBS="$LIBS"
+-LIBS="-lstdc++  $LIBS"
++LIBS="-lstdc++ -lm  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+ #line 1690 "configure"
+ #include "confdefs.h"
diff --git a/graphics/ivtools/patches/patch-ac b/graphics/ivtools/patches/patch-ac
new file mode 100644
index 00000000000..514eaf38fba
--- /dev/null
+++ b/graphics/ivtools/patches/patch-ac
@@ -0,0 +1,14 @@
+$NetBSD: patch-ac,v 1.1 2003/11/18 21:09:18 markd Exp $
+
+--- config/site.def.NETBSD.orig	2003-10-23 07:13:39.000000000 +1300
++++ config/site.def.NETBSD
+@@ -16,6 +16,9 @@
+ #undef TroffCmd
+ #define TroffCmd groff
+ 
++#undef CppCmd
++#define CppCmd /usr/bin/cpp
++
+ /* 
+  * build RPC classes -- requires iostreams & TCP sockets
+  */
diff --git a/graphics/ivtools/patches/patch-ad b/graphics/ivtools/patches/patch-ad
new file mode 100644
index 00000000000..d37d0338c6a
--- /dev/null
+++ b/graphics/ivtools/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1 2003/11/18 21:09:18 markd Exp $
+
+--- src/ComTerp/comterp.c.orig	2003-10-23 07:13:57.000000000 +1300
++++ src/ComTerp/comterp.c
+@@ -58,7 +58,7 @@
+ #include <ctype.h>
+ #include <iostream.h>
+ #include <string.h>
+-#include <strstream.h>
++#include <strstream>
+ #include <unistd.h>
+ #if __GNUC__>=3
+ #include <fstream.h>
diff --git a/graphics/ivtools/patches/patch-ae b/graphics/ivtools/patches/patch-ae
new file mode 100644
index 00000000000..a0a25d9fcd2
--- /dev/null
+++ b/graphics/ivtools/patches/patch-ae
@@ -0,0 +1,38 @@
+$NetBSD: patch-ae,v 1.1 2003/11/18 21:09:18 markd Exp $
+
+--- src/ComTerp/debugfunc.c.orig	2003-10-23 07:13:58.000000000 +1300
++++ src/ComTerp/debugfunc.c
+@@ -26,7 +26,7 @@
+ 
+ #include <ComTerp/debugfunc.h>
+ #include <ComTerp/comterpserv.h>
+-#include <strstream.h>
++#include <strstream>
+ #if __GNUC__==2 && __GNUC_MINOR__<=7
+ #else
+ #include <vector.h>
+@@ -76,13 +76,13 @@ void ComterpPauseFunc::execute_body(ComV
+   comterp()->npause()++;
+ 
+  if (msgstrv.is_string()) {
+-    ostrstream sbuf1_s;
++    std::ostrstream sbuf1_s;
+     sbuf1_s << (stepfunc() ? "step(" : "pause(") << comterp()->npause() << "): " 
+ 	    << msgstrv.string_ptr() << "\n";
+     sbuf1_s.put('\0');
+     cerr << sbuf1_s.str();
+  }
+-  ostrstream sbuf2_s;
++  std::ostrstream sbuf2_s;
+   sbuf2_s << (stepfunc() ? "step(" : "pause(") << comterp()->npause() << "): enter command or press C/R to continue\n";
+   sbuf2_s.put('\0');
+   cerr << sbuf2_s.str();
+@@ -149,7 +149,7 @@ void ComterpPauseFunc::execute_body(ComV
+     }
+   } while (cvect[0] != '\n');
+   comterp()->pop_servstate();
+-  ostrstream sbuf_e;
++  std::ostrstream sbuf_e;
+   sbuf_e << (stepfunc() ? "end of step(" : "end of pause(") << comterp()->npause()-- << ")\n";
+   sbuf_e.put('\0');
+   cerr << sbuf_e.str();
diff --git a/graphics/ivtools/patches/patch-af b/graphics/ivtools/patches/patch-af
new file mode 100644
index 00000000000..5e956941262
--- /dev/null
+++ b/graphics/ivtools/patches/patch-af
@@ -0,0 +1,22 @@
+$NetBSD: patch-af,v 1.1 2003/11/18 21:09:18 markd Exp $
+
+--- src/ComTerp/helpfunc.c.orig	2003-10-23 07:13:58.000000000 +1300
++++ src/ComTerp/helpfunc.c
+@@ -34,7 +34,7 @@ vv * FROM LOSS OF USE, DATA OR PROFITS, 
+ #include <OS/math.h>
+ 
+ #include <iostream.h>
+-#include <strstream.h>
++#include <strstream>
+ #if __GNUC__>=3
+ #include <fstream.h>
+ #endif
+@@ -127,7 +127,7 @@ void HelpFunc::execute() {
+   
+   reset_stack();
+ 
+-  strstreambuf sbuf;
++  std::strstreambuf sbuf;
+ #if __GNUC__<3
+   filebuf fbuf;
+   if (comterp()->handler()) {
diff --git a/graphics/ivtools/patches/patch-ag b/graphics/ivtools/patches/patch-ag
new file mode 100644
index 00000000000..55fcdac3bbc
--- /dev/null
+++ b/graphics/ivtools/patches/patch-ag
@@ -0,0 +1,45 @@
+$NetBSD: patch-ag,v 1.1 2003/11/18 21:09:18 markd Exp $
+
+--- src/ComTerp/iofunc.c.orig	2003-10-23 07:13:58.000000000 +1300
++++ src/ComTerp/iofunc.c
+@@ -31,7 +31,7 @@
+ #include <Attribute/attrlist.h>
+ #include <OS/math.h>
+ #include <iostream.h>
+-#include <strstream.h>
++#include <strstream>
+ #if __GNUC__>=3
+ #include <fstream.h>
+ #endif
+@@ -73,7 +73,7 @@ void PrintFunc::execute() {
+     } else
+       fbuf->attach(fileno(errflag.is_false() ? stdout : stderr));
+   } else {
+-    strmbuf = new strstreambuf();
++    strmbuf = new std::strstreambuf();
+   }
+ #else
+   streambuf* strmbuf = nil;
+@@ -87,7 +87,7 @@ void PrintFunc::execute() {
+       fbuf = new fileptr_filebuf(errflag.is_false() ? stdout : stderr, ios_base::out);
+     strmbuf = fbuf;
+   } else
+-    strmbuf = new strstreambuf();
++    strmbuf = new std::strstreambuf();
+ #endif
+   ostream out(strmbuf);
+ 
+@@ -177,11 +177,11 @@ void PrintFunc::execute() {
+ 
+   if (stringflag.is_true() || strflag.is_true()) {
+     out << '\0';
+-    ComValue retval(((strstreambuf*)strmbuf)->str());
++    ComValue retval(((std::strstreambuf*)strmbuf)->str());
+     push_stack(retval);
+   } else if (symbolflag.is_true() || symflag.is_true()) {
+     out << '\0';
+-    int symbol_id = symbol_add(((strstreambuf*)strmbuf)->str());
++    int symbol_id = symbol_add(((std::strstreambuf*)strmbuf)->str());
+     ComValue retval(symbol_id, ComValue::SymbolType);
+     push_stack(retval);
+   }
diff --git a/graphics/ivtools/patches/patch-ah b/graphics/ivtools/patches/patch-ah
new file mode 100644
index 00000000000..8c2fd575105
--- /dev/null
+++ b/graphics/ivtools/patches/patch-ah
@@ -0,0 +1,22 @@
+$NetBSD: patch-ah,v 1.1 2003/11/18 21:09:18 markd Exp $
+
+--- src/IV-X11/xdrag.c.orig	2003-10-23 07:15:47.000000000 +1300
++++ src/IV-X11/xdrag.c
+@@ -41,7 +41,7 @@
+ #include <OS/math.h>
+ #include <OS/types.h>
+ #include <string.h>
+-#include <strstream.h>
++#include <strstream>
+ 
+ // how is this done portably? it is used to generate a name unique to
+ // this process.
+@@ -129,7 +129,7 @@ static void setDragProperty(
+     Atom property = None;
+     if (length != 0) {
+ 	char buffer[256];
+-	ostrstream name(buffer, 256);
++	std::ostrstream name(buffer, 256);
+ 	name << dragName << "_" << Host::name() << "_" << getpid() << "_"  <<
+ 	    dropUid++ << '\0';
+ 	property = XInternAtom(display, name.str(), False);
diff --git a/graphics/ivtools/patches/patch-ai b/graphics/ivtools/patches/patch-ai
new file mode 100644
index 00000000000..55410656cff
--- /dev/null
+++ b/graphics/ivtools/patches/patch-ai
@@ -0,0 +1,22 @@
+$NetBSD: patch-ai,v 1.1 2003/11/18 21:09:18 markd Exp $
+
+--- src/AttrGlyph/attredit.c.orig	2003-10-23 07:13:40.000000000 +1300
++++ src/AttrGlyph/attredit.c
+@@ -41,7 +41,7 @@
+ 
+ #include <IVGlyph/textedit.h>
+ 
+-#include <strstream.h>
++#include <strstream>
+ #include <string.h>
+ #if __GNUC__==2 && __GNUC_MINOR__<=7
+ #else
+@@ -139,7 +139,7 @@ void AttributeListEditor::update_text(bo
+ #else
+         vbuf.push_back(' ');
+ #endif
+-	strstream valstr;
++	std::strstream valstr;
+ 	valstr << *attr->Value() << '\0';
+ 	const char* val = valstr.str();
+ 	int vallen = val ? strlen(val) : 0;
diff --git a/graphics/ivtools/patches/patch-aj b/graphics/ivtools/patches/patch-aj
new file mode 100644
index 00000000000..71f874b2639
--- /dev/null
+++ b/graphics/ivtools/patches/patch-aj
@@ -0,0 +1,22 @@
+$NetBSD: patch-aj,v 1.1 2003/11/18 21:09:18 markd Exp $
+
+--- src/ComGlyph/attrdialog.c.orig	2003-10-23 07:13:49.000000000 +1300
++++ src/ComGlyph/attrdialog.c
+@@ -49,7 +49,7 @@
+ #include <iostream.h>
+ #include <stdio.h>
+ #include <string.h>
+-#include <strstream.h>
++#include <strstream>
+ 
+ /*****************************************************************************/
+ 
+@@ -186,7 +186,7 @@ void AttrDialogImpl::eval() {
+ 
+ 	    const int bufsiz = BUFSIZ;
+ 	    char buf[bufsiz];
+-	    strstream outstr(buf, bufsiz);
++	    std::strstream outstr(buf, bufsiz);
+ 	    outstr << retval;
+ 	    outstr.put('\0');
+             result_->textvalue(buf);
diff --git a/graphics/ivtools/patches/patch-ak b/graphics/ivtools/patches/patch-ak
new file mode 100644
index 00000000000..f7276464f8f
--- /dev/null
+++ b/graphics/ivtools/patches/patch-ak
@@ -0,0 +1,31 @@
+$NetBSD: patch-ak,v 1.1 2003/11/18 21:09:18 markd Exp $
+
+--- src/ComGlyph/comtextview.c.orig	2003-10-23 07:13:47.000000000 +1300
++++ src/ComGlyph/comtextview.c
+@@ -49,7 +49,7 @@
+ #include <ComTerp/comvalue.h>
+ #include <ctype.h>
+ #include <iostream.h>
+-#include <strstream.h>
++#include <strstream>
+ #include <string.h>
+ 
+ #define XK_MISCELLANY           /* to get the keysym's we need */
+@@ -232,7 +232,7 @@ void ComTE_View::newline()
+ #else
+   ComValue result(comterp()->pop_stack());
+ #endif
+-  ostream* out = new strstream();
++  ostream* out = new std::strstream();
+   if (*comterp()->errmsg()) {
+     *out << comterp()->errmsg() << "\n";
+   } else {
+@@ -248,7 +248,7 @@ void ComTE_View::newline()
+   }
+   out->put('\0');
+   out->flush();
+-  strstream* sout = (strstream*)out;
++  std::strstream* sout = (std::strstream*)out;
+   insert_string(sout->str(), strlen(sout->str()));
+   comterp()->brief(old_brief);
+   delete out; 
diff --git a/graphics/ivtools/patches/patch-al b/graphics/ivtools/patches/patch-al
new file mode 100644
index 00000000000..a7eaff9154c
--- /dev/null
+++ b/graphics/ivtools/patches/patch-al
@@ -0,0 +1,22 @@
+$NetBSD: patch-al,v 1.1 2003/11/18 21:09:18 markd Exp $
+
+--- src/ComGlyph/terpdialog.c.orig	2003-10-23 07:13:49.000000000 +1300
++++ src/ComGlyph/terpdialog.c
+@@ -49,7 +49,7 @@
+ #include <iostream.h>
+ #include <stdio.h>
+ #include <string.h>
+-#include <strstream.h>
++#include <strstream>
+ 
+ /*****************************************************************************/
+ 
+@@ -446,7 +446,7 @@ void TerpDialogImpl::eval() {
+     } else {
+         char buf[BUFSIZ];
+         buf[0] = '\0';
+-        ostrstream ostr(buf, BUFSIZ);
++        std::ostrstream ostr(buf, BUFSIZ);
+ 	
+         ostr << retval;
+ 	ostr << '\0';
diff --git a/graphics/ivtools/patches/patch-am b/graphics/ivtools/patches/patch-am
new file mode 100644
index 00000000000..f4a7328a397
--- /dev/null
+++ b/graphics/ivtools/patches/patch-am
@@ -0,0 +1,31 @@
+$NetBSD: patch-am,v 1.1 2003/11/18 21:09:18 markd Exp $
+
+--- src/Unidraw/catalog.c.orig	2003-10-23 07:15:03.000000000 +1300
++++ src/Unidraw/catalog.c
+@@ -63,7 +63,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <stream.h>
+-#include <strstream.h>
++#include <strstream>
+ #ifdef SYSV
+ #include <OS/types.h>
+ #include <unistd.h>
+@@ -708,7 +708,7 @@ void* Catalog::CopyObject (void* obj, Cl
+     ObjectMap* prevMap = _curMap;
+     ObjectMap omap(obj, base_id), imap(copy, base_id);
+ 
+-    strstream inout;
++    std::strstream inout;
+ 
+     _curMap = &omap;
+     boolean ok = SaveObject(obj, base_id, inout);
+@@ -1660,7 +1660,7 @@ PSPattern* Catalog::ReadPattern (const c
+ 	    }
+ 
+ 	} else {
+-	    istrstream in(definition, strlen(definition) + 1);
++	    std::istrstream in(definition, strlen(definition) + 1);
+             int data[patternHeight];
+             int i;
+ 	    for (i = 0; !in.eof() && in.good() && i < patternHeight; i++) {
diff --git a/graphics/ivtools/patches/patch-an b/graphics/ivtools/patches/patch-an
new file mode 100644
index 00000000000..98c999211bb
--- /dev/null
+++ b/graphics/ivtools/patches/patch-an
@@ -0,0 +1,58 @@
+$NetBSD: patch-an,v 1.1 2003/11/18 21:09:18 markd Exp $
+
+--- src/OverlayUnidraw/ovimport.c.orig	2003-10-23 07:16:21.000000000 +1300
++++ src/OverlayUnidraw/ovimport.c
+@@ -100,7 +100,7 @@
+ #include <ctype.h>
+ #include <fstream.h>
+ #include <string.h>
+-#include <strstream.h>
++#include <strstream>
+ #include <fcntl.h>
+ #include <errno.h>
+ #include <phold.h>
+@@ -246,7 +246,7 @@ void FileHelper::add_stream(istream* is)
+ class ReadPpmIterator {
+ public:
+   ReadPpmIterator(OverlayRaster*);
+-  void getPixels(strstream&);
++  void getPixels(std::strstream&);
+   OverlayRaster* raster() const;
+   u_long xcur() { return _xcur; }
+   u_long ycur() { return _ycur; }
+@@ -282,7 +282,7 @@ ReadPpmIterator::ReadPpmIterator(Overlay
+ {
+ }
+ 
+-void ReadPpmIterator::getPixels(strstream& in) {
++void ReadPpmIterator::getPixels(std::strstream& in) {
+   // cerr << "pcount: " << in.pcount() << "\ttellg: " << in.tellg() << endl;
+   while((in.pcount() - in.tellg()) >= 3 && in.good() && !in.eof()) { 
+     u_char r, g, b;
+@@ -357,7 +357,7 @@ protected:
+ 
+   ReadPpmIterator* _itr;
+ 
+-  ostrstream _save;
++  std::ostrstream _save;
+ };
+ 
+ HandlerList ReadImageHandler::_handlers;
+@@ -442,7 +442,7 @@ void ReadImageHandler::timerExpired(long
+ 
+ 
+ int ReadImageHandler::process(const char* newdat, int len) {
+-  strstream in;
++  std::strstream in;
+   in.write(_save.str(), _save.tellp());
+   _save.freeze(0);
+   in.write(newdat, len);
+@@ -452,7 +452,7 @@ int ReadImageHandler::process(const char
+       "^[ \f\n\r\t\v]*[0-9]+[ \f\n\r\t\v]+[0-9]+[ \f\n\r\t\v]+[0-9]+"
+     );
+ 
+-    ostrstream tmp;  // need to placate Regexp :-(
++    std::ostrstream tmp;  // need to placate Regexp :-(
+     tmp.write(in.str(), in.pcount());
+     in.freeze(0);
+     int pos = endOfHeader.Search(
diff --git a/graphics/ivtools/patches/patch-ao b/graphics/ivtools/patches/patch-ao
new file mode 100644
index 00000000000..52b3a4defb6
--- /dev/null
+++ b/graphics/ivtools/patches/patch-ao
@@ -0,0 +1,40 @@
+$NetBSD: patch-ao,v 1.1 2003/11/18 21:09:18 markd Exp $
+
+--- src/OverlayUnidraw/ovipcmds.c.orig	2003-10-23 07:16:21.000000000 +1300
++++ src/OverlayUnidraw/ovipcmds.c
+@@ -76,7 +76,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <iostream.h>
+-#include <strstream.h>
++#include <strstream>
+ 
+ 
+ RasterTerp::RasterTerp(Editor* ed) : _editor(ed) {
+@@ -639,7 +639,7 @@ OverlayRaster* ScaleGrayCmd::Process(Ove
+        "Enter min and max for linear scaling of gray values",
+        "0.0 1.0");
+     if (newminmax) {
+-      istrstream in(newminmax);
++      std::istrstream in(newminmax);
+       float fmin, fmax;
+       in >> fmin >> fmax;
+       if (in.good()) {
+@@ -731,7 +731,7 @@ OverlayRaster* PseudocolorCmd::Process(O
+     char* newminmax = StrEditDialog::post
+       (GetEditor()->GetWindow(), message, range);
+     if (newminmax) {
+-      istrstream in(newminmax);
++      std::istrstream in(newminmax);
+       float fmin, fmax;
+       in >> fmin >> fmax;
+       if (in.good()) {
+@@ -815,7 +815,7 @@ OverlayRaster* LogScaleCmd::Process(Over
+        "Enter min and max for logarithmic scaling of gray values",
+        "0.0 1.0");
+     if (newminmax) {
+-      istrstream in(newminmax);
++      std::istrstream in(newminmax);
+       float fmin, fmax;
+       in >> fmin >> fmax;
+       if (in.good()) {
diff --git a/graphics/ivtools/patches/patch-ap b/graphics/ivtools/patches/patch-ap
new file mode 100644
index 00000000000..df1c7479ac6
--- /dev/null
+++ b/graphics/ivtools/patches/patch-ap
@@ -0,0 +1,58 @@
+$NetBSD: patch-ap,v 1.1 2003/11/18 21:09:18 markd Exp $
+
+--- src/OverlayUnidraw/ovprecise.c.orig	2003-10-23 07:16:21.000000000 +1300
++++ src/OverlayUnidraw/ovprecise.c
+@@ -39,7 +39,7 @@
+ #include <InterViews/window.h>
+ #include <stdio.h>
+ #include <string.h>
+-#include <strstream.h>
++#include <strstream>
+ 
+ /*****************************************************************************/
+ 
+@@ -90,7 +90,7 @@ void OvPreciseMoveCmd::Execute () {
+     _default_enumval = cur_unit;
+ 
+     if (movestr) {
+-      istrstream in(movestr);
++      std::istrstream in(movestr);
+       float xmove = 0, ymove = 0;
+       in >> xmove >> ymove;
+ 
+@@ -135,7 +135,7 @@ void OvPreciseScaleCmd::Execute () {
+ 			  "Enter X and Y scaling:",
+ 			  default_scalestr);
+     if (scalestr) {
+-      istrstream in(scalestr);
++      std::istrstream in(scalestr);
+       float xscale = 0.0, yscale = 0.0;
+       in >> xscale >> yscale;
+       if (xscale !=0.0 && yscale != 0.0) {
+@@ -173,7 +173,7 @@ void OvPreciseRotateCmd::Execute () {
+ 			  "Enter rotation in degrees:",
+ 			  default_rotatestr);
+     if (rotatestr) {
+-      istrstream in(rotatestr);
++      std::istrstream in(rotatestr);
+       float angle = 0.0;
+       in >> angle;
+       if (angle!=0.0) {
+@@ -218,7 +218,7 @@ void OvPrecisePageCmd::Execute () {
+ 			  "Enter width and height of page:",
+ 			  default_pagestr);
+     if (pagestr) {
+-      istrstream in(pagestr);
++      std::istrstream in(pagestr);
+       int xpage = 0, ypage = 0;
+       in >> xpage >> ypage;
+       if (xpage !=0 && ypage != 0) {
+@@ -256,7 +256,7 @@ void OvPreciseBrushCmd::Execute () {
+ 			  "Enter brush width in pixels:",
+ 			  default_widthstr);
+     if (widthstr) {
+-      istrstream in(widthstr);
++      std::istrstream in(widthstr);
+       float width = 0;
+       in >> width;
+       if (width>=0.0) {
diff --git a/graphics/ivtools/patches/patch-aq b/graphics/ivtools/patches/patch-aq
new file mode 100644
index 00000000000..1f68d08e965
--- /dev/null
+++ b/graphics/ivtools/patches/patch-aq
@@ -0,0 +1,22 @@
+$NetBSD: patch-aq,v 1.1 2003/11/18 21:09:18 markd Exp $
+
+--- src/ComUnidraw/comeditor.c.orig	2003-10-23 07:14:06.000000000 +1300
++++ src/ComUnidraw/comeditor.c
+@@ -58,7 +58,7 @@
+ 
+ #include <Attribute/attrlist.h>
+ 
+-#include <strstream.h>
++#include <strstream>
+ #include <string.h>
+ 
+ /*****************************************************************************/
+@@ -231,7 +231,7 @@ void ComEditor::AddCommands(ComTerp* com
+   if(!whiteboard()) 
+     OverlayEditor::ExecuteCmd(cmd);
+   else {
+-    ostrstream sbuf;
++    std::ostrstream sbuf;
+     boolean oldflag = OverlayScript::ptlist_parens();
+     OverlayScript::ptlist_parens(false);
+     switch (cmd->GetClassId()) {
diff --git a/graphics/ivtools/patches/patch-ar b/graphics/ivtools/patches/patch-ar
new file mode 100644
index 00000000000..4ae75360563
--- /dev/null
+++ b/graphics/ivtools/patches/patch-ar
@@ -0,0 +1,48 @@
+$NetBSD: patch-ar,v 1.1 2003/11/18 21:09:18 markd Exp $
+
+--- src/ComUnidraw/unifunc.c.orig	2003-10-23 07:14:06.000000000 +1300
++++ src/ComUnidraw/unifunc.c
+@@ -56,7 +56,7 @@
+ #include <ComTerp/comvalue.h>
+ #include <Attribute/attrlist.h>
+ #include <stdio.h>
+-#include <strstream.h>
++#include <strstream>
+ #include <unistd.h>
+ #if __GNUC__>=3
+ #include <fstream.h>
+@@ -494,7 +494,7 @@ void ExportFunc::execute() {
+ #endif
+     ostream* out;
+     if (string.is_true()||str.is_true())
+-      out = new strstream();
++      out = new std::strstream();
+     else
+ #if __GNUC__<3      
+       out = new ostream(&fbuf);
+@@ -557,7 +557,7 @@ void ExportFunc::execute() {
+     
+     if (string.is_true()||str.is_true()) {
+       *out << '\0'; out->flush();
+-      ComValue retval(((strstream*)out)->str());
++      ComValue retval(((std::strstream*)out)->str());
+       push_stack(retval);
+     }
+     delete out;
+@@ -652,14 +652,14 @@ void UnidrawPauseFunc::execute() {
+ 	tv->insert_string((char*)msgstrv.string_ptr(), strlen(msgstrv.string_ptr()));
+ 	tv->insert_char('\n');
+       }
+-      ostrstream sbuf_s;
++      std::ostrstream sbuf_s;
+       sbuf_s << "pause(" << comterpserv()->npause() << "): enter command or press C/R to continue\n";
+       sbuf_s.put('\0');
+       tv->insert_string(sbuf_s.str(), strlen(sbuf_s.str()));
+       comterpserv()->push_servstate();
+       unidraw->Run();
+       comterpserv()->pop_servstate();
+-      ostrstream sbuf_e;
++      std::ostrstream sbuf_e;
+       sbuf_e << "end of pause(" << comterpserv()->npause()+1 << ")\n";
+       sbuf_e.put('\0');
+       tv->insert_string(sbuf_e.str(), strlen(sbuf_e.str()));
diff --git a/graphics/ivtools/patches/patch-as b/graphics/ivtools/patches/patch-as
new file mode 100644
index 00000000000..a8c4aa5573c
--- /dev/null
+++ b/graphics/ivtools/patches/patch-as
@@ -0,0 +1,22 @@
+$NetBSD: patch-as,v 1.1 2003/11/18 21:09:18 markd Exp $
+
+--- src/GraphUnidraw/nodecomp.c.orig	2003-10-23 07:14:49.000000000 +1300
++++ src/GraphUnidraw/nodecomp.c
+@@ -78,7 +78,7 @@
+ #include <iostream.h>
+ #include <stdio.h>
+ #include <string.h>
+-#include <strstream.h>
++#include <strstream>
+ 
+ FullGraphic* NodeView::_nv_gs = nil;
+ 
+@@ -602,7 +602,7 @@ void NodeComp::update(Observable*) {
+ 	GetComTerp();
+       boolean old_brief = comterp->brief();
+       comterp->brief(true);
+-      ostrstream outstr;
++      std::ostrstream outstr;
+       NodeComp* node;
+       int incnt = 1;
+       while (node = NodeIn(incnt)) {
diff --git a/graphics/ivtools/patches/patch-at b/graphics/ivtools/patches/patch-at
new file mode 100644
index 00000000000..38b13da92fd
--- /dev/null
+++ b/graphics/ivtools/patches/patch-at
@@ -0,0 +1,13 @@
+$NetBSD: patch-at,v 1.1 2003/11/18 21:09:18 markd Exp $
+
+--- src/Attribute/paramlist.c.orig	2003-10-23 07:13:42.000000000 +1300
++++ src/Attribute/paramlist.c
+@@ -39,7 +39,7 @@
+ #include <stdio.h>
+ #include <string.h>
+ #ifndef __APPLE__
+-#include <strstream.h>
++#include <strstream>
+ #endif
+ 
+ /*****************************************************************************/