diff options
| -rw-r--r-- | sysutils/xosview/Makefile | 6 | ||||
| -rw-r--r-- | sysutils/xosview/distinfo | 2 | ||||
| -rw-r--r-- | sysutils/xosview/files/patch-ae | 23 | ||||
| -rw-r--r-- | sysutils/xosview/files/patch-kernel.cc | 30 |
4 files changed, 25 insertions, 36 deletions
diff --git a/sysutils/xosview/Makefile b/sysutils/xosview/Makefile index 7eee58e04681..bdd3158acf20 100644 --- a/sysutils/xosview/Makefile +++ b/sysutils/xosview/Makefile @@ -7,9 +7,11 @@ # PORTNAME= xosview -PORTVERSION= 1.7.3 +PORTVERSION= 1.7.4 CATEGORIES= sysutils -MASTER_SITES= http://lore.ece.utexas.edu/~bgrayson/xosview/ \ +MASTER_SITES= \ + ftp://ftp.openbsd.ru/pub/OpenBSD/distfiles/ \ + http://lore.ece.utexas.edu/~bgrayson/xosview/ \ ${MASTER_SITE_SUNSITE} MASTER_SITE_SUBDIR= system/status/xstatus diff --git a/sysutils/xosview/distinfo b/sysutils/xosview/distinfo index 5774fe27f6ef..0b551e3b6bf7 100644 --- a/sysutils/xosview/distinfo +++ b/sysutils/xosview/distinfo @@ -1 +1 @@ -MD5 (xosview-1.7.3.tar.gz) = 9d2f87d67bc62ca9d263becd168bae4f +MD5 (xosview-1.7.4.tar.gz) = 2b54da13e6acdbb8eb27f56d413b321a diff --git a/sysutils/xosview/files/patch-ae b/sysutils/xosview/files/patch-ae index b23c9fc40f94..59549324238c 100644 --- a/sysutils/xosview/files/patch-ae +++ b/sysutils/xosview/files/patch-ae @@ -1,23 +1,6 @@ ---- Xdefaults.orig Tue Nov 16 21:53:01 1999 -+++ Xdefaults Wed Nov 17 00:41:59 1999 -@@ -34,6 +34,7 @@ - xosview*loadDecay: False - xosview*loadGraph: False - xosview*loadUsedFormat: float -+xosview*loadAlarmThreshold: 2 - - ! CPU Meter Resources - -@@ -93,7 +94,7 @@ - - ! Network Meter Resources - --xosview*net: False -+xosview*net: True - xosview*netBandwidth: 7500 ! for 64kbps ISDN - !xosview*netBandwidth: 5000 ! for up to 57.6kbps modems - !xosview*netBandwidth: 2000 ! for 28.8kbps modems (no compression) -@@ -144,7 +145,7 @@ +--- Xdefaults.in.orig Wed Jul 5 21:44:36 2000 ++++ Xdefaults.in Tue Aug 21 12:15:19 2001 +@@ -175,7 +175,7 @@ ! Interrupt Rate Meter Resources xosview*irqrate: True xosview*irqrateUsedColor: red diff --git a/sysutils/xosview/files/patch-kernel.cc b/sysutils/xosview/files/patch-kernel.cc index 0639463f3124..d3c6b04fe453 100644 --- a/sysutils/xosview/files/patch-kernel.cc +++ b/sysutils/xosview/files/patch-kernel.cc @@ -1,6 +1,14 @@ ---- bsd/kernel.cc.orig Mon Jul 5 21:09:30 1999 -+++ bsd/kernel.cc Tue Aug 21 10:49:26 2001 -@@ -284,7 +284,12 @@ +--- bsd/kernel.cc.orig Mon Jul 17 11:52:31 2000 ++++ bsd/kernel.cc Tue Aug 21 12:23:41 2001 +@@ -46,6 +46,7 @@ + #endif + + #ifdef HAVE_DEVSTAT ++#include <sys/dkstat.h> + #include <devstat.h> + #include <stdlib.h> /* For malloc(). */ + void DevStat_Init(); +@@ -297,7 +298,12 @@ while (nlp && nlp->n_name) { if ((nlp->n_type == 0) || (nlp->n_value == 0)) /*errx (-1, "kvm_nlist() lookup failed for symbol '%s'.", nlp->n_name);*/ @@ -13,7 +21,7 @@ nlp++; } #ifdef HAVE_DEVSTAT -@@ -457,7 +462,7 @@ +@@ -493,7 +499,7 @@ // void @@ -22,7 +30,7 @@ int totalinuse, totalsize; int rnswap, nswap = swapctl(SWAP_NSWAP, 0, 0); struct swapent *swapiter; -@@ -792,25 +797,25 @@ +@@ -828,25 +834,25 @@ OpenKDIfNeeded(); nintr = (nlst[EINTRCNT_SYM_INDEX].n_value - nlst[INTRCNT_SYM_INDEX].n_value) / sizeof(int); @@ -55,18 +63,14 @@ /* FreeBSD has an array of interrupt counts, indexed by device number. These are also indirected by IRQ num with intr_countp: */ safe_kvm_read (nlst[INTRCOUNTP_SYM_INDEX].n_value, -@@ -839,10 +844,10 @@ +@@ -875,8 +881,8 @@ intrCount[i] = kvm_intrptrs[i]; #endif /* _BSDI_VERSION */ -#else /* XOSVIEW_FREEBSD */ - // NetBSD/OpenBSD version, based on vmstat.c. Note that the pc532 -- // platform does support intrcnt and eintrcnt, but vmstat uses -- // the more advanced event counters to provide software +#else /* XOSVIEW_FREEBSD & i386 */ -+ // NetBSD/OpenBSD & FreeBSD/Alpha version, based on vmstat.c. -+ // Note that the pc532 platform does support intrcnt and eintrcnt, but -+ // vmstat uses the more advanced event counters to provide software ++ // NetBSD/OpenBSD & FreeBSD/Alpha version, based on vmstat.c. Note that the pc532 + // platform does support intrcnt and eintrcnt, but vmstat uses + // the more advanced event counters to provide software // counts. We'll just use the intrcnt array here. If anyone - // has problems, please mail me. bgrayson - { |