git: 042205f33095 - main - audio/murmur: Fix broken murmur.ini defaults

The branch main has been updated by feld:

URL: https://cgit.FreeBSD.org/ports/commit/?id=042205f33095e7e0d7a3852d998727a5bf863487

commit 042205f33095e7e0d7a3852d998727a5bf863487
Author:     Mark Felder <feld@FreeBSD.org>
AuthorDate: 2025-04-12 23:35:43 +0000
Commit:     Mark Felder <feld@FreeBSD.org>
CommitDate: 2025-04-12 23:35:43 +0000

    audio/murmur: Fix broken murmur.ini defaults
    
    Submitted by: jacob@dstsrc.net
    PR:       240649
---
 audio/murmur/Makefile        | 13 +++++++++----
 audio/murmur/files/murmur.in |  9 ---------
 audio/murmur/pkg-plist       |  3 +++
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/audio/murmur/Makefile b/audio/murmur/Makefile
index 712b7db53eb9..7133ffd0d8a6 100644
--- a/audio/murmur/Makefile
+++ b/audio/murmur/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	murmur
 DISTVERSION=	1.3.4
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	audio net
 
 MAINTAINER=	vvd@FreeBSD.org
@@ -69,9 +69,9 @@ post-patch:
 
 pre-install:
 	${SED} -i '' -e 's|database=.*|database=/var/db/murmur/murmur.sqlite|' ${WRKSRC}/scripts/murmur.ini
-	${SED} -i '' -e 's|#pidfile=.*|pidfile=/var/run/murmur/murmur.pid|' ${WRKSRC}/scripts/murmur.ini
-	${SED} -i '' -e 's|#logfile=.*|logfile=/var/log/murmur/murmur.log|' ${WRKSRC}/scripts/murmur.ini
-	${SED} -i '' -e 's|#host=.*|host=0.0.0.0|' ${WRKSRC}/scripts/murmur.ini
+	${SED} -i '' -e 's|;pidfile=.*|pidfile=/var/run/murmur/murmur.pid|' ${WRKSRC}/scripts/murmur.ini
+	${SED} -i '' -e 's|;logfile=.*|logfile=/var/log/murmur/murmur.log|' ${WRKSRC}/scripts/murmur.ini
+	${SED} -i '' -e 's|;host=.*|host=0.0.0.0|' ${WRKSRC}/scripts/murmur.ini
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/release/murmurd ${STAGEDIR}${PREFIX}/sbin
@@ -84,4 +84,9 @@ do-install-DOCS-on:
 	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
 .endfor
 
+post-install:
+	${MKDIR} ${STAGEDIR}/var/db/murmur
+	${MKDIR} ${STAGEDIR}/var/log/murmur
+	${MKDIR} ${STAGEDIR}/var/run/murmur
+
 .include <bsd.port.post.mk>
diff --git a/audio/murmur/files/murmur.in b/audio/murmur/files/murmur.in
index 9767d41513e7..e0cc70b39dfc 100644
--- a/audio/murmur/files/murmur.in
+++ b/audio/murmur/files/murmur.in
@@ -26,16 +26,7 @@ load_rc_config $name
 command="%%PREFIX%%/sbin/murmurd"
 command_args="-ini %%PREFIX%%/etc/murmur.ini"
 pidfile=/var/run/murmur/murmur.pid
-start_precmd=murmur_prestart
 extra_commands="reload"
 sig_reload="USR1"
 
-murmur_prestart() {
-	for i in /var/log/murmur /var/run/murmur /var/db/murmur; do
-		if [ ! -d ${i} ]; then
-			install -d -o %%USERS%% -g %%GROUPS%% ${i}
-		fi
-	done
-}
-
 run_rc_command "$1"
diff --git a/audio/murmur/pkg-plist b/audio/murmur/pkg-plist
index ebea70067760..a7f312631e46 100644
--- a/audio/murmur/pkg-plist
+++ b/audio/murmur/pkg-plist
@@ -5,3 +5,6 @@ sbin/murmurd
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/README.Linux
+@dir(murmur,murmur,) /var/db/murmur
+@dir(murmur,wheel,) /var/log/murmur
+@dir(murmur,murmur,) /var/run/murmur