Update xosview to version 1.8.1alpha, from a nudge by Brian Grayson.

Fixes build on NetBSD-1.6.2 and NetBSD-1.6ZE. Existing patches have
either been incorporated or are unnecessary.

24 files changed, 8 insertions, 730 deletions

diff --git a/doc/CHANGES b/doc/CHANGES
index 0516a34ab24..cf0f7c643cf 100644
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.3804 2003/11/10 02:04:55 xtraeme Exp $
+$NetBSD: CHANGES,v 1.3805 2003/11/10 17:19:29 agc Exp $
 
 Changes to the packages collection and infrastructure in 2003:
 
@@ -4330,3 +4330,4 @@ Changes to the packages collection and infrastructure in 2003:
 	Updated dvd+rw-tools to 5.13.4.7.4 [wiz 2003-11-10]
 	Updated dosbox to 0.60 [xtraeme 2003-11-10]
 	Updated gqview-devel to 1.3.5 [xtraeme 2003-11-10]
+	Updated xosview to 1.8.1alpha [agc 2003-11-10]
diff --git a/sysutils/xosview/Makefile b/sysutils/xosview/Makefile
index 0af313931fa..2f2984a26e3 100644
--- a/sysutils/xosview/Makefile
+++ b/sysutils/xosview/Makefile
@@ -1,16 +1,13 @@
-# $NetBSD: Makefile,v 1.44 2003/10/04 01:42:36 bgrayson Exp $
+# $NetBSD: Makefile,v 1.45 2003/11/10 17:18:28 agc Exp $
 
-DISTNAME=       xosview-1.7.0.b
-PKGNAME=	xosview-1.7.0b
+DISTNAME=       xosview-1.8.1alpha
 CATEGORIES=	sysutils
-MASTER_SITES=   ${MASTER_SITE_SOURCEFORGE:=xosview/}
+MASTER_SITES=	ftp://ftp.netbsd.org/pub/NetBSD/packages/distfiles/
 
 MAINTAINER=	bgrayson@NetBSD.org
 HOMEPAGE=	http://xosview.sourceforge.net/
 COMMENT=	X11 graphical display of OS statistics
 
-NOT_FOR_PLATFORM=	NetBSD-1.[7-9]*-* NetBSD-[2-9]*-*
-
 USE_BUILDLINK2=		YES
 USE_X11BASE=		YES
 
diff --git a/sysutils/xosview/distinfo b/sysutils/xosview/distinfo
index b223e005a85..43a51bd3aba 100644
--- a/sysutils/xosview/distinfo
+++ b/sysutils/xosview/distinfo
@@ -1,25 +1,4 @@
-$NetBSD: distinfo,v 1.7 2003/10/01 01:14:58 christos Exp $
+$NetBSD: distinfo,v 1.8 2003/11/10 17:18:28 agc Exp $
 
