pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/sysutils/top Update to version 3.6alpha7. Thanks to C...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/efdd488f488d
branches:  trunk
changeset: 477916:efdd488f488d
user:      cube <cube%pkgsrc.org@localhost>
date:      Sun Jul 11 19:53:06 2004 +0000

description:
Update to version 3.6alpha7.  Thanks to Christos Zoulas for NetBSD support.
Fixes PR 26249.

diffstat:

 sysutils/top/DESCR            |    6 -
 sysutils/top/Makefile         |   28 +-
 sysutils/top/PLIST            |    4 +-
 sysutils/top/distinfo         |   14 +-
 sysutils/top/patches/patch-aa |   32 -
 sysutils/top/patches/patch-ab |  892 ------------------------------------------
 sysutils/top/patches/patch-ac |   25 -
 sysutils/top/patches/patch-ae |   35 -
 sysutils/top/patches/patch-af |  570 --------------------------
 sysutils/top/patches/patch-ag |    9 -
 sysutils/top/patches/patch-ah |   13 -
 sysutils/top/patches/patch-ai |    8 -
 12 files changed, 9 insertions(+), 1627 deletions(-)

diffs (truncated from 1701 to 300 lines):

diff -r 62b6e7eb490f -r efdd488f488d sysutils/top/DESCR
--- a/sysutils/top/DESCR        Sun Jul 11 18:42:26 2004 +0000
+++ b/sysutils/top/DESCR        Sun Jul 11 19:53:06 2004 +0000
@@ -1,9 +1,3 @@
-                             TOP
-                         Version 3.5beta7
-
-                       William LeFebvre
-                    and a cast of dozens
-
 "top" is a program that will give continual reports about the state of
 the system, including a list of the top cpu using processes.  Version 3
 of "top" has three primary design goals: provide an accurate snapshot of
diff -r 62b6e7eb490f -r efdd488f488d sysutils/top/Makefile
--- a/sysutils/top/Makefile     Sun Jul 11 18:42:26 2004 +0000
+++ b/sysutils/top/Makefile     Sun Jul 11 19:53:06 2004 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.29 2004/07/11 18:42:26 cube Exp $
+# $NetBSD: Makefile,v 1.30 2004/07/11 19:53:06 cube Exp $
 # FreeBSD Id: Makefile,v 1.14 1997/04/30 23:49:14 asami Exp
 #
 
-DISTNAME=       top-3.5beta9
-PKGNAME=       top-3.5b9
+DISTNAME=       top-3.6alpha7
+PKGNAME=       top-3.6a7
 CATEGORIES=    sysutils
 MASTER_SITES=   ftp://ftp.groupsys.com/pub/top/
 
@@ -11,26 +11,6 @@
 HOMEPAGE=      http://www.groupsys.com/topinfo/
 COMMENT=       The ubiquitous system monitoring utility
 
-HAS_CONFIGURE=         yes
-CONFIGURE_SCRIPT=      ./Configure
-
-NOT_FOR_PLATFORM=      NetBSD-1.6*-* NetBSD-2.*-*
-
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "NetBSD"
-CONF=                  netbsd13
-.elif ${OPSYS} == "SunOS"
-CONF+=                 sunos5
-MAKE_ENV+=             CPPFLAGS=
-.endif
-
-CONFIGURE_ARGS+=       ${CONF}
-
-MAKE_ENV+=     COPY="${COPY}" STRIPFLAG="${_STRIPFLAG_INSTALL}"
-
-pre-configure:
-       ${CP} ${FILESDIR}/defaults.${CONF} ${WRKSRC}/.defaults
-       ${CHMOD} a-x ${WRKSRC}/install
+GNU_CONFIGURE=         yes
 
 .include "../../mk/bsd.pkg.mk"
diff -r 62b6e7eb490f -r efdd488f488d sysutils/top/PLIST
--- a/sysutils/top/PLIST        Sun Jul 11 18:42:26 2004 +0000
+++ b/sysutils/top/PLIST        Sun Jul 11 19:53:06 2004 +0000
@@ -1,3 +1,3 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:54:02 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2004/07/11 19:53:06 cube Exp $
 bin/top
-man/man1/top.1.gz
+man/man1/top.1
diff -r 62b6e7eb490f -r efdd488f488d sysutils/top/distinfo
--- a/sysutils/top/distinfo     Sun Jul 11 18:42:26 2004 +0000
+++ b/sysutils/top/distinfo     Sun Jul 11 19:53:06 2004 +0000
@@ -1,12 +1,4 @@
-$NetBSD: distinfo,v 1.4 2003/07/02 09:28:58 grant Exp $
+$NetBSD: distinfo,v 1.5 2004/07/11 19:53:06 cube Exp $
 
