update to 0.9.6

changes:
-improvements to plugin infrastructure and more plugins
-Tag writing and ipod-write support turned on by default
-Local file support for album art plugin
-Gnome-keyring support for storing DAAP password
-improvements, bug fixes and new minor features

5 files changed, 21 insertions, 42 deletions

diff --git a/audio/rhythmbox/Makefile b/audio/rhythmbox/Makefile
index bfae8fd314b..fa7c59fe438 100644
--- a/audio/rhythmbox/Makefile
+++ b/audio/rhythmbox/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.44 2006/09/16 12:20:35 jmmv Exp $
+# $NetBSD: Makefile,v 1.45 2006/10/17 16:45:07 drochner Exp $
 #
 
-DISTNAME=	rhythmbox-0.9.5
-PKGREVISION=	4
+DISTNAME=	rhythmbox-0.9.6
 CATEGORIES=	audio gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/rhythmbox/0.9/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/audio/rhythmbox/PLIST b/audio/rhythmbox/PLIST
index f69218be8a1..3f9f642fad2 100644
--- a/audio/rhythmbox/PLIST
+++ b/audio/rhythmbox/PLIST
@@ -1,12 +1,15 @@
-@comment $NetBSD: PLIST,v 1.12 2006/07/03 13:02:39 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.13 2006/10/17 16:45:07 drochner Exp $
 bin/rhythmbox
 bin/rhythmbox-client
-lib/rhythmbox/plugins/audioscrobbler.rb-plugin
-lib/rhythmbox/plugins/generic-player.rb-plugin
-lib/rhythmbox/plugins/libaudioscrobbler.la
-lib/rhythmbox/plugins/libgeneric-player.la
+lib/rhythmbox/plugins/audiocd.rb-plugin
+lib/rhythmbox/plugins/audioscrobbler/audioscrobbler.rb-plugin
+lib/rhythmbox/plugins/audioscrobbler/libaudioscrobbler.la
+lib/rhythmbox/plugins/cd-recorder/cd-recorder.rb-plugin
+lib/rhythmbox/plugins/cd-recorder/libcd-recorder.la
+lib/rhythmbox/plugins/generic-player/generic-player.rb-plugin
+lib/rhythmbox/plugins/generic-player/libgeneric-player.la
+lib/rhythmbox/plugins/libaudiocd.la
 libexec/rhythmbox-metadata
-share/application-registry/rhythmbox.applications
 share/applications/rhythmbox.desktop
 share/dbus-1/services/org.gnome.Rhythmbox.service
 share/doc/rhythmbox/ch01.html
@@ -228,7 +231,6 @@ share/locale/vi/LC_MESSAGES/rhythmbox.mo
 share/locale/zh_CN/LC_MESSAGES/rhythmbox.mo
 share/locale/zh_HK/LC_MESSAGES/rhythmbox.mo
 share/locale/zh_TW/LC_MESSAGES/rhythmbox.mo
-share/mime-info/rhythmbox.keys
 share/omf/rhythmbox/rhythmbox-C.omf
 share/omf/rhythmbox/rhythmbox-es.omf
 share/omf/rhythmbox/rhythmbox-fr.omf
@@ -271,7 +273,6 @@ share/rhythmbox/rhythmbox-ui.xml
 @dirrm share/rhythmbox
 @dirrm share/omf/rhythmbox
 @comment in scrollkeeper: @dirrm share/omf
-@comment in xdg-dirs: @dirrm share/mime-info
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor/48x48/apps
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor
 @dirrm share/gnome/help/rhythmbox/zh_CN/figures
@@ -292,6 +293,8 @@ share/rhythmbox/rhythmbox-ui.xml
 @dirrm share/doc/rhythmbox
 @comment in dbus: @dirrm share/dbus-1/services
 @comment in xdg-dirs: @dirrm share/applications
-@comment in xdg-dirs: @dirrm share/application-registry
+@dirrm lib/rhythmbox/plugins/generic-player
+@dirrm lib/rhythmbox/plugins/cd-recorder
+@dirrm lib/rhythmbox/plugins/audioscrobbler
 @dirrm lib/rhythmbox/plugins
 @dirrm lib/rhythmbox
