On Fri, Aug 15 2025, Alvar Penning wrote:
> 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.
Hi,
Thanks for the heads up on a new release.
The update itself seems require a bit more work though. I looked at
updating the port and got it further along but plist changes require a
bit more work still. The config file location changed but the
update-plist gives:
Stripping directories from devel/pcre2
Can't put into any plist (no applicable prefix):
/etc/xdg
/etc/xdg/dunst
/etc/xdg/dunst/dunstrc
Not found: /usr/local/share/bash-completion/dunst (in
/usr/ports/x11/dunst/pkg/PLIST)
Not found: /usr/local/share/bash-completion/dunstctl (in
/usr/ports/x11/dunst/pkg/PLIST)
Looking for unregistered conflicts
Not sure how to handle that yet.
Timo
diff /usr/ports
path + /usr/ports
commit - be39b43949c984c7759a42ca41c2206de5072ebd
blob - 03413c0556d75dcb7b0f9e21e63d90be96646ce2
file + x11/dunst/Makefile
--- x11/dunst/Makefile
+++ x11/dunst/Makefile
@@ -2,7 +2,7 @@ COMMENT = customizable and lightweight notification-da
GH_ACCOUNT = dunst-project
GH_PROJECT = dunst
-GH_TAGNAME = v1.12.2
+GH_TAGNAME = v1.13.0
CATEGORIES = x11
@@ -38,21 +38,18 @@ RUN_DEPENDS += x11/dbus
TEST_DEPENDS = shells/bash
-MAKE_FLAGS = WAYLAND=0
-
-FAKE_FLAGS = PREFIX="${PREFIX}" \
+MAKE_FLAGS = PREFIX="${PREFIX}" \
MANPREFIX="${PREFIX}/man" \
DATADIR="${PREFIX}/share/examples" \
- SYSCONFDIR="/etc"
+ SYSCONFDIR="/etc/xdg" \
+
BASHCOMPLETIONDIR="${LOCALBASE}/share/bash-completion/completions" \
+
FISHCOMPLETIONDIR="${LOCALBASE}/share/fish/vendor_completions.d" \
+ ZSHCOMPLETIONDIR="${LOCALBASE}/share/zsh/site-functions" \
+ WAYLAND=0 \
+ SYSTEMD=0
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:
- mv ${WRKINST}/${SYSCONFDIR}/dunst ${PREFIX}/share
- mv ${PREFIX}/share/examples/bash-completion
${PREFIX}/share/bash-completion
- mv ${PREFIX}/share/examples/fish ${PREFIX}/share/fish
- mv ${PREFIX}/share/examples/zsh ${PREFIX}/share/zsh
-
.include <bsd.port.mk>
commit - be39b43949c984c7759a42ca41c2206de5072ebd
blob - 131aa727da1cbfa0d084ec96bfd924c670b02181
file + x11/dunst/distinfo
--- x11/dunst/distinfo
+++ x11/dunst/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
commit - be39b43949c984c7759a42ca41c2206de5072ebd
blob - c010fc861b3ee52d84698142af92a707ff79b54b
file + x11/dunst/patches/patch-config_mk
--- x11/dunst/patches/patch-config_mk
+++ x11/dunst/patches/patch-config_mk
@@ -10,5 +10,5 @@ Index: config.mk
+DEFAULT_CFLAGS = -g -std=gnu11 -pedantic -Wall -Wno-overlength-strings
${EXTRA_CFLAGS}
+DEFAULT_LDFLAGS = -lm
- CPPFLAGS_DEBUG := -DDEBUG_BUILD
+ CPPFLAGS_DEBUG :=
CFLAGS_DEBUG := -O0
commit - be39b43949c984c7759a42ca41c2206de5072ebd
blob - f78cc4119e33c2fc7c030b7e912506e84010c35f
file + /dev/null
--- x11/dunst/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.
commit - be39b43949c984c7759a42ca41c2206de5072ebd
blob - /dev/null
file + x11/dunst/patches/patch-docs_dunst_1_pod_in (mode 644)
--- /dev/null
+++ x11/dunst/patches/patch-docs_dunst_1_pod_in
@@ -0,0 +1,15 @@
+Index: docs/dunst.1.pod.in
+--- docs/dunst.1.pod.in.orig
++++ docs/dunst.1.pod.in
+@@ -92,9 +92,9 @@ Set notification timeout time.
+
+ =head1 CONFIGURATION
+
+-A default configuration file is included (usually @sysconfdir@/dunst/dunstrc)
++A default configuration file is included in @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
++${LOCALBASE}/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.
commit - be39b43949c984c7759a42ca41c2206de5072ebd
blob - df6ae772052695068470a7127efdd6100f02de1c
file + x11/dunst/patches/patch-docs_dunst_5_pod
--- x11/dunst/patches/patch-docs_dunst_5_pod
+++ x11/dunst/patches/patch-docs_dunst_5_pod
@@ -1,25 +1,25 @@
Index: docs/dunst.5.pod
--- docs/dunst.5.pod.orig
+++ docs/dunst.5.pod
-@@ -463,7 +463,7 @@ Hide the count of stacked duplicate notifications.
+@@ -475,7 +475,7 @@ Hide the count of stacked duplicate notifications.
Show an indicator if a notification contains actions and/or open-able URLs.
See
ACTIONS below for further details.
-=item B<icon_path> (default:
"/usr/share/icons/gnome/16x16/status/:/usr/share/icons/gnome/16x16/devices/")
-+=item B<icon_path> (default:
"${PREFIX}/share/icons/gnome/16x16/status/:${PREFIX}/share/icons/gnome/16x16/devices/")
++=item B<icon_path> (default:
"${LOCALBASE}/share/icons/gnome/16x16/status/:${LOCALBASE}/share/icons/gnome/16x16/devices/")
Can be set to a colon-separated list of paths to search for icons to use with
notifications.
-@@ -477,7 +477,7 @@ replace icon_path search.
+@@ -489,7 +489,7 @@ replace icon_path search.
Comma-separated list of names of the themes to use for looking up icons. This
has to be the name of the directory in which the theme is located, not the
human-friendly name of the theme. So for example, the theme B<Breeze Dark> is
-located in F</usr/share/icons/breeze-dark>. In this case you have to set the
-+located in F<${PREFIX}/share/icons/breeze-dark>. In this case you have to set
the
++located in F<${LOCALBASE}/share/icons/breeze-dark>. In this case you have to
set the
theme to B<breeze-dark>.
The first theme in the list is the most important. Only if the icon cannot be
-@@ -515,12 +515,12 @@ Maximum number of notifications that will be kept in h
+@@ -527,12 +527,12 @@ Maximum number of notifications that will be kept in h
is reached, older notifications will be deleted once a new one arrives. See
HISTORY.
commit - be39b43949c984c7759a42ca41c2206de5072ebd
blob - 74ca9bd6eede4f02dfe4a073d19b9bafe68a6f48
file + x11/dunst/patches/patch-dunstrc
--- x11/dunst/patches/patch-dunstrc
+++ x11/dunst/patches/patch-dunstrc
@@ -1,7 +1,7 @@
Index: dunstrc
--- dunstrc.orig
+++ dunstrc
-@@ -238,7 +238,7 @@
+@@ -240,7 +240,7 @@
max_icon_size = 128
# Paths to default icons (only necessary when not using recursive icon
lookup)
@@ -10,7 +10,7 @@ Index: dunstrc
### History ###
-@@ -252,10 +252,10 @@
+@@ -254,10 +254,10 @@
### Misc/Advanced ###
# dmenu path.
commit - be39b43949c984c7759a42ca41c2206de5072ebd
blob - 2c1e8aa2ea3d03a69003a1683b117151875cfc93
file + x11/dunst/pkg/PLIST
--- x11/dunst/pkg/PLIST
+++ x11/dunst/pkg/PLIST
@@ -1,3 +1,4 @@
+@sample ${SYSCONFDIR}/dunst/
@bin bin/dunst
bin/dunstctl
@bin bin/dunstify
@@ -7,10 +8,6 @@ bin/dunstctl
@man man/man5/dunst.5
share/bash-completion/completions/dunst
share/bash-completion/completions/dunstctl
-share/dunst/
-@sample ${SYSCONFDIR}/dunst/
-share/dunst/dunstrc
-@sample ${SYSCONFDIR}/dunst/dunstrc
share/examples/dbus-1/
share/examples/dbus-1/services/
share/examples/dbus-1/services/org.knopwob.dunst.service
