From: "Alvar Penning" <post@0x21.biz>
Subject: Re: [update] x11/dunst to 1.13.0
To: <ports@openbsd.org>, "Stuart Henderson" <stu@spacehopper.org>
Cc: "Timo Myyra" <timo.myyra@bittivirhe.fi>
Date: Fri, 15 Aug 2025 21:36:29 +0200

Hi Stuart,

On Thu Aug 14, 2025 at 9:46 AM CEST, Stuart Henderson wrote:
> Could you send a patch(1)-compatible diff i.e. --no-renames please?
> Whoever commits will be doing so from a CVS checkout.

Thanks for your reply and please excuse the wrong format. An updated
diff follows my message.

To prevent others from making the same mistake, the git config part of
the "Preparing a Diff" section in faq5.html[0] could be updated as
follows.

  $ git config diff.noprefix true
  $ git config diff.relative true
  $ git config diff.renames false

Doing so allows getting rid of the "--relative" command line argument
for "git diff" or "git show". At least for so long as the git command is
executed from the right directory.

Best,
Alvar

[0]: https://www.openbsd.org/faq/faq5.html#Diff


diff --git Makefile Makefile
index 03413c0556d..9b7c13f3633 100644
--- Makefile
+++ Makefile
@@ -2,7 +2,7 @@ COMMENT =	customizable and lightweight notification-daemon
 
 GH_ACCOUNT =	dunst-project
 GH_PROJECT =	dunst
-GH_TAGNAME =	v1.12.2
+GH_TAGNAME =	v1.13.0
 
 CATEGORIES =	x11
 
@@ -46,7 +46,7 @@ FAKE_FLAGS =	PREFIX="${PREFIX}" \
 		SYSCONFDIR="/etc"
 
 pre-configure:
-	${SUBST_CMD} ${WRKSRC}/docs/dunst.1.pod \
+	${SUBST_CMD} ${WRKSRC}/docs/dunst.1.pod.in \
 		${WRKSRC}/docs/dunst.5.pod ${WRKSRC}/dunstrc
 
 post-install:
diff --git distinfo distinfo
index 131aa727da1..378d1a756bd 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (dunst-1.12.2.tar.gz) = j3ZkvU5gg+lgTighRf5bje52VfoLCZpbaColSeHzPTI=
-SIZE (dunst-1.12.2.tar.gz) = 4657260
+SHA256 (dunst-1.13.0.tar.gz) = eooYE5d61ZQUiMZrkUUBcD/A9uEuYx3BhQatYXJC56A=
+SIZE (dunst-1.13.0.tar.gz) = 4664717
diff --git patches/patch-docs_dunst_1_pod patches/patch-docs_dunst_1_pod
deleted file mode 100644
index f78cc4119e3..00000000000
--- patches/patch-docs_dunst_1_pod
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: docs/dunst.1.pod
---- docs/dunst.1.pod.orig
-+++ docs/dunst.1.pod
-@@ -94,7 +94,7 @@ Set notification timeout time.
- 
- A default configuration file is included (usually ##SYSCONFDIR##/dunst/dunstrc)
- and serves as the least important configuration file. Note: this was previously
--/usr/share/dunst/dunstrc. You can edit this file to change the system-wide
-+${PREFIX}/share/dunst/dunstrc. You can edit this file to change the system-wide
- defaults or copy it to a more important location to override its settings. See
- the FILES section for more details on where dunst searches for its
- configuration files and how settings get applied.
diff --git patches/patch-docs_dunst_1_pod_in patches/patch-docs_dunst_1_pod_in
new file mode 100644
index 00000000000..64fbce9e8bb
--- /dev/null
+++ patches/patch-docs_dunst_1_pod_in
@@ -0,0 +1,12 @@
+Index: docs/dunst.1.pod.in
+--- docs/dunst.1.pod.in.orig
++++ docs/dunst.1.pod.in
+@@ -94,7 +94,7 @@ Set notification timeout time.
+ 
+ A default configuration file is included (usually @sysconfdir@/dunst/dunstrc)
+ and serves as the least important configuration file. Note: this was previously
+-/usr/share/dunst/dunstrc. You can edit this file to change the system-wide
++${PREFIX}/share/dunst/dunstrc. You can edit this file to change the system-wide
+ defaults or copy it to a more important location to override its settings. See
+ the FILES section for more details on where dunst searches for its
+ configuration files and how settings get applied.