26 files changed, 32 insertions, 31 deletions

diff --git a/audio/gbemol/Makefile b/audio/gbemol/Makefile
index e119b3ff3fbb..cccd557ab27f 100644
--- a/audio/gbemol/Makefile
+++ b/audio/gbemol/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	gbemol
 PORTVERSION=	0.3.2
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	audio
 MASTER_SITES=	SF
 
diff --git a/audio/gimmix/Makefile b/audio/gimmix/Makefile
index ef497c97d483..1209acc553e3 100644
--- a/audio/gimmix/Makefile
+++ b/audio/gimmix/Makefile
@@ -3,10 +3,9 @@
 
 PORTNAME=	gimmix
 PORTVERSION=	0.5.7.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	audio
-MASTER_SITES=	${MASTER_SITE_BERLIOS}
-MASTER_SITE_SUBDIR=	gimmix
+MASTER_SITES=	BERLIOS/gimmix
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Gimmix is a graphical MPD client written in C using GTK+2
diff --git a/audio/glurp/Makefile b/audio/glurp/Makefile
index bb9e93a7983b..6f25bfa1a34f 100644
--- a/audio/glurp/Makefile
+++ b/audio/glurp/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	glurp
 PORTVERSION=	0.12.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio
 MASTER_SITES=	SF
 
diff --git a/audio/gmpc-alarm/Makefile b/audio/gmpc-alarm/Makefile
index 96c540c67050..b09977a6bc22 100644
--- a/audio/gmpc-alarm/Makefile
+++ b/audio/gmpc-alarm/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	gmpc-alarm
 PORTVERSION=	11.8.16
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio
 MASTER_SITES=	http://download.sarine.nl/Programs/gmpc/${PORTVERSION}/
 
diff --git a/audio/gmpc-albumview/Makefile b/audio/gmpc-albumview/Makefile
index 9f95c065dfa2..e5d38409a953 100644
--- a/audio/gmpc-albumview/Makefile
+++ b/audio/gmpc-albumview/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	gmpc-albumview
 PORTVERSION=	11.8.16
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio
 MASTER_SITES=	http://download.sarine.nl/Programs/gmpc/${PORTVERSION}/
 
diff --git a/audio/gmpc-discogs/Makefile b/audio/gmpc-discogs/Makefile
index 54fda40007f8..11a2add99047 100644
--- a/audio/gmpc-discogs/Makefile
+++ b/audio/gmpc-discogs/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	gmpc-discogs
 PORTVERSION=	0.20.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	audio
 MASTER_SITES=	http://download.sarine.nl/Programs/gmpc/${PORTVERSION}/ \
 		http://freebsd.unixfreunde.de/sources/
diff --git a/audio/gmpc-extraplaylist/Makefile b/audio/gmpc-extraplaylist/Makefile
index 5a92d680c54b..fe6e2a370732 100644
--- a/audio/gmpc-extraplaylist/Makefile
+++ b/audio/gmpc-extraplaylist/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	gmpc-extraplaylist
 PORTVERSION=	0.20.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	audio
 MASTER_SITES=	http://download.sarine.nl/Programs/gmpc/${PORTVERSION}/ \
 		http://freebsd.unixfreunde.de/sources/
diff --git a/audio/gmpc-lastfm/Makefile b/audio/gmpc-lastfm/Makefile
index 6ede6d448c0a..79817adb40ef 100644
--- a/audio/gmpc-lastfm/Makefile
+++ b/audio/gmpc-lastfm/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	gmpc-lastfm
 PORTVERSION=	0.20.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	audio
 MASTER_SITES=	http://download.sarine.nl/Programs/gmpc/${PORTVERSION}/ \
 		http://freebsd.unixfreunde.de/sources/
diff --git a/audio/gmpc-libnotify/Makefile b/audio/gmpc-libnotify/Makefile
index 72915ec19d6b..c7630f91b1c1 100644
--- a/audio/gmpc-libnotify/Makefile
+++ b/audio/gmpc-libnotify/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	gmpc-libnotify
 PORTVERSION=	11.8.16
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio
 MASTER_SITES=	http://download.sarine.nl/Programs/gmpc/${PORTVERSION}/
 
diff --git a/audio/gmpc-lyrics/Makefile b/audio/gmpc-lyrics/Makefile
index 72ffdc5b68c5..e2d450c44e12 100644
--- a/audio/gmpc-lyrics/Makefile
+++ b/audio/gmpc-lyrics/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	gmpc-lyrics
 PORTVERSION=	11.8.16
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	audio
 MASTER_SITES=	http://download.sarine.nl/Programs/gmpc/${PORTVERSION}/
 
