cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

upgrade to 1.7.4

Browse Source
This commit is contained in:
form 2000-07-17 16:24:46 +00:00
parent 65541a0866
commit 927e2190d3
10 changed files with 66 additions and 112 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sysutils/xosview/Makefile
View File

@ -1,7 +1,7 @@
# $OpenBSD: Makefile,v 1.16 2000/06/15 05:35:42 form Exp $ # $OpenBSD: Makefile,v 1.17 2000/07/17 16:24:46 form Exp $
# $NetBSD: Makefile,v 1.9 1998/04/15 10:38:50 agc Exp $ # $NetBSD: Makefile,v 1.9 1998/04/15 10:38:50 agc Exp $
DISTNAME= xosview-1.7.3 DISTNAME= xosview-1.7.4
CATEGORIES= sysutils CATEGORIES= sysutils
NEED_VERSION= 1.301 NEED_VERSION= 1.301
MASTER_SITES= http://lore.ece.utexas.edu/~bgrayson/xosview/ MASTER_SITES= http://lore.ece.utexas.edu/~bgrayson/xosview/
@ -17,8 +17,8 @@ USE_X11= Yes
CONFIGURE_STYLE=gnu CONFIGURE_STYLE=gnu
CONFIGURE_ENV+= CPPFLAGS="-I${X11BASE}/include" LDFLAGS="-L${X11BASE}/lib" CONFIGURE_ENV+= CPPFLAGS="-I${X11BASE}/include" LDFLAGS="-L${X11BASE}/lib"
MAKE_ENV+= UVM=${UVM} #MAKE_ENV+= UVM=${UVM}
MAKE_FLAGS= ARCH=${ARCH} #MAKE_FLAGS= ARCH=${ARCH}
.if (${MACHINE_ARCH} == "alpha") .if (${MACHINE_ARCH} == "alpha")
BROKEN= "compilation errors" BROKEN= "compilation errors"

6
sysutils/xosview/files/md5
View File

@ -1,3 +1,3 @@
MD5 (xosview-1.7.3.tar.gz) = 9d2f87d67bc62ca9d263becd168bae4f MD5 (xosview-1.7.4.tar.gz) = aaea69f14f0d749243b7a594e292796b
RMD160 (xosview-1.7.3.tar.gz) = 65f7b34407d7f0fa315cee2d3681f74c52028506 RMD160 (xosview-1.7.4.tar.gz) = 071e8bbeeb58cc5101adfb440844e97698a34030
SHA1 (xosview-1.7.3.tar.gz) = 237e5acb9a18c48a2d3ccf78c3fb0ea81a41652e SHA1 (xosview-1.7.4.tar.gz) = 8d1780fb3053647f529e40c11ad5fa83cc80acc4

13
sysutils/xosview/patches/patch-ad
View File

@ -1,13 +0,0 @@
# $OpenBSD: patch-ad,v 1.1 1999/07/09 15:39:54 form Exp $
--- xosview.1.orig Fri Jul 9 22:33:35 1999
+++ xosview.1 Fri Jul 9 22:33:44 1999
@@ -787,7 +787,7 @@
Added battery-meter support to NetBSD.
.RE
-Oleg Safiullin (form@vs.itam.nsc.ru)
+Oleg Safiullin (form@vell.nsc.ru)
.RS
OpenBSD interrupt-meter support.
.RE

20
sysutils/xosview/patches/patch-ae
View File

@ -1,20 +0,0 @@
--- bsd/memmeter.cc.orig Sat Dec 4 22:50:10 1999
+++ bsd/memmeter.cc Sat Dec 4 22:52:32 1999
@@ -90,7 +90,7 @@
/* Initialize total_ to 0.0. FreeBSD will then add some to
* this, and later we'll add all the common fields to this. */
total_ = 0.0;
-#if defined(UVM) & defined(XOSVIEW_NETBSD)
+#if defined(UVM) && (defined(XOSVIEW_NETBSD) || defined(XOSVIEW_OPENBSD))
struct uvmexp kvm_uvm_exp;
BSDGetUVMPageStats(&kvm_uvm_exp);
int pgsize = kvm_uvm_exp.pagesize;
@@ -123,7 +123,7 @@
/*total_ = kvm_cnt.v_page_count * pgsize;*/
# endif /* FreeBSD */
fields_[FREE_INDEX] = kvm_cnt.v_free_count * pgsize;
-#endif /* UVM && NetBSD */
+#endif /* UVM && (NetBSD || OpenBSD) */
/* Now add to total_ (the cache pages were counted for FreeBSD
* above). */
total_ += fields_[0] + fields_[1] + fields_[2] + fields_[FREE_INDEX];

