update to 0.9.5

This is a major update, too many individual changes to list here.
Most notably: uses the gstreamer-0.10 framework now.

(That's still not that great software, there is an appearent ressource
leak which makes switching between play channels fail after a while.)

8 files changed, 326 insertions, 120 deletions

diff --git a/audio/rhythmbox/Makefile b/audio/rhythmbox/Makefile
index d2ca7f0b33f..54a7bb3ff72 100644
--- a/audio/rhythmbox/Makefile
+++ b/audio/rhythmbox/Makefile
@@ -1,43 +1,50 @@
-# $NetBSD: Makefile,v 1.37 2006/04/17 13:46:16 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2006/07/02 11:32:40 drochner Exp $
 #
 
-DISTNAME=	rhythmbox-0.8.8
-PKGREVISION=	7
+DISTNAME=	rhythmbox-0.9.5
 CATEGORIES=	audio gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/rhythmbox/0.8/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/rhythmbox/0.9/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.rhythmbox.org/
 COMMENT=	Music management application for GNOME
 
-DEPENDS+=		gst-plugins0.8-esound>=0.8.1:../../audio/gst-plugins0.8-esound
-DEPENDS+=		gst-plugins0.8-gnomevfs>=0.8.1:../../sysutils/gst-plugins0.8-gnomevfs
-DEPENDS+=		gst-plugins0.8-mad>=0.8.1:../../audio/gst-plugins0.8-mad
-DEPENDS+=		gst-plugins0.8-vorbis>=0.8.1:../../audio/gst-plugins0.8-vorbis
-
 GNU_CONFIGURE=		YES
 USE_DIRS+=		gnome2-1.5
 USE_TOOLS+=		gmake msgfmt pkg-config
 USE_LIBTOOL=		YES
 USE_PKGLOCALEDIR=	YES
 
-PKGCONFIG_OVERRIDE=	data/rhythmbox.pc.in
+CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc
+CONFIGURE_ARGS+=	--without-bonobo
+CONFIGURE_ARGS+=	--without-hal
+CONFIGURE_ARGS+=	--without-ipod
+CONFIGURE_ARGS+=	--disable-python
 
 GCONF2_SCHEMAS=		rhythmbox.schemas
 
-.include "../../audio/flac/buildlink3.mk"
-.include "../../audio/libid3tag/buildlink3.mk"
-.include "../../audio/libvorbis/buildlink3.mk"
+BUILDLINK_API_DEPENDS.gtk2+=		gtk2+>=2.5.4
+BUILDLINK_API_DEPENDS.musicbrainz+=	musicbrainz>=2.1.0
+BUILDLINK_API_DEPENDS.totem+=		{totem,totem-xine}>=1.1.5
+
+.include "../../audio/musicbrainz/buildlink3.mk"
 .include "../../devel/GConf2/schemas.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/libbonobo/buildlink3.mk"
 .include "../../devel/libglade2/buildlink3.mk"
-.include "../../multimedia/gstreamer0.8/buildlink3.mk"
-.include "../../multimedia/gst-plugins0.8/buildlink3.mk"
+.include "../../devel/libgnomeui/buildlink3.mk"
+.include "../../devel/libsexy/buildlink3.mk"
+.include "../../multimedia/gstreamer0.10/buildlink3.mk"
+.include "../../multimedia/gst-plugins0.10-base/buildlink3.mk"
+.include "../../multimedia/totem/buildlink3.mk"
+.include "../../net/libsoup-devel/buildlink3.mk"
+.include "../../sysutils/dbus-glib/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../sysutils/gnome-vfs2/buildlink3.mk"
+.include "../../sysutils/nautilus-cd-burner/buildlink3.mk"
+.include "../../sysutils/libnotify/buildlink3.mk"
+.include "../../textproc/gnome-doc-utils/buildlink3.mk"
 .include "../../textproc/intltool/buildlink3.mk"
 .include "../../textproc/scrollkeeper/omf.mk"
 .include "../../x11/gtk2/buildlink3.mk"
diff --git a/audio/rhythmbox/PLIST b/audio/rhythmbox/PLIST
index 1dea4a18b5b..6b68c58172d 100644
--- a/audio/rhythmbox/PLIST
+++ b/audio/rhythmbox/PLIST
@@ -1,81 +1,179 @@
-@comment $NetBSD: PLIST,v 1.9 2006/04/17 07:07:12 jlam Exp $
+@comment $NetBSD: PLIST,v 1.10 2006/07/02 11:32:40 drochner Exp $
 bin/rhythmbox
