aboutsummaryrefslogtreecommitdiff
path: root/audio/musicpd
diff options
context:
space:
mode:
authorSahil Tandon <sahil@FreeBSD.org>2010-07-25 02:48:54 +0000
committerSahil Tandon <sahil@FreeBSD.org>2010-07-25 02:48:54 +0000
commitb171055c7d96270dd148fdf031d2a6540f599604 (patch)
treebb641c796505c91650a600d4c06b4656222cb4e8 /audio/musicpd
parent9e721c894bd6e310a9287f7faedacca8fae836d2 (diff)
Notes
Diffstat (limited to 'audio/musicpd')
-rw-r--r--audio/musicpd/Makefile14
-rw-r--r--audio/musicpd/distinfo6
-rw-r--r--audio/musicpd/files/musicpd.in2
-rw-r--r--audio/musicpd/files/pkg-message.in5
-rw-r--r--audio/musicpd/pkg-plist3
5 files changed, 19 insertions, 11 deletions
diff --git a/audio/musicpd/Makefile b/audio/musicpd/Makefile
index 3f66f548014f..7445bed5a7a6 100644
--- a/audio/musicpd/Makefile
+++ b/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}
diff --git a/audio/musicpd/distinfo b/audio/musicpd/distinfo
index 5c5cd143a465..65d6d533ce63 100644
--- a/audio/musicpd/distinfo
+++ b/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
diff --git a/audio/musicpd/files/musicpd.in b/audio/musicpd/files/musicpd.in
index 1147b9ad6cac..801be15d4458 100644
--- a/audio/musicpd/files/musicpd.in
+++ b/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
diff --git a/audio/musicpd/files/pkg-message.in b/audio/musicpd/files/pkg-message.in
index 44f907854b5e..d6ed6a4e3868 100644
--- a/audio/musicpd/files/pkg-message.in
+++ b/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:
diff --git a/audio/musicpd/pkg-plist b/audio/musicpd/pkg-plist
index eead1b0ad098..960ffd36618f 100644
--- a/audio/musicpd/pkg-plist
+++ b/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