more g++-3 header issues. don't use the compat headers.

10 files changed, 130 insertions, 150 deletions

diff --git a/sysutils/xosview/patches/patch-ai b/sysutils/xosview/patches/patch-ai
index f69068151dd..057b5dfdba5 100644
--- a/sysutils/xosview/patches/patch-ai
+++ b/sysutils/xosview/patches/patch-ai
@@ -1,15 +1,17 @@
-$NetBSD: patch-ai,v 1.1 2003/09/30 23:03:59 christos Exp $
+$NetBSD: patch-ai,v 1.2 2003/10/01 01:14:35 christos Exp $
 
 --- bsd/btrymeter.cc.orig	1999-02-16 09:09:22.000000000 -0500
-+++ bsd/btrymeter.cc	2003-09-30 18:39:27.000000000 -0400
-@@ -11,6 +11,7 @@
++++ bsd/btrymeter.cc	2003-09-30 21:07:12.000000000 -0400
+@@ -11,7 +11,8 @@
  //
  #include "btrymeter.h"
  #include "xosview.h"
+-#include <fstream.h>
 +#include <iostream>
- #include <fstream.h>
++#include <fstream>
  #include <stdlib.h>
  
+ #include <fcntl.h>
 @@ -52,7 +53,7 @@
    int loadinfo = open(APMFILENAME, O_RDONLY, 0);
  
diff --git a/sysutils/xosview/patches/patch-al b/sysutils/xosview/patches/patch-al
index 8c357c1bb53..1e6ad32e578 100644
--- a/sysutils/xosview/patches/patch-al
+++ b/sysutils/xosview/patches/patch-al
@@ -1,11 +1,13 @@
-$NetBSD: patch-al,v 1.2 2003/10/01 00:33:54 christos Exp $
+$NetBSD: patch-al,v 1.3 2003/10/01 01:14:35 christos Exp $
 
 --- fieldmeter.cc.orig	1999-02-16 09:08:35.000000000 -0500
-+++ fieldmeter.cc	2003-09-30 20:28:39.000000000 -0400
-@@ -8,2 +8,3 @@
++++ fieldmeter.cc	2003-09-30 20:48:22.000000000 -0400
+@@ -8,3 +8,4 @@
  //
+-#include <fstream.h>
 +#include <iostream>
