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

update to 1.7.0.b.

Browse Source
This commit is contained in:
form 1999-07-01 22:07:44 +00:00
parent 8a4846fd93
commit f3a20873f9
4 changed files with 162 additions and 184 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sysutils/xosview/files/md5
View File

@ -1,3 +1,3 @@
MD5 (xosview-1.6.2.a.tar.gz) = bf021401b5dbf3971ff8a4ea6c90ee11
RMD160 (xosview-1.6.2.a.tar.gz) = b1dfbfbc43eb910fe64108a1f74f863a1a2f20d8
SHA1 (xosview-1.6.2.a.tar.gz) = 08d99b317b6ea5021084df5e11d5d9b5e9fc0640
MD5 (xosview-1.7.0.b.tar.gz) = f5b237eb455aefd686949a48ca12ef3d
RMD160 (xosview-1.7.0.b.tar.gz) = 1edc1c5671ea1a6a3635e187c30eb3de6a77b9b2
SHA1 (xosview-1.7.0.b.tar.gz) = 7f3053e0e8300995eb16421b0840cfbe9c4c7d07

175
sysutils/xosview/patches/patch-aa
View File

@ -1,138 +1,107 @@
*** bsd/kernel.cc.orig Fri Sep 25 02:21:30 1998
--- bsd/kernel.cc Mon Nov 23 10:12:36 1998
***************
*** 32,37 ****
--- 32,41 ----
#include <sys/disk.h> /* For disk statistics. */
# $OpenBSD: patch-aa,v 1.6 1999/07/01 22:07:44 form Exp $
--- bsd/kernel.cc.orig Tue Feb 16 20:09:21 1999
+++ bsd/kernel.cc Fri Jul 2 04:46:10 1999
@@ -67,7 +67,11 @@
#ifdef HAVE_SWAPCTL
#include <unistd.h> /* For swapctl proto. */
+#ifdef XOSVIEW_OPENBSD
+#include <sys/swap.h>
+#else
#include <vm/vm_swap.h> /* For swapent, SWAP_*. */
+#endif
#include <stdlib.h> /* For malloc(), free(). */
#endif
+ #ifdef XOSVIEW_OPENBSD
+ #include "obsdintr.h" /* XXX: got from 2.4 */
+ #endif
+
#include <sys/socket.h> /* These two are needed for the */
#include <net/if.h> /* NetMeter helper functions. */
#if defined(XOSVIEW_FREEBSD) && (__FreeBSD_version >= 300000)
***************
*** 104,114 ****
--- 108,134 ----
#endif /* XOSVIEW_FREEBSD */
+ #if defined(XOSVIEW_OPENBSD) && (defined(pc532) || defined(i386))
+
+ # ifdef i386
+ { "_intrhand" },
+ #define INTRHAND_SYM_INDEX 7
+ { "_intrstray" },
+ #define INTRSTRAY_SYM_INDEX 8
+ # else
+ { "_ivt" },
+ #define IVT_SYM_INDEX 7
+ # endif
+
+ #else /* XOSVIEW_OPENBSD && (pc532 || i386) */
+
{ "_intrcnt" },
#define INTRCNT_SYM_INDEX 7
@@ -110,9 +114,9 @@
{ "_eintrcnt" },
#define EINTRCNT_SYM_INDEX 8
+ #endif /* XOSVIEW_OPENBSD && (pc532 || i386) */
+
{NULL}
};
-#if defined(XOSVIEW_OPENBSD) && (defined(pc532) || defined(i386))
+#if defined(XOSVIEW_OPENBSD) && (defined(__pc532__) || defined(__i386__))
***************
*** 441,447 ****
--- 461,470 ----
-# ifdef i386
+# ifdef __i386__
{ "_intrhand" },
#define INTRHAND_SYM_INDEX 9
{ "_intrstray" },
@@ -661,7 +665,7 @@
}
/* ---------------------- Interrupt Meter stuff ----------------- */
+ #if !defined(XOSVIEW_OPENBSD) || !(defined(pc532) && defined(i386))
-#if !defined(XOSVIEW_OPENBSD) || !(defined(pc532) && defined(i386))
+#if !defined(XOSVIEW_OPENBSD) || !(defined(__pc532__) || defined(__i386__))
static unsigned long kvm_intrcnt[128];// guess at space needed
+ #endif
+
#ifdef XOSVIEW_FREEBSD
static unsigned long kvm_intrptrs[NUM_INTR];
#endif
***************
*** 449,457 ****
--- 472,487 ----
@@ -672,16 +676,16 @@
int
BSDIntrInit() {
OpenKDIfNeeded();
+ #if defined(XOSVIEW_OPENBSD) && defined(i386)
+ return ValidSymbol(INTRHAND_SYM_INDEX) && ValidSymbol(INTRSTRAY_SYM_INDEX);
+ #elif defined (XOSVIEW_OPENBSD) && defined(pc532)
+ return ValidSymbol(IVP_SYM_INDEX);
+ #else
-#if defined(XOSVIEW_OPENBSD) && defined(i386)
+#if defined(XOSVIEW_OPENBSD) && defined(__i386__)
return ValidSymbol(INTRHAND_SYM_INDEX) && ValidSymbol(INTRSTRAY_SYM_INDEX);
-#elif defined (XOSVIEW_OPENBSD) && defined(pc532)
+#elif defined (XOSVIEW_OPENBSD) && defined(__pc532__)
return ValidSymbol(IVP_SYM_INDEX);
#else
return ValidSymbol(INTRCNT_SYM_INDEX) && ValidSymbol(EINTRCNT_SYM_INDEX);
+ #endif
#endif
}
+ #if !defined(XOSVIEW_OPENBSD) || !(defined(pc532) || defined(i386))
int BSDNumInts() {
-#if !defined(XOSVIEW_OPENBSD) || !(defined(pc532) || defined(i386))
+#if !defined(XOSVIEW_OPENBSD) || !(defined(__pc532__) || defined(__i386__))
int
BSDNumInts() {
int nintr;
OpenKDIfNeeded();
***************
*** 471,476 ****
--- 501,507 ----
@@ -702,7 +706,7 @@
# endif
#endif
}
+ #endif /* XOSVIEW_OPENBSD */
-#endif /* XOSVIEW_OPENBSD */
+#endif /* XOSVIEW_OPENBSD && !(__i386__ || __pc532__) */
void
BSDGetIntrStats (unsigned long intrCount[NUM_INTR])
***************
*** 496,507 ****
--- 527,574 ----
BSDGetIntrStats (unsigned long intrCount[NUM_INTR]) {
@@ -727,8 +731,8 @@
// counts. We'll just use the intrcnt array here. If anyone
// has problems, please mail me. bgrayson
{
+ #if defined(XOSVIEW_OPENBSD) && (defined(pc532) || defined(i386))
+ # ifdef i386
+ struct intrhand *intrhand[16], *ihp, ih;
+ int intrstray[16];
+
+ safe_kvm_read(nlst[INTRHAND_SYM_INDEX].n_value, intrhand,
+ sizeof(intrhand));
+ safe_kvm_read(nlst[INTRSTRAY_SYM_INDEX].n_value, intrstray,
+ sizeof(intrstray));
+
+ for (int i=0;i<16;i++) {
+ ihp = intrhand[i];
+ intrCount[i] = 0;
+ while (ihp) {
+ if (kvm_read(kd, (u_long)ihp, &ih, sizeof(ih)) != sizeof(ih)) {
+ fprintf(stderr, "Error: kvm_read(): %s\n", kvm_geterr(kd));
+ exit(1);
+ }
+ intrCount[i] = ih.ih_count;
+ ihp = ih.ih_next;
+ }
+ }
+ # endif /* i386 */
+ # ifdef pc532
+ struct iv ivt[32], *ivp = ivt;
+
+ safe_kvm_read(nlst[IVP_SYM_INDEX].n_value, ivp, sizeof(ivt));
+ for (int i=0;i<16;i++,ivp++) {
+ if (ivp->iv_vec && ivp->iv_use)
+ intrCount[i] = ivp->iv_cnt;
+ else
+ intrCount[i] = 0;
+ }
+ # endif /* pc532 */
+ #else /* XOSVIEW_OPENBSD && (pc532 || i386) */
-#if defined(XOSVIEW_OPENBSD) && (defined(pc532) || defined(i386))
-# ifdef i386
+#if defined(XOSVIEW_OPENBSD) && (defined(__pc532__) || defined(__i386__))
+# ifdef __i386__
struct intrhand *intrhand[16], *ihp, ih;
int intrstray[16];
@@ -749,8 +753,8 @@
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));
@@ -760,15 +764,15 @@
else
intrCount[i] = 0;
}
-# endif /* pc532 */
-#else /* XOSVIEW_OPENBSD && (pc532 || i386) */
+# endif /* __pc532__ */
+#else /* XOSVIEW_OPENBSD && (__pc532__ || __i386__) */
int nintr = BSDNumInts();
safe_kvm_read(nlst[INTRCNT_SYM_INDEX].n_value, kvm_intrcnt,
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) */
+#endif /* XOSVIEW_OPENBSD && (__pc532__ || __i386__) */
}
return;
#endif

