pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc Update xosview to version 1.8.1alpha, from a nudge by ...
details: https://anonhg.NetBSD.org/pkgsrc/rev/a17eefe25140
branches: trunk
changeset: 463419:a17eefe25140
user: agc <agc%pkgsrc.org@localhost>
date: Mon Nov 10 17:18:28 2003 +0000
description:
Update xosview to version 1.8.1alpha, from a nudge by Brian Grayson.
Fixes build on NetBSD-1.6.2 and NetBSD-1.6ZE. Existing patches have
either been incorporated or are unnecessary.
diffstat:
doc/CHANGES | 3 +-
sysutils/xosview/Makefile | 9 +--
sysutils/xosview/distinfo | 27 +--------
sysutils/xosview/patches/patch-aa | 13 ----
sysutils/xosview/patches/patch-ab | 30 ----------
sysutils/xosview/patches/patch-ac | 26 --------
sysutils/xosview/patches/patch-ad | 85 ----------------------------
sysutils/xosview/patches/patch-ae | 27 ---------
sysutils/xosview/patches/patch-af | 16 -----
sysutils/xosview/patches/patch-ag | 24 --------
sysutils/xosview/patches/patch-ah | 62 --------------------
sysutils/xosview/patches/patch-ai | 23 -------
sysutils/xosview/patches/patch-aj | 13 ----
sysutils/xosview/patches/patch-ak | 42 --------------
sysutils/xosview/patches/patch-al | 26 --------
sysutils/xosview/patches/patch-am | 66 ----------------------
sysutils/xosview/patches/patch-an | 20 ------
sysutils/xosview/patches/patch-ao | 46 ---------------
sysutils/xosview/patches/patch-aq | 113 --------------------------------------
sysutils/xosview/patches/patch-ar | 9 ---
sysutils/xosview/patches/patch-as | 9 ---
sysutils/xosview/patches/patch-at | 14 ----
sysutils/xosview/patches/patch-au | 19 ------
sysutils/xosview/patches/patch-av | 16 -----
24 files changed, 8 insertions(+), 730 deletions(-)
diffs (truncated from 852 to 300 lines):
diff -r f7f75bd4d557 -r a17eefe25140 doc/CHANGES
--- a/doc/CHANGES Mon Nov 10 16:32:56 2003 +0000
+++ b/doc/CHANGES Mon Nov 10 17:18:28 2003 +0000
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.3804 2003/11/10 02:04:55 xtraeme Exp $
+$NetBSD: CHANGES,v 1.3805 2003/11/10 17:19:29 agc Exp $
Changes to the packages collection and infrastructure in 2003:
@@ -4330,3 +4330,4 @@
Updated dvd+rw-tools to 5.13.4.7.4 [wiz 2003-11-10]
Updated dosbox to 0.60 [xtraeme 2003-11-10]
Updated gqview-devel to 1.3.5 [xtraeme 2003-11-10]
+ Updated xosview to 1.8.1alpha [agc 2003-11-10]
diff -r f7f75bd4d557 -r a17eefe25140 sysutils/xosview/Makefile
--- a/sysutils/xosview/Makefile Mon Nov 10 16:32:56 2003 +0000
+++ b/sysutils/xosview/Makefile Mon Nov 10 17:18:28 2003 +0000
@@ -1,16 +1,13 @@
-# $NetBSD: Makefile,v 1.44 2003/10/04 01:42:36 bgrayson Exp $
+# $NetBSD: Makefile,v 1.45 2003/11/10 17:18:28 agc Exp $
-DISTNAME= xosview-1.7.0.b
-PKGNAME= xosview-1.7.0b
+DISTNAME= xosview-1.8.1alpha
CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xosview/}
+MASTER_SITES= ftp://ftp.netbsd.org/pub/NetBSD/packages/distfiles/
MAINTAINER= bgrayson%NetBSD.org@localhost
HOMEPAGE= http://xosview.sourceforge.net/
COMMENT= X11 graphical display of OS statistics
-NOT_FOR_PLATFORM= NetBSD-1.[7-9]*-* NetBSD-[2-9]*-*
-
USE_BUILDLINK2= YES
USE_X11BASE= YES
diff -r f7f75bd4d557 -r a17eefe25140 sysutils/xosview/distinfo
--- a/sysutils/xosview/distinfo Mon Nov 10 16:32:56 2003 +0000
+++ b/sysutils/xosview/distinfo Mon Nov 10 17:18:28 2003 +0000
@@ -1,25 +1,4 @@
-$NetBSD: distinfo,v 1.7 2003/10/01 01:14:58 christos Exp $
+$NetBSD: distinfo,v 1.8 2003/11/10 17:18:28 agc Exp $
-SHA1 (xosview-1.7.0.b.tar.gz) = 7f3053e0e8300995eb16421b0840cfbe9c4c7d07
-Size (xosview-1.7.0.b.tar.gz) = 134985 bytes
-SHA1 (patch-aa) = eee6460439413714dc235173c333e68b23a40e22
-SHA1 (patch-ab) = 09ebf4dfcae497b169f9170f53ec853745d8fc0b
-SHA1 (patch-ac) = 80d74f813739693f3c1b40c8cb442eac8574497d
-SHA1 (patch-ad) = 594bea4feb45b082c9e4809044cbeaafba81c53e
-SHA1 (patch-ae) = 22b3cbe6a2ba488c28a12b7185d0dcff2d3fbf05
-SHA1 (patch-af) = a9b1cfa4f00526e884239af1514c1b4eecd98a4e
-SHA1 (patch-ag) = 1b4e4cb5e8ba1a732eb57b44f5e41562b219d9ac
-SHA1 (patch-ah) = a566d00f2035e41db8bfe265f27e3177e9915ee8
-SHA1 (patch-ai) = adf1a5b55f1c69fdeb351329fe61edfc4c307471
-SHA1 (patch-aj) = b3e186c222f183b0a66d904b79a982eb16cf90e1
-SHA1 (patch-ak) = 3f0770a966bbfca0af312613922683cdb439f9b1
-SHA1 (patch-al) = fe2e608f4a989114c6f1110d4095d2e71085de2c
-SHA1 (patch-am) = d5b623d24a19d3abde92225607a946c379fd7c3b
-SHA1 (patch-an) = eee9622975ea617f38fb412f595a83c1b383cda7
-SHA1 (patch-ao) = 507234e1f52933ce86e80a4a5f77f78cca4c6995
-SHA1 (patch-aq) = 3c65d034a2e825842d8225205af0d4047e49ed78
-SHA1 (patch-ar) = 9661856017f24890181d629f0973d74a0a183289
-SHA1 (patch-as) = eb7206136486d0dd11cf44e008623b5b3396ecf9
-SHA1 (patch-at) = 78f1579fd55d1909d9d3294a25d0e384693f9972
-SHA1 (patch-au) = 31a138d0dc45278cdd8b6e702a185fbc5d4e1054
-SHA1 (patch-av) = 29c83dc3a0dda55f285c75883020781dec2cb30a
+SHA1 (xosview-1.8.1alpha.tar.gz) = f655f336a6c6d3e5ed2fd0bd8581de1d17ed0680
+Size (xosview-1.8.1alpha.tar.gz) = 241885 bytes
diff -r f7f75bd4d557 -r a17eefe25140 sysutils/xosview/patches/patch-aa
--- a/sysutils/xosview/patches/patch-aa Mon Nov 10 16:32:56 2003 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.8 1998/11/04 16:37:11 agc Exp $
-
---- config/Makefile.config.in 1998/11/04 15:12:15 1.1
-+++ config/Makefile.config.in 1998/11/04 15:51:37
-@@ -20,7 +20,7 @@
-
- # Optimized CXXFLAGS
- CXXFLAGS += $(CFLAGS) -Wall -O4 -pipe -I@x_includes@ \
-- -I$(TOP) -I$(TOP)/@host_dir@ @DEFS@
-+ -I$(TOP) -I$(TOP)/@host_dir@ -I${TOP}/include @DEFS@
- # DEBUG CXXFLAGS
- #CXXFLAGS += $(CFLAGS) -Wall -ggdb -pipe -I@x_includes@ \
- # -I$(TOP) -I$(TOP)/@host_dir@ @DEFS@
diff -r f7f75bd4d557 -r a17eefe25140 sysutils/xosview/patches/patch-ab
--- a/sysutils/xosview/patches/patch-ab Mon Nov 10 16:32:56 2003 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-$NetBSD: patch-ab,v 1.7 1999/04/07 10:25:11 agc Exp $
-
-Avoid ugly "-n\n" output on Solaris.
-
---- config/Makefile.top.in 1999/04/07 10:14:34 1.1
-+++ config/Makefile.top.in 1999/04/07 10:17:30
-@@ -55,17 +55,20 @@
- ## These next lines look really ugly. The echo statements are an
- ## attempt to make the output look a little nicer. The "echo -n"
- ## statements create a two-space indent at the beginning of the line.
-+## They also don't work properly on Solaris (unless you have the
-+## lottery of having /usr/ucb/echo found before /bin/echo in your
-+## PATH), so delete them for just now.
- install: xosview
-- @echo "Installing executable..."; echo -n " "
-+ @echo "Installing executable..."
- @INSTALL_PROGRAM@ @INSTALL_ARGS@ xosview $(BINDIR)
-- @echo "Installing application defaults..."; echo -n " "
-+ @echo "Installing application defaults..."
- @INSTALL_DATA@ Xdefaults $(XAPPLOADDIR)/XOsview
- @echo "Making sure $(MANDIR) exists..."
- @if [ ! -d $(MANDIR) ]; then \
- echo "Making $(MANDIR)..."; \
- mkdir $(MANDIR); \
- fi
-- @echo "Installing man page..."; echo -n " "
-+ @echo "Installing man page..."
- @INSTALL_DATA@ xosview.1 $(MANDIR)
-
- install-man:
diff -r f7f75bd4d557 -r a17eefe25140 sysutils/xosview/patches/patch-ac
--- a/sysutils/xosview/patches/patch-ac Mon Nov 10 16:32:56 2003 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-$NetBSD: patch-ac,v 1.6 2000/06/27 08:15:51 tron Exp $
-
---- configure.orig Tue Feb 16 17:06:16 1999
-+++ configure Sun Apr 11 14:11:30 1999
-@@ -1717,6 +1717,21 @@
- host_dir=bsd
-
- ;;
-+netbsd1.[45]*)
-+ host_os=netbsd
-+ EXTRALIBS="-lkvm $XPMLIB"
-+ INSTALL_ARGS='-s -g kmem -m 02555'
-+ cat >> confdefs.h <<\EOF
-+#define XOSVIEW_NETBSD 1
-+EOF
-+
-+ cat >> confdefs.h <<\EOF
-+#define UVM 1
-+EOF
-+
-+ host_dir=bsd
-+
-+;;
- ## Also check for versions that have not been tested.
- netbsd*) echo "configure: warning:
- *************** Warning *****************
diff -r f7f75bd4d557 -r a17eefe25140 sysutils/xosview/patches/patch-ad
--- a/sysutils/xosview/patches/patch-ad Mon Nov 10 16:32:56 2003 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,85 +0,0 @@
-$NetBSD: patch-ad,v 1.6 2002/12/11 21:38:06 christos Exp $
-
---- bsd/kernel.cc.orig Tue Feb 16 09:09:21 1999
-+++ bsd/kernel.cc Wed Dec 11 16:34:46 2002
-@@ -30,6 +30,10 @@
- #include <errno.h>
- #include <sys/dkstat.h> /* For CPUSTATES, which tells us how
- many cpu states there are. */
-+#if defined(XOSVIEW_NETBSD) && !defined(CPUSTATES)
-+#include <sys/sched.h>
-+#endif
-+
- #ifndef XOSVIEW_FREEBSD
- #include <sys/disk.h> /* For disk statistics. */
- #endif
-@@ -60,14 +64,22 @@
- #include <sys/malloc.h>
- #include <sys/sysctl.h>
- #include <sys/device.h>
-+#if defined(__NetBSD_Version__) && __NetBSD_Version__ > 105010000 /* > 1.5A */
-+#include <uvm/uvm.h>
-+#else
- #include <vm/vm.h> /* XXX Is this needed? */
-+#endif
- #else
- #include <sys/vmmeter.h> /* For struct vmmeter. */
- #endif
-
- #ifdef HAVE_SWAPCTL
- #include <unistd.h> /* For swapctl proto. */
--#include <vm/vm_swap.h> /* For swapent, SWAP_*. */
-+#if defined(__NetBSD_Version__) && __NetBSD_Version__ >= 104000000
-+#include <sys/swap.h> /* For swapent, SWAP_*. */
-+#else
-+#include <vm/vm_swap.h>
-+#endif
- #include <stdlib.h> /* For malloc(), free(). */
- #endif
-
-@@ -85,7 +97,11 @@
- // This struct has the list of all the symbols we want from the kernel.
- static struct nlist nlst[] =
- {
-+#if defined(__NetBSD_Version__) && __NetBSD_Version__ > 104260000 /* > 1.4Z */
-+{ "_ifnet" }, /* XXX: LZ! Don't renumber */
-+#else
- { "_cp_time" },
-+#endif
- #define CP_TIME_SYM_INDEX 0
- { "_ifnet" },
- #define IFNET_SYM_INDEX 1
-@@ -293,7 +309,21 @@
- if (!timeArray) errx (-1, "BSDGetCPUTimes(): passed pointer was null!\n");
- if (CPUSTATES != 5)
- errx (-1, "Error: xosview for *BSD expects 5 cpu states!\n");
-+#if defined(__NetBSD_Version__) && __NetBSD_Version__ > 104260000 /* > 1.4Z */
-+ int mib[2];
-+ struct schedstate_percpu ssp;
-+ size_t size = sizeof(ssp.spc_cp_time);
-+ mib[0] = CTL_KERN;
-+ mib[1] = KERN_CP_TIME;
-+ if (sysctl(mib, 2, ssp.spc_cp_time, &size, NULL, 0) < 0) {
-+ printf("can't get schedstate_percpu: %s\n", strerror(errno));
-+ memset(&ssp, 0, sizeof(ssp));
-+ }
-+ for (size = 0; size < CPUSTATES; size++)
-+ timeArray[size] = (long) ssp.spc_cp_time[size];
-+#else
- safe_kvm_read_symbol (CP_TIME_SYM_INDEX, timeArray, sizeof (long) * CPUSTATES);
-+#endif
- }
-
-
-@@ -651,7 +681,11 @@
- while (kvmdiskptr != NULL) {
- safe_kvm_read ((u_long)kvmdiskptr, &kvmcurrdisk, sizeof(kvmcurrdisk));
- /* Add up the contribution from this disk. */
-+#if defined(__NetBSD_Version__) && __NetBSD_Version__ > 106070000 /* > 1.6G */
-+ *bytesXferred += kvmcurrdisk.dk_rbytes + kvmcurrdisk.dk_wbytes;
-+#else
- *bytesXferred += kvmcurrdisk.dk_bytes;
-+#endif
- #ifdef DEBUG
- printf ("Got %#x (lower 32bits)\n", (int) (*bytesXferred & 0xffffffff));
- #endif
diff -r f7f75bd4d557 -r a17eefe25140 sysutils/xosview/patches/patch-ae
--- a/sysutils/xosview/patches/patch-ae Mon Nov 10 16:32:56 2003 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-$NetBSD: patch-ae,v 1.9 2003/10/01 00:33:54 christos Exp $
-
---- bsd/cpumeter.cc.orig 1999-02-16 09:09:22.000000000 -0500
-+++ bsd/cpumeter.cc 2003-09-30 20:27:45.000000000 -0400
-@@ -17,2 +17,5 @@
- #include <sys/dkstat.h> // For CPUSTATES #define. BCG
-+#if defined(XOSVIEW_NETBSD) && !defined(CPUSTATES)
-+#include <sys/sched.h>
-+#endif
- #include <stdlib.h> // For use of atoi BCG
-@@ -111,9 +114,9 @@
- 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@localhost, 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");
-+" 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@localhost, 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 = 0;
diff -r f7f75bd4d557 -r a17eefe25140 sysutils/xosview/patches/patch-af
--- a/sysutils/xosview/patches/patch-af Mon Nov 10 16:32:56 2003 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-$NetBSD: patch-af,v 1.1 2000/08/18 22:43:53 christos Exp $
-
---- bsd/pagemeter.h.orig Fri Aug 18 18:40:08 2000
-+++ bsd/pagemeter.h Fri Aug 18 18:22:28 2000
-@@ -22,7 +22,11 @@
- #include "fieldmetergraph.h"
- #if defined(UVM)
- #include <sys/param.h>
-+#if defined(__NetBSD_Version__) && __NetBSD_Version__ > 105010000 /* > 1.5A */
-+#include <uvm/uvm.h>
-+#else
- #include <vm/vm.h>
-+#endif
- #include <uvm/uvm_extern.h>
- #else
- #include <sys/vmmeter.h>
diff -r f7f75bd4d557 -r a17eefe25140 sysutils/xosview/patches/patch-ag
--- a/sysutils/xosview/patches/patch-ag Mon Nov 10 16:32:56 2003 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2001/12/19 09:49:43 tron Exp $
-
---- config/config.sub.orig Tue Feb 16 15:10:08 1999
-+++ config/config.sub Tue Dec 18 22:24:26 2001
-@@ -424,6 +424,9 @@
- basic_machine=mips-sony
Home |
Main Index |
Thread Index |
Old Index