ports/155726: [MAINTAINER] Update port: audio/musicpd to 0.16.2
Chris Rees
utisoft at gmail.com
Sun Mar 20 16:40:06 UTC 2011
>Number: 155726
>Category: ports
>Synopsis: [MAINTAINER] Update port: audio/musicpd to 0.16.2
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Sun Mar 20 16:40:05 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator: Chris Rees
>Release: FreeBSD 8.2-RELEASE i386
>Organization:
>Environment:
System: FreeBSD zeus.bayofrum.net 8.2-RELEASE FreeBSD 8.2-RELEASE #1: Sun Feb 27 22:19:51 UTC 2011 root at zeus.bayofrum.net:/usr/obj/usr/src/sys/ZEUS i386
>Description:
* configure.ac:
- fix bashism in tremor test
* decoder:
- tremor: fix configure test
- gme: detect end of song
* encoder:
- vorbis: reset the Ogg stream after flush
* output:
- httpd: fix uninitialized variable
- httpd: include sys/socket.h
- oss: AFMT_S24_PACKED is little-endian
- oss: disable 24 bit playback on FreeBSD
>How-To-Repeat:
>Fix:
- Update to 0.16.2
- Make MPDCONF have sane FreeBSD defaults
- Move default musicpd root to /var/mpd and stop clobbering make.conf
- Now runs as user MPDUSER by default (in new conf)
Submitted by: Chris Rees <utisoft at gmail.com> (maintainer)
--- musicpd-0.16.2.diff begins here ---
Index: Makefile
===================================================================
RCS file: /exports/cvsroot-freebsd/ports/audio/musicpd/Makefile,v
retrieving revision 1.61
diff -u -r1.61 Makefile
--- Makefile 1 Mar 2011 19:49:36 -0000 1.61
+++ Makefile 20 Mar 2011 11:56:55 -0000
@@ -6,8 +6,8 @@
#
PORTNAME= musicpd
-PORTVERSION= 0.16.1
-PORTREVISION= 2
+PORTVERSION= 0.16.2
+PORTREVISION?= 0
CATEGORIES= audio ipv6
MASTER_SITES= SF/${PORTNAME}/mpd/${PORTVERSION}
DISTNAME= mpd-${PORTVERSION}
@@ -63,7 +63,7 @@
HTTPD "Support for httpd output streaming" off \
SAMPLERATE "Support sample rate conversion" off
-MPDDIR= var/mpd
+MPDDIR?= /var/mpd
MPDUSER= mpd
MPDGROUP= mpd
MPDCONF?= mpd.conf
@@ -80,7 +80,7 @@
SUB_LIST+= MPDUSER=${MPDUSER} \
MPDGROUP=${MPDGROUP} \
- MPDDIR=${PREFIX}/${MPDDIR} \
+ MPDDIR=${MPDDIR} \
MPDUID=${MPDUID} \
MPDGID=${MPDGID} \
MPDCONF=${MPDCONF}
@@ -226,14 +226,10 @@
.endif
post-patch:
-# Fix issues with garbled sound for 24-bit on FreeBSD. This is fixed in git,
-# so should be removed with next update.
- @${REINPLACE_CMD} -e '383,395d;421,430d' \
- ${WRKSRC}/src/output/oss_plugin.c
- @${REINPLACE_CMD} -e "s/%%MPDDIR%%/${PREFIX:C/\//\\\//g}\/${MPDDIR:C/\//\\\//g}/g" -e "s/%%MPDUSER%%/${MPDUSER}/g" \
+# Replace ~/ with MPDDIR and make musicpd run as mpd by default
+ @${REINPLACE_CMD} -e 's,^#\([^"]*"\)~/,\1${MPDDIR}/,g' \
+ -e 's,^#\(user[^"]*"\)nobody,\1${MPDUSER},g' \
${WRKSRC}/doc/mpdconf.example
- @${REINPLACE_CMD} -e 's/tremor == xno/tremor = xno/' \
- ${WRKSRC}/configure
.if (${OSVERSION} < 800000)
${REINPLACE_CMD} -e 's/nan[f]\{0,1\}(\"\")/NAN/g' \
${WRKSRC}/src/crossfade.c \
@@ -251,8 +247,8 @@
${CP} -p ${PREFIX}/etc/${MPDCONF}.sample \
${PREFIX}/etc/${MPDCONF} ; \
fi
- @${MKDIR} ${PREFIX}/${MPDDIR}
- @${CHOWN} -R ${MPDUSER}:${MPDGROUP} ${PREFIX}/${MPDDIR}
+ @${MKDIR} ${MPDDIR}
+ @${CHOWN} -R ${MPDUSER}:${MPDGROUP} ${MPDDIR}
@${ECHO_MSG}
@${CAT} ${PKGMESSAGE}
@${ECHO_MSG}
Index: distinfo
===================================================================
RCS file: /exports/cvsroot-freebsd/ports/audio/musicpd/distinfo,v
retrieving revision 1.25
diff -u -r1.25 distinfo
--- distinfo 6 Feb 2011 18:06:29 -0000 1.25
+++ distinfo 20 Mar 2011 11:56:55 -0000
@@ -1,2 +1,2 @@
-SHA256 (mpd-0.16.1.tar.bz2) = b85ca840e31aea2249ad8e9c5c36f6533fc0f88d357a7441817ccacb1e31df57
-SIZE (mpd-0.16.1.tar.bz2) = 480244
+SHA256 (mpd-0.16.2.tar.bz2) = 59a3c191bbfcbbbc119f4b1e44bcb62ce15e45bc4d5041153408acc3074cb1d5
+SIZE (mpd-0.16.2.tar.bz2) = 478096
--- musicpd-0.16.2.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list