- Update to 0.11.2

PR:		ports/73133
Submitted by:	Mark Daniel Reidel <root@alu.reidel.info> (maintainer)

7 files changed, 35 insertions, 63 deletions

diff --git a/audio/gmpc/Makefile b/audio/gmpc/Makefile
index 34677a521d26..e1a4b1fc764d 100644
--- a/audio/gmpc/Makefile
+++ b/audio/gmpc/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gmpc
-PORTVERSION=	0.11.1
+PORTVERSION=	0.11.2
 PORTEPOCH=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://mercury.chem.pitt.edu/~shank/ \
diff --git a/audio/gmpc/distinfo b/audio/gmpc/distinfo
index 2caa6608ba63..c70a71570a0c 100644
--- a/audio/gmpc/distinfo
+++ b/audio/gmpc/distinfo
@@ -1,2 +1,2 @@
-MD5 (gmpc-0.11.1.tar.gz) = 1b7c233c52073dec6eb983119605494a
-SIZE (gmpc-0.11.1.tar.gz) = 209726
+MD5 (gmpc-0.11.2.tar.gz) = a7cc8c0734fef9e0b05be76cea3c0a20
+SIZE (gmpc-0.11.2.tar.gz) = 210365
diff --git a/audio/gmpc/files/patch-src-open-location.c b/audio/gmpc/files/patch-src-open-location.c
deleted file mode 100644
index 393c4198bca1..000000000000
--- a/audio/gmpc/files/patch-src-open-location.c
+++ /dev/null
@@ -1,15 +0,0 @@
---- 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
deleted file mode 100644
index 25c213d32e55..000000000000
--- a/audio/gmpc/files/patch-src-playlist2.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- 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
deleted file mode 100644
index 091aa984a2d1..000000000000
--- a/audio/gmpc/files/patch-src-song-browser.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- 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/files/patch-src-tray-icon.c b/audio/gmpc/files/patch-src-tray-icon.c
new file mode 100644
index 000000000000..d3cd5fdfda18
--- /dev/null
+++ b/audio/gmpc/files/patch-src-tray-icon.c
@@ -0,0 +1,14 @@
+--- 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 cafee05a5bef..62b0f22a9890 100644
--- a/audio/gmpc/pkg-plist
+++ b/audio/gmpc/pkg-plist
@@ -1,19 +1,19 @@
 bin/gmpc
-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/media-stop.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
+%%DATADIR%%/gmpc-tray.png
+%%DATADIR%%/gmpc.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-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%%/open-location.glade
+%%DATADIR%%/add-browser.glade
+@dirrm %%DATADIR%%