52
sysutils/xosview/patches/patch-ab
View File

@ -1,30 +1,22 @@
*** /dev/null Mon Nov 23 09:34:17 1998
--- bsd/obsdintr.h Mon Nov 23 09:39:14 1998
***************
*** 0 ****
--- 1,25 ----
+ #ifndef _OPENBSDINTR_H_
+ #define _OPENBSDINTR_H_
+
+ #ifdef i386
+ struct intrhand {
+ int (*ih_fun) __P((void *));
+ void *ih_arg;
+ u_long ih_count;
+ struct intrhand *ih_next;
+ int ih_level;
+ int ih_irq;
+ char *ih_what;
+ };
+ #endif
+
+ #ifdef pc532
+ struct iv {
+ void (*iv_vec)();
+ void *iv_arg;
+ int iv_cnt;
+ char *iv_use;
+ };
+ #endif
+
+ #endif /* _OPENBSDINTR_H_ */
# $OpenBSD: patch-ab,v 1.6 1999/07/01 22:07:44 form Exp $
--- bsd/obsdintr.h.orig Fri Jul 2 04:26:33 1999
+++ bsd/obsdintr.h Fri Jul 2 04:26:50 1999
@@ -1,7 +1,7 @@
#ifndef _OPENBSDINTR_H_
#define _OPENBSDINTR_H_
-#ifdef i386
+#ifdef __i386__
struct intrhand {
int (*ih_fun) __P((void *));
void *ih_arg;
@@ -13,7 +13,7 @@
};
#endif
-#ifdef pc532
+#ifdef __pc532__
struct iv {
void (*iv_vec)();
void *iv_arg;

43
sysutils/xosview/patches/patch-ac
View File

@ -1,15 +1,32 @@
--- xwin.cc.orig Sat Jun 26 13:43:54 1999
+++ xwin.cc Sat Jun 26 13:42:38 1999
@@ -53,9 +53,9 @@
# $OpenBSD: patch-ac,v 1.2 1999/07/01 22:07:44 form Exp $
--- configure.orig Fri Jul 2 04:36:11 1999
+++ configure Fri Jul 2 04:41:31 1999
@@ -1658,6 +1658,19 @@
host_dir=linux
host_os=linux ;;
+
+## Check for OpenBSD 2.0-2.4
+openbsd2.[01234]*)
+ EXTRALIBS="-lkvm $XPMLIB"
+ INSTALL_ARGS='-s -g kmem -m 02555'
+ cat >> confdefs.h <<\EOF
+#define XOSVIEW_OPENBSD 1
+EOF
+
+
+ host_dir=bsd
+ host_os=openbsd ;;
+
## Check for known versions of NetBSD...
netbsd1.[0123]*)
host_os=netbsd
@@ -1761,6 +1774,7 @@
INSTALL_ARGS='-s -g kmem -m 02555'
cat >> confdefs.h <<\EOF
#define XOSVIEW_OPENBSD 1
+#define HAVE_SWAPCTL 1
EOF
// Set up the default Events
events_ = NULL;
- addEvent( new Event( this, ConfigureNotify, &configureEvent ) );
- addEvent( new Event( this, ClientMessage, &deleteEvent ) );
- addEvent( new Event( this, MappingNotify, &mappingNotify ) );
+ addEvent( new Event( this, ConfigureNotify, &XWin::configureEvent ) );
+ addEvent( new Event( this, ClientMessage, &XWin::deleteEvent ) );
+ addEvent( new Event( this, MappingNotify, &XWin::mappingNotify ) );
//openDisplay(); // Done explicitly in xosview.cc.
}