-lib/bonobo/servers/GNOME_Rhythmbox.server
-lib/pkgconfig/rhythmbox.pc
+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
+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
+share/doc/rhythmbox/ch02.html
+share/doc/rhythmbox/ch03.html
+share/doc/rhythmbox/ch04.html
+share/doc/rhythmbox/ch05.html
+share/doc/rhythmbox/ch06.html
+share/doc/rhythmbox/ch07.html
+share/doc/rhythmbox/ch08.html
+share/doc/rhythmbox/home.png
+share/doc/rhythmbox/index.html
+share/doc/rhythmbox/index.sgml
+share/doc/rhythmbox/left.png
+share/doc/rhythmbox/rhythmbox-RBCellRendererPixbuf.html
+share/doc/rhythmbox/rhythmbox-RBSource.html
+share/doc/rhythmbox/rhythmbox-eel-gconf-extensions.html
+share/doc/rhythmbox/rhythmbox-rb-cell-renderer-rating.html
+share/doc/rhythmbox/rhythmbox-rb-debug.html
+share/doc/rhythmbox/rhythmbox-rb-dialog.html
+share/doc/rhythmbox/rhythmbox-rb-druid.html
+share/doc/rhythmbox/rhythmbox-rb-entry-view.html
+share/doc/rhythmbox/rhythmbox-rb-enums.html
+share/doc/rhythmbox/rhythmbox-rb-file-helpers.html
+share/doc/rhythmbox/rhythmbox-rb-glade-helpers.html
+share/doc/rhythmbox/rhythmbox-rb-header.html
+share/doc/rhythmbox/rhythmbox-rb-history.html
+share/doc/rhythmbox/rhythmbox-rb-iradio-source.html
+share/doc/rhythmbox/rhythmbox-rb-library-source.html
+share/doc/rhythmbox/rhythmbox-rb-load-failure-dialog.html
+share/doc/rhythmbox/rhythmbox-rb-metadata.html
+share/doc/rhythmbox/rhythmbox-rb-new-station-dialog.html
+share/doc/rhythmbox/rhythmbox-rb-play-order-linear-loop.html
+share/doc/rhythmbox/rhythmbox-rb-play-order-linear.html
+share/doc/rhythmbox/rhythmbox-rb-play-order-random-by-age-and-rating.html
+share/doc/rhythmbox/rhythmbox-rb-play-order-random-by-age.html
+share/doc/rhythmbox/rhythmbox-rb-play-order-random-by-rating.html
+share/doc/rhythmbox/rhythmbox-rb-play-order-random-equal-weights.html
+share/doc/rhythmbox/rhythmbox-rb-play-order-random.html
+share/doc/rhythmbox/rhythmbox-rb-play-order-shuffle.html
+share/doc/rhythmbox/rhythmbox-rb-play-order.html
+share/doc/rhythmbox/rhythmbox-rb-player.html
+share/doc/rhythmbox/rhythmbox-rb-playlist-manager.html
+share/doc/rhythmbox/rhythmbox-rb-playlist-source-recorder.html
+share/doc/rhythmbox/rhythmbox-rb-playlist-source.html
+share/doc/rhythmbox/rhythmbox-rb-preferences.html
+share/doc/rhythmbox/rhythmbox-rb-property-view.html
+share/doc/rhythmbox/rhythmbox-rb-query-creator.html
+share/doc/rhythmbox/rhythmbox-rb-rating-helper.html
+share/doc/rhythmbox/rhythmbox-rb-rating.html
+share/doc/rhythmbox/rhythmbox-rb-recorder.html
+share/doc/rhythmbox/rhythmbox-rb-search-entry.html
+share/doc/rhythmbox/rhythmbox-rb-shell-clipboard.html
+share/doc/rhythmbox/rhythmbox-rb-shell-player.html
+share/doc/rhythmbox/rhythmbox-rb-shell-preferences.html
+share/doc/rhythmbox/rhythmbox-rb-shell.html
+share/doc/rhythmbox/rhythmbox-rb-song-display-box.html
+share/doc/rhythmbox/rhythmbox-rb-song-info.html
+share/doc/rhythmbox/rhythmbox-rb-source-header.html
+share/doc/rhythmbox/rhythmbox-rb-sourcelist-model.html
+share/doc/rhythmbox/rhythmbox-rb-sourcelist.html
+share/doc/rhythmbox/rhythmbox-rb-station-properties-dialog.html
+share/doc/rhythmbox/rhythmbox-rb-statusbar.html
+share/doc/rhythmbox/rhythmbox-rb-stock-icons.html
+share/doc/rhythmbox/rhythmbox-rb-string-helpers.html
+share/doc/rhythmbox/rhythmbox-rb-tray-icon.html
+share/doc/rhythmbox/rhythmbox-rb-tree-dnd.html
+share/doc/rhythmbox/rhythmbox-rb-tree-model-sort.html
+share/doc/rhythmbox/rhythmbox-rb-util.html
+share/doc/rhythmbox/rhythmbox-rhythmdb-property-model.html
+share/doc/rhythmbox/rhythmbox-rhythmdb-query-model.html
+share/doc/rhythmbox/rhythmbox-rhythmdb-tree.html
+share/doc/rhythmbox/rhythmbox-rhythmdb.html
+share/doc/rhythmbox/rhythmbox.devhelp
+share/doc/rhythmbox/rhythmbox.devhelp2
+share/doc/rhythmbox/right.png
+share/doc/rhythmbox/style.css
+share/doc/rhythmbox/up.png
 share/gconf/schemas/rhythmbox.schemas
