- Update to 0.20.0

Submitted by:	avl@
Approved by:	portmgr (myself,pav)
Feature safe:	yes

57 files changed, 837 insertions, 255 deletions

diff --git a/audio/gmpc-alarm/Makefile b/audio/gmpc-alarm/Makefile
index f7aef82189c4..961420328f9c 100644
--- a/audio/gmpc-alarm/Makefile
+++ b/audio/gmpc-alarm/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gmpc-alarm
-PORTVERSION=	0.19.0
-PORTREVISION=	3
+PORTVERSION=	0.20.0
 CATEGORIES=	audio
 MASTER_SITES=	http://download.sarine.nl/Programs/gmpc/${PORTVERSION}/ \
 		http://freebsd.unixfreunde.de/sources/
@@ -15,15 +14,13 @@ MASTER_SITES=	http://download.sarine.nl/Programs/gmpc/${PORTVERSION}/ \
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	A Alarm plugin for gmpc
 
-LIB_DEPENDS=	mpd:${PORTSDIR}/audio/libmpd \
-		curl.6:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=	mpd.3:${PORTSDIR}/audio/libmpd
 BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gmpc.pc:${PORTSDIR}/audio/gmpc
 RUN_DEPENDS=	gmpc:${PORTSDIR}/audio/gmpc
 
 GNU_CONFIGURE=	yes
-USE_XORG=	x11
 USE_GMAKE=	yes
-USE_GNOME=	gnomehack intltool
-USE_LDCONFIG=	yes
+USE_GNOME=	gnomehack pkgconfig glib20 gtk20 intltool
+USE_GETTEXT=	yes
 
 .include <bsd.port.mk>
diff --git a/audio/gmpc-alarm/distinfo b/audio/gmpc-alarm/distinfo
index 43ae1bb09bc2..0291f4dfdf48 100644
--- a/audio/gmpc-alarm/distinfo
+++ b/audio/gmpc-alarm/distinfo
@@ -1,3 +1,2 @@
-MD5 (gmpc-alarm-0.19.0.tar.gz) = 8c40a1af9779533944e0eb4b211118fa
-SHA256 (gmpc-alarm-0.19.0.tar.gz) = 68539a3f9ee3ad4f87d6a76e9656afd3635ea1d73cef3bb281c436f8eb5efd96
-SIZE (gmpc-alarm-0.19.0.tar.gz) = 307031
+SHA256 (gmpc-alarm-0.20.0.tar.gz) = bd1ff9138db3eb1941198f6985f08e868616f82c961cbd10624173b831be8bd6
+SIZE (gmpc-alarm-0.20.0.tar.gz) = 310461
diff --git a/audio/gmpc-alarm/pkg-descr b/audio/gmpc-alarm/pkg-descr
index 1b6f71a50b9e..fd12133a383b 100644
--- a/audio/gmpc-alarm/pkg-descr
+++ b/audio/gmpc-alarm/pkg-descr
@@ -1,3 +1,4 @@
-This plugin can start/stop/pause your music at a preset time.
+The Alarm Timer plugin turns your music player into an alarm, set the time in at
+which it must go off and the rest is done by gmpc.
 
-WWW: http://gmpcwiki.sarine.nl/index.php/Alarm
+WWW: http://gmpc.wikia.com/wiki/GMPC_PLUGIN_ALARM
diff --git a/audio/gmpc-alarm/pkg-plist b/audio/gmpc-alarm/pkg-plist
index 230424148b8d..795f87881be6 100644
--- a/audio/gmpc-alarm/pkg-plist
+++ b/audio/gmpc-alarm/pkg-plist
@@ -3,16 +3,19 @@ lib/gmpc/plugins/alarmplugin.so
 share/locale/bg/LC_MESSAGES/gmpc-alarm.mo
 share/locale/bs/LC_MESSAGES/gmpc-alarm.mo
 share/locale/de/LC_MESSAGES/gmpc-alarm.mo
+share/locale/en_CA/LC_MESSAGES/gmpc-alarm.mo
 share/locale/es/LC_MESSAGES/gmpc-alarm.mo
 share/locale/fi/LC_MESSAGES/gmpc-alarm.mo
 share/locale/fr/LC_MESSAGES/gmpc-alarm.mo
 share/locale/hu/LC_MESSAGES/gmpc-alarm.mo
+share/locale/id/LC_MESSAGES/gmpc-alarm.mo
 share/locale/it/LC_MESSAGES/gmpc-alarm.mo
 share/locale/ja/LC_MESSAGES/gmpc-alarm.mo
 share/locale/ml/LC_MESSAGES/gmpc-alarm.mo
 share/locale/nb/LC_MESSAGES/gmpc-alarm.mo
 share/locale/nl/LC_MESSAGES/gmpc-alarm.mo
 share/locale/pl/LC_MESSAGES/gmpc-alarm.mo
+share/locale/pt_BR/LC_MESSAGES/gmpc-alarm.mo
 share/locale/ro/LC_MESSAGES/gmpc-alarm.mo
 share/locale/ru/LC_MESSAGES/gmpc-alarm.mo
 share/locale/sq/LC_MESSAGES/gmpc-alarm.mo
diff --git a/audio/gmpc-albumview/Makefile b/audio/gmpc-albumview/Makefile
index f28067911062..5f9739ef8e99 100644
--- a/audio/gmpc-albumview/Makefile
+++ b/audio/gmpc-albumview/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gmpc-albumview
-PORTVERSION=	0.19.0
-PORTREVISION=	3
+PORTVERSION=	0.20.0
 CATEGORIES=	audio
 MASTER_SITES=	http://download.sarine.nl/Programs/gmpc/${PORTVERSION}/ \
 		http://freebsd.unixfreunde.de/sources/
@@ -15,15 +14,13 @@ MASTER_SITES=	http://download.sarine.nl/Programs/gmpc/${PORTVERSION}/ \
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	Draws all album covers
 
-LIB_DEPENDS=	mpd:${PORTSDIR}/audio/libmpd \
-		curl.6:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=	mpd.3:${PORTSDIR}/audio/libmpd
 BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gmpc.pc:${PORTSDIR}/audio/gmpc
 RUN_DEPENDS=	gmpc:${PORTSDIR}/audio/gmpc
 
 GNU_CONFIGURE=	yes
-USE_XORG=	x11
-USE_GNOME=	gnomehack intltool
-USE_LDCONFIG=	yes
 USE_GMAKE=	yes
+USE_GNOME=	pkgconfig glib20 gtk20 intltool
+USE_GETTEXT=	yes
 
 .include <bsd.port.mk>
diff --git a/audio/gmpc-albumview/distinfo b/audio/gmpc-albumview/distinfo
index 5dfc708ab1a0..4b64e0d84bbc 100644
--- a/audio/gmpc-albumview/distinfo
+++ b/audio/gmpc-albumview/distinfo
@@ -1,3 +1,2 @@
-MD5 (gmpc-albumview-0.19.0.tar.gz) = 66f22d939856fe8f29b9d7c0e2828d4f
-SHA256 (gmpc-albumview-0.19.0.tar.gz) = 5e3e895e6e47a21c11eb007110fa1c94ea8c332a014b354362bcfbd383490694
-SIZE (gmpc-albumview-0.19.0.tar.gz) = 305443
+SHA256 (gmpc-albumview-0.20.0.tar.gz) = 7e5efa43338526c15beca0c13930f5e9358544f11ca03441b4a0cb1321a6b0e9
+SIZE (gmpc-albumview-0.20.0.tar.gz) = 443167
diff --git a/audio/gmpc-albumview/pkg-descr b/audio/gmpc-albumview/pkg-descr
index ee9f0c9c79eb..e478a44e9437 100644
--- a/audio/gmpc-albumview/pkg-descr
+++ b/audio/gmpc-albumview/pkg-descr
@@ -1,4 +1,7 @@
-This plugin fetches cover art, artist art,album and artist information
-from the file system.
+This plugin shows your music collection in albums, it's showing album covers
+with the artist and album name under it.
 
-WWW:	http://gmpc.wikia.com/wiki/GMPC_PLUGIN_ALBUMVIEW
+You can also filter out specific artists or albums and set the amount of albums
+per row.
+
+WWW: http://gmpc.wikia.com/wiki/GMPC_PLUGIN_ALBUMVIEW
diff --git a/audio/gmpc-albumview/pkg-plist b/audio/gmpc-albumview/pkg-plist
index 131cca96c435..4d8aded9fa43 100644
--- a/audio/gmpc-albumview/pkg-plist
+++ b/audio/gmpc-albumview/pkg-plist
@@ -1,4 +1,68 @@
 lib/gmpc/plugins/albumviewplugin.la
 lib/gmpc/plugins/albumviewplugin.so
+%%DATADIR%%/icons/Humanity/128x128/apps/albumview.png
+%%DATADIR%%/icons/Humanity/16x16/apps/albumview.png
+%%DATADIR%%/icons/Humanity/22x22/apps/albumview.png
+%%DATADIR%%/icons/Humanity/24x24/apps/albumview.png
+%%DATADIR%%/icons/Humanity/32x32/apps/albumview.png
+%%DATADIR%%/icons/Humanity/48x48/apps/albumview.png
+%%DATADIR%%/icons/Humanity/64x64/apps/albumview.png
+%%DATADIR%%/icons/Humanity/72x72/apps/albumview.png
+%%DATADIR%%/icons/Humanity/96x96/apps/albumview.png
+%%DATADIR%%/icons/Humanity/scalable/apps/albumview.svg
+%%DATADIR%%/icons/hicolor/128x128/apps/albumview.png
+%%DATADIR%%/icons/hicolor/16x16/apps/albumview.png
+%%DATADIR%%/icons/hicolor/22x22/apps/albumview.png
+%%DATADIR%%/icons/hicolor/24x24/apps/albumview.png
+%%DATADIR%%/icons/hicolor/32x32/apps/albumview.png
+%%DATADIR%%/icons/hicolor/48x48/apps/albumview.png
+%%DATADIR%%/icons/hicolor/64x64/apps/albumview.png
+%%DATADIR%%/icons/hicolor/72x72/apps/albumview.png
+%%DATADIR%%/icons/hicolor/96x96/apps/albumview.png
+%%DATADIR%%/icons/hicolor/scalable/apps/albumview.svg
 @dirrmtry lib/gmpc/plugins
 @dirrmtry lib/gmpc
+@dirrm %%DATADIR%%/icons/hicolor/scalable/apps
+@dirrm %%DATADIR%%/icons/hicolor/scalable
+@dirrm %%DATADIR%%/icons/hicolor/96x96/apps
+@dirrm %%DATADIR%%/icons/hicolor/96x96
+@dirrm %%DATADIR%%/icons/hicolor/72x72/apps
+@dirrm %%DATADIR%%/icons/hicolor/72x72
+@dirrm %%DATADIR%%/icons/hicolor/64x64/apps
+@dirrm %%DATADIR%%/icons/hicolor/64x64
+@dirrm %%DATADIR%%/icons/hicolor/48x48/apps
+@dirrm %%DATADIR%%/icons/hicolor/48x48
+@dirrm %%DATADIR%%/icons/hicolor/32x32/apps
+@dirrm %%DATADIR%%/icons/hicolor/32x32
+@dirrm %%DATADIR%%/icons/hicolor/24x24/apps
+@dirrm %%DATADIR%%/icons/hicolor/24x24
+@dirrm %%DATADIR%%/icons/hicolor/22x22/apps
+@dirrm %%DATADIR%%/icons/hicolor/22x22
+@dirrm %%DATADIR%%/icons/hicolor/16x16/apps
+@dirrm %%DATADIR%%/icons/hicolor/16x16
+@dirrm %%DATADIR%%/icons/hicolor/128x128/apps
+@dirrm %%DATADIR%%/icons/hicolor/128x128
+@dirrm %%DATADIR%%/icons/hicolor
+@dirrm %%DATADIR%%/icons/Humanity/scalable/apps
+@dirrm %%DATADIR%%/icons/Humanity/scalable
+@dirrm %%DATADIR%%/icons/Humanity/96x96/apps
+@dirrm %%DATADIR%%/icons/Humanity/96x96
+@dirrm %%DATADIR%%/icons/Humanity/72x72/apps
+@dirrm %%DATADIR%%/icons/Humanity/72x72
+@dirrm %%DATADIR%%/icons/Humanity/64x64/apps
+@dirrm %%DATADIR%%/icons/Humanity/64x64
+@dirrm %%DATADIR%%/icons/Humanity/48x48/apps
+@dirrm %%DATADIR%%/icons/Humanity/48x48
+@dirrm %%DATADIR%%/icons/Humanity/32x32/apps
+@dirrm %%DATADIR%%/icons/Humanity/32x32
+@dirrm %%DATADIR%%/icons/Humanity/24x24/apps
+@dirrm %%DATADIR%%/icons/Humanity/24x24
+@dirrm %%DATADIR%%/icons/Humanity/22x22/apps
+@dirrm %%DATADIR%%/icons/Humanity/22x22
+@dirrm %%DATADIR%%/icons/Humanity/16x16/apps
+@dirrm %%DATADIR%%/icons/Humanity/16x16
+@dirrm %%DATADIR%%/icons/Humanity/128x128/apps
+@dirrm %%DATADIR%%/icons/Humanity/128x128
+@dirrm %%DATADIR%%/icons/Humanity
+@dirrm %%DATADIR%%/icons
+@dirrm %%DATADIR%%
diff --git a/audio/gmpc-discogs/Makefile b/audio/gmpc-discogs/Makefile
index b09edc989851..b14120759ea9 100644
--- a/audio/gmpc-discogs/Makefile
+++ b/audio/gmpc-discogs/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gmpc-discogs
-PORTVERSION=	0.19.0
-PORTREVISION=	4
+PORTVERSION=	0.20.0
 CATEGORIES=	audio
 MASTER_SITES=	http://download.sarine.nl/Programs/gmpc/${PORTVERSION}/ \
 		http://freebsd.unixfreunde.de/sources/
@@ -15,16 +14,13 @@ MASTER_SITES=	http://download.sarine.nl/Programs/gmpc/${PORTVERSION}/ \
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	Album Image fetcher for gmpc
 
-LIB_DEPENDS=	mpd:${PORTSDIR}/audio/libmpd \
-		curl.6:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=	mpd.3:${PORTSDIR}/audio/libmpd
 BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gmpc.pc:${PORTSDIR}/audio/gmpc
 RUN_DEPENDS=	gmpc:${PORTSDIR}/audio/gmpc
 
 GNU_CONFIGURE=	yes
-USE_XORG=	x11
 USE_GMAKE=	yes
