4 files changed, 24 insertions, 21 deletions

diff --git a/audio/gmpc-mserver/Makefile b/audio/gmpc-mserver/Makefile
index 09a114be0761..b263569cb414 100644
--- a/audio/gmpc-mserver/Makefile
+++ b/audio/gmpc-mserver/Makefile
@@ -6,30 +6,25 @@
 #
 
 PORTNAME=	gmpc-mserver
-PORTVERSION=	0.19.0
-PORTREVISION=	4
+PORTVERSION=	0.20.0
 CATEGORIES=	audio
-MASTER_SITES=	http://download.sarine.nl/gmpc-${PORTVERSION:C/\.0$//}/ \
+MASTER_SITES=	http://download.sarine.nl/Programs/gmpc/${PORTVERSION}/ \
 		http://freebsd.unixfreunde.de/sources/
 
 MAINTAINER=	miwi@FreeBSD.org
-COMMENT=	A plugin for gmpc that serves music.
+COMMENT=	Lets you stream music files to your mpd that are not in your database
 
-LIB_DEPENDS=	mpd:${PORTSDIR}/audio/libmpd \
-		curl.6:${PORTSDIR}/ftp/curl \
+LIB_DEPENDS=	mpd.3:${PORTSDIR}/audio/libmpd \
 		tag.1:${PORTSDIR}/audio/taglib \
-		microhttpd:${PORTSDIR}/www/libmicrohttpd
+		microhttpd.6:${PORTSDIR}/www/libmicrohttpd
 BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gmpc.pc:${PORTSDIR}/audio/gmpc
-RUN_DEPEND=	gmpc:${PORTSDIR}/audio/gmpc
-
-BROKEN=		fails to build
+RUN_DEPENDS=	gmpc:${PORTSDIR}/audio/gmpc
 
 GNU_CONFIGURE=	yes
+USE_GMAKE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
-USE_XORG=	x11
-USE_GNOME=	gnomehack
-USE_LDCONFIG=	yes
-USE_GMAKE=	yes
+USE_GNOME=	gnomehack pkgconfig glib20 gtk20 libxml2
+USE_GETTEXT=	yes
 
 .include <bsd.port.mk>
diff --git a/audio/gmpc-mserver/distinfo b/audio/gmpc-mserver/distinfo
index 8970a8a41777..53d515af15c1 100644
--- a/audio/gmpc-mserver/distinfo
+++ b/audio/gmpc-mserver/distinfo
@@ -1,3 +1,2 @@
-MD5 (gmpc-mserver-0.19.0.tar.gz) = 5d4a3e703eb9ec9a4132039101f57618
-SHA256 (gmpc-mserver-0.19.0.tar.gz) = 348e15bcc1c1be6b57dcf57dc91db2aa5191e6b2ba2348e587dc4570ceb5a89e
-SIZE (gmpc-mserver-0.19.0.tar.gz) = 311447
+SHA256 (gmpc-mserver-0.20.0.tar.gz) = dfc4872f1258a10819eec3f99562637b77fd745fb2a5cbdaf88c2c3e4e107052
+SIZE (gmpc-mserver-0.20.0.tar.gz) = 314343
diff --git a/audio/gmpc-mserver/pkg-descr b/audio/gmpc-mserver/pkg-descr
index cb2e275c5d30..bf164da31cdd 100644
--- a/audio/gmpc-mserver/pkg-descr
+++ b/audio/gmpc-mserver/pkg-descr
@@ -1,3 +1,8 @@
-A plugin for gmpc that serves music.
+This plugin lets you stream music files to your mpd that are not in your
+database.
+Mserver is compiled using the libmicrohttp library, which enables applications
+to function as a minimal webserver. As MPD is perfectly capable of playing
+Streams out of the box, you get a list of streams in your playback queue after
+adding the files.
 
-WWW: http://sarine.nl/gmpc-plugins
+WWW: http://gmpc.wikia.com/wiki/GMPC_PLUGIN_MSERVER
diff --git a/audio/gmpc-mserver/pkg-plist b/audio/gmpc-mserver/pkg-plist
index fa9eb58c309f..b5fdfe424d64 100644
--- a/audio/gmpc-mserver/pkg-plist
+++ b/audio/gmpc-mserver/pkg-plist
@@ -1,4 +1,8 @@
-share/gmpc/plugins/gmpcmserverplugin.la
-share/gmpc/plugins/gmpcmserverplugin.so
+lib/gmpc/plugins/gmpcmserverplugin.la
+lib/gmpc/plugins/gmpcmserverplugin.so
+share/gmpc/plugins/gmpc-mserver/gmpc-mserver.png
+@dirrmtry lib/gmpc/plugins
+@dirrmtry lib/gmpc
+@dirrm share/gmpc/plugins/gmpc-mserver
 @dirrmtry share/gmpc/plugins
 @dirrmtry share/gmpc