-share/gnome-2.0/ui/rhythmbox-ui.xml
-share/gnome/help/rhythmbox/C/authors.xml
 share/gnome/help/rhythmbox/C/fdl-appendix.xml
-share/gnome/help/rhythmbox/C/figures/rb-adv.png
-share/gnome/help/rhythmbox/C/figures/rb-asst-finish.png
-share/gnome/help/rhythmbox/C/figures/rb-asst-library.png
-share/gnome/help/rhythmbox/C/figures/rb-asst-start.png
-share/gnome/help/rhythmbox/C/figures/rb-basic.png
-share/gnome/help/rhythmbox/C/figures/rb-browser.png
-share/gnome/help/rhythmbox/C/figures/rb-context-menu.png
-share/gnome/help/rhythmbox/C/figures/rb-empty.png
-share/gnome/help/rhythmbox/C/figures/rb-full-play.png
-share/gnome/help/rhythmbox/C/figures/rb-group-auto.png
-share/gnome/help/rhythmbox/C/figures/rb-group-create.png
-share/gnome/help/rhythmbox/C/figures/rb-group.png
-share/gnome/help/rhythmbox/C/figures/rb-imported.png
-share/gnome/help/rhythmbox/C/figures/rb-iradio-add.png
-share/gnome/help/rhythmbox/C/figures/rb-iradio.png
-share/gnome/help/rhythmbox/C/figures/rb-nextprev.png
-share/gnome/help/rhythmbox/C/figures/rb-nobrowse-play.png
+share/gnome/help/rhythmbox/C/figures/rb-iradio-main.png
 share/gnome/help/rhythmbox/C/figures/rb-notification-area-menu.png
-share/gnome/help/rhythmbox/C/figures/rb-notification-area.png
-share/gnome/help/rhythmbox/C/figures/rb-player.png
-share/gnome/help/rhythmbox/C/figures/rb-prefs-general.png
-share/gnome/help/rhythmbox/C/figures/rb-prefs-ipod.png
-share/gnome/help/rhythmbox/C/figures/rb-prefs-library.png
-share/gnome/help/rhythmbox/C/figures/rb-prefs.png
-share/gnome/help/rhythmbox/C/figures/rb-repeat.png
-share/gnome/help/rhythmbox/C/figures/rb-search.png
-share/gnome/help/rhythmbox/C/figures/rb-shuffle.png
-share/gnome/help/rhythmbox/C/figures/rb-sidebar.png
-share/gnome/help/rhythmbox/C/figures/rb-stats.png
+share/gnome/help/rhythmbox/C/figures/rb-notification-window.png
+share/gnome/help/rhythmbox/C/figures/rb-notification-zone.png
+share/gnome/help/rhythmbox/C/figures/rb-podcast-main.png
 share/gnome/help/rhythmbox/C/figures/rb-statusbar.png
-share/gnome/help/rhythmbox/C/figures/rb-toolbar-editor.png
+share/gnome/help/rhythmbox/C/figures/rb-toolbar-prevplaynext.png
+share/gnome/help/rhythmbox/C/figures/rb-toolbar-repeat.png
+share/gnome/help/rhythmbox/C/figures/rb-toolbar-shuffle.png
 share/gnome/help/rhythmbox/C/figures/rb-toolbar.png
 share/gnome/help/rhythmbox/C/figures/rb-volume-changer.png
-share/gnome/help/rhythmbox/C/figures/rb-volume-mute.png
 share/gnome/help/rhythmbox/C/figures/rb-window-small.png
 share/gnome/help/rhythmbox/C/figures/rb-window.png
-share/gnome/help/rhythmbox/C/figures/rhythmbox-group.png
-share/gnome/help/rhythmbox/C/figures/rhythmbox-tray-icon.png
 share/gnome/help/rhythmbox/C/legal.xml
