5 files changed, 26 insertions, 46 deletions
diff --git a/x11/nwg-look/Makefile b/x11/nwg-look/Makefile
index 4fd302264f85..be72e13cc65d 100644
--- a/x11/nwg-look/Makefile
+++ b/x11/nwg-look/Makefile
@@ -1,10 +1,10 @@
 PORTNAME=	nwg-look
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.0.3
-PORTREVISION=	4
+DISTVERSION=	1.0.6
+PORTREVISION=	1
 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 +15,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