Attachment 207602 Details for Bug 240649 – Combined patch

[patch] Combined patch

murmur.patch (text/plain), 2.23 KB, created by Jacob Wahlgren on 2019-09-18 11:46:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jacob Wahlgren

Created: 2019-09-18 11:46:05 UTC

Size: 2.23 KB

patch

obsolete

>--- audio/murmur/files/murmur.in.orig	2019-09-17 20:05:44.429726000 +0200
>+++ audio/murmur/files/murmur.in	2019-09-17 18:27:20.425143000 +0200
>@@ -28,14 +28,5 @@
> command="%%PREFIX%%/sbin/murmurd"
> command_args="-ini %%PREFIX%%/etc/murmur.ini"
> pidfile=/var/run/murmur/murmur.pid
>-start_precmd=murmur_prestart
>-
>-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"
>--- audio/murmur/Makefile.orig	2019-09-17 17:33:08.601531000 +0200
>+++ audio/murmur/Makefile	2019-09-17 20:40:19.704510000 +0200
>@@ -78,13 +78,10 @@
> 
> post-patch:
> 	@${ECHO_CMD} 'QMAKE_LFLAGS += -fstack-protector' >> ${WRKSRC}/src/murmur/murmur.pro
>+	@${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
> 
>-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
>-
> do-install:
> 	${INSTALL_PROGRAM} ${WRKSRC}/release/murmurd ${STAGEDIR}${PREFIX}/sbin
> 	${INSTALL_DATA} ${WRKSRC}/scripts/murmur.ini ${STAGEDIR}${PREFIX}/etc/murmur.ini.sample
>@@ -96,5 +93,10 @@
> .for f in CHANGES INSTALL README README.Linux
> 	${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>
>--- audio/murmur/pkg-plist.orig	2019-09-17 17:36:58.876178000 +0200
>+++ audio/murmur/pkg-plist	2019-09-17 18:43:57.443333000 +0200
>@@ -5,3 +5,6 @@
> %%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

Actions: View | Diff

Attachments on bug 240649: 207579 | 207580 | 207581 | 207602