-share/gnome/help/rhythmbox/C/quick-reference.xml
 share/gnome/help/rhythmbox/C/rhythmbox.xml
-share/gnome/help/rhythmbox/C/user-guide.xml
-share/gnome/help/rhythmbox/ja/authors.xml
-share/gnome/help/rhythmbox/ja/fdl-appendix.xml
-share/gnome/help/rhythmbox/ja/figures/rb-adv.png
-share/gnome/help/rhythmbox/ja/figures/rb-basic.png
-share/gnome/help/rhythmbox/ja/figures/rb-browser.png
-share/gnome/help/rhythmbox/ja/figures/rb-context-menu.png
-share/gnome/help/rhythmbox/ja/figures/rb-iradio-add.png
-share/gnome/help/rhythmbox/ja/figures/rb-iradio.png
-share/gnome/help/rhythmbox/ja/figures/rb-nextprev.png
-share/gnome/help/rhythmbox/ja/figures/rb-notification-area-menu.png
-share/gnome/help/rhythmbox/ja/figures/rb-notification-area.png
-share/gnome/help/rhythmbox/ja/figures/rb-player.png
-share/gnome/help/rhythmbox/ja/figures/rb-prefs-general.png
-share/gnome/help/rhythmbox/ja/figures/rb-prefs-library.png
-share/gnome/help/rhythmbox/ja/figures/rb-repeat.png
-share/gnome/help/rhythmbox/ja/figures/rb-search.png
-share/gnome/help/rhythmbox/ja/figures/rb-shuffle.png
-share/gnome/help/rhythmbox/ja/figures/rb-sidebar.png
-share/gnome/help/rhythmbox/ja/figures/rb-stats.png
-share/gnome/help/rhythmbox/ja/figures/rb-volume-changer.png
-share/gnome/help/rhythmbox/ja/figures/rb-window.png
-share/gnome/help/rhythmbox/ja/legal.xml
-share/gnome/help/rhythmbox/ja/quick-reference.xml
-share/gnome/help/rhythmbox/ja/rhythmbox.xml
-share/gnome/help/rhythmbox/ja/user-guide.xml
-share/idl/Rhythmbox.idl
+share/gnome/help/rhythmbox/es/figures/rb-iradio-main.png
+share/gnome/help/rhythmbox/es/figures/rb-notification-area-menu.png
+share/gnome/help/rhythmbox/es/figures/rb-notification-window.png
+share/gnome/help/rhythmbox/es/figures/rb-notification-zone.png
+share/gnome/help/rhythmbox/es/figures/rb-podcast-main.png
+share/gnome/help/rhythmbox/es/figures/rb-statusbar.png
+share/gnome/help/rhythmbox/es/figures/rb-toolbar-prevplaynext.png
+share/gnome/help/rhythmbox/es/figures/rb-toolbar-repeat.png
+share/gnome/help/rhythmbox/es/figures/rb-toolbar-shuffle.png
+share/gnome/help/rhythmbox/es/figures/rb-toolbar.png
+share/gnome/help/rhythmbox/es/figures/rb-volume-changer.png
+share/gnome/help/rhythmbox/es/figures/rb-window-small.png
+share/gnome/help/rhythmbox/es/figures/rb-window.png
+share/gnome/help/rhythmbox/es/rhythmbox.xml
+share/gnome/help/rhythmbox/fr/figures/rb-iradio-main.png
+share/gnome/help/rhythmbox/fr/figures/rb-notification-area-menu.png
+share/gnome/help/rhythmbox/fr/figures/rb-notification-window.png
+share/gnome/help/rhythmbox/fr/figures/rb-notification-zone.png
+share/gnome/help/rhythmbox/fr/figures/rb-podcast-main.png
+share/gnome/help/rhythmbox/fr/figures/rb-statusbar.png
+share/gnome/help/rhythmbox/fr/figures/rb-toolbar-prevplaynext.png
+share/gnome/help/rhythmbox/fr/figures/rb-toolbar-repeat.png
+share/gnome/help/rhythmbox/fr/figures/rb-toolbar-shuffle.png
+share/gnome/help/rhythmbox/fr/figures/rb-toolbar.png
+share/gnome/help/rhythmbox/fr/figures/rb-volume-changer.png
+share/gnome/help/rhythmbox/fr/figures/rb-window-small.png
+share/gnome/help/rhythmbox/fr/figures/rb-window.png
+share/gnome/help/rhythmbox/fr/rhythmbox.xml
+share/gnome/help/rhythmbox/ru/figures/rb-iradio-main.png
+share/gnome/help/rhythmbox/ru/figures/rb-notification-area-menu.png
+share/gnome/help/rhythmbox/ru/figures/rb-notification-window.png
+share/gnome/help/rhythmbox/ru/figures/rb-notification-zone.png
+share/gnome/help/rhythmbox/ru/figures/rb-podcast-main.png
+share/gnome/help/rhythmbox/ru/figures/rb-statusbar.png
+share/gnome/help/rhythmbox/ru/figures/rb-toolbar-prevplaynext.png
+share/gnome/help/rhythmbox/ru/figures/rb-toolbar-repeat.png
+share/gnome/help/rhythmbox/ru/figures/rb-toolbar-shuffle.png
+share/gnome/help/rhythmbox/ru/figures/rb-toolbar.png
+share/gnome/help/rhythmbox/ru/figures/rb-volume-changer.png
+share/gnome/help/rhythmbox/ru/figures/rb-window-small.png
+share/gnome/help/rhythmbox/ru/figures/rb-window.png
+share/gnome/help/rhythmbox/ru/rhythmbox.xml
+share/gnome/help/rhythmbox/sv/figures/rb-iradio-main.png
+share/gnome/help/rhythmbox/sv/figures/rb-notification-area-menu.png
+share/gnome/help/rhythmbox/sv/figures/rb-notification-window.png
+share/gnome/help/rhythmbox/sv/figures/rb-notification-zone.png
+share/gnome/help/rhythmbox/sv/figures/rb-podcast-main.png
+share/gnome/help/rhythmbox/sv/figures/rb-statusbar.png
+share/gnome/help/rhythmbox/sv/figures/rb-toolbar-prevplaynext.png
+share/gnome/help/rhythmbox/sv/figures/rb-toolbar-repeat.png
+share/gnome/help/rhythmbox/sv/figures/rb-toolbar-shuffle.png
+share/gnome/help/rhythmbox/sv/figures/rb-toolbar.png
+share/gnome/help/rhythmbox/sv/figures/rb-volume-changer.png
+share/gnome/help/rhythmbox/sv/figures/rb-window-small.png
+share/gnome/help/rhythmbox/sv/figures/rb-window.png
+share/gnome/help/rhythmbox/sv/rhythmbox.xml
+share/gnome/help/rhythmbox/zh_CN/figures/rb-iradio-main.png
+share/gnome/help/rhythmbox/zh_CN/figures/rb-notification-area-menu.png
+share/gnome/help/rhythmbox/zh_CN/figures/rb-notification-window.png
+share/gnome/help/rhythmbox/zh_CN/figures/rb-notification-zone.png
+share/gnome/help/rhythmbox/zh_CN/figures/rb-podcast-main.png
+share/gnome/help/rhythmbox/zh_CN/figures/rb-statusbar.png
+share/gnome/help/rhythmbox/zh_CN/figures/rb-toolbar-prevplaynext.png
+share/gnome/help/rhythmbox/zh_CN/figures/rb-toolbar-repeat.png
+share/gnome/help/rhythmbox/zh_CN/figures/rb-toolbar-shuffle.png
+share/gnome/help/rhythmbox/zh_CN/figures/rb-toolbar.png
+share/gnome/help/rhythmbox/zh_CN/figures/rb-volume-changer.png
+share/gnome/help/rhythmbox/zh_CN/figures/rb-window-small.png
+share/gnome/help/rhythmbox/zh_CN/figures/rb-window.png
+share/gnome/help/rhythmbox/zh_CN/rhythmbox.xml
+share/icons/hicolor/48x48/apps/rhythmbox.png
+share/icons/hicolor/icon-theme.cache
 share/locale/am/LC_MESSAGES/rhythmbox.mo
 share/locale/ar/LC_MESSAGES/rhythmbox.mo
 share/locale/az/LC_MESSAGES/rhythmbox.mo
