regenerate patches with -u1 to avoid $Id getting in the patch

5 files changed, 26 insertions, 85 deletions

diff --git a/sysutils/xosview/patches/patch-ae b/sysutils/xosview/patches/patch-ae
index 35382f0f7e7..52452c83142 100644
--- a/sysutils/xosview/patches/patch-ae
+++ b/sysutils/xosview/patches/patch-ae
@@ -1,20 +1,14 @@
-$NetBSD: patch-ae,v 1.8 2003/09/30 23:03:59 christos Exp $
+$NetBSD: patch-ae,v 1.9 2003/10/01 00:33:54 christos Exp $
 
 --- bsd/cpumeter.cc.orig	1999-02-16 09:09:22.000000000 -0500
-+++ bsd/cpumeter.cc	2003-09-30 18:34:41.000000000 -0400
-@@ -15,6 +15,9 @@
- // $Id: patch-ae,v 1.8 2003/09/30 23:03:59 christos Exp $
- //
++++ bsd/cpumeter.cc	2003-09-30 20:27:45.000000000 -0400
+@@ -17,2 +17,5 @@
  #include <sys/dkstat.h>         //  For CPUSTATES #define.  BCG
 +#if defined(XOSVIEW_NETBSD) && !defined(CPUSTATES)
 +#include <sys/sched.h>
 +#endif
  #include <stdlib.h>		//  For use of atoi  BCG
- #include "general.h"
- #include "cpumeter.h"
-@@ -109,13 +112,13 @@
-     static int firstTime = 1;
-     if (firstTime) {
+@@ -111,9 +114,9 @@
        fprintf(stderr,
 -"  Warning:  the CPU tick counters are not changing.  This could
 -be due to running a kernel besides /netbsd (or the equivalent for FreeBSD).
@@ -31,5 +25,3 @@ $NetBSD: patch-ae,v 1.8 2003/09/30 23:03:59 christos Exp $
 +" (or in lieu of -- it ought to get fixed faster if you contact me"
 +" directly).  Thanks!\n");
        firstTime = 0;
-     }
-   }
diff --git a/sysutils/xosview/patches/patch-aj b/sysutils/xosview/patches/patch-aj
index b5ff7736eb0..95f4c5612ed 100644
--- a/sysutils/xosview/patches/patch-aj
+++ b/sysutils/xosview/patches/patch-aj
@@ -1,21 +1,13 @@
-$NetBSD: patch-aj,v 1.1 2003/09/30 23:03:59 christos Exp $
+$NetBSD: patch-aj,v 1.2 2003/10/01 00:33:54 christos Exp $
 
 --- bsd/loadmeter.cc.orig	1999-02-16 09:09:21.000000000 -0500
-+++ bsd/loadmeter.cc	2003-09-30 18:38:51.000000000 -0400
-@@ -15,6 +15,7 @@
- //
- // $Id: patch-aj,v 1.1 2003/09/30 23:03:59 christos Exp $
++++ bsd/loadmeter.cc	2003-09-30 20:27:02.000000000 -0400
+@@ -17,2 +17,3 @@
  //
 +#include <iostream>
  #include <stdlib.h>  //  for getloadavg()
- #include "general.h"
- #include "loadmeter.h"
-@@ -58,7 +59,7 @@
-     //  prevent this whole problem, the load meter can not be a decay
-     //  meter.  The load is a decaying average kind of thing anyway,
+@@ -60,3 +61,3 @@
      //  so having a decaying load average is redundant.
 -    cerr << "Warning:  The loadmeter can not be configured as a decay\n"
 +    std::cerr << "Warning:  The loadmeter can not be configured as a decay\n"
           << "  meter.  See the source code (" << __FILE__ << ") for further\n"
-          << "  details.\n";
-     dodecay_ = 0;
diff --git a/sysutils/xosview/patches/patch-al b/sysutils/xosview/patches/patch-al
index 6d2473fb9e1..8c357c1bb53 100644
--- a/sysutils/xosview/patches/patch-al
+++ b/sysutils/xosview/patches/patch-al
@@ -1,18 +1,12 @@
-$NetBSD: patch-al,v 1.1 2003/09/30 23:03:59 christos Exp $
+$NetBSD: patch-al,v 1.2 2003/10/01 00:33:54 christos Exp $
 
 --- fieldmeter.cc.orig	1999-02-16 09:08:35.000000000 -0500
-+++ fieldmeter.cc	2003-09-30 18:42:06.000000000 -0400
-@@ -6,6 +6,7 @@
- //
- // $Id: patch-al,v 1.1 2003/09/30 23:03:59 christos Exp $
++++ fieldmeter.cc	2003-09-30 20:28:39.000000000 -0400
+@@ -8,2 +8,3 @@
  //
 +#include <iostream>
  #include <fstream.h>
