From e051160d50269fb3006f3cea2e69925e9955ec36 Mon Sep 17 00:00:00 2001
From: Zsolt Udvari <uzsolt@FreeBSD.org>
Date: Fri, 18 Apr 2025 10:49:18 +0200
Subject: [PATCH] sysutils/dunst: Improving port

Add TEST_TARGET and TEST_DEPENDS.
The textproc/jq is runtime dependency.
Use MAKE_ENV handle DUNSTIFY option instead of patching.
Use OPTIONS_SUB.
---
 sysutils/dunst/Makefile  | 20 +++++++++++---------
 sysutils/dunst/pkg-plist |  3 ++-
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/sysutils/dunst/Makefile b/sysutils/dunst/Makefile
index 0d3d79494dad..073bf1c8bf10 100644
--- a/sysutils/dunst/Makefile
+++ b/sysutils/dunst/Makefile
@@ -1,6 +1,7 @@
 PORTNAME=	dunst
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.12.2
+PORTREVISION=	1
 CATEGORIES=	sysutils
 
 MAINTAINER=	uzsolt@FreeBSD.org
@@ -13,6 +14,10 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 BUILD_DEPENDS=	evdev-proto>0:devel/evdev-proto
 LIB_DEPENDS=	libdbus-1.so:devel/dbus \
 		libharfbuzz.so:print/harfbuzz
+# textproc/jq required by completions
+RUN_DEPENDS=	jq:textproc/jq
+TEST_DEPENDS=	bash:shells/bash \
+		valgrind:devel/valgrind
 
 USES=		gmake gnome perl5 pkgconfig xorg
 
@@ -23,16 +28,19 @@ USE_GNOME=	cairo gdkpixbuf pango
 USE_PERL5=	build
 USE_XORG=	x11 xext xinerama xrandr xscrnsaver
 
-MAKE_ARGS=	MANPREFIX="${PREFIX}/share/man" SYSCONFDIR="${PREFIX}/etc" \
+MAKE_ARGS=	MANPREFIX="${PREFIX}/share/man" \
+		SYSCONFDIR="${PREFIX}/etc" \
 		SYSTEMD=0
+TEST_TARGET=	test
 
-OPTIONS_DEFINE=	DUNSTIFY WAYLAND
+OPTIONS_DEFINE=		DUNSTIFY WAYLAND
 OPTIONS_DEFAULT=	DUNSTIFY WAYLAND
+OPTIONS_SUB=		yes
 
 DUNSTIFY_DESC=	Install dunstify (alternative to the notify-send)
 
 DUNSTIFY_LIB_DEPENDS=	libnotify.so:devel/libnotify
-DUNSTIFY_PLIST_FILES=	bin/dunstify
+DUNSTIFY_MAKE_ENV_OFF=	DUNSTIFY=0
 
 WAYLAND_CATEGORIES=	wayland
 WAYLAND_BUILD_DEPENDS=	wayland-protocols>0:graphics/wayland-protocols
@@ -49,12 +57,6 @@ post-patch:
 		${WRKSRC}/src/settings_data.h \
 		${WRKSRC}/src/icon-lookup.c
 
-post-patch-DUNSTIFY-off:
-	@${REINPLACE_CMD} -e '/^all:/s/dunstify//' \
-		 -e '/^install:/s/install-dunstify//' \
-		${WRKSRC}/Makefile
-	@${REINPLACE_CMD} '/libnotify/d' ${WRKSRC}/config.mk
-
 pre-install:
 	@${MKDIR} ${STAGEDIR}${ETCDIR}
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/dbus-1/services/
diff --git a/sysutils/dunst/pkg-plist b/sysutils/dunst/pkg-plist
index a4c49e917358..77f179623987 100644
--- a/sysutils/dunst/pkg-plist
+++ b/sysutils/dunst/pkg-plist
@@ -1,12 +1,13 @@
 bin/dunst
 bin/dunstctl
+%%DUNSTIFY%%bin/dunstify
 @sample %%ETCDIR%%/dunstrc.sample
 share/bash-completion/completions/dunst
 share/bash-completion/completions/dunstctl
 share/dbus-1/services/org.knopwob.dunst.service
 share/fish/vendor_completions.d/dunst.fish
 share/fish/vendor_completions.d/dunstctl.fish
-share/fish/vendor_completions.d/dunstify.fish
+%%DUNSTIFY%%share/fish/vendor_completions.d/dunstify.fish
 share/man/man1/dunst.1.gz
 share/man/man1/dunstctl.1.gz
 share/man/man1/dunstify.1.gz