@@ -95,6 +193,7 @@ share/locale/eu/LC_MESSAGES/rhythmbox.mo
 share/locale/fi/LC_MESSAGES/rhythmbox.mo
 share/locale/fr/LC_MESSAGES/rhythmbox.mo
 share/locale/ga/LC_MESSAGES/rhythmbox.mo
+share/locale/gl/LC_MESSAGES/rhythmbox.mo
 share/locale/he/LC_MESSAGES/rhythmbox.mo
 share/locale/hr/LC_MESSAGES/rhythmbox.mo
 share/locale/hu/LC_MESSAGES/rhythmbox.mo
@@ -105,87 +204,93 @@ share/locale/ja/LC_MESSAGES/rhythmbox.mo
 share/locale/ko/LC_MESSAGES/rhythmbox.mo
 share/locale/lt/LC_MESSAGES/rhythmbox.mo
 share/locale/lv/LC_MESSAGES/rhythmbox.mo
+share/locale/mk/LC_MESSAGES/rhythmbox.mo
+share/locale/ml/LC_MESSAGES/rhythmbox.mo
 share/locale/mn/LC_MESSAGES/rhythmbox.mo
 share/locale/ms/LC_MESSAGES/rhythmbox.mo
 share/locale/nb/LC_MESSAGES/rhythmbox.mo
