1
0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-16 07:58:04 +00:00

Update to 2.14.5.

This commit is contained in:
Joe Marcus Clarke 2006-12-03 19:52:29 +00:00
parent bfce61825e
commit 29935df67f
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=178723
5 changed files with 79 additions and 26 deletions

View File

@ -6,8 +6,7 @@
# $MCom: ports/devel/libgtop/Makefile,v 1.5 2006/10/02 23:26:51 ahze Exp $
PORTNAME= libgtop
PORTVERSION= 2.14.4
PORTREVISION= 1
PORTVERSION= 2.14.5
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@ -25,7 +24,9 @@ USE_GMAKE= yes
USE_GNOME= gnomehack glib20 ltverhack intlhack
USE_LDCONFIG= yes
USE_AUTOTOOLS= libtool:15
CONFIGURE_ARGS= --infodir=${PREFIX}/info
CONFIGURE_ARGS= --infodir=${PREFIX}/info \
--disable-gtk-doc \
--with-html-dir=${PREFIX}/share/doc
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"

View File

@ -1,3 +1,3 @@
MD5 (gnome2/libgtop-2.14.4.tar.bz2) = f13217814aed782b262e22735e5c02b2
SHA256 (gnome2/libgtop-2.14.4.tar.bz2) = 9b6bddc5d300b785850d0ff4188f717ed1beaca185475f535fde73b895f91e2e
SIZE (gnome2/libgtop-2.14.4.tar.bz2) = 668808
MD5 (gnome2/libgtop-2.14.5.tar.bz2) = 76e25d05ecea6ddd26cecb99f69fc020
SHA256 (gnome2/libgtop-2.14.5.tar.bz2) = 82018e342d725e4fa267a280952b1a3875d1ff3a6e1bb611958b21af08021b1e
SIZE (gnome2/libgtop-2.14.5.tar.bz2) = 759197

View File

@ -68,7 +68,6 @@
+ geom_deletetree (&gmp);
return;
}
+ geom_stats_snapshot_timestamp (sc, &ts);
+ etime = ts.tv_sec + (ts.tv_nsec * 1e-9);
+ geom_stats_snapshot_reset (sc);
@ -126,9 +125,10 @@
+ buf->read = ld[0];
+ buf->write = ld[1];
+#else
#if !defined(__FreeBSD_kernel__)
buf->read = sfs.f_syncreads + sfs.f_asyncreads;
buf->write = sfs.f_syncwrites + sfs.f_asyncwrites;
#endif
+#endif
buf->flags |= (1 << GLIBTOP_FSUSAGE_READ) | (1 << GLIBTOP_FSUSAGE_WRITE);
}

View File

