ports/148082: Update port: audio/musicpd from 0.15.8 to 0.15.10
Chris Rees
utisoft at gmail.com
Wed Jun 23 08:20:03 UTC 2010
>Number: 148082
>Category: ports
>Synopsis: Update port: audio/musicpd from 0.15.8 to 0.15.10
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Wed Jun 23 08:20:02 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator: Chris Rees
>Release: FreeBSD 8.0-RELEASE-p3 i386
>Organization:
bayofrum
>Environment:
System: FreeBSD amnesiac.bayofrum.net 8.0-RELEASE-p3 FreeBSD 8.0-RELEASE-p3 #0: Wed May 26 05:45:12 UTC 2010 root at i386-builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC i386
>Description:
This updates to the new version, and also automates the installation of config files. If this port ends up mine I'd also like to in the future use the variable MPDCONF I've added in to rename the configuration file to a more consistent musicpd.conf, with some code to keep it the same for those who still use mpd.conf
musicpd hasn't been updated since February this year, and the maintainer has been timing out since December.
If the maintainer times out again, please could I have maintainership of this port?
[No disrespect to the current maintainer, these things happen after all]
>How-To-Repeat:
>Fix:
--- musicpd.diff begins here ---
diff -ruN musicpd.orig/Makefile musicpd/Makefile
--- musicpd.orig/Makefile 2010-06-23 08:28:07.000000000 +0100
+++ musicpd/Makefile 2010-06-23 09:05:03.000000000 +0100
@@ -6,8 +6,7 @@
#
PORTNAME= musicpd
-PORTVERSION= 0.15.8
-PORTREVISION= 3
+PORTVERSION= 0.15.10
CATEGORIES= audio ipv6
MASTER_SITES= SF/${PORTNAME}/mpd/${PORTVERSION}
DISTNAME= mpd-${PORTVERSION}
@@ -62,6 +61,7 @@
MPDDIR= var/mpd
MPDUSER= mpd
MPDGROUP= mpd
+MPDCONF= mpd.conf
USERS= ${MPDUSER}
GROUPS= ${MPDGROUP}
@@ -70,13 +70,15 @@
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 @@
.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 -ruN musicpd.orig/distinfo musicpd/distinfo
--- musicpd.orig/distinfo 2010-06-23 08:28:07.000000000 +0100
+++ musicpd/distinfo 2010-06-23 09:11:15.000000000 +0100
@@ -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.10.tar.bz2) = fb18fa3ed5ff7e3719536a6603098df5
+SHA256 (mpd-0.15.10.tar.bz2) = fabb48214e27bfaa2bc29c2ad56b5835fc9572951106ae77bb481e892bfc423a
+SIZE (mpd-0.15.10.tar.bz2) = 390045
diff -ruN musicpd.orig/files/musicpd.in musicpd/files/musicpd.in
--- musicpd.orig/files/musicpd.in 2010-06-23 08:28:07.000000000 +0100
+++ musicpd/files/musicpd.in 2010-06-23 09:05:28.000000000 +0100
@@ -15,7 +15,7 @@
rcvar=`set_rcvar`
stop_cmd="${name}_stop"
-config=%%PREFIX%%/etc/mpd.conf
+config=%%PREFIX%%/etc/%%MPDCONF%%
command=%%PREFIX%%/bin/mpd
required_files=$config
diff -ruN musicpd.orig/files/pkg-message.in musicpd/files/pkg-message.in
--- musicpd.orig/files/pkg-message.in 2010-06-23 08:28:07.000000000 +0100
+++ musicpd/files/pkg-message.in 2010-06-23 09:09:22.000000000 +0100
@@ -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 -ruN musicpd.orig/pkg-plist musicpd/pkg-plist
--- musicpd.orig/pkg-plist 2010-06-23 08:28:07.000000000 +0100
+++ musicpd/pkg-plist 2010-06-23 09:04:31.000000000 +0100
@@ -1,2 +1,5 @@
bin/mpd
@dirrmtry var/mpd
+ at unexec if cmp -s %D/etc/%%MPDCONF%%.sample %D/etc/%%MPDCONF%%; then rm -f %D/etc/%%MPDCONF%%; fi
+etc/%%MPDCONF%%.sample
+ at exec if [ ! -f %D/etc/%%MPDCONF%% ] ; then cp -p %D/%F %B/%%MPDCONF%%; fi
--- musicpd.diff ends here ---
--
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list