summaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
Diffstat (limited to 'x11')
-rw-r--r--x11/cl-clx-sbcl/Makefile2
-rw-r--r--x11/foot/Makefile2
-rw-r--r--x11/foot/distinfo6
-rw-r--r--x11/hyprlock/Makefile12
-rw-r--r--x11/hyprlock/distinfo6
-rw-r--r--x11/hyprlock/files/patch-CMakeLists.txt30
-rw-r--r--x11/hyprlock/pkg-descr13
-rw-r--r--x11/libinput/Makefile2
-rw-r--r--x11/libinput/distinfo6
-rw-r--r--x11/linux-nvidia-libs-devel/Makefile2
-rw-r--r--x11/linux-nvidia-libs-devel/distinfo6
-rw-r--r--x11/linux-nvidia-libs/distinfo6
-rw-r--r--x11/nvidia-driver-devel/Makefile2
-rw-r--r--x11/nvidia-driver-devel/distinfo6
-rw-r--r--x11/nvidia-driver/Makefile.version2
-rw-r--r--x11/nvidia-driver/distinfo6
-rw-r--r--x11/nwg-bar/Makefile4
-rw-r--r--x11/nwg-dock-hyprland/Makefile36
-rw-r--r--x11/nwg-dock-hyprland/distinfo24
-rw-r--r--x11/nwg-dock-hyprland/files/patch-go.mod14
-rw-r--r--x11/nwg-dock-hyprland/pkg-plist10
-rw-r--r--x11/nwg-dock/Makefile4
-rw-r--r--x11/nwg-drawer/Makefile37
-rw-r--r--x11/nwg-drawer/distinfo34
-rw-r--r--x11/nwg-drawer/files/patch-go.mod14
-rw-r--r--x11/nwg-drawer/pkg-descr12
-rw-r--r--x11/nwg-launchers/Makefile4
-rw-r--r--x11/nwg-look/Makefile30
-rw-r--r--x11/nwg-look/distinfo14
-rw-r--r--x11/nwg-look/files/patch-go.mod14
-rw-r--r--x11/nwg-look/pkg-descr2
-rw-r--r--x11/nwg-look/pkg-plist11
-rw-r--r--x11/nwg-menu/Makefile22
-rw-r--r--x11/nwg-menu/distinfo26
-rw-r--r--x11/nwg-menu/files/patch-go.mod14
-rw-r--r--x11/nwg-menu/files/patch-main.go4
-rw-r--r--x11/plasma6-layer-shell-qt/Makefile1
-rw-r--r--x11/plasma6-layer-shell-qt/files/patch-src_qwaylandlayersurface.cpp17
-rw-r--r--x11/rubygem-gnome/Makefile2
-rw-r--r--x11/wallutils/Makefile56
-rw-r--r--x11/wallutils/distinfo54
-rw-r--r--x11/wallutils/pkg-message7
-rw-r--r--x11/wdisplays/Makefile3
-rw-r--r--x11/wdisplays/distinfo6
-rw-r--r--x11/workrave/Makefile6
-rw-r--r--x11/xcb-proto/Makefile5
-rw-r--r--x11/xcb-proto/distinfo6
-rw-r--r--x11/xcb-proto/pkg-plist2
-rw-r--r--x11/xnee/Makefile1
-rw-r--r--x11/xorgproto/Makefile4
-rw-r--r--x11/xorgproto/distinfo6
-rw-r--r--x11/xorgproto/pkg-plist58
52 files changed, 301 insertions, 372 deletions
diff --git a/x11/cl-clx-sbcl/Makefile b/x11/cl-clx-sbcl/Makefile
index 16dda28992ca..12f951615347 100644
--- a/x11/cl-clx-sbcl/Makefile
+++ b/x11/cl-clx-sbcl/Makefile
@@ -1,6 +1,6 @@
PORTNAME= clx
DISTVERSION= 0.7.6
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= x11 lisp
PKGNAMEPREFIX= cl-
PKGNAMESUFFIX= -sbcl
diff --git a/x11/foot/Makefile b/x11/foot/Makefile
index c3e1b3a4950b..9bd367151346 100644
--- a/x11/foot/Makefile
+++ b/x11/foot/Makefile
@@ -1,5 +1,5 @@
PORTNAME= foot
-DISTVERSION= 1.23.0
+DISTVERSION= 1.23.1
CATEGORIES= x11 wayland
MASTER_SITES= https://codeberg.org/dnkl/${PORTNAME}/archive/${DISTVERSIONFULL}${EXTRACT_SUFX}?dummy=/
diff --git a/x11/foot/distinfo b/x11/foot/distinfo
index fe520cfcf419..87fa1fdd5958 100644
--- a/x11/foot/distinfo
+++ b/x11/foot/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1752646534
-SHA256 (foot-1.23.0.tar.gz) = 74c874feb5ae0277a9f19fbd6418a40524cd71d629784276d109ebfe4e786421
-SIZE (foot-1.23.0.tar.gz) = 613734
+TIMESTAMP = 1753252093
+SHA256 (foot-1.23.1.tar.gz) = 02072b8f0aaf26907b6b02293c875539ce52fc59079344e7cf811ab03394cfa3
+SIZE (foot-1.23.1.tar.gz) = 614201
diff --git a/x11/hyprlock/Makefile b/x11/hyprlock/Makefile
index a51a14b9d8a3..e4689892ce30 100644
--- a/x11/hyprlock/Makefile
+++ b/x11/hyprlock/Makefile
@@ -1,7 +1,6 @@
PORTNAME= hyprlock
DISTVERSIONPREFIX= v
-DISTVERSION= 0.8.2
-PORTREVISION= 2
+DISTVERSION= 0.9.1
CATEGORIES= x11 wayland
MAINTAINER= tagattie@FreeBSD.org
@@ -11,7 +10,8 @@ WWW= https://github.com/hyprwm/hyprlock
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= hyprwayland-scanner>=0.4.4:devel/hyprwayland-scanner \
+BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto \
+ hyprwayland-scanner>=0.4.4:devel/hyprwayland-scanner \
wayland-protocols>=1.35:graphics/wayland-protocols
LIB_DEPENDS= libhyprlang.so:devel/hyprlang \
libhyprutils.so:devel/hyprutils \
@@ -24,11 +24,15 @@ LIB_DEPENDS= libhyprlang.so:devel/hyprlang \
RUN_DEPENDS= unix-selfauth-helper>0:security/unix-selfauth-helper
USES= cmake compiler:c++11-lib gl gnome jpeg pkgconfig
+
USE_GITHUB= yes
+GH_ACCOUNT= hyprwm
+
USE_GL= egl gbm
USE_GNOME= cairo pango
-GH_ACCOUNT= hyprwm
+
LDFLAGS+= -Wl,--as-needed # pango deps
+
PLIST_FILES= bin/${PORTNAME} \
etc/pam.d/${PORTNAME} \
share/hypr/${PORTNAME}.conf
diff --git a/x11/hyprlock/distinfo b/x11/hyprlock/distinfo
index 60f86a454072..4823ecb9437d 100644
--- a/x11/hyprlock/distinfo
+++ b/x11/hyprlock/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1746281087
-SHA256 (hyprwm-hyprlock-v0.8.2_GH0.tar.gz) = 14c47e71bdac9213909b11cdda16377dab12e27179d939df5ef2a0083a21e1e8
-SIZE (hyprwm-hyprlock-v0.8.2_GH0.tar.gz) = 80394
+TIMESTAMP = 1754034433
+SHA256 (hyprwm-hyprlock-v0.9.1_GH0.tar.gz) = 03f26ceba049546767a903a5e5bcd78fa4d261a5d116febd45633b88b9f16a97
+SIZE (hyprwm-hyprlock-v0.9.1_GH0.tar.gz) = 83699
diff --git a/x11/hyprlock/files/patch-CMakeLists.txt b/x11/hyprlock/files/patch-CMakeLists.txt
new file mode 100644
index 000000000000..7ec6a3c2d392
--- /dev/null
+++ b/x11/hyprlock/files/patch-CMakeLists.txt
@@ -0,0 +1,30 @@
+--- CMakeLists.txt.orig 2025-07-17 09:05:58 UTC
++++ CMakeLists.txt
+@@ -86,14 +86,25 @@ pkg_check_modules(
+ pangocairo
+ libdrm
+ gbm
+- pam
+ hyprutils>=0.8.0
+ sdbus-c++>=2.0.0
+ hyprgraphics)
++find_library(PAM_FOUND pam)
++if(PAM_FOUND)
++ message(STATUS "Found pam")
++ set(PAM_LIB ${PAM_FOUND})
++else()
++ pkg_check_modules(PAM IMPORTED_TARGET pam)
++ if(PAM_FOUND)
++ set(PAM_LIB PkgConfig::PAM)
++ else()
++ message(FATAL_ERROR "The required library libpam was not found.")
++ endif()
++endif()
+
+ file(GLOB_RECURSE SRCFILES CONFIGURE_DEPENDS "src/*.cpp")
+ add_executable(hyprlock ${SRCFILES})
+-target_link_libraries(hyprlock PRIVATE pam rt Threads::Threads PkgConfig::deps
++target_link_libraries(hyprlock PRIVATE ${PAM_LIB} rt Threads::Threads PkgConfig::deps
+ OpenGL::EGL OpenGL::GLES3)
+
+ # protocols
diff --git a/x11/hyprlock/pkg-descr b/x11/hyprlock/pkg-descr
index c84e12082d3d..c63a363a9f01 100644
--- a/x11/hyprlock/pkg-descr
+++ b/x11/hyprlock/pkg-descr
@@ -2,7 +2,12 @@ Hyprland's simple, yet multi-threaded and GPU-accelerated screen
locking utility.
Features:
- - uses the secure ext-session-lock protocol
- - full support for fractional-scale
- - fully GPU accelerated
- - multi-threaded resource acquisition for no hitches
+- Uses the ext-session-lock protocol
+- Support for fractional-scale
+- Fully GPU accelerated
+- Multi-threaded resource acquisition
+- Blurred screenshot as the background
+- Native fingerprint support (using libfprint's dbus interface)
+- Some of Hyprland's eyecandy: gradient borders, blur, animations,
+ shadows, etc.
+and more...
diff --git a/x11/libinput/Makefile b/x11/libinput/Makefile
index 700b49c20cd9..9b512e7f25d3 100644
--- a/x11/libinput/Makefile
+++ b/x11/libinput/Makefile
@@ -1,5 +1,5 @@
PORTNAME= libinput
-DISTVERSION= 1.27.1
+DISTVERSION= 1.28.1
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/libinput/distinfo b/x11/libinput/distinfo
index 1b3b17c893e7..90849d84dd0b 100644
--- a/x11/libinput/distinfo
+++ b/x11/libinput/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1740915316
-SHA256 (libinput-1.27.1.tar.bz2) = 641df745984baff8f6f822066b4e32f28482d267e95448158732eb2f65ea7fe9
-SIZE (libinput-1.27.1.tar.bz2) = 844741
+TIMESTAMP = 1753347960
+SHA256 (libinput-1.28.1.tar.bz2) = 19e5337ec10fdf920c8d1f4ece63cd7d1c12279ee26e347e30e98e2942d9e1aa
+SIZE (libinput-1.28.1.tar.bz2) = 864820
diff --git a/x11/linux-nvidia-libs-devel/Makefile b/x11/linux-nvidia-libs-devel/Makefile
index 89d730f3a4c8..75a71009c848 100644
--- a/x11/linux-nvidia-libs-devel/Makefile
+++ b/x11/linux-nvidia-libs-devel/Makefile
@@ -1,4 +1,4 @@
-DISTVERSION= 575.64.03
+DISTVERSION= 575.64.05
# Explicitly set PORTREVISION as it can be overridden by the master port
PORTREVISION= 0
diff --git a/x11/linux-nvidia-libs-devel/distinfo b/x11/linux-nvidia-libs-devel/distinfo
index fd5f4aac32a3..a70e71db8736 100644
--- a/x11/linux-nvidia-libs-devel/distinfo
+++ b/x11/linux-nvidia-libs-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1751449830
-SHA256 (NVIDIA-Linux-x86_64-575.64.03.run) = 4bb7aa86004b2ed299c7d430a0622c5c90327ce3aca4f6e9a531d4c41d3a0ca0
-SIZE (NVIDIA-Linux-x86_64-575.64.03.run) = 387655074
+TIMESTAMP = 1753240442
+SHA256 (NVIDIA-Linux-x86_64-575.64.05.run) = 85f2b50f912261c1917a0b2cf7e1f9743affd008fdc0f209f4d5563f774d502d
+SIZE (NVIDIA-Linux-x86_64-575.64.05.run) = 386961985
diff --git a/x11/linux-nvidia-libs/distinfo b/x11/linux-nvidia-libs/distinfo
index fc1c447d52d7..ca1a6562fea8 100644
--- a/x11/linux-nvidia-libs/distinfo
+++ b/x11/linux-nvidia-libs/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1750204287
-SHA256 (NVIDIA-Linux-x86_64-570.169.run) = 5f32a847795cc5c3f980f79189abac070d91481d7bd3601c02c2829dd3873765
-SIZE (NVIDIA-Linux-x86_64-570.169.run) = 375816796
+TIMESTAMP = 1752809652
+SHA256 (NVIDIA-Linux-x86_64-570.172.08.run) = 0256867e082caf93d7b25fa7c8e69b316062a9c6c72c6e228fad7b238c6fa17d
+SIZE (NVIDIA-Linux-x86_64-570.172.08.run) = 375905456
diff --git a/x11/nvidia-driver-devel/Makefile b/x11/nvidia-driver-devel/Makefile
index 82483c12030b..8eed6eabe018 100644
--- a/x11/nvidia-driver-devel/Makefile
+++ b/x11/nvidia-driver-devel/Makefile
@@ -1,4 +1,4 @@
-DISTVERSION= 575.64.03
+DISTVERSION= 575.64.05
# Explicitly set PORTREVISION as it can be overridden by the master port
PORTREVISION= 0
diff --git a/x11/nvidia-driver-devel/distinfo b/x11/nvidia-driver-devel/distinfo
index 8f130be3a8e0..143acac9011c 100644
--- a/x11/nvidia-driver-devel/distinfo
+++ b/x11/nvidia-driver-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1751449665
-SHA256 (NVIDIA-FreeBSD-x86_64-575.64.03.tar.xz) = 1fa676e43bb2da5f4458ad8feb969d7dac3438adb2f3294ca15b2c3e95522363
-SIZE (NVIDIA-FreeBSD-x86_64-575.64.03.tar.xz) = 287548092
+TIMESTAMP = 1753239149
+SHA256 (NVIDIA-FreeBSD-x86_64-575.64.05.tar.xz) = 8831b28b41b821fac90db30a9cfe13481a9d8bd46d0ffeb544fd8c4fbbab538f
+SIZE (NVIDIA-FreeBSD-x86_64-575.64.05.tar.xz) = 287953228
diff --git a/x11/nvidia-driver/Makefile.version b/x11/nvidia-driver/Makefile.version
index bcc6945ffc97..c4fdb5ffcd5a 100644
--- a/x11/nvidia-driver/Makefile.version
+++ b/x11/nvidia-driver/Makefile.version
@@ -1,4 +1,4 @@
# NVIDIA Distversion
#
# This will be included from x11/nvidia-driver and the nvidia-drm port
-NVIDIA_DISTVERSION?= 570.169
+NVIDIA_DISTVERSION?= 570.172.08
diff --git a/x11/nvidia-driver/distinfo b/x11/nvidia-driver/distinfo
index 1763322181a0..22a4573388da 100644
--- a/x11/nvidia-driver/distinfo
+++ b/x11/nvidia-driver/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1750203781
-SHA256 (NVIDIA-FreeBSD-x86_64-570.169.tar.xz) = 1d132020452851b3122dd38ae96eb578a510755c73c417db788611ede51e76ce
-SIZE (NVIDIA-FreeBSD-x86_64-570.169.tar.xz) = 261338796
+TIMESTAMP = 1752763563
+SHA256 (NVIDIA-FreeBSD-x86_64-570.172.08.tar.xz) = 004fd4084d96854580582d6664df7d36df6e03230001c06a9fa0234c1a3ba1e6
+SIZE (NVIDIA-FreeBSD-x86_64-570.172.08.tar.xz) = 260741248
diff --git a/x11/nwg-bar/Makefile b/x11/nwg-bar/Makefile
index a977beccdcba..dc3aa7eadb0c 100644
--- a/x11/nwg-bar/Makefile
+++ b/x11/nwg-bar/Makefile
@@ -1,10 +1,10 @@
PORTNAME= nwg-bar
DISTVERSIONPREFIX= v
DISTVERSION= 0.1.6
-PORTREVISION= 12
+PORTREVISION= 13
CATEGORIES= x11 wayland
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER= tagattie@FreeBSD.org
COMMENT= GTK3-based button bar for sway and other wlroots-based compositors
WWW= https://github.com/nwg-piotr/nwg-bar
diff --git a/x11/nwg-dock-hyprland/Makefile b/x11/nwg-dock-hyprland/Makefile
index de71a642ad9b..4af41fd66400 100644
--- a/x11/nwg-dock-hyprland/Makefile
+++ b/x11/nwg-dock-hyprland/Makefile
@@ -1,45 +1,33 @@
PORTNAME= nwg-dock-hyprland
DISTVERSIONPREFIX= v
-DISTVERSION= 0.4.3
-PORTREVISION= 5
-CATEGORIES= x11
+DISTVERSION= 0.4.8
+CATEGORIES= x11 wayland
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER= tagattie@FreeBSD.org
COMMENT= GTK3-based dock for Hyprland
WWW= https://github.com/nwg-piotr/nwg-dock-hyprland
-LICENSE= AGPLv3 MIT
-LICENSE_COMB= multi
-LICENSE_FILE_AGPLv3= ${WRKSRC_diamondburned_gotk4_pkg}/LICENSE.md
-LICENSE_FILE_MIT= ${WRKSRC}/LICENSE
+LICENSE= MIT
+LICENSE_FILE= ${WRKSRC}/LICENSE
LIB_DEPENDS= libgtk-layer-shell.so:x11-toolkits/gtk-layer-shell
USES= gnome go:modules pkgconfig
-USE_GITHUB= yes
+
USE_GNOME= cairo gdkpixbuf gtk30
-GH_ACCOUNT= nwg-piotr
-GH_TUPLE= KarpelesLab:weak:v0.1.1:karpeleslab_weak/vendor/github.com/KarpelesLab/weak \
- allan-simon:go-singleinstance:d0997106ab37:allan_simon_go_singleinstance/vendor/github.com/allan-simon/go-singleinstance \
- diamondburned:gotk4-layer-shell:6efa9f6dc438:diamondburned_gotk4_layer_shell_pkg/vendor/github.com/diamondburned/gotk4-layer-shell \
- diamondburned:gotk4:v0.3.1:diamondburned_gotk4_pkg/vendor/github.com/diamondburned/gotk4 \
- go4org:unsafe-assume-no-moving-gc:b99613f794b6:go4org_unsafe_assume_no_moving_gc/vendor/go4.org/unsafe/assume-no-moving-gc \
- golang:sync:v0.10.0:golang_sync/vendor/golang.org/x/sync \
- golang:sys:v0.29.0:golang_sys/vendor/golang.org/x/sys \
- sirupsen:logrus:v1.9.3:sirupsen_logrus/vendor/github.com/sirupsen/logrus
+
+GO_MODULE= github.com/nwg-piotr/nwg-dock-hyprland
CGO_LDFLAGS+= -Wl,--as-needed # harfbuzz, freetype2
-PLIST_FILES= bin/${PORTNAME}
-PORTDATA= images *.css
post-patch:
# Respect PREFIX for *.desktop
- @${REINPLACE_CMD} 's,/usr/share,${DATADIR:H},' \
+ @${REINPLACE_CMD} -e 's|/usr/share|${DATADIR:H}|' \
${WRKSRC}/tools.go
post-install:
# Based on install from WRKSRC/Makefile
- @${CP} -p ${WRKSRC}/config/*.css ${WRKSRC}
- (cd ${WRKSRC} && ${COPYTREE_SHARE} "${PORTDATA}" \
- ${STAGEDIR}${DATADIR})
+ @${MKDIR} ${STAGEDIR}${DATADIR}
+ ${INSTALL_DATA} ${WRKSRC}/config/* ${STAGEDIR}${DATADIR}
+ cd ${WRKSRC} && ${COPYTREE_SHARE} images ${STAGEDIR}${DATADIR}
.include <bsd.port.mk>
diff --git a/x11/nwg-dock-hyprland/distinfo b/x11/nwg-dock-hyprland/distinfo
index dcf734fd1204..0246fb5dd46b 100644
--- a/x11/nwg-dock-hyprland/distinfo
+++ b/x11/nwg-dock-hyprland/distinfo
@@ -1,19 +1,5 @@
-TIMESTAMP = 1736472099
-SHA256 (nwg-piotr-nwg-dock-hyprland-v0.4.3_GH0.tar.gz) = e2335966bd4314b17534a492ae62b15484a501d3a52889e535836a74a46c2b7e
-SIZE (nwg-piotr-nwg-dock-hyprland-v0.4.3_GH0.tar.gz) = 23010
-SHA256 (KarpelesLab-weak-v0.1.1_GH0.tar.gz) = a8b6b241e8b72c95132497864c59a559fb35f6ae4b296c299e563a12a3a16fbe
-SIZE (KarpelesLab-weak-v0.1.1_GH0.tar.gz) = 3484
-SHA256 (allan-simon-go-singleinstance-d0997106ab37_GH0.tar.gz) = f8cee874873fe9fc1a81e8a7ca83df85c57aa86279c09cb8cba10d5feb7ed295
-SIZE (allan-simon-go-singleinstance-d0997106ab37_GH0.tar.gz) = 2819
-SHA256 (diamondburned-gotk4-layer-shell-6efa9f6dc438_GH0.tar.gz) = b49b2b22708aa7da4b3dfef86cfe6da5eae10413de1357cd560543505da567a3
-SIZE (diamondburned-gotk4-layer-shell-6efa9f6dc438_GH0.tar.gz) = 24347
-SHA256 (diamondburned-gotk4-v0.3.1_GH0.tar.gz) = 1aea32fc2026aa0d3b2ad429eff2900d826a7a1dddceb2649d4d4114fe86feca
-SIZE (diamondburned-gotk4-v0.3.1_GH0.tar.gz) = 3311686
-SHA256 (go4org-unsafe-assume-no-moving-gc-b99613f794b6_GH0.tar.gz) = 92c41675053bbd8fb47ba69e2688c8e51910891a5dbb96b4fc9a8cc3576fba80
-SIZE (go4org-unsafe-assume-no-moving-gc-b99613f794b6_GH0.tar.gz) = 2616
-SHA256 (golang-sync-v0.10.0_GH0.tar.gz) = 2a7b7c36a89b444213ec3237a21dd1ca6ed351adf423666cc6bf853711a13f3d
-SIZE (golang-sync-v0.10.0_GH0.tar.gz) = 18099
-SHA256 (golang-sys-v0.29.0_GH0.tar.gz) = 7bac3e0a686a05d0e86ca110917b45f60553d6c146dba8a4cdafb911486428e7
-SIZE (golang-sys-v0.29.0_GH0.tar.gz) = 1519988
-SHA256 (sirupsen-logrus-v1.9.3_GH0.tar.gz) = cfa48a647a28c1f12fb6a9b672bc4d88b6407ff05aedcf23ce939d342646acce
-SIZE (sirupsen-logrus-v1.9.3_GH0.tar.gz) = 50320
+TIMESTAMP = 1753769266
+SHA256 (go/x11_nwg-dock-hyprland/nwg-dock-hyprland-v0.4.8/v0.4.8.mod) = 4fef36c7d96798a0dd2f3393ef33903919bf59235b3563f05432f5326ec31e00
+SIZE (go/x11_nwg-dock-hyprland/nwg-dock-hyprland-v0.4.8/v0.4.8.mod) = 549
+SHA256 (go/x11_nwg-dock-hyprland/nwg-dock-hyprland-v0.4.8/v0.4.8.zip) = 47c836c8e631701895ab672f8b1611215dde882ac5c343af081086c1e5ce3910
+SIZE (go/x11_nwg-dock-hyprland/nwg-dock-hyprland-v0.4.8/v0.4.8.zip) = 33092
diff --git a/x11/nwg-dock-hyprland/files/patch-go.mod b/x11/nwg-dock-hyprland/files/patch-go.mod
deleted file mode 100644
index 36f3e193747e..000000000000
--- a/x11/nwg-dock-hyprland/files/patch-go.mod
+++ /dev/null
@@ -1,14 +0,0 @@
-Drop after lang/go122 appears (switch to USES=go:1.22,modules)
-
-github.com/nwg-piotr/nwg-dock-hyprland: cannot compile Go 1.22 code
-
---- go.mod.orig 2024-08-30 23:04:22 UTC
-+++ go.mod
-@@ -1,6 +1,6 @@ module nwg-dock-hyprland
- module nwg-dock-hyprland
-
--go 1.23
-+go 1.21
-
- require (
- github.com/allan-simon/go-singleinstance v0.0.0-20210120080615-d0997106ab37
diff --git a/x11/nwg-dock-hyprland/pkg-plist b/x11/nwg-dock-hyprland/pkg-plist
new file mode 100644
index 000000000000..2289fad9be04
--- /dev/null
+++ b/x11/nwg-dock-hyprland/pkg-plist
@@ -0,0 +1,10 @@
+bin/nwg-dock-hyprland
+%%DATADIR%%/images/grid.svg
+%%DATADIR%%/images/icon-missing.svg
+%%DATADIR%%/images/task-empty-vertical.svg
+%%DATADIR%%/images/task-empty.svg
+%%DATADIR%%/images/task-multiple-vertical.svg
+%%DATADIR%%/images/task-multiple.svg
+%%DATADIR%%/images/task-single-vertical.svg
+%%DATADIR%%/images/task-single.svg
+%%DATADIR%%/style.css
diff --git a/x11/nwg-dock/Makefile b/x11/nwg-dock/Makefile
index 2baba1d7828b..6a8314bb21bd 100644
--- a/x11/nwg-dock/Makefile
+++ b/x11/nwg-dock/Makefile
@@ -1,10 +1,10 @@
PORTNAME= nwg-dock
DISTVERSIONPREFIX= v
DISTVERSION= 0.4.3
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= x11
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER= tagattie@FreeBSD.org
COMMENT= GTK3-based dock for sway
WWW= https://github.com/nwg-piotr/nwg-dock
diff --git a/x11/nwg-drawer/Makefile b/x11/nwg-drawer/Makefile
index 9722f89d7b91..4047b03a9f66 100644
--- a/x11/nwg-drawer/Makefile
+++ b/x11/nwg-drawer/Makefile
@@ -1,51 +1,38 @@
PORTNAME= nwg-drawer
DISTVERSIONPREFIX= v
-DISTVERSION= 0.6.3
-PORTREVISION= 5
+DISTVERSION= 0.7.4
CATEGORIES= x11 wayland
-MAINTAINER= ports@FreeBSD.org
-COMMENT= Application drawer for sway and other wlroots compositors
+MAINTAINER= tagattie@FreeBSD.org
+COMMENT= Application drawer for wlroots-based Wayland compositors
WWW= https://github.com/nwg-piotr/nwg-drawer
-LICENSE= AGPLv3 MIT
+LICENSE= MIT MPL20
LICENSE_COMB= multi
-LICENSE_FILE_AGPLv3= ${WRKSRC_diamondburned_gotk4_pkg}/LICENSE.md
LICENSE_FILE_MIT= ${WRKSRC}/LICENSE
+LICENSE_FILE_MPL20= ${WRKSRC}/LICENSE-gotk4
LIB_DEPENDS= libgtk-layer-shell.so:x11-toolkits/gtk-layer-shell
RUN_DEPENDS= xdg-open:devel/xdg-utils
USES= gnome go:modules pkgconfig
-USE_GITHUB= yes
+
USE_GNOME= cairo gdkpixbuf gtk30
-GH_ACCOUNT= nwg-piotr
-GH_TUPLE= KarpelesLab:weak:v0.1.1:karpeleslab_weak/vendor/github.com/KarpelesLab/weak \
- allan-simon:go-singleinstance:d0997106ab37:allan_simon_go_singleinstance/vendor/github.com/allan-simon/go-singleinstance \
- diamondburned:gotk4-layer-shell:6efa9f6dc438:diamondburned_gotk4_layer_shell_pkg/vendor/github.com/diamondburned/gotk4-layer-shell \
- diamondburned:gotk4:v0.3.1:diamondburned_gotk4_pkg/vendor/github.com/diamondburned/gotk4 \
- expr-lang:expr:v1.16.9:expr_lang_expr/vendor/github.com/expr-lang/expr \
- fsnotify:fsnotify:v1.8.0:fsnotify_fsnotify/vendor/github.com/fsnotify/fsnotify \
- go4org:unsafe-assume-no-moving-gc:b99613f794b6:go4org_unsafe_assume_no_moving_gc/vendor/go4.org/unsafe/assume-no-moving-gc \
- golang:sync:v0.10.0:golang_sync/vendor/golang.org/x/sync \
- golang:sys:v0.29.0:golang_sys/vendor/golang.org/x/sys \
- joshuarubin:go-sway:v1.2.0:joshuarubin_go_sway/vendor/github.com/joshuarubin/go-sway \
- joshuarubin:lifecycle:v1.1.4:joshuarubin_lifecycle/vendor/github.com/joshuarubin/lifecycle \
- sirupsen:logrus:v1.9.3:sirupsen_logrus/vendor/github.com/sirupsen/logrus \
- uber-go:multierr:v1.11.0:uber_go_multierr/vendor/go.uber.org/multierr
+
+GO_MODULE= github.com/nwg-piotr/nwg-drawer
CGO_LDFLAGS+= -Wl,--as-needed # harfbuzz, freetype2
+
PLIST_FILES= bin/${PORTNAME}
PORTDATA= desktop-directories img *.css
post-patch:
# Respect PREFIX for *.desktop
- @${REINPLACE_CMD} 's,/usr/share,${DATADIR:H},' \
- ${WRKSRC}/main.go \
+ @${REINPLACE_CMD} -e 's|/usr/share|${DATADIR:H}|' \
${WRKSRC}/tools.go
post-install:
# Based on install from WRKSRC/Makefile
- (cd ${WRKSRC} && ${COPYTREE_SHARE} "${PORTDATA}" \
- ${STAGEDIR}${DATADIR})
+ cd ${WRKSRC} && ${COPYTREE_SHARE} "${PORTDATA}" \
+ ${STAGEDIR}${DATADIR}
.include <bsd.port.mk>
diff --git a/x11/nwg-drawer/distinfo b/x11/nwg-drawer/distinfo
index df19ef2fcc51..93b429c66e33 100644
--- a/x11/nwg-drawer/distinfo
+++ b/x11/nwg-drawer/distinfo
@@ -1,29 +1,5 @@
-TIMESTAMP = 1738108670
-SHA256 (nwg-piotr-nwg-drawer-v0.6.3_GH0.tar.gz) = 9b87cd3a47e37d63ec764b2595667319d4b3e207d3e56eaaa0701b67178a998b
-SIZE (nwg-piotr-nwg-drawer-v0.6.3_GH0.tar.gz) = 54818
-SHA256 (KarpelesLab-weak-v0.1.1_GH0.tar.gz) = a8b6b241e8b72c95132497864c59a559fb35f6ae4b296c299e563a12a3a16fbe
-SIZE (KarpelesLab-weak-v0.1.1_GH0.tar.gz) = 3484
-SHA256 (allan-simon-go-singleinstance-d0997106ab37_GH0.tar.gz) = f8cee874873fe9fc1a81e8a7ca83df85c57aa86279c09cb8cba10d5feb7ed295
-SIZE (allan-simon-go-singleinstance-d0997106ab37_GH0.tar.gz) = 2819
-SHA256 (diamondburned-gotk4-layer-shell-6efa9f6dc438_GH0.tar.gz) = b49b2b22708aa7da4b3dfef86cfe6da5eae10413de1357cd560543505da567a3
-SIZE (diamondburned-gotk4-layer-shell-6efa9f6dc438_GH0.tar.gz) = 24347
-SHA256 (diamondburned-gotk4-v0.3.1_GH0.tar.gz) = 1aea32fc2026aa0d3b2ad429eff2900d826a7a1dddceb2649d4d4114fe86feca
-SIZE (diamondburned-gotk4-v0.3.1_GH0.tar.gz) = 3311686
-SHA256 (expr-lang-expr-v1.16.9_GH0.tar.gz) = 80f1c8f59ea6e659e554567926dbfc2f3228002bf6b2a4e2d358e75a7c98eb76
-SIZE (expr-lang-expr-v1.16.9_GH0.tar.gz) = 1900866
-SHA256 (fsnotify-fsnotify-v1.8.0_GH0.tar.gz) = 3c4cbec6225307397717f18bb87ffc496e59d0f802a41fff572bf09e5dbf6e2b
-SIZE (fsnotify-fsnotify-v1.8.0_GH0.tar.gz) = 72325
-SHA256 (go4org-unsafe-assume-no-moving-gc-b99613f794b6_GH0.tar.gz) = 92c41675053bbd8fb47ba69e2688c8e51910891a5dbb96b4fc9a8cc3576fba80
-SIZE (go4org-unsafe-assume-no-moving-gc-b99613f794b6_GH0.tar.gz) = 2616
-SHA256 (golang-sync-v0.10.0_GH0.tar.gz) = 2a7b7c36a89b444213ec3237a21dd1ca6ed351adf423666cc6bf853711a13f3d
-SIZE (golang-sync-v0.10.0_GH0.tar.gz) = 18099
-SHA256 (golang-sys-v0.29.0_GH0.tar.gz) = 7bac3e0a686a05d0e86ca110917b45f60553d6c146dba8a4cdafb911486428e7
-SIZE (golang-sys-v0.29.0_GH0.tar.gz) = 1519988
-SHA256 (joshuarubin-go-sway-v1.2.0_GH0.tar.gz) = 3bd95f49be110b40bc005f3db157c0a8e6ccedb4e0ed48e810368f23030a1833
-SIZE (joshuarubin-go-sway-v1.2.0_GH0.tar.gz) = 12933
-SHA256 (joshuarubin-lifecycle-v1.1.4_GH0.tar.gz) = 512fc4ca6e4f8db0b493f47f3edffed3ce09002267b0ff0d64fa09941d4d249f
-SIZE (joshuarubin-lifecycle-v1.1.4_GH0.tar.gz) = 7542
-SHA256 (sirupsen-logrus-v1.9.3_GH0.tar.gz) = cfa48a647a28c1f12fb6a9b672bc4d88b6407ff05aedcf23ce939d342646acce
-SIZE (sirupsen-logrus-v1.9.3_GH0.tar.gz) = 50320
-SHA256 (uber-go-multierr-v1.11.0_GH0.tar.gz) = 8aa599cf7de733306cf8770f854f8a38e6c819b1ae4296f15e44b1e7c6698f34
-SIZE (uber-go-multierr-v1.11.0_GH0.tar.gz) = 16900
+TIMESTAMP = 1753261961
+SHA256 (go/x11_nwg-drawer/nwg-drawer-v0.7.4/v0.7.4.mod) = 4bf8aba06b69fd0776b7a331366e81ce8af211e25695f04dc20b1c4247d62d94
+SIZE (go/x11_nwg-drawer/nwg-drawer-v0.7.4/v0.7.4.mod) = 808
+SHA256 (go/x11_nwg-drawer/nwg-drawer-v0.7.4/v0.7.4.zip) = 9a52755ba2871042ee659dc007325dc78bcb2e666e7c0401318765e9a82e8300
+SIZE (go/x11_nwg-drawer/nwg-drawer-v0.7.4/v0.7.4.zip) = 79311
diff --git a/x11/nwg-drawer/files/patch-go.mod b/x11/nwg-drawer/files/patch-go.mod
deleted file mode 100644
index 8bd55d169665..000000000000
--- a/x11/nwg-drawer/files/patch-go.mod
+++ /dev/null
@@ -1,14 +0,0 @@
-Drop after lang/go122 appears (switch to USES=go:1.22,modules)
-
-github.com/nwg-piotr/nwg-drawer: cannot compile Go 1.22 code
-
---- go.mod.orig 2024-02-08 02:12:17 UTC
-+++ go.mod
-@@ -1,6 +1,6 @@ module github.com/nwg-piotr/nwg-drawer
- module github.com/nwg-piotr/nwg-drawer
-
--go 1.23
-+go 1.21
-
- require (
- github.com/allan-simon/go-singleinstance v0.0.0-20210120080615-d0997106ab37
diff --git a/x11/nwg-drawer/pkg-descr b/x11/nwg-drawer/pkg-descr
index 51f0950366da..0608e025c1ff 100644
--- a/x11/nwg-drawer/pkg-descr
+++ b/x11/nwg-drawer/pkg-descr
@@ -1,7 +1,7 @@
-nwg-drawer displays the application grid. The search entry
-allows to look for installed applications, and for files in XDG user
-directories. The grid view may also be filtered by categories.
+Nwg-drawer is an application launcher. It's being developed with sway
+and Hyprland in mind, but should also work with other wlroots-based
+Wayland compositors.
-nwg-drawer is a golang replacement to nwggrid from nwg-launchers.
-It's being developed with sway in mind, but should also work with
-other wlroots-based Wayland compositors.
+The "nwg-drawer" command displays the application grid. The search
+entry allows to look for installed applications, and for files in XDG
+user directories. The grid view may also be filtered by categories.
diff --git a/x11/nwg-launchers/Makefile b/x11/nwg-launchers/Makefile
index e54118b68287..598fd127a20f 100644
--- a/x11/nwg-launchers/Makefile
+++ b/x11/nwg-launchers/Makefile
@@ -1,10 +1,10 @@
PORTNAME= nwg-launchers
DISTVERSIONPREFIX= v
DISTVERSION= 0.7.1.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11 wayland
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER= tagattie@FreeBSD.org
COMMENT= GTK-based launchers: application grid, button bar, dmenu for sway and other window managers
WWW= https://github.com/nwg-piotr/nwg-launchers
diff --git a/x11/nwg-look/Makefile b/x11/nwg-look/Makefile
index 4fd302264f85..f47aaa749277 100644
--- a/x11/nwg-look/Makefile
+++ b/x11/nwg-look/Makefile
@@ -1,10 +1,9 @@
PORTNAME= nwg-look
DISTVERSIONPREFIX= v
-DISTVERSION= 1.0.3
-PORTREVISION= 4
+DISTVERSION= 1.0.6
CATEGORIES= x11 wayland
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER= tagattie@FreeBSD.org
COMMENT= GTK settings editor adapted to work in the wlroots environment
WWW= https://github.com/nwg-piotr/nwg-look
@@ -15,36 +14,23 @@ LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig
RUN_DEPENDS= xcur2png:x11/xcur2png
USES= gnome go:modules pkgconfig
-USE_GITHUB= yes
+
USE_GNOME= cairo gdkpixbuf gtk30
-GH_ACCOUNT= nwg-piotr
-GH_TUPLE= golang:sys:v0.29.0:golang_sys/vendor/golang.org/x/sys \
- gotk3:gotk3:ff349ae13f56:gotk3_gotk3/vendor/github.com/gotk3/gotk3 \
- sirupsen:logrus:v1.9.3:sirupsen_logrus/vendor/github.com/sirupsen/logrus
+
+GO_MODULE= github.com/nwg-piotr/nwg-look
CGO_LDFLAGS+= -Wl,--as-needed # harfbuzz, freetype2
-PLIST_FILES= bin/${PORTNAME} \
- ${DATADIR}/langs/en_US.json \
- ${DATADIR}/langs/ja_JP.json \
- ${DATADIR}/langs/pl_PL.json \
- ${DATADIR}/langs/ru_RU.json \
- ${DATADIR}/langs/zh_CN.json \
- ${DATADIR}/main.glade \
- share/applications/${PORTNAME}.desktop \
- share/pixmaps/${PORTNAME}.svg
post-patch:
# Respect PREFIX for *.glade and *.desktop
- @${REINPLACE_CMD} 's,/usr/share,${DATADIR:H},' \
- ${WRKSRC}/main.go \
+ @${REINPLACE_CMD} -e 's|/usr/share|${DATADIR:H}|' \
${WRKSRC}/tools.go
post-install:
# Based on install from WRKSRC/Makefile
- ${MKDIR} ${STAGEDIR}${DATADIR}/langs
+ @${MKDIR} ${STAGEDIR}${DATADIR}/langs
${INSTALL_DATA} ${WRKSRC}/langs/* ${STAGEDIR}${DATADIR}/langs
${INSTALL_DATA} ${WRKSRC}/stuff/main.glade ${STAGEDIR}${DATADIR}
- ${INSTALL_DATA} ${WRKSRC}/stuff/*.desktop \
- ${STAGEDIR}${PREFIX}/share/applications
+ ${INSTALL_DATA} ${WRKSRC}/stuff/*.desktop ${STAGEDIR}${DESKTOPDIR}
${INSTALL_DATA} ${WRKSRC}/stuff/*.svg \
${STAGEDIR}${PREFIX}/share/pixmaps
diff --git a/x11/nwg-look/distinfo b/x11/nwg-look/distinfo
index 3dd3bd3d6058..f8fd9ac76a1c 100644
--- a/x11/nwg-look/distinfo
+++ b/x11/nwg-look/distinfo
@@ -1,9 +1,5 @@
-TIMESTAMP = 1741481426
-SHA256 (nwg-piotr-nwg-look-v1.0.3_GH0.tar.gz) = bab42b80ae6d5ce4ac11ed563e71c4f54608d1e97272001dd6494bd92d471177
-SIZE (nwg-piotr-nwg-look-v1.0.3_GH0.tar.gz) = 25289
-SHA256 (golang-sys-v0.29.0_GH0.tar.gz) = 7bac3e0a686a05d0e86ca110917b45f60553d6c146dba8a4cdafb911486428e7
-SIZE (golang-sys-v0.29.0_GH0.tar.gz) = 1519988
-SHA256 (gotk3-gotk3-ff349ae13f56_GH0.tar.gz) = e37085985248c69a8b429e37eb2ebee31a2b0f6bbd8310dc154050985fcc6b04
-SIZE (gotk3-gotk3-ff349ae13f56_GH0.tar.gz) = 279122
-SHA256 (sirupsen-logrus-v1.9.3_GH0.tar.gz) = cfa48a647a28c1f12fb6a9b672bc4d88b6407ff05aedcf23ce939d342646acce
-SIZE (sirupsen-logrus-v1.9.3_GH0.tar.gz) = 50320
+TIMESTAMP = 1753256472
+SHA256 (go/x11_nwg-look/nwg-look-v1.0.6/v1.0.6.mod) = 81fea2d19c3bf51a77752d8b1252949420a6e8fbe284fd83bf6755cd6c823662
+SIZE (go/x11_nwg-look/nwg-look-v1.0.6/v1.0.6.mod) = 223
+SHA256 (go/x11_nwg-look/nwg-look-v1.0.6/v1.0.6.zip) = 2d952459da1fdd3abfe2461026b72b8e2d18dca2ae6a6c1c6bcf20c02cbeda84
+SIZE (go/x11_nwg-look/nwg-look-v1.0.6/v1.0.6.zip) = 32411
diff --git a/x11/nwg-look/files/patch-go.mod b/x11/nwg-look/files/patch-go.mod
deleted file mode 100644
index d0b3adc392ce..000000000000
--- a/x11/nwg-look/files/patch-go.mod
+++ /dev/null
@@ -1,14 +0,0 @@
-Drop after lang/go122 appears (switch to USES=go:1.22,modules)
-
-github.com/nwg-piotr/nwg-look: cannot compile Go 1.22 code
-
---- go.mod.orig 2025-01-17 00:47:24 UTC
-+++ go.mod
-@@ -1,6 +1,6 @@ module github.com/nwg-piotr/nwg-look
- module github.com/nwg-piotr/nwg-look
-
--go 1.23
-+go 1.21
-
- require (
- github.com/gotk3/gotk3 v0.6.5-0.20240618185848-ff349ae13f56
diff --git a/x11/nwg-look/pkg-descr b/x11/nwg-look/pkg-descr
index f0e4a61b21a3..0d5253707a98 100644
--- a/x11/nwg-look/pkg-descr
+++ b/x11/nwg-look/pkg-descr
@@ -1,5 +1,5 @@
Nwg-look is a GTK settings editor, designed to work properly in
-wlroots-based Wayland environment. The look and feel is strongly
+wlroots-based Wayland environment. The look and feel is strongly
influenced by LXAppearance, but nwg-look is intended to free the user
from a few inconveniences:
diff --git a/x11/nwg-look/pkg-plist b/x11/nwg-look/pkg-plist
new file mode 100644
index 000000000000..650ee5b5e566
--- /dev/null
+++ b/x11/nwg-look/pkg-plist
@@ -0,0 +1,11 @@
+bin/nwg-look
+share/applications/nwg-look.desktop
+%%DATADIR%%/langs/cs_CZ.json
+%%DATADIR%%/langs/en_US.json
+%%DATADIR%%/langs/ja_JP.json
+%%DATADIR%%/langs/pl_PL.json
+%%DATADIR%%/langs/ru_RU.json
+%%DATADIR%%/langs/tr_TR.json
+%%DATADIR%%/langs/zh_CN.json
+%%DATADIR%%/main.glade
+share/pixmaps/nwg-look.svg
diff --git a/x11/nwg-menu/Makefile b/x11/nwg-menu/Makefile
index d4c1d87707dd..14294bd18301 100644
--- a/x11/nwg-menu/Makefile
+++ b/x11/nwg-menu/Makefile
@@ -1,10 +1,9 @@
PORTNAME= nwg-menu
DISTVERSIONPREFIX= v
-DISTVERSION= 0.1.7
-PORTREVISION= 5
+DISTVERSION= 0.1.9
CATEGORIES= x11 wayland
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER= tagattie@FreeBSD.org
COMMENT= MenuStart plugin to nwg-panel, also capable of working standalone
WWW= https://github.com/nwg-piotr/nwg-menu
@@ -15,25 +14,18 @@ LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \
libgtk-layer-shell.so:x11-toolkits/gtk-layer-shell
USES= gnome go:modules pkgconfig
-USE_GITHUB= yes
+
USE_GNOME= cairo gdkpixbuf gtk30
-GH_ACCOUNT= nwg-piotr
-GH_TUPLE= allan-simon:go-singleinstance:d0997106ab37:allan_simon_go_singleinstance/vendor/github.com/allan-simon/go-singleinstance \
- dlasky:gotk3-layershell:5c5115f0d774:dlasky_gotk3_layershell/vendor/github.com/dlasky/gotk3-layershell \
- golang:sync:v0.10.0:golang_sync/vendor/golang.org/x/sync \
- golang:sys:v0.29.0:golang_sys/vendor/golang.org/x/sys \
- gotk3:gotk3:ff349ae13f56:gotk3_gotk3/vendor/github.com/gotk3/gotk3 \
- joshuarubin:go-sway:v1.2.0:joshuarubin_go_sway/vendor/github.com/joshuarubin/go-sway \
- joshuarubin:lifecycle:v1.1.4:joshuarubin_lifecycle/vendor/github.com/joshuarubin/lifecycle \
- sirupsen:logrus:v1.9.3:sirupsen_logrus/vendor/github.com/sirupsen/logrus \
- uber-go:multierr:v1.11.0:uber_go_multierr/vendor/go.uber.org/multierr
+
+GO_MODULE= github.com/nwg-piotr/nwg-menu
CGO_LDFLAGS+= -Wl,--as-needed # harfbuzz, freetype2
+
PLIST_FILES= bin/${PORTNAME}
PORTDATA= desktop-directories *.css
post-patch:
# Respect PREFIX for *.desktop and system configs
- @${REINPLACE_CMD} 's,/usr/share,${DATADIR:H},' \
+ @${REINPLACE_CMD} -e 's|/usr/share|${DATADIR:H}|' \
${WRKSRC}/main.go \
${WRKSRC}/tools.go
diff --git a/x11/nwg-menu/distinfo b/x11/nwg-menu/distinfo
index 2433d48dc58b..f473e8492dba 100644
--- a/x11/nwg-menu/distinfo
+++ b/x11/nwg-menu/distinfo
@@ -1,21 +1,5 @@
-TIMESTAMP = 1736554057
-SHA256 (nwg-piotr-nwg-menu-v0.1.7_GH0.tar.gz) = 406de41e098519fc911ca1a4d87e5bbeb05b309a29f3fd110ca738a89f59d594
-SIZE (nwg-piotr-nwg-menu-v0.1.7_GH0.tar.gz) = 3861013
-SHA256 (allan-simon-go-singleinstance-d0997106ab37_GH0.tar.gz) = f8cee874873fe9fc1a81e8a7ca83df85c57aa86279c09cb8cba10d5feb7ed295
-SIZE (allan-simon-go-singleinstance-d0997106ab37_GH0.tar.gz) = 2819
-SHA256 (dlasky-gotk3-layershell-5c5115f0d774_GH0.tar.gz) = 9b4f0a555e5f7714930e3f592414e6fa5cb61b744a58ee79419fa89a5530af9e
-SIZE (dlasky-gotk3-layershell-5c5115f0d774_GH0.tar.gz) = 2374334
-SHA256 (golang-sync-v0.10.0_GH0.tar.gz) = 2a7b7c36a89b444213ec3237a21dd1ca6ed351adf423666cc6bf853711a13f3d
-SIZE (golang-sync-v0.10.0_GH0.tar.gz) = 18099
-SHA256 (golang-sys-v0.29.0_GH0.tar.gz) = 7bac3e0a686a05d0e86ca110917b45f60553d6c146dba8a4cdafb911486428e7
-SIZE (golang-sys-v0.29.0_GH0.tar.gz) = 1519988
-SHA256 (gotk3-gotk3-ff349ae13f56_GH0.tar.gz) = e37085985248c69a8b429e37eb2ebee31a2b0f6bbd8310dc154050985fcc6b04
-SIZE (gotk3-gotk3-ff349ae13f56_GH0.tar.gz) = 279122
-SHA256 (joshuarubin-go-sway-v1.2.0_GH0.tar.gz) = 3bd95f49be110b40bc005f3db157c0a8e6ccedb4e0ed48e810368f23030a1833
-SIZE (joshuarubin-go-sway-v1.2.0_GH0.tar.gz) = 12933
-SHA256 (joshuarubin-lifecycle-v1.1.4_GH0.tar.gz) = 512fc4ca6e4f8db0b493f47f3edffed3ce09002267b0ff0d64fa09941d4d249f
-SIZE (joshuarubin-lifecycle-v1.1.4_GH0.tar.gz) = 7542
-SHA256 (sirupsen-logrus-v1.9.3_GH0.tar.gz) = cfa48a647a28c1f12fb6a9b672bc4d88b6407ff05aedcf23ce939d342646acce
-SIZE (sirupsen-logrus-v1.9.3_GH0.tar.gz) = 50320
-SHA256 (uber-go-multierr-v1.11.0_GH0.tar.gz) = 8aa599cf7de733306cf8770f854f8a38e6c819b1ae4296f15e44b1e7c6698f34
-SIZE (uber-go-multierr-v1.11.0_GH0.tar.gz) = 16900
+TIMESTAMP = 1753240326
+SHA256 (go/x11_nwg-menu/nwg-menu-v0.1.9/v0.1.9.mod) = 325e45ee9ecc61789bd0ccb348cb50b9c961a3a135376907ffa5b44fcc763ed2
+SIZE (go/x11_nwg-menu/nwg-menu-v0.1.9/v0.1.9.mod) = 549
+SHA256 (go/x11_nwg-menu/nwg-menu-v0.1.9/v0.1.9.zip) = a3549d7f251c5236484fc569484ea6d5a8c780847d1d7075a6701be879d62f07
+SIZE (go/x11_nwg-menu/nwg-menu-v0.1.9/v0.1.9.zip) = 3915462
diff --git a/x11/nwg-menu/files/patch-go.mod b/x11/nwg-menu/files/patch-go.mod
deleted file mode 100644
index 2d7b50e370dc..000000000000
--- a/x11/nwg-menu/files/patch-go.mod
+++ /dev/null
@@ -1,14 +0,0 @@
-Drop after lang/go122 appears (switch to USES=go:1.22,modules)
-
-github.com/nwg-piotr/nwg-menu: cannot compile Go 1.22 code
-
---- go.mod.orig 2025-01-11 00:07:37 UTC
-+++ go.mod
-@@ -1,6 +1,6 @@ module github.com/nwg-piotr/nwg-menu
- module github.com/nwg-piotr/nwg-menu
-
--go 1.23
-+go 1.21
-
- require (
- github.com/allan-simon/go-singleinstance v0.0.0-20210120080615-d0997106ab37
diff --git a/x11/nwg-menu/files/patch-main.go b/x11/nwg-menu/files/patch-main.go
index bcc726370384..e36a6d5ae3ba 100644
--- a/x11/nwg-menu/files/patch-main.go
+++ b/x11/nwg-menu/files/patch-main.go
@@ -1,6 +1,6 @@
- Adapt to BSD-style shutdown
---- main.go.orig 2025-01-11 00:07:37 UTC
+--- main.go.orig 1979-11-29 15:00:00 UTC
+++ main.go
@@ -122,8 +122,8 @@ var cmdLogout = flag.String("cmd-logout", "swaymsg exi
var wm = flag.String("wm", "", "use swaymsg exec (with 'sway' argument) or hyprctl dispatch exec (with 'hyprland') or riverctl spawn (with 'river') to launch programs")
@@ -12,4 +12,4 @@
+var cmdShutdown = flag.String("cmd-shutdown", "shutdown -p now", "shutdown command")
var debug = flag.Bool("debug", false, "turn on Debug messages")
var hover = flag.Bool("t", false, "hovering caTegories opens submenus")
-
+ var clickOutside = flag.Bool("k", false, "clicKing outside closes the window")
diff --git a/x11/plasma6-layer-shell-qt/Makefile b/x11/plasma6-layer-shell-qt/Makefile
index 7d07e029f098..30f4a19b164f 100644
--- a/x11/plasma6-layer-shell-qt/Makefile
+++ b/x11/plasma6-layer-shell-qt/Makefile
@@ -1,5 +1,6 @@
PORTNAME= layer-shell-qt
DISTVERSION= ${KDE_PLASMA_VERSION}
+PORTREVISION= 1
CATEGORIES= x11 kde kde-plasma
COMMENT= Qt component to allow applications to make use of the Wayland wl-layer-shell protocol
diff --git a/x11/plasma6-layer-shell-qt/files/patch-src_qwaylandlayersurface.cpp b/x11/plasma6-layer-shell-qt/files/patch-src_qwaylandlayersurface.cpp
new file mode 100644
index 000000000000..264ac398bdcd
--- /dev/null
+++ b/x11/plasma6-layer-shell-qt/files/patch-src_qwaylandlayersurface.cpp
@@ -0,0 +1,17 @@
+Fix the crash that happens when right-clicking the desktop surface
+
+--- src/qwaylandlayersurface.cpp.orig 2025-07-15 09:53:41 UTC
++++ src/qwaylandlayersurface.cpp
+@@ -113,10 +113,8 @@ void QWaylandLayerSurface::attachPopup(QtWaylandClient
+
+ void QWaylandLayerSurface::attachPopup(QtWaylandClient::QWaylandShellSurface *popup)
+ {
+- std::any anyRole = popup->surfaceRole();
+-
+- if (auto role = std::any_cast<::xdg_popup *>(&anyRole)) {
+- get_popup(*role);
++ if (auto role = popup->nativeResource("xdg_popup")) {
++ get_popup(reinterpret_cast<struct ::xdg_popup*>(role));
+ } else {
+ qCWarning(LAYERSHELLQT) << "Cannot attach popup of unknown type";
+ }
diff --git a/x11/rubygem-gnome/Makefile b/x11/rubygem-gnome/Makefile
index 0ee5a1fb32a4..55f3cf334985 100644
--- a/x11/rubygem-gnome/Makefile
+++ b/x11/rubygem-gnome/Makefile
@@ -1,5 +1,5 @@
PORTNAME= gnome
-PORTVERSION= 4.2.9
+PORTVERSION= 4.3.0
CATEGORIES= x11 gnome rubygems
PKGNAMEPREFIX= rubygem-
diff --git a/x11/wallutils/Makefile b/x11/wallutils/Makefile
index 3281237b6c1d..163116c70e46 100644
--- a/x11/wallutils/Makefile
+++ b/x11/wallutils/Makefile
@@ -1,6 +1,7 @@
PORTNAME= wallutils
-DISTVERSION= 5.12.9
-PORTREVISION= 7
+DISTVERSIONPREFIX= v
+DISTVERSION= 5.14.2
+PORTREVISION= 1
CATEGORIES= x11 wayland
MAINTAINER= eduardo@FreeBSD.org
@@ -13,27 +14,27 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
LIB_DEPENDS= libwayland-client.so:graphics/wayland \
libX11.so:x11/libX11
-USES= go:modules
+USES= go:modules pkgconfig
USE_GITHUB= yes
GH_ACCOUNT= xyproto
-GH_TUPLE= antchfx:xmlquery:v1.3.8:antchfx_xmlquery/vendor/github.com/antchfx/xmlquery \
- antchfx:xpath:v1.2.0:antchfx_xpath/vendor/github.com/antchfx/xpath \
+GH_TUPLE= antchfx:xmlquery:v1.4.4:antchfx_xmlquery/vendor/github.com/antchfx/xmlquery \
+ antchfx:xpath:v1.3.4:antchfx_xpath/vendor/github.com/antchfx/xpath \
anthonynsimon:bild:v0.14.0:anthonynsimon_bild/vendor/github.com/anthonynsimon/bild \
- cpuguy83:go-md2man:v2.0.4:cpuguy83_go_md2man_v2/vendor/github.com/cpuguy83/go-md2man/v2 \
- fatih:color:v1.17.0:fatih_color/vendor/github.com/fatih/color \
- golang:groupcache:41bb18bfe9da:golang_groupcache/vendor/github.com/golang/groupcache \
- golang:image:v0.18.0:golang_image/vendor/golang.org/x/image \
- golang:net:58aab5ef257a:golang_net/vendor/golang.org/x/net \
- golang:sys:v0.18.0:golang_sys/vendor/golang.org/x/sys \
- golang:text:v0.16.0:golang_text/vendor/golang.org/x/text \
- mattn:go-colorable:v0.1.13:mattn_go_colorable/vendor/github.com/mattn/go-colorable \
+ cpuguy83:go-md2man:v2.0.7:cpuguy83_go_md2man_v2/vendor/github.com/cpuguy83/go-md2man/v2 \
+ fatih:color:v1.18.0:fatih_color/vendor/github.com/fatih/color \
+ golang:groupcache:2c02b8208cf8:golang_groupcache/vendor/github.com/golang/groupcache \
+ golang:image:v0.29.0:golang_image/vendor/golang.org/x/image \
+ golang:net:v0.42.0:golang_net/vendor/golang.org/x/net \
+ golang:sys:v0.34.0:golang_sys/vendor/golang.org/x/sys \
+ golang:text:v0.27.0:golang_text/vendor/golang.org/x/text \
+ mattn:go-colorable:v0.1.14:mattn_go_colorable/vendor/github.com/mattn/go-colorable \
mattn:go-isatty:v0.0.20:mattn_go_isatty/vendor/github.com/mattn/go-isatty \
russross:blackfriday:v2.1.0:russross_blackfriday_v2/vendor/github.com/russross/blackfriday/v2 \
stretchr:powerwalk:bceb9d014549:stretchr_powerwalk/vendor/github.com/stretchr/powerwalk \
- urfave:cli:v1.22.15:urfave_cli/vendor/github.com/urfave/cli \
- xyproto:env:v2.2.5:xyproto_env_v2/vendor/github.com/xyproto/env \
+ urfave:cli:v1.22.17:urfave_cli/vendor/github.com/urfave/cli \
+ xyproto:env:v2.5.3:xyproto_env_v2/vendor/github.com/xyproto/env \
xyproto:heic:v1.0.0:xyproto_heic/vendor/github.com/xyproto/heic
-GL_TUPLE= https://gitlab.howett.net:go:plist:1454fab16a0642638feb0ae98c41f79eccb2a20a:go_plist/vendor/howett.net/plist
+GL_TUPLE= https://gitlab.howett.net:go:plist:5afcd134990e1c90a92bac94906f74af0b10042d:go_plist/vendor/howett.net/plist
GO_TARGET= ./cmd/getdpi \
./cmd/lscollection \
./cmd/lsmon \
@@ -47,18 +48,20 @@ GO_TARGET= ./cmd/getdpi \
./cmd/vram \
./cmd/wayinfo \
./cmd/xinfo \
- ./cmd/xml2stw \
- ${NULL}
-PLIST_FILES= ${GO_TARGET:S,./cmd,bin,} \
- share/man/man1/getdpi.1.gz \
- share/man/man1/vram.1.gz
+ ./cmd/xml2stw
+
+PLIST_FILES= ${GO_TARGET:S,./cmd,bin,}
+PLIST_FILES+= ${GO_TARGET:S,./cmd,share/man/man1,:S,$,.1.gz,}
OPTIONS_DEFINE= HEIF
OPTIONS_DEFAULT= HEIF
-HEIF_LIB_DEPENDS= libheif.so:graphics/libheif
-HEIF_USES= pkgconfig
-HEIF_VARS= GO_TARGET+=./cmd/heic2stw
+# Using [HEIF_VARS= GO_TARGET+=./cmd/heic2stw] causes post-install to fail parsing instalation of heic2stw.1 manual
+.include <bsd.port.options.mk>
+.if ${PORT_OPTIONS:MHEIF}
+LIB_DEPENDS+= libheif.so:graphics/libheif
+GO_TARGET+= ./cmd/heic2stw
+.endif
post-patch:
# Respect PREFIX for wallpapers
@@ -67,7 +70,8 @@ post-patch:
${WRKSRC}/collections.go
post-install:
- ${INSTALL_MAN} ${WRKSRC}/cmd/getdpi/getdpi.1 ${STAGEDIR}${PREFIX}/share/man/man1
- ${INSTALL_MAN} ${WRKSRC}/cmd/vram/vram.1 ${STAGEDIR}${PREFIX}/share/man/man1
+.for _target in ${GO_TARGET:S,./cmd,/cmd,}
+ ${INSTALL_MAN} ${WRKSRC}/${_target}/${_target:T}.1 ${STAGEDIR}${PREFIX}/share/man/man1
+.endfor
.include <bsd.port.mk>
diff --git a/x11/wallutils/distinfo b/x11/wallutils/distinfo
index 047f4c74384e..cc6863ccb62d 100644
--- a/x11/wallutils/distinfo
+++ b/x11/wallutils/distinfo
@@ -1,37 +1,37 @@
-TIMESTAMP = 1723453889
-SHA256 (xyproto-wallutils-5.12.9_GH0.tar.gz) = 1868ba6b43f3de94208180fbaac8bb46346c3b27b143969c29b842220aad5383
-SIZE (xyproto-wallutils-5.12.9_GH0.tar.gz) = 2589216
-SHA256 (antchfx-xmlquery-v1.3.8_GH0.tar.gz) = aff0d2224b7f997200f09d4b245ca84623e9ccaa7d8c427ee3f4b0657cf04c8e
-SIZE (antchfx-xmlquery-v1.3.8_GH0.tar.gz) = 20748
-SHA256 (antchfx-xpath-v1.2.0_GH0.tar.gz) = 507f7f3dee7b833506d9fa0d90aad43a78d92c632eb7c39d8bb8cfa752ee289c
-SIZE (antchfx-xpath-v1.2.0_GH0.tar.gz) = 28749
+TIMESTAMP = 1753819972
+SHA256 (xyproto-wallutils-v5.14.2_GH0.tar.gz) = 49588f3cadfaf9ff00fa28a50732a898f98f6baa6d7c19fa85514fee37ca0f11
+SIZE (xyproto-wallutils-v5.14.2_GH0.tar.gz) = 2667743
+SHA256 (antchfx-xmlquery-v1.4.4_GH0.tar.gz) = 562fe76e34388cce955c899aa1b31e400f708a3b616a75c4d49e458fd4042a17
+SIZE (antchfx-xmlquery-v1.4.4_GH0.tar.gz) = 26097
+SHA256 (antchfx-xpath-v1.3.4_GH0.tar.gz) = eb279925195c3fdfc9fb0a81af543fde0967619d93bc0101ae4675436ad084e6
+SIZE (antchfx-xpath-v1.3.4_GH0.tar.gz) = 38989
SHA256 (anthonynsimon-bild-v0.14.0_GH0.tar.gz) = f69a34f5bae7248da0f6d0eba83efc042818c1ec51183f71d9923b9dfc8dd556
SIZE (anthonynsimon-bild-v0.14.0_GH0.tar.gz) = 3999692
-SHA256 (cpuguy83-go-md2man-v2.0.4_GH0.tar.gz) = b0a4c7c077ede56967deef6ab7e7696c0f46124b0b3360fd05564ec5a536f11f
-SIZE (cpuguy83-go-md2man-v2.0.4_GH0.tar.gz) = 9902
-SHA256 (fatih-color-v1.17.0_GH0.tar.gz) = 82e284c6679ac3eb4cbbb5e15b142bb1e6a68f957fe0d2db8ec4fe17e7f78e88
-SIZE (fatih-color-v1.17.0_GH0.tar.gz) = 12341
-SHA256 (golang-groupcache-41bb18bfe9da_GH0.tar.gz) = 1e89795970d6593affdafe1d09dcf947681ca1ea82528e8e4fb9974a77f2e394
-SIZE (golang-groupcache-41bb18bfe9da_GH0.tar.gz) = 26101
-SHA256 (golang-image-v0.18.0_GH0.tar.gz) = dd23e3256a92667d201fd031a44294e4d54812e0f6fc69365da3bb4fcf3c730d
-SIZE (golang-image-v0.18.0_GH0.tar.gz) = 5103909
-SHA256 (golang-net-58aab5ef257a_GH0.tar.gz) = 18f73cc040d821c9a715338c0d446481a6d9df1b3e0437302d09a5b96119ce4d
-SIZE (golang-net-58aab5ef257a_GH0.tar.gz) = 1263704
-SHA256 (golang-sys-v0.18.0_GH0.tar.gz) = cee1944ab655ddf7eab6301e15cb6d01fdd6cd0a0f0b5896050ee60b124e084c
-SIZE (golang-sys-v0.18.0_GH0.tar.gz) = 1448211
-SHA256 (golang-text-v0.16.0_GH0.tar.gz) = 6df270cb3d696f882857c8ce02233e7f08d5ff900986e1ac669b47e088b18779
-SIZE (golang-text-v0.16.0_GH0.tar.gz) = 8972326
-SHA256 (mattn-go-colorable-v0.1.13_GH0.tar.gz) = c3b62c76d365906bba9aa9d9ec048fd33a2a5742299d6482a08e7466d4c52d77
-SIZE (mattn-go-colorable-v0.1.13_GH0.tar.gz) = 9762
+SHA256 (cpuguy83-go-md2man-v2.0.7_GH0.tar.gz) = ca3a5b57e2c01759f5a00ad2a578d034c5370fae9aa7a6c3af5648b2fc802a92
+SIZE (cpuguy83-go-md2man-v2.0.7_GH0.tar.gz) = 11337
+SHA256 (fatih-color-v1.18.0_GH0.tar.gz) = 586b2b42a4165ac52b35808be1238f90d109789bfcb1ddecd3f512eddbac0a9f
+SIZE (fatih-color-v1.18.0_GH0.tar.gz) = 12717
+SHA256 (golang-groupcache-2c02b8208cf8_GH0.tar.gz) = b1c7464afcdeeca03a78abc75a514e9dcf03f87be4d407f64f8a5357596b4dbb
+SIZE (golang-groupcache-2c02b8208cf8_GH0.tar.gz) = 26678
+SHA256 (golang-image-v0.29.0_GH0.tar.gz) = 1294e48b646e8aebdbcb86f20397d2c90a96da9cd697acb2c682defeec3a4ba4
+SIZE (golang-image-v0.29.0_GH0.tar.gz) = 5104054
+SHA256 (golang-net-v0.42.0_GH0.tar.gz) = c63ea31ca98f9cee6c242dc127370ea7786e685a8031955b7b3628c732dfc7cd
+SIZE (golang-net-v0.42.0_GH0.tar.gz) = 1504513
+SHA256 (golang-sys-v0.34.0_GH0.tar.gz) = 4ff2fa6503c1b6ed34733c301b259289b114eae9ed430217b1fccbaebab85319
+SIZE (golang-sys-v0.34.0_GH0.tar.gz) = 1530927
+SHA256 (golang-text-v0.27.0_GH0.tar.gz) = 0e3c1bc881b4049e5191a981c8914f8667810b61e6f3575d5d989c375f7ef55f
+SIZE (golang-text-v0.27.0_GH0.tar.gz) = 8973031
+SHA256 (mattn-go-colorable-v0.1.14_GH0.tar.gz) = 293966a59f0238da3c39f5b27c192d0efd6473ff74ab5a9c7e1ec73fdda3f1d4
+SIZE (mattn-go-colorable-v0.1.14_GH0.tar.gz) = 9800
SHA256 (mattn-go-isatty-v0.0.20_GH0.tar.gz) = 18fc42a278e60fb7a1dffa72f20539ae88d0e292db55b513ef514b7d369883a6
SIZE (mattn-go-isatty-v0.0.20_GH0.tar.gz) = 4713
SHA256 (russross-blackfriday-v2.1.0_GH0.tar.gz) = a13af0fc5305713f5154693feaf654d024689efea76390091a5e8c757335b4f4
SIZE (russross-blackfriday-v2.1.0_GH0.tar.gz) = 92896
SHA256 (stretchr-powerwalk-bceb9d014549_GH0.tar.gz) = 01289e544b8d9147fc677960834565dabeda0eb13bf3507f8cba9d844ab3e4a2
SIZE (stretchr-powerwalk-bceb9d014549_GH0.tar.gz) = 4041
-SHA256 (urfave-cli-v1.22.15_GH0.tar.gz) = 055ed382e019d26114394b5e95dbb2c71ec245c10c0387d2c7db17adb9722d59
-SIZE (urfave-cli-v1.22.15_GH0.tar.gz) = 80516
-SHA256 (xyproto-env-v2.2.5_GH0.tar.gz) = ccf1abd4a20dd9dc8fa7b306d125e2823866dce1e1cb41e23cc0300d837b4b52
-SIZE (xyproto-env-v2.2.5_GH0.tar.gz) = 7869
+SHA256 (urfave-cli-v1.22.17_GH0.tar.gz) = 44e20f78e0d399014591e1d0bd3c520dfff65a27ec2ad1310649eca5e56521e4
+SIZE (urfave-cli-v1.22.17_GH0.tar.gz) = 80511
+SHA256 (xyproto-env-v2.5.3_GH0.tar.gz) = feaa9356bb9150627905bc74f5571a49a0ddad7052de914f4610aac4961fb37f
+SIZE (xyproto-env-v2.5.3_GH0.tar.gz) = 8866
SHA256 (xyproto-heic-v1.0.0_GH0.tar.gz) = c66194f27e4a4dd837bc7caae357a817fea6b0743c5822c37fad777f4bda3a5b
SIZE (xyproto-heic-v1.0.0_GH0.tar.gz) = 67422236
diff --git a/x11/wallutils/pkg-message b/x11/wallutils/pkg-message
new file mode 100644
index 000000000000..16c192316141
--- /dev/null
+++ b/x11/wallutils/pkg-message
@@ -0,0 +1,7 @@
+[
+{ type: install
+ message: <<EOM
+Consider using graphics/feh for setting the wallpaper for some window managers that runs under X, e.g., x11-wm/i3
+EOM
+}
+]
diff --git a/x11/wdisplays/Makefile b/x11/wdisplays/Makefile
index e0559df148c7..bc8e3941a707 100644
--- a/x11/wdisplays/Makefile
+++ b/x11/wdisplays/Makefile
@@ -1,6 +1,5 @@
PORTNAME= wdisplays
-DISTVERSION= 1.1.1
-PORTREVISION= 1
+DISTVERSION= 1.1.3
CATEGORIES= x11 wayland
MAINTAINER= jbeich@FreeBSD.org
diff --git a/x11/wdisplays/distinfo b/x11/wdisplays/distinfo
index a8945ad536b6..3b4518539e7c 100644
--- a/x11/wdisplays/distinfo
+++ b/x11/wdisplays/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1688213246
-SHA256 (artizirk-wdisplays-1.1.1_GH0.tar.gz) = 2df2c56db494c8450b1c7746b0ed2af11bf637fe2838f7412146fcc5cc1a2605
-SIZE (artizirk-wdisplays-1.1.1_GH0.tar.gz) = 108810
+TIMESTAMP = 1753443827
+SHA256 (artizirk-wdisplays-1.1.3_GH0.tar.gz) = 6b8674598d50cb56a3acb79bd563c1d7a7d7781a8ce8dcc83a240916024b7070
+SIZE (artizirk-wdisplays-1.1.3_GH0.tar.gz) = 109082
diff --git a/x11/workrave/Makefile b/x11/workrave/Makefile
index c8fcca41a51b..06251bfa3ec6 100644
--- a/x11/workrave/Makefile
+++ b/x11/workrave/Makefile
@@ -1,7 +1,7 @@
PORTNAME= workrave
DISTVERSIONPREFIX= v
DISTVERSION= 1.10.50
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11
MASTER_SITES= https://github.com/rcaelers/workrave/releases/download/v${DISTVERSION:S/./_/g}/
@@ -10,7 +10,7 @@ COMMENT= RSI prevention tool (${FLAVOR} flavor)
WWW= https://www.workrave.org/
LICENSE= GPLv3+
-LICENSE_FILE= COPYING
+LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libgdome.so:textproc/gdome2 \
libharfbuzz.so:print/harfbuzz
@@ -34,7 +34,7 @@ PLIST_FILES= lib/xfce4/panel/plugins/libworkrave-plugin.a \
share/xfce4/panel/plugins/workrave-xfce-applet.desktop
.endif
USE_CXXSTD= c++11
-USE_GNOME= gdkpixbuf gtkmm30 intlhack intltool introspection:build
+USE_GNOME= gdkpixbuf gtkmm30 intlhack intltool introspection:build libxml2
USE_LDCONFIG= yes
USE_XORG= ice sm x11 xext xmu xorgproto xscrnsaver xtst
diff --git a/x11/xcb-proto/Makefile b/x11/xcb-proto/Makefile
index 8a03571772e2..6e232b2d3703 100644
--- a/x11/xcb-proto/Makefile
+++ b/x11/xcb-proto/Makefile
@@ -1,6 +1,7 @@
PORTNAME= xcb-proto
PORTVERSION= 1.17.0
CATEGORIES= x11 python
+MASTER_SITES= XORG/individual/proto
MAINTAINER= x11@FreeBSD.org
COMMENT= The X protocol C-language Binding (XCB) protocol
@@ -9,10 +10,10 @@ WWW= https://xcb.freedesktop.org/
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/COPYING
-USES= gnome python tar:xz xorg-cat:proto
+GNU_CONFIGURE= yes
+USES= gnome python tar:xz
USE_GNOME= libxml2:build
NO_ARCH= yes
-MAKE_ARGS= pkgconfigdir=${PREFIX}/libdata/pkgconfig
DATADIR= ${PREFIX}/share/xcb
diff --git a/x11/xcb-proto/distinfo b/x11/xcb-proto/distinfo
index 0a6e99c81a30..e75a3f68397f 100644
--- a/x11/xcb-proto/distinfo
+++ b/x11/xcb-proto/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1713255468
-SHA256 (xorg/proto/xcb-proto-1.17.0.tar.xz) = 2c1bacd2110f4799f74de6ebb714b94cf6f80fb112316b1219480fd22562148c
-SIZE (xorg/proto/xcb-proto-1.17.0.tar.xz) = 151748
+TIMESTAMP = 1753269668
+SHA256 (xcb-proto-1.17.0.tar.xz) = 2c1bacd2110f4799f74de6ebb714b94cf6f80fb112316b1219480fd22562148c
+SIZE (xcb-proto-1.17.0.tar.xz) = 151748
diff --git a/x11/xcb-proto/pkg-plist b/x11/xcb-proto/pkg-plist
index 10db9e7288d2..de8ab93d2518 100644
--- a/x11/xcb-proto/pkg-plist
+++ b/x11/xcb-proto/pkg-plist
@@ -1,4 +1,4 @@
-libdata/pkgconfig/xcb-proto.pc
+share/pkgconfig/xcb-proto.pc
%%DATADIR%%/bigreq.xml
%%DATADIR%%/composite.xml
%%DATADIR%%/damage.xml
diff --git a/x11/xnee/Makefile b/x11/xnee/Makefile
index 2f0a5f8730d3..f88c203e03c0 100644
--- a/x11/xnee/Makefile
+++ b/x11/xnee/Makefile
@@ -33,7 +33,6 @@ GNEE_DESKTOP_ENTRIES= "Gnee" "" "${PORTNAME}.png" \
post-patch:
@${REINPLACE_CMD} -e \
's|$${libdir}/gnome-panel|$${prefix}/libexec|g ; \
- s|$${libdir}/bonobo/|$${prefix}/libdata/bonobo/|g ; \
s|"CCC"|""|g' ${WRKSRC}/configure
@${REINPLACE_CMD} -e \
's|@PIXMAP_DIR@|pixmap|g ; \
diff --git a/x11/xorgproto/Makefile b/x11/xorgproto/Makefile
index 50ab69358a11..057745dc40d2 100644
--- a/x11/xorgproto/Makefile
+++ b/x11/xorgproto/Makefile
@@ -1,6 +1,7 @@
PORTNAME= xorgproto
DISTVERSION= 2024.1
CATEGORIES= x11
+MASTER_SITES= XORG/individual/proto
MAINTAINER= x11@FreeBSD.org
COMMENT= X Window System unified protocol definitions
@@ -8,10 +9,11 @@ WWW= https://gitlab.freedesktop.org/xorg/proto/xorgproto
LICENSE= MIT
-USES= tar:xz xorg-cat:proto
+USES= tar:xz
NO_ARCH= yes
+GNU_CONFIGURE= yes
CONFIGURE_ARGS= --without-fop \
--without-xmlto \
--without-xsltproc \
diff --git a/x11/xorgproto/distinfo b/x11/xorgproto/distinfo
index fe87b2b0eba8..d965a0e2d162 100644
--- a/x11/xorgproto/distinfo
+++ b/x11/xorgproto/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1711437392
-SHA256 (xorg/proto/xorgproto-2024.1.tar.xz) = 372225fd40815b8423547f5d890c5debc72e88b91088fbfb13158c20495ccb59
-SIZE (xorg/proto/xorgproto-2024.1.tar.xz) = 760500
+TIMESTAMP = 1753269244
+SHA256 (xorgproto-2024.1.tar.xz) = 372225fd40815b8423547f5d890c5debc72e88b91088fbfb13158c20495ccb59
+SIZE (xorgproto-2024.1.tar.xz) = 760500
diff --git a/x11/xorgproto/pkg-plist b/x11/xorgproto/pkg-plist
index cfe2fdaa2618..c94ee5e6fd55 100644
--- a/x11/xorgproto/pkg-plist
+++ b/x11/xorgproto/pkg-plist
@@ -127,35 +127,35 @@ include/X11/fonts/fontstruct.h
include/X11/fonts/fsmasks.h
include/X11/keysym.h
include/X11/keysymdef.h
-libdata/pkgconfig/applewmproto.pc
-libdata/pkgconfig/bigreqsproto.pc
-libdata/pkgconfig/compositeproto.pc
-libdata/pkgconfig/damageproto.pc
-libdata/pkgconfig/dmxproto.pc
-libdata/pkgconfig/dpmsproto.pc
-libdata/pkgconfig/dri2proto.pc
-libdata/pkgconfig/dri3proto.pc
-libdata/pkgconfig/fixesproto.pc
-libdata/pkgconfig/fontsproto.pc
-libdata/pkgconfig/glproto.pc
-libdata/pkgconfig/inputproto.pc
-libdata/pkgconfig/kbproto.pc
-libdata/pkgconfig/presentproto.pc
-libdata/pkgconfig/randrproto.pc
-libdata/pkgconfig/recordproto.pc
-libdata/pkgconfig/renderproto.pc
-libdata/pkgconfig/resourceproto.pc
-libdata/pkgconfig/scrnsaverproto.pc
-libdata/pkgconfig/videoproto.pc
-libdata/pkgconfig/xcmiscproto.pc
-libdata/pkgconfig/xextproto.pc
-libdata/pkgconfig/xf86bigfontproto.pc
-libdata/pkgconfig/xf86dgaproto.pc
-libdata/pkgconfig/xf86driproto.pc
-libdata/pkgconfig/xf86vidmodeproto.pc
-libdata/pkgconfig/xineramaproto.pc
-libdata/pkgconfig/xproto.pc
-libdata/pkgconfig/xwaylandproto.pc
+share/pkgconfig/applewmproto.pc
+share/pkgconfig/bigreqsproto.pc
+share/pkgconfig/compositeproto.pc
+share/pkgconfig/damageproto.pc
+share/pkgconfig/dmxproto.pc
+share/pkgconfig/dpmsproto.pc
+share/pkgconfig/dri2proto.pc
+share/pkgconfig/dri3proto.pc
+share/pkgconfig/fixesproto.pc
+share/pkgconfig/fontsproto.pc
+share/pkgconfig/glproto.pc
+share/pkgconfig/inputproto.pc
+share/pkgconfig/kbproto.pc
+share/pkgconfig/presentproto.pc
+share/pkgconfig/randrproto.pc
+share/pkgconfig/recordproto.pc
+share/pkgconfig/renderproto.pc
+share/pkgconfig/resourceproto.pc
+share/pkgconfig/scrnsaverproto.pc
+share/pkgconfig/videoproto.pc
+share/pkgconfig/xcmiscproto.pc
+share/pkgconfig/xextproto.pc
+share/pkgconfig/xf86bigfontproto.pc
+share/pkgconfig/xf86dgaproto.pc
+share/pkgconfig/xf86driproto.pc
+share/pkgconfig/xf86vidmodeproto.pc
+share/pkgconfig/xineramaproto.pc
+share/pkgconfig/xproto.pc
+share/pkgconfig/xwaylandproto.pc
%%PORTDOCS%%%%DOCSDIR%%/compositeproto.txt
%%PORTDOCS%%%%DOCSDIR%%/damageproto.txt
%%PORTDOCS%%%%DOCSDIR%%/dri2proto.txt