@ -1,16 +1,16 @@
--- sysdeps/freebsd/procmap.c.orig Mon Dec 12 19:09:39 2005
+++ sysdeps/freebsd/procmap.c Tue May 2 12:46:49 2006
@@ -108,14 +108,16 @@
--- sysdeps/freebsd/procmap.c.orig Mon Nov 27 14:22:45 2006
+++ sysdeps/freebsd/procmap.c Sun Dec 3 14:41:07 2006
@@ -108,14 +108,16 @@ glibtop_get_proc_map_p (glibtop *server,
#else
struct vm_object object;
#endif
- glibtop_map_entry *maps;
+ GArray *maps = g_array_sized_new(FALSE, FALSE,
+ sizeof(glibtop_map_entry),
+ 100);
#if defined __FreeBSD__
+ sizeof(glibtop_map_entry),
+ 100);
#if (defined __FreeBSD__) || defined(__FreeBSD_kernel__)
struct vnode vnode;
#if __FreeBSD_version < 500039
#if (__FreeBSD_version < 500039) && !defined(__FreeBSD_kernel__)
struct inode inode;
#endif
#endif
@ -19,7 +19,7 @@
int update = 0;
glibtop_init_p (server, (1L << GLIBTOP_SYSDEPS_PROC_MAP), 0);
@@ -123,15 +125,15 @@
@@ -123,15 +125,15 @@ glibtop_get_proc_map_p (glibtop *server,
memset (buf, 0, sizeof (glibtop_proc_map));
/* It does not work for the swapper task. */
@ -38,7 +38,7 @@
}
/* Now we get the memory maps. */
@@ -159,8 +161,6 @@
@@ -159,8 +161,6 @@ glibtop_get_proc_map_p (glibtop *server,
buf->total = buf->number * buf->size;
@ -47,7 +47,7 @@
buf->flags = _glibtop_sysdeps_proc_map;
/* Walk through the `vm_map_entry' list ... */
@@ -170,6 +170,10 @@
@@ -170,6 +170,10 @@ glibtop_get_proc_map_p (glibtop *server,
* to OBJT_DEFAULT so if seems this really works. */
do {
@ -58,7 +58,7 @@
if (update) {
if (kvm_read (server->machine.kd,
(unsigned long) entry.next,
@@ -197,22 +201,6 @@
@@ -197,22 +201,6 @@ glibtop_get_proc_map_p (glibtop *server,
#endif
#endif
@ -81,7 +81,7 @@
#if defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000)
if (!entry.object.uvm_obj)
@@ -224,7 +212,7 @@
@@ -224,7 +212,7 @@ glibtop_get_proc_map_p (glibtop *server,
(unsigned long) entry.object.uvm_obj,
&vnode, sizeof (vnode)) != sizeof (vnode)) {
glibtop_warn_io_r (server, "kvm_read (vnode)");
@ -90,7 +90,7 @@
}
#else
if (!entry.object.vm_object)
@@ -251,8 +239,8 @@
@@ -251,8 +239,8 @@ glibtop_get_proc_map_p (glibtop *server,
&inode, sizeof (inode)) != sizeof (inode))
glibtop_error_io_r (server, "kvm_read (inode)");
@ -101,18 +101,18 @@
#endif
@@ -274,8 +262,8 @@
@@ -274,8 +262,8 @@ glibtop_get_proc_map_p (glibtop *server,
switch (vnode.v_type) {
case VREG:
#if __FreeBSD_version < 600006
#if (__FreeBSD_version < 600006) && !defined(__FreeBSD_kernel__)
- maps [i-1].inode = vnode.v_cachedid;
- maps [i-1].device = vnode.v_cachedfs;
+ inum = vnode.v_cachedid;
+ dev = vnode.v_cachedfs;
+ inum = vnode.v_cachedid;
+ dev = vnode.v_cachedfs;
#endif
default:
continue;
@@ -289,11 +277,37 @@
@@ -289,11 +277,37 @@ glibtop_get_proc_map_p (glibtop *server,
&inode, sizeof (inode)) != sizeof (inode))
glibtop_error_io_r (server, "kvm_read (inode)");

View File

@ -46,6 +46,54 @@ lib/libgtop-2.0.la
lib/libgtop-2.0.so
lib/libgtop-2.0.so.7
libdata/pkgconfig/libgtop-2.0.pc
%%DOCSDIR%%/home.png
%%DOCSDIR%%/index.html
%%DOCSDIR%%/index.sgml
%%DOCSDIR%%/left.png
%%DOCSDIR%%/libgtop-Close.html
%%DOCSDIR%%/libgtop-Command.html
%%DOCSDIR%%/libgtop-GlibTop-Server.html
%%DOCSDIR%%/libgtop-GlibTop.html
%%DOCSDIR%%/libgtop-Inode-DB.html
%%DOCSDIR%%/libgtop-Net-List.html
%%DOCSDIR%%/libgtop-Net-Load.html
%%DOCSDIR%%/libgtop-PPP.html
%%DOCSDIR%%/libgtop-Shared-Memory-Limits.html
%%DOCSDIR%%/libgtop-Uptime.html
%%DOCSDIR%%/libgtop-cpu.html
%%DOCSDIR%%/libgtop-fsusage.html
%%DOCSDIR%%/libgtop-lib.html
%%DOCSDIR%%/libgtop-loadavg.html
%%DOCSDIR%%/libgtop-mem.html
%%DOCSDIR%%/libgtop-mountlist.html
%%DOCSDIR%%/libgtop-msg-limits.html
%%DOCSDIR%%/libgtop-open.html
%%DOCSDIR%%/libgtop-parameter.html
%%DOCSDIR%%/libgtop-procargs.html
%%DOCSDIR%%/libgtop-prockernel.html
%%DOCSDIR%%/libgtop-proclist.html
%%DOCSDIR%%/libgtop-procmap.html
%%DOCSDIR%%/libgtop-procmem.html
%%DOCSDIR%%/libgtop-procopenfiles.html
%%DOCSDIR%%/libgtop-procsegment.html
%%DOCSDIR%%/libgtop-procsignal.html
%%DOCSDIR%%/libgtop-procstate.html
%%DOCSDIR%%/libgtop-proctime.html
%%DOCSDIR%%/libgtop-procuid.html
%%DOCSDIR%%/libgtop-sem-limits.html
%%DOCSDIR%%/libgtop-signal.html
%%DOCSDIR%%/libgtop-swap.html
%%DOCSDIR%%/libgtop-sysdeps.html
%%DOCSDIR%%/libgtop-sysinfo.html
%%DOCSDIR%%/libgtop-union.html
%%DOCSDIR%%/libgtop-version.html
%%DOCSDIR%%/libgtop-white-paper-overview.html
%%DOCSDIR%%/libgtop-white-paper.html
%%DOCSDIR%%/libgtop.devhelp
%%DOCSDIR%%/libgtop.devhelp2
%%DOCSDIR%%/right.png
%%DOCSDIR%%/style.css
%%DOCSDIR%%/up.png
share/locale/am/LC_MESSAGES/libgtop-2.0.mo
share/locale/ar/LC_MESSAGES/libgtop-2.0.mo
share/locale/az/LC_MESSAGES/libgtop-2.0.mo
@ -111,6 +159,7 @@ share/locale/sr/LC_MESSAGES/libgtop-2.0.mo
share/locale/sr@Latn/LC_MESSAGES/libgtop-2.0.mo
share/locale/sv/LC_MESSAGES/libgtop-2.0.mo
share/locale/ta/LC_MESSAGES/libgtop-2.0.mo
share/locale/te/LC_MESSAGES/libgtop-2.0.mo
share/locale/th/LC_MESSAGES/libgtop-2.0.mo
share/locale/tr/LC_MESSAGES/libgtop-2.0.mo
share/locale/uk/LC_MESSAGES/libgtop-2.0.mo
@ -131,6 +180,8 @@ share/locale/zh_TW/LC_MESSAGES/libgtop-2.0.mo
@dirrmtry share/locale/xh
@dirrmtry share/locale/uk/LC_MESSAGES
@dirrmtry share/locale/uk
@dirrmtry share/locale/te/LC_MESSAGES
@dirrmtry share/locale/te
@dirrmtry share/locale/sr/LC_MESSAGES
@dirrmtry share/locale/sr
@dirrmtry share/locale/sl/LC_MESSAGES
@ -175,3 +226,4 @@ share/locale/zh_TW/LC_MESSAGES/libgtop-2.0.mo
@dirrmtry share/locale/bn_IN
@dirrmtry share/locale/be/LC_MESSAGES
@dirrmtry share/locale/be
@dirrm %%DOCSDIR%%