4 files changed, 14 insertions, 52 deletions
diff --git a/x11/nwg-menu/Makefile b/x11/nwg-menu/Makefile
index 59f222b5365a..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=	4
+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")