From 81c26d49a516dfbeebcb63ea2334c2777cd45b50 Mon Sep 17 00:00:00 2001 From: rillig Date: Tue, 14 Mar 2006 15:48:01 +0000 Subject: Updated xosview to 1.8.3. All our patches have been applied upstream. --- sysutils/xosview/Makefile | 14 ++++++------- sysutils/xosview/distinfo | 16 ++++----------- sysutils/xosview/patches/patch-aa | 20 ------------------- sysutils/xosview/patches/patch-ab | 15 -------------- sysutils/xosview/patches/patch-am | 15 -------------- sysutils/xosview/patches/patch-bc | 17 ---------------- sysutils/xosview/patches/patch-bd | 41 --------------------------------------- sysutils/xosview/patches/patch-be | 19 ------------------ sysutils/xosview/patches/patch-bf | 17 ---------------- sysutils/xosview/patches/patch-bg | 18 ----------------- 10 files changed, 11 insertions(+), 181 deletions(-) delete mode 100644 sysutils/xosview/patches/patch-aa delete mode 100644 sysutils/xosview/patches/patch-ab delete mode 100644 sysutils/xosview/patches/patch-am delete mode 100644 sysutils/xosview/patches/patch-bc delete mode 100644 sysutils/xosview/patches/patch-bd delete mode 100644 sysutils/xosview/patches/patch-be delete mode 100644 sysutils/xosview/patches/patch-bf delete mode 100644 sysutils/xosview/patches/patch-bg (limited to 'sysutils/xosview') diff --git a/sysutils/xosview/Makefile b/sysutils/xosview/Makefile index 8985e12ba65..321ad885bc4 100644 --- a/sysutils/xosview/Makefile +++ b/sysutils/xosview/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.57 2006/02/05 23:10:59 joerg Exp $ +# $NetBSD: Makefile,v 1.58 2006/03/14 15:48:01 rillig Exp $ -DISTNAME= xosview-1.8.2 -PKGREVISION= 2 +DISTNAME= xosview-1.8.3 CATEGORIES= sysutils MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xosview/} @@ -16,22 +15,23 @@ USE_LANGUAGES= c++ HAS_CONFIGURE= YES CONFIGURE_ARGS+= --prefix=${PREFIX:Q} -CONFIGURE_ARGS+= --x-includes=${X11BASE}/include -CONFIGURE_ARGS+= --x-libraries=${X11BASE}/lib +CONFIGURE_ARGS+= --x-includes=${X11BASE:Q}/include +CONFIGURE_ARGS+= --x-libraries=${X11BASE:Q}/lib INSTALLATION_DIRS= bin lib/X11/app-defaults man/man1 +MAKE_FLAGS+= MANDIR=${PREFIX:Q}/${PKGMANDIR:Q}/man1 .include "../../mk/bsd.prefs.mk" .if ${OPSYS} == "NetBSD" . if !defined(UVM) && exists(/usr/include/uvm/uvm.h) CFLAGS+= -DUVM -UVM= # defined +UVM= yes BUILD_DEFS+= UVM . endif .elif ${OPSYS} == "SunOS" USE_TOOLS+= gmake -CPPFLAGS+= -I${X11BASE}/include +CPPFLAGS+= -I${X11BASE:Q}/include LIBS+= -lsocket -lnsl .endif diff --git a/sysutils/xosview/distinfo b/sysutils/xosview/distinfo index 334df1f40e4..4b21623522b 100644 --- a/sysutils/xosview/distinfo +++ b/sysutils/xosview/distinfo @@ -1,13 +1,5 @@ -$NetBSD: distinfo,v 1.15 2006/02/18 10:12:24 rillig Exp $ +$NetBSD: distinfo,v 1.16 2006/03/14 15:48:01 rillig Exp $ -SHA1 (xosview-1.8.2.tar.gz) = 54df604641ebbe6872f631cea34c9d91883bf4da -RMD160 (xosview-1.8.2.tar.gz) = eb2a513629350795b85c41fc61cbd23da4de140e -Size (xosview-1.8.2.tar.gz) = 248859 bytes -SHA1 (patch-aa) = d05d32ba8c981d82a0d61efe3e9f7e050dbd7bbc -SHA1 (patch-ab) = 3ff624013a7780228b68dffe1bdc320d9e75eccd -SHA1 (patch-am) = 093fb676e2327128c750c253f11a419311c0eef7 -SHA1 (patch-bc) = 7019b4e13fc8884ec71d7e964741c0936cc70745 -SHA1 (patch-bd) = 2e3c185989b5896d2b8a2ee6dbbe9e52c664861a -SHA1 (patch-be) = 37a04b3c10108e3de07e9236f3e0bc503676d5ac -SHA1 (patch-bf) = cff3f716b05515a88fc075b040f0e978176d0d00 -SHA1 (patch-bg) = 1143c70bf2472b246c86e868b73912d3ae1236ac +SHA1 (xosview-1.8.3.tar.gz) = 420fd0620ff9fb9ba83fc833eeb8b872414e377e +RMD160 (xosview-1.8.3.tar.gz) = 595e812dee686ccaa5d95eb537782679d752271b +Size (xosview-1.8.3.tar.gz) = 259793 bytes diff --git a/sysutils/xosview/patches/patch-aa b/sysutils/xosview/patches/patch-aa deleted file mode 100644 index 93cba94c406..00000000000 --- a/sysutils/xosview/patches/patch-aa +++ /dev/null @@ -1,20 +0,0 @@ -$NetBSD: patch-aa,v 1.11 2006/02/18 10:12:24 rillig Exp $ - -Status: applied upstream. - ---- bsd/kernel.cc.orig 2003-10-13 21:53:17.000000000 -0400 -+++ bsd/kernel.cc 2004-04-15 10:16:49.000000000 -0400 -@@ -817,11 +817,11 @@ - #if defined(NETBSD_1_6A) - // Use the new sysctl to do this for us. - int mib[3] = {CTL_HW, HW_DISKSTATS, sizeof(struct disk_sysctl)}; -- size_t sysctl_size = NetBSD_N_Drives * sizeof(struct disk_sysctl); -+ size_t sysctl_sz = NetBSD_N_Drives * sizeof(struct disk_sysctl); - struct disk_sysctl drive_stats[NetBSD_N_Drives]; - - // Do the sysctl. -- if (sysctl(mib, 3, drive_stats, &sysctl_size, NULL, 0) < 0) { -+ if (sysctl(mib, 3, drive_stats, &sysctl_sz, NULL, 0) < 0) { - err(1, "sysctl hw.diskstats failed"); - } - diff --git a/sysutils/xosview/patches/patch-ab b/sysutils/xosview/patches/patch-ab deleted file mode 100644 index a4018c97d3f..00000000000 --- a/sysutils/xosview/patches/patch-ab +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-ab,v 1.10 2006/02/18 10:12:24 rillig Exp $ - -Status: applied upstream. - ---- bsd/intratemeter.cc.orig 2003-10-09 00:20:06.000000000 -0400 -+++ bsd/intratemeter.cc 2004-04-21 14:32:07.000000000 -0400 -@@ -48,7 +48,7 @@ - dodecay_ = parent_->isResourceTrue("irqrateDecay"); - useGraph_ = parent_->isResourceTrue("irqrateGraph"); - SetUsedFormat (parent_->getResource("irqrateUsedFormat")); -- total_ = 100; -+ total_ = 2000; - - // Now, grab a sample. I don't know if this is needed here. BCG - BSDGetIntrStats (lastirqs_); diff --git a/sysutils/xosview/patches/patch-am b/sysutils/xosview/patches/patch-am deleted file mode 100644 index 62a563037fd..00000000000 --- a/sysutils/xosview/patches/patch-am +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-am,v 1.6 2006/02/18 10:12:24 rillig Exp $ - -Status: applied upstream. - ---- Xrm.cc.orig 2003-10-09 05:25:25.000000000 +0200 -+++ Xrm.cc -@@ -98,7 +98,7 @@ const char *Xrm::getResource(const char - char fcn_lower[1024]; - strncpy(fcn_lower, className(), 1024); - char* p = fcn_lower; -- while (p && *p) *p++ = tolower(*p); -+ while (p && *p) { *p = tolower(*p); p++; } - snprintf(fcn, 1024, "%s.%s", fcn_lower, rname); - XrmGetResource(_db, frn, fcn, &type, &val); - } diff --git a/sysutils/xosview/patches/patch-bc b/sysutils/xosview/patches/patch-bc deleted file mode 100644 index 0060c11d9cd..00000000000 --- a/sysutils/xosview/patches/patch-bc +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-bc,v 1.2 2006/02/18 10:12:24 rillig Exp $ - -Status: applied upstream. - -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 deleted file mode 100644 index 8991f7d83d4..00000000000 --- a/sysutils/xosview/patches/patch-bd +++ /dev/null @@ -1,41 +0,0 @@ -$NetBSD: patch-bd,v 1.2 2006/02/18 10:12:24 rillig Exp $ - -Status: applied upstream. - -The Solaris SunPro compiler does not know the old 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 - #include - #include --#include -+#include -+ -+#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 deleted file mode 100644 index 894efd07c07..00000000000 --- a/sysutils/xosview/patches/patch-be +++ /dev/null @@ -1,19 +0,0 @@ -$NetBSD: patch-be,v 1.2 2006/02/18 10:12:24 rillig Exp $ - -Status: applied upstream. - -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 deleted file mode 100644 index f9799560225..00000000000 --- a/sysutils/xosview/patches/patch-bf +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-bf,v 1.2 2006/02/18 10:12:24 rillig Exp $ - -Status: applied upstream. - -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 - /*#include */ - -+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 deleted file mode 100644 index 568061295b2..00000000000 --- a/sysutils/xosview/patches/patch-bg +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: patch-bg,v 1.2 2006/02/18 10:12:24 rillig Exp $ - -Status: applied upstream. - -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) \ - ( \ -- cgit v1.2.3