svn commit: r309886 - in head: . audio/musicpd audio/musicpd/files

[Chris Rees]

Author: crees
Date: Thu Jan  3 15:34:02 2013
New Revision: 309886
URL: http://svnweb.freebsd.org/changeset/ports/309886

Log:
  Add missing directories for musicpd to work out of the box
  
  Noticed by:	theraven
  
  Fix mpd user home directory

Modified:
  head/UIDs
  head/audio/musicpd/Makefile
  head/audio/musicpd/files/musicpd.in
  head/audio/musicpd/pkg-plist

Modified: head/UIDs
==============================================================================
--- head/UIDs	Thu Jan  3 15:09:27 2013	(r309885)
+++ head/UIDs	Thu Jan  3 15:34:02 2013	(r309886)
@@ -77,7 +77,7 @@ freeradius:*:133:133::0:0:FreeRADIUS Dae
 undernet:*:134:134::0:0:Undernet ircu Daemon:/nonexistent:/usr/sbin/nologin
 rabbitmq:*:135:135::0:0:RabbitMQ:/var/db/rabbitmq:/usr/sbin/nologin
 dhcpd:*:136:136::0:0:ISC DHCP daemon:/nonexistent:/usr/sbin/nologin
-mpd:*:137:137::0:0:MusicPD pseudo-user:/usr/local/var/mpd:/usr/sbin/nologin
+mpd:*:137:137::0:0:MusicPD pseudo-user:/var/mpd:/usr/sbin/nologin
 wolfpack:*:138:138::0:0:Wolfpack Empire Server:/usr/local/share/wolfpack:/usr/sbin/nologin
 shellinabox:*:139:139::0:0:Shell In A Box:/nonexistent:/usr/sbin/nologin
 amanda:*:140:140::0:0:Amanda Daemon:/var/db/amanda:/usr/sbin/nologin

Modified: head/audio/musicpd/Makefile
==============================================================================
--- head/audio/musicpd/Makefile	Thu Jan  3 15:09:27 2013	(r309885)
+++ head/audio/musicpd/Makefile	Thu Jan  3 15:34:02 2013	(r309886)
@@ -2,7 +2,7 @@
 
 PORTNAME=	musicpd
 PORTVERSION=	0.17.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio ipv6
 MASTER_SITES=	SF/${PORTNAME}/mpd/${PORTVERSION}
 DISTNAME=	mpd-${PORTVERSION}
@@ -267,8 +267,7 @@ post-install:
 		${CP} -p ${PREFIX}/etc/${MPDCONF}.sample \
 			${PREFIX}/etc/${MPDCONF} ; \
 	fi
-	@${MKDIR} ${MPDDIR}
-	@${INSTALL} -d -o ${MPDUSER} -g ${MPDGROUP} ${MPDDIR}
+	@${INSTALL} -d -o ${MPDUSER} -g ${MPDGROUP} ${MPDDIR} ${MPDDIR}/.mpd
 	@${ECHO_MSG}
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO_MSG}

Modified: head/audio/musicpd/files/musicpd.in
==============================================================================
--- head/audio/musicpd/files/musicpd.in	Thu Jan  3 15:09:27 2013	(r309885)
+++ head/audio/musicpd/files/musicpd.in	Thu Jan  3 15:34:02 2013	(r309886)
@@ -8,18 +8,22 @@
 
 # Add the following line to /etc/rc.conf to enable mpd:
 #
-# musicpd_enable="YES"
+# musicpd_enable=YES
 
 . /etc/rc.subr
 
 name=musicpd
 rcvar=musicpd_enable
-start_precmd="${name}_getpidfile"
-stop_precmd="${name}_getpidfile"
+
+load_rc_config $name
+
+: ${musicpd_enable:=NO}
 
 command=%%PREFIX%%/bin/musicpd
 command_args=%%PREFIX%%/etc/%%MPDCONF%%
 required_files=%%PREFIX%%/etc/%%MPDCONF%%
+start_precmd=${name}_getpidfile
+stop_precmd=${name}_getpidfile
 
 musicpd_getpidfile()
 {
@@ -31,8 +35,4 @@ musicpd_getpidfile()
 	fi
 }
 
-load_rc_config $name
-
-: ${musicpd_enable="NO"}
-
-run_rc_command "$1"
+run_rc_command $1

Modified: head/audio/musicpd/pkg-plist
==============================================================================
--- head/audio/musicpd/pkg-plist	Thu Jan  3 15:09:27 2013	(r309885)
+++ head/audio/musicpd/pkg-plist	Thu Jan  3 15:34:02 2013	(r309886)
@@ -2,4 +2,4 @@ bin/musicpd
 @unexec if cmp -s %D/etc/%%MPDCONF%%.sample %D/etc/%%MPDCONF%%; then rm -f %D/etc/%%MPDCONF%%; fi
 etc/%%MPDCONF%%.sample
 @exec if [ ! -f %D/etc/%%MPDCONF%% ] ; then cp -p %D/%F %B/%%MPDCONF%%; fi
- at exec install -d -o %%MPDUSER%% -g %%MPDGROUP%% %%MPDDIR%%
+ at exec install -d -o %%MPDUSER%% -g %%MPDGROUP%% %%MPDDIR%% %%MPDDIR%%/.mpd