[pkgsrc/trunk]: pkgsrc/sysutils/xosview/patches more g++-3 header issues. don...

[christos <christos%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/24ba927c6880
branches:  trunk
changeset: 462367:24ba927c6880
user:      christos <christos%pkgsrc.org@localhost>
date:      Wed Oct 01 01:14:35 2003 +0000

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

diffstat:

 sysutils/xosview/patches/patch-ai |   10 +-
 sysutils/xosview/patches/patch-al |   10 +-
 sysutils/xosview/patches/patch-am |   49 +++-----------
 sysutils/xosview/patches/patch-an |   22 ++----
 sysutils/xosview/patches/patch-aq |  122 ++++++++++---------------------------
 sysutils/xosview/patches/patch-ar |    9 ++
 sysutils/xosview/patches/patch-as |    9 ++
 sysutils/xosview/patches/patch-at |   14 ++++
 sysutils/xosview/patches/patch-au |   19 +++++
 sysutils/xosview/patches/patch-av |   16 ++++
 10 files changed, 130 insertions(+), 150 deletions(-)

diffs (truncated from 473 to 300 lines):

diff -r a2ad75c9b919 -r 24ba927c6880 sysutils/xosview/patches/patch-ai
--- a/sysutils/xosview/patches/patch-ai Wed Oct 01 00:34:18 2003 +0000
+++ b/sysutils/xosview/patches/patch-ai Wed Oct 01 01:14:35 2003 +0000
@@ -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 -r a2ad75c9b919 -r 24ba927c6880 sysutils/xosview/patches/patch-al
--- a/sysutils/xosview/patches/patch-al Wed Oct 01 00:34:18 2003 +0000
+++ b/sysutils/xosview/patches/patch-al Wed Oct 01 01:14:35 2003 +0000
@@ -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 -r a2ad75c9b919 -r 24ba927c6880 sysutils/xosview/patches/patch-am
--- a/sysutils/xosview/patches/patch-am Wed Oct 01 00:34:18 2003 +0000
+++ b/sysutils/xosview/patches/patch-am Wed Oct 01 01:14:35 2003 +0000
@@ -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 @@
 -  //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 -r a2ad75c9b919 -r 24ba927c6880 sysutils/xosview/patches/patch-an
--- a/sysutils/xosview/patches/patch-an Wed Oct 01 00:34:18 2003 +0000
+++ b/sysutils/xosview/patches/patch-an Wed Oct 01 01:14:35 2003 +0000
@@ -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 -r a2ad75c9b919 -r 24ba927c6880 sysutils/xosview/patches/patch-aq
--- a/sysutils/xosview/patches/patch-aq Wed Oct 01 00:34:18 2003 +0000
+++ b/sysutils/xosview/patches/patch-aq Wed Oct 01 01:14:35 2003 +0000
@@ -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