diff --git a/audio/gmpc-lyricsplugin/Makefile b/audio/gmpc-lyricsplugin/Makefile
index 3bbfa98129ac..267de52f26a6 100644
--- a/audio/gmpc-lyricsplugin/Makefile
+++ b/audio/gmpc-lyricsplugin/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	gmpc-lyricsplugin
 PORTVERSION=	0.20.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	audio
 MASTER_SITES=	http://download.sarine.nl/Programs/gmpc/${PORTVERSION}/ \
 		http://freebsd.unixfreunde.de/sources/
diff --git a/audio/gmpc-lyricwiki/Makefile b/audio/gmpc-lyricwiki/Makefile
index aa3c87e14c36..dc496672b358 100644
--- a/audio/gmpc-lyricwiki/Makefile
+++ b/audio/gmpc-lyricwiki/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	gmpc-lyricwiki
 PORTVERSION=	11.8.16
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	audio
 MASTER_SITES=	http://download.sarine.nl/Programs/gmpc/${PORTVERSION}/
 
diff --git a/audio/gmpc-magnatune/Makefile b/audio/gmpc-magnatune/Makefile
index c13a3e7360f0..d285c74683ee 100644
--- a/audio/gmpc-magnatune/Makefile
+++ b/audio/gmpc-magnatune/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	gmpc-magnatune
 PORTVERSION=	11.8.16
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	audio
 MASTER_SITES=	http://download.sarine.nl/Programs/gmpc/${PORTVERSION}/
 
diff --git a/audio/gmpc-mdcover/Makefile b/audio/gmpc-mdcover/Makefile
index 5b869d653f78..a0a282a05835 100644
--- a/audio/gmpc-mdcover/Makefile
+++ b/audio/gmpc-mdcover/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	gmpc-mdcover
 PORTVERSION=	0.20.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	audio
 MASTER_SITES=	http://download.sarine.nl/Programs/gmpc/${PORTVERSION}/ \
 		http://freebsd.unixfreunde.de/sources/
diff --git a/audio/gmpc-mserver/Makefile b/audio/gmpc-mserver/Makefile
index a305b102bf08..b85e1e50f1c7 100644
--- a/audio/gmpc-mserver/Makefile
+++ b/audio/gmpc-mserver/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	gmpc-mserver
 PORTVERSION=	0.20.0
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	audio
 MASTER_SITES=	http://download.sarine.nl/Programs/gmpc/${PORTVERSION}/ \
 		http://freebsd.unixfreunde.de/sources/
diff --git a/audio/gmpc-shout/Makefile b/audio/gmpc-shout/Makefile
index fbcb26005350..470550490aec 100644
--- a/audio/gmpc-shout/Makefile
+++ b/audio/gmpc-shout/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	gmpc-shout
 PORTVERSION=	0.20.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	audio
 MASTER_SITES=	http://download.sarine.nl/Programs/gmpc/${PORTVERSION}/ \
 		http://freebsd.unixfreunde.de/sources/
diff --git a/audio/gmpc-wikipedia/Makefile b/audio/gmpc-wikipedia/Makefile
index 2000e7ceee16..15d0770a65c3 100644
--- a/audio/gmpc-wikipedia/Makefile
+++ b/audio/gmpc-wikipedia/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	gmpc-wikipedia
 PORTVERSION=	11.8.16
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio
 MASTER_SITES=	http://download.sarine.nl/Programs/gmpc/${PORTVERSION}/
 
diff --git a/audio/gmpc/Makefile b/audio/gmpc/Makefile
index 12b1a5a223e9..820c5f2136f6 100644
--- a/audio/gmpc/Makefile
+++ b/audio/gmpc/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	gmpc
 PORTVERSION=	11.8.16
-PORTREVISION=	3
+PORTREVISION=	4
 PORTEPOCH=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://download.sarine.nl/Programs/gmpc/${PORTVERSION}/ \
diff --git a/audio/libmpd/Makefile b/audio/libmpd/Makefile
index 22f29f3363d1..4bdea645a328 100644
--- a/audio/libmpd/Makefile
+++ b/audio/libmpd/Makefile
@@ -3,15 +3,15 @@
 
 PORTNAME=	libmpd
 PORTVERSION=	11.8.17
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://download.sarine.nl/Programs/gmpc/11.8.16/
 
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	Abstraction around libmpdclient
 
-USE_AUTOTOOLS=	libtool
 GNU_CONFIGURE=	yes
