summaryrefslogtreecommitdiff
path: root/devel/libgtop
diff options
context:
space:
mode:
Diffstat (limited to 'devel/libgtop')
-rw-r--r--devel/libgtop/Makefile11
-rw-r--r--devel/libgtop/distinfo8
-rw-r--r--devel/libgtop/files/patch-config.h.in12
-rw-r--r--devel/libgtop/files/patch-configure60
-rw-r--r--devel/libgtop/files/patch-examples_mountlist.c33
-rw-r--r--devel/libgtop/files/patch-sysdeps_freebsd_procmap.c135
-rw-r--r--devel/libgtop/pkg-plist8
7 files changed, 23 insertions, 244 deletions
diff --git a/devel/libgtop/Makefile b/devel/libgtop/Makefile
index f34748c5e97d..e403da033c41 100644
--- a/devel/libgtop/Makefile
+++ b/devel/libgtop/Makefile
@@ -1,24 +1,21 @@
PORTNAME= libgtop
-PORTVERSION= 2.40.0
-PORTREVISION= 1
+PORTVERSION= 2.41.3
CATEGORIES= devel gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome
-PATCH_SITES= https://gitlab.gnome.org/GNOME/${PORTNAME}/-/commit/
-PATCHFILES+= df6393ac0cd7.patch:-p1 # https://gitlab.gnome.org/GNOME/libgtop/-/merge_requests/35
-
MAINTAINER= gnome@FreeBSD.org
COMMENT= GNOME top library
+WWW= https://gitlab.gnome.org/GNOME/libgtop
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
USE_PERL5= build
USE_XORG= xau
-USES= gettext gmake gnome libtool makeinfo pathfix perl5 \
+USES= gettext gmake gnome libtool pathfix perl5 \
pkgconfig tar:xz xorg
-USE_GNOME= gnomeprefix glib20 intlhack introspection:build
+USE_GNOME= gnomeprefix glib20 introspection:build
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
INSTALL_TARGET= install-strip
diff --git a/devel/libgtop/distinfo b/devel/libgtop/distinfo
index 9742254625a3..874c56877a28 100644
--- a/devel/libgtop/distinfo
+++ b/devel/libgtop/distinfo
@@ -1,5 +1,3 @@
-TIMESTAMP = 1591951268
-SHA256 (gnome/libgtop-2.40.0.tar.xz) = 78f3274c0c79c434c03655c1b35edf7b95ec0421430897fb1345a98a265ed2d4
-SIZE (gnome/libgtop-2.40.0.tar.xz) = 744316
-SHA256 (gnome/df6393ac0cd7.patch) = c262b98834f07f524959a240dc41ff7711dd6f38920b6ce86299e8bb9dcf79bd
-SIZE (gnome/df6393ac0cd7.patch) = 784
+TIMESTAMP = 1731954188
+SHA256 (gnome/libgtop-2.41.3.tar.xz) = 775676df958e2ea2452f7568f28b2ea581063d312773dd5c0b7624c1b9b2da8c
+SIZE (gnome/libgtop-2.41.3.tar.xz) = 754028
diff --git a/devel/libgtop/files/patch-config.h.in b/devel/libgtop/files/patch-config.h.in
deleted file mode 100644
index 8349c55b4756..000000000000
--- a/devel/libgtop/files/patch-config.h.in
+++ /dev/null
@@ -1,12 +0,0 @@
---- config.h.in.orig 2015-08-13 20:06:02.824731000 +0200
-+++ config.h.in 2015-08-13 20:07:06.011319000 +0200
-@@ -115,6 +115,9 @@
- /* defined if you have linux/isdn.h */
- #undef HAVE_ISDN_H
-
-+/* defined if you have kinfo_getfile in -lutil */
-+#undef HAVE_KINFO_GETFILE
-+
- /* Define to 1 if you have the `lchown' function. */
- #undef HAVE_LCHOWN
-
diff --git a/devel/libgtop/files/patch-configure b/devel/libgtop/files/patch-configure
deleted file mode 100644
index 67c0d5a5f62f..000000000000
--- a/devel/libgtop/files/patch-configure
+++ /dev/null
@@ -1,60 +0,0 @@
---- configure.orig 2015-08-13 20:06:09.161030000 +0200
-+++ configure 2015-08-13 20:07:04.020683000 +0200
-@@ -14503,6 +14503,57 @@
-
- fi
-
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for kinfo_getfile in -lutil" >&5
-+$as_echo_n "checking for kinfo_getfile in -lutil... " >&6; }
-+if ${ac_cv_lib_util_kinfo_getfile+:} false; then :
-+ $as_echo_n "(cached) " >&6
-+else
-+ ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lutil $LIBS"
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-+
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char kinfo_getfile ();
-+int
-+main ()
-+{
-+return kinfo_getfile ();
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_link "$LINENO"; then :
-+ ac_cv_lib_util_kinfo_getfile=yes
-+else
-+ ac_cv_lib_util_kinfo_getfile=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_util_kinfo_getfile" >&5
-+$as_echo "$ac_cv_lib_util_kinfo_getfile" >&6; }
-+if test "x$ac_cv_lib_util_kinfo_getfile" = xyes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define HAVE_LIBUTIL 1
-+_ACEOF
-+
-+ LIBS="-lutil $LIBS"
-+
-+fi
-+
-+if test xac_cv_lib_kinfo_getfile_util = xyes ; then
-+
-+$as_echo "#define HAVE_KINFO_GETFILE 1" >>confdefs.h
-+
-+fi
-+
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5
- $as_echo_n "checking for an ANSI C-conforming const... " >&6; }
- if ${ac_cv_c_const+:} false; then :
diff --git a/devel/libgtop/files/patch-examples_mountlist.c b/devel/libgtop/files/patch-examples_mountlist.c
deleted file mode 100644
index bf01f6b34c86..000000000000
--- a/devel/libgtop/files/patch-examples_mountlist.c
+++ /dev/null
@@ -1,33 +0,0 @@
-Remove unreliable and non-portable way to demonstrate memory utilization
-with sbrk(2).
-
-https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=221751
-
---- examples/mountlist.c.orig
-+++ examples/mountlist.c
-@@ -71,16 +71,12 @@
-
- printf ("Host = '%s' - %u\n\n", buffer, port);
-
-- printf ("sbrk (0) = %p\n\n", sbrk (0));
--
- for (c = 0; c < PROFILE_COUNT; c++) {
- mount_entries = glibtop_get_mountlist (&mount_list, 1);
-
- g_free (mount_entries);
- }
-
-- printf ("sbrk (0) = %p\n\n", sbrk (0));
--
- mount_entries = glibtop_get_mountlist (&mount_list, 1);
-
- if (mount_entries == NULL)
-@@ -108,8 +104,6 @@
-
- g_free (mount_entries);
-
-- printf ("\nsbrk (0) = %p\n\n", sbrk (0));
--
- glibtop_close ();
-
- exit (0);
diff --git a/devel/libgtop/files/patch-sysdeps_freebsd_procmap.c b/devel/libgtop/files/patch-sysdeps_freebsd_procmap.c
index a0f64e09184f..a3b4fcc550f2 100644
--- a/devel/libgtop/files/patch-sysdeps_freebsd_procmap.c
+++ b/devel/libgtop/files/patch-sysdeps_freebsd_procmap.c
@@ -1,15 +1,15 @@
---- sysdeps/freebsd/procmap.c.orig 2021-06-06 05:13:00 UTC
+--- sysdeps/freebsd/procmap.c.orig 2023-01-15 10:43:14 UTC
+++ sysdeps/freebsd/procmap.c
-@@ -34,6 +34,8 @@
- #include <vm/vm_map.h>
- #include <vm/vm.h>
+@@ -26,6 +26,8 @@
+
+ #include <glibtop_suid.h>
+#include <stdbool.h>
+
- #define _KVM_VNODE
- #include <sys/vnode.h>
- #undef _KVM_VNODE
-@@ -51,14 +53,15 @@
+ #include <kvm.h>
+ #include <sys/param.h>
+ #include <sys/proc.h>
+@@ -51,12 +53,14 @@
#define _KERNEL
#include <sys/mount.h>
#include <ufs/ufs/quota.h>
@@ -23,18 +23,9 @@
#undef _KERNEL
+#include <ufs/ufs/inode.h>
--
- #if (__FreeBSD_version >= 1101001)
- #define _KERNEL
- #include <ufs/ufs/extattr.h>
-@@ -95,12 +98,14 @@ _glibtop_sysdeps_freebsd_dev_inode (glibtop *server, s
- struct cdev_priv priv;
- #if __FreeBSD_version < 800039
- struct cdev si;
-+#else
-+ struct ufsmount um;
- #endif
+ #if (__FreeBSD_version >= 1101001)
+@@ -100,7 +104,7 @@ _glibtop_sysdeps_freebsd_dev_inode (glibtop *server, s
*inum = 0;
*dev = 0;
@@ -43,7 +34,7 @@
(char *) &tagptr, sizeof (tagptr)) != sizeof (tagptr) ||
kvm_read (server->machine->kd, (gulong) tagptr,
(char *) tagstr, sizeof (tagstr)) != sizeof (tagstr))
-@@ -120,7 +125,7 @@ _glibtop_sysdeps_freebsd_dev_inode (glibtop *server, s
+@@ -120,7 +124,7 @@ _glibtop_sysdeps_freebsd_dev_inode (glibtop *server, s
return;
}
@@ -52,107 +43,3 @@
sizeof (inode)) != sizeof (inode))
{
glibtop_warn_io_r (server, "kvm_read (inode)");
-@@ -231,6 +236,32 @@ _glibtop_init_proc_map_p (glibtop *server)
- server->sysdeps.proc_map = _glibtop_sysdeps_proc_map;
- }
-
-+static int
-+vm_map_reader(void *token, vm_map_entry_t addr, vm_map_entry_t dest)
-+{
-+ kvm_t *kd;
-+
-+ kd = (kvm_t *)token;
-+ return (kvm_read (kd, (gulong) addr, dest, sizeof(*dest)) == sizeof(*dest));
-+}
-+
-+#if (__FreeBSD_version < 1300062)
-+typedef int vm_map_entry_reader(void *token, vm_map_entry_t addr,
-+ vm_map_entry_t dest);
-+
-+static inline vm_map_entry_t
-+vm_map_entry_read_succ(void *token, struct vm_map_entry *const clone,
-+ vm_map_entry_reader reader)
-+{
-+ vm_map_entry_t next;
-+
-+ next = clone->next;
-+ if (!reader (token, next, clone))
-+ return (NULL);
-+ return (next);
-+}
-+#endif
-+
- /* Provides detailed information about a process. */
-
- glibtop_map_entry *
-@@ -238,13 +269,12 @@ glibtop_get_proc_map_p (glibtop *server, glibtop_proc_
- pid_t pid)
- {
- struct kinfo_proc *pinfo;
-- struct vm_map_entry entry, *first;
-+ struct vm_map_entry entry;
- struct vmspace vmspace;
- struct vm_object object;
- GArray *maps;
- struct vnode vnode;
-- int count;
-- int update = 0;
-+ int i, count;
-
- memset (buf, 0, sizeof (glibtop_proc_map));
-
-@@ -273,16 +303,6 @@ glibtop_get_proc_map_p (glibtop *server, glibtop_proc_
- return NULL;
- }
-
-- first = vmspace.vm_map.header.next;
--
-- if (kvm_read (server->machine->kd,
-- (gulong) vmspace.vm_map.header.next,
-- (char *) &entry, sizeof (entry)) != sizeof (entry)) {
-- glibtop_warn_io_r (server, "kvm_read (entry)");
-- glibtop_suid_leave (server);
-- return NULL;
-- }
--
- /* Walk through the `vm_map_entry' list ... */
-
- /* I tested this a few times with `mmap'; as soon as you write
-@@ -292,21 +312,17 @@ glibtop_get_proc_map_p (glibtop *server, glibtop_proc_
- maps = g_array_sized_new(FALSE, FALSE, sizeof(glibtop_map_entry),
- vmspace.vm_map.nentries);
-
-- do {
-+ entry = vmspace.vm_map.header;
-+ for (i = 0; i < vmspace.vm_map.nentries; i++) {
- glibtop_map_entry *mentry;
- guint64 inum, dev;
- guint len;
-
-- if (update) {
-- if (kvm_read (server->machine->kd,
-- (gulong) entry.next,
-- (char *) &entry, sizeof (entry)) != sizeof (entry)) {
-- glibtop_warn_io_r (server, "kvm_read (entry)");
-- continue;
-- }
-- } else {
-- update = 1;
-- }
-+ if (!vm_map_entry_read_succ(server->machine->kd, &entry, vm_map_reader)) {
-+ glibtop_warn_io_r (server, "kvm_read (entry)");
-+ glibtop_suid_leave (server);
-+ return NULL;
-+ }
-
- if (entry.eflags & (MAP_ENTRY_IS_SUB_MAP))
- continue;
-@@ -377,7 +393,7 @@ glibtop_get_proc_map_p (glibtop *server, glibtop_proc_
- if (entry.protection & VM_PROT_EXECUTE)
- mentry->perm |= GLIBTOP_MAP_PERM_EXECUTE;
-
-- } while (entry.next != first);
-+ }
-
- glibtop_suid_leave (server);
-
diff --git a/devel/libgtop/pkg-plist b/devel/libgtop/pkg-plist
index adbe6ae84ea2..560dc50bec8b 100644
--- a/devel/libgtop/pkg-plist
+++ b/devel/libgtop/pkg-plist
@@ -1,9 +1,8 @@
-bin/libgtop_daemon2
-@(,kmem,2555) bin/libgtop_server2
include/libgtop-2.0/glibtop.h
include/libgtop-2.0/glibtop/close.h
include/libgtop-2.0/glibtop/command.h
include/libgtop-2.0/glibtop/cpu.h
+include/libgtop-2.0/glibtop/disk.h
include/libgtop-2.0/glibtop/fsusage.h
include/libgtop-2.0/glibtop/global.h
include/libgtop-2.0/glibtop/gnuserv.h
@@ -46,8 +45,10 @@ lib/girepository-1.0/GTop-2.0.typelib
lib/libgtop-2.0.a
lib/libgtop-2.0.so
lib/libgtop-2.0.so.11
-lib/libgtop-2.0.so.11.0.1
+lib/libgtop-2.0.so.11.1.0
libdata/pkgconfig/libgtop-2.0.pc
+libexec/libgtop_daemon2
+@(,kmem,2555) libexec/libgtop_server2
%%DOCSDIR%%/home.png
%%DOCSDIR%%/index.html
%%DOCSDIR%%/left-insensitive.png
@@ -97,6 +98,7 @@ libdata/pkgconfig/libgtop-2.0.pc
%%DOCSDIR%%/up-insensitive.png
%%DOCSDIR%%/up.png
share/gir-1.0/GTop-2.0.gir
+share/locale/ab/LC_MESSAGES/libgtop.mo
share/locale/am/LC_MESSAGES/libgtop.mo
share/locale/ar/LC_MESSAGES/libgtop.mo
share/locale/as/LC_MESSAGES/libgtop.mo
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-27 11:52:12 +0000