- #include <fstream.h>
++#include <fstream>
+ #include <stdlib.h>
 @@ -296,10 +297,10 @@
        || (x > x_ + width_) || (x + width > x_ + width_)){
 -    cerr << "FieldMeter::checkX() : bad horiz values for meter : "
diff --git a/sysutils/xosview/patches/patch-am b/sysutils/xosview/patches/patch-am
index bb33d551a0e..b4a58350cd7 100644
--- a/sysutils/xosview/patches/patch-am
+++ b/sysutils/xosview/patches/patch-am
@@ -1,69 +1,44 @@
-$NetBSD: patch-am,v 1.2 2003/10/01 00:33:54 christos Exp $
+$NetBSD: patch-am,v 1.3 2003/10/01 01:14:35 christos Exp $
 
 --- Xrm.cc.orig	1999-02-16 09:08:35.000000000 -0500
-+++ Xrm.cc	2003-09-30 18:44:38.000000000 -0400
-@@ -11,10 +11,13 @@
- #include <stdlib.h>
- #include <stdio.h>	//  For snprintf().
++++ Xrm.cc	2003-09-30 20:34:27.000000000 -0400
+@@ -13,3 +13,3 @@
  #include <ctype.h>
 -#include <iostream.h>
 +#include <iostream>
  #include <unistd.h>  //  for access(), etc.  BCG
- #include "snprintf.h"
+@@ -17,2 +17,5 @@
  #include "general.h"
 +#ifndef NULL
 +#define NULL 0
 +#endif
  #include "Xrm.h"
- #include "Xrmcommandline.h"
- 
-@@ -29,7 +32,7 @@
- bool Xrm::_initialized = false;
- 
+@@ -31,3 +34,3 @@
  Xrm::Xrm(const char *instanceName, int argc, char **argv){
 -  cerr << " Error:  This constructor is not supported yet.\n";
 +  std::cerr << " Error:  This constructor is not supported yet." << std::endl;
    exit (-1);
-   _db = NULL;
-   _class = _instance = NULLQUARK;
-@@ -114,7 +117,7 @@
-   }
-   else
+@@ -116,3 +119,3 @@
    {
 -    cerr << "Error:  Xrm:loadAndMergeResources() called twice!\n";
 +    std::cerr << "Error:  Xrm:loadAndMergeResources() called twice!" << std::endl;
      exit (-1);
-   }
-   //  This is ugly code.  According to X and Xt rules, many files need
-@@ -218,14 +221,14 @@
- 
- 
+@@ -220,3 +223,3 @@
  //------------  Some debugging functions follow.  -----------------------
 -inline ostream &operator<<(ostream &os, const XrmBinding &b){
 +inline std::ostream &operator<<(std::ostream &os, const XrmBinding &b){
    switch (b){
-   case XrmBindTightly:
-     return os << ".";
-   case XrmBindLoosely:
-     return os << "*";
+@@ -227,3 +230,3 @@
    default:
 -    cerr <<"ostream operator<<(ostream &, const XrmBinding &) : "
 +    std::cerr <<"std::ostream operator<<(std::ostream &, const XrmBinding &) : "
        <<"Unknown XrmBinding!";
-     return os;
-   }
-@@ -233,7 +236,7 @@
-   return os;
- }
+@@ -235,3 +238,3 @@
  
 -ostream &Xrm::dump(ostream &os) const {
 +std::ostream &Xrm::dump(std::ostream &os) const {
    os <<"--- Xrm --- class: " <<XrmQuarkToString(_class)
-      <<", instance: " <<XrmQuarkToString(_instance) <<"\n";
- 
-@@ -250,10 +253,10 @@
-                  XrmQuarkList quarks, XrmRepresentation *type,
-                  XrmValue *value, XPointer closure) {
+@@ -252,6 +255,6 @@
    
 -  ostream *os = (ostream *)closure;
 +  std::ostream *os = (std::ostream *)closure;
@@ -72,10 +47,8 @@ $NetBSD: patch-am,v 1.2 2003/10/01 00:33:54 christos Exp $
 -  //cerr <<"type = " <<XrmQuarkToString(*type) <<endl;
 +  //std::cerr <<"type = " <<XrmQuarkToString(*type) <<std::endl;
  
-   int i = 0;
-   while (quarks[i] != NULLQUARK){
 --- Xrm.h.orig	1999-02-16 09:08:34.000000000 -0500
-+++ Xrm.h	2003-09-30 20:29:33.000000000 -0400
++++ Xrm.h	2003-09-30 20:34:27.000000000 -0400
 @@ -18,4 +18,2 @@
  
 -class ostream;
diff --git a/sysutils/xosview/patches/patch-an b/sysutils/xosview/patches/patch-an
index d1291ab04b0..ae529a6011b 100644
--- a/sysutils/xosview/patches/patch-an
+++ b/sysutils/xosview/patches/patch-an
@@ -1,28 +1,20 @@
-$NetBSD: patch-an,v 1.1 2003/09/30 23:03:59 christos Exp $
+$NetBSD: patch-an,v 1.2 2003/10/01 01:14:35 christos Exp $
 
 --- fieldmeterdecay.cc.orig	1999-02-16 09:08:35.000000000 -0500
-+++ fieldmeterdecay.cc	2003-09-30 18:46:03.000000000 -0400
-@@ -26,6 +26,7 @@
- //   4.  Make the checkResources () function in the meter set the 
- //	 dodecay_ variable according to the, e.g., xosview*cpuDecay resource.
++++ fieldmeterdecay.cc	2003-09-30 20:48:49.000000000 -0400
+@@ -28,3 +28,4 @@
  
+-#include <fstream.h>
 +#include <iostream>
- #include <fstream.h>
++#include <fstream>
  #include <math.h>		//  For fabs()
- #include "general.h"
-@@ -137,13 +138,13 @@
-       //    Let's correct for that here.
-     if ( manditory || (twidth != lastvals_[i]) || (x != lastx_[i]) ){
+@@ -139,3 +140,3 @@
        if (!checkX(x, twidth))
 -        cerr <<__FILE__ << ":" << __LINE__ <<endl;
 +        std::cerr <<__FILE__ << ":" << __LINE__ <<std::endl;
        parent_->drawFilledRectangle( x, y_, twidth, halfheight );
-     }
- 
-     if ( manditory || (decay_[i] != lastDecayval_[i]) ){
+@@ -145,3 +146,3 @@
        if (!checkX(decayx, decaytwidth))
 -        cerr <<__FILE__ << ":" << __LINE__ <<endl;
 +        std::cerr <<__FILE__ << ":" << __LINE__ <<std::endl;
        parent_->drawFilledRectangle( decayx, y_+halfheight+1,
-             decaytwidth, height_ - halfheight-1);
-     }
diff --git a/sysutils/xosview/patches/patch-aq b/sysutils/xosview/patches/patch-aq
index ba02deb34cc..fad7e29ec62 100644
--- a/sysutils/xosview/patches/patch-aq
+++ b/sysutils/xosview/patches/patch-aq
@@ -1,169 +1,113 @@
-$NetBSD: patch-aq,v 1.1 2003/09/30 23:03:59 christos Exp $
+$NetBSD: patch-aq,v 1.2 2003/10/01 01:14:35 christos Exp $
 
 --- xwin.cc.orig	1999-02-16 09:08:34.000000000 -0500
-+++ xwin.cc	2003-09-30 18:46:45.000000000 -0400
-@@ -3,6 +3,7 @@
- //
- 
++++ xwin.cc	2003-09-30 20:47:37.000000000 -0400
+@@ -5,2 +5,3 @@
  #include <X11/Xatom.h>
 +#include <iostream>
  #include <stdlib.h>
- #include <unistd.h>
- #include "snprintf.h"
-@@ -22,8 +23,8 @@
- //-----------------------------------------------------------------------------
- 
+@@ -24,4 +25,4 @@
  XWin::XWin( int argc, char *argv[], int x, int y, int width, int height ){
 -  cerr << "This constructor call is not supported! (" << __FILE__
 -       << ":" << __LINE__ << ")" << endl;
 +  std::cerr << "This constructor call is not supported! (" << __FILE__
 +       << ":" << __LINE__ << ")" << std::endl;
    exit (-1);
-   //  FIXME BCG  This constructor needs to do much of the work of the above
-   //  one.  Or, we need to drop this as a constructor.  As it is, it is
-@@ -134,7 +135,7 @@
-   map();
-   flush();
+@@ -136,3 +137,3 @@
    if(XGetWindowAttributes(display_, window_, &attr_) == 0){
 -    cerr <<"Error getting attributes of Main." <<endl;
 +    std::cerr <<"Error getting attributes of Main." <<std::endl;
      exit(2);
-   }
- 
-@@ -154,8 +155,8 @@
-   const char* fontName = getResource("font");
- 
+@@ -156,4 +157,4 @@
    if ((font_ = XLoadQueryFont(display_, fontName)) == NULL){
 -    cerr <<name_ <<": display " <<DisplayString(display_)
 -      <<" cannot load font " << fontName << endl;
 +    std::cerr <<name_ <<": display " <<DisplayString(display_)
 +      <<" cannot load font " << fontName << std::endl;
      exit(1);
-   }
- }
-@@ -164,7 +165,7 @@
- void XWin::setHints( int argc, char *argv[] ){
-   // Set up class hint
+@@ -166,3 +167,3 @@
    if((classhints_ = XAllocClassHint()) == NULL){
 -    cerr <<"Error allocating class hint!" <<endl;
 +    std::cerr <<"Error allocating class hint!" <<std::endl;
      exit(1);
-   }
-   //  We have to cast away the const's.
-@@ -173,7 +174,7 @@
- 
-   // Set up the window manager hints
+@@ -175,3 +176,3 @@
    if((wmhints_ = XAllocWMHints()) == NULL){
 -    cerr <<"Error allocating Window Manager hints!" <<endl;
 +    std::cerr <<"Error allocating Window Manager hints!" <<std::endl;
      exit(1);
-   }
-   wmhints_->flags = (InputHint|StateHint);
-@@ -182,11 +183,11 @@
- 
-   // Set up XTextProperty for window name and icon name
+@@ -184,3 +185,3 @@
    if(XStringListToTextProperty(&name_, 1, &title_) == 0){
 -    cerr <<"Error creating XTextProperty!" <<endl;
 +    std::cerr <<"Error creating XTextProperty!" <<std::endl;
      exit(1);
-   }
+@@ -188,3 +189,3 @@
    if(XStringListToTextProperty(&name_, 1, &iconname_) == 0){
 -    cerr <<"Error creating XTextProperty!" <<endl;
 +    std::cerr <<"Error creating XTextProperty!" <<std::endl;
      exit(1);
-   }
- 
-@@ -204,7 +205,7 @@
- void XWin::openDisplay( void ){
-   // Open connection to display selected by user
+@@ -206,3 +207,3 @@
    if ((display_ = XOpenDisplay (display_name_)) == NULL) {
 -    cerr <<"Can't open display named " << display_name_ <<endl;
 +    std::cerr <<"Can't open display named " << display_name_ <<std::endl;
      exit(1);
-   }
- 
-@@ -251,8 +252,8 @@
- 		pixmap_att.valuemask=XpmSize|XpmReturnPixels|XpmColormap|XpmCloseness;
- 		if(XpmReadFileToPixmap(display_,DefaultRootWindow(display_),pixmap_file, pixmap, NULL, &pixmap_att))
+@@ -253,4 +254,4 @@
          	{
 -                	cerr << "Pixmap " << pixmap_file  << " not found" << endl;
 -                	cerr << "Defaulting to blank" << endl;
 +                	std::cerr << "Pixmap " << pixmap_file  << " not found" << std::endl;
 +                	std::cerr << "Defaulting to blank" << std::endl;
                  	pixmap=NULL;
- 			return 0; // OOps
-         	}
-@@ -261,7 +262,7 @@
- 	return 0; // No file specified, none used
- #else
+@@ -263,3 +264,3 @@
  	(void) pixmap;
 -	cerr << "Error:  getPixmap called, when Xpm is not enabled!\n" ;
 +	std::cerr << "Error:  getPixmap called, when Xpm is not enabled!\n" ;
  	return 0;
- #endif
- }
-@@ -273,7 +274,7 @@
-   // Fill out a XsizeHints structure to inform the window manager
-   // of desired size and location of main window.
+@@ -275,3 +276,3 @@
    if((sizehints_ = XAllocSizeHints()) == NULL){
 -    cerr <<"Error allocating size hints!" <<endl;
 +    std::cerr <<"Error allocating size hints!" <<std::endl;
      exit(1);
-   }
-   sizehints_->flags = PSize;
-@@ -350,7 +351,7 @@
- #if 0
- void XWin::usage( void ){
+@@ -352,3 +353,3 @@
    //  FIXME  We need to update this.  BCG
 -  cerr <<name_ <<" [-display name] [-geometry geom]" <<endl;
 +  std::cerr <<name_ <<" [-display name] [-geometry geom]" <<std::endl;
  //    exit (1);
- }
- #endif
-@@ -386,7 +387,7 @@
-     return retval;
-   else
+@@ -388,3 +389,3 @@
    {
 -    cerr << "Error:  Couldn't find '" << name << "' resource in the resource database!\n";
 +    std::cerr << "Error:  Couldn't find '" << name << "' resource in the resource database!\n";
      exit (-1);
-       /*  Some compilers aren't smart enough to know that exit() exits.  */
-     return '\0';
-@@ -396,7 +397,7 @@
- //-----------------------------------------------------------------------------
+@@ -397,4 +398,4 @@
  
- void XWin::dumpResources( ostream &os ){
+-void XWin::dumpResources( ostream &os ){
 -cerr << "Function not implemented!\n";  //  BCG  FIXME  Need to make this.
++void XWin::dumpResources( std::ostream &os ){
 +std::cerr << "Function not implemented!\n";  //  BCG  FIXME  Need to make this.
  (void) os;  //  Keep gcc happy.
- }
- //-----------------------------------------------------------------------------
-@@ -405,7 +406,7 @@
-   XColor exact, closest;
-   
+@@ -407,3 +408,3 @@
    if ( XAllocNamedColor( display_, colormap(), name, &closest, &exact ) == 0 )
 -    cerr <<"XWin::allocColor() : failed to alloc : " <<name <<endl;
 +    std::cerr <<"XWin::allocColor() : failed to alloc : " <<name <<std::endl;
  
-   return exact.pixel;
- }
-@@ -504,7 +505,7 @@
-     mask_ = ResizeRedirectMask;
-     break;
+@@ -506,3 +507,3 @@
    default:
 -    cerr <<"XWin::Event::Event() : unknown event type : " <<event_ <<endl;
 +    std::cerr <<"XWin::Event::Event() : unknown event type : " <<event_ <<std::endl;
      mask_ = NoEventMask;
-     break;
-   }
 --- xwin.h.orig	1999-02-16 09:08:35.000000000 -0500
-+++ xwin.h	2003-09-30 18:33:56.000000000 -0400
-@@ -105,7 +105,7 @@
-     Event( XWin *parent, int event, EventCallBack callBack );
-     virtual ~Event( void ){}
++++ xwin.h	2003-09-30 20:41:12.000000000 -0400
+@@ -11,3 +11,3 @@
+ #endif
+-#include <iostream.h>
++#include <iostream>
+ #include <string.h>
+@@ -99,3 +99,3 @@
+     return (!strncasecmp(getResource(name),"True", 5)); }
+-  void dumpResources( ostream &os );
++  void dumpResources(std::ostream &os );
+   
+@@ -107,3 +107,3 @@
  
 -    friend XWin;
 +    friend class XWin;
  
-     void callBack( XEvent &event )
-       { if ( event.type == event_ ) (parent_->*callBack_)( event ); }
diff --git a/sysutils/xosview/patches/patch-ar b/sysutils/xosview/patches/patch-ar
new file mode 100644
index 00000000000..235a43e1d8d
--- /dev/null
+++ b/sysutils/xosview/patches/patch-ar
@@ -0,0 +1,9 @@
+$NetBSD: patch-ar,v 1.1 2003/10/01 01:14:35 christos Exp $
+
+--- llist.cc.orig	2003-09-30 20:46:58.000000000 -0400
++++ llist.cc	2003-09-30 20:47:04.000000000 -0400
+@@ -8,3 +8,3 @@
+ //
+-#include <iostream.h>
++#include <iostream>
+ #include "general.h"
diff --git a/sysutils/xosview/patches/patch-as b/sysutils/xosview/patches/patch-as
new file mode 100644
index 00000000000..b31dc20bf1c
--- /dev/null
+++ b/sysutils/xosview/patches/patch-as
@@ -0,0 +1,9 @@
+$NetBSD: patch-as,v 1.1 2003/10/01 01:14:35 christos Exp $
+
+--- fieldmetergraph.cc.orig	2003-09-30 20:49:12.000000000 -0400
++++ fieldmetergraph.cc	2003-09-30 20:49:19.000000000 -0400
+@@ -26,3 +26,3 @@
+ 
+-#include <fstream.h>
++#include <fstream>
+ #include <math.h>		//  For fabs()
diff --git a/sysutils/xosview/patches/patch-at b/sysutils/xosview/patches/patch-at
new file mode 100644
index 00000000000..b1929e9f168
--- /dev/null
+++ b/sysutils/xosview/patches/patch-at
@@ -0,0 +1,14 @@
+$NetBSD: patch-at,v 1.1 2003/10/01 01:14:35 christos Exp $
+
+--- timer.h.orig	1999-02-16 09:08:34.000000000 -0500
++++ timer.h	2003-09-30 20:44:15.000000000 -0400
+@@ -36,3 +36,3 @@
+   
+-  ostream &printOn(ostream &os) const {
++  std::ostream &printOn(std::ostream &os) const {
+     return os <<"Timer : ["
+@@ -49,3 +49,3 @@
+ 
+-inline ostream &operator<<(ostream &os, const Timer &t){
++inline std::ostream &operator<<(std::ostream &os, const Timer &t){
+   return t.printOn(os);
diff --git a/sysutils/xosview/patches/patch-au b/sysutils/xosview/patches/patch-au
new file mode 100644
index 00000000000..60e76f7c204
--- /dev/null
+++ b/sysutils/xosview/patches/patch-au
@@ -0,0 +1,19 @@
+$NetBSD: patch-au,v 1.1 2003/10/01 01:14:35 christos Exp $
+
+--- timeval.h.orig	2003-09-30 20:43:13.000000000 -0400
++++ timeval.h	2003-09-30 20:45:02.000000000 -0400
+@@ -14,3 +14,3 @@
+ #include <sys/time.h>
+-#include <iostream.h>
++#include <iostream>
+ 
+@@ -31,3 +31,3 @@
+ 
+-  ostream &printOn(ostream &os) const {
++  std::ostream &printOn(std::ostream &os) const {
+     return os <<"(" <<sec() <<" sec, " <<usec() <<" usec)";
+@@ -39,3 +39,3 @@
+ 
+-inline ostream &operator<<(ostream &os, const TimeVal &tv){
++inline std::ostream &operator<<(std::ostream &os, const TimeVal &tv){
+   return tv.printOn(os);
diff --git a/sysutils/xosview/patches/patch-av b/sysutils/xosview/patches/patch-av
new file mode 100644
index 00000000000..a66b94d8aed
--- /dev/null
+++ b/sysutils/xosview/patches/patch-av
@@ -0,0 +1,16 @@
+$NetBSD: patch-av,v 1.1 2003/10/01 01:14:35 christos Exp $
+
+--- general.h.orig	1999-02-16 09:08:34.000000000 -0500
++++ general.h	2003-09-30 20:40:04.000000000 -0400
+@@ -19,9 +19,4 @@
+ 
+-
+-#ifdef __GNUC__
+-  /*  Grab _G_HAVE_BOOL, if possible.  */
+-#include <_G_config.h>
+-#endif
+-
+-#ifndef _G_HAVE_BOOL
++#include <ostream>
++#ifndef __GNUC__
+   /*  Every GNU system has _G_config.h, I believe, which tells us