Date: Thu, 17 Mar 2005 23:49:46 +0100 From: Ulrich Spoerlein <q@uni.de> To: ports@freebsd.org Cc: clsung@freebsd.org Subject: Please test: Update/Unbreak of sysutils/xosview Message-ID: <20050317224946.GD834@galgenberg.net>
next in thread | raw e-mail | index | archive | help
--maH1Gajj2nflutpK
Content-Type: multipart/mixed; boundary="3Pql8miugIZX0722"
Content-Disposition: inline
--3Pql8miugIZX0722
Content-Type: text/plain; charset=iso-8859-15
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
Well, I can't say I was bored, but somehow I had to fix this app which I
dont even use. Go figure ...
Attached is an update to the current version and my attempt at bringing
back the IRQ counting on FreeBSD 5. Due to all the #ifdef mess, I'm not
quite sure if this builds/works on non-i386 platforms. I also can't test
-CURRENT, therefore please give it a whirl if you have a non-FreeBSD4/5
non-i386 machine handy.
Thanks!
Ulrich Sp=F6rlein
--=20
PGP Key ID: F0DB9F44 Encrypted mail welcome!
Fingerprint: F1CE D062 0CA9 ADE3 349B 2FE8 980A C6B5 F0DB 9F44
Ok, which part of "Ph'nglui mglw'nafh Cthulhu R'lyeh wgah'nagl fhtagn."
didn't you understand?
--3Pql8miugIZX0722
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="xosview-1.8.2.patch"
Content-Transfer-Encoding: quoted-printable
Index: Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/ports/sysutils/xosview/Makefile,v
retrieving revision 1.37
diff -u -r1.37 Makefile
--- Makefile 18 Nov 2004 22:09:44 -0000 1.37
+++ Makefile 17 Mar 2005 22:39:02 -0000
@@ -7,7 +7,7 @@
#
=20
PORTNAME=3D xosview
-PORTVERSION=3D 1.8.0
+PORTVERSION=3D 1.8.2
CATEGORIES=3D sysutils
MASTER_SITES=3D ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=3D ${PORTNAME}
@@ -22,10 +22,6 @@
=20
.include <bsd.port.pre.mk>
=20
-.if ${OSVERSION} >=3D 600000
-BROKEN=3D "Configure fails on FreeBSD >=3D 6.x"
-.endif
-
post-patch:
@${REINPLACE_CMD} -e 's,iostream.h,iostream,' \
${WRKSRC}/xwin.h \
@@ -46,7 +42,7 @@
${WRKSRC}/fieldmeter.cc \
${WRKSRC}/fieldmeterdecay.cc \
${WRKSRC}/fieldmetergraph.cc
- @${REINPLACE_CMD} -e 's,-O4 -pipe,,' \
+ @${REINPLACE_CMD} -e 's,-O4,,' \
${WRKSRC}/configure
=20
.include <bsd.port.post.mk>
Index: distinfo
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/ports/sysutils/xosview/distinfo,v
retrieving revision 1.12
diff -u -r1.12 distinfo
--- distinfo 31 Mar 2004 03:11:37 -0000 1.12
+++ distinfo 17 Mar 2005 22:39:02 -0000
@@ -1,2 +1,2 @@
-MD5 (xosview-1.8.0.tar.gz) =3D bcbc0f02ac8944222ec677d504024c40
-SIZE (xosview-1.8.0.tar.gz) =3D 170323
+MD5 (xosview-1.8.2.tar.gz) =3D cc8b261b1f8d82da29239f1cc2ee55e9
+SIZE (xosview-1.8.2.tar.gz) =3D 248859
Index: files/patch-Host.h
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: files/patch-Host.h
diff -N files/patch-Host.h
--- files/patch-Host.h 28 Oct 2003 14:53:44 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,10 +0,0 @@
---- Host.h.orig Sun Jan 24 06:20:39 1999
-+++ Host.h Mon Oct 27 21:31:31 2003
-@@ -19,6 +19,7 @@
- #include <arpa/inet.h>
- #include <iostream.h>
- #include "bool.h"
-+using namespace std;
-=20
- class Host {
- public:
Index: files/patch-Xrm.h
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: files/patch-Xrm.h
diff -N files/patch-Xrm.h
--- files/patch-Xrm.h 28 Oct 2003 14:53:44 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
---- Xrm.h.orig Sun Jan 24 06:20:39 1999
-+++ Xrm.h Mon Oct 27 21:26:37 2003
-@@ -16,7 +16,7 @@
- #include <X11/Xlib.h>
- #include <X11/Xresource.h>
-=20
--class ostream;
-+using namespace std;
-=20
- class Xrm {
- public:
Index: files/patch-bsd::cpumeter.cc
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: files/patch-bsd::cpumeter.cc
diff -N files/patch-bsd::cpumeter.cc
--- files/patch-bsd::cpumeter.cc 28 Oct 2003 14:53:44 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,21 +0,0 @@
---- bsd/cpumeter.cc.orig Tue Oct 28 17:42:56 2003
-+++ bsd/cpumeter.cc Tue Oct 28 17:43:20 2003
-@@ -123,12 +123,12 @@
- static int firstTime =3D 1;
- if (firstTime) {
- fprintf(stderr,
--" Warning: the CPU tick counters are not changing. This could
--be due to running a kernel besides /netbsd (or the equivalent for FreeBSD=
).
-- If this is the case, re-run xosview with the -N kernel-name option.
-- If not, then this is a bug. Please send a message to
--bgrayson@ece.utexas.edu, in addition to any send-pr bug reports
--(or in lieu of -- it ought to get fixed faster if you contact me
-+" Warning: the CPU tick counters are not changing. This could \
-+be due to running a kernel besides /netbsd (or the equivalent for FreeBSD=
). \
-+ If this is the case, re-run xosview with the -N kernel-name option. \
-+ If not, then this is a bug. Please send a message to \
-+bgrayson@ece.utexas.edu, in addition to any send-pr bug reports \
-+(or in lieu of -- it ought to get fixed faster if you contact me \
- directly). Thanks!\n");
- firstTime =3D 0;
- }
Index: files/patch-configure
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/ports/sysutils/xosview/files/patch-configure,v
retrieving revision 1.2
diff -u -r1.2 patch-configure
--- files/patch-configure 2 Jun 2002 17:43:05 -0000 1.2
+++ files/patch-configure 17 Mar 2005 22:39:02 -0000
@@ -1,11 +1,11 @@
--- configure.orig Sat Jun 1 23:56:10 2002
+++ configure Sat Jun 1 23:56:23 2002
-@@ -1851,7 +1851,7 @@
+@@ -4852,7 +4852,7 @@
=20
host_dir=3Dbsd
host_os=3Dfreebsd ;;
--freebsd[4]*)=20
-+freebsd[45]*)=20
+-freebsd[4]*)
++freebsd[456]*)
EXTRALIBS=3D"-lkvm $XPMLIB $DEVSTATLIB"
INSTALL_ARGS=3D'-s -g kmem -m 02555'
NetMeter_Default_Setting=3DTrue
Index: files/patch-general.h
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: files/patch-general.h
diff -N files/patch-general.h
--- files/patch-general.h 2 Dec 2002 01:52:14 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,29 +0,0 @@
---- general.h.orig Fri Feb 14 01:22:03 1997
-+++ general.h Sun Dec 1 19:54:02 2002
-@@ -17,11 +17,14 @@
- includes but before any local includes. It should NOT be included
- by any .h files unless there is a REALLY good reason. */
-=20
-+#include "osreldate.h"
-=20
- #ifdef __GNUC__
-+#if defined(__FreeBSD__) && (__FreeBSD_version < 500035)
- /* Grab _G_HAVE_BOOL, if possible. */
- #include <_G_config.h>
- #endif
-+#endif
-=20
- #ifndef _G_HAVE_BOOL
- /* Every GNU system has _G_config.h, I believe, which tells us
-@@ -29,11 +32,6 @@
- let's just redefine them all. The following lines are directly
- from g++-include's bool.h file. bgrayson */
-=20
--#undef FALSE
--#undef false
--#undef TRUE
--#undef true
--enum bool { FALSE =3D 0, false =3D 0, TRUE =3D 1, true =3D 1 };
- #endif
-=20
-=20
Index: files/patch-kernel.cc
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/ports/sysutils/xosview/files/patch-kernel.cc,v
retrieving revision 1.5
diff -u -r1.5 patch-kernel.cc
--- files/patch-kernel.cc 28 Oct 2003 14:53:44 -0000 1.5
+++ files/patch-kernel.cc 17 Mar 2005 22:39:02 -0000
@@ -1,6 +1,6 @@
---- bsd/kernel.cc.orig Tue Oct 9 10:40:51 2001
-+++ bsd/kernel.cc Mon Oct 27 20:03:03 2003
-@@ -46,6 +46,7 @@
+--- bsd/kernel.cc.orig Tue Oct 14 03:53:17 2003
++++ bsd/kernel.cc Thu Mar 17 23:26:49 2005
+@@ -54,6 +54,7 @@
#endif
=20
#ifdef HAVE_DEVSTAT
@@ -8,8 +8,41 @@
#include <devstat.h>
#include <stdlib.h> /* For malloc(). */
void DevStat_Init();
-@@ -297,7 +298,12 @@
- while (nlp && nlp->n_name) {
+@@ -211,19 +212,28 @@
+=20
+ { "_bufspace" },
+ #define BUFSPACE_SYM_INDEX 3
++#if __FreeBSD_version < 500000
+ { "_intr_countp" },
+ #define INTRCOUNTP_SYM_INDEX 4
++{ DUMMY_SYM },
++#define DUMMY_5 5
++#else
++{ "_intrnames" },
++#define INTRNAMES_SYM_INDEX 4
++{ "_eintrnames" },
++#define EINTRNAMES_SYM_INDEX 5
++#endif /* FreeBSD < 5.x */
+ { "_intrcnt" },
+-#define INTRCNT_SYM_INDEX 5
++#define INTRCNT_SYM_INDEX 6
+ { "_eintrcnt" },
+-#define EINTRCNT_SYM_INDEX 6
++#define EINTRCNT_SYM_INDEX 7
+=20
+ #ifndef HAVE_DEVSTAT
+=20
+ { "_dk_ndrive" },
+-#define DK_NDRIVE_SYM_INDEX 7
++#define DK_NDRIVE_SYM_INDEX 8
+ { "_dk_wds" },
+-#define DK_WDS_SYM_INDEX 8
++#define DK_WDS_SYM_INDEX 9
+=20
+ #endif /*HAVE_DEVSTAT */
+=20
+@@ -329,7 +339,12 @@
+ while (nlp && nlp->n_name && strncmp(nlp->n_name, DUMMY_SYM, strlen(DUM=
MY_SYM))) {
if ((nlp->n_type =3D=3D 0) || (nlp->n_value =3D=3D 0))
/*errx (-1, "kvm_nlist() lookup failed for symbol '%s'.", nlp->n_na=
me);*/
+#if defined(XOSVIEW_FREEBSD) && defined(__alpha__)
@@ -21,16 +54,7 @@
nlp++;
}
#ifdef HAVE_DEVSTAT
-@@ -493,7 +499,7 @@
- //
-=20
- void
--BSDGetSwapCtlInfo(int *totalp, int *freep) {
-+BSDGetSwapCtlInfo(int64_t *totalp, int64_t *freep) {
- int totalinuse, totalsize;
- int rnswap, nswap =3D swapctl(SWAP_NSWAP, 0, 0);
- struct swapent *swapiter;
-@@ -557,13 +563,21 @@
+@@ -597,13 +612,21 @@
* Make sure that the userland devstat version matches the kernel
* devstat version.
*/
@@ -52,7 +76,7 @@
nodisk++;
return;
}
-@@ -578,7 +592,11 @@
+@@ -618,7 +641,11 @@
* changed here, since it almost certainly has. We only look for
* errors.
*/
@@ -64,7 +88,7 @@
nodisk++;
return;
}
-@@ -590,7 +608,11 @@
+@@ -630,7 +657,11 @@
=20
/* only interested in disks */
matches =3D NULL;
@@ -76,7 +100,7 @@
nodisk++;
return;
}
-@@ -605,7 +627,11 @@
+@@ -645,7 +676,11 @@
* device list has changed, so we don't look for return values of 0
* or 1. If we get back -1, though, there is an error.
*/
@@ -88,7 +112,7 @@
&num_selections, &select_generation,
generation, cur.dinfo->devices, num_devices,
matches, num_matches,
-@@ -632,7 +658,11 @@
+@@ -672,7 +707,11 @@
* the selection process again, in case a device that we
* were previously displaying has gone away.
*/
@@ -100,7 +124,7 @@
case -1:
return (0);
case 1: {
-@@ -640,7 +670,11 @@
+@@ -680,7 +719,11 @@
=20
num_devices =3D cur.dinfo->numdevs;
generation =3D cur.dinfo->generation;
@@ -112,7 +136,7 @@
&num_selections, &select_generation,
generation, cur.dinfo->devices,
num_devices, matches, num_matches,
-@@ -664,14 +698,22 @@
+@@ -704,14 +747,22 @@
* Calculate elapsed time up front, since it's the same for all
* devices.
*/
@@ -135,7 +159,7 @@
return (0);
}
=20
-@@ -685,7 +727,11 @@
+@@ -725,7 +776,11 @@
=20
di =3D dev_select[dn].position;
=20
@@ -147,7 +171,7 @@
&last.dinfo->devices[di], busy_seconds,
&total_bytes, &total_transfers,
NULL, NULL,
-@@ -700,7 +746,11 @@
+@@ -740,7 +795,11 @@
last.dinfo =3D cur.dinfo;
cur.dinfo =3D tmp_dinfo;
=20
@@ -159,7 +183,7 @@
=20
} else {
/* no disks found ? */
-@@ -828,25 +878,25 @@
+@@ -912,25 +971,26 @@
OpenKDIfNeeded();=20
nintr =3D (nlst[EINTRCNT_SYM_INDEX].n_value -
nlst[INTRCNT_SYM_INDEX].n_value) / sizeof(int);
@@ -189,17 +213,46 @@
BSDGetIntrStats (unsigned long intrCount[NUM_INTR]) {
-#ifdef XOSVIEW_FREEBSD
+#if defined(XOSVIEW_FREEBSD) && defined(__i386__)
++#if __FreeBSD_version < 500000
/* 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,
-@@ -875,8 +925,8 @@
- intrCount[i] =3D kvm_intrptrs[i];
- #endif /* _BSDI_VERSION */
-=20
--#else /* XOSVIEW_FREEBSD */
-- // NetBSD/OpenBSD version, based on vmstat.c. Note that the pc532
-+#else /* XOSVIEW_FREEBSD & i386 */
-+ // NetBSD/OpenBSD & FreeBSD/Alpha version, based on vmstat.c. Note th=
at the pc532=20
- // 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
+@@ -944,6 +1004,38 @@
+ sizeof(unsigned long);
+ intrCount[i] =3D kvm_intrcnt[idx];
+ }
++#else /* FreeBSD 5.x and 6.x */
++ /* This code is stolen from vmstat */
++ unsigned long *kvm_intrcnt;
++ char *kvm_intrname;
++ size_t inamlen, intrcntlen;
++ unsigned int i, nintr;
++ int d;
++
++ intrcntlen =3D (nlst[EINTRCNT_SYM_INDEX].n_value - nlst[INTRCNT_SYM_I=
NDEX].n_value);
++ inamlen =3D nlst[EINTRNAMES_SYM_INDEX].n_value - nlst[INTRNAMES_SYM_I=
NDEX].n_value;
++ nintr =3D intrcntlen / sizeof(unsigned long);
++
++ if (((kvm_intrcnt =3D (unsigned long *)malloc(intrcntlen)) =3D=3D NUL=
L) ||=20
++ ((kvm_intrname =3D (char *)malloc(inamlen)) =3D=3D NULL))
++ err(1, "malloc()");
++
++ safe_kvm_read (nlst[INTRCNT_SYM_INDEX].n_value, kvm_intrcnt, intrcntl=
en);
++ safe_kvm_read (nlst[INTRNAMES_SYM_INDEX].n_value, kvm_intrname, inaml=
en);
++
++ /* kvm_intrname has the ASCII names of the IRQs, every null-terminated
++ * string corresponds to a value in the kvm_intrcnt array */
++ for (i=3D0; i < nintr; i++) {
++ if (kvm_intrname[0] !=3D '\0' && (*kvm_intrcnt !=3D 0)) {
++ /* Figure out which irq we have here */
++ if (1 =3D=3D sscanf(kvm_intrname, "irq%d:", &d))
++ if (d < NUM_INTR)
++ intrCount[d] =3D *kvm_intrcnt;
++ }
++ kvm_intrcnt++;
++ kvm_intrname +=3D strlen(kvm_intrname) + 1;
++ }
++#endif
+ #elif defined (XOSVIEW_BSDI)
+ int nintr =3D 16;
+ #if _BSDI_VERSION >=3D 199802 /* BSD/OS 4.x */
Index: files/patch-kernel.h
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/ports/sysutils/xosview/files/patch-kernel.h,v
retrieving revision 1.3
diff -u -r1.3 patch-kernel.h
--- files/patch-kernel.h 22 Aug 2001 22:22:06 -0000 1.3
+++ files/patch-kernel.h 17 Mar 2005 22:39:02 -0000
@@ -1,14 +1,5 @@
--- bsd/kernel.h.orig Fri May 29 14:21:36 1998
+++ bsd/kernel.h Tue Aug 21 10:50:17 2001
-@@ -52,7 +52,7 @@
-=20
- #ifdef HAVE_SWAPCTL
- void
--BSDGetSwapCtlInfo(int* total, int* free);
-+BSDGetSwapCtlInfo(int64_t* total, int64_t* free);
- #endif
-=20
- int
@@ -67,7 +67,11 @@
#endif
=20
Index: files/patch-swapinternal.cc
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/ports/sysutils/xosview/files/patch-swapinternal.cc,v
retrieving revision 1.2
diff -u -r1.2 patch-swapinternal.cc
--- files/patch-swapinternal.cc 22 Aug 2001 22:22:06 -0000 1.2
+++ files/patch-swapinternal.cc 17 Mar 2005 22:39:02 -0000
@@ -1,6 +1,6 @@
--- bsd/swapinternal.cc.orig Tue Nov 16 23:16:20 1999
+++ bsd/swapinternal.cc Tue Aug 21 11:27:26 2001
-@@ -437,16 +437,17 @@
+@@ -459,16 +459,17 @@
#endif /* XOSVIEW_FREEBSD */
=20
void
Index: files/patch-swapinternal.h
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/ports/sysutils/xosview/files/patch-swapinternal.h,v
retrieving revision 1.2
diff -u -r1.2 patch-swapinternal.h
--- files/patch-swapinternal.h 22 Aug 2001 22:22:06 -0000 1.2
+++ files/patch-swapinternal.h 17 Mar 2005 22:39:02 -0000
@@ -6,6 +6,7 @@
void
-BSDGetSwapInfo(int* total, int* free);
+BSDGetSwapInfo(int64_t* total, int64_t* free);
+ #endif
=20
void
-BSDGetSwapCtlInfo(int* total, int* free);
Index: files/patch-swapmeter.cc
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/ports/sysutils/xosview/files/patch-swapmeter.cc,v
retrieving revision 1.2
diff -u -r1.2 patch-swapmeter.cc
--- files/patch-swapmeter.cc 22 Aug 2001 22:22:06 -0000 1.2
+++ files/patch-swapmeter.cc 17 Mar 2005 22:39:02 -0000
@@ -2,6 +2,6 @@
+++ bsd/swapmeter.cc Tue Aug 21 10:53:02 2001
@@ -76,3 +76,3 @@
void SwapMeter::getswapinfo( void ){
-- int total_int, free_int;
+- unsigned long long total_int, free_int;
+ int64_t total_int, free_int;
=20
Index: files/patch-xwin.h
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: files/patch-xwin.h
diff -N files/patch-xwin.h
--- files/patch-xwin.h 28 Oct 2003 14:53:44 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,10 +0,0 @@
---- xwin.h.orig Mon Feb 25 03:52:00 2002
-+++ xwin.h Mon Oct 27 21:13:29 2003
-@@ -11,6 +11,7 @@
- #endif
- #include <iostream.h>
- #include <string.h>
-+using namespace std;
-=20
- #define XWIN_H_CVSID "$Id$"
-=20
--3Pql8miugIZX0722--
--maH1Gajj2nflutpK
Content-Type: application/pgp-signature
Content-Disposition: inline
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (FreeBSD)
iD8DBQFCOgmKmArGtfDbn0QRAiKUAJ9IVbVNew/XQh3BlpZZWiXwBAnlFQCgoFnz
zg34rwxLWt4fFuynQodoms4=
=L/dz
-----END PGP SIGNATURE-----
--maH1Gajj2nflutpK--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20050317224946.GD834>