5 files changed, 21 insertions, 62 deletions

diff --git a/audio/musicpd/Makefile b/audio/musicpd/Makefile
index 44bd8a66a55d..bb50959b4e7d 100644
--- a/audio/musicpd/Makefile
+++ b/audio/musicpd/Makefile
@@ -1,24 +1,22 @@
 # $FreeBSD$
 
 PORTNAME=	musicpd
-PORTVERSION=	0.17.3
-PORTREVISION=	4
+PORTVERSION=	0.17.6
 CATEGORIES=	audio ipv6
-MASTER_SITES=	SF/${PORTNAME}/mpd/${PORTVERSION}
+MASTER_SITES=	http://www.musicpd.org/download/mpd/${PORTVERSION:R}/
 DISTNAME=	mpd-${PORTVERSION}
 
 MAINTAINER=	crees@FreeBSD.org
 COMMENT=	Remote-controllable music daemon
 
+LICENSE=	GPLv2
+LICENSE=	GPLv2
+
 LIB_DEPENDS+=	libmad.so:${PORTSDIR}/audio/libmad \
 		libcurl.so:${PORTSDIR}/ftp/curl
 
-LICENSE=	GPLv2
-
-USE_STAGE=	yes
-NO_STAGE=	yes
 USES=		gmake pkgconfig
-USE_BZIP2=	yes
+USE_XZ=		yes
 GNU_CONFIGURE=	yes
 USE_GNOME=	glib20
 
@@ -28,16 +26,13 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 
 CFLAGS+=	-I${PREFIX}/include
 
-MAN1=		${PORTNAME}.1
-MAN5=		${PORTNAME}.conf.5
-
 DOCSDIR?=	${PREFIX}/share/doc/musicpd
 PORTDOCS=	AUTHORS README COPYING NEWS UPGRADING
 
 SUB_FILES=	pkg-message
 
 OPTIONS_DEFINE=	ID3TAG IPV6 FLAC VORBIS WAV FFMPEG TREMOR AAC \
-		MUSEPACK MIKMOD MODPLUG ARCHIVE MMS LASTFM AO PULSEAUDIO \
+		MUSEPACK MIKMOD MODPLUG ARCHIVE MMS AO PULSEAUDIO \
 		JACK SHOUTCAST SNDFILE LAME HTTPD SAMPLERATE SQLITE3
 OPTIONS_RADIO=	ZEROCONF
 OPTIONS_RADIO_ZEROCONF=	AVAHI MDNSRESPONDER
@@ -144,7 +139,7 @@ CONFIGURE_ARGS+=--enable-bzip2 \
 		--enable-zip \
 		--enable-iso9660
 LIB_DEPENDS+=	libzzip.so:${PORTSDIR}/devel/zziplib \
-		iso9660.8:${PORTSDIR}/sysutils/libcdio
+		libiso9660.so:${PORTSDIR}/sysutils/libcdio
 .endif
 
 .if ${PORT_OPTIONS:MFFMPEG}
@@ -155,12 +150,6 @@ LIB_DEPENDS+=	libavcodec.so:${PORTSDIR}/multimedia/ffmpeg \
 CONFIGURE_ARGS+=--disable-ffmpeg
 .endif
 
-.if ${PORT_OPTIONS:MLASTFM}
-CONFIGURE_ARGS+=--enable-lastfm
-.else
-CONFIGURE_ARGS+=--disable-lastfm
-.endif
-
 .if ${PORT_OPTIONS:MMMS}
 CONFIGURE_ARGS+=--enable-mms
 LIB_DEPENDS+=	libmms.so:${PORTSDIR}/net/libmms
@@ -274,26 +263,19 @@ post-patch:
 .endif
 
 do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/src/mpd ${PREFIX}/bin/${PORTNAME}
-	@${INSTALL_MAN} ${WRKSRC}/doc/mpd.1 ${MAN1PREFIX}/man/man1/${PORTNAME}.1
+	@${INSTALL_PROGRAM} ${WRKSRC}/src/mpd \
+		${STAGEDIR}/${PREFIX}/bin/${PORTNAME}
+	@${INSTALL_MAN} ${WRKSRC}/doc/mpd.1 \
+		${STAGEDIR}/${PREFIX}/man/man1/${PORTNAME}.1
 	@${INSTALL_MAN} ${WRKSRC}/doc/mpd.conf.5 \
-		${MAN5PREFIX}/man/man5/${PORTNAME}.conf.5
+		${STAGEDIR}/${PREFIX}/man/man5/${PORTNAME}.conf.5
 .if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}/${DOCSDIR}
 .   for doc in ${PORTDOCS}
-	@${INSTALL_DATA} ${WRKSRC}/${doc} ${DOCSDIR}/
+	@${INSTALL_DATA} ${WRKSRC}/${doc} ${STAGEDIR}/${DOCSDIR}/
 .   endfor
+	@${INSTALL_DATA} ${WRKSRC}/doc/mpdconf.example \
+		${STAGEDIR}/${PREFIX}/etc/${PORTNAME}.conf.sample
 .endif
 
-post-install:
-	@${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.post.mk>
diff --git a/audio/musicpd/distinfo b/audio/musicpd/distinfo
index d2d554b84e9b..c0e1225f1fc6 100644
--- a/audio/musicpd/distinfo
+++ b/audio/musicpd/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mpd-0.17.3.tar.bz2) = 37867e1859c51cce65ca793a641a61e975fbf3c564a988d7a54270e8698d34c6
-SIZE (mpd-0.17.3.tar.bz2) = 548655
+SHA256 (mpd-0.17.6.tar.xz) = defd23931bd3f0aaee82a079a0583278e51e25f480509a93bc5f70de7f421906
+SIZE (mpd-0.17.6.tar.xz) = 537580
diff --git a/audio/musicpd/files/patch-src-decoder-ffmpeg_decoder_plugin-c b/audio/musicpd/files/patch-src-decoder-ffmpeg_decoder_plugin-c
deleted file mode 100644
index b90689f67d39..000000000000
--- a/audio/musicpd/files/patch-src-decoder-ffmpeg_decoder_plugin-c
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/decoder/ffmpeg_decoder_plugin.c.orig	2013-01-07 01:39:40.000000000 +0100
-+++ src/decoder/ffmpeg_decoder_plugin.c	2013-12-14 21:22:19.284609914 +0100
-@@ -395,6 +395,11 @@
- #endif
- 		return SAMPLE_FORMAT_S32;
- 
-+#if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(51,17,0)
-+	case AV_SAMPLE_FMT_FLTP:
-+		return SAMPLE_FORMAT_FLOAT;
-+#endif
-+
- 	default:
- 		break;
- 	}
-
diff --git a/audio/musicpd/files/patch-src_output_httpd_output_plugin.c b/audio/musicpd/files/patch-src_output_httpd_output_plugin.c
deleted file mode 100644
index f2cec1a491d7..000000000000
--- a/audio/musicpd/files/patch-src_output_httpd_output_plugin.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/output/httpd_output_plugin.c.orig
-+++ src/output/httpd_output_plugin.c
-@@ -32,6 +32,7 @@
- #include <assert.h>
- 
- #include <sys/types.h>
-+#include <sys/socket.h>
- #include <unistd.h>
- #include <errno.h>
- 
diff --git a/audio/musicpd/pkg-plist b/audio/musicpd/pkg-plist
index db2935a61945..1740b2007579 100644
--- a/audio/musicpd/pkg-plist
+++ b/audio/musicpd/pkg-plist
@@ -4,3 +4,5 @@ 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
+man/man1/musicpd.1.gz
+man/man5/musicpd.conf.5.gz