diff --git a/sysutils/xfce4-taskmanager/Makefile b/sysutils/xfce4-taskmanager/Makefile index 5ecec2e96057..a327c9900719 100644 --- a/sysutils/xfce4-taskmanager/Makefile +++ b/sysutils/xfce4-taskmanager/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.24 2021/12/08 16:06:41 adam Exp $ +# $NetBSD: Makefile,v 1.25 2021/12/10 00:00:02 gutteridge Exp $ -PKGREVISION= 3 .include "../../meta-pkgs/xfce4/Makefile.common" -VERSION= 1.2.3 +VERSION= 1.4.2 DISTNAME= xfce4-taskmanager-${VERSION} CATEGORIES= sysutils MASTER_SITES= https://archive.xfce.org/src/apps/xfce4-taskmanager/${VERSION:R}/ @@ -11,18 +10,18 @@ MASTER_SITES= https://archive.xfce.org/src/apps/xfce4-taskmanager/${VERSION:R}/ HOMEPAGE= https://goodies.xfce.org/projects/applications/xfce4-taskmanager COMMENT= Xfce task manager -# patch needs libkvm. +# NetBSD support file needs libkvm. .include "../../mk/bsd.prefs.mk" -.if ${OPSYS} != "Linux" +.if ${OPSYS} == "NetBSD" LDFLAGS+= -lkvm .endif -CONFIGURE_ARGS+= --disable-gtk2 .if ${OPSYS} == "NetBSD" pre-configure: ${CP} ${FILESDIR}/task-manager-netbsd.c ${WRKSRC}/src/task-manager-bsd.c .endif +.include "../../devel/libwnck3/buildlink3.mk" .include "../../x11/libXmu/buildlink3.mk" .include "../../x11/libxfce4ui/buildlink3.mk" .include "../../sysutils/desktop-file-utils/desktopdb.mk" diff --git a/sysutils/xfce4-taskmanager/PLIST b/sysutils/xfce4-taskmanager/PLIST index 6245d6886391..72caec8d94c3 100644 --- a/sysutils/xfce4-taskmanager/PLIST +++ b/sysutils/xfce4-taskmanager/PLIST @@ -1,9 +1,13 @@ -@comment $NetBSD: PLIST,v 1.4 2020/04/11 04:24:55 gutteridge Exp $ +@comment $NetBSD: PLIST,v 1.5 2021/12/10 00:00:02 gutteridge Exp $ bin/xfce4-taskmanager share/applications/xfce4-taskmanager.desktop +share/icons/hicolor/128x128/apps/org.xfce.taskmanager.png share/icons/hicolor/16x16/actions/xc_crosshair.png +share/icons/hicolor/16x16/apps/org.xfce.taskmanager.png share/icons/hicolor/24x24/actions/xc_crosshair.png +share/icons/hicolor/48x48/apps/org.xfce.taskmanager.png share/icons/hicolor/scalable/actions/xc_crosshair.svg +share/icons/hicolor/scalable/apps/org.xfce.taskmanager.svg share/locale/ar/LC_MESSAGES/xfce4-taskmanager.mo share/locale/ast/LC_MESSAGES/xfce4-taskmanager.mo share/locale/be/LC_MESSAGES/xfce4-taskmanager.mo @@ -16,6 +20,7 @@ share/locale/el/LC_MESSAGES/xfce4-taskmanager.mo share/locale/en_AU/LC_MESSAGES/xfce4-taskmanager.mo share/locale/en_GB/LC_MESSAGES/xfce4-taskmanager.mo share/locale/es/LC_MESSAGES/xfce4-taskmanager.mo +share/locale/et/LC_MESSAGES/xfce4-taskmanager.mo share/locale/eu/LC_MESSAGES/xfce4-taskmanager.mo share/locale/fi/LC_MESSAGES/xfce4-taskmanager.mo share/locale/fr/LC_MESSAGES/xfce4-taskmanager.mo @@ -24,6 +29,7 @@ share/locale/he/LC_MESSAGES/xfce4-taskmanager.mo share/locale/hr/LC_MESSAGES/xfce4-taskmanager.mo share/locale/hu/LC_MESSAGES/xfce4-taskmanager.mo share/locale/hy_AM/LC_MESSAGES/xfce4-taskmanager.mo +share/locale/hye/LC_MESSAGES/xfce4-taskmanager.mo share/locale/id/LC_MESSAGES/xfce4-taskmanager.mo share/locale/ie/LC_MESSAGES/xfce4-taskmanager.mo share/locale/is/LC_MESSAGES/xfce4-taskmanager.mo diff --git a/sysutils/xfce4-taskmanager/distinfo b/sysutils/xfce4-taskmanager/distinfo index 2c3add945584..ad1be8fec5a9 100644 --- a/sysutils/xfce4-taskmanager/distinfo +++ b/sysutils/xfce4-taskmanager/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.8 2021/10/26 11:20:27 nia Exp $ +$NetBSD: distinfo,v 1.9 2021/12/10 00:00:02 gutteridge Exp $ -BLAKE2s (xfce4-taskmanager-1.2.3.tar.bz2) = 5b8bdbd4295c65eade7b1369544f1fc1c0da6b574fdb796d0e15fb590b6eac97 -SHA512 (xfce4-taskmanager-1.2.3.tar.bz2) = e3fbc89e4a1f6d3cd2f03388626b86129244c9d16092c74db18459efcaffc401a4aaab0588d9b96771f609bf5b17fa0a923a17d598e148b6d71efbb08aa5faf3 -Size (xfce4-taskmanager-1.2.3.tar.bz2) = 406223 bytes +BLAKE2s (xfce4-taskmanager-1.4.2.tar.bz2) = d3548ad9e3c7099d437a595a945b4fb0c6e1c6734474fc86939c260a4ff1a749 +SHA512 (xfce4-taskmanager-1.4.2.tar.bz2) = cd7f26c7ab0e0557be52155d58c677258da8479c2a09b0e1dd4006fe0ecb2a3c82d68ecdf72c10e8b8977eac5a158fcb606027229e973edb6ea7570d040c2444 +Size (xfce4-taskmanager-1.4.2.tar.bz2) = 414315 bytes diff --git a/sysutils/xfce4-taskmanager/files/task-manager-netbsd.c b/sysutils/xfce4-taskmanager/files/task-manager-netbsd.c index 34f3781b3cbb..fb856c298c2e 100644 --- a/sysutils/xfce4-taskmanager/files/task-manager-netbsd.c +++ b/sysutils/xfce4-taskmanager/files/task-manager-netbsd.c @@ -147,7 +147,8 @@ gboolean get_cpu_usage (gushort *cpu_count, gfloat *cpu_user, gfloat *cpu_system /* vmtotal values in #pg */ #define pagetok(nb) ((nb) * (getpagesize())) -gboolean get_memory_usage (guint64 *memory_total, guint64 *memory_free, +gboolean get_memory_usage (guint64 *memory_total, + guint64 *memory_available, guint64 *memory_free, guint64 *memory_cache, guint64 *memory_buffers, guint64 *swap_total, guint64 *swap_free) { @@ -173,6 +174,7 @@ gboolean get_memory_usage (guint64 *memory_total, guint64 *memory_free, *memory_free = pagetok((guint64)vmtotal.t_free); *memory_cache = 0; *memory_buffers = pagetok(vmtotal.t_rm - vmtotal.t_arm); + *memory_available = *memory_free + *memory_cache + *memory_buffers; /* get swap stats */ if ((nswap = swapctl(SWAP_NSWAP, 0, 0)) == 0)