Index: head/sysutils/dunst/Makefile
===================================================================
--- head/sysutils/dunst/Makefile	(revision 566429)
+++ head/sysutils/dunst/Makefile	(revision 566430)
@@ -1,49 +1,69 @@
 # Created by: Rod Person <rodperson@rodperson.com>
 # $FreeBSD$
 
 PORTNAME=	dunst
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.5.0
+DISTVERSION=	1.6.1
 CATEGORIES=	sysutils
 
 MAINTAINER=	dmgk@FreeBSD.org
 COMMENT=	Lightweight notification daemon
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
+BUILD_DEPENDS=	evdev-proto>0:devel/evdev-proto
 LIB_DEPENDS=	libdbus-1.so:devel/dbus
 
 USES=		gmake gnome perl5 pkgconfig xorg
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	dunst-project
 
 USE_GNOME=	cairo gdkpixbuf2 pango
 USE_PERL5=	build
 USE_XORG=	x11 xext xinerama xrandr xscrnsaver
 
-MAKE_ARGS=	MANPREFIX="${PREFIX}/man"
+MAKE_ARGS=	MANPREFIX="${PREFIX}/man" SYSCONFDIR="${PREFIX}/etc"
 ALL_TARGET=	dunst
 TEST_TARGET=	test
 
-OPTIONS_DEFINE=	DUNSTIFY
-OPTIONS_DEFAULT=	DUNSTIFY
+OPTIONS_DEFINE=	DUNSTIFY WAYLAND
+OPTIONS_DEFAULT=	DUNSTIFY WAYLAND
 
 DUNSTIFY_DESC=	Install dunstify (alternative to the notify-send)
 
 DUNSTIFY_LIB_DEPENDS=	libnotify.so:devel/libnotify
-DUNSTIFY_ALL_TARGET=	dunstify
 DUNSTIFY_PLIST_FILES=	bin/dunstify
 
+WAYLAND_BUILD_DEPENDS=	wayland-protocols>0:graphics/wayland-protocols
+WAYLAND_LIB_DEPENDS=	libwayland-client.so:graphics/wayland
+WAYLAND_MAKE_ENV_OFF=	WAYLAND=0
+
+post-patch:
+	@${REINPLACE_CMD} -e 's,/usr,${PREFIX},g' \
+		-e 's,/etc,${PREFIX}&,g' \
+		${WRKSRC}/config.h \
+		${WRKSRC}/docs/dunst.?.pod \
+		${WRKSRC}/dunstrc \
+		${WRKSRC}/src/settings.c
+	@${REINPLACE_CMD} -e 's,/dunstrc,&.sample,' \
+		${WRKSRC}/Makefile
+
+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}${PREFIX}/share/dunst/
+	@${MKDIR} ${STAGEDIR}${ETCDIR}
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/dbus-1/services/
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/dunst
 
 post-install-DUNSTIFY-on:
 	${INSTALL_PROGRAM} ${WRKSRC}/dunstify ${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.mk>
Index: head/sysutils/dunst/distinfo
===================================================================
--- head/sysutils/dunst/distinfo	(revision 566429)
+++ head/sysutils/dunst/distinfo	(revision 566430)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1595614338
-SHA256 (dunst-project-dunst-v1.5.0_GH0.tar.gz) = 2c390adf144b5fa0ff007ea3616c90f1bb537df6a8042196993f5585d1bc8c9a
-SIZE (dunst-project-dunst-v1.5.0_GH0.tar.gz) = 169272
+TIMESTAMP = 1613910171
+SHA256 (dunst-project-dunst-v1.6.1_GH0.tar.gz) = cc7d801575f75e92b18d46ee5d3df80aaf331c88b83ec6caabbecf8636310e13
+SIZE (dunst-project-dunst-v1.6.1_GH0.tar.gz) = 217267
Index: head/sysutils/dunst/pkg-plist
===================================================================
--- head/sysutils/dunst/pkg-plist	(revision 566429)
+++ head/sysutils/dunst/pkg-plist	(revision 566430)
@@ -1,6 +1,7 @@
 bin/dunst
 bin/dunstctl
+@sample %%ETCDIR%%/dunstrc.sample
 man/man1/dunst.1.gz
 man/man1/dunstctl.1.gz
+man/man5/dunst.5.gz
 share/dbus-1/services/org.knopwob.dunst.service
-%%DATADIR%%/dunstrc