-USE_GNOME=	gnomehack intltool
-USE_LDCONFIG=	yes
+USE_GNOME=	gnomehack pkgconfig glib20 gtk20 intltool libxml2
 USE_GETTEXT=	yes
 
 .include <bsd.port.mk>
diff --git a/audio/gmpc-discogs/distinfo b/audio/gmpc-discogs/distinfo
index 98ac2c1e30d3..d9c8881f8f12 100644
--- a/audio/gmpc-discogs/distinfo
+++ b/audio/gmpc-discogs/distinfo
@@ -1,3 +1,2 @@
-MD5 (gmpc-discogs-0.19.0.tar.gz) = c9b96ee13eeccd5a56f09ae65ebf0472
-SHA256 (gmpc-discogs-0.19.0.tar.gz) = 62c26a51875ab7b95670d8cc656cbe06244b456cb493df43fce9b3b95f5e615d
-SIZE (gmpc-discogs-0.19.0.tar.gz) = 302571
+SHA256 (gmpc-discogs-0.20.0.tar.gz) = 263ef4f77115243046eb151c7a5416c6a376fa2f1c64b3713757d7129499a1f7
+SIZE (gmpc-discogs-0.20.0.tar.gz) = 305381
diff --git a/audio/gmpc-discogs/pkg-descr b/audio/gmpc-discogs/pkg-descr
index 8290e6f10224..88e9000fb5ec 100644
--- a/audio/gmpc-discogs/pkg-descr
+++ b/audio/gmpc-discogs/pkg-descr
@@ -1,3 +1,4 @@
-DiscoGS Artist and Album Image Fetcher.
+The DiscoGS plugin searches the database of www.discogs.com to find available
+images for the artists and albums in your music collection.
 
 WWW: http://gmpc.wikia.com/wiki/GMPC_PLUGIN_DISCOGS
diff --git a/audio/gmpc-extraplaylist/Makefile b/audio/gmpc-extraplaylist/Makefile
index b8620d2fe023..8ded0834d37c 100644
--- a/audio/gmpc-extraplaylist/Makefile
+++ b/audio/gmpc-extraplaylist/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gmpc-extraplaylist
-PORTVERSION=	0.19.0
-PORTREVISION=	3
+PORTVERSION=	0.20.0
 CATEGORIES=	audio
 MASTER_SITES=	http://download.sarine.nl/Programs/gmpc/${PORTVERSION}/ \
 		http://freebsd.unixfreunde.de/sources/
@@ -15,14 +14,15 @@ MASTER_SITES=	http://download.sarine.nl/Programs/gmpc/${PORTVERSION}/ \
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	A favorites plugin for gmpc
 
-LIB_DEPENDS=	mpd:${PORTSDIR}/audio/libmpd \
-		curl.6:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=	mpd.3:${PORTSDIR}/audio/libmpd
 BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gmpc.pc:${PORTSDIR}/audio/gmpc
 RUN_DEPENDS=	gmpc:${PORTSDIR}/audio/gmpc
 
 GNU_CONFIGURE=	yes
-USE_XORG=	x11
-USE_GNOME=	gnomehack
-USE_LDCONFIG=	yes
+USE_GNOME=	pkgconfig glib20 gtk20 libglade2 libxml2
+
+PLIST_FILES=	lib/gmpc/plugins/libextraplaylist.la \
+		lib/gmpc/plugins/libextraplaylist.so
+PLIST_DIRSTRY=	lib/gmpc/plugins lib/gmpc
 
 .include <bsd.port.mk>
diff --git a/audio/gmpc-extraplaylist/distinfo b/audio/gmpc-extraplaylist/distinfo
index 14be810fdc1a..b70b28517da5 100644
--- a/audio/gmpc-extraplaylist/distinfo
+++ b/audio/gmpc-extraplaylist/distinfo
@@ -1,3 +1,2 @@
-MD5 (gmpc-extraplaylist-0.19.0.tar.gz) = 7e44dd3c04e1d0cd3570f584791355ad
-SHA256 (gmpc-extraplaylist-0.19.0.tar.gz) = 8487222322f2b5aa97d6e54caeae9ea55e465d2bb7ab340fc13d82b6b7d2a635
-SIZE (gmpc-extraplaylist-0.19.0.tar.gz) = 278165
+SHA256 (gmpc-extraplaylist-0.20.0.tar.gz) = be1ca8660af7ffc3290df7c54a755f2cdd2d9261e3d6dd88792da7e62796ff4c
+SIZE (gmpc-extraplaylist-0.20.0.tar.gz) = 282724
diff --git a/audio/gmpc-extraplaylist/pkg-descr b/audio/gmpc-extraplaylist/pkg-descr
index ac87ab4bffb2..86fa8163c9dd 100644
--- a/audio/gmpc-extraplaylist/pkg-descr
+++ b/audio/gmpc-extraplaylist/pkg-descr
@@ -1,3 +1,3 @@
-The plugin allows you to generate a playlist based on a set of rules.
+The plugin shows playlist window regardless of activated window.
 
-WWW: http://gmpcwiki.sarine.nl/index.php/Extra_playlist
+WWW: http://gmpc.wikia.com/wiki/Extra_playlist
diff --git a/audio/gmpc-extraplaylist/pkg-plist b/audio/gmpc-extraplaylist/pkg-plist
index 44cea8f5bac3..e69de29bb2d1 100644
--- a/audio/gmpc-extraplaylist/pkg-plist
+++ b/audio/gmpc-extraplaylist/pkg-plist
@@ -1,4 +0,0 @@
-lib/gmpc/plugins/libextraplaylist.la
-lib/gmpc/plugins/libextraplaylist.so
-@dirrmtry lib/gmpc/plugins
-@dirrmtry lib/gmpc
diff --git a/audio/gmpc-lastfm/Makefile b/audio/gmpc-lastfm/Makefile
index 1ece0f4da1e4..ac3358adc01d 100644
--- a/audio/gmpc-lastfm/Makefile
+++ b/audio/gmpc-lastfm/Makefile
@@ -6,25 +6,22 @@
 #
 
 PORTNAME=	gmpc-lastfm
-PORTVERSION=	0.19.0
-PORTREVISION=	3
+PORTVERSION=	0.20.0
 CATEGORIES=	audio
 MASTER_SITES=	http://download.sarine.nl/Programs/gmpc/${PORTVERSION}/ \
 		http://freebsd.unixfreunde.de/sources/
 DISTNAME=	gmpc-last-fm-${PORTVERSION}
 
 MAINTAINER=	miwi@FreeBSD.org
-COMMENT=	Lastfm plugin for gmpc
+COMMENT=	Last.FM metadata fetcher plugin for gmpc
 
-LIB_DEPENDS=	mpd:${PORTSDIR}/audio/libmpd \
-		curl.6:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=	mpd.3:${PORTSDIR}/audio/libmpd
 BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gmpc.pc:${PORTSDIR}/audio/gmpc
 RUN_DEPENDS=	gmpc:${PORTSDIR}/audio/gmpc
 
 GNU_CONFIGURE=	yes
-USE_XORG=	x11
-USE_GNOME=	gnomehack intltool
 USE_GMAKE=	yes
-USE_LDCONFIG=	yes
+USE_GNOME=	gnomehack pkgconfig glib20 gtk20 intltool libxml2
+USE_GETTEXT=	yes
 
 .include <bsd.port.mk>
diff --git a/audio/gmpc-lastfm/distinfo b/audio/gmpc-lastfm/distinfo
index 835c12cf30b0..4abe4564fa22 100644
--- a/audio/gmpc-lastfm/distinfo
+++ b/audio/gmpc-lastfm/distinfo
@@ -1,3 +1,2 @@
-MD5 (gmpc-last-fm-0.19.0.tar.gz) = 51d7bf7397c15a3272271d8d4c493b09
-SHA256 (gmpc-last-fm-0.19.0.tar.gz) = 15e824b9e7dbd58adeccf2e0249905d49c8a610358b3806573237139eb8cf9f6
-SIZE (gmpc-last-fm-0.19.0.tar.gz) = 306520
+SHA256 (gmpc-last-fm-0.20.0.tar.gz) = 626a49a5c0f26955901038019cb81d62915c9b37a8b5f4be17438d7fd0c67960
+SIZE (gmpc-last-fm-0.20.0.tar.gz) = 309397
diff --git a/audio/gmpc-lastfm/pkg-descr b/audio/gmpc-lastfm/pkg-descr
index f9b5679766c4..ca90a3e98a28 100644
--- a/audio/gmpc-lastfm/pkg-descr
+++ b/audio/gmpc-lastfm/pkg-descr
@@ -1,4 +1,13 @@
-The last.fm plugin can fetch artist images, from last.fm. This plugin doesn't
-scrobble your music, use a dedicated client like mpdscribble for this.
+The Last.FM metadata fetcher is taking all kinds of metadata from last.fm for
+your music collection.
 
-WWW: http://gmpcwiki.sarine.nl/index.php/Last.fm
+The following metadata is taken from last.fm:
+
+ * Artist Images
+ * Artist Biography
+ * Album Covers
+ * Similar Artist
+ * Similar Songs
+ * Similar Genres
+
+WWW: http://gmpc.wikia.com/wiki/GMPC_PLUGIN_LASTFM
diff --git a/audio/gmpc-libnotify/Makefile b/audio/gmpc-libnotify/Makefile
index 32d8d2e887d5..76f9ef312cfa 100644
--- a/audio/gmpc-libnotify/Makefile
+++ b/audio/gmpc-libnotify/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gmpc-libnotify
-PORTVERSION=	0.19.0
-PORTREVISION=	3
+PORTVERSION=	0.20.0
 CATEGORIES=	audio
 MASTER_SITES=	http://download.sarine.nl/Programs/gmpc/${PORTVERSION}/ \
 		http://freebsd.unixfreunde.de/sources/
@@ -15,16 +14,18 @@ MASTER_SITES=	http://download.sarine.nl/Programs/gmpc/${PORTVERSION}/ \
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	A libnotify for gmpc
 
-LIB_DEPENDS=	mpd:${PORTSDIR}/audio/libmpd \
-		curl.6:${PORTSDIR}/ftp/curl \
+LIB_DEPENDS=	mpd.3:${PORTSDIR}/audio/libmpd \
 		notify.1:${PORTSDIR}/devel/libnotify
 BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gmpc.pc:${PORTSDIR}/audio/gmpc
 RUN_DEPENDS=	gmpc:${PORTSDIR}/audio/gmpc
 
 GNU_CONFIGURE=	yes
-USE_XORG=	x11
 USE_GMAKE=	yes
-USE_GNOME=	gnomehack intltool
-USE_LDCONFIG=	yes
+USE_GNOME=	pkgconfig glib20 gtk20 intltool
+USE_GETTEXT=	yes
+
+PLIST_FILES=	lib/gmpc/plugins/libnotifyplugin.la \
+		lib/gmpc/plugins/libnotifyplugin.so
+PLIST_DIRSTRY=	lib/gmpc/plugins lib/gmpc
 
 .include <bsd.port.mk>
diff --git a/audio/gmpc-libnotify/distinfo b/audio/gmpc-libnotify/distinfo
index e577c745b56b..00fa62a84056 100644
--- a/audio/gmpc-libnotify/distinfo
+++ b/audio/gmpc-libnotify/distinfo
@@ -1,3 +1,2 @@
-MD5 (gmpc-libnotify-0.19.0.tar.gz) = da1a96fbedb216976b1dae0bbd4bbcb2
-SHA256 (gmpc-libnotify-0.19.0.tar.gz) = 72ae8fc35d06aaf9f29e16eac9852196e21f721ded2b59a3d2c01b7c3403fb96
-SIZE (gmpc-libnotify-0.19.0.tar.gz) = 300073
+SHA256 (gmpc-libnotify-0.20.0.tar.gz) = 487deb607b6355413efdfdfcbb8949c3bc95003a5b49571285ab78f23fe65982
+SIZE (gmpc-libnotify-0.20.0.tar.gz) = 302842
diff --git a/audio/gmpc-libnotify/pkg-descr b/audio/gmpc-libnotify/pkg-descr
index 69d37ff68646..2c3dfbea61c0 100644
--- a/audio/gmpc-libnotify/pkg-descr
+++ b/audio/gmpc-libnotify/pkg-descr
@@ -1,3 +1,8 @@
-A libnotify plugin for gmpc.
+The Libnotify plugin is a misc plugin for gmpc. The plugin uses libnotify to
+send messages to the notification-daemon on song change. It will show the song
+title, artist, album (date) and genre. It will also display the album cover if
+available.
 
-WWW:	http://gmpcwiki.sarine.nl/index.php/Libnotify 
+It can act as a replacement for the built-in notification.
+
+WWW: http://gmpc.wikia.com/wiki/GMPC_PLUGIN_LIBNOTIFY
diff --git a/audio/gmpc-libnotify/pkg-plist b/audio/gmpc-libnotify/pkg-plist
index 4de579fab99e..e69de29bb2d1 100644
--- a/audio/gmpc-libnotify/pkg-plist
+++ b/audio/gmpc-libnotify/pkg-plist
@@ -1,4 +0,0 @@
-lib/gmpc/plugins/libnotifyplugin.la
-lib/gmpc/plugins/libnotifyplugin.so
-@dirrmtry lib/gmpc/plugins
-@dirrmtry lib/gmpc
diff --git a/audio/gmpc-lyrics/Makefile b/audio/gmpc-lyrics/Makefile
index f5a7e83495b4..8ea193face05 100644
--- a/audio/gmpc-lyrics/Makefile
+++ b/audio/gmpc-lyrics/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gmpc-lyrics
-PORTVERSION=	0.19.0
-PORTREVISION=	3
+PORTVERSION=	0.20.0
 CATEGORIES=	audio
 MASTER_SITES=	http://download.sarine.nl/Programs/gmpc/${PORTVERSION}/ \
 		http://freebsd.unixfreunde.de/sources/
@@ -15,15 +14,17 @@ MASTER_SITES=	http://download.sarine.nl/Programs/gmpc/${PORTVERSION}/ \
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	A Lyrics Provider plugin for gmpc
 
-LIB_DEPENDS=	mpd:${PORTSDIR}/audio/libmpd \
-		curl.6:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=	mpd.3:${PORTSDIR}/audio/libmpd
 BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gmpc.pc:${PORTSDIR}/audio/gmpc
 RUN_DEPENDS=	gmpc:${PORTSDIR}/audio/gmpc
 
 GNU_CONFIGURE=	yes
-USE_XORG=	x11
 USE_GMAKE=	yes
