Update ivtools to version 1.1.2.

Changes from 1.1.0: incorporation of our patches in the standard
distribution.

19 files changed, 8 insertions, 552 deletions

diff --git a/graphics/ivtools/Makefile b/graphics/ivtools/Makefile
index 9c08f9226cb..d6ed26177fb 100644
--- a/graphics/ivtools/Makefile
+++ b/graphics/ivtools/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.5 2003/11/18 21:09:18 markd Exp $
+# $NetBSD: Makefile,v 1.6 2003/12/14 12:02:17 markd Exp $
 
-DISTNAME=	ivtools-1.1
-PKGNAME=	ivtools-1.1.0
+DISTNAME=	ivtools-1.1.2
 WRKSRC=		${WRKDIR}/${PKGNAME:C/\.[0-9]$//}
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=ivtools/}
@@ -16,6 +15,9 @@ CONFLICTS+=	dclock-*
 GNU_CONFIGURE=	YES
 USE_X11=	YES
 
+post-patch:
+	${RM} -f ${WRKSRC}/src/include/ivstd/strstream.h
+
 pre-install:
 	${RM} -f ${WRKSRC}/config/local.def.orig
 	${RM} -f ${WRKSRC}/config/site.def.NETBSD.orig
diff --git a/graphics/ivtools/distinfo b/graphics/ivtools/distinfo
index 87043b0b219..b395296ada5 100644
--- a/graphics/ivtools/distinfo
+++ b/graphics/ivtools/distinfo
@@ -1,24 +1,7 @@
-$NetBSD: distinfo,v 1.3 2003/11/18 21:09:18 markd Exp $
+$NetBSD: distinfo,v 1.4 2003/12/14 12:02:17 markd Exp $
 
-SHA1 (ivtools-1.1.tgz) = ae5728ea757f69fea8ab58dc31d360b13537e416
-Size (ivtools-1.1.tgz) = 2158051 bytes
+SHA1 (ivtools-1.1.2.tgz) = 806ef6c2e86e9e4ef786511154410488554657ae
+Size (ivtools-1.1.2.tgz) = 2159581 bytes
 SHA1 (patch-aa) = 191619b7db43c47d7cc991bc33787434f0ef6948
 SHA1 (patch-ab) = d333341342e946e1bb44c332f35f1601dd29fce3
 SHA1 (patch-ac) = bcda1a0b71b669ad6a4900077564c226af262708
-SHA1 (patch-ad) = d375d49cfa97eb0a0d8bbdc46d598ba90f2c4d94
-SHA1 (patch-ae) = 9d4ef9a95199b3de9ea8b9a6999aa554d89de8f5
-SHA1 (patch-af) = f1c280983e03f678972d375d6c2d2d0f11099b3b
-SHA1 (patch-ag) = 1b2759aeca1f9e96b9ae6e9be425c89098a05aa5
-SHA1 (patch-ah) = b1b437c3e2e88d07896548933a88bd6fe521892f
-SHA1 (patch-ai) = 9439ab915855a4447c53ed300ca08f7a3f02969c
-SHA1 (patch-aj) = 20ce90a636eac6127d580730af19aaa9dc4dd4f9
-SHA1 (patch-ak) = b8156a5df4f2f69326cc6dac24e1024d02a5877b
-SHA1 (patch-al) = 00c28ec931991a833d7ea0136ecf2badfedd1ec3
-SHA1 (patch-am) = 61482cebd89e91202e3804d735da12dfa7a96e80
-SHA1 (patch-an) = c4b8a320f81bcd44fb89278e7cd9a5acb0337eb4
-SHA1 (patch-ao) = ffa68faf07bd473075b33372bb6a9731a5a4bfbb
-SHA1 (patch-ap) = 08a299a614ec3f561b3c4fa5cb0abbc829935a30
-SHA1 (patch-aq) = b6efcf11b3e8e5ddd324be86d446f1ef3dc11857
-SHA1 (patch-ar) = 88d07fccb61c8bbb679cd6bbad7a3299a90cb02f
-SHA1 (patch-as) = 0b8c22854ba66d29f09741b914b03a1487e82f76
-SHA1 (patch-at) = 702ee07cea0299507c801840e1dcda930931b557
diff --git a/graphics/ivtools/patches/patch-ad b/graphics/ivtools/patches/patch-ad
deleted file mode 100644
index d37d0338c6a..00000000000
--- a/graphics/ivtools/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$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
deleted file mode 100644
index a0a25d9fcd2..00000000000
--- a/graphics/ivtools/patches/patch-ae
+++ /dev/null
@@ -1,38 +0,0 @@
-$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
deleted file mode 100644
index 5e956941262..00000000000
--- a/graphics/ivtools/patches/patch-af
+++ /dev/null
@@ -1,22 +0,0 @@
-$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
deleted file mode 100644
index 55fcdac3bbc..00000000000
--- a/graphics/ivtools/patches/patch-ag
+++ /dev/null
@@ -1,45 +0,0 @@
-$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
deleted file mode 100644
index 8c2fd575105..00000000000
--- a/graphics/ivtools/patches/patch-ah
+++ /dev/null
@@ -1,22 +0,0 @@
-$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
deleted file mode 100644
index 55410656cff..00000000000
--- a/graphics/ivtools/patches/patch-ai
+++ /dev/null
@@ -1,22 +0,0 @@
-$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
deleted file mode 100644
index 71f874b2639..00000000000
--- a/graphics/ivtools/patches/patch-aj
+++ /dev/null
@@ -1,22 +0,0 @@
-$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
deleted file mode 100644
index f7276464f8f..00000000000
--- a/graphics/ivtools/patches/patch-ak
+++ /dev/null
@@ -1,31 +0,0 @@
-$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
deleted file mode 100644
index a7eaff9154c..00000000000
--- a/graphics/ivtools/patches/patch-al
+++ /dev/null
@@ -1,22 +0,0 @@
-$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
deleted file mode 100644
index f4a7328a397..00000000000
--- a/graphics/ivtools/patches/patch-am
+++ /dev/null
@@ -1,31 +0,0 @@
-$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
deleted file mode 100644
index 98c999211bb..00000000000
--- a/graphics/ivtools/patches/patch-an
+++ /dev/null
@@ -1,58 +0,0 @@
-$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
deleted file mode 100644
index 52b3a4defb6..00000000000
--- a/graphics/ivtools/patches/patch-ao
+++ /dev/null
@@ -1,40 +0,0 @@
-$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
deleted file mode 100644
index df1c7479ac6..00000000000
--- a/graphics/ivtools/patches/patch-ap
+++ /dev/null
@@ -1,58 +0,0 @@
-$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
deleted file mode 100644
index 1f68d08e965..00000000000
--- a/graphics/ivtools/patches/patch-aq
+++ /dev/null
@@ -1,22 +0,0 @@
-$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
deleted file mode 100644
index 4ae75360563..00000000000
--- a/graphics/ivtools/patches/patch-ar
+++ /dev/null
@@ -1,48 +0,0 @@
-$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
deleted file mode 100644
index a8c4aa5573c..00000000000
--- a/graphics/ivtools/patches/patch-as
+++ /dev/null
@@ -1,22 +0,0 @@
-$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
deleted file mode 100644
index 38b13da92fd..00000000000
--- a/graphics/ivtools/patches/patch-at
+++ /dev/null
@@ -1,13 +0,0 @@
-$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
- 
- /*****************************************************************************/