-USES=		pathfix pkgconfig
+USES=		libtool pathfix pkgconfig
 USE_GNOME=	glib20
 USE_LDCONFIG=	yes
 
diff --git a/audio/libmpd/pkg-plist b/audio/libmpd/pkg-plist
index 92dfc09c19ab..4642e369fba8 100644
--- a/audio/libmpd/pkg-plist
+++ b/audio/libmpd/pkg-plist
@@ -10,8 +10,8 @@ include/libmpd/libmpd-version.h
 include/libmpd/libmpd.h
 include/libmpd/libmpdclient.h
 lib/libmpd.a
-lib/libmpd.la
 lib/libmpd.so
-lib/libmpd.so.4
+lib/libmpd.so.1
+lib/libmpd.so.1.3.0
 libdata/pkgconfig/libmpd.pc
 @dirrm include/libmpd
diff --git a/audio/mpdas/Makefile b/audio/mpdas/Makefile
index 41a4d47929aa..c37664b72a39 100644
--- a/audio/mpdas/Makefile
+++ b/audio/mpdas/Makefile
@@ -3,10 +3,11 @@
 
 PORTNAME=	mpdas
 PORTVERSION=	0.3.1
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://50hz.ws/mpdas/
 
-MAINTAINER=	henrik@affekt.org	
+MAINTAINER=	henrik@affekt.org
 COMMENT=	MPD AudioScrobbler written in C++ supporting the latest protocol
 
 LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl \
@@ -23,6 +24,6 @@ PLIST_FILES=	bin/mpdas \
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/mpdas ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/mpdas.1 ${STAGEDIR}${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/mpdas.1 ${STAGEDIR}${MANPREFIX}/man/man1
 
 .include <bsd.port.mk>
diff --git a/audio/osd-lyrics/Makefile b/audio/osd-lyrics/Makefile
index 2bf390fb063f..087150075218 100644
--- a/audio/osd-lyrics/Makefile
+++ b/audio/osd-lyrics/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	osdlyrics
 PORTVERSION=	0.4.3
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	audio deskutils
 MASTER_SITES=	GOOGLE_CODE
 PROJECTHOST=	osd-lyrics
diff --git a/audio/xfce4-mpc-plugin/Makefile b/audio/xfce4-mpc-plugin/Makefile
index 429b634ff0e7..dc39d619b9de 100644
--- a/audio/xfce4-mpc-plugin/Makefile
+++ b/audio/xfce4-mpc-plugin/Makefile
@@ -3,14 +3,14 @@
 
 PORTNAME=	xfce4-mpc-plugin
 PORTVERSION=	0.4.4
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	audio xfce
 MASTER_SITES=	${MASTER_SITE_XFCE}
 MASTER_SITE_SUBDIR=src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	xfce@FreeBSD.org
-COMMENT=	Musicpd client plugin for the Xfce panel 
+COMMENT=	Musicpd client plugin for the Xfce panel
 
 LICENSE=	BSD
 
diff --git a/audio/xfmpc/Makefile b/audio/xfmpc/Makefile
index 7a655f677c0c..8de4deb7acb8 100644
--- a/audio/xfmpc/Makefile
+++ b/audio/xfmpc/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	xfmpc
 PORTVERSION=	0.2.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	audio xfce
 MASTER_SITES=	${MASTER_SITE_XFCE}
 MASTER_SITE_SUBDIR=/src/apps/${PORTNAME}/${PORTVERSION:R}
diff --git a/net-im/pidgin-pidgimpd/Makefile b/net-im/pidgin-pidgimpd/Makefile
index 8e747d392b6a..374f05e70b1b 100644
--- a/net-im/pidgin-pidgimpd/Makefile
+++ b/net-im/pidgin-pidgimpd/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	pidgimpd
 PORTVERSION=	1.1.1
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	net-im audio
 MASTER_SITES=	http://ayeon.org/projects/pidgimpd/
 PKGNAMEPREFIX=	pidgin-
diff --git a/x11-wm/e17-module-mpdule/Makefile b/x11-wm/e17-module-mpdule/Makefile
index ebaf31a98bf0..fe744d6eaaff 100644
--- a/x11-wm/e17-module-mpdule/Makefile
+++ b/x11-wm/e17-module-mpdule/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	mpdule
 PORTVERSION=	20130510
+PORTREVISION=	1
 CATEGORIES=	x11-wm enlightenment
 MASTER_SITES=	LOCAL/gblach/e17/modules/
 PKGNAMEPREFIX=	e17-module-