summaryrefslogtreecommitdiff
path: root/sysutils/xosview
diff options
context:
space:
mode:
authortron <tron@pkgsrc.org>1998-05-18 09:07:32 +0000
committertron <tron@pkgsrc.org>1998-05-18 09:07:32 +0000
commitf142d17f6980820ca4654718ddd7767824b54e3d (patch)
tree3f02da23dd85cb658c9fbdee0567059c4cc3ed5f /sysutils/xosview
parent8625d8ed4fbc8a634f72c433e3c9213a9fc650ad (diff)
downloadpkgsrc-f142d17f6980820ca4654718ddd7767824b54e3d.tar.gz
Update xosview to 1.6.0 using patches supplied by Brian Grayson, fixes
PR pkg/5461.
Diffstat (limited to 'sysutils/xosview')
-rw-r--r--sysutils/xosview/Makefile9
-rw-r--r--sysutils/xosview/files/md52
-rw-r--r--sysutils/xosview/patches/patch-aa28
-rw-r--r--sysutils/xosview/patches/patch-ab38
-rw-r--r--sysutils/xosview/patches/patch-ac79
-rw-r--r--sysutils/xosview/patches/patch-ad16
-rw-r--r--sysutils/xosview/patches/patch-ae27
-rw-r--r--sysutils/xosview/pkg/DESCR3
8 files changed, 8 insertions, 194 deletions
diff --git a/sysutils/xosview/Makefile b/sysutils/xosview/Makefile
index 98bcd46323c..1453bfc7e5d 100644
--- a/sysutils/xosview/Makefile
+++ b/sysutils/xosview/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.10 1998/05/08 21:00:38 hubertf Exp $
+# $NetBSD: Makefile,v 1.11 1998/05/18 09:07:32 tron Exp $
#
-DISTNAME= xosview-1.5.1
+DISTNAME= xosview-1.6.0
CATEGORIES= sysutils
-MASTER_SITES= http://www.ece.utexas.edu/~bgrayson/xosview/
+MASTER_SITES= http://www.ece.utexas.edu/~bgrayson/xosview/ \
+ http://lore.ece.utexas.edu/~bgrayson/xosview/
MAINTAINER= bgrayson@ece.utexas.edu
@@ -11,7 +12,7 @@ GNU_CONFIGURE= yes
USE_X11= yes
MAN1= xosview.1
-MAKE_ENV+= UVM=${UVM} PKGSRCDIR=${PKGSRCDIR}
+MAKE_ENV+= UVM=${UVM}
MAKE_FLAGS= ARCH=${ARCH} -f
.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/xosview/files/md5 b/sysutils/xosview/files/md5
index 5525afafbdf..f51b29b32b7 100644
--- a/sysutils/xosview/files/md5
+++ b/sysutils/xosview/files/md5
@@ -1 +1 @@
-MD5 (xosview-1.5.1.tar.gz) = 7d5ddc680660cca3e01604b8730b038f
+MD5 (xosview-1.6.0.tar.gz) = 08e1380466ecb1ef336f13aedbc4cb3e
diff --git a/sysutils/xosview/patches/patch-aa b/sysutils/xosview/patches/patch-aa
deleted file mode 100644
index 64eb2775927..00000000000
--- a/sysutils/xosview/patches/patch-aa
+++ /dev/null
@@ -1,28 +0,0 @@
-*** netbsd/pagemeter.h.orig Fri Jul 18 04:37:33 1997
---- netbsd/pagemeter.h Wed Mar 18 15:02:27 1998
-***************
-*** 21,25 ****
---- 21,31 ----
-
- #include "fieldmeterdecay.h"
-+ #if defined(UVM)
-+ #include <sys/param.h>
-+ #include <vm/vm.h>
-+ #include <uvm/uvm_extern.h>
-+ #else
- #include <sys/vmmeter.h>
-+ #endif
-
- class PageMeter : public FieldMeterDecay {
-***************
-*** 36,40 ****
---- 42,50 ----
- void getpageinfo( void );
- private:
-+ #if defined(UVM)
-+ struct uvmexp prev_;
-+ #else
- struct vmmeter prev_;
-+ #endif
- };
-
diff --git a/sysutils/xosview/patches/patch-ab b/sysutils/xosview/patches/patch-ab
deleted file mode 100644
index a618d2c66d3..00000000000
--- a/sysutils/xosview/patches/patch-ab
+++ /dev/null
@@ -1,38 +0,0 @@
---- netbsd/pagemeter.cc.orig Sun Dec 7 18:50:28 1997
-+++ netbsd/pagemeter.cc Wed Mar 18 15:11:46 1998
-@@ -56,9 +56,15 @@
-
- void PageMeter::getpageinfo (void) {
- // Begin NetBSD-specific code...
-+#if defined(UVM)
-+ struct uvmexp uvm;
-+ NetBSDGetPageStats(&uvm);
-+#else
- struct vmmeter vm;
--
- NetBSDGetPageStats(&vm);
-+#endif
-+
-+
- #ifdef XOSVIEW_FREEBSD
- #warning "FreeBSD hack"
- /* I'm not completely sure these are the right statistics, but
-@@ -66,10 +72,17 @@
- fields_[0] = vm.v_vnodein - prev_.v_vnodein;
- fields_[1] = vm.v_vnodeout - prev_.v_vnodeout;
- #else
-+#if defined(UVM)
-+ fields_[0] = uvm.pageins - prev_.pageins;
-+ fields_[1] = uvm.pgswapout - prev_.pgswapout;
-+ prev_ = uvm;
-+#else
- fields_[0] = vm.v_pgpgin - prev_.v_pgpgin;
- fields_[1] = vm.v_pgpgout - prev_.v_pgpgout;
--#endif
- prev_ = vm;
-+#endif
-+#endif
-+
- // End NetBSD-specific code...
- if (total_ < fields_[0] + fields_[1])
- total_ = fields_[0] + fields_[1];
diff --git a/sysutils/xosview/patches/patch-ac b/sysutils/xosview/patches/patch-ac
deleted file mode 100644
index 54ce45dfbe8..00000000000
--- a/sysutils/xosview/patches/patch-ac
+++ /dev/null
@@ -1,79 +0,0 @@
-*** netbsd/kernel.cc.orig Sat Nov 15 03:00:02 1997
---- netbsd/kernel.cc Fri Mar 13 17:26:48 1998
-***************
-*** 22,25 ****
---- 22,26 ----
-
- #include <err.h> /* For err(), warn(), etc. BCG */
-+ #include <errno.h>
- #include <sys/dkstat.h> /* For CPUSTATES, which tells us how
- many cpu states there are. */
-***************
-*** 34,38 ****
---- 35,53 ----
- #include <net/if.h> /* NetMeter helper functions. */
- #endif
-+
-+ #include <sys/param.h>
-+
-+ #if defined(UVM)
-+ #include <string.h>
-+ #include <sys/malloc.h>
-+ #include <sys/sysctl.h>
-+ #include <sys/device.h>
-+ #else
-+ #include <unistd.h>
-+ #include <vm/vm_swap.h>
- #include <sys/vmmeter.h> /* For struct vmmeter. */
-+ #endif
-+
-+ #include <vm/vm.h>
- #include "kernel.h" /* To grab CVSID stuff. */
-
-***************
-*** 52,56 ****
---- 67,75 ----
- { "_ifnet" },
- #define IFNET_SYM_INDEX 1
-+ #if defined(UVM)
-+ { "_disklist" }, //Just to make kvm_nlist happy
-+ #else
- { "_cnt" },
-+ #endif
- #define VMMETER_SYM_INDEX 2
- #ifndef XOSVIEW_FREEBSD /* FreeBSD doesn't have a diskmeter yet. */
-***************
-*** 148,151 ****
---- 167,185 ----
- NetBSDPageInit() { OpenKDIfNeeded(); }
-
-+ #if defined(UVM)
-+ void
-+ NetBSDGetPageStats(struct uvmexp* uvm) {
-+ size_t size;
-+ int mib[2];
-+ if (!uvm) errx(-1, "NetBSDGetPageStats(): passed pointer was null!\n");
-+ size = sizeof(uvmexp);
-+ mib[0] = CTL_VM;
-+ mib[1] = VM_UVMEXP;
-+ if (sysctl(mib, 2, uvm, &size, NULL, 0) < 0) {
-+ printf("can't get uvmexp: %s\n", strerror(errno));
-+ memset(&uvm, 0, sizeof(uvmexp));
-+ }
-+ }
-+ #else
- void
- NetBSDGetPageStats(struct vmmeter* vmp) {
-***************
-*** 153,157 ****
- safe_kvm_read_symbol(VMMETER_SYM_INDEX, vmp, sizeof(struct vmmeter));
- }
-!
- // ------------------------ CPUMeter functions ------------------
-
---- 187,191 ----
- safe_kvm_read_symbol(VMMETER_SYM_INDEX, vmp, sizeof(struct vmmeter));
- }
-! #endif
- // ------------------------ CPUMeter functions ------------------
-
diff --git a/sysutils/xosview/patches/patch-ad b/sysutils/xosview/patches/patch-ad
deleted file mode 100644
index 64a3cee7a51..00000000000
--- a/sysutils/xosview/patches/patch-ad
+++ /dev/null
@@ -1,16 +0,0 @@
---- netbsd/kernel.h.orig Tue Mar 3 18:24:35 1998
-+++ netbsd/kernel.h Sun Mar 1 17:04:45 1998
-@@ -37,8 +37,13 @@
- void
- NetBSDPageInit();
-
-+#if defined(UVM)
-+void
-+NetBSDGetPageStats(struct uvmexp* vmp);
-+#else
- void
- NetBSDGetPageStats(struct vmmeter* vmp);
-+#endif
-
- void
- NetBSDCPUInit();
diff --git a/sysutils/xosview/patches/patch-ae b/sysutils/xosview/patches/patch-ae
deleted file mode 100644
index 2d3e8171b8a..00000000000
--- a/sysutils/xosview/patches/patch-ae
+++ /dev/null
@@ -1,27 +0,0 @@
---- config/Makefile.netbsd.in.orig Tue Mar 3 18:49:24 1998
-+++ config/Makefile.netbsd.in Tue Mar 3 18:48:33 1998
-@@ -9,6 +9,24 @@
-
- CXXFLAGS += -I@top_srcdir@
-
-+.include "${PKGSRCDIR}/mk/bsd.pkg.subdir.mk"
-+.if (${ARCH} == "hp300")
-+CXXFLAGS += -D_HP300_CPU_H_
-+.endif
-+.if (${ARCH} == "mac68k")
-+CXXFLAGS += -D_CPU_MACHINE_
-+.endif
-+.if (${ARCH} == "x68k")
-+CXXFLAGS += -D_X68K_CPU_H_
-+.endif
-+
-+.ifndef UVM
-+UVM=
-+.endif
-+.if ${UVM} != ""
-+CXXFLAGS+= -DUVM
-+.endif
-+
- OBJS = \
- MeterMaker.o \
- cpumeter.o \
diff --git a/sysutils/xosview/pkg/DESCR b/sysutils/xosview/pkg/DESCR
index 8c8e67bef9c..b246c45099c 100644
--- a/sysutils/xosview/pkg/DESCR
+++ b/sysutils/xosview/pkg/DESCR
@@ -1,4 +1,4 @@
-Taken from Bryan Grayson's URL on xosview:
+Taken from Brian Grayson's URL on xosview:
(http://lore.ece.utexas.edu/~bgrayson/xosview.html)
xosview (or XOsview, or XOSView, take your pick!) is an application
@@ -7,3 +7,4 @@ as a graphical performance meter.
Original author: Mike Romberg (romberg@fsl.noaa.gov)
Ported to NetBSD by: Brian Grayson (bgrayson@ece.utexas.edu)
+Major FreeBSD work by: Tom Pavel (pavel@slac.stanford.edu)