Date: Tue, 30 Apr 2013 20:48:03 +0000 (UTC) From: Chris Rees <crees@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r316961 - in head/audio/musicpd: . files Message-ID: <201304302048.r3UKm3kk097202@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: crees Date: Tue Apr 30 20:48:02 2013 New Revision: 316961 URL: http://svnweb.freebsd.org/changeset/ports/316961 Log: audio/musicpd: Update to 0.17.3 Take out the compatibility shims for people who redefined MPDCONF-- they've had enough warning. Error out with some helpful hints if people still haven't moved to using musicpd.conf Modified: head/audio/musicpd/Makefile head/audio/musicpd/distinfo head/audio/musicpd/files/musicpd.in head/audio/musicpd/files/pkg-message.in head/audio/musicpd/pkg-plist Modified: head/audio/musicpd/Makefile ============================================================================== --- head/audio/musicpd/Makefile Tue Apr 30 20:30:22 2013 (r316960) +++ head/audio/musicpd/Makefile Tue Apr 30 20:48:02 2013 (r316961) @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= musicpd -PORTVERSION= 0.17.2 -PORTREVISION= 2 +PORTVERSION= 0.17.3 CATEGORIES= audio ipv6 MASTER_SITES= SF/${PORTNAME}/mpd/${PORTVERSION} DISTNAME= mpd-${PORTVERSION} @@ -28,7 +27,7 @@ LDFLAGS+= -L${LOCALBASE}/lib CFLAGS+= -I${PREFIX}/include MAN1= ${PORTNAME}.1 -MAN5= ${MPDCONF}.5 +MAN5= ${PORTNAME}.conf.5 DOCSDIR?= ${PREFIX}/share/doc/musicpd PORTDOCS= AUTHORS README COPYING NEWS UPGRADING @@ -45,20 +44,32 @@ LAME_DESC= Support for MP3 Icecast Strea MPDDIR?= /var/mpd MPDUSER?= mpd MPDGROUP?= mpd -MPDCONF?= musicpd.conf USERS= ${MPDUSER} GROUPS= ${MPDGROUP} -PLIST_SUB= MPDCONF=${MPDCONF} \ - MPDUSER=${MPDUSER} \ +PLIST_SUB= MPDUSER=${MPDUSER} \ MPDDIR=${MPDDIR} \ MPDGROUP=${MPDGROUP} -SUB_LIST+= MPDDIR=${MPDDIR} \ - MPDCONF=${MPDCONF} +SUB_LIST+= MPDDIR=${MPDDIR} .include <bsd.port.options.mk> +.ifdef MPDCONF +.error Please remove the MPDCONF line from make.conf, then rename ${PREFIX}/etc/${MPDCONF} to musicpd.conf, if it exists +.endif + +.include <bsd.port.pre.mk> + +.if exists(${PREFIX}/etc/mpd.conf) +MSG=You still have ${PREFIX}/etc/mpd.conf in existence-- this file is no longer used by musicpd. +.if !exists(${PREFIX}/etc/musicpd.conf) +.error ${MSG} Move it to ${PREFIX}/etc/musicpd.conf. +.else +.error ${MSG} You also have musicpd.conf-- check carefully to see which one you want, and remove mpd.conf. +.endif +.endif + .if ${PORT_OPTIONS:MFLAC} LIB_DEPENDS+= FLAC.10:${PORTSDIR}/audio/flac .else @@ -221,16 +232,6 @@ LIB_DEPENDS+= cue:${PORTSDIR}/textproc/l CONFIGURE_ARGS+=--disable-cue .endif -.if ${MPDCONF} != musicpd.conf -pre-everything:: - @${ECHO_MSG} "Looks as though you're using a non-default value for MPDCONF." - @${ECHO_MSG} "This is deprecated, and some time in the near future the only value permissible" - @${ECHO_MSG} "for MPDCONF will be the default; musicpd.conf." - @${ECHO_MSG} -n "Continuing in " - @for s in 5 4 3 2 1 ; do ${ECHO_MSG} -n "$$s... " && sleep 1 ; done - @${ECHO_MSG} "" -.endif - post-patch: # Replace ~/ with MPDDIR and make musicpd run as mpd by default @${REINPLACE_CMD} -e 's,^#\([^"]*"\)~/,\1${MPDDIR}/,g' \ @@ -246,8 +247,8 @@ post-patch: ${WRKSRC}/doc/mpdconf.example # Fix man pages for executable names @${REINPLACE_CMD} -e 's/^\(\.B m\)pd/\1usicpd/' \ - -e 's#^\(\.BI \)/etc/mpd.conf#\1${PREFIX}/etc/${MPDCONF}#' \ - -e 's#^mpd.conf#${MPDCONF}#' \ + -e 's#^\(\.BI \)/etc/mpd.conf#\1${PREFIX}/etc/${PORTNAME}.conf#' \ + -e 's#^mpd.conf#${PORTNAME}.conf#' \ -e 's#^mpd(1)#musicpd(1)#' \ ${WRKSRC}/doc/mpd.1 ${WRKSRC}/doc/mpd.conf.5 .if (${OSVERSION} < 800000) @@ -261,7 +262,7 @@ do-install: @${INSTALL_PROGRAM} ${WRKSRC}/src/mpd ${PREFIX}/bin/${PORTNAME} @${INSTALL_MAN} ${WRKSRC}/doc/mpd.1 ${MAN1PREFIX}/man/man1/${PORTNAME}.1 @${INSTALL_MAN} ${WRKSRC}/doc/mpd.conf.5 \ - ${MAN5PREFIX}/man/man5/${MPDCONF}.5 + ${MAN5PREFIX}/man/man5/${PORTNAME}.conf.5 .if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${DOCSDIR} . for doc in ${PORTDOCS} @@ -270,14 +271,14 @@ do-install: .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} ; \ + @${INSTALL_DATA} ${WRKSRC}/doc/mpdconf.example ${PREFIX}/etc/${PORTNAME}.conf.sample + @if [ ! -f ${PREFIX}/etc/${PORTNAME}.conf ]; then \ + ${CP} -p ${PREFIX}/etc/${PORTNAME}.conf.sample \ + ${PREFIX}/etc/${PORTNAME}.conf ; \ fi @${INSTALL} -d -o ${MPDUSER} -g ${MPDGROUP} ${MPDDIR} ${MPDDIR}/.mpd @${ECHO_MSG} @${CAT} ${PKGMESSAGE} @${ECHO_MSG} -.include <bsd.port.mk> +.include <bsd.port.post.mk> Modified: head/audio/musicpd/distinfo ============================================================================== --- head/audio/musicpd/distinfo Tue Apr 30 20:30:22 2013 (r316960) +++ head/audio/musicpd/distinfo Tue Apr 30 20:48:02 2013 (r316961) @@ -1,2 +1,2 @@ -SHA256 (mpd-0.17.2.tar.bz2) = 48ff361a35df2751610e9716930e29235c1bd77224e57eb9ada1f04950668eb7 -SIZE (mpd-0.17.2.tar.bz2) = 548182 +SHA256 (mpd-0.17.3.tar.bz2) = 37867e1859c51cce65ca793a641a61e975fbf3c564a988d7a54270e8698d34c6 +SIZE (mpd-0.17.3.tar.bz2) = 548655 Modified: head/audio/musicpd/files/musicpd.in ============================================================================== --- head/audio/musicpd/files/musicpd.in Tue Apr 30 20:30:22 2013 (r316960) +++ head/audio/musicpd/files/musicpd.in Tue Apr 30 20:48:02 2013 (r316961) @@ -20,15 +20,15 @@ load_rc_config $name : ${musicpd_enable:=NO} command=%%PREFIX%%/bin/musicpd -command_args=%%PREFIX%%/etc/%%MPDCONF%% -required_files=%%PREFIX%%/etc/%%MPDCONF%% +command_args=%%PREFIX%%/etc/musicpd.conf +required_files=%%PREFIX%%/etc/musicpd.conf start_precmd=${name}_getpidfile stop_precmd=${name}_getpidfile musicpd_getpidfile() { if type get_pidfile_from_conf >/dev/null 2>&1 && - get_pidfile_from_conf pid_file %%PREFIX%%/etc/%%MPDCONF%% ; then + get_pidfile_from_conf pid_file %%PREFIX%%/etc/musicpd.conf ; then pidfile="$_pidfile_from_conf" else pidfile="%%MPDDIR%%/.mpd/pid" Modified: head/audio/musicpd/files/pkg-message.in ============================================================================== --- head/audio/musicpd/files/pkg-message.in Tue Apr 30 20:30:22 2013 (r316960) +++ head/audio/musicpd/files/pkg-message.in Tue Apr 30 20:48:02 2013 (r316961) @@ -12,7 +12,7 @@ and add the following line to /etc/rc.co Then start the server with - %%PREFIX%%/etc/rc.d/musicpd start + service musicpd start or reboot. Modified: head/audio/musicpd/pkg-plist ============================================================================== --- head/audio/musicpd/pkg-plist Tue Apr 30 20:30:22 2013 (r316960) +++ head/audio/musicpd/pkg-plist Tue Apr 30 20:48:02 2013 (r316961) @@ -1,5 +1,6 @@ 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 +@unexec if cmp -s %D/etc/musicpd.conf.sample %D/etc/musicpd.conf; then rm -f %D/etc/musicpd.conf; fi +etc/musicpd.conf.sample +@exec if [ ! -f %B/musicpd.conf ] ; then cp -p %D/%F %B/musicpd.conf; fi @exec install -d -o %%MPDUSER%% -g %%MPDGROUP%% %%MPDDIR%% %%MPDDIR%%/.mpd +@unexec rmdir -p %%MPDDIR%%/.mpd 2>/dev/null || true
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201304302048.r3UKm3kk097202>