From owner-freebsd-current Thu Feb 15 4:48:33 2001 Delivered-To: freebsd-current@freebsd.org Received: from mail.rdc1.kt.home.ne.jp (ha2.rdc1.kt.home.ne.jp [203.165.9.243]) by hub.freebsd.org (Postfix) with ESMTP id 8A71237B491; Thu, 15 Feb 2001 04:48:18 -0800 (PST) Received: from daemon.local.idaemons.org ([203.165.161.10]) by mail.rdc1.kt.home.ne.jp (InterMail vM.4.01.02.00 201-229-116) with ESMTP id <20010215124816.CLXV19464.mail.rdc1.kt.home.ne.jp@daemon.local.idaemons.org>; Thu, 15 Feb 2001 04:48:16 -0800 Received: by daemon.local.idaemons.org (8.11.1/3.7W) id f1FCmDv43012; Thu, 15 Feb 2001 21:48:13 +0900 (JST) Date: Thu, 15 Feb 2001 21:48:13 +0900 Message-ID: <86u25wqfhu.wl@archon.local.idaemons.org> From: "Akinori MUSHA" To: ade@FreeBSD.org Cc: ports@FreeBSD.org, current@FreeBSD.org Subject: libgtop on CURRENT User-Agent: Wanderlust/2.5.4 (Smooth) SEMI/1.14.2 (=?ISO-8859-1?Q?Daish=F2?= =?ISO-8859-1?Q?ji?=) FLIM/1.14.2 (Yagi-Nishiguchi) APEL/10.2 MULE XEmacs/21.1 (patch 14) (Cuyahoga Valley) (i386--freebsd) Organization: Associated I. Daemons X-PGP-Public-Key: finger knu@FreeBSD.org X-PGP-Fingerprint: 081D 099C 1705 861D 4B70 B04A 920B EFC7 9FD9 E1EE MIME-Version: 1.0 (generated by SEMI 1.14.2 - =?ISO-8859-1?Q?=22Daish=F2ji=22?=) Content-Type: text/plain; charset=US-ASCII Sender: owner-freebsd-current@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG It is necessary to update libgtop for CURRENT as attached. I haven't yet got an idea how to fix it to shut up the following error messages, though. LibGTop-Server: kvm_getargv (12): Undefined error: 0 LibGTop-Server: kvm_getargv (11): Undefined error: 0 LibGTop-Server: kvm_getargv (10): Undefined error: 0 By the way, you'd better split patches into per-file patches.. -- / /__ __ Akinori.org / MUSHA.org / ) ) ) ) / FreeBSD.org / Ruby-lang.org Akinori MUSHA aka / (_ / ( (__( @ iDaemons.org / and.or.jp "We're only at home when we're on the run, on the wing, on the fly" Index: Makefile =================================================================== RCS file: /home/ncvs/ports/devel/libgtop/Makefile,v retrieving revision 1.40 diff -u -r1.40 Makefile --- Makefile 2000/12/28 02:35:31 1.40 +++ Makefile 2001/02/15 12:35:38 @@ -7,7 +7,7 @@ PORTNAME= libgtop PORTVERSION= 1.0.10 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= stable/sources/libgtop Index: files/patch-aj =================================================================== RCS file: /home/ncvs/ports/devel/libgtop/files/patch-aj,v retrieving revision 1.2 diff -u -r1.2 patch-aj --- files/patch-aj 2000/12/28 02:35:34 1.2 +++ files/patch-aj 2001/02/14 16:24:33 @@ -71,9 +71,9 @@ - switch (pinfo [0].kp_proc.p_stat) { + switch (pinfo [0].XXX_P_STAT) { case SIDL: ---- sysdeps/freebsd/procuid.c.orig Thu Sep 16 16:08:07 1999 -+++ sysdeps/freebsd/procuid.c Fri Dec 22 18:37:41 2000 -@@ -86,13 +86,38 @@ +--- sysdeps/freebsd/procuid.c.orig Fri Sep 17 06:08:07 1999 ++++ sysdeps/freebsd/procuid.c Thu Feb 15 01:16:50 2001 +@@ -86,13 +86,42 @@ - buf->uid = pinfo [0].kp_eproc.e_pcred.p_ruid; - buf->euid = pinfo [0].kp_eproc.e_pcred.p_svuid; @@ -95,7 +95,11 @@ +#define XXX_E_PGID ki_pgid +#define XXX_E_TPGID ki_tpgid +#define XXX_P_NICE ki_nice ++#if __FreeBSD_version >= 500013 ++#define XXX_P_PRIORITY ki_pri.pri_user ++#else +#define XXX_P_PRIORITY ki_priority ++#endif +#else + +#define XXX_P_RUID kp_eproc.e_pcred.p_ruid @@ -122,8 +126,8 @@ + buf->nice = pinfo [0].XXX_P_NICE; + buf->priority = pinfo [0].XXX_P_PRIORITY; ---- sysdeps/freebsd/proctime.c.orig Thu Sep 16 16:08:07 1999 -+++ sysdeps/freebsd/proctime.c Fri Dec 22 22:45:57 2000 +--- sysdeps/freebsd/proctime.c.orig Fri Sep 17 06:08:07 1999 ++++ sysdeps/freebsd/proctime.c Thu Feb 15 01:15:11 2001 @@ -68,5 +68,2 @@ u_quad_t u, st, ut, it, tot; -#if (__FreeBSD_version < 300003) @@ -150,10 +154,14 @@ - buf->rtime = tv2sec (pinfo [0].kp_proc.p_rtime); + buf->rtime = pinfo [0].kp_proc.p_runtime; #endif -@@ -194,2 +186,13 @@ +@@ -194,2 +186,17 @@ #else +#if __FreeBSD_version >= 500013 ++#if __FreeBSD_version >= 500016 ++ if ((pinfo [0].ki_flag & PS_INMEM)) { ++#else + if ((pinfo [0].ki_flag & P_INMEM)) { ++#endif + buf->utime = pinfo [0].ki_runtime; + buf->stime = 0; /* XXX */ + buf->cutime = tv2sec (pinfo [0].ki_childtime); @@ -164,7 +172,7 @@ + +#else glibtop_suid_enter (server); -@@ -224,2 +227,3 @@ +@@ -224,2 +231,3 @@ } +#endif To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-current" in the body of the message