Attachment 115406 Details for Bug 157173 – musicpd.diff

[patch] musicpd.diff

musicpd.diff (text/plain), 1.79 KB, created by Doug Barton on 2011-05-21 19:17:48 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Doug Barton

Created: 2011-05-21 19:17:48 UTC

Size: 1.79 KB

patch

obsolete

>Index: Makefile
>===================================================================
>RCS file: /home/pcvs/ports/audio/musicpd/Makefile,v
>retrieving revision 1.63
>diff -u -r1.63 Makefile
>--- Makefile	16 May 2011 13:32:35 -0000	1.63
>+++ Makefile	21 May 2011 18:13:21 -0000
>@@ -7,7 +7,7 @@
> 
> PORTNAME=	musicpd
> PORTVERSION=	0.16.2
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	audio ipv6
> MASTER_SITES=	SF/${PORTNAME}/mpd/${PORTVERSION}
> DISTNAME=	mpd-${PORTVERSION}
>Index: files/musicpd.in
>===================================================================
>RCS file: /home/pcvs/ports/audio/musicpd/files/musicpd.in,v
>retrieving revision 1.7
>diff -u -r1.7 musicpd.in
>--- files/musicpd.in	16 May 2011 13:32:35 -0000	1.7
>+++ files/musicpd.in	21 May 2011 18:13:21 -0000
>@@ -1,6 +1,6 @@
> #!/bin/sh
>-#
>-# $FreeBSD: ports/audio/musicpd/files/musicpd.in,v 1.7 2011/05/16 13:32:35 nivit Exp $
>+
>+# $FreeBSD$
> #
> # PROVIDE: musicpd
> # REQUIRE: mixer LOGIN avahi_daemon
>@@ -8,28 +8,31 @@
> 
> # Add the following line to /etc/rc.conf to enable mpd:
> #
>-#musicpd_enable="YES"
>+# musicpd_enable="YES"
> 
> . /etc/rc.subr
> 
> name=musicpd
> rcvar=`set_rcvar`
>-stop_cmd="${name}_stop"
>+start_precmd="${name}_getpidfile"
>+stop_precmd="${name}_getpidfile"
> 
>-config=%%PREFIX%%/etc/%%MPDCONF%%
> command=%%PREFIX%%/bin/musicpd
>-required_files=$config
>+command_args=%%PREFIX%%/etc/%%MPDCONF%%
>+required_files=%%PREFIX%%/etc/%%MPDCONF%%
> 
>-musicpd_stop()
>+musicpd_getpidfile()
> {
>-	echo -n "Stopping musicpd: ";
>-	${command} --kill ${config} && echo "stopped.";
>+	if type get_pidfile_from_conf >/dev/null 2>&1 &&
>+	    get_pidfile_from_conf pid_file %%PREFIX%%/etc/%%MPDCONF%% ; then
>+		pidfile="$_pidfile_from_conf"
>+	else
>+		pidfile="%%MPDDIR%%/.mpd/pid"
>+	fi
> }
> 
> load_rc_config $name
> 
> : ${musicpd_enable="NO"}
> 
>-command_args="$config"
>-
> run_rc_command "$1"

Actions: View | Diff

Attachments on bug 157173: 115403 | 115404 | 115405 | 115406