-USE_GNOME=	gnomehack intltool
-USE_LDCONFIG=	yes
+USE_GNOME=	gnomehack pkgconfig intltool glib20 gtk20 libxml2
+USE_GETTEXT=	yes
+
+PLIST_FILES=	lib/gmpc/plugins/lyricsplugin.la \
+		lib/gmpc/plugins/lyricsplugin.so
+PLIST_DIRSTRY=	lib/gmpc/plugins lib/gmpc
 
 .include <bsd.port.mk>
diff --git a/audio/gmpc-lyrics/distinfo b/audio/gmpc-lyrics/distinfo
index 1a378901d356..400a1e9f4e89 100644
--- a/audio/gmpc-lyrics/distinfo
+++ b/audio/gmpc-lyrics/distinfo
@@ -1,3 +1,2 @@
-MD5 (gmpc-lyrics-0.19.0.tar.gz) = edc96c023774004f3ffb760592a9a48d
-SHA256 (gmpc-lyrics-0.19.0.tar.gz) = 956ce4937129dbee1d427d2c1a729179a69233a2d17f3b0a7e5be21a8bb41678
-SIZE (gmpc-lyrics-0.19.0.tar.gz) = 303330
+SHA256 (gmpc-lyrics-0.20.0.tar.gz) = 049e7d7e007827b3b57bd00e19495200249529d3e9c914cba32bd4288bd5d97f
+SIZE (gmpc-lyrics-0.20.0.tar.gz) = 306141
diff --git a/audio/gmpc-lyrics/pkg-descr b/audio/gmpc-lyrics/pkg-descr
index 32ddd2e74c27..a9d8ed0e4c1a 100644
--- a/audio/gmpc-lyrics/pkg-descr
+++ b/audio/gmpc-lyrics/pkg-descr
@@ -1,8 +1,6 @@
-This plugin fetches lyrics from the Internet. It uses the following websites
-as sources:
+This plugin fetches lyrics from the web from the following sites:
 
-    * LyricWiki
-    * LeosLyrics
-    * Lyrics Tracker
+ * LeosLyrics
+ * LyricsTracker
 
-WWW: http://gmpcwiki.sarine.nl/index.php/Lyrics
+WWW: http://gmpc.wikia.com/wiki/GMPC_PLUGIN_LYRICS
diff --git a/audio/gmpc-lyrics/pkg-plist b/audio/gmpc-lyrics/pkg-plist
index 898f242c6c49..e69de29bb2d1 100644
--- a/audio/gmpc-lyrics/pkg-plist
+++ b/audio/gmpc-lyrics/pkg-plist
@@ -1,4 +0,0 @@
-lib/gmpc/plugins/lyricsplugin.la
-lib/gmpc/plugins/lyricsplugin.so
-@dirrm lib/gmpc/plugins
-@dirrm lib/gmpc
diff --git a/audio/gmpc-lyricsplugin/Makefile b/audio/gmpc-lyricsplugin/Makefile
index 2d5bff866ca5..6cced1241bcb 100644
--- a/audio/gmpc-lyricsplugin/Makefile
+++ b/audio/gmpc-lyricsplugin/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gmpc-lyricsplugin
-PORTVERSION=	0.19.0
-PORTREVISION=	4
+PORTVERSION=	0.20.0
 CATEGORIES=	audio
 MASTER_SITES=	http://download.sarine.nl/Programs/gmpc/${PORTVERSION}/ \
 		http://freebsd.unixfreunde.de/sources/
@@ -15,16 +14,17 @@ MASTER_SITES=	http://download.sarine.nl/Programs/gmpc/${PORTVERSION}/ \
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	A fetch lyrics gmpc plugin
 
-LIB_DEPENDS=	mpd:${PORTSDIR}/audio/libmpd \
-		curl.6:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=	mpd.3:${PORTSDIR}/audio/libmpd
 BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gmpc.pc:${PORTSDIR}/audio/gmpc
 RUN_DEPENDS=	gmpc:${PORTSDIR}/audio/gmpc
 
 GNU_CONFIGURE=	yes
-USE_XORG=	x11
 USE_GMAKE=	yes
-USE_GNOME=	gnomehack intltool
-USE_LDCONFIG=	yes
+USE_GNOME=	pkgconfig intltool glib20 gtk20 libxml2
 USE_GETTEXT=	yes
 
+PLIST_FILES=	lib/gmpc/plugins/lyricspluginplugin.la \
+		lib/gmpc/plugins/lyricspluginplugin.so
+PLIST_DIRSTRY=	lib/gmpc/plugins lib/gmpc
+
 .include <bsd.port.mk>
