7 files changed, 110 insertions, 2 deletions
diff --git a/sysutils/xosview/Makefile b/sysutils/xosview/Makefile
index 469bc889d34..0fa62b74f9c 100644
--- a/sysutils/xosview/Makefile
+++ b/sysutils/xosview/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.53 2005/05/22 20:08:34 jlam Exp $
+# $NetBSD: Makefile,v 1.54 2005/11/17 15:53:00 rillig Exp $
 
 DISTNAME=	xosview-1.8.2
+PKGREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=xosview/}
 
diff --git a/sysutils/xosview/distinfo b/sysutils/xosview/distinfo
index e7f020c1630..4ececf1fa0e 100644
--- a/sysutils/xosview/distinfo
+++ b/sysutils/xosview/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.13 2005/02/24 13:41:00 agc Exp $
+$NetBSD: distinfo,v 1.14 2005/11/17 15:53:00 rillig Exp $
 
 SHA1 (xosview-1.8.2.tar.gz) = 54df604641ebbe6872f631cea34c9d91883bf4da
 RMD160 (xosview-1.8.2.tar.gz) = eb2a513629350795b85c41fc61cbd23da4de140e
@@ -6,3 +6,8 @@ Size (xosview-1.8.2.tar.gz) = 248859 bytes
 SHA1 (patch-aa) = cc3de3bb4130724df543f85705b19946fba2577a
 SHA1 (patch-ab) = 4cb1ed9fad5577a889f22216be2345ace2655307
 SHA1 (patch-am) = 2ff8a500b677f87391d7128c76921f646c91444f