-SHA1 (top-3.5beta9.tar.gz) = e8766e316f5199cb32bc0ea8e95a4d3e3713c0cc
-Size (top-3.5beta9.tar.gz) = 234762 bytes
-SHA1 (patch-aa) = 53e906a829188247f66f29a341c9d9a82ca9f12f
-SHA1 (patch-ab) = 61b2c944eeef35cca65e799817d15daddc6a1e76
-SHA1 (patch-ac) = 312345d0fcb5fa4372afcfd6ec24dba025057816
-SHA1 (patch-ae) = 457a49f2d8aa9f81e15947a100fb83f52ff16f30
-SHA1 (patch-af) = 50242c5c0fbf57ba2b404299d13881a4ec6ba206
-SHA1 (patch-ag) = 5844930d052539e3a99f48edab098ad5f50b9e92
-SHA1 (patch-ah) = 3002ca01ce66eff78fe70f898e35f1b80e10d5ca
-SHA1 (patch-ai) = 236883fd11295368accb6e595b7c604042c5991c
+SHA1 (top-3.6alpha7.tar.gz) = b0336ddc2482b6a52f5345855bf46e0de7d8438a
+Size (top-3.6alpha7.tar.gz) = 295433 bytes
diff -r 62b6e7eb490f -r efdd488f488d sysutils/top/patches/patch-aa
--- a/sysutils/top/patches/patch-aa     Sun Jul 11 18:42:26 2004 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-$NetBSD: patch-aa,v 1.7 1999/12/08 16:18:49 agc Exp $
-
---- commands.c Tue Aug 27 16:13:57 1996
-+++ commands.c Sat Oct  4 03:25:02 1997
-@@ -25,4 +25,7 @@
- 
-+#include "top.h"
-+#include "top.local.h"
- #include "sigdesc.h"          /* generated automatically */
- #include "boolean.h"
-+#include "machine.h"
- #include "utils.h"
-@@ -44,4 +47,4 @@
- 
--show_help()
--
-+show_help(statics)
-+    struct statics *statics;
- {
-@@ -74,4 +77,11 @@
- #ifdef ORDER
-+      {
-+          int i;
-+
-       fputs("\
--o       - specify sort order (size, res, cpu, time)\n", stdout);
-+o       - specify sort order (", stdout);
-+          for (i = 0; statics->order_names[i] != NULL; i++)
-+              printf("%s%s", i == 0 ? "" : ", ", statics->order_names[i]);
-+          puts(")");
-+      }
- #endif
diff -r 62b6e7eb490f -r efdd488f488d sysutils/top/patches/patch-ab
--- a/sysutils/top/patches/patch-ab     Sun Jul 11 18:42:26 2004 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,892 +0,0 @@
-$NetBSD: patch-ab,v 1.11 2003/01/19 09:39:06 salo Exp $
-
---- ./machine/m_netbsd13.c.orig        Sat Feb 19 03:24:47 2000
-+++ ./machine/m_netbsd13.c     Sat Feb 19 03:31:13 2000
-@@ -0,0 +1,887 @@
-+/*
-+ * top - a top users display for Unix
-+ *
-+ * SYNOPSIS:  For a NetBSD-1.3 (or later) system
-+ *
-+ * DESCRIPTION:
-+ * Originally written for BSD4.4 system by Christos Zoulas.
-+ * Based on the FreeBSD 2.0 version by Steven Wallace and Wolfram Schneider.
-+ * NetBSD-1.0 port by Arne Helme. Process ordering by Luke Mewburn.
-+ * NetBSD-1.3 port by Luke Mewburn, based on code by Matthew Green.
-+ * NetBSD-1.4/UVM port by matthew green.
-+ *
-+ * This is the machine-dependent module for NetBSD-1.3 and later
-+ * Works for:
-+ *    NetBSD-1.3
-+ *
-+ * LIBS: -lkvm
-+ *
-+ * CFLAGS: -DHAVE_GETOPT -DORDER
-+ *
-+ * AUTHORS:   Christos Zoulas <christos%ee.cornell.edu@localhost>
-+ *            Steven Wallace <swallace%freebsd.org@localhost>
-+ *            Wolfram Schneider <wosch%cs.tu-berlin.de@localhost>
-+ *            Arne Helme <arne%acm.org@localhost>
-+ *            Luke Mewburn <lukem%netbsd.org@localhost>
-+ *            matthew green <mrg%eterna.com.au@localhost>
-+ *
-+ *
-+ * Id: machine.c,v 1.5 1995/01/06 02:04:39 swallace Exp
-+ */
-+
-+#include <sys/types.h>
-+#include <sys/signal.h>
-+#include <sys/param.h>
-+#if __NetBSD_Version__ > 103080000
-+#define UVM
-+#endif
-+#include <sys/stat.h>
-+#include <sys/errno.h>
-+#include <sys/sysctl.h>
-+#include <sys/dir.h>
-+#include <sys/dkstat.h>
-+#include <sys/file.h>
-+#include <sys/time.h>
-+
-+#include <vm/vm_swap.h>
-+
-+#if defined(UVM)
-+#include <uvm/uvm_extern.h>
-+#endif
-+
-+#include "os.h"
-+#include <err.h>
-+#include <errno.h>
-+#include <kvm.h>
-+#include <math.h>
-+#include <nlist.h>
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <string.h>
-+#include <unistd.h>
-+
-+static int check_nlist __P((struct nlist *));
-+static int getkval __P((unsigned long, int *, int, char *));
-+extern char* printable __P((char *));
-+
-+#include "top.h"
-+#include "machine.h"
-+#include "utils.h"
-+
-+
-+/* get_process_info passes back a handle.  This is what it looks like: */
-+
-+struct handle
-+{
-+    struct kinfo_proc **next_proc;    /* points to next valid proc pointer */
-+    int remaining;            /* number of pointers remaining */
-+};
-+
-+/* declarations for load_avg */
-+#include "loadavg.h"
-+
-+#define PP(pp, field) ((pp)->kp_proc . field)
-+#define EP(pp, field) ((pp)->kp_eproc . field)
-+#define VP(pp, field) ((pp)->kp_eproc.e_vm . field)
-+
-+/* define what weighted cpu is.  */
-+#define weighted_cpu(pct, pp) (PP((pp), p_swtime) == 0 ? 0.0 : \
-+                       ((pct) / (1.0 - exp(PP((pp), p_swtime) * logcpu))))
-+
-+/* what we consider to be process size: */
-+#define PROCSIZE(pp) \
-+      (VP((pp), vm_tsize) + VP((pp), vm_dsize) + VP((pp), vm_ssize))
-+
-+/* definitions for indices in the nlist array */
-+
-+
-+static struct nlist nlst[] = {
-+#define X_CCPU                0
-+    { "_ccpu" },              /* 0 */
-+#define X_CP_TIME     1
-+    { "_cp_time" },           /* 1 */
-+#define X_HZ          2
-+    { "_hz" },                        /* 2 */
-+#define X_STATHZ      3
-+    { "_stathz" },            /* 3 */
-+#define X_AVENRUN     4
-+    { "_averunnable" },               /* 4 */
-+#if !defined(UVM)
-+#define X_CNT         5
-+    { "_cnt" },
-+#endif
-+
-+    { 0 }
-+};
-+
-+/*
-+ *  These definitions control the format of the per-process area
-+ */
-+
-+static char header[] =
-+  "  PID X        PRI NICE   SIZE   RES STATE   TIME   WCPU    CPU COMMAND";
-+/* 0123456   -- field to fill in starts at header+6 */
-+#define UNAME_START 6
-+
-+#define Proc_format \
-+      "%5d %-8.8s %3d %4d%7s %5s %-5s%7s %5.2f%% %5.2f%% %.14s"
-+
-+
-+/* process state names for the "STATE" column of the display */
-+/* the extra nulls in the string "run" are for adding a slash and
-+   the processor number when needed */
-+
-+char *state_abbrev[] =
-+{
-+    "", "start", "run\0\0\0", "sleep", "stop", "zomb"
-+};
-+
-+
-+static kvm_t *kd;
-+
-+/* values that we stash away in _init and use in later routines */
-+
-+static double logcpu;
-+
-+/* these are retrieved from the kernel in _init */
-+
-+static int hz;
-+static int ccpu;
-+
-+/* these are offsets obtained via nlist and used in the get_ functions */
-+
-+static unsigned long cp_time_offset;
-+static unsigned long avenrun_offset;
-+static unsigned long cnt_offset;
-+/* these are for calculating cpu state percentages */
-+
-+static long cp_time[CPUSTATES];
-+static long cp_old[CPUSTATES];
-+static long cp_diff[CPUSTATES];
-+
-+/* these are for detailing the process states */
-+
-+int process_states[7];
-+char *procstatenames[] = {
-+    "", " starting, ", " running, ", " sleeping, ", " stopped, ",
-+    " zombie, ", " ABANDONED, ",
-+    NULL
-+};
-+



Home | Main Index | Thread Index | Old Index