4 files changed, 30 insertions, 34 deletions

diff --git a/audio/gmpc/Makefile b/audio/gmpc/Makefile
index d2476f079548..f0da64e01a79 100644
--- a/audio/gmpc/Makefile
+++ b/audio/gmpc/Makefile
@@ -6,39 +6,40 @@
 #
 
 PORTNAME=	gmpc
-PORTVERSION=	0.11.2
-PORTREVISION=	3
+PORTVERSION=	0.13.0
 PORTEPOCH=	1
 CATEGORIES=	audio
-MASTER_SITES=	http://mercury.chem.pitt.edu/~shank/ \
-		http://download.qballcow.nl/programs/gmpc/
+MASTER_SITES=	http://download.qballcow.nl/programs/gmpc-0.13/
 
-MAINTAINER=	ports@mark.reidel.info
+MAINTAINER=	redchrom@gmail.com
 COMMENT=	Tray-aware GTK2 client for musicpd
 
+LIB_DEPENDS=	mpd:${PORTSDIR}/audio/libmpd
+
 GNU_CONFIGURE=	yes
 USE_GNOME=	libglade2 gnomevfs2
-CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib" \
-
-CFLAGS+=	-I${PREFIX}/include
+USE_X_PREFIX=	yes
 
 OPTIONS=	NLS "Native language support" on
 
+.include <bsd.port.pre.mk>
+
 .if !defined(WITHOUT_NLS)
+USE_GETTEXT=	yes
 PLIST_FILES+=	share/locale/fr/LC_MESSAGES/gmpc.mo
+PLIST_FILES+=	share/locale/ru/LC_MESSAGES/gmpc.mo
 .endif
 
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/src/gmpc ${PREFIX}/bin/
-	${MKDIR} ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/pixmaps/*.png ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/glade/*.glade ${DATADIR}
+post-patch:
+	@${REINPLACE_CMD} -e 's|(libdir)/pkgconfig|(prefix)/libdata/pkgconfig|g' \
+		${WRKSRC}/data/Makefile.in
+
+post-install:
 .if !defined(WITHOUT_NLS)
-.for language in fr
+.for language in fr ru
 	${MKDIR} ${LOCALBASE}/share/locale/${language}/LC_MESSAGES
 	${INSTALL_DATA} ${WRKSRC}/po/${language}.gmo ${PREFIX}/share/locale/${language}/LC_MESSAGES/gmpc.mo
 .endfor
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/audio/gmpc/distinfo b/audio/gmpc/distinfo
index 00f6d02fabd9..54658b58e4ab 100644
--- a/audio/gmpc/distinfo
+++ b/audio/gmpc/distinfo
@@ -1,3 +1,3 @@
-MD5 (gmpc-0.11.2.tar.gz) = a7cc8c0734fef9e0b05be76cea3c0a20
-SHA256 (gmpc-0.11.2.tar.gz) = cacf881ccdbc3fe5568636bf279392b5d339a481a5fb2c03d5c70a2de58f7407
-SIZE (gmpc-0.11.2.tar.gz) = 210365
+MD5 (gmpc-0.13.0.tar.gz) = dbbb1880feb8b9c2493ece670520299b
+SHA256 (gmpc-0.13.0.tar.gz) = 7b47fd0d2e5a2f2d626b3e9e903ff8a0c0ce7c926925944dcea1f9ca3e6cfda1
+SIZE (gmpc-0.13.0.tar.gz) = 476926
diff --git a/audio/gmpc/files/patch-src-tray-icon.c b/audio/gmpc/files/patch-src-tray-icon.c
deleted file mode 100644
index d3cd5fdfda18..000000000000
--- a/audio/gmpc/files/patch-src-tray-icon.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/tray-icon.c.orig	Sun Oct 17 00:43:58 2004
-+++ src/tray-icon.c	Wed Oct 27 00:08:40 2004
-@@ -201,10 +201,10 @@
- 	int monitor = gdk_screen_get_monitor_at_window(
- 			gtk_widget_get_screen(tv), tv->window);
- 	GtkWidget *eventb;
-+	char *tooltiptext = NULL;
- 	if(tip != NULL) return FALSE;
- 
- 
--	char *tooltiptext = NULL;
- 
- 	tooltiptext = tray_get_tooltip_text();
- 	gdk_screen_get_monitor_geometry(
diff --git a/audio/gmpc/pkg-plist b/audio/gmpc/pkg-plist
index 62b0f22a9890..505f7a3f871f 100644
--- a/audio/gmpc/pkg-plist
+++ b/audio/gmpc/pkg-plist
@@ -1,19 +1,28 @@
 bin/gmpc
 %%DATADIR%%/gmpc-tray.png
 %%DATADIR%%/gmpc.png
+%%DATADIR%%/icecast.png
 %%DATADIR%%/media-album.png
 %%DATADIR%%/media-artist.png
 %%DATADIR%%/media-audiofile.png
 %%DATADIR%%/media-next.png
 %%DATADIR%%/media-pause.png
 %%DATADIR%%/media-play.png
+%%DATADIR%%/media-playlist.png
 %%DATADIR%%/media-prev.png
 %%DATADIR%%/media-stop.png
 %%DATADIR%%/media-stream.png
 %%DATADIR%%/player-repeat.png
 %%DATADIR%%/player-shuffle.png
 %%DATADIR%%/gmpc.glade
-%%DATADIR%%/playlist.glade
+%%DATADIR%%/playlist3.glade
 %%DATADIR%%/open-location.glade
 %%DATADIR%%/add-browser.glade
+share/applications/gmpc.desktop
+include/gmpc/config1.h
+include/gmpc/cover-art.h
+include/gmpc/plugin.h
+include/gmpc/qthread.h
+@dirrm include/gmpc
+libdata/pkgconfig/gmpc.pc
 @dirrm %%DATADIR%%