+SHA1 (patch-bc) = 91a2804c51b669fe039bb92df1704262eeff97d2
+SHA1 (patch-bd) = b09e24ca0fdc9abfa541e380da46f5d25218c082
+SHA1 (patch-be) = f4c1c9541e7a65c2e8a910491821007480936368
+SHA1 (patch-bf) = 62974d53607dba489179552247c6c3982e27fdf7
+SHA1 (patch-bg) = 8a21069575bc4a1bb999d8171b4bc1fc9cb02f23
diff --git a/sysutils/xosview/patches/patch-bc b/sysutils/xosview/patches/patch-bc
new file mode 100644
index 00000000000..f475128d6a1
--- /dev/null
+++ b/sysutils/xosview/patches/patch-bc
@@ -0,0 +1,15 @@
+$NetBSD: patch-bc,v 1.1 2005/11/17 15:53:01 rillig Exp $
+
+The Solaris SunPro compiler also has a bool type, not only gcc.
+
+--- general.h.orig	2003-10-09 06:35:59.000000000 +0200
++++ general.h	2005-02-22 14:16:47.160972300 +0100
+@@ -17,7 +17,7 @@
+       includes but before any local includes.  It should NOT be included
+       by any .h files unless there is a REALLY good reason.  */
+ 
+-#ifndef __GNUC__
++#if !defined(__GNUC__) && !defined(__sun)
+   /*  Every GNU system has _G_config.h, I believe, which tells us
+       whether or not the bool define exists.  However, for simplicity,
+       let's just redefine them all.  The following lines are directly
diff --git a/sysutils/xosview/patches/patch-bd b/sysutils/xosview/patches/patch-bd
new file mode 100644
index 00000000000..1bb54845df3
--- /dev/null
+++ b/sysutils/xosview/patches/patch-bd
@@ -0,0 +1,39 @@
+$NetBSD: patch-bd,v 1.1 2005/11/17 15:53:01 rillig Exp $
+
+The Solaris SunPro compiler does not know the old <strstream.h> header.
+I fixed it to use the new one. The #define is ugly, but I wanted to keep
+the patch short.
+
+--- sunos5/cpumeter.cc.orig	1999-01-31 21:26:38.000000000 +0100
++++ sunos5/cpumeter.cc	2005-02-22 14:44:47.640675500 +0100
+@@ -8,7 +8,10 @@
+ #include <unistd.h>
+ #include <ctype.h>
+ #include <string.h>
+-#include <strstream.h>
++#include <sstream>
++
++#define ostrstream std::ostringstream
++using std::ends;
+ 
+ CPUMeter::CPUMeter(XOSView *parent, kstat_ctl_t *_kc, int cpuid)
+ 	: FieldMeterGraph(parent, CPU_STATES, toUpper(cpuStr(cpuid)),
+@@ -91,15 +94,15 @@ const char *CPUMeter::toUpper(const char
+ 
+ const char *CPUMeter::cpuStr(int num)
+ {
+-	static char buffer[32];
+-	ostrstream str(buffer, 32);
++	static std::string buffer;
++	std::ostringstream str(buffer);
+ 
+ 	str << "cpu";
+ 	if (num != 0)
+ 		str << (num - 1);
+ 	str << ends;
+ 
+-	return buffer;
++	return buffer.c_str();
+ }
+ 
+ int CPUMeter::countCPUs(kstat_ctl_t *kc)
diff --git a/sysutils/xosview/patches/patch-be b/sysutils/xosview/patches/patch-be
new file mode 100644
index 00000000000..cdb4b34b90e
--- /dev/null
+++ b/sysutils/xosview/patches/patch-be
@@ -0,0 +1,17 @@
+$NetBSD: patch-be,v 1.1 2005/11/17 15:53:01 rillig Exp $
+
+There's some prototype conflict with SunPro, when the constructor is
+called. The "const int" is unnecessary, as ints are always passed by
+value.
+
+--- sunos5/cpumeter.h.orig	1999-01-31 21:26:38.000000000 +0100
++++ sunos5/cpumeter.h	2005-02-22 14:16:47.280965600 +0100
+@@ -12,7 +12,7 @@
+ 
+ class CPUMeter : public FieldMeterGraph {
+  public:
+-	CPUMeter(XOSView *parent, kstat_ctl_t *kcp, const int cpuid = 0);
++	CPUMeter(XOSView *parent, kstat_ctl_t *kcp, int cpuid = 0);
+ 	~CPUMeter(void);
+ 
+ 	const char *name(void) const { return "CPUMeter"; }
diff --git a/sysutils/xosview/patches/patch-bf b/sysutils/xosview/patches/patch-bf
new file mode 100644
index 00000000000..df6cadba1e3
--- /dev/null
+++ b/sysutils/xosview/patches/patch-bf
@@ -0,0 +1,15 @@
+$NetBSD: patch-bf,v 1.1 2005/11/17 15:53:01 rillig Exp $
+
+SunPro complains about an unknown variable cerr.
+
+--- sunos5/loadmeter.cc.orig	1999-01-31 21:26:38.000000000 +0100
++++ sunos5/loadmeter.cc	2005-02-22 14:20:47.410939700 +0100
+@@ -8,6 +8,8 @@
+ #include <kstat.h>
+ /*#include <sys/loadavg.h>*/
+ 
++using std::cerr;
++
+ LoadMeter::LoadMeter(XOSView *parent, kstat_ctl_t *_kc)
+ 	: FieldMeterGraph(parent, 2, "LOAD", "PROCS/MIN", 1, 1, 0)
+ {
diff --git a/sysutils/xosview/patches/patch-bg b/sysutils/xosview/patches/patch-bg
new file mode 100644
index 00000000000..ed7f74cf72e
--- /dev/null
+++ b/sysutils/xosview/patches/patch-bg
@@ -0,0 +1,16 @@
+$NetBSD: patch-bg,v 1.1 2005/11/17 15:53:01 rillig Exp $
+
+This patch fixes the MIN and MAX macros. To my knowledge, only gcc can
+handle ({...}) expressions, so let's express that.
+
+--- xosview.cc.orig	2003-10-09 05:40:54.000000000 +0200
++++ xosview.cc	2005-02-22 14:16:47.380960800 +0100
+@@ -22,7 +22,7 @@ static const char * const versionString 
+ 
+ static const char NAME[] = "xosview@";
+ 
+-#ifdef sgi
++#if !defined(__GNUC__)
+ 
+ #define MIN(x,y)		\
+ (				\