CVS commit: pkgsrc/x11/xload

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Mon Jul 20 07:10:36 UTC 2026

Modified Files:
        pkgsrc/x11/xload: Makefile distinfo
Added Files:
        pkgsrc/x11/xload/patches: patch-meson.build

Log Message:
xload: update to 1.2.1.

Alan Coopersmith (8):
      Improve man page formatting
      man page: fix warnings from `mandoc -T lint`
      gitlab CI: drop the ci-fairy check-mr job
      Strip trailing whitespace from source files
      meson: Add option to build with meson
      meson: include libintl.h when checking for gettext()
      meson: include headers when checking for other functions
      xload 1.2.1


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 pkgsrc/x11/xload/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/x11/xload/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/x11/xload/patches/patch-meson.build

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/x11/xload/Makefile
diff -u pkgsrc/x11/xload/Makefile:1.19 pkgsrc/x11/xload/Makefile:1.20
--- pkgsrc/x11/xload/Makefile:1.19      Wed Apr  3 21:19:42 2024
+++ pkgsrc/x11/xload/Makefile   Mon Jul 20 07:10:35 2026
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.19 2024/04/03 21:19:42 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2026/07/20 07:10:35 wiz Exp $
 
-DISTNAME=      xload-1.2.0
+DISTNAME=      xload-1.2.1
 CATEGORIES=    x11
 MASTER_SITES=  ${MASTER_SITE_XORG:=app/}
 EXTRACT_SUFX=  .tar.xz
@@ -9,15 +9,11 @@ MAINTAINER=   pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://xorg.freedesktop.org/
 COMMENT=       System load average display for X
 
-BROKEN_GETTEXT_DETECTION=      yes
-
-GNU_CONFIGURE= yes
 USE_TOOLS+=    pkg-config xgettext
 
-CONFIGURE_ENV+=                APP_MAN_SUFFIX=1
-
-MAKE_FLAGS+=           appdefaultdir=${PREFIX}/lib/X11/app-defaults
+MESON_ARGS+=   -Dappdefaultdir=${PREFIX}/lib/X11/app-defaults
 
+.include "../../devel/meson/build.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../x11/libXaw/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/x11/xload/distinfo
diff -u pkgsrc/x11/xload/distinfo:1.10 pkgsrc/x11/xload/distinfo:1.11
--- pkgsrc/x11/xload/distinfo:1.10      Wed Apr  3 21:19:42 2024
+++ pkgsrc/x11/xload/distinfo   Mon Jul 20 07:10:35 2026
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.10 2024/04/03 21:19:42 wiz Exp $
+$NetBSD: distinfo,v 1.11 2026/07/20 07:10:35 wiz Exp $
 
-BLAKE2s (xload-1.2.0.tar.xz) = 9ef741a4351ede2992dc12410d1d23143df422d7ac3537557803917bf3e52f6e
-SHA512 (xload-1.2.0.tar.xz) = b6143f796f7d24bb204e29f341f59c27a0eba00ae58e42bde0d1471e3e9357a0ce5e9e23de119d2540c9f5c71d28eb1e85dd766b6b28a7f066805b5f386aa716
-Size (xload-1.2.0.tar.xz) = 134996 bytes
+BLAKE2s (xload-1.2.1.tar.xz) = 1b60fec0dc8d3efa2e7dee89f5a5bf2227aacb6c608cbde326496f8aff33d8dd
+SHA512 (xload-1.2.1.tar.xz) = 55bdf254d7521a54a9dc771a7e8d3d2750a64d8ec8274c3d2394cbe40358b03525a39d1e10c637bd9e66ee7f956d9aa55ae6c416a2611a35718e01f3b491fde1
+Size (xload-1.2.1.tar.xz) = 141716 bytes
+SHA1 (patch-meson.build) = 0e6b24e2f439b225478b86a0bd3e2f357680019e

Added files:

Index: pkgsrc/x11/xload/patches/patch-meson.build
diff -u /dev/null pkgsrc/x11/xload/patches/patch-meson.build:1.1
--- /dev/null   Mon Jul 20 07:10:36 2026
+++ pkgsrc/x11/xload/patches/patch-meson.build  Mon Jul 20 07:10:35 2026
@@ -0,0 +1,36 @@
+$NetBSD: patch-meson.build,v 1.1 2026/07/20 07:10:35 wiz Exp $
+
+deps needs to be initialized before it can be modified.
+
+--- meson.build.orig   2026-07-20 07:08:14.949369171 +0000
++++ meson.build
+@@ -47,6 +47,14 @@ cc = meson.get_compiler('c')
+ 
+ cc = meson.get_compiler('c')
+ 
++# Checks for pkg-config packages
++dep_libxaw = dependency('xaw7', required: true)
++dep_libxmu = dependency('xmu', required: true)
++dep_libxt  = dependency('xt', required: true)
++dep_libx11 = dependency('x11', required: true)
++dep_xproto = dependency('xproto', required: true, version: '>= 7.0.17')
++deps = [dep_libxaw, dep_libxmu, dep_libxt, dep_libx11, dep_xproto]
++
+ # Replacement for XORG_DEFAULT_OPTIONS
+ if cc.has_argument('-fno-strict-aliasing')
+   add_project_arguments('-fno-strict-aliasing', language: 'c')
+@@ -105,14 +113,6 @@ endforeach
+     description: f'Define to 1 if you have the <@h@> header file.',
+   )
+ endforeach
+-
+-# Checks for pkg-config packages
+-dep_libxaw = dependency('xaw7', required: true)
+-dep_libxmu = dependency('xmu', required: true)
+-dep_libxt  = dependency('xt', required: true)
+-dep_libx11 = dependency('x11', required: true)
+-dep_xproto = dependency('xproto', required: true, version: '>= 7.0.17')
+-deps = [dep_libxaw, dep_libxmu, dep_libxt, dep_libx11, dep_xproto]
+ 
+ config_h = configure_file(output: 'config.h', configuration: conf)
+ add_project_arguments('-DHAVE_CONFIG_H', language: ['c'])