Index: files/musicpd.in
===================================================================
RCS file: /exports/cvsroot-freebsd/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 07:42:30 -0000
@@ -1,7 +1,5 @@
 #!/bin/sh
 #
-# $FreeBSD: ports/audio/musicpd/files/musicpd.in,v 1.7 2011/05/16 13:32:35 nivit Exp $
-#
 # PROVIDE: musicpd
 # REQUIRE: mixer LOGIN avahi_daemon
 # KEYWORD: shutdown
@@ -14,16 +12,21 @@
 
 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
 
-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