- Update to 0.15.12

- Install configuration file if it does not exist

PR:		ports/148082
Submitted by:	Chris Rees <utisoft@gmail.com> (maintainer)

audio/musicpd/Makefile

@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	musicpd
-PORTVERSION=	0.15.8
-PORTREVISION=	4
+PORTVERSION=	0.15.12
 CATEGORIES=	audio ipv6
 MASTER_SITES=	SF/${PORTNAME}/mpd/${PORTVERSION}
 DISTNAME=	mpd-${PORTVERSION}
@@ -62,6 +61,7 @@ OPTIONS=	ID3TAG          "Support ID3 v1/v2 tags"                on \
 MPDDIR=	var/mpd
 MPDUSER=	mpd
 MPDGROUP=	mpd
+MPDCONF=	mpd.conf
 
 USERS=	${MPDUSER}
 GROUPS=	${MPDGROUP}
@@ -70,13 +70,15 @@ MPDUID=	137
 MPDGID=	137
 
 PLIST_SUB=	MPDUSER=${MPDUSER} \
-		MPDGROUP=${MPDGROUP}
+		MPDGROUP=${MPDGROUP} \
+		MPDCONF=${MPDCONF}
 
 SUB_LIST+=	MPDUSER=${MPDUSER} \
 		MPDGROUP=${MPDGROUP} \
 		MPDDIR=${PREFIX}/${MPDDIR} \
 		MPDUID=${MPDUID} \
-		MPDGID=${MPDGID}
+		MPDGID=${MPDGID} \
+		MPDCONF=${MPDCONF}
 
 .include <bsd.port.pre.mk>
 
@@ -227,6 +229,10 @@ post-patch:
 .endif
 
 post-install:
+	@${INSTALL_DATA} ${WRKSRC}/doc/mpdconf.example ${PREFIX}/etc/${MPDCONF}.sample
+	@if [ ! -f ${PREFIX}/etc/${MPDCONF} ]; then \
+		${CP} -p ${PREFIX}/etc/${MPDCONF}.sample ${PREFIX}/etc/${MPDCONF} ; \
+	fi
 	@${MKDIR} ${PREFIX}/${MPDDIR}
 	@${CHOWN} -R ${MPDUSER}:${MPDGROUP} ${PREFIX}/${MPDDIR}
 	@${ECHO_MSG}

audio/musicpd/distinfo

@@ -1,3 +1,3 @@
-MD5 (mpd-0.15.8.tar.bz2) = 824e1ce46c0f468865d9e5e403cdaf5d
-SHA256 (mpd-0.15.8.tar.bz2) = 5de1bac0af52c6d2d2744a8c8c84bb1423de4eff2351790068173cf4f287aad7
-SIZE (mpd-0.15.8.tar.bz2) = 390489
+MD5 (mpd-0.15.12.tar.bz2) = b00b289a20ecd9accfd4972d6395135c
+SHA256 (mpd-0.15.12.tar.bz2) = 0a9ff27d265b3ca2892bf56f2b01acffc657a81833e83dabbec9b7a4be80b3b3
+SIZE (mpd-0.15.12.tar.bz2) = 391039

audio/musicpd/files/musicpd.in

@@ -15,7 +15,7 @@ name=musicpd
 rcvar=`set_rcvar`
 stop_cmd="${name}_stop"
 
-config=%%PREFIX%%/etc/mpd.conf
+config=%%PREFIX%%/etc/%%MPDCONF%%
 command=%%PREFIX%%/bin/mpd
 required_files=$config
 

audio/musicpd/files/pkg-message.in

@@ -2,10 +2,9 @@
 
 The musicpd package has been successfully installed.
 
-In order to run the MPD server, you need to create
+In order to run the MPD server, you need to edit
 
-	%%PREFIX%%/etc/mpd.conf out of
-	%%PREFIX%%/share/doc/mpd/mpdconf.example
+	%%PREFIX%%/etc/%%MPDCONF%%
 
 and add the following line to /etc/rc.conf:
 

audio/musicpd/pkg-plist

@@ -1,2 +1,5 @@
 bin/mpd
 @dirrmtry var/mpd
+@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