- #include <stdlib.h>
- #include "snprintf.h"
-@@ -294,14 +295,14 @@
- bool FieldMeter::checkX(int x, int width) const {
-   if ((x < x_) || (x + width < x_)
+@@ -296,10 +297,10 @@
        || (x > x_ + width_) || (x + width > x_ + width_)){
 -    cerr << "FieldMeter::checkX() : bad horiz values for meter : "
 -         << name() << endl;
@@ -28,5 +22,3 @@ $NetBSD: patch-al,v 1.1 2003/09/30 23:03:59 christos Exp $
 +      std::cerr <<"fields_[" <<i <<"] = " <<fields_[i] <<",";
 +    std::cerr <<std::endl;
  
-     return false;
-   }
diff --git a/sysutils/xosview/patches/patch-am b/sysutils/xosview/patches/patch-am
index 5dc2fa9f273..bb33d551a0e 100644
--- a/sysutils/xosview/patches/patch-am
+++ b/sysutils/xosview/patches/patch-am
@@ -1,4 +1,4 @@
-$NetBSD: patch-am,v 1.1 2003/09/30 23:03:59 christos Exp $
+$NetBSD: patch-am,v 1.2 2003/10/01 00:33:54 christos Exp $
 
 --- Xrm.cc.orig	1999-02-16 09:08:35.000000000 -0500
 +++ Xrm.cc	2003-09-30 18:44:38.000000000 -0400
@@ -75,38 +75,19 @@ $NetBSD: patch-am,v 1.1 2003/09/30 23:03:59 christos Exp $
    int i = 0;
    while (quarks[i] != NULLQUARK){
 --- Xrm.h.orig	1999-02-16 09:08:34.000000000 -0500
-+++ Xrm.h	2003-09-30 19:01:04.000000000 -0400
-@@ -10,14 +10,13 @@
- #define _Xrm_h
- 
- #include "bool.h"
-+#include <iostream>
- 
- #define XRM_H_CVSID "$Id: patch-am,v 1.1 2003/09/30 23:03:59 christos Exp $"
- 
- #include <X11/Xlib.h>
- #include <X11/Xresource.h>
++++ Xrm.h	2003-09-30 20:29:33.000000000 -0400
+@@ -18,4 +18,2 @@
  
 -class ostream;
 -
  class Xrm {
- public:
-   Xrm(const char *className, const char *instanceName);
-@@ -31,7 +30,7 @@
-   const char* getDisplayName (int argc, char** argv);
-   void loadAndMergeResources(int& argc, char** argv, Display* display);
+@@ -33,3 +31,3 @@
  
 -  ostream &dump(ostream &os) const;
 +  std::ostream &dump(std::ostream &os) const;
  
- private:
-   XrmDatabase _db;
-@@ -47,7 +46,7 @@
-   static bool _initialized;
- };
+@@ -49,3 +47,3 @@
  
 -inline ostream &operator<<(ostream &os, const Xrm &xrm){
 +inline std::ostream &operator<<(std::ostream &os, const Xrm &xrm){
    return xrm.dump(os);
- }
- 
diff --git a/sysutils/xosview/patches/patch-ao b/sysutils/xosview/patches/patch-ao
index 93fe5516b36..f69546d735c 100644
--- a/sysutils/xosview/patches/patch-ao
+++ b/sysutils/xosview/patches/patch-ao
@@ -1,43 +1,28 @@
-$NetBSD: patch-ao,v 1.1 2003/09/30 23:03:59 christos Exp $
+$NetBSD: patch-ao,v 1.2 2003/10/01 00:33:54 christos Exp $
 
 --- xosview.cc.orig	1999-02-16 09:08:34.000000000 -0500
-+++ xosview.cc	2003-09-30 18:41:24.000000000 -0400
-@@ -6,7 +6,7 @@
- //
- // $Id: patch-ao,v 1.1 2003/09/30 23:03:59 christos Exp $
++++ xosview.cc	2003-09-30 20:30:35.000000000 -0400
+@@ -8,3 +8,3 @@
  //
 -#include <iostream.h>
 +#include <iostream>
  #include <unistd.h>
- #include <string.h>
- #include <stdlib.h>
-@@ -312,7 +312,7 @@
-   {
-     switch (argv[0][1]) {
+@@ -314,3 +314,3 @@
        case 'v':
 -      		cerr << versionString << endl;
 +      		std::cerr << versionString << std::endl;
  		exit(0);
-       case 'n': //  Check for -name option that was already parsed
- 		//  and acted upon by main().
-@@ -335,12 +335,12 @@
- #endif
-       case '-':  /*  Check for --version argument.  */
+@@ -337,3 +337,3 @@
                if (!strncasecmp(*argv, "--version", 10)) {
 -	        cerr << versionString << endl;
 +	        std::cerr << versionString << std::endl;
  		exit(0);
- 	      }
- 	      /*  Fall through to default/error case.  */
+@@ -342,3 +342,3 @@
        default:
 -      		cerr << "Ignoring unknown option '" << argv[0] << "'.\n";
 +      		std::cerr << "Ignoring unknown option '" << argv[0] << "'.\n";
  	  	break;
-     }
-     argc--;
-@@ -355,19 +355,19 @@
- }
- 
+@@ -357,5 +357,5 @@
  void XOSView::visibilityEvent( XVisibilityEvent &event ){
 -  //cerr <<"XOSView::visibilityEvent() : ";
 +  //std::cerr <<"XOSView::visibilityEvent() : ";
@@ -45,7 +30,7 @@ $NetBSD: patch-ao,v 1.1 2003/09/30 23:03:59 christos Exp $
 -    //cerr <<"hidden";
 +    //std::cerr <<"hidden";
      _isvisible = false;
-   }
+@@ -363,6 +363,6 @@
    else {
 -    //cerr <<"not hidden";
 +    //std::cerr <<"not hidden";
@@ -54,9 +39,8 @@ $NetBSD: patch-ao,v 1.1 2003/09/30 23:03:59 christos Exp $
 -  //cerr <<endl;
 +  //std::cerr <<std::endl;
  }
- 
+@@ -370,3 +370,3 @@
  void XOSView::unmapEvent( XUnmapEvent & ){
 -  //cerr <<"XOSView::unmapEvent()" <<endl;
 +  //std::cerr <<"XOSView::unmapEvent()" <<std::endl;
    _isvisible = false;
- }