+share/locale/ne/LC_MESSAGES/rhythmbox.mo
 share/locale/nl/LC_MESSAGES/rhythmbox.mo
-share/locale/no/LC_MESSAGES/rhythmbox.mo
 share/locale/pa/LC_MESSAGES/rhythmbox.mo
 share/locale/pl/LC_MESSAGES/rhythmbox.mo
 share/locale/pt/LC_MESSAGES/rhythmbox.mo
 share/locale/pt_BR/LC_MESSAGES/rhythmbox.mo
 share/locale/ro/LC_MESSAGES/rhythmbox.mo
 share/locale/ru/LC_MESSAGES/rhythmbox.mo
+share/locale/rw/LC_MESSAGES/rhythmbox.mo
 share/locale/sk/LC_MESSAGES/rhythmbox.mo
 share/locale/sr/LC_MESSAGES/rhythmbox.mo
 share/locale/sr@Latn/LC_MESSAGES/rhythmbox.mo
 share/locale/sv/LC_MESSAGES/rhythmbox.mo
+share/locale/th/LC_MESSAGES/rhythmbox.mo
 share/locale/tr/LC_MESSAGES/rhythmbox.mo
 share/locale/uk/LC_MESSAGES/rhythmbox.mo
 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-ja.omf
-share/pixmaps/rhythmbox.png
+share/omf/rhythmbox/rhythmbox-es.omf
+share/omf/rhythmbox/rhythmbox-fr.omf
+share/omf/rhythmbox/rhythmbox-ru.omf
+share/omf/rhythmbox/rhythmbox-sv.omf
+share/omf/rhythmbox/rhythmbox-zh_CN.omf
 share/rhythmbox/art/about-logo.png
-share/rhythmbox/art/rhythmbox-album.png
-share/rhythmbox/art/rhythmbox-audiocd.png
-share/rhythmbox/art/rhythmbox-automatic-playlist.png
-share/rhythmbox/art/rhythmbox-dnd.png
-share/rhythmbox/art/rhythmbox-ipod.png
-share/rhythmbox/art/rhythmbox-iradio.png
-share/rhythmbox/art/rhythmbox-library.png
-share/rhythmbox/art/rhythmbox-next.png
+share/rhythmbox/art/media-eject.png
 share/rhythmbox/art/rhythmbox-no-star.png
-share/rhythmbox/art/rhythmbox-pause.png
-share/rhythmbox/art/rhythmbox-paused.png
-share/rhythmbox/art/rhythmbox-play.png
-share/rhythmbox/art/rhythmbox-playing.png
-share/rhythmbox/art/rhythmbox-playlist-menu.png
-share/rhythmbox/art/rhythmbox-playlist.png
-share/rhythmbox/art/rhythmbox-previous.png
-share/rhythmbox/art/rhythmbox-repeat.png
-share/rhythmbox/art/rhythmbox-rewind.png
+share/rhythmbox/art/rhythmbox-podcast.png
 share/rhythmbox/art/rhythmbox-set-star.png
-share/rhythmbox/art/rhythmbox-shuffle.png
-share/rhythmbox/art/rhythmbox-stop.png
 share/rhythmbox/art/rhythmbox-tray-icon.png
 share/rhythmbox/art/rhythmbox-unset-star.png
-share/rhythmbox/art/rhythmbox-visuals.png
-share/rhythmbox/art/rhythmbox-volume-max.png
-share/rhythmbox/art/rhythmbox-volume-medium.png
-share/rhythmbox/art/rhythmbox-volume-min.png
-share/rhythmbox/art/rhythmbox-volume-mute.png
-share/rhythmbox/art/rhythmbox-volume-zero.png
+share/rhythmbox/daap-ui.xml
+share/rhythmbox/generic-player-ui.xml
+share/rhythmbox/glade/audioscrobbler-prefs.glade
 share/rhythmbox/glade/create-playlist.glade
+share/rhythmbox/glade/daap-prefs.glade
 share/rhythmbox/glade/druid.glade
 share/rhythmbox/glade/general-prefs.glade
 share/rhythmbox/glade/library-prefs.glade