diff --git a/audio/gmpc-lyricsplugin/distinfo b/audio/gmpc-lyricsplugin/distinfo
index f5c3350bb1ee..075fcaa62ac4 100644
--- a/audio/gmpc-lyricsplugin/distinfo
+++ b/audio/gmpc-lyricsplugin/distinfo
@@ -1,3 +1,2 @@
-MD5 (gmpc-lyricsplugin-0.19.0.tar.gz) = c94df3cd71994bec8818b83a05f0ce7a
-SHA256 (gmpc-lyricsplugin-0.19.0.tar.gz) = d4e53914e7bfd284bea0a056ccf1dac16fc16f85b14ae4d8d6c1de11816ce092
-SIZE (gmpc-lyricsplugin-0.19.0.tar.gz) = 293968
+SHA256 (gmpc-lyricsplugin-0.20.0.tar.gz) = ee4ff7462e32c80a5a383f2866b693a8c3ac865763530bdc343d6585126314b4
+SIZE (gmpc-lyricsplugin-0.20.0.tar.gz) = 296752
diff --git a/audio/gmpc-lyricsplugin/pkg-descr b/audio/gmpc-lyricsplugin/pkg-descr
index 7a8a26d2d8c1..074a5ea57fbd 100644
--- a/audio/gmpc-lyricsplugin/pkg-descr
+++ b/audio/gmpc-lyricsplugin/pkg-descr
@@ -1,3 +1,6 @@
-Uses lyricsplugin (website: http://www.lyricsplugin.com/ ) to fetch lyrics.
+This plugin fetches lyrics from the web from the following sites:
 
-WWW: http://gmpc.wikia.com/wiki/GMPC_0.19.0
+ * Neolyrics
+ * Lyrics tracker
+
+WWW: http://gmpc.wikia.com/wiki/Lyrics
diff --git a/audio/gmpc-lyricsplugin/pkg-plist b/audio/gmpc-lyricsplugin/pkg-plist
index 2eff91d6cc71..e69de29bb2d1 100644
--- a/audio/gmpc-lyricsplugin/pkg-plist
+++ b/audio/gmpc-lyricsplugin/pkg-plist
@@ -1,4 +0,0 @@
-lib/gmpc/plugins/lyricspluginplugin.la
-lib/gmpc/plugins/lyricspluginplugin.so
-@dirrm lib/gmpc/plugins
-@dirrm lib/gmpc
diff --git a/audio/gmpc-lyricwiki/Makefile b/audio/gmpc-lyricwiki/Makefile
index d1fb48a798dc..6f0fb7b1eb17 100644
--- a/audio/gmpc-lyricwiki/Makefile
+++ b/audio/gmpc-lyricwiki/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gmpc-lyricwiki
-PORTVERSION=	0.19.0
-PORTREVISION=	3
+PORTVERSION=	0.20.0
 CATEGORIES=	audio
 MASTER_SITES=	http://download.sarine.nl/Programs/gmpc/${PORTVERSION}/ \
 		http://freebsd.unixfreunde.de/sources/
@@ -15,15 +14,13 @@ MASTER_SITES=	http://download.sarine.nl/Programs/gmpc/${PORTVERSION}/ \
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	A Lyricswiki Provider plugin for gmpc
 
-LIB_DEPENDS=	mpd:${PORTSDIR}/audio/libmpd \
-		curl.6:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=	mpd.3:${PORTSDIR}/audio/libmpd
 BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gmpc.pc:${PORTSDIR}/audio/gmpc
 RUN_DEPENDS=	gmpc:${PORTSDIR}/audio/gmpc
 
 GNU_CONFIGURE=	yes
-USE_XORG=	x11
 USE_GMAKE=	yes
-USE_GNOME=	gnomehack intltool
-USE_LDCONFIG=	yes
+USE_GNOME=	gnomehack pkgconfig intltool glib20 gtk20 libxml2
+USE_GETTEXT=	yes
 
 .include <bsd.port.mk>
diff --git a/audio/gmpc-lyricwiki/distinfo b/audio/gmpc-lyricwiki/distinfo
index e0490b51909b..0ae5e3bcdba5 100644
--- a/audio/gmpc-lyricwiki/distinfo
+++ b/audio/gmpc-lyricwiki/distinfo
@@ -1,3 +1,2 @@
-MD5 (gmpc-lyricwiki-0.19.0.tar.gz) = 3fbed5bb69935240e162a162359116b1
-SHA256 (gmpc-lyricwiki-0.19.0.tar.gz) = 3547e44065bb3daed0b3c6078e0f1f808ad8653942d5e92420430903704cfbe6
-SIZE (gmpc-lyricwiki-0.19.0.tar.gz) = 302340
+SHA256 (gmpc-lyricwiki-0.20.0.tar.gz) = c28aba7934a571da5d958f99ee1fd6c155c7d65e14672d112eca4d64814abfc6
+SIZE (gmpc-lyricwiki-0.20.0.tar.gz) = 305243
diff --git a/audio/gmpc-lyricwiki/pkg-descr b/audio/gmpc-lyricwiki/pkg-descr
index aa8c45454119..d23dda67c7b0 100644
--- a/audio/gmpc-lyricwiki/pkg-descr
+++ b/audio/gmpc-lyricwiki/pkg-descr
@@ -1,3 +1,4 @@
-A new plugin that uses the REST api of lyricwiki to fetch lyrics.
+A new plugin that uses the rest api of lyricwiki to fetch lyrics from
+lyrics.wikia.com.
 
-WWW: http://gmpcwiki.sarine.nl/index.php/Lyricwiki
+WWW: http://gmpc.wikia.com/wiki/Lyricwiki
diff --git a/audio/gmpc-lyricwiki/pkg-plist b/audio/gmpc-lyricwiki/pkg-plist
index 0524e5bb50b2..a7b67eb48758 100644
--- a/audio/gmpc-lyricwiki/pkg-plist
+++ b/audio/gmpc-lyricwiki/pkg-plist
@@ -17,5 +17,5 @@ share/locale/sl/LC_MESSAGES/gmpc-lyricwiki.mo
 share/locale/sq/LC_MESSAGES/gmpc-lyricwiki.mo
 share/locale/sv/LC_MESSAGES/gmpc-lyricwiki.mo
 share/locale/zh_CN/LC_MESSAGES/gmpc-lyricwiki.mo
-@dirrm lib/gmpc/plugins
-@dirrm lib/gmpc
+@dirrmtry lib/gmpc/plugins
+@dirrmtry lib/gmpc
diff --git a/audio/gmpc-magnatune/Makefile b/audio/gmpc-magnatune/Makefile
index b841dab4477a..b44c26368e9e 100644
--- a/audio/gmpc-magnatune/Makefile
+++ b/audio/gmpc-magnatune/Makefile
@@ -6,25 +6,22 @@
 #
 
 PORTNAME=	gmpc-magnatune
-PORTVERSION=	0.19.0
-PORTREVISION=	3
+PORTVERSION=	0.20.0
 CATEGORIES=	audio
 MASTER_SITES=	http://download.sarine.nl/Programs/gmpc/${PORTVERSION}/ \
 		http://freebsd.unixfreunde.de/sources/
 
 MAINTAINER=	miwi@FreeBSD.org
-COMMENT=	A Autoplaylist plugin for gmpc
+COMMENT=	The Magnatune plugin let's you preview music from Magnatune
 
-LIB_DEPENDS=	mpd:${PORTSDIR}/audio/libmpd \
-		curl.6:${PORTSDIR}/ftp/curl \
+LIB_DEPENDS=	mpd.3:${PORTSDIR}/audio/libmpd \
 		sqlite3:${PORTSDIR}/databases/sqlite3
 BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gmpc.pc:${PORTSDIR}/audio/gmpc
 RUN_DEPENDS=	gmpc:${PORTSDIR}/audio/gmpc
 
 GNU_CONFIGURE=	yes
-USE_XORG=	x11
 USE_GMAKE=	yes
-USE_GNOME=	gnomehack intltool
-USE_LDCONFIG=	yes
+USE_GNOME=	pkgconfig intltool glib20 gtk20 libglade2
+USE_GETTEXT=	yes
 
 .include <bsd.port.mk>
diff --git a/audio/gmpc-magnatune/distinfo b/audio/gmpc-magnatune/distinfo
index 47d43665cda0..85ccb499639c 100644
--- a/audio/gmpc-magnatune/distinfo
+++ b/audio/gmpc-magnatune/distinfo
@@ -1,3 +1,2 @@
-MD5 (gmpc-magnatune-0.19.0.tar.gz) = cc4c2b59b2ba9544532780bfbfea1a36
-SHA256 (gmpc-magnatune-0.19.0.tar.gz) = c4e86b8c9214f29fd970ca09204a7acf952c872ff56293d6d02b7b89d02bd2e9
-SIZE (gmpc-magnatune-0.19.0.tar.gz) = 314799
+SHA256 (gmpc-magnatune-0.20.0.tar.gz) = 9aec7fef36312b06d102c95a228a85dd71cde6c0a084918f03ad05ab68fc14ce
+SIZE (gmpc-magnatune-0.20.0.tar.gz) = 318606
diff --git a/audio/gmpc-magnatune/pkg-descr b/audio/gmpc-magnatune/pkg-descr
index 32a299847da0..bd0963550e92 100644
--- a/audio/gmpc-magnatune/pkg-descr
+++ b/audio/gmpc-magnatune/pkg-descr
@@ -1,6 +1,4 @@
-The magnatune plugin provides an interface to the www.magnatune.com website.
-The plugin allows you to browse, and preview available albums.
-(It uses the 128kbit mp3 version). The magnatune plugin provides a double
-function, it also uses the data from the magnatune website to fetch cover art.
+With the Magnatune plugin you can browse through the database of Magnatune and
+preview all kinds of music.
 
-WWW: http://gmpcwiki.sarine.nl/index.php/Mdcover
+WWW: http://gmpc.wikia.com/wiki/GMPC_PLUGIN_MAGNATUNE
diff --git a/audio/gmpc-mdcover/Makefile b/audio/gmpc-mdcover/Makefile
index 5aadbd75be31..93ebfb8711f2 100644
--- a/audio/gmpc-mdcover/Makefile
+++ b/audio/gmpc-mdcover/Makefile
@@ -6,24 +6,21 @@
 #
 
 PORTNAME=	gmpc-mdcover
-PORTVERSION=	0.19.0
-PORTREVISION=	3
+PORTVERSION=	0.20.0
 CATEGORIES=	audio
 MASTER_SITES=	http://download.sarine.nl/Programs/gmpc/${PORTVERSION}/ \
 		http://freebsd.unixfreunde.de/sources/
 
 MAINTAINER=	miwi@FreeBSD.org
-COMMENT=	A Directory artist/song plugin for gmpc
+COMMENT=	Collects metadata for gmpc
 
-LIB_DEPENDS=	mpd:${PORTSDIR}/audio/libmpd \
-		curl.6:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=	mpd.3:${PORTSDIR}/audio/libmpd
 BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gmpc.pc:${PORTSDIR}/audio/gmpc
 RUN_DEPENDS=	gmpc:${PORTSDIR}/audio/gmpc
 
 GNU_CONFIGURE=	yes
-USE_XORG=	x11
-USE_GNOME=	gnomehack intltool
-USE_LDCONFIG=	yes
 USE_GMAKE=	yes
+USE_GNOME=	gnomehack pkgconfig intltool glib20 gtk20 libxml2
+USE_GETTEXT=	yes
 
 .include <bsd.port.mk>
diff --git a/audio/gmpc-mdcover/distinfo b/audio/gmpc-mdcover/distinfo
index b216eab08845..da1c637228df 100644
--- a/audio/gmpc-mdcover/distinfo
+++ b/audio/gmpc-mdcover/distinfo
@@ -1,3 +1,2 @@
-MD5 (gmpc-mdcover-0.19.0.tar.gz) = ff145fe84e4d5711f53a1e0004ff679b
-SHA256 (gmpc-mdcover-0.19.0.tar.gz) = 84cf89649b9e8689074cf7687f1907803804eddec579e10f4488670fd819837a
-SIZE (gmpc-mdcover-0.19.0.tar.gz) = 302359
+SHA256 (gmpc-mdcover-0.20.0.tar.gz) = e0f50943e46ff83614d9d18e08aa2b4e592b71df090763e0827dee8106170d82
+SIZE (gmpc-mdcover-0.20.0.tar.gz) = 305148
diff --git a/audio/gmpc-mdcover/pkg-descr b/audio/gmpc-mdcover/pkg-descr
index b3bfcc2e95a4..4e16f99b3282 100644
--- a/audio/gmpc-mdcover/pkg-descr
+++ b/audio/gmpc-mdcover/pkg-descr
@@ -1,4 +1,4 @@
-This plugin fetches cover art, artist art,album and artist information
-from the file system. 
+Mdcover plugin is a for gmpc. It looks in the location where the music file is
+located to collect metadata. It does this based on a set of rules.
 
-WWW:	http://gmpcwiki.sarine.nl/index.php/Mdcover
+WWW: http://gmpc.wikia.com/wiki/GMPC_PLUGIN_MDCOVER
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
diff --git a/audio/gmpc-shout/Makefile b/audio/gmpc-shout/Makefile
index 31e408588d57..7e909a95bb0d 100644
--- a/audio/gmpc-shout/Makefile
+++ b/audio/gmpc-shout/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gmpc-shout
-PORTVERSION=	0.19.0
-PORTREVISION=	3
+PORTVERSION=	0.20.0
 CATEGORIES=	audio
 MASTER_SITES=	http://download.sarine.nl/Programs/gmpc/${PORTVERSION}/ \
 		http://freebsd.unixfreunde.de/sources/
@@ -15,17 +14,15 @@ MASTER_SITES=	http://download.sarine.nl/Programs/gmpc/${PORTVERSION}/ \
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	Shoutcast stream for gmpc
 
-RUN_DEPENDS=	gmpc:${PORTSDIR}/audio/gmpc
-LIB_DEPENDS+=	mpd:${PORTSDIR}/audio/libmpd \
-		curl.6:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=	mpd.3:${PORTSDIR}/audio/libmpd \
+		cairo.2:${PORTSDIR}/graphics/cairo
 BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gmpc.pc:${PORTSDIR}/audio/gmpc
+RUN_DEPENDS=	gmpc:${PORTSDIR}/audio/gmpc \
+		ogg123:${PORTSDIR}/audio/vorbis-tools
 
 GNU_CONFIGURE=	yes
-USE_XORG=	x11
-USE_GNOME=	gnomehack intltool
 USE_GMAKE=	yes
-USE_LDCONFIG=	yes
-
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
+USE_GNOME=	gnomehack pkgconfig intltool glib20 gtk20 libxml2
+USE_GETTEXT=	yes
 
 .include <bsd.port.mk>
diff --git a/audio/gmpc-shout/distinfo b/audio/gmpc-shout/distinfo
index 8d62a0aa6e1b..d6c01b947395 100644
--- a/audio/gmpc-shout/distinfo
+++ b/audio/gmpc-shout/distinfo
@@ -1,3 +1,2 @@
-MD5 (gmpc-shout-0.19.0.tar.gz) = c69b0e2fb89153454ee561e88291ff6e
-SHA256 (gmpc-shout-0.19.0.tar.gz) = 7e30f373267d746290e9cd1cf3a95a29c1c3530672315799581fd4588a0f87d7
-SIZE (gmpc-shout-0.19.0.tar.gz) = 297763
+SHA256 (gmpc-shout-0.20.0.tar.gz) = 0727e71f422a7b41da9705ab38ccfd13fd8203e1975dff6c34e55e7f957da3df
+SIZE (gmpc-shout-0.20.0.tar.gz) = 300903
diff --git a/audio/gmpc-shout/pkg-descr b/audio/gmpc-shout/pkg-descr
index 28d11e987bac..35e41a5aeafe 100644
--- a/audio/gmpc-shout/pkg-descr
+++ b/audio/gmpc-shout/pkg-descr
@@ -1,3 +1,4 @@
-This plugin allows gmpc to play Shoutcast streams.
+This plugin calls ogg123 and points it at mpd's shoutstream. it will stop ogg123
+when stopped/paused and starts it again when mpd starts playing again.
 
-WWW: http://gmpcwiki.sarine.nl/index.php/Shout
+WWW: http://gmpc.wikia.com/wiki/GMPC_PLUGIN_SHOUT
diff --git a/audio/gmpc-shout/pkg-plist b/audio/gmpc-shout/pkg-plist
index 643d90344065..fb706551bee2 100644
--- a/audio/gmpc-shout/pkg-plist
+++ b/audio/gmpc-shout/pkg-plist
@@ -10,5 +10,5 @@ share/locale/pl/LC_MESSAGES/gmpc-shout.mo
 share/locale/ro/LC_MESSAGES/gmpc-shout.mo
 share/locale/ru/LC_MESSAGES/gmpc-shout.mo
 share/locale/zh_CN/LC_MESSAGES/gmpc-shout.mo
-@dirrm lib/gmpc/plugins
-@dirrm lib/gmpc
+@dirrmtry lib/gmpc/plugins
+@dirrmtry lib/gmpc
diff --git a/audio/gmpc-wikipedia/Makefile b/audio/gmpc-wikipedia/Makefile
index 3cb72f6020a9..8e57c2dc5558 100644
--- a/audio/gmpc-wikipedia/Makefile
+++ b/audio/gmpc-wikipedia/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gmpc-wikipedia
-PORTVERSION=	0.19.0
-PORTREVISION=	4
+PORTVERSION=	0.20.0
 CATEGORIES=	audio
 MASTER_SITES=	http://download.sarine.nl/Programs/gmpc/${PORTVERSION}/ \
 		http://freebsd.unixfreunde.de/sources/
@@ -15,16 +14,15 @@ MASTER_SITES=	http://download.sarine.nl/Programs/gmpc/${PORTVERSION}/ \
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	Wikipedia info for gmpc
 
-LIB_DEPENDS=	mpd:${PORTSDIR}/audio/libmpd \
-		curl.6:${PORTSDIR}/ftp/curl \
+LIB_DEPENDS=	mpd.3:${PORTSDIR}/audio/libmpd \
+		soup-2.4.1:${PORTSDIR}/devel/libsoup \
 		webkit-1.0.13:${PORTSDIR}/www/webkit-gtk2
 BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gmpc.pc:${PORTSDIR}/audio/gmpc
-RUN_DEPEND=	gmpc:${PORTSDIR}/audio/gmpc
+RUN_DEPENDS=	gmpc:${PORTSDIR}/audio/gmpc
 
 GNU_CONFIGURE=	yes
-USE_XORG=	x11
-USE_GNOME=	gnomehack intltool
-USE_LDCONFIG=	yes
 USE_GMAKE=	yes
+USE_GNOME=	pkgconfig intltool glib20 gtk20
+USE_GETTEXT=	yes
 
 .include <bsd.port.mk>
diff --git a/audio/gmpc-wikipedia/distinfo b/audio/gmpc-wikipedia/distinfo
index fabf63c361e7..62219772823a 100644
--- a/audio/gmpc-wikipedia/distinfo
+++ b/audio/gmpc-wikipedia/distinfo
@@ -1,3 +1,2 @@
-MD5 (gmpc-wikipedia-0.19.0.tar.gz) = dab8c94a568c3dca40232971f10729e8
-SHA256 (gmpc-wikipedia-0.19.0.tar.gz) = e04341db5052c8e83c918a1fbb33fd6bff3a84d9fb0a92b56af4545bf8dfe9d5
-SIZE (gmpc-wikipedia-0.19.0.tar.gz) = 306643
+SHA256 (gmpc-wikipedia-0.20.0.tar.gz) = 81bea5cc7407ecf0b8ff53eeef6f579e25cbea4ee8b0c4fe376e6778fefae63d
+SIZE (gmpc-wikipedia-0.20.0.tar.gz) = 311098
diff --git a/audio/gmpc-wikipedia/pkg-descr b/audio/gmpc-wikipedia/pkg-descr
index b3af412e31e2..04cb3a661a62 100644
--- a/audio/gmpc-wikipedia/pkg-descr
+++ b/audio/gmpc-wikipedia/pkg-descr
@@ -1,3 +1,4 @@
-This plugin shows embedded information on the current artist from wikipedia.
+A plugin that shows the Wikipedia page of the currently playing artist.
+The information is shown in a new tab of the player.
 
-WWW: http://sarine.nl/gmpc-plugins
+WWW: http://gmpc.wikia.com/wiki/GMPC_PLUGIN_WIKIPEDIA
diff --git a/audio/gmpc/Makefile b/audio/gmpc/Makefile
index aee8b236bcc2..80e0c267bf23 100644
--- a/audio/gmpc/Makefile
+++ b/audio/gmpc/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gmpc
-PORTVERSION=	0.19.0
-PORTREVISION=	5
+PORTVERSION=	0.20.0
 PORTEPOCH=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://download.sarine.nl/Programs/gmpc/${PORTVERSION}/ \
@@ -16,39 +15,37 @@ MASTER_SITES=	http://download.sarine.nl/Programs/gmpc/${PORTVERSION}/ \
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	Full featured GTK2 client for musicpd
 
-BUILD_DEPENDS=	gob2:${PORTSDIR}/devel/gob2
-LIB_DEPENDS=	mpd:${PORTSDIR}/audio/libmpd \
+BUILD_DEPENDS=	gob2:${PORTSDIR}/devel/gob2 \
+		valac:${PORTSDIR}/lang/vala
+LIB_DEPENDS=	mpd.3:${PORTSDIR}/audio/libmpd \
+		sexy.2:${PORTSDIR}/x11-toolkits/libsexy \
 		sqlite3.8:${PORTSDIR}/databases/sqlite3 \
-		curl.6:${PORTSDIR}/ftp/curl \
 		soup-2.4.1:${PORTSDIR}/devel/libsoup
 
 GNU_CONFIGURE=	yes
-USE_XORG=	x11 sm
 USE_GMAKE=	yes
-USE_GNOME=	libglade2 gnomevfs2 gnomehack
+USE_GNOME=	gnomehack pkgconfig glib20 gtk20 libglade2
 INSTALLS_ICONS=	yes
 USE_GETTEXT=	yes
+CONFIGURE_ARGS=	--enable-system-libsexy
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
 
-MAN1=	gmpc-remote.1 gmpc.1
+MAN1=		gmpc-remote.1 gmpc.1
 
-OPTIONS=	SESSION "Enable session support" on \
-		MMKEYS "Enable multimedia keys support" on \
-		TRAY "Enable tray icon support" on
+OPTIONS=	MMKEYS "Enable multimedia keys support" on \
+		XSPF "Enable support for XSPF playlists" off
 
-.include <bsd.port.pre.mk>
-
-pre-configure:
-.if defined(WITHOUT_SESSION)
-CONFIGURE_ARGS+=	--disable-sm
-.endif
+.include <bsd.port.options.mk>
 
 .if defined(WITHOUT_MMKEYS)
-CONFIGURE_ARGS+=	--disable-mmkeys
+CONFIGURE_ARGS+=--disable-mmkeys
 .endif
 
-.if defined(WITHOUT_TRAY)
-CONFIGURE_ARGS+=	--disable-trayicon
+.if defined(WITH_XSPF)
+LIB_DEPENDS+=	xspf.4:${PORTSDIR}/multimedia/libxspf
+CONFIGURE_ARGS+=--enable-libxspf
+.else
+CONFIGURE_ARGS+=--disable-libxspf
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/audio/gmpc/distinfo b/audio/gmpc/distinfo
index b9cdc1ebdabf..be95013dd07d 100644
--- a/audio/gmpc/distinfo
+++ b/audio/gmpc/distinfo
@@ -1,3 +1,2 @@
-MD5 (gmpc-0.19.0.tar.gz) = bbd02996b6eb389aa6c25150de87f7a2
-SHA256 (gmpc-0.19.0.tar.gz) = 11d8013a494fae57b0efde19182f52029ff56d1b21cfa8b19e281fd135f4772d
-SIZE (gmpc-0.19.0.tar.gz) = 1601887
+SHA256 (gmpc-0.20.0.tar.gz) = d9b8bd23e86acc74049d2ceb5e06db8c62b43e7e5bd166ac8348eae133b9de81
+SIZE (gmpc-0.20.0.tar.gz) = 3093720
diff --git a/audio/gmpc/pkg-plist b/audio/gmpc/pkg-plist
index a7922aab033a..a6550aef3691 100644
--- a/audio/gmpc/pkg-plist
+++ b/audio/gmpc/pkg-plist
@@ -2,40 +2,440 @@ bin/gmpc
 bin/gmpc-remote
 bin/gmpc-remote-stream
 include/gmpc/config1.h
-include/gmpc/gmpc-connection.h
-include/gmpc/gmpc-easy-command.h
+include/gmpc/gmpc-extras.h
 include/gmpc/gmpc-meta-text-view.h
 include/gmpc/gmpc-meta-watcher.h
 include/gmpc/gmpc-metaimage.h
 include/gmpc/gmpc-mpddata-model-sort.h
 include/gmpc/gmpc-mpddata-model.h
-include/gmpc/gmpc-mpddata-treeview-tooltip.h
 include/gmpc/gmpc-mpddata-treeview.h
-include/gmpc/gmpc-paned-size-group.h
-include/gmpc/gmpc-plugin.h
 include/gmpc/gmpc-profiles.h
 include/gmpc/gmpc-version.h
 include/gmpc/gmpc_easy_download.h
 include/gmpc/metadata.h
 include/gmpc/misc.h
+include/gmpc/mpd-async-request.h
+include/gmpc/mpdinteraction.h
 include/gmpc/playlist3-messages.h
 include/gmpc/plugin.h
 libdata/pkgconfig/gmpc.pc
 share/applications/gmpc.desktop
 %%DATADIR%%/aboutdialog.ui
+%%DATADIR%%/gmpc-add-url.ui
 %%DATADIR%%/gmpc-gtk-win32.rc
+%%DATADIR%%/icons/Humanity/128x128/actions/dynamic.png
+%%DATADIR%%/icons/Humanity/128x128/actions/gmpc-database.png
+%%DATADIR%%/icons/Humanity/128x128/actions/gmpc-metabrowser.png
+%%DATADIR%%/icons/Humanity/128x128/actions/gmpc-serve.png
+%%DATADIR%%/icons/Humanity/128x128/actions/info.png
+%%DATADIR%%/icons/Humanity/128x128/actions/media-audiofile.png
+%%DATADIR%%/icons/Humanity/128x128/actions/media-consume.png
+%%DATADIR%%/icons/Humanity/128x128/actions/media-playlist.png
+%%DATADIR%%/icons/Humanity/128x128/actions/media-repeat-single.png
+%%DATADIR%%/icons/Humanity/128x128/actions/media-tag.png
+%%DATADIR%%/icons/Humanity/128x128/actions/playlist-browser.png
+%%DATADIR%%/icons/Humanity/128x128/actions/playlist-search-browser.png
+%%DATADIR%%/icons/Humanity/128x128/actions/tag-browser.png
+%%DATADIR%%/icons/Humanity/128x128/apps/gmpc.png
+%%DATADIR%%/icons/Humanity/128x128/status/audio-volume-high.png
+%%DATADIR%%/icons/Humanity/128x128/status/audio-volume-low.png
+%%DATADIR%%/icons/Humanity/128x128/status/audio-volume-medium.png
+%%DATADIR%%/icons/Humanity/128x128/status/audio-volume-muted.png
+%%DATADIR%%/icons/Humanity/128x128/status/emblem-favorite.png
+%%DATADIR%%/icons/Humanity/128x128/status/fetching-artist.png
+%%DATADIR%%/icons/Humanity/128x128/status/frame-artist.png
+%%DATADIR%%/icons/Humanity/128x128/status/gmpc-tray-disconnected.png
+%%DATADIR%%/icons/Humanity/128x128/status/gmpc-tray-pause.png
+%%DATADIR%%/icons/Humanity/128x128/status/gmpc-tray-play.png
+%%DATADIR%%/icons/Humanity/128x128/status/gmpc-tray.png
+%%DATADIR%%/icons/Humanity/128x128/status/media-album.png
+%%DATADIR%%/icons/Humanity/128x128/status/media-artist.png
+%%DATADIR%%/icons/Humanity/128x128/status/media-codec.png
+%%DATADIR%%/icons/Humanity/128x128/status/media-date.png
+%%DATADIR%%/icons/Humanity/128x128/status/media-format.png
+%%DATADIR%%/icons/Humanity/128x128/status/media-genre.png
+%%DATADIR%%/icons/Humanity/128x128/status/media-num-tracks.png
+%%DATADIR%%/icons/Humanity/128x128/status/media-track-length.png
+%%DATADIR%%/icons/Humanity/128x128/status/no-artist.png
+%%DATADIR%%/icons/Humanity/128x128/status/stock_repeat.png
+%%DATADIR%%/icons/Humanity/128x128/status/stock_shuffle.png
+%%DATADIR%%/icons/Humanity/128x128/status/stylized-cover.png
+%%DATADIR%%/icons/Humanity/128x128/status/stylized-fetching-cover.png
+%%DATADIR%%/icons/Humanity/128x128/status/stylized-no-cover.png
+%%DATADIR%%/icons/Humanity/16x16/actions/dynamic.png
+%%DATADIR%%/icons/Humanity/16x16/actions/gmpc-database.png
+%%DATADIR%%/icons/Humanity/16x16/actions/gmpc-metabrowser.png
+%%DATADIR%%/icons/Humanity/16x16/actions/gmpc-serve.png
+%%DATADIR%%/icons/Humanity/16x16/actions/info.png
+%%DATADIR%%/icons/Humanity/16x16/actions/media-audiofile.png
+%%DATADIR%%/icons/Humanity/16x16/actions/media-consume.png
+%%DATADIR%%/icons/Humanity/16x16/actions/media-playlist.png
+%%DATADIR%%/icons/Humanity/16x16/actions/media-repeat-single.png
+%%DATADIR%%/icons/Humanity/16x16/actions/media-tag.png
+%%DATADIR%%/icons/Humanity/16x16/actions/playlist-browser.png
+%%DATADIR%%/icons/Humanity/16x16/actions/playlist-search-browser.png
+%%DATADIR%%/icons/Humanity/16x16/actions/tag-browser.png
+%%DATADIR%%/icons/Humanity/16x16/apps/gmpc.png
+%%DATADIR%%/icons/Humanity/16x16/status/audio-volume-high.png
+%%DATADIR%%/icons/Humanity/16x16/status/audio-volume-low.png
+%%DATADIR%%/icons/Humanity/16x16/status/audio-volume-medium.png
+%%DATADIR%%/icons/Humanity/16x16/status/audio-volume-muted.png
+%%DATADIR%%/icons/Humanity/16x16/status/emblem-favorite.png
+%%DATADIR%%/icons/Humanity/16x16/status/fetching-artist.png
+%%DATADIR%%/icons/Humanity/16x16/status/frame-artist.png
+%%DATADIR%%/icons/Humanity/16x16/status/gmpc-tray-disconnected.png
+%%DATADIR%%/icons/Humanity/16x16/status/gmpc-tray-pause.png
+%%DATADIR%%/icons/Humanity/16x16/status/gmpc-tray-play.png
+%%DATADIR%%/icons/Humanity/16x16/status/gmpc-tray.png
+%%DATADIR%%/icons/Humanity/16x16/status/media-album.png
+%%DATADIR%%/icons/Humanity/16x16/status/media-artist.png
+%%DATADIR%%/icons/Humanity/16x16/status/media-codec.png
+%%DATADIR%%/icons/Humanity/16x16/status/media-date.png
+%%DATADIR%%/icons/Humanity/16x16/status/media-format.png
+%%DATADIR%%/icons/Humanity/16x16/status/media-genre.png
+%%DATADIR%%/icons/Humanity/16x16/status/media-num-tracks.png
+%%DATADIR%%/icons/Humanity/16x16/status/media-track-length.png
+%%DATADIR%%/icons/Humanity/16x16/status/no-artist.png
+%%DATADIR%%/icons/Humanity/16x16/status/rating.png
+%%DATADIR%%/icons/Humanity/16x16/status/stock_repeat.png
+%%DATADIR%%/icons/Humanity/16x16/status/stock_shuffle.png
+%%DATADIR%%/icons/Humanity/16x16/status/stylized-cover.png
+%%DATADIR%%/icons/Humanity/16x16/status/stylized-fetching-cover.png
+%%DATADIR%%/icons/Humanity/16x16/status/stylized-no-cover.png
+%%DATADIR%%/icons/Humanity/22x22/actions/dynamic.png
+%%DATADIR%%/icons/Humanity/22x22/actions/gmpc-database.png
+%%DATADIR%%/icons/Humanity/22x22/actions/gmpc-metabrowser.png
+%%DATADIR%%/icons/Humanity/22x22/actions/gmpc-serve.png
+%%DATADIR%%/icons/Humanity/22x22/actions/info.png
+%%DATADIR%%/icons/Humanity/22x22/actions/media-audiofile.png
+%%DATADIR%%/icons/Humanity/22x22/actions/media-consume.png
+%%DATADIR%%/icons/Humanity/22x22/actions/media-playlist.png
+%%DATADIR%%/icons/Humanity/22x22/actions/media-repeat-single.png
+%%DATADIR%%/icons/Humanity/22x22/actions/media-tag.png
+%%DATADIR%%/icons/Humanity/22x22/actions/playlist-browser.png
+%%DATADIR%%/icons/Humanity/22x22/actions/playlist-search-browser.png
+%%DATADIR%%/icons/Humanity/22x22/actions/tag-browser.png
+%%DATADIR%%/icons/Humanity/22x22/apps/gmpc.png
+%%DATADIR%%/icons/Humanity/22x22/status/audio-volume-high.png
+%%DATADIR%%/icons/Humanity/22x22/status/audio-volume-low.png
+%%DATADIR%%/icons/Humanity/22x22/status/audio-volume-medium.png
+%%DATADIR%%/icons/Humanity/22x22/status/audio-volume-muted.png
+%%DATADIR%%/icons/Humanity/22x22/status/emblem-favorite.png
+%%DATADIR%%/icons/Humanity/22x22/status/fetching-artist.png
+%%DATADIR%%/icons/Humanity/22x22/status/frame-artist.png
+%%DATADIR%%/icons/Humanity/22x22/status/gmpc-tray-disconnected.png
+%%DATADIR%%/icons/Humanity/22x22/status/gmpc-tray-pause.png
+%%DATADIR%%/icons/Humanity/22x22/status/gmpc-tray-play.png
+%%DATADIR%%/icons/Humanity/22x22/status/gmpc-tray.png
+%%DATADIR%%/icons/Humanity/22x22/status/media-album.png
+%%DATADIR%%/icons/Humanity/22x22/status/media-artist.png
+%%DATADIR%%/icons/Humanity/22x22/status/media-codec.png
+%%DATADIR%%/icons/Humanity/22x22/status/media-date.png
+%%DATADIR%%/icons/Humanity/22x22/status/media-format.png
+%%DATADIR%%/icons/Humanity/22x22/status/media-genre.png
+%%DATADIR%%/icons/Humanity/22x22/status/media-num-tracks.png
+%%DATADIR%%/icons/Humanity/22x22/status/media-track-length.png
+%%DATADIR%%/icons/Humanity/22x22/status/no-artist.png
+%%DATADIR%%/icons/Humanity/22x22/status/rating.png
+%%DATADIR%%/icons/Humanity/22x22/status/stock_repeat.png
+%%DATADIR%%/icons/Humanity/22x22/status/stock_shuffle.png
+%%DATADIR%%/icons/Humanity/22x22/status/stylized-cover.png
+%%DATADIR%%/icons/Humanity/22x22/status/stylized-fetching-cover.png
+%%DATADIR%%/icons/Humanity/22x22/status/stylized-no-cover.png
+%%DATADIR%%/icons/Humanity/24x24/actions/dynamic.png
+%%DATADIR%%/icons/Humanity/24x24/actions/gmpc-database.png
+%%DATADIR%%/icons/Humanity/24x24/actions/gmpc-metabrowser.png
+%%DATADIR%%/icons/Humanity/24x24/actions/gmpc-serve.png
+%%DATADIR%%/icons/Humanity/24x24/actions/media-audiofile.png
+%%DATADIR%%/icons/Humanity/24x24/actions/media-consume.png
+%%DATADIR%%/icons/Humanity/24x24/actions/media-playlist.png
+%%DATADIR%%/icons/Humanity/24x24/actions/media-repeat-single.png
+%%DATADIR%%/icons/Humanity/24x24/actions/media-tag.png
+%%DATADIR%%/icons/Humanity/24x24/actions/playlist-browser.png
+%%DATADIR%%/icons/Humanity/24x24/actions/playlist-search-browser.png
+%%DATADIR%%/icons/Humanity/24x24/actions/tag-browser.png
+%%DATADIR%%/icons/Humanity/24x24/apps/gmpc.png
+%%DATADIR%%/icons/Humanity/24x24/categories/mpd.png
+%%DATADIR%%/icons/Humanity/24x24/status/audio-volume-high.png
+%%DATADIR%%/icons/Humanity/24x24/status/audio-volume-low.png
+%%DATADIR%%/icons/Humanity/24x24/status/audio-volume-medium.png
+%%DATADIR%%/icons/Humanity/24x24/status/audio-volume-muted.png
+%%DATADIR%%/icons/Humanity/24x24/status/emblem-favorite.png
+%%DATADIR%%/icons/Humanity/24x24/status/fetching-artist.png
+%%DATADIR%%/icons/Humanity/24x24/status/frame-artist.png
+%%DATADIR%%/icons/Humanity/24x24/status/gmpc-tray-disconnected.png
+%%DATADIR%%/icons/Humanity/24x24/status/gmpc-tray-pause.png
+%%DATADIR%%/icons/Humanity/24x24/status/gmpc-tray-play.png
+%%DATADIR%%/icons/Humanity/24x24/status/gmpc-tray.png
+%%DATADIR%%/icons/Humanity/24x24/status/media-album.png
+%%DATADIR%%/icons/Humanity/24x24/status/media-artist.png
+%%DATADIR%%/icons/Humanity/24x24/status/media-codec.png
+%%DATADIR%%/icons/Humanity/24x24/status/media-date.png
+%%DATADIR%%/icons/Humanity/24x24/status/media-format.png
+%%DATADIR%%/icons/Humanity/24x24/status/media-genre.png
+%%DATADIR%%/icons/Humanity/24x24/status/media-num-tracks.png
+%%DATADIR%%/icons/Humanity/24x24/status/media-track-length.png
+%%DATADIR%%/icons/Humanity/24x24/status/no-artist.png
+%%DATADIR%%/icons/Humanity/24x24/status/stylized-cover.png
+%%DATADIR%%/icons/Humanity/24x24/status/stylized-fetching-cover.png
+%%DATADIR%%/icons/Humanity/24x24/status/stylized-no-cover.png
+%%DATADIR%%/icons/Humanity/32x32/actions/dynamic.png
+%%DATADIR%%/icons/Humanity/32x32/actions/gmpc-database.png
+%%DATADIR%%/icons/Humanity/32x32/actions/gmpc-metabrowser.png
+%%DATADIR%%/icons/Humanity/32x32/actions/gmpc-serve.png
+%%DATADIR%%/icons/Humanity/32x32/actions/info.png
+%%DATADIR%%/icons/Humanity/32x32/actions/media-audiofile.png
+%%DATADIR%%/icons/Humanity/32x32/actions/media-consume.png
+%%DATADIR%%/icons/Humanity/32x32/actions/media-playlist.png
+%%DATADIR%%/icons/Humanity/32x32/actions/media-repeat-single.png
+%%DATADIR%%/icons/Humanity/32x32/actions/media-tag.png
+%%DATADIR%%/icons/Humanity/32x32/actions/playlist-browser.png
+%%DATADIR%%/icons/Humanity/32x32/actions/playlist-search-browser.png
+%%DATADIR%%/icons/Humanity/32x32/actions/tag-browser.png
+%%DATADIR%%/icons/Humanity/32x32/apps/gmpc.png
+%%DATADIR%%/icons/Humanity/32x32/status/audio-volume-high.png
+%%DATADIR%%/icons/Humanity/32x32/status/audio-volume-low.png
+%%DATADIR%%/icons/Humanity/32x32/status/audio-volume-medium.png
+%%DATADIR%%/icons/Humanity/32x32/status/audio-volume-muted.png
+%%DATADIR%%/icons/Humanity/32x32/status/emblem-favorite.png
+%%DATADIR%%/icons/Humanity/32x32/status/fetching-artist.png
+%%DATADIR%%/icons/Humanity/32x32/status/frame-artist.png
+%%DATADIR%%/icons/Humanity/32x32/status/gmpc-tray-disconnected.png
+%%DATADIR%%/icons/Humanity/32x32/status/gmpc-tray-pause.png
+%%DATADIR%%/icons/Humanity/32x32/status/gmpc-tray-play.png
+%%DATADIR%%/icons/Humanity/32x32/status/gmpc-tray.png
+%%DATADIR%%/icons/Humanity/32x32/status/media-album.png
+%%DATADIR%%/icons/Humanity/32x32/status/media-artist.png
+%%DATADIR%%/icons/Humanity/32x32/status/media-codec.png
+%%DATADIR%%/icons/Humanity/32x32/status/media-date.png
+%%DATADIR%%/icons/Humanity/32x32/status/media-format.png
+%%DATADIR%%/icons/Humanity/32x32/status/media-genre.png
+%%DATADIR%%/icons/Humanity/32x32/status/media-num-tracks.png
+%%DATADIR%%/icons/Humanity/32x32/status/media-track-length.png
+%%DATADIR%%/icons/Humanity/32x32/status/no-artist.png
+%%DATADIR%%/icons/Humanity/32x32/status/rating.png
+%%DATADIR%%/icons/Humanity/32x32/status/stock_repeat.png
+%%DATADIR%%/icons/Humanity/32x32/status/stock_shuffle.png
+%%DATADIR%%/icons/Humanity/32x32/status/stylized-cover.png
+%%DATADIR%%/icons/Humanity/32x32/status/stylized-fetching-cover.png
+%%DATADIR%%/icons/Humanity/32x32/status/stylized-no-cover.png
+%%DATADIR%%/icons/Humanity/48x48/actions/dynamic.png
+%%DATADIR%%/icons/Humanity/48x48/actions/gmpc-database.png
+%%DATADIR%%/icons/Humanity/48x48/actions/gmpc-metabrowser.png
+%%DATADIR%%/icons/Humanity/48x48/actions/gmpc-serve.png
+%%DATADIR%%/icons/Humanity/48x48/actions/info.png
+%%DATADIR%%/icons/Humanity/48x48/actions/media-audiofile.png
+%%DATADIR%%/icons/Humanity/48x48/actions/media-consume.png
+%%DATADIR%%/icons/Humanity/48x48/actions/media-playlist.png
+%%DATADIR%%/icons/Humanity/48x48/actions/media-repeat-single.png
+%%DATADIR%%/icons/Humanity/48x48/actions/media-tag.png
+%%DATADIR%%/icons/Humanity/48x48/actions/playlist-browser.png
+%%DATADIR%%/icons/Humanity/48x48/actions/playlist-search-browser.png
+%%DATADIR%%/icons/Humanity/48x48/actions/tag-browser.png
+%%DATADIR%%/icons/Humanity/48x48/apps/gmpc.png
+%%DATADIR%%/icons/Humanity/48x48/status/audio-volume-high.png
+%%DATADIR%%/icons/Humanity/48x48/status/audio-volume-low.png
+%%DATADIR%%/icons/Humanity/48x48/status/audio-volume-medium.png
+%%DATADIR%%/icons/Humanity/48x48/status/audio-volume-muted.png
+%%DATADIR%%/icons/Humanity/48x48/status/emblem-favorite.png
+%%DATADIR%%/icons/Humanity/48x48/status/fetching-artist.png
+%%DATADIR%%/icons/Humanity/48x48/status/frame-artist.png
+%%DATADIR%%/icons/Humanity/48x48/status/gmpc-tray-disconnected.png
+%%DATADIR%%/icons/Humanity/48x48/status/gmpc-tray-pause.png
+%%DATADIR%%/icons/Humanity/48x48/status/gmpc-tray-play.png
+%%DATADIR%%/icons/Humanity/48x48/status/gmpc-tray.png
+%%DATADIR%%/icons/Humanity/48x48/status/media-album.png
+%%DATADIR%%/icons/Humanity/48x48/status/media-artist.png
+%%DATADIR%%/icons/Humanity/48x48/status/media-codec.png
+%%DATADIR%%/icons/Humanity/48x48/status/media-date.png
+%%DATADIR%%/icons/Humanity/48x48/status/media-format.png
+%%DATADIR%%/icons/Humanity/48x48/status/media-genre.png
+%%DATADIR%%/icons/Humanity/48x48/status/media-num-tracks.png
+%%DATADIR%%/icons/Humanity/48x48/status/media-track-length.png
+%%DATADIR%%/icons/Humanity/48x48/status/no-artist.png
+%%DATADIR%%/icons/Humanity/48x48/status/stock_repeat.png
+%%DATADIR%%/icons/Humanity/48x48/status/stock_shuffle.png
+%%DATADIR%%/icons/Humanity/48x48/status/stylized-cover.png
+%%DATADIR%%/icons/Humanity/48x48/status/stylized-fetching-cover.png
+%%DATADIR%%/icons/Humanity/48x48/status/stylized-no-cover.png
+%%DATADIR%%/icons/Humanity/64x64/actions/dynamic.png
+%%DATADIR%%/icons/Humanity/64x64/actions/gmpc-database.png
+%%DATADIR%%/icons/Humanity/64x64/actions/gmpc-metabrowser.png
+%%DATADIR%%/icons/Humanity/64x64/actions/gmpc-serve.png
+%%DATADIR%%/icons/Humanity/64x64/actions/media-audiofile.png
+%%DATADIR%%/icons/Humanity/64x64/actions/media-consume.png
+%%DATADIR%%/icons/Humanity/64x64/actions/media-playlist.png
+%%DATADIR%%/icons/Humanity/64x64/actions/media-repeat-single.png
+%%DATADIR%%/icons/Humanity/64x64/actions/media-tag.png
+%%DATADIR%%/icons/Humanity/64x64/actions/playlist-browser.png
+%%DATADIR%%/icons/Humanity/64x64/actions/playlist-search-browser.png
+%%DATADIR%%/icons/Humanity/64x64/actions/tag-browser.png
+%%DATADIR%%/icons/Humanity/64x64/apps/gmpc.png
+%%DATADIR%%/icons/Humanity/64x64/status/audio-volume-high.png
+%%DATADIR%%/icons/Humanity/64x64/status/audio-volume-low.png
+%%DATADIR%%/icons/Humanity/64x64/status/audio-volume-medium.png
+%%DATADIR%%/icons/Humanity/64x64/status/audio-volume-muted.png
+%%DATADIR%%/icons/Humanity/64x64/status/emblem-favorite.png
+%%DATADIR%%/icons/Humanity/64x64/status/fetching-artist.png
+%%DATADIR%%/icons/Humanity/64x64/status/frame-artist.png
+%%DATADIR%%/icons/Humanity/64x64/status/gmpc-tray-disconnected.png
+%%DATADIR%%/icons/Humanity/64x64/status/gmpc-tray-pause.png
+%%DATADIR%%/icons/Humanity/64x64/status/gmpc-tray-play.png
+%%DATADIR%%/icons/Humanity/64x64/status/gmpc-tray.png
+%%DATADIR%%/icons/Humanity/64x64/status/media-album.png
+%%DATADIR%%/icons/Humanity/64x64/status/media-artist.png
+%%DATADIR%%/icons/Humanity/64x64/status/media-codec.png
+%%DATADIR%%/icons/Humanity/64x64/status/media-date.png
+%%DATADIR%%/icons/Humanity/64x64/status/media-format.png
+%%DATADIR%%/icons/Humanity/64x64/status/media-genre.png
+%%DATADIR%%/icons/Humanity/64x64/status/media-num-tracks.png
+%%DATADIR%%/icons/Humanity/64x64/status/media-track-length.png
+%%DATADIR%%/icons/Humanity/64x64/status/no-artist.png
+%%DATADIR%%/icons/Humanity/64x64/status/stock_repeat.png
+%%DATADIR%%/icons/Humanity/64x64/status/stock_shuffle.png
+%%DATADIR%%/icons/Humanity/64x64/status/stylized-cover.png
+%%DATADIR%%/icons/Humanity/64x64/status/stylized-fetching-cover.png
+%%DATADIR%%/icons/Humanity/64x64/status/stylized-no-cover.png
+%%DATADIR%%/icons/Humanity/72x72/actions/dynamic.png
+%%DATADIR%%/icons/Humanity/72x72/actions/gmpc-database.png
+%%DATADIR%%/icons/Humanity/72x72/actions/gmpc-metabrowser.png
+%%DATADIR%%/icons/Humanity/72x72/actions/gmpc-serve.png
+%%DATADIR%%/icons/Humanity/72x72/actions/media-audiofile.png
+%%DATADIR%%/icons/Humanity/72x72/actions/media-consume.png
+%%DATADIR%%/icons/Humanity/72x72/actions/media-playlist.png
+%%DATADIR%%/icons/Humanity/72x72/actions/media-repeat-single.png
+%%DATADIR%%/icons/Humanity/72x72/actions/media-tag.png
+%%DATADIR%%/icons/Humanity/72x72/actions/playlist-browser.png
+%%DATADIR%%/icons/Humanity/72x72/actions/playlist-search-browser.png
+%%DATADIR%%/icons/Humanity/72x72/actions/tag-browser.png
+%%DATADIR%%/icons/Humanity/72x72/apps/gmpc.png
+%%DATADIR%%/icons/Humanity/72x72/status/audio-volume-high.png
+%%DATADIR%%/icons/Humanity/72x72/status/audio-volume-low.png
+%%DATADIR%%/icons/Humanity/72x72/status/audio-volume-medium.png
+%%DATADIR%%/icons/Humanity/72x72/status/audio-volume-muted.png
+%%DATADIR%%/icons/Humanity/72x72/status/emblem-favorite.png
+%%DATADIR%%/icons/Humanity/72x72/status/fetching-artist.png
+%%DATADIR%%/icons/Humanity/72x72/status/frame-artist.png
+%%DATADIR%%/icons/Humanity/72x72/status/gmpc-tray-disconnected.png
+%%DATADIR%%/icons/Humanity/72x72/status/gmpc-tray-pause.png
+%%DATADIR%%/icons/Humanity/72x72/status/gmpc-tray-play.png
+%%DATADIR%%/icons/Humanity/72x72/status/gmpc-tray.png
+%%DATADIR%%/icons/Humanity/72x72/status/media-album.png
+%%DATADIR%%/icons/Humanity/72x72/status/media-artist.png
+%%DATADIR%%/icons/Humanity/72x72/status/media-codec.png
+%%DATADIR%%/icons/Humanity/72x72/status/media-date.png
+%%DATADIR%%/icons/Humanity/72x72/status/media-format.png
+%%DATADIR%%/icons/Humanity/72x72/status/media-genre.png
+%%DATADIR%%/icons/Humanity/72x72/status/media-num-tracks.png
+%%DATADIR%%/icons/Humanity/72x72/status/media-track-length.png
+%%DATADIR%%/icons/Humanity/72x72/status/no-artist.png
+%%DATADIR%%/icons/Humanity/72x72/status/stock_repeat.png
+%%DATADIR%%/icons/Humanity/72x72/status/stock_shuffle.png
+%%DATADIR%%/icons/Humanity/72x72/status/stylized-cover.png
+%%DATADIR%%/icons/Humanity/72x72/status/stylized-fetching-cover.png
+%%DATADIR%%/icons/Humanity/72x72/status/stylized-no-cover.png
+%%DATADIR%%/icons/Humanity/96x96/actions/dynamic.png
+%%DATADIR%%/icons/Humanity/96x96/actions/gmpc-database.png
+%%DATADIR%%/icons/Humanity/96x96/actions/gmpc-metabrowser.png
+%%DATADIR%%/icons/Humanity/96x96/actions/gmpc-serve.png
+%%DATADIR%%/icons/Humanity/96x96/actions/media-audiofile.png
+%%DATADIR%%/icons/Humanity/96x96/actions/media-consume.png
+%%DATADIR%%/icons/Humanity/96x96/actions/media-playlist.png
+%%DATADIR%%/icons/Humanity/96x96/actions/media-repeat-single.png
+%%DATADIR%%/icons/Humanity/96x96/actions/media-tag.png
+%%DATADIR%%/icons/Humanity/96x96/actions/playlist-browser.png
+%%DATADIR%%/icons/Humanity/96x96/actions/playlist-search-browser.png
+%%DATADIR%%/icons/Humanity/96x96/actions/tag-browser.png
+%%DATADIR%%/icons/Humanity/96x96/apps/gmpc.png
+%%DATADIR%%/icons/Humanity/96x96/status/audio-volume-high.png
+%%DATADIR%%/icons/Humanity/96x96/status/audio-volume-low.png
+%%DATADIR%%/icons/Humanity/96x96/status/audio-volume-medium.png
+%%DATADIR%%/icons/Humanity/96x96/status/audio-volume-muted.png
+%%DATADIR%%/icons/Humanity/96x96/status/emblem-favorite.png
+%%DATADIR%%/icons/Humanity/96x96/status/fetching-artist.png
+%%DATADIR%%/icons/Humanity/96x96/status/frame-artist.png
+%%DATADIR%%/icons/Humanity/96x96/status/gmpc-tray-disconnected.png
+%%DATADIR%%/icons/Humanity/96x96/status/gmpc-tray-pause.png
+%%DATADIR%%/icons/Humanity/96x96/status/gmpc-tray-play.png
+%%DATADIR%%/icons/Humanity/96x96/status/gmpc-tray.png
+%%DATADIR%%/icons/Humanity/96x96/status/media-album.png
+%%DATADIR%%/icons/Humanity/96x96/status/media-artist.png
+%%DATADIR%%/icons/Humanity/96x96/status/media-codec.png
+%%DATADIR%%/icons/Humanity/96x96/status/media-date.png
+%%DATADIR%%/icons/Humanity/96x96/status/media-format.png
+%%DATADIR%%/icons/Humanity/96x96/status/media-genre.png
+%%DATADIR%%/icons/Humanity/96x96/status/media-num-tracks.png
+%%DATADIR%%/icons/Humanity/96x96/status/media-track-length.png
+%%DATADIR%%/icons/Humanity/96x96/status/no-artist.png
+%%DATADIR%%/icons/Humanity/96x96/status/stock_repeat.png
+%%DATADIR%%/icons/Humanity/96x96/status/stock_shuffle.png
+%%DATADIR%%/icons/Humanity/96x96/status/stylized-cover.png
+%%DATADIR%%/icons/Humanity/96x96/status/stylized-fetching-cover.png
+%%DATADIR%%/icons/Humanity/96x96/status/stylized-no-cover.png
+%%DATADIR%%/icons/Humanity/scalable/actions/dynamic.svg
+%%DATADIR%%/icons/Humanity/scalable/actions/gmpc-database.svg
+%%DATADIR%%/icons/Humanity/scalable/actions/gmpc-metabrowser.svg
+%%DATADIR%%/icons/Humanity/scalable/actions/gmpc-serve.svg
+%%DATADIR%%/icons/Humanity/scalable/actions/info.svg
+%%DATADIR%%/icons/Humanity/scalable/actions/media-audiofile.svg
+%%DATADIR%%/icons/Humanity/scalable/actions/media-consume.svg
+%%DATADIR%%/icons/Humanity/scalable/actions/media-playlist.svg
+%%DATADIR%%/icons/Humanity/scalable/actions/media-repeat-single.svg
+%%DATADIR%%/icons/Humanity/scalable/actions/media-tag.svg
+%%DATADIR%%/icons/Humanity/scalable/actions/playlist-browser.svg
+%%DATADIR%%/icons/Humanity/scalable/actions/playlist-search-browser.svg
+%%DATADIR%%/icons/Humanity/scalable/actions/tag-browser.svg
+%%DATADIR%%/icons/Humanity/scalable/apps/gmpc.svg
+%%DATADIR%%/icons/Humanity/scalable/categories/mpd.svg
+%%DATADIR%%/icons/Humanity/scalable/status/audio-volume-high.svg
+%%DATADIR%%/icons/Humanity/scalable/status/audio-volume-low.svg
+%%DATADIR%%/icons/Humanity/scalable/status/audio-volume-medium.svg
+%%DATADIR%%/icons/Humanity/scalable/status/audio-volume-muted.svg
+%%DATADIR%%/icons/Humanity/scalable/status/emblem-favorite.svg
+%%DATADIR%%/icons/Humanity/scalable/status/fetching-artist.svg
+%%DATADIR%%/icons/Humanity/scalable/status/frame-artist.svg
+%%DATADIR%%/icons/Humanity/scalable/status/gmpc-tray-disconnected.svg
+%%DATADIR%%/icons/Humanity/scalable/status/gmpc-tray-pause.svg
+%%DATADIR%%/icons/Humanity/scalable/status/gmpc-tray-play.svg
+%%DATADIR%%/icons/Humanity/scalable/status/gmpc-tray.svg
+%%DATADIR%%/icons/Humanity/scalable/status/media-album.svg
+%%DATADIR%%/icons/Humanity/scalable/status/media-artist.svg
+%%DATADIR%%/icons/Humanity/scalable/status/media-codec.svg
+%%DATADIR%%/icons/Humanity/scalable/status/media-date.svg
+%%DATADIR%%/icons/Humanity/scalable/status/media-format.svg
+%%DATADIR%%/icons/Humanity/scalable/status/media-genre.svg
+%%DATADIR%%/icons/Humanity/scalable/status/media-num-tracks.svg
+%%DATADIR%%/icons/Humanity/scalable/status/media-track-length.svg
+%%DATADIR%%/icons/Humanity/scalable/status/no-artist.svg
+%%DATADIR%%/icons/Humanity/scalable/status/stock_repeat.svg
+%%DATADIR%%/icons/Humanity/scalable/status/stock_shuffle.svg
+%%DATADIR%%/icons/Humanity/scalable/status/stylized-cover.svg
+%%DATADIR%%/icons/Humanity/scalable/status/stylized-fetching-cover.svg
+%%DATADIR%%/icons/Humanity/scalable/status/stylized-no-cover.svg
 %%DATADIR%%/icons/gmpc-loading-cover.png
 %%DATADIR%%/icons/gmpc-no-cover.png
 %%DATADIR%%/icons/hicolor/128x128/apps/gmpc.png
 %%DATADIR%%/icons/hicolor/128x128/categories/mpd.png
 %%DATADIR%%/icons/hicolor/128x128/status/fetching-artist.png
 %%DATADIR%%/icons/hicolor/128x128/status/frame-artist.png
+%%DATADIR%%/icons/hicolor/128x128/status/media-album.png
+%%DATADIR%%/icons/hicolor/128x128/status/media-artist.png
+%%DATADIR%%/icons/hicolor/128x128/status/media-codec.png
+%%DATADIR%%/icons/hicolor/128x128/status/media-date.png
+%%DATADIR%%/icons/hicolor/128x128/status/media-format.png
+%%DATADIR%%/icons/hicolor/128x128/status/media-genre.png
+%%DATADIR%%/icons/hicolor/128x128/status/media-num-tracks.png
+%%DATADIR%%/icons/hicolor/128x128/status/media-track-length.png
 %%DATADIR%%/icons/hicolor/128x128/status/no-artist.png
 %%DATADIR%%/icons/hicolor/128x128/status/stylized-cover.png
 %%DATADIR%%/icons/hicolor/128x128/status/stylized-fetching-cover.png
 %%DATADIR%%/icons/hicolor/128x128/status/stylized-no-cover.png
+%%DATADIR%%/icons/hicolor/16x16/actions/gmpc-database.png
+%%DATADIR%%/icons/hicolor/16x16/actions/gmpc-metabrowser.png
 %%DATADIR%%/icons/hicolor/16x16/actions/media-audiofile.png
+%%DATADIR%%/icons/hicolor/16x16/actions/media-consume.png
 %%DATADIR%%/icons/hicolor/16x16/actions/media-playlist.png
+%%DATADIR%%/icons/hicolor/16x16/actions/media-repeat-single.png
 %%DATADIR%%/icons/hicolor/16x16/actions/media-tag.png
 %%DATADIR%%/icons/hicolor/16x16/actions/playlist-browser.png
 %%DATADIR%%/icons/hicolor/16x16/actions/playlist-search-browser.png
@@ -50,8 +450,19 @@ share/applications/gmpc.desktop
 %%DATADIR%%/icons/hicolor/16x16/status/gmpc-tray-pause.png
 %%DATADIR%%/icons/hicolor/16x16/status/gmpc-tray-play.png
 %%DATADIR%%/icons/hicolor/16x16/status/gmpc-tray.png
+%%DATADIR%%/icons/hicolor/16x16/status/media-album.png
+%%DATADIR%%/icons/hicolor/16x16/status/media-artist.png
+%%DATADIR%%/icons/hicolor/16x16/status/media-codec.png
+%%DATADIR%%/icons/hicolor/16x16/status/media-date.png
+%%DATADIR%%/icons/hicolor/16x16/status/media-format.png
+%%DATADIR%%/icons/hicolor/16x16/status/media-genre.png
+%%DATADIR%%/icons/hicolor/16x16/status/media-num-tracks.png
+%%DATADIR%%/icons/hicolor/16x16/status/media-track-length.png
+%%DATADIR%%/icons/hicolor/16x16/status/rating.png
 %%DATADIR%%/icons/hicolor/16x16/status/stock_repeat.png
 %%DATADIR%%/icons/hicolor/16x16/status/stock_shuffle.png
+%%DATADIR%%/icons/hicolor/22x22/actions/gmpc-database.png
+%%DATADIR%%/icons/hicolor/22x22/actions/gmpc-metabrowser.png
 %%DATADIR%%/icons/hicolor/22x22/actions/media-audiofile.png
 %%DATADIR%%/icons/hicolor/22x22/actions/media-playlist.png
 %%DATADIR%%/icons/hicolor/22x22/apps/gmpc.png
@@ -64,7 +475,18 @@ share/applications/gmpc.desktop
 %%DATADIR%%/icons/hicolor/22x22/status/gmpc-tray-pause.png
 %%DATADIR%%/icons/hicolor/22x22/status/gmpc-tray-play.png
 %%DATADIR%%/icons/hicolor/22x22/status/gmpc-tray.png
+%%DATADIR%%/icons/hicolor/22x22/status/media-album.png
+%%DATADIR%%/icons/hicolor/22x22/status/media-artist.png
+%%DATADIR%%/icons/hicolor/22x22/status/media-codec.png
+%%DATADIR%%/icons/hicolor/22x22/status/media-date.png
+%%DATADIR%%/icons/hicolor/22x22/status/media-format.png
+%%DATADIR%%/icons/hicolor/22x22/status/media-genre.png
+%%DATADIR%%/icons/hicolor/22x22/status/media-num-tracks.png
+%%DATADIR%%/icons/hicolor/22x22/status/media-track-length.png
+%%DATADIR%%/icons/hicolor/22x22/status/rating.png
 %%DATADIR%%/icons/hicolor/32x32/actions/add-url.png
+%%DATADIR%%/icons/hicolor/32x32/actions/gmpc-database.png
+%%DATADIR%%/icons/hicolor/32x32/actions/gmpc-metabrowser.png
 %%DATADIR%%/icons/hicolor/32x32/actions/media-audiofile.png
 %%DATADIR%%/icons/hicolor/32x32/actions/media-playlist.png
 %%DATADIR%%/icons/hicolor/32x32/actions/media-tag.png
@@ -77,19 +499,43 @@ share/applications/gmpc.desktop
 %%DATADIR%%/icons/hicolor/32x32/status/audio-volume-medium.png
 %%DATADIR%%/icons/hicolor/32x32/status/audio-volume-muted.png
 %%DATADIR%%/icons/hicolor/32x32/status/emblem-favorite.png
-%%DATADIR%%/icons/hicolor/32x32/status/gmpc-tray.png
+%%DATADIR%%/icons/hicolor/32x32/status/media-album.png
+%%DATADIR%%/icons/hicolor/32x32/status/media-artist.png
+%%DATADIR%%/icons/hicolor/32x32/status/media-codec.png
+%%DATADIR%%/icons/hicolor/32x32/status/media-date.png
+%%DATADIR%%/icons/hicolor/32x32/status/media-format.png
+%%DATADIR%%/icons/hicolor/32x32/status/media-genre.png
+%%DATADIR%%/icons/hicolor/32x32/status/media-num-tracks.png
+%%DATADIR%%/icons/hicolor/32x32/status/media-track-length.png
+%%DATADIR%%/icons/hicolor/32x32/status/rating.png
+%%DATADIR%%/icons/hicolor/48x48/actions/gmpc-database.png
+%%DATADIR%%/icons/hicolor/48x48/actions/gmpc-metabrowser.png
 %%DATADIR%%/icons/hicolor/48x48/actions/media-playlist.png
 %%DATADIR%%/icons/hicolor/48x48/actions/media-tag.png
 %%DATADIR%%/icons/hicolor/48x48/actions/tag-browser.png
 %%DATADIR%%/icons/hicolor/48x48/apps/gmpc.png
 %%DATADIR%%/icons/hicolor/48x48/status/fetching-artist.png
 %%DATADIR%%/icons/hicolor/48x48/status/frame-artist.png
-%%DATADIR%%/icons/hicolor/48x48/status/gmpc-tray.png
+%%DATADIR%%/icons/hicolor/48x48/status/media-album.png
+%%DATADIR%%/icons/hicolor/48x48/status/media-artist.png
+%%DATADIR%%/icons/hicolor/48x48/status/media-codec.png
+%%DATADIR%%/icons/hicolor/48x48/status/media-date.png
+%%DATADIR%%/icons/hicolor/48x48/status/media-format.png
+%%DATADIR%%/icons/hicolor/48x48/status/media-genre.png
+%%DATADIR%%/icons/hicolor/48x48/status/media-num-tracks.png
+%%DATADIR%%/icons/hicolor/48x48/status/media-track-length.png
 %%DATADIR%%/icons/hicolor/48x48/status/no-artist.png
 %%DATADIR%%/icons/hicolor/48x48/status/stylized-cover.png
 %%DATADIR%%/icons/hicolor/64x64/apps/gmpc.png
 %%DATADIR%%/icons/hicolor/64x64/status/fetching-artist.png
 %%DATADIR%%/icons/hicolor/64x64/status/frame-artist.png
+%%DATADIR%%/icons/hicolor/64x64/status/media-album.png
+%%DATADIR%%/icons/hicolor/64x64/status/media-artist.png
+%%DATADIR%%/icons/hicolor/64x64/status/media-date.png
+%%DATADIR%%/icons/hicolor/64x64/status/media-format.png
+%%DATADIR%%/icons/hicolor/64x64/status/media-genre.png
+%%DATADIR%%/icons/hicolor/64x64/status/media-num-tracks.png
+%%DATADIR%%/icons/hicolor/64x64/status/media-track-length.png
 %%DATADIR%%/icons/hicolor/64x64/status/no-artist.png
 %%DATADIR%%/icons/hicolor/64x64/status/stylized-cover.png
 %%DATADIR%%/icons/hicolor/64x64/status/stylized-fetching-cover.png
@@ -97,6 +543,13 @@ share/applications/gmpc.desktop
 %%DATADIR%%/icons/hicolor/72x72/apps/gmpc.png
 %%DATADIR%%/icons/hicolor/72x72/status/fetching-artist.png
 %%DATADIR%%/icons/hicolor/72x72/status/frame-artist.png
+%%DATADIR%%/icons/hicolor/72x72/status/media-album.png
+%%DATADIR%%/icons/hicolor/72x72/status/media-artist.png
+%%DATADIR%%/icons/hicolor/72x72/status/media-date.png
+%%DATADIR%%/icons/hicolor/72x72/status/media-format.png
+%%DATADIR%%/icons/hicolor/72x72/status/media-genre.png
+%%DATADIR%%/icons/hicolor/72x72/status/media-num-tracks.png
+%%DATADIR%%/icons/hicolor/72x72/status/media-track-length.png
 %%DATADIR%%/icons/hicolor/72x72/status/no-artist.png
 %%DATADIR%%/icons/hicolor/72x72/status/stylized-cover.png
 %%DATADIR%%/icons/hicolor/72x72/status/stylized-fetching-cover.png
@@ -104,10 +557,24 @@ share/applications/gmpc.desktop
 %%DATADIR%%/icons/hicolor/96x96/apps/gmpc.png
 %%DATADIR%%/icons/hicolor/96x96/status/fetching-artist.png
 %%DATADIR%%/icons/hicolor/96x96/status/frame-artist.png
+%%DATADIR%%/icons/hicolor/96x96/status/media-album.png
+%%DATADIR%%/icons/hicolor/96x96/status/media-artist.png
+%%DATADIR%%/icons/hicolor/96x96/status/media-date.png
+%%DATADIR%%/icons/hicolor/96x96/status/media-format.png
+%%DATADIR%%/icons/hicolor/96x96/status/media-genre.png
+%%DATADIR%%/icons/hicolor/96x96/status/media-num-tracks.png
+%%DATADIR%%/icons/hicolor/96x96/status/media-track-length.png
 %%DATADIR%%/icons/hicolor/96x96/status/no-artist.png
 %%DATADIR%%/icons/hicolor/96x96/status/stylized-fetching-cover.png
 %%DATADIR%%/icons/hicolor/96x96/status/stylized-no-cover.png
+%%DATADIR%%/icons/hicolor/scalable/actions/gmpc-database.svg
+%%DATADIR%%/icons/hicolor/scalable/actions/gmpc-metabrowser.svg
 %%DATADIR%%/icons/hicolor/scalable/actions/media-audiofile.svg
+%%DATADIR%%/icons/hicolor/scalable/actions/media-consume.svg
+%%DATADIR%%/icons/hicolor/scalable/actions/media-playlist.svg
+%%DATADIR%%/icons/hicolor/scalable/actions/media-repeat-single.svg
+%%DATADIR%%/icons/hicolor/scalable/actions/media-tag.svg
+%%DATADIR%%/icons/hicolor/scalable/actions/tag-browser.svg
 %%DATADIR%%/icons/hicolor/scalable/apps/gmpc.svg
 %%DATADIR%%/icons/hicolor/scalable/categories/mpd.svg
 %%DATADIR%%/icons/hicolor/scalable/status/audio-volume-high.svg
@@ -121,6 +588,14 @@ share/applications/gmpc.desktop
 %%DATADIR%%/icons/hicolor/scalable/status/gmpc-tray-pause.svg
 %%DATADIR%%/icons/hicolor/scalable/status/gmpc-tray-play.svg
 %%DATADIR%%/icons/hicolor/scalable/status/gmpc-tray.svg
+%%DATADIR%%/icons/hicolor/scalable/status/media-album.svg
+%%DATADIR%%/icons/hicolor/scalable/status/media-artist.svg
+%%DATADIR%%/icons/hicolor/scalable/status/media-codec.svg
+%%DATADIR%%/icons/hicolor/scalable/status/media-date.svg
+%%DATADIR%%/icons/hicolor/scalable/status/media-format.svg
+%%DATADIR%%/icons/hicolor/scalable/status/media-genre.svg
+%%DATADIR%%/icons/hicolor/scalable/status/media-num-tracks.svg
+%%DATADIR%%/icons/hicolor/scalable/status/media-track-length.svg
 %%DATADIR%%/icons/hicolor/scalable/status/no-artist.svg
 %%DATADIR%%/icons/hicolor/scalable/status/stylized-cover.svg
 %%DATADIR%%/icons/hicolor/scalable/status/stylized-fetching-cover.svg
@@ -128,7 +603,6 @@ share/applications/gmpc.desktop
 %%DATADIR%%/icons/media-album.png
 %%DATADIR%%/icons/media-artist.png
 %%DATADIR%%/icons/media-stream.png
-%%DATADIR%%/icons/mpdBrowser_case.png
 %%DATADIR%%/password-dialog.ui
 %%DATADIR%%/playlist-message-window.ui
 %%DATADIR%%/playlist-save-dialog.ui
@@ -143,6 +617,16 @@ share/applications/gmpc.desktop
 %%DATADIR%%/preferences-trayicon.ui
 %%DATADIR%%/preferences.ui
 %%DATADIR%%/weblinks.list
+share/icons/Humanity/128x128/apps/gmpc.png
+share/icons/Humanity/16x16/apps/gmpc.png
+share/icons/Humanity/22x22/apps/gmpc.png
+share/icons/Humanity/24x24/apps/gmpc.png
+share/icons/Humanity/32x32/apps/gmpc.png
+share/icons/Humanity/48x48/apps/gmpc.png
+share/icons/Humanity/64x64/apps/gmpc.png
+share/icons/Humanity/72x72/apps/gmpc.png
+share/icons/Humanity/96x96/apps/gmpc.png
+share/icons/Humanity/scalable/apps/gmpc.svg
 share/icons/hicolor/128x128/apps/gmpc.png
 share/icons/hicolor/16x16/apps/gmpc.png
 share/icons/hicolor/22x22/apps/gmpc.png
@@ -159,6 +643,9 @@ share/locale/bs/LC_MESSAGES/gmpc.mo
 share/locale/cs/LC_MESSAGES/gmpc.mo
 share/locale/da/LC_MESSAGES/gmpc.mo
 share/locale/de/LC_MESSAGES/gmpc.mo
+share/locale/el/LC_MESSAGES/gmpc.mo
+share/locale/en_CA/LC_MESSAGES/gmpc.mo
+share/locale/en_GB/LC_MESSAGES/gmpc.mo
 share/locale/es/LC_MESSAGES/gmpc.mo
 share/locale/fi/LC_MESSAGES/gmpc.mo
 share/locale/fr/LC_MESSAGES/gmpc.mo
@@ -169,6 +656,7 @@ share/locale/hu/LC_MESSAGES/gmpc.mo
 share/locale/hy/LC_MESSAGES/gmpc.mo
 share/locale/id/LC_MESSAGES/gmpc.mo
 share/locale/it/LC_MESSAGES/gmpc.mo
+share/locale/ja/LC_MESSAGES/gmpc.mo
 share/locale/jv/LC_MESSAGES/gmpc.mo
 share/locale/lv/LC_MESSAGES/gmpc.mo
 share/locale/ml/LC_MESSAGES/gmpc.mo
@@ -187,10 +675,28 @@ share/locale/th/LC_MESSAGES/gmpc.mo
 share/locale/tr/LC_MESSAGES/gmpc.mo
 share/locale/zh_CN/LC_MESSAGES/gmpc.mo
 share/locale/zh_TW/LC_MESSAGES/gmpc.mo
-@dirrmtry share/locale/jv/LC_MESSAGES
-@dirrmtry share/locale/jv
-@dirrmtry share/locale/hy/LC_MESSAGES
-@dirrmtry share/locale/hy
+@dirrm include/gmpc
+@dirrmtry share/icons/Humanity/scalable/apps
+@dirrmtry share/icons/Humanity/scalable
+@dirrmtry share/icons/Humanity/96x96/apps
+@dirrmtry share/icons/Humanity/96x96
+@dirrmtry share/icons/Humanity/72x72/apps
+@dirrmtry share/icons/Humanity/72x72
+@dirrmtry share/icons/Humanity/64x64/apps
+@dirrmtry share/icons/Humanity/64x64
+@dirrmtry share/icons/Humanity/48x48/apps
+@dirrmtry share/icons/Humanity/48x48
+@dirrmtry share/icons/Humanity/32x32/apps
+@dirrmtry share/icons/Humanity/32x32
+@dirrmtry share/icons/Humanity/24x24/apps
+@dirrmtry share/icons/Humanity/24x24
+@dirrmtry share/icons/Humanity/22x22/apps
+@dirrmtry share/icons/Humanity/22x22
+@dirrmtry share/icons/Humanity/16x16/apps
+@dirrmtry share/icons/Humanity/16x16
+@dirrmtry share/icons/Humanity/128x128/apps
+@dirrmtry share/icons/Humanity/128x128
+@dirrmtry share/icons/Humanity
 @dirrm %%DATADIR%%/icons/hicolor/scalable/status
 @dirrm %%DATADIR%%/icons/hicolor/scalable/categories
 @dirrm %%DATADIR%%/icons/hicolor/scalable/apps
@@ -226,7 +732,51 @@ share/locale/zh_TW/LC_MESSAGES/gmpc.mo
 @dirrm %%DATADIR%%/icons/hicolor/128x128/apps
 @dirrm %%DATADIR%%/icons/hicolor/128x128
 @dirrm %%DATADIR%%/icons/hicolor
+@dirrm %%DATADIR%%/icons/Humanity/scalable/status
+@dirrm %%DATADIR%%/icons/Humanity/scalable/categories
+@dirrm %%DATADIR%%/icons/Humanity/scalable/apps
+@dirrm %%DATADIR%%/icons/Humanity/scalable/actions
+@dirrm %%DATADIR%%/icons/Humanity/scalable
+@dirrm %%DATADIR%%/icons/Humanity/96x96/status
+@dirrm %%DATADIR%%/icons/Humanity/96x96/apps
+@dirrm %%DATADIR%%/icons/Humanity/96x96/actions
+@dirrm %%DATADIR%%/icons/Humanity/96x96
+@dirrm %%DATADIR%%/icons/Humanity/72x72/status
+@dirrm %%DATADIR%%/icons/Humanity/72x72/apps
+@dirrm %%DATADIR%%/icons/Humanity/72x72/actions
+@dirrm %%DATADIR%%/icons/Humanity/72x72
+@dirrm %%DATADIR%%/icons/Humanity/64x64/status
+@dirrm %%DATADIR%%/icons/Humanity/64x64/apps
+@dirrm %%DATADIR%%/icons/Humanity/64x64/actions
+@dirrm %%DATADIR%%/icons/Humanity/64x64
+@dirrm %%DATADIR%%/icons/Humanity/48x48/status
+@dirrm %%DATADIR%%/icons/Humanity/48x48/apps
+@dirrm %%DATADIR%%/icons/Humanity/48x48/actions
+@dirrm %%DATADIR%%/icons/Humanity/48x48
+@dirrm %%DATADIR%%/icons/Humanity/32x32/status
+@dirrm %%DATADIR%%/icons/Humanity/32x32/apps
+@dirrm %%DATADIR%%/icons/Humanity/32x32/actions
+@dirrm %%DATADIR%%/icons/Humanity/32x32
+@dirrm %%DATADIR%%/icons/Humanity/24x24/status
+@dirrm %%DATADIR%%/icons/Humanity/24x24/categories
+@dirrm %%DATADIR%%/icons/Humanity/24x24/apps
+@dirrm %%DATADIR%%/icons/Humanity/24x24/actions
+@dirrm %%DATADIR%%/icons/Humanity/24x24
+@dirrm %%DATADIR%%/icons/Humanity/22x22/status
+@dirrm %%DATADIR%%/icons/Humanity/22x22/apps
+@dirrm %%DATADIR%%/icons/Humanity/22x22/actions
+@dirrm %%DATADIR%%/icons/Humanity/22x22
+@dirrm %%DATADIR%%/icons/Humanity/16x16/status
+@dirrm %%DATADIR%%/icons/Humanity/16x16/apps
+@dirrm %%DATADIR%%/icons/Humanity/16x16/actions
+@dirrm %%DATADIR%%/icons/Humanity/16x16
+@dirrm %%DATADIR%%/icons/Humanity/128x128/status
+@dirrm %%DATADIR%%/icons/Humanity/128x128/apps
+@dirrm %%DATADIR%%/icons/Humanity/128x128/actions
+@dirrm %%DATADIR%%/icons/Humanity/128x128
+@dirrm %%DATADIR%%/icons/Humanity
 @dirrm %%DATADIR%%/icons
 @dirrm %%DATADIR%%
+@dirrmtry share/locale/jv/LC_MESSAGES
+@dirrmtry share/locale/jv
 @dirrmtry share/applications
-@dirrm include/gmpc
diff --git a/audio/libmpd/Makefile b/audio/libmpd/Makefile
index 9cf1c656d653..2c19db713cfb 100644
--- a/audio/libmpd/Makefile
+++ b/audio/libmpd/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	libmpd
-PORTVERSION=	0.19.0
+PORTVERSION=	0.20.0
 CATEGORIES=	audio
 MASTER_SITES=	http://download.sarine.nl/Programs/gmpc/${PORTVERSION}/ \
 		http://freebsd.unixfreunde.de/sources/
diff --git a/audio/libmpd/distinfo b/audio/libmpd/distinfo
index de78985e7a5b..e7179ef6da05 100644
--- a/audio/libmpd/distinfo
+++ b/audio/libmpd/distinfo
@@ -1,3 +1,2 @@
-MD5 (libmpd-0.19.0.tar.gz) = a994f5f25a22c778926a3684c3e3050d
-SHA256 (libmpd-0.19.0.tar.gz) = 8976e7c9a4a133a9df55914759382634c8b1f4ff213cd01a28c78d889216d4b8
-SIZE (libmpd-0.19.0.tar.gz) = 356104
+SHA256 (libmpd-0.20.0.tar.gz) = 7205b01b007b2ef06f19aacca26fec2673b730f1a9b6c2ce0ed6728c9ac67723
+SIZE (libmpd-0.20.0.tar.gz) = 363996
diff --git a/audio/libmpd/pkg-plist b/audio/libmpd/pkg-plist
index 82c5124cbbd3..949f9e6c3e69 100644
--- a/audio/libmpd/pkg-plist
+++ b/audio/libmpd/pkg-plist
@@ -12,6 +12,6 @@ include/libmpd/libmpdclient.h
 lib/libmpd.a
 lib/libmpd.la
 lib/libmpd.so
-lib/libmpd.so.2
+lib/libmpd.so.3
 libdata/pkgconfig/libmpd.pc
 @dirrm include/libmpd