-SHA1 (xosview-1.7.0.b.tar.gz) = 7f3053e0e8300995eb16421b0840cfbe9c4c7d07
-Size (xosview-1.7.0.b.tar.gz) = 134985 bytes
-SHA1 (patch-aa) = eee6460439413714dc235173c333e68b23a40e22
-SHA1 (patch-ab) = 09ebf4dfcae497b169f9170f53ec853745d8fc0b
-SHA1 (patch-ac) = 80d74f813739693f3c1b40c8cb442eac8574497d
-SHA1 (patch-ad) = 594bea4feb45b082c9e4809044cbeaafba81c53e
-SHA1 (patch-ae) = 22b3cbe6a2ba488c28a12b7185d0dcff2d3fbf05
-SHA1 (patch-af) = a9b1cfa4f00526e884239af1514c1b4eecd98a4e
-SHA1 (patch-ag) = 1b4e4cb5e8ba1a732eb57b44f5e41562b219d9ac
-SHA1 (patch-ah) = a566d00f2035e41db8bfe265f27e3177e9915ee8
-SHA1 (patch-ai) = adf1a5b55f1c69fdeb351329fe61edfc4c307471
-SHA1 (patch-aj) = b3e186c222f183b0a66d904b79a982eb16cf90e1
-SHA1 (patch-ak) = 3f0770a966bbfca0af312613922683cdb439f9b1
-SHA1 (patch-al) = fe2e608f4a989114c6f1110d4095d2e71085de2c
-SHA1 (patch-am) = d5b623d24a19d3abde92225607a946c379fd7c3b
-SHA1 (patch-an) = eee9622975ea617f38fb412f595a83c1b383cda7
-SHA1 (patch-ao) = 507234e1f52933ce86e80a4a5f77f78cca4c6995
-SHA1 (patch-aq) = 3c65d034a2e825842d8225205af0d4047e49ed78
-SHA1 (patch-ar) = 9661856017f24890181d629f0973d74a0a183289
-SHA1 (patch-as) = eb7206136486d0dd11cf44e008623b5b3396ecf9
-SHA1 (patch-at) = 78f1579fd55d1909d9d3294a25d0e384693f9972
-SHA1 (patch-au) = 31a138d0dc45278cdd8b6e702a185fbc5d4e1054
-SHA1 (patch-av) = 29c83dc3a0dda55f285c75883020781dec2cb30a
+SHA1 (xosview-1.8.1alpha.tar.gz) = f655f336a6c6d3e5ed2fd0bd8581de1d17ed0680
+Size (xosview-1.8.1alpha.tar.gz) = 241885 bytes
diff --git a/sysutils/xosview/patches/patch-aa b/sysutils/xosview/patches/patch-aa
deleted file mode 100644
index 83e01958b1b..00000000000
--- a/sysutils/xosview/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.8 1998/11/04 16:37:11 agc Exp $
-
---- config/Makefile.config.in	1998/11/04 15:12:15	1.1
-+++ config/Makefile.config.in	1998/11/04 15:51:37
-@@ -20,7 +20,7 @@
- 
- # Optimized CXXFLAGS
- CXXFLAGS      += $(CFLAGS) -Wall -O4 -pipe -I@x_includes@ \
--                -I$(TOP) -I$(TOP)/@host_dir@ @DEFS@
-+                -I$(TOP) -I$(TOP)/@host_dir@ -I${TOP}/include @DEFS@
- # DEBUG CXXFLAGS
- #CXXFLAGS      += $(CFLAGS) -Wall -ggdb -pipe -I@x_includes@ \
- #                -I$(TOP) -I$(TOP)/@host_dir@ @DEFS@
diff --git a/sysutils/xosview/patches/patch-ab b/sysutils/xosview/patches/patch-ab
deleted file mode 100644
index 195f859d4d7..00000000000
--- a/sysutils/xosview/patches/patch-ab
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-ab,v 1.7 1999/04/07 10:25:11 agc Exp $
-
-Avoid ugly "-n\n" output on Solaris.
-
---- config/Makefile.top.in	1999/04/07 10:14:34	1.1
-+++ config/Makefile.top.in	1999/04/07 10:17:30
-@@ -55,17 +55,20 @@
- ##  These next lines look really ugly.  The echo statements are an
- ##    attempt to make the output look a little nicer.  The "echo -n"
- ##    statements create a two-space indent at the beginning of the line.
-+##    They also don't work properly on Solaris (unless you have the
-+##    lottery of having /usr/ucb/echo found before /bin/echo in your
-+##    PATH), so delete them for just now.
- install: xosview
--	@echo "Installing executable..."; echo -n "  "
-+	@echo "Installing executable..."
- 	@INSTALL_PROGRAM@ @INSTALL_ARGS@ xosview $(BINDIR)
--	@echo "Installing application defaults..."; echo -n "  "
-+	@echo "Installing application defaults..."
- 	@INSTALL_DATA@ Xdefaults $(XAPPLOADDIR)/XOsview
- 	@echo "Making sure $(MANDIR) exists..."
- 	@if [ ! -d $(MANDIR) ]; then \
- 	  echo "Making $(MANDIR)..."; \
- 	  mkdir $(MANDIR); \
- 	fi
--	@echo "Installing man page..."; echo -n "  "
-+	@echo "Installing man page..."
- 	@INSTALL_DATA@ xosview.1 $(MANDIR)
- 
- install-man:
diff --git a/sysutils/xosview/patches/patch-ac b/sysutils/xosview/patches/patch-ac
deleted file mode 100644
index db36a0775c8..00000000000
--- a/sysutils/xosview/patches/patch-ac
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-ac,v 1.6 2000/06/27 08:15:51 tron Exp $
-
---- configure.orig	Tue Feb 16 17:06:16 1999
-+++ configure	Sun Apr 11 14:11:30 1999
-@@ -1717,6 +1717,21 @@
-   host_dir=bsd
- 
- ;;
-+netbsd1.[45]*)  
-+	host_os=netbsd
-+        EXTRALIBS="-lkvm $XPMLIB"
-+        INSTALL_ARGS='-s -g kmem -m 02555'
-+	cat >> confdefs.h <<\EOF
-+#define XOSVIEW_NETBSD 1
-+EOF
-+
-+	cat >> confdefs.h <<\EOF
-+#define UVM 1
-+EOF
-+
-+  host_dir=bsd
-+
-+;;
- ##  Also check for versions that have not been tested.
- netbsd*)  echo "configure: warning: 
- ***************  Warning  *****************
diff --git a/sysutils/xosview/patches/patch-ad b/sysutils/xosview/patches/patch-ad
deleted file mode 100644
index 871e6302e8c..00000000000
--- a/sysutils/xosview/patches/patch-ad
+++ /dev/null
@@ -1,85 +0,0 @@
-$NetBSD: patch-ad,v 1.6 2002/12/11 21:38:06 christos Exp $
-
---- bsd/kernel.cc.orig	Tue Feb 16 09:09:21 1999
-+++ bsd/kernel.cc	Wed Dec 11 16:34:46 2002
-@@ -30,6 +30,10 @@
- #include <errno.h>
- #include <sys/dkstat.h>         /*  For CPUSTATES, which tells us how
-                                       many cpu states there are.  */
-+#if defined(XOSVIEW_NETBSD) && !defined(CPUSTATES)
-+#include <sys/sched.h>
-+#endif
-+
- #ifndef XOSVIEW_FREEBSD
- #include <sys/disk.h>		/*  For disk statistics.  */
- #endif
-@@ -60,14 +64,22 @@
- #include <sys/malloc.h>
- #include <sys/sysctl.h>
- #include <sys/device.h>
-+#if defined(__NetBSD_Version__) && __NetBSD_Version__ > 105010000 /* > 1.5A */
-+#include <uvm/uvm.h>
-+#else
- #include <vm/vm.h>	/* XXX  Is this needed?  */
-+#endif
- #else
- #include <sys/vmmeter.h>	/*  For struct vmmeter.  */
- #endif
- 
- #ifdef HAVE_SWAPCTL
- #include <unistd.h>		/*  For swapctl proto.  */
--#include <vm/vm_swap.h>		/*  For swapent, SWAP_*.  */
-+#if defined(__NetBSD_Version__) && __NetBSD_Version__ >= 104000000
-+#include <sys/swap.h>		/*  For swapent, SWAP_*.  */
-+#else
-+#include <vm/vm_swap.h>
-+#endif
- #include <stdlib.h>		/*  For malloc(), free().  */
- #endif
- 
-@@ -85,7 +97,11 @@
- //  This struct has the list of all the symbols we want from the kernel.
- static struct nlist nlst[] =
- {
-+#if defined(__NetBSD_Version__) && __NetBSD_Version__ > 104260000 /* > 1.4Z */
-+{ "_ifnet" },	/* XXX: LZ! Don't renumber */
-+#else
- { "_cp_time" },
-+#endif
- #define CP_TIME_SYM_INDEX 0
- { "_ifnet" },
- #define IFNET_SYM_INDEX 1
-@@ -293,7 +309,21 @@
-   if (!timeArray) errx (-1, "BSDGetCPUTimes():  passed pointer was null!\n");
-   if (CPUSTATES != 5)
-     errx (-1, "Error:  xosview for *BSD expects 5 cpu states!\n");
-+#if defined(__NetBSD_Version__) && __NetBSD_Version__ > 104260000 /* > 1.4Z */
-+  int mib[2];
-+  struct schedstate_percpu ssp;
-+  size_t size = sizeof(ssp.spc_cp_time);
-+  mib[0] = CTL_KERN;
-+  mib[1] = KERN_CP_TIME;
-+  if (sysctl(mib, 2, ssp.spc_cp_time, &size, NULL, 0) < 0) {
-+    printf("can't get schedstate_percpu: %s\n", strerror(errno));
-+    memset(&ssp, 0, sizeof(ssp));
-+  }
-+  for (size = 0; size < CPUSTATES; size++)
-+    timeArray[size] = (long) ssp.spc_cp_time[size];
-+#else
-   safe_kvm_read_symbol (CP_TIME_SYM_INDEX, timeArray, sizeof (long) * CPUSTATES);
-+#endif
- }
- 
- 
-@@ -651,7 +681,11 @@
-   while (kvmdiskptr != NULL) {
-     safe_kvm_read ((u_long)kvmdiskptr, &kvmcurrdisk, sizeof(kvmcurrdisk));
-       /*  Add up the contribution from this disk.  */
-+#if defined(__NetBSD_Version__) &&  __NetBSD_Version__ > 106070000 /* > 1.6G */
-+    *bytesXferred += kvmcurrdisk.dk_rbytes + kvmcurrdisk.dk_wbytes;
-+#else
-     *bytesXferred += kvmcurrdisk.dk_bytes;
-+#endif
- #ifdef DEBUG
-     printf ("Got %#x (lower 32bits)\n", (int) (*bytesXferred & 0xffffffff));
- #endif
diff --git a/sysutils/xosview/patches/patch-ae b/sysutils/xosview/patches/patch-ae
deleted file mode 100644
index 52452c83142..00000000000
--- a/sysutils/xosview/patches/patch-ae
+++ /dev/null
@@ -1,27 +0,0 @@
-$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 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
-@@ -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).
--  If this is the case, re-run xosview with the -N kernel-name option.
--  If not, then this is a bug.  Please send a message to
--bgrayson@ece.utexas.edu, in addition to any send-pr bug reports
--(or in lieu of -- it ought to get fixed faster if you contact me
--directly).  Thanks!\n");
-+" Warning: The CPU tick counters are not changing.  This could"
-+" be due to running a kernel besides /netbsd (or the equivalent for FreeBSD)."
-+" If this is the case, re-run xosview with the -N kernel-name option."
-+" If not, then this is a bug.  Please send a message to"
-+" bgrayson@ece.utexas.edu, in addition to any send-pr bug reports"
-+" (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-af b/sysutils/xosview/patches/patch-af
deleted file mode 100644
index c21efde10d1..00000000000
--- a/sysutils/xosview/patches/patch-af
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-af,v 1.1 2000/08/18 22:43:53 christos Exp $
-
---- bsd/pagemeter.h.orig	Fri Aug 18 18:40:08 2000
-+++ bsd/pagemeter.h	Fri Aug 18 18:22:28 2000
-@@ -22,7 +22,11 @@
- #include "fieldmetergraph.h"
- #if defined(UVM)
- #include <sys/param.h>
-+#if defined(__NetBSD_Version__) && __NetBSD_Version__ > 105010000 /* > 1.5A */
-+#include <uvm/uvm.h>
-+#else
- #include <vm/vm.h>
-+#endif
- #include <uvm/uvm_extern.h>
- #else
- #include <sys/vmmeter.h>
diff --git a/sysutils/xosview/patches/patch-ag b/sysutils/xosview/patches/patch-ag
deleted file mode 100644
index 611ce068e6a..00000000000
--- a/sysutils/xosview/patches/patch-ag
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2001/12/19 09:49:43 tron Exp $
-
---- config/config.sub.orig	Tue Feb 16 15:10:08 1999
-+++ config/config.sub	Tue Dec 18 22:24:26 2001
-@@ -424,6 +424,9 @@
- 		basic_machine=mips-sony
- 		os=-newsos
- 		;;
-+	newsmips*)
-+		basic_machine=mips-sony
-+		;;
- 	next | m*-next )
- 		basic_machine=m68k-next
- 		case $os in
-@@ -513,6 +516,9 @@
- 		;;
- 	sequent)
- 		basic_machine=i386-sequent
-+		;;
-+	sgimips*)
-+		basic_machine=mips-sgi
- 		;;
- 	sh)
- 		basic_machine=sh-hitachi
diff --git a/sysutils/xosview/patches/patch-ah b/sysutils/xosview/patches/patch-ah
deleted file mode 100644
index e807bca1ce2..00000000000
--- a/sysutils/xosview/patches/patch-ah
+++ /dev/null
@@ -1,62 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2002/12/11 22:35:56 christos Exp $
-
---- bsd/swapinternal.cc.orig	Tue Feb 16 09:09:21 1999
-+++ bsd/swapinternal.cc	Wed Dec 11 17:33:24 2002
-@@ -68,8 +68,10 @@
- #ifdef XOSVIEW_FREEBSD
- #include <sys/rlist.h>
- #else
-+#ifndef HAVE_SWAPCTL
- #include <sys/map.h>		/*  For struct mapent.  */
- #endif
-+#endif
- 
- #include <kvm.h>		/*  For all sorts of stuff.  */
- #ifndef HAVE_SWAPCTL
-@@ -118,10 +120,12 @@
- #ifdef XOSVIEW_FREEBSD
- static struct rlisthdr swaplist;
- #else
-+#ifndef HAVE_SWAPCTL
- static int nswapmap;
- static struct map *swapmap, *kswapmap;
- static struct mapent *mp;
- #endif
-+#endif
- static int nfree;
- 
- #define SVAR(var) __STRING(var) /* to force expansion */
-@@ -174,6 +178,7 @@
- 	KGET1(VM_SWDEVT, &ptr, sizeof ptr, "swdevt");
- 	KGET2(ptr, sw, (signed) (nswdev * sizeof(*sw)), "*swdevt");
- #else /* XOSVIEW_FREEBSD */
-+#ifndef HAVE_SWAPCTL
-         KGET(VM_NSWAPMAP, nswapmap);
-         KGET(VM_SWAPMAP, kswapmap);     /* kernel `swapmap' is a pointer */
-         if ((sw = (struct swdevt*) malloc(nswdev * sizeof(*sw))) == NULL ||
-@@ -184,6 +189,9 @@
-                 return (0);
-         }
-         KGET1(VM_SWDEVT, sw, (signed) (nswdev * sizeof(*sw)), "swdevt");
-+#else
-+	return(0);
-+#endif
- #endif /* XOSVIEW_FREEBSD */
-         once = 1;
-         return (1);
-@@ -243,6 +251,7 @@
- void
- fetchswap()
- {
-+#ifndef HAVE_SWAPCTL
-         int s, e, i;
-         int elast;
- 	struct mapent* localmp;
-@@ -299,6 +308,7 @@
-                         s = bound;
-                 }
-         }
-+#endif
- }
- #endif /* XOSVIEW_FREEBSD */
- 
diff --git a/sysutils/xosview/patches/patch-ai b/sysutils/xosview/patches/patch-ai
deleted file mode 100644
index 057b5dfdba5..00000000000
--- a/sysutils/xosview/patches/patch-ai
+++ /dev/null
@@ -1,23 +0,0 @@
-$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 21:07:12.000000000 -0400
-@@ -11,7 +11,8 @@
- //
- #include "btrymeter.h"
- #include "xosview.h"
--#include <fstream.h>
-+#include <iostream>
-+#include <fstream>
- #include <stdlib.h>
- 
- #include <fcntl.h>
-@@ -52,7 +53,7 @@
-   int loadinfo = open(APMFILENAME, O_RDONLY, 0);
- 
-   if ( !loadinfo ){
--    cerr <<"Can not open file : " <<APMFILENAME <<endl;
-+    std::cerr <<"Can not open file : " <<APMFILENAME << std::endl;
-     parent_->done(1);
-     return;
-   }
diff --git a/sysutils/xosview/patches/patch-aj b/sysutils/xosview/patches/patch-aj
deleted file mode 100644
index 95f4c5612ed..00000000000
--- a/sysutils/xosview/patches/patch-aj
+++ /dev/null
@@ -1,13 +0,0 @@
-$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 20:27:02.000000000 -0400
-@@ -17,2 +17,3 @@
- //
-+#include <iostream>
- #include <stdlib.h>  //  for getloadavg()
-@@ -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"
diff --git a/sysutils/xosview/patches/patch-ak b/sysutils/xosview/patches/patch-ak
deleted file mode 100644
index 7a64926bebd..00000000000
--- a/sysutils/xosview/patches/patch-ak
+++ /dev/null
@@ -1,42 +0,0 @@
-$NetBSD: patch-ak,v 1.1 2003/09/30 23:03:59 christos Exp $
-
---- Host.cc.orig	1999-02-16 09:08:34.000000000 -0500
-+++ Host.cc	2003-09-30 18:47:24.000000000 -0400
-@@ -168,7 +168,7 @@
-   return false;
- }
- 
--ostream &Host::print(ostream& os) const {
-+std::ostream &Host::print(std::ostream& os) const {
-   /*  Cast 'this' to a char*, so we don't need to create a Host::! operator.*/
-   if (!*((char*)this))
-     return os <<"Invalid Host.  h_errno was = " <<_failure <<"\n";
---- Host.h.orig	1999-02-16 09:08:34.000000000 -0500
-+++ Host.h	2003-09-30 18:47:52.000000000 -0400
-@@ -17,7 +17,7 @@
- #include <netinet/in.h>
- #include <netdb.h>
- #include <arpa/inet.h>
--#include <iostream.h>
-+#include <iostream>
- #include "bool.h"
- 
- class Host {
-@@ -66,7 +66,7 @@
- 
-   // Should not use this under linux for the same reashon as the above
-   // function.
--  ostream &print(ostream &os) const;
-+  std::ostream &print(std::ostream &os) const;
- 
- protected:
- private:
-@@ -84,7 +84,7 @@
- };
- 
- // Do not use this under linux until inet_ntoa() is fixed.
--inline ostream &operator<<(ostream &os, const Host& host) {
-+inline std::ostream &operator<<(std::ostream &os, const Host& host) {
-   return host.print(os);
- }
- 
diff --git a/sysutils/xosview/patches/patch-al b/sysutils/xosview/patches/patch-al
deleted file mode 100644
index 1e6ad32e578..00000000000
--- a/sysutils/xosview/patches/patch-al
+++ /dev/null
@@ -1,26 +0,0 @@
-$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:48:22.000000000 -0400
-@@ -8,3 +8,4 @@
- //
--#include <fstream.h>
-+#include <iostream>
-+#include <fstream>
- #include <stdlib.h>
-@@ -296,10 +297,10 @@
-       || (x > x_ + width_) || (x + width > x_ + width_)){
--    cerr << "FieldMeter::checkX() : bad horiz values for meter : "
--         << name() << endl;
-+    std::cerr << "FieldMeter::checkX() : bad horiz values for meter : "
-+         << name() << std::endl;
- 
--    cerr <<"value "<<x<<", width "<<width<<", total_ = "<<total_<<endl;
-+    std::cerr <<"value "<<x<<", width "<<width<<", total_ = "<<total_<<std::endl;
- 
-     for (int i = 0 ; i < numfields_ ; i++)
--      cerr <<"fields_[" <<i <<"] = " <<fields_[i] <<",";
--    cerr <<endl;
-+      std::cerr <<"fields_[" <<i <<"] = " <<fields_[i] <<",";
-+    std::cerr <<std::endl;
- 
diff --git a/sysutils/xosview/patches/patch-am b/sysutils/xosview/patches/patch-am
deleted file mode 100644
index b4a58350cd7..00000000000
--- a/sysutils/xosview/patches/patch-am
+++ /dev/null
@@ -1,66 +0,0 @@
-$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 20:34:27.000000000 -0400
-@@ -13,3 +13,3 @@
- #include <ctype.h>
--#include <iostream.h>
-+#include <iostream>
- #include <unistd.h>  //  for access(), etc.  BCG
-@@ -17,2 +17,5 @@
- #include "general.h"
-+#ifndef NULL
-+#define NULL 0
-+#endif
- #include "Xrm.h"
-@@ -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);
-@@ -116,3 +119,3 @@
-   {
--    cerr << "Error:  Xrm:loadAndMergeResources() called twice!\n";
-+    std::cerr << "Error:  Xrm:loadAndMergeResources() called twice!" << std::endl;
-     exit (-1);
-@@ -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){
-@@ -227,3 +230,3 @@
-   default:
--    cerr <<"ostream operator<<(ostream &, const XrmBinding &) : "
-+    std::cerr <<"std::ostream operator<<(std::ostream &, const XrmBinding &) : "
-       <<"Unknown XrmBinding!";
-@@ -235,3 +238,3 @@
- 
--ostream &Xrm::dump(ostream &os) const {
-+std::ostream &Xrm::dump(std::ostream &os) const {
-   os <<"--- Xrm --- class: " <<XrmQuarkToString(_class)
-@@ -252,6 +255,6 @@
-   
--  ostream *os = (ostream *)closure;
-+  std::ostream *os = (std::ostream *)closure;
-   (void) type;  //  Avoid gcc warnings.
- 
--  //cerr <<"type = " <<XrmQuarkToString(*type) <<endl;
-+  //std::cerr <<"type = " <<XrmQuarkToString(*type) <<std::endl;
- 
---- Xrm.h.orig	1999-02-16 09:08:34.000000000 -0500
-+++ Xrm.h	2003-09-30 20:34:27.000000000 -0400
-@@ -18,4 +18,2 @@
- 
--class ostream;
--
- class Xrm {
-@@ -33,3 +31,3 @@
- 
--  ostream &dump(ostream &os) const;
-+  std::ostream &dump(std::ostream &os) const;
- 
-@@ -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-an b/sysutils/xosview/patches/patch-an
deleted file mode 100644
index ae529a6011b..00000000000
--- a/sysutils/xosview/patches/patch-an
+++ /dev/null
@@ -1,20 +0,0 @@
-$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 20:48:49.000000000 -0400
-@@ -28,3 +28,4 @@
- 
--#include <fstream.h>
-+#include <iostream>
-+#include <fstream>
- #include <math.h>		//  For fabs()
-@@ -139,3 +140,3 @@
-       if (!checkX(x, twidth))
--        cerr <<__FILE__ << ":" << __LINE__ <<endl;
-+        std::cerr <<__FILE__ << ":" << __LINE__ <<std::endl;
-       parent_->drawFilledRectangle( x, y_, twidth, halfheight );
-@@ -145,3 +146,3 @@
-       if (!checkX(decayx, decaytwidth))
--        cerr <<__FILE__ << ":" << __LINE__ <<endl;
-+        std::cerr <<__FILE__ << ":" << __LINE__ <<std::endl;
-       parent_->drawFilledRectangle( decayx, y_+halfheight+1,
diff --git a/sysutils/xosview/patches/patch-ao b/sysutils/xosview/patches/patch-ao
deleted file mode 100644
index f69546d735c..00000000000
--- a/sysutils/xosview/patches/patch-ao
+++ /dev/null
@@ -1,46 +0,0 @@
-$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 20:30:35.000000000 -0400
-@@ -8,3 +8,3 @@
- //
--#include <iostream.h>
-+#include <iostream>
- #include <unistd.h>
-@@ -314,3 +314,3 @@
-       case 'v':
--      		cerr << versionString << endl;
-+      		std::cerr << versionString << std::endl;
- 		exit(0);
-@@ -337,3 +337,3 @@
-               if (!strncasecmp(*argv, "--version", 10)) {
--	        cerr << versionString << endl;
-+	        std::cerr << versionString << std::endl;
- 		exit(0);
-@@ -342,3 +342,3 @@
-       default:
--      		cerr << "Ignoring unknown option '" << argv[0] << "'.\n";
-+      		std::cerr << "Ignoring unknown option '" << argv[0] << "'.\n";
- 	  	break;
-@@ -357,5 +357,5 @@
- void XOSView::visibilityEvent( XVisibilityEvent &event ){
--  //cerr <<"XOSView::visibilityEvent() : ";
-+  //std::cerr <<"XOSView::visibilityEvent() : ";
-   if (event.state == VisibilityFullyObscured){
--    //cerr <<"hidden";
-+    //std::cerr <<"hidden";
-     _isvisible = false;
-@@ -363,6 +363,6 @@
-   else {
--    //cerr <<"not hidden";
-+    //std::cerr <<"not hidden";
-     _isvisible = true;
-   }
--  //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;
diff --git a/sysutils/xosview/patches/patch-aq b/sysutils/xosview/patches/patch-aq
deleted file mode 100644
index fad7e29ec62..00000000000
--- a/sysutils/xosview/patches/patch-aq
+++ /dev/null
@@ -1,113 +0,0 @@
-$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 20:47:37.000000000 -0400
-@@ -5,2 +5,3 @@
- #include <X11/Xatom.h>
-+#include <iostream>
- #include <stdlib.h>
-@@ -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);
-@@ -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);
-@@ -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);
-@@ -166,3 +167,3 @@
-   if((classhints_ = XAllocClassHint()) == NULL){
--    cerr <<"Error allocating class hint!" <<endl;
-+    std::cerr <<"Error allocating class hint!" <<std::endl;
-     exit(1);
-@@ -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);
-@@ -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);
-@@ -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);
-@@ -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;
-@@ -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;
-@@ -275,3 +276,3 @@
-   if((sizehints_ = XAllocSizeHints()) == NULL){
--    cerr <<"Error allocating size hints!" <<endl;
-+    std::cerr <<"Error allocating size hints!" <<std::endl;
-     exit(1);
-@@ -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);
-@@ -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);
-@@ -397,4 +398,4 @@
- 
--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.
-@@ -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;
- 
-@@ -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;
---- xwin.h.orig	1999-02-16 09:08:35.000000000 -0500
-+++ 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;
- 
diff --git a/sysutils/xosview/patches/patch-ar b/sysutils/xosview/patches/patch-ar
deleted file mode 100644
index 235a43e1d8d..00000000000
--- a/sysutils/xosview/patches/patch-ar
+++ /dev/null
@@ -1,9 +0,0 @@
-$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
deleted file mode 100644
index b31dc20bf1c..00000000000
--- a/sysutils/xosview/patches/patch-as
+++ /dev/null
@@ -1,9 +0,0 @@
-$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
deleted file mode 100644
index b1929e9f168..00000000000
--- a/sysutils/xosview/patches/patch-at
+++ /dev/null
@@ -1,14 +0,0 @@
-$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
deleted file mode 100644
index 60e76f7c204..00000000000
--- a/sysutils/xosview/patches/patch-au
+++ /dev/null
@@ -1,19 +0,0 @@
-$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
deleted file mode 100644
index a66b94d8aed..00000000000
--- a/sysutils/xosview/patches/patch-av
+++ /dev/null
@@ -1,16 +0,0 @@
-$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