11
sysutils/xosview/patches/patch-af
View File

@ -1,11 +0,0 @@
--- Xdefaults.orig Sat Dec 4 22:58:35 1999
+++ Xdefaults Sat Dec 4 22:59:17 1999
@@ -19,6 +19,8 @@
xosview*enableStipple: False ! Change to true to try beta stipple support.
xosview*samplesPerSec: 10 ! not yet supported
xosview*graphNumCols: 128 ! number of samples shown in a graph
+xosview*load: True
+xosview*loadAlarmThreshold: 2
! Load Meter Resources
! We don't need to enable the Decay option, as it is already time-averaged.

57
sysutils/xosview/patches/patch-aa → sysutils/xosview/patches/patch-bsd_kernel_cc
View File

@ -1,20 +1,16 @@
# $OpenBSD: patch-aa,v 1.7 1999/07/09 15:39:54 form Exp $ $OpenBSD: patch-bsd_kernel_cc,v 1.1 2000/07/17 16:24:47 form Exp $
--- bsd/kernel.cc.orig Mon Jul 17 22:56:11 2000
--- bsd/kernel.cc.orig Fri Jul 9 22:17:49 1999 +++ bsd/kernel.cc Mon Jul 17 23:01:09 2000
+++ bsd/kernel.cc Fri Jul 9 22:21:52 1999 @@ -72,7 +72,7 @@ int DevStat_Get();
@@ -67,7 +67,11 @@
#ifdef HAVE_SWAPCTL #ifdef HAVE_SWAPCTL
#include <unistd.h> /* For swapctl proto. */ #include <unistd.h> /* For swapctl proto. */
+#ifdef XOSVIEW_OPENBSD -#if defined(XOSVIEW_NETBSD) && defined(__NetBSD_Version__) && __NetBSD_Version__ >= 104000000
+#include <sys/swap.h> +#if defined(XOSVIEW_OPENBSD) || (defined(XOSVIEW_NETBSD) && defined(__NetBSD_Version__) && __NetBSD_Version__ >= 104000000)
+#else #include <sys/swap.h> /* For swapent, SWAP_*. */
#include <vm/vm_swap.h> /* For swapent, SWAP_*. */ #else
+#endif #include <vm/vm_swap.h> /* swapent, SWAP_*. */
#include <stdlib.h> /* For malloc(), free(). */ @@ -162,9 +162,9 @@ static struct nlist nlst[] =
#endif
@@ -153,9 +157,9 @@
{ "_eintrcnt" }, { "_eintrcnt" },
#define EINTRCNT_SYM_INDEX 8 #define EINTRCNT_SYM_INDEX 8
@ -26,7 +22,7 @@
{ "_intrhand" }, { "_intrhand" },
#define INTRHAND_SYM_INDEX 9 #define INTRHAND_SYM_INDEX 9
{ "_intrstray" }, { "_intrstray" },
@@ -750,7 +754,7 @@ @@ -781,7 +781,7 @@ BSDGetDiskXFerBytes (unsigned long long
} }
/* ---------------------- Interrupt Meter stuff ----------------- */ /* ---------------------- Interrupt Meter stuff ----------------- */
@ -35,7 +31,7 @@
static unsigned long kvm_intrcnt[128];// guess at space needed static unsigned long kvm_intrcnt[128];// guess at space needed
#endif #endif
@@ -770,9 +774,9 @@ @@ -801,9 +801,9 @@ int
BSDIntrInit() { BSDIntrInit() {
OpenKDIfNeeded(); OpenKDIfNeeded();
@ -47,7 +43,7 @@
return ValidSymbol(IVP_SYM_INDEX); return ValidSymbol(IVP_SYM_INDEX);
#elif defined (XOSVIEW_BSDI) #elif defined (XOSVIEW_BSDI)
#if _BSDI_VERSION >= 199802 /* BSD/OS 4.x */ #if _BSDI_VERSION >= 199802 /* BSD/OS 4.x */
@@ -785,7 +789,7 @@ @@ -816,7 +816,7 @@ BSDIntrInit() {
#endif #endif
} }
@ -56,7 +52,7 @@
int int
BSDNumInts() { BSDNumInts() {
int nintr; int nintr;
@@ -846,8 +850,8 @@ @@ -877,8 +877,8 @@ BSDGetIntrStats (unsigned long intrCount
// counts. We'll just use the intrcnt array here. If anyone // counts. We'll just use the intrcnt array here. If anyone
// has problems, please mail me. bgrayson // has problems, please mail me. bgrayson
{ {
@ -67,33 +63,12 @@
struct intrhand *intrhand[16], *ihp, ih; struct intrhand *intrhand[16], *ihp, ih;
int intrstray[16]; int intrstray[16];
@@ -868,8 +872,8 @@ @@ -911,7 +911,7 @@ BSDGetIntrStats (unsigned long intrCount
ihp = ih.ih_next;
}
}
-# endif /* i386 */
-# ifdef pc532
+# endif /* __i386__ */
+# ifdef __pc532__
struct iv ivt[32], *ivp = ivt;
safe_kvm_read(nlst[IVP_SYM_INDEX].n_value, ivp, sizeof(ivt));
@@ -879,15 +883,15 @@
else
intrCount[i] = 0; intrCount[i] = 0;
} }
-# endif /* pc532 */ # endif /* pc532 */
-#else /* XOSVIEW_OPENBSD && (pc532 || i386) */ -#else /* XOSVIEW_OPENBSD && (pc532 || i386) */
+# endif /* __pc532__ */
+#else /* XOSVIEW_OPENBSD && (__pc532__ || __i386__) */ +#else /* XOSVIEW_OPENBSD && (__pc532__ || __i386__) */
int nintr = BSDNumInts(); int nintr = BSDNumInts();
safe_kvm_read(nlst[INTRCNT_SYM_INDEX].n_value, kvm_intrcnt, safe_kvm_read(nlst[INTRCNT_SYM_INDEX].n_value, kvm_intrcnt,
sizeof(long)*nintr); sizeof(long)*nintr);
for (int i=0;i<nintr;i++) {
intrCount[i] = kvm_intrcnt[i];
}
-#endif /* XOSVIEW_OPENBSD && (pc532 || i386) */
+#endif /* XOSVIEW_OPENBSD && (__pc532__ || __i386__) */
}
return;
#endif

12
sysutils/xosview/patches/patch-bsd_memmeter_cc Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-bsd_memmeter_cc,v 1.1 2000/07/17 16:24:47 form Exp $
--- bsd/memmeter.cc.orig Mon Jul 17 23:11:07 2000
+++ bsd/memmeter.cc Mon Jul 17 23:12:05 2000
@@ -90,7 +90,7 @@ void MemMeter::getmeminfo (void) {
/* Initialize total_ to 0.0. FreeBSD will then add some to
* this, and later we'll add all the common fields to this. */
total_ = 0.0;
-#if defined(UVM) & defined(XOSVIEW_NETBSD)
+#if defined(UVM) && (defined(XOSVIEW_NETBSD) || defined(XOSVIEW_OPENBSD))
struct uvmexp kvm_uvm_exp;
BSDGetUVMPageStats(&kvm_uvm_exp);
int pgsize = kvm_uvm_exp.pagesize;

9
sysutils/xosview/patches/patch-ab → sysutils/xosview/patches/patch-bsd_obsdintr_h
View File

@ -1,7 +1,6 @@
# $OpenBSD: patch-ab,v 1.7 1999/07/09 15:39:54 form Exp $ $OpenBSD: patch-bsd_obsdintr_h,v 1.1 2000/07/17 16:24:47 form Exp $
--- bsd/obsdintr.h.orig Tue Jan 26 01:32:03 1999
--- bsd/obsdintr.h.orig Tue Feb 16 20:09:21 1999 +++ bsd/obsdintr.h Mon Jul 17 23:02:06 2000
+++ bsd/obsdintr.h Fri Jul 9 22:03:11 1999
@@ -1,7 +1,17 @@ @@ -1,7 +1,17 @@
#ifndef _OPENBSDINTR_H_ #ifndef _OPENBSDINTR_H_
#define _OPENBSDINTR_H_ #define _OPENBSDINTR_H_
@ -21,7 +20,7 @@
struct intrhand { struct intrhand {
int (*ih_fun) __P((void *)); int (*ih_fun) __P((void *));
void *ih_arg; void *ih_arg;
@@ -13,7 +23,7 @@ @@ -13,7 +23,7 @@ struct intrhand {
}; };
#endif #endif

30
sysutils/xosview/patches/patch-ac → sysutils/xosview/patches/patch-configure
View File

@ -1,33 +1,36 @@
--- configure.orig Wed Nov 17 13:16:57 1999 $OpenBSD: patch-configure,v 1.1 2000/07/17 16:24:47 form Exp $
+++ configure Sat Dec 4 23:54:58 1999 --- configure.orig Mon Jul 17 23:02:37 2000
@@ -1635,6 +1635,19 @@ +++ configure Mon Jul 17 23:09:45 2000
@@ -1676,6 +1676,18 @@ fi
host_dir=linux host_dir=linux
host_os=linux ;; host_os=linux ;;
+ +
+## Check for OpenBSD 2.0-2.5 +## Check for OpenBSD 2.0-2.5
+openbsd2.[012345]*) +openbsd2.[012345]*)
+ EXTRALIBS="-lkvm $XPMLIB" + EXTRALIBS="-lkvm $XPMLIB"
+ INSTALL_ARGS='-s -g kmem -m 02555' + INSTALL_ARGS='-s -g kmem -m 02555'
+ cat >> confdefs.h <<\EOF + cat >> confdefs.h <<\EOF
+#define XOSVIEW_OPENBSD 1 +#define XOSVIEW_OPENBSD 1
+EOF +EOF
+ +
+ + host_dir=bsd
+ host_dir=bsd
+ host_os=openbsd ;; + host_os=openbsd ;;
+ +
## Check for known versions of NetBSD... ## Check for known versions of NetBSD...
netbsd1.[012345]*) netbsd1.[012345]*)
host_os=netbsd host_os_full=$host_os
@@ -1747,16 +1760,35 @@ @@ -1805,16 +1817,34 @@ EOF
host_dir=bsd host_dir=bsd
host_os=freebsd ;; host_os=freebsd ;;
-openbsd*) -openbsd*)
- EXTRALIBS="-lkvm $XPMLIB"
- INSTALL_ARGS='-s -g kmem -m 02555'
+openbsd*) +openbsd*)
EXTRALIBS="-lkvm $XPMLIB" + EXTRALIBS="-lkvm $XPMLIB"
INSTALL_ARGS='-s -g kmem -m 02555' + INSTALL_ARGS='-s -g kmem -m 02555'
NetMeter_Default_Setting=True
cat >> confdefs.h <<\EOF cat >> confdefs.h <<\EOF
#define XOSVIEW_OPENBSD 1 #define XOSVIEW_OPENBSD 1
+#define HAVE_SWAPCTL 1 +#define HAVE_SWAPCTL 1
@ -52,10 +55,7 @@
+ fi + fi
- host_dir=bsd - host_dir=bsd
- host_os=openbsd ;;
+ host_dir=bsd + host_dir=bsd
+ host_os=openbsd host_os=openbsd ;;
+;;
bsdi*) bsdi*)
EXTRALIBS="-lkvm $XPMLIB" EXTRALIBS="-lkvm $XPMLIB"
INSTALL_ARGS='-s -g kmem -m 02555'

12
sysutils/xosview/patches/patch-xosview_1 Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-xosview_1,v 1.1 2000/07/17 16:24:47 form Exp $
--- xosview.1.orig Mon Jul 17 23:10:20 2000
+++ xosview.1 Mon Jul 17 23:10:35 2000
@@ -843,7 +843,7 @@ David W. Talmage (talmage@jefferson.cmf.
Added battery-meter support to NetBSD.
.RE
-Oleg Safiullin (form@vs.itam.nsc.ru)
+Oleg Safiullin (form@openbsd.ru)
.RS
OpenBSD interrupt-meter support.
.RE