-share/rhythmbox/glade/load-failure.glade
+share/rhythmbox/glade/playlist-save.glade
+share/rhythmbox/glade/plugins.glade
+share/rhythmbox/glade/podcast-feed-properties.glade
+share/rhythmbox/glade/podcast-new.glade
+share/rhythmbox/glade/podcast-prefs.glade
+share/rhythmbox/glade/podcast-properties.glade
+share/rhythmbox/glade/recorder.glade
 share/rhythmbox/glade/song-info-multiple.glade
 share/rhythmbox/glade/song-info.glade
 share/rhythmbox/glade/station-new.glade
 share/rhythmbox/glade/station-properties.glade
 share/rhythmbox/glade/uri.glade
+share/rhythmbox/ipod-ui.xml
 share/rhythmbox/iradio-initial.pls
+share/rhythmbox/playlists.xml
+share/rhythmbox/rhythmbox-ui.xml
 @dirrm share/rhythmbox/glade
 @dirrm share/rhythmbox/art
 @dirrm share/rhythmbox
-@comment in xdg-dirs: @dirrm share/pixmaps
 @dirrm share/omf/rhythmbox
 @comment in scrollkeeper: @dirrm share/omf
 @comment in xdg-dirs: @dirrm share/mime-info
-@comment in ORBit2: @dirrm share/idl
-@dirrm share/gnome/help/rhythmbox/ja/figures
-@dirrm share/gnome/help/rhythmbox/ja
+@dirrm share/gnome/help/rhythmbox/zh_CN/figures
+@dirrm share/gnome/help/rhythmbox/zh_CN
+@dirrm share/gnome/help/rhythmbox/sv/figures
+@dirrm share/gnome/help/rhythmbox/sv
+@dirrm share/gnome/help/rhythmbox/ru/figures
+@dirrm share/gnome/help/rhythmbox/ru
+@dirrm share/gnome/help/rhythmbox/fr/figures
+@dirrm share/gnome/help/rhythmbox/fr
+@dirrm share/gnome/help/rhythmbox/es/figures
+@dirrm share/gnome/help/rhythmbox/es
 @dirrm share/gnome/help/rhythmbox/C/figures
 @dirrm share/gnome/help/rhythmbox/C
 @dirrm share/gnome/help/rhythmbox
 @comment in gnome2-dirs: @dirrm share/gnome/help
-@comment in gnome2-dirs: @dirrm share/gnome-2.0/ui
 @comment in GConf2: @dirrm share/gconf/schemas
+@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
-@comment in libbonobo: @dirrm lib/bonobo/servers
+@dirrm lib/rhythmbox/plugins
+@dirrm lib/rhythmbox
diff --git a/audio/rhythmbox/distinfo b/audio/rhythmbox/distinfo
index ab1fa56869e..5e8f0b7d880 100644
--- a/audio/rhythmbox/distinfo
+++ b/audio/rhythmbox/distinfo
@@ -1,5 +1,10 @@
-$NetBSD: distinfo,v 1.15 2005/02/23 20:39:51 agc Exp $
+$NetBSD: distinfo,v 1.16 2006/07/02 11:32:40 drochner Exp $
 
