6 files changed, 74 insertions, 12 deletions

diff --git a/audio/gmpc/Makefile b/audio/gmpc/Makefile
index ec2214ffdcdc..34677a521d26 100644
--- a/audio/gmpc/Makefile
+++ b/audio/gmpc/Makefile
@@ -6,26 +6,38 @@
 #
 
 PORTNAME=	gmpc
-PORTVERSION=	0.10.3
+PORTVERSION=	0.11.1
 PORTEPOCH=	1
 CATEGORIES=	audio
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	musicpd
+MASTER_SITES=	http://mercury.chem.pitt.edu/~shank/ \
+		http://download.qballcow.nl/programs/gmpc/
 
 MAINTAINER=	ports@mark.reidel.info
 COMMENT=	Tray-aware GTK2 client for musicpd
 
 GNU_CONFIGURE=	yes
-USE_GNOME=	glib20 gtk20 libglade2
+USE_GNOME=	libglade2 gnomevfs2
 CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib" \
 
 CFLAGS+=	-I${PREFIX}/include
 
+OPTIONS=	NLS "Native language support" on
+
+.if !defined(WITHOUT_NLS)
+PLIST_FILES+=	share/locale/fr/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/gmpc.glade ${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/glade/*.glade ${DATADIR}
+.if !defined(WITHOUT_NLS)
+.for language in fr
+	${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>
diff --git a/audio/gmpc/distinfo b/audio/gmpc/distinfo
index 8a5fe785ea1c..2caa6608ba63 100644
--- a/audio/gmpc/distinfo
+++ b/audio/gmpc/distinfo
@@ -1,2 +1,2 @@
-MD5 (gmpc-0.10.3.tar.gz) = c87307039fdd852260271dea9f0580af
-SIZE (gmpc-0.10.3.tar.gz) = 145028
+MD5 (gmpc-0.11.1.tar.gz) = 1b7c233c52073dec6eb983119605494a
+SIZE (gmpc-0.11.1.tar.gz) = 209726
diff --git a/audio/gmpc/files/patch-src-open-location.c b/audio/gmpc/files/patch-src-open-location.c
new file mode 100644
index 000000000000..393c4198bca1
--- /dev/null
+++ b/audio/gmpc/files/patch-src-open-location.c
@@ -0,0 +1,15 @@
+--- src/open-location.c.orig	Sat Jul  3 14:33:37 2004
++++ src/open-location.c	Sun Jul 25 17:40:10 2004
+@@ -171,9 +171,10 @@
+ 
+ void ol_add_location()
+ {
+-	if(strlen(gtk_entry_get_text(GTK_ENTRY(glade_xml_get_widget(ol_xml, "entry_stream")))) == 0 ) return;
+ 	GList *list = NULL;
+-	GnomeVFSURI *uri = gnome_vfs_uri_new(gtk_entry_get_text(GTK_ENTRY(glade_xml_get_widget(ol_xml, "entry_stream"))));
++	GnomeVFSURI *uri;
++	if(strlen(gtk_entry_get_text(GTK_ENTRY(glade_xml_get_widget(ol_xml, "entry_stream")))) == 0 ) return;
++	uri = gnome_vfs_uri_new(gtk_entry_get_text(GTK_ENTRY(glade_xml_get_widget(ol_xml, "entry_stream"))));
+ 	if(uri == NULL)
+ 	{
+ 		g_print("Invalid link\n");
diff --git a/audio/gmpc/files/patch-src-playlist2.c b/audio/gmpc/files/patch-src-playlist2.c
new file mode 100644
index 000000000000..25c213d32e55
--- /dev/null
+++ b/audio/gmpc/files/patch-src-playlist2.c
@@ -0,0 +1,14 @@
+--- src/playlist2.c.orig	Mon Jul 12 17:46:23 2004
++++ src/playlist2.c	Sun Jul 25 17:38:51 2004
+@@ -609,10 +609,10 @@
+ 	/* move every dragged row */
+ 	if (gtk_tree_selection_count_selected_rows (selection) > 0)
+ 	{
++		int i = 0;
+ 		GList *list = NULL;
+ 		list = gtk_tree_selection_get_selected_rows (selection, &pl2_fil);
+ 		list = g_list_last (list);
+-		int i = 0;
+ 		/* start a command list */
+ 		mpd_sendCommandListBegin (info.connection);
+ 		do
diff --git a/audio/gmpc/files/patch-src-song-browser.c b/audio/gmpc/files/patch-src-song-browser.c
new file mode 100644
index 000000000000..091aa984a2d1
--- /dev/null
+++ b/audio/gmpc/files/patch-src-song-browser.c
@@ -0,0 +1,13 @@
+--- src/song-browser.c.orig	Sat Jul 10 17:12:59 2004
++++ src/song-browser.c	Sun Jul 25 17:39:25 2004
+@@ -626,8 +626,9 @@
+ 		return;
+ 	if (add_list != NULL)
+ 	{
++		GList *song;
+ 		mpd_sendCommandListBegin (info.connection);
+-		GList *song = g_list_first (add_list);
++		song = g_list_first (add_list);
+ 		do
+ 		{
+ 			mpd_sendAddCommand (info.connection, song->data);
diff --git a/audio/gmpc/pkg-plist b/audio/gmpc/pkg-plist
index e06f38e6bfd6..cafee05a5bef 100644
--- a/audio/gmpc/pkg-plist
+++ b/audio/gmpc/pkg-plist
@@ -1,11 +1,19 @@
 bin/gmpc
-share/gmpc/tray.png
-share/gmpc/media-play.png
-share/gmpc/media-pause.png
+share/gmpc/gmpc-tray.png
+share/gmpc/gmpc.png
+share/gmpc/media-album.png
+share/gmpc/media-artist.png
+share/gmpc/media-audiofile.png
 share/gmpc/media-next.png
+share/gmpc/media-pause.png
+share/gmpc/media-play.png
 share/gmpc/media-prev.png
-share/gmpc/gmpc-tray.png
 share/gmpc/media-stop.png
-share/gmpc/gmpc.png
+share/gmpc/media-stream.png
+share/gmpc/player-repeat.png
+share/gmpc/player-shuffle.png
 share/gmpc/gmpc.glade
+share/gmpc/playlist.glade
+share/gmpc/open-location.glade
+share/gmpc/add-browser.glade
 @dirrm share/gmpc