4 files changed, 24 insertions, 74 deletions
diff --git a/x11/nwg-drawer/Makefile b/x11/nwg-drawer/Makefile
index 9722f89d7b91..f63a63ae63fa 100644
--- a/x11/nwg-drawer/Makefile
+++ b/x11/nwg-drawer/Makefile
@@ -1,51 +1,39 @@
 PORTNAME=	nwg-drawer
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.6.3
-PORTREVISION=	5
+DISTVERSION=	0.7.4
+PORTREVISION=	1
 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.