diff --git a/audio/rhythmbox/distinfo b/audio/rhythmbox/distinfo
index 4996e0dc122..7e04bd278e4 100644
--- a/audio/rhythmbox/distinfo
+++ b/audio/rhythmbox/distinfo
@@ -1,12 +1,11 @@
-$NetBSD: distinfo,v 1.18 2006/08/23 12:19:57 jmmv Exp $
+$NetBSD: distinfo,v 1.19 2006/10/17 16:45:07 drochner Exp $
 
-SHA1 (rhythmbox-0.9.5.tar.bz2) = 94b35f20c9fa45b105d4a068d83e150f4380e921
-RMD160 (rhythmbox-0.9.5.tar.bz2) = b51fd8800d00fd8a8ad16e1ab511cb40630fd4f1
-Size (rhythmbox-0.9.5.tar.bz2) = 2429543 bytes
+SHA1 (rhythmbox-0.9.6.tar.bz2) = 1ef250dbf64613abdfd7665a37e8ee9d0693eb4a
+RMD160 (rhythmbox-0.9.6.tar.bz2) = ce6c711ab06e19ced45bce0b3c445643e351c841
+Size (rhythmbox-0.9.6.tar.bz2) = 3129839 bytes
 SHA1 (patch-aa) = dcadca60a960d44651e1ccc5deba55d97a460af9
 SHA1 (patch-ab) = 3b4e391036f0f9e854b25952a0f63d81dfb07c5b
-SHA1 (patch-ac) = 1541c6df2a835a320aad67676302c42c0020572b
-SHA1 (patch-ad) = 4016299eda7f6ae3d9c132a8db088ac1aef26b7e
+SHA1 (patch-ac) = 4666fd4e5d33d98c03907fba9e8c7f18942c5487
 SHA1 (patch-ae) = 1be3a5dc5a879a64b65a26efba133fe3958ea712
 SHA1 (patch-af) = c240903bfcf720493f8aad768b2693484d2de665
 SHA1 (patch-ag) = 65069bcdfa6f73e617ca0afd5283653bcfe79026
diff --git a/audio/rhythmbox/patches/patch-ac b/audio/rhythmbox/patches/patch-ac
index 3f647df227d..41609f63919 100644
--- a/audio/rhythmbox/patches/patch-ac
+++ b/audio/rhythmbox/patches/patch-ac
@@ -1,6 +1,6 @@
-$NetBSD: patch-ac,v 1.2 2006/08/23 12:19:58 jmmv Exp $
+$NetBSD: patch-ac,v 1.3 2006/10/17 16:45:07 drochner Exp $
 
---- metadata/rb-metadata-dbus-client.c.orig	2006-05-27 06:15:44.000000000 +0200
+--- metadata/rb-metadata-dbus-client.c.orig	2006-08-12 11:25:47.000000000 +0200
 +++ metadata/rb-metadata-dbus-client.c
 @@ -52,7 +52,7 @@
  
@@ -11,12 +11,3 @@ $NetBSD: patch-ac,v 1.2 2006/08/23 12:19:58 jmmv Exp $
  #include <sys/wait.h>
  #include <string.h>
  #include <stdlib.h>
-@@ -118,7 +118,7 @@ kill_metadata_service (void)
- 	if (dbus_connection) {
- 		if (dbus_connection_get_is_connected (dbus_connection)) {
- 			rb_debug ("closing dbus connection");
--			dbus_connection_disconnect (dbus_connection);
-+			dbus_connection_close (dbus_connection);
- 		} else {
- 			rb_debug ("dbus connection already closed");
- 		}
diff --git a/audio/rhythmbox/patches/patch-ad b/audio/rhythmbox/patches/patch-ad
deleted file mode 100644
index 8220f52af1f..00000000000
--- a/audio/rhythmbox/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2006/08/23 12:19:58 jmmv Exp $
-
---- metadata/rb-metadata-dbus-service.c.orig	2006-05-27 06:15:44.000000000 +0200
-+++ metadata/rb-metadata-dbus-service.c
-@@ -494,7 +494,7 @@ main (int argc, char **argv)
- 	g_main_loop_run (svc.loop);
- 
- 	if (svc.connection) {
--		dbus_connection_disconnect (svc.connection);
-+		dbus_connection_close (svc.connection);
- 		dbus_connection_unref (svc.connection);
- 	}
-