-SHA1 (rhythmbox-0.8.8.tar.bz2) = a48713cc191ce6df44f5466638dda39d56280243
-RMD160 (rhythmbox-0.8.8.tar.bz2) = 7c436dd556c330ea98d87bad5cb304ab4a236020
-Size (rhythmbox-0.8.8.tar.bz2) = 2435338 bytes
+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 (patch-aa) = dcadca60a960d44651e1ccc5deba55d97a460af9
+SHA1 (patch-ab) = 3b4e391036f0f9e854b25952a0f63d81dfb07c5b
+SHA1 (patch-ac) = b62a5816bd6a93156fce0c99c216ffeb4beb9787
+SHA1 (patch-ae) = 1be3a5dc5a879a64b65a26efba133fe3958ea712
+SHA1 (patch-af) = c240903bfcf720493f8aad768b2693484d2de665
diff --git a/audio/rhythmbox/patches/patch-aa b/audio/rhythmbox/patches/patch-aa
new file mode 100644
index 00000000000..b4e89a205f8
--- /dev/null
+++ b/audio/rhythmbox/patches/patch-aa
@@ -0,0 +1,14 @@
+$NetBSD: patch-aa,v 1.5 2006/07/02 11:32:40 drochner Exp $
+
+--- player/rb-recorder-gst.c.orig	2006-01-18 05:22:11.000000000 +0100
++++ player/rb-recorder-gst.c
+@@ -25,7 +25,9 @@
+ #include <string.h>
+ #include <math.h>
+ #include <time.h>
++#ifdef __linux__
+ #include <sys/vfs.h>
++#endif
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <fcntl.h>
diff --git a/audio/rhythmbox/patches/patch-ab b/audio/rhythmbox/patches/patch-ab
new file mode 100644
index 00000000000..2bd4e645f68
--- /dev/null
+++ b/audio/rhythmbox/patches/patch-ab
@@ -0,0 +1,15 @@
+$NetBSD: patch-ab,v 1.4 2006/07/02 11:32:40 drochner Exp $
+
+--- daapsharing/rb-daap-src.c.orig	2006-01-21 10:17:03.000000000 +0100
++++ daapsharing/rb-daap-src.c
+@@ -54,6 +54,10 @@
+ 
+ #define RESPONSE_BUFFER_SIZE	(4096)
+ 
++#ifndef MSG_NOSIGNAL
++#define MSG_NOSIGNAL 0
++#endif
++
+ #ifdef HAVE_GSTREAMER_0_8
+ typedef enum {
+ 	RB_DAAP_SRC_OPEN = GST_ELEMENT_FLAG_LAST,
diff --git a/audio/rhythmbox/patches/patch-ac b/audio/rhythmbox/patches/patch-ac
new file mode 100644
index 00000000000..7fdc65c45ff
--- /dev/null
+++ b/audio/rhythmbox/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1 2006/07/02 11:32:40 drochner Exp $
+
+--- metadata/rb-metadata-dbus-client.c.orig	2006-04-22 11:30:47.000000000 +0200
++++ metadata/rb-metadata-dbus-client.c
+@@ -52,7 +52,7 @@
+ 
+ #include <unistd.h>
+ #include <sys/types.h>
+-#include <sys/signal.h>
++#include <signal.h>
+ #include <sys/wait.h>
+ #include <string.h>
+ #include <stdlib.h>
diff --git a/audio/rhythmbox/patches/patch-ae b/audio/rhythmbox/patches/patch-ae
new file mode 100644
index 00000000000..b87cbe9b3a6
--- /dev/null
+++ b/audio/rhythmbox/patches/patch-ae
@@ -0,0 +1,14 @@
+$NetBSD: patch-ae,v 1.1 2006/07/02 11:32:40 drochner Exp $
+
+--- shell/main.c.orig	2006-05-30 16:44:01.000000000 +0200
++++ shell/main.c
+@@ -372,7 +372,9 @@ main (int argc, char **argv)
+ 	} else {
+ 
+ 		rb_profile_start ("mainloop");
++		GDK_THREADS_ENTER ();
+ 		gtk_main ();
++		GDK_THREADS_LEAVE ();
+ 		rb_profile_end ("mainloop");
+ 
+ 		rb_debug ("out of toplevel loop");
diff --git a/audio/rhythmbox/patches/patch-af b/audio/rhythmbox/patches/patch-af
new file mode 100644
index 00000000000..f60f8c9d512
--- /dev/null
+++ b/audio/rhythmbox/patches/patch-af
@@ -0,0 +1,33 @@
+$NetBSD: patch-af,v 1.1 2006/07/02 11:32:40 drochner Exp $
+
+--- shell/rb-shell-player.c.orig	2006-04-22 12:44:25.000000000 +0200
++++ shell/rb-shell-player.c
+@@ -903,10 +903,8 @@ rb_shell_player_open_playlist_url (RBShe
+ 		rb_player_play (player->priv->mmplayer, &error);
+ 
+ 	if (error) {
+-		GDK_THREADS_ENTER ();
+ 		rb_shell_player_error (player, TRUE, error);
+ 		g_error_free (error);
+-		GDK_THREADS_LEAVE ();
+ 	}
+ 	g_idle_add ((GSourceFunc) notify_playing_idle, player);
+ }
+@@ -958,13 +956,17 @@ open_location_thread (OpenLocationThread
+ 
+ 			location = g_queue_pop_head (data->player->priv->playlist_urls);
+ 			rb_debug ("playing first stream url %s", data->location);
++			GDK_THREADS_ENTER ();
+ 			rb_shell_player_open_playlist_url (data->player, location);
++			GDK_THREADS_LEAVE ();
+ 			g_free (location);
+ 		}
+ 	} else {
+ 		/* if we can't parse it as a playlist, just try playing it */
+ 		rb_debug ("playlist parser failed, playing %s directly", data->location);
++		GDK_THREADS_ENTER ();
+ 		rb_shell_player_open_playlist_url (data->player, data->location);
++		GDK_THREADS_LEAVE ();
+ 	}
+ 
+ 	g_free (data);