pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/sysutils
Module Name: pkgsrc
Committed By: pho
Date: Sat Aug 30 08:24:21 UTC 2025
Modified Files:
pkgsrc/sysutils/gkrellm: Makefile Makefile.common PLIST buildlink3.mk
distinfo options.mk
pkgsrc/sysutils/gkrellm-server: Makefile PLIST
pkgsrc/sysutils/gkrellm-share: Makefile PLIST
pkgsrc/sysutils/gkrellm/files: gkrellmd.sh
pkgsrc/sysutils/gkrellm/patches: patch-src_Makefile
Added Files:
pkgsrc/sysutils/gkrellm/patches: patch-gkrellmd.1 patch-server_Makefile
patch-src_sysdeps_freebsd.c
Removed Files:
pkgsrc/sysutils/gkrellm/files: dragonfly.c po.Makefile server.Makefile
src.Makefile top.Makefile top.Makefile.inc
pkgsrc/sysutils/gkrellm/patches: patch-Makefile.inc patch-aa patch-ab
patch-ac patch-ad patch-ae patch-ag patch-ah patch-ai patch-aj
patch-ak patch-al patch-am patch-an patch-ao patch-ap patch-aq
patch-ar patch-as patch-au patch-av patch-aw patch-ay patch-az
Log Message:
sysutils/gkrellm{,-share,-server}: Update to 2.4.0
pkgsrc changes:
- Changed HOMEPAGE. gkrellm.net has apparently been taken over and now it
only contains irrelevent ads and AI-generated crap, pretending to still
be the official website. It's clearly a fake because it doesn't even
distribute the source tarball. The upstream has moved to srcbox.net.
- Removed patch-aa (src/sysdeps/bsd-common.c), patch-ab
(src/sysdeps/netbsd.c), patch-ac (src/sysdeps/openbsd.c), patch-ad
(src/sysdeps/bsd-net-open.c), patch-ae (server/gkrellmd-private.h),
patch-ag (src/chart.c), patch-ah (src/config.c), patch-ai (src/disk.c),
patch-aj (src/mail.c), patch-ak (src/net.c), patch-al (src/sensors.c),
patch-an (server/mail.c), patch-ao (server/sysdeps-unix.c), patch-ap
(src/client.c), patch-aq (server/main.c), patch-ar (src/monitor.c),
patch-as (src/configure), patch-au (src/gkrellm.h), patch-aw
(src/inet.h), patch-ay (src/sysdeps-unix.c), and patch-az
(src/sysdeps/sensors-common.c): The upstream took our patch and merged
them. How amazing!
- Removed patch-am (src/smbencrypt.c): The upstream removed SMB stuff and
now it uses libntlm.
- Removed patch-Makefile.inc and patch-src_Makefile: We've (including me)
been patching makefiles without knowing those files have come from pkgsrc
but not from upstream. The original files were in ${FILESDIR}. This is
confusing even to us pkgsrc devs, so don't do this anymore.
- gkrellmd from sysutils/gkrellm-server is no longer setuid'ed on NetBSD,
because its NetBSD-specific code has migrated away from kvm to
sysctl. The same is going to be the case for FreeBSD in the next release
but not now.
- NLS support is now optional but is enabled by default.
- Dropped the option for building with glib1 instead of glib2. It's no
longer supported.
- Dropped optional dependencies from sysutils/gkrellm/buildlink3.mk because
they are private to sysutils/gkrellm and don't affect any of the plugins.
- Moved gkrellmd from ${PREFIX}/bin to ${PREFIX}/sbin because it's not
supposed to be directly executed by users. Its man page is now also moved
to section 8.
upstream changes:
## [2.4.0](https://git.srcbox.net/gkrellm/gkrellm/releases/tag/gkrellm-2.4.0) - 2025-01-19
- Use a sans-serif font and slightly bigger font sizes by default
- Add native GnuTLS support mail check via SSL/TLS and require GnuTLS 3.3 or newer (#29)
- Add and install a systemd service unit for gkrellmd
- Install gkrellmd configuration file in standard "install" make target
- Require and always use `getaddrinfo()` function. In a previous release this
was already done on Linux. Now it also applies to other platforms like BSD,
macOS, Solaris and Windows.
- Enable gkrellmd timeouts by default to make gkrellm clients automatically
reconnect after a connection loss
- Fix syslog facility/priority code in gkrellmd to be POSIX compliant so it
is more portable to Unix platforms other than Linux
- Require OpenSSL 1.1 or newer for mail check via SSL/TLS.
- Fix translations and add menu items to main context menu which were previously
only available as debug options
- Replace MD5 code with existing functionality from GLib
- Add and install XDG desktop file as well as icons on Unix/Linux systems.
This uses the GKrellM icon used on Windows only so far because the old icon
is only available in a very small size that is not suitable for modern
screen sizes. The icon is also used as the default window icon in taskbars
and launchers.
- Use locale-dependent date and time formatting by default
- Add Windows 10, 11, Server 2016/2019/2022 OS version detection
- Do not strip executables during installation by default anymore. Use
`make install-strip` if you prefer the old behavior.
- Fix syntax errors in manual pages (patch by Sandro Tosi)
- Fix GTK and GLib deprecation warnings and require GTK >= 2.24
- Fix most compiler warnings when building with GCC 13 and Clang 18
- Center each line in multiline clock/calendar decals
- Fix IPv6 address matching in gkrellmd client access list
- Update French translation (patch by Jerome UZEL)
- Fix stack corruption in Solaris kstat code (patch by Adam Stylinsk)
## [2.3.11](https://git.srcbox.net/gkrellm/gkrellm/releases/tag/gkrellm-2.3.11) - 2019-07-25
- Fix krell scale for medium sized filesystems (based on patch by Peter Hymann)
- Support OpenSSL >= 1.1 for mail check over SSL/TLS
- Sort Linux disk devices alphabetically (patch by Petr Gajdos)
- Avoid corruption of chart labels (based on patch by Stefan Seyfried)
- Fix possible buffer-overflow in disk size formatting
## [2.3.10](https://git.srcbox.net/gkrellm/gkrellm/releases/tag/gkrellm-2.3.10) - 2016-10-23
- Fix Linux nvme block devices
- Do not reject disks because they are not found in `/proc/devices` (the nvme
disks may not be there) so new default is to accept anything in
`/proc/diskstats` regardless if major number is known or in devices file.
## [2.3.9](https://git.srcbox.net/gkrellm/gkrellm/releases/tag/gkrellm-2.3.9) - 2016-10-11
- Fix mmc block devices (regression in 2.3.8)
- Allow Pango markup for all configurable panel labels
## [2.3.8](https://git.srcbox.net/gkrellm/gkrellm/releases/tag/gkrellm-2.3.8) - 2016-09-07
- Add option to ignore network interfaces that match a regular expression
pattern
- Fix composite disk graph double counting
- Handle dynamic disk major numbers for `dm` and `mdp` virtual devices and don't
add their data to the composite disk
- Disk panel labels are now configurable. This is mostly useful for user
labeling of virtual disks
- Use wrap bytes instead of discarding data when cumulative chart data overflows
- Changed keyboard shortcut for theme changes to `Shift+Page Up` and `Shift+Page Down`
(patch by Pavel Reznicek)
- Indentation cleanup bugfix for Linux kernel version detection
(patch by Ville Skytta)
## [2.3.7](https://git.srcbox.net/gkrellm/gkrellm/releases/tag/gkrellm-2.3.7) - 2016-06-03
- Use `gdk_pixbuf_new_from_data()` instead of deprecated
`gdk_pixbuf_new_from_inline()`. Inline `alert_inline[]` needed to be --raw.
- Fix sending error message back to clients that were refused by gkrellmd and
add dialog to gkrellm client to display the error message
- Fix possible chart rendering problem for single pixels
- Fix compilation without OpenSSL and GnuTLS (patch by Felix Janda)
- Always use `getaddrinfo()` on Linux to fix IPv6 support on C libraries other
than glibc (for example musl libc)
- Fix handling of `mmcblkN` SD disk partition numbers
## [2.3.6-RC2](https://git.srcbox.net/gkrellm/gkrellm/releases/tag/gkrellm-2.3.6-rc2) - 2015-12-23
- Each real CPU chart may be individually enabled instead of as a group so CPU
charts may be split into multiple instances. For systems with large numbers
of CPUs.
- Make drawing CPU panel labels optional to allow saving vertical space.
- Patch from Ville Skytta: fix some `netbsd.c` and `winops-win32.c` issues flagged by cppcheck.
- Patch from Neil Booth: Add multiple CPU capability to CPU monitor for
Dragonfly. Acquired `dragonfly.c` from web so could apply patch. I have no clue
why I never had a `dragonfly.c`.
- Patch from Jindrich Makovicka: Update multiple GKrellM files to compile with
`-DGTK_DISABLE_DEPRECATED -DGSEAL_ENABLE` for GTK3 compatibility. Replaces
GtkItemFactory and GtkTooltips.
- Add nvidia-smi interface to linux.c for getting nvidia GPU temperatures.
- Translation updates
- ru.po from Roman Savochenko
- uk.po new translation from Roman Savochenko
- pt.po new translation from Ze based on pt_BR.po
- fr.po from Jerome UZEL
- Bugfixes
- fix memory leaks: add `g_thread_unref()` for all GThread pointers returned
from `g_thread_new()` calls.
- Flag config as modified when changing a charts Resolution per Grid and bump
max grid resolution to 500000000.
- Store lockfiles under `/var/lock/gkrellm-UID` directories to make lockfiles
work for multiple users.
- Only link against and initialize Libgcrypt when building with GnuTLS < 2.12.
This allows using GKrellM with GnuTLS versions built against Nettle instead
of Libgcrypt.
- Patch from Gerard Neil: Skip autofs mounts in free disk space polling
- Patch from Gerard Neil: Handle cifs as remote filesystem to use longer
`nfs-timeout` polling interval
- Patch from Alexandre Rostovtsev: Explicitly link against gmodule-2.0
- Add support for GPU-Z sensor information on Windows
- Increase minimum required GLib version to 2.32, some parts of gkrellm use
newer GLib API
- Drop remaining GLib 1.x compatibility from gkrellmd
- Patch from Ville Skyttä: Allow binding to a listen address that doesn't exist
yet (gkrellmd)
- Patch from Pierre Neyron: Option to enable/disable new network interfaces
by default
2.3.5 - Thu Oct 7, 2010
------------------------
* Patch from Hajimu Umemoto: use utmpx instead of utmp on FreeBSD 9-CURRENT
* Linux sensors: check for /sys/class/thermal/thermal_zone[0-*].
* Patch from Simon de Hartog: Add Linux net monitor checking for
IPv6 routes.
* Patches from Stefan Gehn:
- Use dynamic buffering to handle large disk names from a Mac gkrellmd.
- Clean up debug printing by using gkrellm_debug(), g_message(),
g_debug(), g_warning().
- Replace sprintf() calls with snprintf().
- Use glib gstdio to replace unix calls: fopen()->g_fopen(), etc.
- Use glib mutex functions for portability when building with
GnuTLS.
- Fix IMAP login by escaping backslash and double-quotes in
username, password and mailbox strings.
- Fix initial sending of fstab entries in gkrellmd, fstab was only
sent if it was marked as "changed"
- Configure scripts handle pkg-config and compiler errors better.
- src/Makefile: Rename SMC_LIBS to X11_lIBS and add -lX11
- Makefile: Drop duplicating SMC_LIBS in "netbsd" targets by calling
src/Makefile with "netbsd" target instead of using the generic
"gkrellm" target.
- gkrellmd: Make "-d" commandline option the short version
for "--detach" instead of for "--debug-level".
- Enable IPv6-support on win32 if target os is windows xp or newer.
- Support monitoring of active IPv6 TCP connections on windows vista
or newer.
- Fix building with mingw-w64 environment.
- Fix time formatting on win32 for monthly network statistics
* Patch from Stefan Gehn: add searching for linux sensors directly below
hwmon dir since kernel is putting newer devices there.
* Patch from Hajimu Umemoto: FreeBSD memory usage calculation update.
* Translation updates
o fr.po from Jerome UZEL
o es.po from Cristian Othon Martinez Vera
o de.po minor bug patch from Jan Brinkmann.
o pt_BR.po update from Vinicius Moreira de Oliveira
* Bugfixes
o Fix eof check in fgets_pipe() (when using external mail check program).
o Jindrich Makovicka patch: fix some aliasing violations due to
sockaddr_* typecasting.
o Ville Skytta patch: add explicit -lm linking to fix Fedora builds
with --no-add-needed.
2.3.4 - Mon Jan 4, 2010
------------------------
* Add gkrellm_sys_setup_connect() function so sysdep code can register
from gkrellm_sys_main_init() a setup function to call after main()
argument parsing.
* Patch from Hajimu Umemoto: add FreeBSD support for the amdtemp
temperature sensor.
* Add some mbmon usage help to gkrellm.1 and README.
* Bugfixes
o Patch from Sandro Tosi: fix a FTBFS when using gold as linker
(by simply adding -lX11).
o Add SSL library init calls to mail check for gnutls case.
o Patch from Hans de Goede: Fix some crashes - check for NULL GC when
drawing root pixmap on transparent chart or panel.
o Patch from Goswin von Brederlow: Ignore device mapper devices in
Linux disk stats.
2.3.3 - Mon Dec 21, 2009
------------------------
* gkrellm.spec update from Tim Keller.
* Patch from Cyrus Rahman: restore gkrellm_sys_main_init() call to proper
place and fix FreeBSD sensors for amd64 and fix allocate sensor bug.
* Patch from Hajimu Umemoto: add --without-ntlm option
* Patches from Hajimu Umemoto for FreeBSD:
- Support SMP CPU charts coming in FreeBSD 6.4-RELEASE and 7.1-RELEASE
- Use sysctl for swap info on recent FreeBSD; suppress compile warnings
- Include patch from Pietro Cerutti for coretemp(4) sensor support and
fix bug causing only one instance of a sensor type to be added.
- Include patch from Sven Berkvens-Matthijsse to enable battery support
on amd64 using ACPI.
* Patch from Stefan Gehn: Makefile & configure ntlm detect use pkg-config.
* Patch from Erik-Jan: sensors monitor option to show temperature units.
* Patch from Hans de Goede: rename getline to gkrellm_getline to avoid
conflict with new getline function in recent glibc.
* Bugfixes
o Fix a crah by moving "unable to connect" Gtk dialogs outside
of the connect to client thread.
o Divide by zero crash in Linux battery monitor when batteries are dead.
o Patch from Hans de Goede: fix a crash by adding openssl mail check
locking to mail monitor.
* Translation updates
o pt_BR.po update from Vinicius Moreira de Oliveira
2.3.2 - Fri Oct 3, 2008
------------------------
* Patch from Stefan Gehn:
- Add error logging routines so errors and debugging can be routed to
a file or stdout, and gkrellmd can log to the system syslog file.
Begin replacing debug printf() with g_message(), g_warning(), etc
functions to support the logging functions.
- Port gtk_combo functions to gtk_combo_box
- Add client mode server connection error dialog pupups.
- Use GTK 2.12 gtk_widget_xxx_tooltip over gtk_tooltip in mail.c
- win32 changes:
Use unicode function calls.
Use getaddrinfo() on win32.
Support CoreTemp application for getting cpu temperatures.
Redo sensor-handling to support multiple sensor backends.
Make Proc monitor work and properly count # of logged in users.
Mem monitor displays cache bytes.
System name shows some new windows versions.
Remove trayicon
- Other various cleanups and changes in his quite large patch.
* Add OpenSSL license exception.
Make OpenSSL the default to avoid gnutls symbol conflict crash.
* Link to libntlm and remove smb* files from gkrellm source distribution.
* Patch from Takao Fujiwara: Pass clock/calendar strings to strftime in
current locale. Bump default width up to 100.
* Patch from Leo Schwab: add linux sysfs battery interface. Use
preferencially over deprecated /proc/acpi interface.
* Patch from Lycestra:
- Mac OS X support:
"darwin9" build mode for Leopard, which lacks libkvm
add inet monitor interface
add buffers and cache data to memory monitor
- don't client connect to server in the case read_server_setup() fails
* Bugfixes
o Allow spaces in file system monitor directories.
o Andrey Rahmatullin and Ravi Pinjal both sent a patch to fix:
some memleaks in clock monitor.
o Ken Milmore patch: fix configure script to work for lm_sensors >= 3.1
o NULL serve_name segfault
* Translation updates
o pl.po from Michal Smoczyk
2.3.1 - Sun Dec 2, 2007
------------------------
* Clock/Calendar monitor rewritten to use user configurable display
format strings containing strftime conversion characters and
Pango text attribute markup strings.
* Hans de Goede patch: add new to be released libsensors4 interface to
linux sensors.
* Martijn Ras patch: -A option to bind gkrellmd to a specific interface.
* Include UDP connections in the Linux inet monitor.
* Bugfixes
o Ville Skytta patch: add gcrypt.h for mail monitor gnutls support.
o Add test for "charged" when checking linux battery charging state.
o Stop pumping extra "float_factor" lines into user-config.
o Add omitted substitution variables: $L for disk, $H for some others.
o make fs monitor panels adjust height according to changes in text
extents with panel format string Pango markup changes (and fs
labels can now use markup).
* Translation updates
o de.po from Steffen Weise
o fr.po from Jerome UZEL
o pl.po from Michal Smoczyk
2.3.0 - Fri Jul 20, 2007
------------------------
* Upgrade to GPLv3
* Jindrich Makovicka patch: mail check for Sylpheed .claws_mark mark file.
* Stefan Gehn large set of patches for Windows:
1) Makefiles updated for Windows 2000/XP builds under MinGW/MSYS.
Drop win9x support.
2) Add support: SpeedFan sensors, tcp port stats for the Inet monitor,
theme transparency,
3) Add Vista detection, but running under Vista needs testing.
4) Improve the plugin interface. Added static libgkrellm.a for easier
plugin porting. New files: src/win32-libgkrellm.c,
src/win32-plugin.c server/win32-gui.c server/win32-gui.h
server/win32-libgkrellmd.c server/win32-plugin.c
server/win32-plugin.h.
Pass callback pointer to win32 gkrellmd plugins.
5) Various #ifdef WIN32 unix/windows compatibility cleanups, new
gkrellmd_get_timer_ticks() and gkrellmd_ticks() functions, trayicon
handling.
* Michal Nazarewicz patch: preserve config of disabled monitors.
* Anthony Mallet patches:
1) Add NetBSD ACPI battery monitor support.
2) Collection of NetBSD pkgsrc port patches: Disk monitor API changes,
DragonFLY OS support, 64 bit compile cleanups.
* Will Simoneau patch: look for linux I2O disks.
* Don't save config for disabled non-existing net interfaces.
* Add memory monitor raw free and raw used panel variables.
* Plugin interface to export strings (data) for panel/chart labels.
Net monitor updated to check for exports.
* Linux nvidia GPU option to use nvclock when nvidia-settings fails.
* Translation updates
o de.po from Steffen Weise
o fr.po from Jerome UZEL
* Bugfixes
o Add SubstructureRedirectMask in net_wm_state().
o gkrellmd documentation: fix gkrellmd.1 typos, add missing pidfile.
o Read of inet update_interval from config failed.
o Negative sensor factors weren't saved in the config.
o Linux sensors:
1) handle libsensors via686a 2.0V voltage label style.
2) Read temps from multiple nVidia gpu cores.
o Linux.c 64 bit compile warnings.
To generate a diff of this commit:
cvs rdiff -u -r1.130 -r1.131 pkgsrc/sysutils/gkrellm/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/sysutils/gkrellm/Makefile.common
cvs rdiff -u -r1.12 -r1.13 pkgsrc/sysutils/gkrellm/PLIST
cvs rdiff -u -r1.73 -r1.74 pkgsrc/sysutils/gkrellm/buildlink3.mk
cvs rdiff -u -r1.49 -r1.50 pkgsrc/sysutils/gkrellm/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/sysutils/gkrellm/options.mk
cvs rdiff -u -r1.35 -r1.36 pkgsrc/sysutils/gkrellm-server/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/sysutils/gkrellm-server/PLIST
cvs rdiff -u -r1.7 -r1.8 pkgsrc/sysutils/gkrellm-share/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/sysutils/gkrellm-share/PLIST
cvs rdiff -u -r1.2 -r0 pkgsrc/sysutils/gkrellm/files/dragonfly.c
cvs rdiff -u -r1.1.1.1 -r1.2 pkgsrc/sysutils/gkrellm/files/gkrellmd.sh
cvs rdiff -u -r1.1.1.1 -r0 pkgsrc/sysutils/gkrellm/files/po.Makefile \
pkgsrc/sysutils/gkrellm/files/top.Makefile
cvs rdiff -u -r1.6 -r0 pkgsrc/sysutils/gkrellm/files/server.Makefile
cvs rdiff -u -r1.7 -r0 pkgsrc/sysutils/gkrellm/files/src.Makefile
cvs rdiff -u -r1.15 -r0 pkgsrc/sysutils/gkrellm/files/top.Makefile.inc
cvs rdiff -u -r1.4 -r0 pkgsrc/sysutils/gkrellm/patches/patch-Makefile.inc \
pkgsrc/sysutils/gkrellm/patches/patch-ae
cvs rdiff -u -r1.18 -r0 pkgsrc/sysutils/gkrellm/patches/patch-aa
cvs rdiff -u -r1.15 -r0 pkgsrc/sysutils/gkrellm/patches/patch-ab
cvs rdiff -u -r1.6 -r0 pkgsrc/sysutils/gkrellm/patches/patch-ac
cvs rdiff -u -r1.3 -r0 pkgsrc/sysutils/gkrellm/patches/patch-ad \
pkgsrc/sysutils/gkrellm/patches/patch-ao \
pkgsrc/sysutils/gkrellm/patches/patch-ap \
pkgsrc/sysutils/gkrellm/patches/patch-ar
cvs rdiff -u -r1.1 -r0 pkgsrc/sysutils/gkrellm/patches/patch-ag \
pkgsrc/sysutils/gkrellm/patches/patch-ah \
pkgsrc/sysutils/gkrellm/patches/patch-ai \
pkgsrc/sysutils/gkrellm/patches/patch-ak \
pkgsrc/sysutils/gkrellm/patches/patch-al \
pkgsrc/sysutils/gkrellm/patches/patch-am \
pkgsrc/sysutils/gkrellm/patches/patch-an \
pkgsrc/sysutils/gkrellm/patches/patch-as \
pkgsrc/sysutils/gkrellm/patches/patch-au \
pkgsrc/sysutils/gkrellm/patches/patch-av \
pkgsrc/sysutils/gkrellm/patches/patch-aw \
pkgsrc/sysutils/gkrellm/patches/patch-az
cvs rdiff -u -r1.2 -r0 pkgsrc/sysutils/gkrellm/patches/patch-aj \
pkgsrc/sysutils/gkrellm/patches/patch-aq \
pkgsrc/sysutils/gkrellm/patches/patch-ay
cvs rdiff -u -r0 -r1.1 pkgsrc/sysutils/gkrellm/patches/patch-gkrellmd.1 \
pkgsrc/sysutils/gkrellm/patches/patch-server_Makefile \
pkgsrc/sysutils/gkrellm/patches/patch-src_sysdeps_freebsd.c
cvs rdiff -u -r1.2 -r1.3 pkgsrc/sysutils/gkrellm/patches/patch-src_Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/sysutils/gkrellm/Makefile
diff -u pkgsrc/sysutils/gkrellm/Makefile:1.130 pkgsrc/sysutils/gkrellm/Makefile:1.131
--- pkgsrc/sysutils/gkrellm/Makefile:1.130 Thu Apr 24 14:15:45 2025
+++ pkgsrc/sysutils/gkrellm/Makefile Sat Aug 30 08:24:18 2025
@@ -1,53 +1,48 @@
-# $NetBSD: Makefile,v 1.130 2025/04/24 14:15:45 wiz Exp $
-.include "Makefile.common"
+# $NetBSD: Makefile,v 1.131 2025/08/30 08:24:18 pho Exp $
-PKGREVISION= 67
+.include "Makefile.common"
GKRELLM_PKGBASE= gkrellm
-WRKSRC= ${GKRELLM_SRCDIR}
-
COMMENT= GTK2 based system monitor
-
DEPENDS+= gkrellm-share-${GKRELLM_VERSION}:../../sysutils/gkrellm-share
USE_TOOLS+= pkg-config
-.include "../../mk/bsd.prefs.mk"
+.include "../../mk/bsd.fast.prefs.mk"
-# NetBSD 3.99.1 and above don't have to be installed setgid.
-.if (${OPSYS} == "FreeBSD" || ${OPSYS} == "OpenBSD" || ${OPSYS} == "DragonFly" || \
- (${OPSYS} == "NetBSD" && ${OPSYS_VERSION} < 039900))
+.if ${OPSYS} == "FreeBSD" || ${OPSYS} == "OpenBSD" || ${OPSYS} == "DragonFly"
SPECIAL_PERMS+= ${PREFIX}/bin/gkrellm ${BINOWN} kmem 2555
.endif
-NOT_FOR_PLATFORM= IRIX-*-*
-
-.include "options.mk"
-
-MAKE_ENV+= MODULES=src LINK_FLAGS=${EXPORT_SYMBOLS_LDFLAGS:Q}
-MAKE_ENV+= SSL_TYPE=${GKRELLM_SSL_TYPE:Q}
-MAKE_ENV+= PKG_INCLUDE=-I${BUILDLINK_PREFIX.${GKRELLM_SSL_TYPE}}/include
-MAKE_ENV+= PKG_LIBS="-L${BUILDLINK_PREFIX.${GKRELLM_SSL_TYPE}}/lib ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.${GKRELLM_SSL_TYPE}}/lib"
-MAKE_ENV+= MANDIR=${PREFIX}/${PKGMANDIR}/man1
-MAKE_ENV+= SMANDIR=${PREFIX}/${PKGMANDIR}/man8
-MAKE_FLAGS+= BINOWNER=${BINOWN} BINGROUP=${BINGRP}
-INSTALL_MAKE_FLAGS+= MANDIR=${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
-INSTALL_MAKE_FLAGS+= SMANDIR=${DESTDIR}${PREFIX}/${PKGMANDIR}/man8
-
-# Fix PR pkg/40047, Thanks to Ondrej Tuma
-.if ${OBJECT_FMT} == "ELF" && ${OPSYS} != "SunOS"
-LDFLAGS+= -Wl,-export-dynamic
-.endif
-
SUBST_CLASSES+= gkprefix
SUBST_STAGE.gkprefix= pre-configure
SUBST_FILES.gkprefix= src/gkrellm.h
-SUBST_SED.gkprefix= -e '/SYSTEM_/{s!/usr!${PREFIX}!;}'
+SUBST_SED.gkprefix+= -e '/LOCAL_[A-Z][A-Z]*_DIR/d'
+SUBST_SED.gkprefix+= -e '/SYSTEM_[A-Z][A-Z]*_DIR/{s!/usr!${PREFIX}!;}'
+
+BUILD_DIRS= src
+BUILD_TARGET= ${GKRELLM_PER_PLATFORM_TARGET}
+.if !empty(PKG_OPTIONS:Mnls)
+BUILD_MAKE_FLAGS+= LOCALEDIR=${PREFIX}/${PKGLOCALEDIR}/locale
+.endif
-REQD_DIRS= lib/gkrellm2/plugins lib/gkrellm2 include/gkrellm2
+MAKE_ENV+= MANDIR=${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+
+REQD_DIRS= lib/gkrellm2/plugins lib/gkrellm2/themes
+
+# Generate and install gkrellm.pc
+post-build:
+ ${RUN}cd ${WRKSRC} && \
+ ${BUILD_MAKE_CMD} gkrellm.pc
+
+INSTALL_MAKE_CMD= \
+ ${PKGSRC_SETENV} ${MAKE_ENV} \
+ ${MAKE_PROGRAM} ${MAKE_FLAGS} ${INSTALL_MAKE_FLAGS}
+post-install:
+ ${RUN}cd ${WRKSRC} && \
+ ${INSTALL_MAKE_CMD} install_gkrellm.pc
.include "../../devel/glib2/buildlink3.mk"
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
-.include "../../x11/libSM/buildlink3.mk"
-
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/sysutils/gkrellm/Makefile.common
diff -u pkgsrc/sysutils/gkrellm/Makefile.common:1.19 pkgsrc/sysutils/gkrellm/Makefile.common:1.20
--- pkgsrc/sysutils/gkrellm/Makefile.common:1.19 Sat Nov 27 05:37:59 2021
+++ pkgsrc/sysutils/gkrellm/Makefile.common Sat Aug 30 08:24:18 2025
@@ -1,40 +1,98 @@
-# $NetBSD: Makefile.common,v 1.19 2021/11/27 05:37:59 pho Exp $
+# $NetBSD: Makefile.common,v 1.20 2025/08/30 08:24:18 pho Exp $
#
# used by sysutils/gkrellm-share/Makefile
# used by sysutils/gkrellm-server/Makefile
+GKRELLM_VERSION= 2.4.0
+GKRELLM_DISTBASE= gkrellm-${GKRELLM_VERSION}
+
DISTNAME= ${GKRELLM_DISTBASE}
PKGNAME= ${GKRELLM_PKGBASE}-${GKRELLM_VERSION}
CATEGORIES= sysutils
-MASTER_SITES= http://members.dslextreme.com/users/billw/gkrellm/
+MASTER_SITES= https://gkrellm.srcbox.net/releases/
EXTRACT_SUFX= .tar.bz2
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE= http://gkrellm.net/
-LICENSE= gnu-gpl-v2
+HOMEPAGE= https://gkrellm.srcbox.net/
+LICENSE= gnu-gpl-v3
USE_TOOLS+= gmake
-USE_PKGLOCALEDIR= YES
-MAKE_ENV+= LOCALEDIR=${PREFIX}/${PKGLOCALEDIR}/locale
-MAKE_ENV+= GREP=${GREP:Q}
+FILESDIR= ${.CURDIR}/../../sysutils/gkrellm/files
+PATCHDIR= ${.CURDIR}/../../sysutils/gkrellm/patches
+DISTINFO_FILE= ${.CURDIR}/../../sysutils/gkrellm/distinfo
+
+.include "../../sysutils/gkrellm/options.mk"
+.include "../../mk/bsd.fast.prefs.mk"
+
+BROKEN_EXCEPT_ON_PLATFORM= # empty
-.if defined(GKRELLM_DEBUG)
-MAKE_ENV+= DEBUG=yes
+###
+### Darwin
+###
+BROKEN_EXCEPT_ON_PLATFORM+= Darwin-*-*
+.if ${OPSYS} == "Darwin"
+. if !empty(PKG_OPTIONS:Mquartz)
+GKRELLM_PER_PLATFORM_TARGET= macosx
+. elif ${OPSYS_VERSION} >= 100400 # post-Tiger; libkvm unavailable
+GKRELLM_PER_PLATFORM_TARGET= darwin9
+. else
+GKRELLM_PER_PLATFORM_TARGET= darwin
+. endif
.endif
-GKRELLM_VERSION= 2.2.10
-GKRELLM_DISTBASE= gkrellm-${GKRELLM_VERSION}
-GKRELLM_SRCDIR= ${WRKDIR}/${GKRELLM_DISTBASE}
+###
+### DragonFly
+###
+BROKEN_EXCEPT_ON_PLATFORM+= DragonFly-*-*
+.if ${OPSYS} == "DragonFly"
+GKRELLM_PER_PLATFORM_TARGET= dragonfly
+.endif
-FILESDIR= ${.CURDIR}/../../sysutils/gkrellm/files
-PATCHDIR= ${.CURDIR}/../../sysutils/gkrellm/patches
-DISTINFO_FILE= ${.CURDIR}/../../sysutils/gkrellm/distinfo
+###
+### FreeBSD
+###
+BROKEN_EXCEPT_ON_PLATFORM+= FreeBSD-*-*
+.if ${OPSYS} == "FreeBSD"
+. if ${OPSYS_VERSION} >= 030000
+GKRELLM_PER_PLATFORM_TARGET= freebsd
+. else
+GKRELLM_PER_PLATFORM_TARGET= freebsd2
+. endif
+.endif
+
+###
+### Linux
+###
+BROKEN_EXCEPT_ON_PLATFORM+= Linux-*-*
+.if ${OPSYS} == "Linux"
+GKRELLM_PER_PLATFORM_TARGET= all
+.endif
-post-extract:
- ${CP} ${FILESDIR}/top.Makefile ${WRKSRC}/Makefile
- ${CP} ${FILESDIR}/top.Makefile.inc ${WRKSRC}/Makefile.inc
- ${CP} ${FILESDIR}/po.Makefile ${WRKSRC}/po/Makefile
- ${CP} ${FILESDIR}/server.Makefile ${WRKSRC}/server/Makefile
- ${CP} ${FILESDIR}/src.Makefile ${WRKSRC}/src/Makefile
- ${CP} ${FILESDIR}/dragonfly.c ${WRKSRC}/src/sysdeps
+###
+### NetBSD
+###
+BROKEN_EXCEPT_ON_PLATFORM+= NetBSD-*-*
+.if ${OPSYS} == "NetBSD"
+. if ${OPSYS_VERSION} >= 020000
+GKRELLM_PER_PLATFORM_TARGET= netbsd2
+. else
+GKRELLM_PER_PLATFORM_TARGET= netbsd1
+. endif
+.endif
+
+###
+### OpenBSD
+###
+BROKEN_EXCEPT_ON_PLATFORM+= OpenBSD-*-*
+.if ${OPSYS} == "OpenBSD"
+GKRELLM_PER_PLATFORM_TARGET= openbsd
+.endif
+
+###
+### SunOS
+###
+BROKEN_EXCEPT_ON_PLATFORM+= SunOS-*-*
+.if ${OPSYS} == "SunOS"
+GKRELLM_PER_PLATFORM_TARGET= solaris
+.endif
Index: pkgsrc/sysutils/gkrellm/PLIST
diff -u pkgsrc/sysutils/gkrellm/PLIST:1.12 pkgsrc/sysutils/gkrellm/PLIST:1.13
--- pkgsrc/sysutils/gkrellm/PLIST:1.12 Mon Jan 1 22:29:56 2018
+++ pkgsrc/sysutils/gkrellm/PLIST Sat Aug 30 08:24:18 2025
@@ -1,6 +1,15 @@
-@comment $NetBSD: PLIST,v 1.12 2018/01/01 22:29:56 rillig Exp $
+@comment $NetBSD: PLIST,v 1.13 2025/08/30 08:24:18 pho Exp $
bin/gkrellm
include/gkrellm2/gkrellm-public-proto.h
+include/gkrellm2/gkrellm-version.h
include/gkrellm2/gkrellm.h
+include/gkrellm2/log.h
lib/pkgconfig/gkrellm.pc
man/man1/gkrellm.1
+share/applications/gkrellm.desktop
+share/icons/hicolor/16x16/apps/gkrellm.png
+share/icons/hicolor/24x24/apps/gkrellm.png
+share/icons/hicolor/32x32/apps/gkrellm.png
+share/icons/hicolor/48x48/apps/gkrellm.png
+share/icons/hicolor/64x64/apps/gkrellm.png
+share/metainfo/net.srcbox.gkrellm.GKrellM.metainfo.xml
Index: pkgsrc/sysutils/gkrellm/buildlink3.mk
diff -u pkgsrc/sysutils/gkrellm/buildlink3.mk:1.73 pkgsrc/sysutils/gkrellm/buildlink3.mk:1.74
--- pkgsrc/sysutils/gkrellm/buildlink3.mk:1.73 Thu Apr 24 14:15:45 2025
+++ pkgsrc/sysutils/gkrellm/buildlink3.mk Sat Aug 30 08:24:18 2025
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.73 2025/04/24 14:15:45 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.74 2025/08/30 08:24:18 pho Exp $
BUILDLINK_TREE+= gkrellm
@@ -11,19 +11,6 @@ BUILDLINK_PKGSRCDIR.gkrellm?= ../../sysu
.include "../../devel/glib2/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
-.include "../../x11/libSM/buildlink3.mk"
-
-pkgbase := gkrellm
-.include "../../mk/pkg-build-options.mk"
-
-.if ${PKG_BUILD_OPTIONS.gkrellm:Mopenssl}
-.include "../../security/openssl/buildlink3.mk"
-.endif
-
-.if ${PKG_BUILD_OPTIONS.gkrellm:Mgnutls}
-.include "../../security/gnutls/buildlink3.mk"
-.endif
-
.endif # GKRELLM_BUILDLINK3_MK
BUILDLINK_TREE+= -gkrellm
Index: pkgsrc/sysutils/gkrellm/distinfo
diff -u pkgsrc/sysutils/gkrellm/distinfo:1.49 pkgsrc/sysutils/gkrellm/distinfo:1.50
--- pkgsrc/sysutils/gkrellm/distinfo:1.49 Sat Nov 27 04:43:02 2021
+++ pkgsrc/sysutils/gkrellm/distinfo Sat Aug 30 08:24:18 2025
@@ -1,30 +1,9 @@
-$NetBSD: distinfo,v 1.49 2021/11/27 04:43:02 pho Exp $
+$NetBSD: distinfo,v 1.50 2025/08/30 08:24:18 pho Exp $
-BLAKE2s (gkrellm-2.2.10.tar.bz2) = 7cfeedd45dd708d10725ead8e46f01394da4db5219c9393341c2d66eda03ac73
-SHA512 (gkrellm-2.2.10.tar.bz2) = f3bc055c54bd18c20a59fae471e27c7f4067067525cbc351a0e9fb80a70f7da59c220f36ecabae341e73e0b0e93546edabebff896eed863b515c6d8408a5670a
-Size (gkrellm-2.2.10.tar.bz2) = 718894 bytes
-SHA1 (patch-Makefile.inc) = 958f3f402b3f13c2d81520eda62fe4293ac784ab
-SHA1 (patch-aa) = 1cf9b98520b37aa75c6c5b9d0398e8d92204a12e
-SHA1 (patch-ab) = e900c811ddea106efee5cbfc04d0cf14cc6e6451
-SHA1 (patch-ac) = 8890d5a5e8eaf21508a1bf91de788183fd6f7a75
-SHA1 (patch-ad) = 2a12402c941a5a197aa58e711e254ae2c91dfb10
-SHA1 (patch-ae) = 7ebbdd1dddb87f84f6e9e7ae316af18b316d4ddf
-SHA1 (patch-ag) = 6791436e17fccd7265cda8b4e3da229c4937c20f
-SHA1 (patch-ah) = 2018be5c2dd11c22c6d3f7c7fc8607e2c63123f3
-SHA1 (patch-ai) = 234e3e1e458e5709157668cf7d18faabdd076071
-SHA1 (patch-aj) = 224deaa57e7703f34a7911c63d2e6833862920c5
-SHA1 (patch-ak) = b96987c120ca4c37c83075da61e8eb04e41d2023
-SHA1 (patch-al) = 4eab3c3757c198dcc3049a63fc3b8adceef7bc1c
-SHA1 (patch-am) = bf8b01f5e368a5387f8d224ca51ec18a74410b5c
-SHA1 (patch-an) = 1e63ce0e4fbe9bd22c46d00c6aeac6b3e7cda440
-SHA1 (patch-ao) = c9e1a7324e0a9194c05554a09bafd4fe0460df38
-SHA1 (patch-ap) = 0781bec3da89724f7145beaffba4aa318493dbef
-SHA1 (patch-aq) = 0799e334333ae072a40cdcb6ccd04ed6a2f52765
-SHA1 (patch-ar) = 86ee88c8506c1ceb1d35eb488d209b16306a715d
-SHA1 (patch-as) = 3df33e28754cf1fee88717b431726bf090c15f70
-SHA1 (patch-au) = 27df64d854cb15202fa984170faeab4c128d5cad
-SHA1 (patch-av) = 09cbc2fbb8226f8fe56bff458a4772998cae3f32
-SHA1 (patch-aw) = c32ae045dad9754edb88e375b8893cfe161567d0
-SHA1 (patch-ay) = 54ce179dd051509d9fdf857730cf2ddf9b9fe0b3
-SHA1 (patch-az) = 3dbfe97e17a9aad5a6fc8e62b1116ac1fd2ec3a2
-SHA1 (patch-src_Makefile) = 2f5e83b5d8eca2a2e7dff8e05e85da0ce84fe02e
+BLAKE2s (gkrellm-2.4.0.tar.bz2) = fe1062d50117f49eb846063e773d012cc6e1ad86e8a2208372880e1a73f36430
+SHA512 (gkrellm-2.4.0.tar.bz2) = 770acfe5ee23b74ffe5becc89d3735e9e8688ac338b052e1c2f86cb722b7867b1f8c262a969ef3140eb32912cf0426ac13bf3743e2a9149eec2a962655e05a9f
+Size (gkrellm-2.4.0.tar.bz2) = 790070 bytes
+SHA1 (patch-gkrellmd.1) = 579f6eac994ec5321645a21a117e621260be8a6c
+SHA1 (patch-server_Makefile) = a8194ddd9dc9f58cbacd0615914b53cc2af8a9b0
+SHA1 (patch-src_Makefile) = 6bfbcd0d33975671cbd1d60473a00b55a27eba2a
+SHA1 (patch-src_sysdeps_freebsd.c) = 830c55f97cc374148f2e1fbf57e843bccc33ab00
Index: pkgsrc/sysutils/gkrellm/options.mk
diff -u pkgsrc/sysutils/gkrellm/options.mk:1.2 pkgsrc/sysutils/gkrellm/options.mk:1.3
--- pkgsrc/sysutils/gkrellm/options.mk:1.2 Sat Nov 27 05:37:59 2021
+++ pkgsrc/sysutils/gkrellm/options.mk Sat Aug 30 08:24:18 2025
@@ -1,20 +1,46 @@
-# $NetBSD: options.mk,v 1.2 2021/11/27 05:37:59 pho Exp $
+# $NetBSD: options.mk,v 1.3 2025/08/30 08:24:18 pho Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.gkrellm
+PKG_SUPPORTED_OPTIONS= nls ntlm
PKG_OPTIONS_OPTIONAL_GROUPS= tls
PKG_OPTIONS_GROUP.tls= gnutls openssl
-
+PKG_SUGGESTED_OPTIONS+= nls ntlm openssl
PKG_OPTIONS_LEGACY_OPTS+= ssl:openssl
-PKG_SUGGESTED_OPTIONS= openssl
+
+.include "../../mk/bsd.fast.prefs.mk"
+
+.if ${OPSYS} == "Darwin"
+PKG_SUPPORTED_OPTIONS+= quartz
+.endif
.include "../../mk/bsd.options.mk"
+.if !empty(PKG_OPTIONS:Mnls)
+. include "../../devel/gettext-lib/buildlink3.mk"
+MAKE_FLAGS+= enable_nls=1
+.endif
+
+.if !empty(PKG_OPTIONS:Mntlm)
+. include "../../devel/libntlm/buildlink3.mk"
+.else
+MAKE_FLAGS+= without-ntlm=yes
+.endif
+
.if !empty(PKG_OPTIONS:Mopenssl)
-.include "../../security/openssl/buildlink3.mk"
-GKRELLM_SSL_TYPE= openssl
+. include "../../security/openssl/buildlink3.mk"
+.else
+MAKE_FLAGS+= without-ssl=yes
.endif
.if !empty(PKG_OPTIONS:Mgnutls)
-.include "../../security/gnutls/buildlink3.mk"
-GKRELLM_SSL_TYPE= gnutls
+. include "../../security/gnutls/buildlink3.mk"
+.else
+MAKE_FLAGS+= without-gnutls=yes
+.endif
+
+.if !empty(PKG_OPTIONS:Mquartz)
+# Handled in Makefile.common
+.else
+. include "../../x11/libICE/buildlink3.mk"
+. include "../../x11/libSM/buildlink3.mk"
.endif
Index: pkgsrc/sysutils/gkrellm-server/Makefile
diff -u pkgsrc/sysutils/gkrellm-server/Makefile:1.35 pkgsrc/sysutils/gkrellm-server/Makefile:1.36
--- pkgsrc/sysutils/gkrellm-server/Makefile:1.35 Wed Dec 8 16:06:29 2021
+++ pkgsrc/sysutils/gkrellm-server/Makefile Sat Aug 30 08:24:21 2025
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.35 2021/12/08 16:06:29 adam Exp $
+# $NetBSD: Makefile,v 1.36 2025/08/30 08:24:21 pho Exp $
.include "../../sysutils/gkrellm/Makefile.common"
GKRELLM_PKGBASE= gkrellm-server
-PKGREVISION= 7
COMMENT= Monitoring daemon remotely accessible by a GKrellM client
DEPENDS+= gkrellm-share-${GKRELLM_VERSION}:../../sysutils/gkrellm-share
@@ -13,38 +12,36 @@ RCD_SCRIPTS= gkrellmd
EGDIR= ${PREFIX}/share/examples/gkrellm-server
CONF_FILES= ${EGDIR}/gkrellmd.conf ${PKG_SYSCONFDIR}/gkrellmd.conf
-CFLAGS.SunOS+= -Du_int32_t=uint32_t
+.include "../../mk/bsd.fast.prefs.mk"
-.include "../../mk/bsd.prefs.mk"
-
-.if (${OPSYS} == "FreeBSD" || ${OPSYS} == "OpenBSD" || ${OPSYS} == "NetBSD" || ${OPSYS} == "DragonFly")
-SPECIAL_PERMS+= ${PREFIX:Q}/bin/gkrellmd ${REAL_ROOT_USER} kmem 2555
+.if ${OPSYS} == "FreeBSD" || ${OPSYS} == "OpenBSD" || ${OPSYS} == "DragonFly"
+SPECIAL_PERMS+= ${PREFIX}/bin/gkrellmd ${REAL_ROOT_USER} kmem 2555
.endif
-NOT_FOR_PLATFORM= IRIX-*-*
-
-MAKE_ENV+= MODULES=server
-INSTALL_MAKE_FLAGS+= BINOWNER=${BINOWN:Q} BINGROUP=${BINGRP:Q}
-
-PKG_OPTIONS_VAR= PKG_OPTIONS.gkrellm-server
-PKG_SUPPORTED_OPTIONS= glib1
-
-.include "../../mk/bsd.options.mk"
-
SUBST_CLASSES+= gkprefix
SUBST_STAGE.gkprefix= pre-configure
SUBST_FILES.gkprefix= server/gkrellmd.h
-SUBST_SED.gkprefix= -e '/GKRELLMD_SYS_ETC/{s!/etc!${PKG_SYSCONFDIR}!;}'
+SUBST_SED.gkprefix+= -e '/GKRELLMD_LOCAL_ETC/d'
+SUBST_SED.gkprefix+= -e '/GKRELLMD_SYS_ETC/{s!/etc!${PKG_SYSCONFDIR}!;}'
+
+BUILD_DIRS= server
+BUILD_TARGET= ${GKRELLM_PER_PLATFORM_TARGET}
+.if !empty(PKG_OPTIONS:Mnls)
+BUILD_MAKE_FLAGS+= LOCALEDIR=${PREFIX}/${PKGLOCALEDIR}/locale
+.endif
+INSTALL_MAKE_FLAGS+= CFGDIR=${DESTDIR}${EGDIR}
+INSTALL_MAKE_FLAGS+= SINSTALLDIR=${DESTDIR}${PREFIX}/sbin
+INSTALL_MAKE_FLAGS+= SMANDIR=${DESTDIR}${PREFIX}/${PKGMANDIR}/man8
+INSTALL_TARGET= install_bin install_inc install_man install_cfg
+
+# include/gkrellm2/log.h conflicts with sysutils/gkrellm because the latter
+# also installs exactly the same file. Removing it means that one cannot
+# build a gkrellm plugin with only the server installed, but can we do
+# anything better than this?
post-install:
- ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX:Q}/share/examples/gkrellm-server
- ${INSTALL_DATA} ${WRKSRC:Q}/server/gkrellmd.conf ${DESTDIR}${PREFIX:Q}/share/examples/gkrellm-server
+ ${RM} -f ${DESTDIR}${PREFIX}/include/gkrellm2/log.h
-.if !empty(PKG_OPTIONS:Mglib1)
-MAKE_ENV+= USE_GLIB12=yes
-.include "../../devel/glib/buildlink3.mk"
-.else
.include "../../devel/glib2/buildlink3.mk"
-.endif
.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/sysutils/gkrellm-server/PLIST
diff -u pkgsrc/sysutils/gkrellm-server/PLIST:1.7 pkgsrc/sysutils/gkrellm-server/PLIST:1.8
--- pkgsrc/sysutils/gkrellm-server/PLIST:1.7 Tue Mar 11 14:05:15 2014
+++ pkgsrc/sysutils/gkrellm-server/PLIST Sat Aug 30 08:24:21 2025
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.7 2014/03/11 14:05:15 jperkin Exp $
-bin/gkrellmd
+@comment $NetBSD: PLIST,v 1.8 2025/08/30 08:24:21 pho Exp $
+include/gkrellm2/gkrellmd-version.h
include/gkrellm2/gkrellmd.h
-man/man1/gkrellmd.1
+man/man8/gkrellmd.8
+sbin/gkrellmd
share/examples/gkrellm-server/gkrellmd.conf
Index: pkgsrc/sysutils/gkrellm-share/Makefile
diff -u pkgsrc/sysutils/gkrellm-share/Makefile:1.7 pkgsrc/sysutils/gkrellm-share/Makefile:1.8
--- pkgsrc/sysutils/gkrellm-share/Makefile:1.7 Tue Oct 23 19:51:03 2012
+++ pkgsrc/sysutils/gkrellm-share/Makefile Sat Aug 30 08:24:21 2025
@@ -1,20 +1,25 @@
-# $NetBSD: Makefile,v 1.7 2012/10/23 19:51:03 asau Exp $
+# $NetBSD: Makefile,v 1.8 2025/08/30 08:24:21 pho Exp $
+
.include "../../sysutils/gkrellm/Makefile.common"
-PKGREVISION= #
GKRELLM_PKGBASE= gkrellm-share
COMMENT= GKrellM2 locale files
+BUILD_DIRS= po
+INSTALLATION_DIRS= share/gkrellm2
+
+.if !empty(PKG_OPTIONS:Mnls)
USE_TOOLS+= msgfmt
USE_PKGLOCALEDIR= yes
-
-MAKE_ENV+= MODULES=po
INSTALL_MAKE_FLAGS= LOCALEDIR=${DESTDIR}${PREFIX}/${PKGLOCALEDIR}/locale
-
-INSTALLATION_DIRS= share/gkrellm2 ${PKGLOCALEDIR}/locale
+INSTALLATION_DIRS+= ${PKGLOCALEDIR}/locale
+PLIST.nls= yes
+.endif
+PLIST_VARS+= nls
+PRINT_PLIST_AWK+= /^${PKGLOCALEDIR:S,/,\/,g}\/locale/ { $$0 = "$${PLIST.nls}" $$0 }
post-install:
- ${INSTALL_DATA} ${GKRELLM_SRCDIR}/README ${GKRELLM_SRCDIR}/COPYRIGHT ${DESTDIR}${PREFIX}/share/gkrellm2
+ ${INSTALL_DATA} ${WRKSRC}/README ${WRKSRC}/COPYRIGHT ${DESTDIR}${PREFIX}/share/gkrellm2
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/sysutils/gkrellm-share/PLIST
diff -u pkgsrc/sysutils/gkrellm-share/PLIST:1.5 pkgsrc/sysutils/gkrellm-share/PLIST:1.6
--- pkgsrc/sysutils/gkrellm-share/PLIST:1.5 Sun Jun 14 18:16:05 2009
+++ pkgsrc/sysutils/gkrellm-share/PLIST Sat Aug 30 08:24:21 2025
@@ -1,17 +1,19 @@
-@comment $NetBSD: PLIST,v 1.5 2009/06/14 18:16:05 joerg Exp $
+@comment $NetBSD: PLIST,v 1.6 2025/08/30 08:24:21 pho Exp $
share/gkrellm2/COPYRIGHT
share/gkrellm2/README
-share/locale/bg/LC_MESSAGES/gkrellm.mo
-share/locale/cs/LC_MESSAGES/gkrellm.mo
-share/locale/da/LC_MESSAGES/gkrellm.mo
-share/locale/de/LC_MESSAGES/gkrellm.mo
-share/locale/es/LC_MESSAGES/gkrellm.mo
-share/locale/fr/LC_MESSAGES/gkrellm.mo
-share/locale/it/LC_MESSAGES/gkrellm.mo
-share/locale/ja/LC_MESSAGES/gkrellm.mo
-share/locale/nl/LC_MESSAGES/gkrellm.mo
-share/locale/pl/LC_MESSAGES/gkrellm.mo
-share/locale/pt_BR/LC_MESSAGES/gkrellm.mo
-share/locale/ru/LC_MESSAGES/gkrellm.mo
-share/locale/sl/LC_MESSAGES/gkrellm.mo
-share/locale/sv/LC_MESSAGES/gkrellm.mo
+${PLIST.nls}share/locale/bg/LC_MESSAGES/gkrellm.mo
+${PLIST.nls}share/locale/cs/LC_MESSAGES/gkrellm.mo
+${PLIST.nls}share/locale/da/LC_MESSAGES/gkrellm.mo
+${PLIST.nls}share/locale/de/LC_MESSAGES/gkrellm.mo
+${PLIST.nls}share/locale/es/LC_MESSAGES/gkrellm.mo
+${PLIST.nls}share/locale/fr/LC_MESSAGES/gkrellm.mo
+${PLIST.nls}share/locale/it/LC_MESSAGES/gkrellm.mo
+${PLIST.nls}share/locale/ja/LC_MESSAGES/gkrellm.mo
+${PLIST.nls}share/locale/nl/LC_MESSAGES/gkrellm.mo
+${PLIST.nls}share/locale/pl/LC_MESSAGES/gkrellm.mo
+${PLIST.nls}share/locale/pt/LC_MESSAGES/gkrellm.mo
+${PLIST.nls}share/locale/pt_BR/LC_MESSAGES/gkrellm.mo
+${PLIST.nls}share/locale/ru/LC_MESSAGES/gkrellm.mo
+${PLIST.nls}share/locale/sl/LC_MESSAGES/gkrellm.mo
+${PLIST.nls}share/locale/sv/LC_MESSAGES/gkrellm.mo
+${PLIST.nls}share/locale/uk/LC_MESSAGES/gkrellm.mo
Index: pkgsrc/sysutils/gkrellm/files/gkrellmd.sh
diff -u pkgsrc/sysutils/gkrellm/files/gkrellmd.sh:1.1.1.1 pkgsrc/sysutils/gkrellm/files/gkrellmd.sh:1.2
--- pkgsrc/sysutils/gkrellm/files/gkrellmd.sh:1.1.1.1 Tue Feb 24 22:11:28 2004
+++ pkgsrc/sysutils/gkrellm/files/gkrellmd.sh Sat Aug 30 08:24:18 2025
@@ -1,6 +1,6 @@
#!@RCD_SCRIPTS_SHELL@
#
-# $NetBSD: gkrellmd.sh,v 1.1.1.1 2004/02/24 22:11:28 cube Exp $
+# $NetBSD: gkrellmd.sh,v 1.2 2025/08/30 08:24:18 pho Exp $
#
# PROVIDE: gkrellmd
@@ -10,7 +10,7 @@
name="gkrellmd"
rcvar=$name
-command="@PREFIX@/bin/gkrellmd"
+command="@PREFIX@/sbin/gkrellmd"
gkrellmd_flags="-d"
load_rc_config $name
Index: pkgsrc/sysutils/gkrellm/patches/patch-src_Makefile
diff -u pkgsrc/sysutils/gkrellm/patches/patch-src_Makefile:1.2 pkgsrc/sysutils/gkrellm/patches/patch-src_Makefile:1.3
--- pkgsrc/sysutils/gkrellm/patches/patch-src_Makefile:1.2 Sat Nov 27 04:43:02 2021
+++ pkgsrc/sysutils/gkrellm/patches/patch-src_Makefile Sat Aug 30 08:24:21 2025
@@ -1,15 +1,46 @@
-$NetBSD: patch-src_Makefile,v 1.2 2021/11/27 04:43:02 pho Exp $
+$NetBSD: patch-src_Makefile,v 1.3 2025/08/30 08:24:21 pho Exp $
-Honor LDFLAGS set by pkgsrc while linking gkrellm.
+Hunk #1:
+ Support building on DragonFly.
---- src/Makefile.orig 2018-12-29 15:47:29.689517593 +0000
+Hunk #0, #2:
+ Add an explicit -lm for Solaris. Also avoid passing -Wl,-E to the Solaris
+ linker because it doesn't support the flag.
+
+--- src/Makefile.orig 2025-01-19 16:02:37.000000000 +0000
+++ src/Makefile
-@@ -100,7 +100,7 @@ all: build
- build: gkrellm
+@@ -82,6 +82,7 @@ ifneq ($(PACKAGE),gkrellm)
+ FLAGS += -DPACKAGE=\"$(PACKAGE)\"
+ endif
+
++OS_RELEASE=$(shell uname -r)
+
+ OBJS = main.o alerts.o battery.o base64.o clock.o cpu.o disk.o fs.o \
+ hostname.o inet.o mail.o mem.o net.o proc.o sensors.o uptime.o \
+@@ -100,6 +101,9 @@ static: $(OBJS) $(UNIXOBJS) $(EXTRAOBJS)
+ $(CC) $(OBJS) $(UNIXOBJS) $(EXTRAOBJS) -o gkrellm.static -static \
+ $(LDFLAGS) $(LIBS) $(LINK_FLAGS)
+
++dragonfly:
++ $(MAKE) EXTRAOBJS= SYS_LIBS="-lkvm -lkinfo -ldevstat -lm" gkrellm
++
+ freebsd2:
+ ifeq ($(HAVE_SSL),1)
+ $(MAKE) EXTRAOBJS= SYS_LIBS="-lkvm" gkrellm
+@@ -161,8 +165,15 @@ openbsd:
+ $(MAKE) GTOP_LIBS= SYS_LIBS="-lkvm -pthread" gkrellm
- gkrellm static: $(OBJS)
-- $(CC) $(OBJS) -o gkrellm$(if $(findstring static,$@),.static -static) $(LIBS) $(LINK_FLAGS)
-+ $(CC) $(OBJS) -o gkrellm$(if $(findstring static,$@),.static -static) $(LDFLAGS) $(LIBS) $(LINK_FLAGS)
+ solaris:
++ifeq ($(OS_RELEASE),5.8)
++ $(MAKE) CFLAGS="-Wno-implicit-int -DSOLARIS_8" \
++ SYS_LIBS="-lm -lkstat -lkvm -ldevinfo -lsocket -lnsl -lintl -lresolv" \
++ LINK_FLAGS="" gkrellm
++else
+ $(MAKE) CFLAGS="-Wno-implicit-int" \
+- SYS_LIBS="-lkstat -lkvm -ldevinfo" gkrellm
++ SYS_LIBS="-lm -lkstat -lkvm -ldevinfo -lsocket -lnsl -lresolv" \
++ LINK_FLAGS="" gkrellm
++endif
- install: gkrellm
- $(INSTALL_DIR) $(INSTALLDIR)
+ windows: libgkrellm.a
+ $(MAKE) \
Added files:
Index: pkgsrc/sysutils/gkrellm/patches/patch-gkrellmd.1
diff -u /dev/null pkgsrc/sysutils/gkrellm/patches/patch-gkrellmd.1:1.1
--- /dev/null Sat Aug 30 08:24:21 2025
+++ pkgsrc/sysutils/gkrellm/patches/patch-gkrellmd.1 Sat Aug 30 08:24:21 2025
@@ -0,0 +1,13 @@
+$NetBSD: patch-gkrellmd.1,v 1.1 2025/08/30 08:24:21 pho Exp $
+
+Move gkrellmd(1) to section 8 because it's not supposed to be directly
+executed by users.
+
+--- gkrellmd.1.orig 2025-08-25 14:03:28.877318062 +0000
++++ gkrellmd.1
+@@ -1,4 +1,4 @@
+-.TH gkrellmd 1 "Jan 07, 2025" "" "User's Manual"
++.TH gkrellmd 8 "Jan 07, 2025" "" "User's Manual"
+
+ .SH "NAME"
+ gkrellmd \- The GNU Krell Monitors Server
Index: pkgsrc/sysutils/gkrellm/patches/patch-server_Makefile
diff -u /dev/null pkgsrc/sysutils/gkrellm/patches/patch-server_Makefile:1.1
--- /dev/null Sat Aug 30 08:24:21 2025
+++ pkgsrc/sysutils/gkrellm/patches/patch-server_Makefile Sat Aug 30 08:24:21 2025
@@ -0,0 +1,54 @@
+$NetBSD: patch-server_Makefile,v 1.1 2025/08/30 08:24:21 pho Exp $
+
+Hunk #0:
+ Support building on DragonFly.
+
+Hunk #1:
+ Add an explicit -lm for Solaris. Not sure why it's needed but we've been
+ doing this.
+
+Hunk #2:
+ Move gkrellmd(1) to section 8 because it's not supposed to be directly
+ executed by users.
+
+--- server/Makefile.orig 2025-01-19 16:02:37.000000000 +0000
++++ server/Makefile
+@@ -88,6 +88,9 @@ static: $(OBJS) $(EXTRAOBJS)
+ $(CC) $(OBJS) $(EXTRAOBJS) -o gkrellmd.static -static \
+ $(LDFLAGS) $(LIBS) $(LINK_FLAGS)
+
++dragonfly:
++ $(MAKE) EXTRAOBJS= SYS_LIBS="-lkvm -lkinfo -ldevstat -lm" gkrellmd
++
+ freebsd2:
+ $(MAKE) EXTRAOBJS= SYS_LIBS="-lkvm -lmd" gkrellmd
+
+@@ -124,12 +127,12 @@ openbsd:
+
+ solaris:
+ ifeq ($(OS_RELEASE),5.8)
+- $(MAKE) CFLAGS="-Wno-implicit-int" \
+- SYS_LIBS="-lkstat -lkvm -ldevinfo -lsocket -lnsl -lintl" \
++ $(MAKE) CFLAGS="-Wno-implicit-int -DSOLARIS_8" \
++ SYS_LIBS="-lm -lkstat -lkvm -ldevinfo -lsocket -lnsl -lintl" \
+ LINK_FLAGS="" gkrellmd
+ else
+ $(MAKE) CFLAGS="-Wno-implicit-int" \
+- SYS_LIBS="-lkstat -lkvm -ldevinfo -lsocket -lnsl" \
++ SYS_LIBS="-lm -lkstat -lkvm -ldevinfo -lsocket -lnsl" \
+ LINK_FLAGS="" gkrellmd
+ endif
+
+@@ -174,10 +177,10 @@ uninstall_inc:
+
+ install_man:
+ $(INSTALL) -d -m $(MANDIRMODE) $(SMANDIR)
+- $(INSTALL) -c -m $(MANMODE) ../gkrellmd.1 $(SMANDIR)/$(PACKAGE_D).1
++ $(INSTALL) -c -m $(MANMODE) ../gkrellmd.1 $(SMANDIR)/$(PACKAGE_D).8
+
+ uninstall_man:
+- $(RM) $(SMANDIR)/$(PACKAGE_D).1
++ $(RM) $(SMANDIR)/$(PACKAGE_D).8
+
+ install_cfg:
+ $(INSTALL) -d -m $(CFGDIRMODE) $(CFGDIR)
Index: pkgsrc/sysutils/gkrellm/patches/patch-src_sysdeps_freebsd.c
diff -u /dev/null pkgsrc/sysutils/gkrellm/patches/patch-src_sysdeps_freebsd.c:1.1
--- /dev/null Sat Aug 30 08:24:21 2025
+++ pkgsrc/sysutils/gkrellm/patches/patch-src_sysdeps_freebsd.c Sat Aug 30 08:24:21 2025
@@ -0,0 +1,43 @@
+$NetBSD: patch-src_sysdeps_freebsd.c,v 1.1 2025/08/30 08:24:21 pho Exp $
+
+Apply FreeBSD patch for newer kernel versions:
+https://git.srcbox.net/gkrellm/gkrellm/commit/6526b753b2ece3331add6c9dd6af09e7899c67bc
+
+--- src/sysdeps/freebsd.c.orig 2025-01-19 16:02:37.000000000 +0000
++++ src/sysdeps/freebsd.c
+@@ -701,9 +701,15 @@ gkrellm_sys_inet_read_tcp_data(void)
+ xig->xig_len > sizeof(struct xinpgen);
+ xig = (struct xinpgen *)((char *)xig + xig->xig_len))
+ {
++#if __FreeBSD_version >= 1200026
++ struct xtcpcb *tp = (struct xtcpcb *)xig;
++ struct xinpcb *inp = &tp->xt_inp;
++ struct xsocket *so = &inp->xi_socket;
++#else
+ struct tcpcb *tp = &((struct xtcpcb *)xig)->xt_tp;
+ struct inpcb *inp = &((struct xtcpcb *)xig)->xt_inp;
+ struct xsocket *so = &((struct xtcpcb *)xig)->xt_socket;
++#endif
+
+ /* Ignore sockets for protocols other than tcp. */
+ if (so->xso_protocol != IPPROTO_TCP)
+@@ -1441,7 +1447,9 @@ get_data(int iodev, u_char command, int interface, u_c
+ struct smbcmd cmd;
+
+ bzero(&cmd, sizeof(cmd));
++#if __FreeBSD_version < 1100070
+ cmd.data.byte_ptr = (char *)&byte;
++#endif
+ cmd.slave = 0x5a;
+ cmd.cmd = command;
+ if (ioctl(iodev, SMB_READB, (caddr_t)&cmd) == -1)
+@@ -1449,6 +1457,9 @@ get_data(int iodev, u_char command, int interface, u_c
+ close(iodev);
+ return FALSE;
+ }
++#if __FreeBSD_version >= 1100070
++ byte = (u_char)cmd.rdata.byte;
++#endif
+ }
+ #endif
+ else
Home |
Main Index |
Thread Index |
Old Index