Update to 0.9.4.

14 files changed, 356 insertions, 330 deletions

diff --git a/audio/rhythmbox-devel/Makefile b/audio/rhythmbox-devel/Makefile
index 53f9c815851..884de328b4a 100644
--- a/audio/rhythmbox-devel/Makefile
+++ b/audio/rhythmbox-devel/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	rhythmbox
-PORTVERSION=	0.9.3.1
-PORTREVISION=	1
+PORTVERSION=	0.9.4
 CATEGORIES=	audio gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.9
@@ -20,15 +19,18 @@ COMMENT=	Audio player for the Gnome 2 desktop environment
 LIB_DEPENDS=	musicbrainz.4:${PORTSDIR}/audio/libmusicbrainz \
 		id3tag.0:${PORTSDIR}/audio/libid3tag \
 		totem-plparser.1:${PORTSDIR}/multimedia/totem-gstreamer \
-		dbus-1.2:${PORTSDIR}/devel/dbus
+		dbus-1.2:${PORTSDIR}/devel/dbus \
+		sexy.1:${PORTSDIR}/x11-toolkits/libsexy \
+		gnome-media-profiles.0:${PORTSDIR}/audio/gnomemedia2
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 INSTALLS_OMF=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack intlhack gnomeprefix libgnomeui nautiluscdburner
+WANT_GNOME=	yes
 USE_GSTREAMER=	flac mad gnomevfs gconf jpeg
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-nautilus-menu
 CONFIGURE_ENV=	LIBS="-lm" \
 		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \
@@ -39,7 +41,8 @@ GCONF_SCHEMAS=	rhythmbox.schemas
 OPTIONS=	IPOD "Enable iPod support" off \
 		DAAP "Enable iTunes music sharing" off \
 		FAAD "Enable FAAD decoder support" off \
-		NOTIFY "Enable libnotify support" on
+		NOTIFY "Enable libnotify support" on \
+		VORBIS "Enable Ogg/Vorbis support" on
 
 .include <bsd.port.pre.mk>
 
@@ -51,11 +54,7 @@ BROKEN=	Does not build on 4.X
 CONFIGURE_ARGS+=	--enable-ipod
 .endif
 
-.if exists(${LOCALBASE}/lib/libvorbis.so)
-WITH_VORBIS=	yes
-.endif
-
-.ifdef (WITH_VORBIS)
+.if !defined(WITHOUT_VORBIS)
 USE_GSTREAMER+=		vorbis
 .else
 CONFIGURE_ARGS+=	--disable-vorbis --disable-vorbistest
@@ -82,11 +81,15 @@ LIB_DEPENDS+=		notify.1:${PORTSDIR}/devel/libnotify
 CONFIGURE_ARGS+=	--disable-libnotify
 .endif
 
-pre-everything::
-.if !defined(WITH_VORBIS)
-	@${ECHO_MSG}
-	@${ECHO_MSG} "Define WITH_VORBIS to enable Vorbis support"
-	@${ECHO_MSG}
+.if ${HAVE_GNOME:Mpygtk2}!=""
+USE_PYTHON=	yes
+.include "${PORTSDIR}/Mk/bsd.python.mk"
+USE_GNOME+=	pygtk2
+CONFIGURE_ARGS+=--enable-python
+PLIST_SUB+=	PYTHON=""
+.else
+CONFIGURE_ARGS+=--disable-python
+PLIST_SUB+=	PYTHON="@comment "
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/audio/rhythmbox-devel/distinfo b/audio/rhythmbox-devel/distinfo
index 840e27898dc..ec5c6718de7 100644
--- a/audio/rhythmbox-devel/distinfo
+++ b/audio/rhythmbox-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/rhythmbox-0.9.3.1.tar.bz2) = 0b63402c35c10de5581d79f5157a0739
-SHA256 (gnome2/rhythmbox-0.9.3.1.tar.bz2) = 8f25b3beba0954a39a2eabe12216f732f7880d313dd213767d57838a6d581976
-SIZE (gnome2/rhythmbox-0.9.3.1.tar.bz2) = 2579756
+MD5 (gnome2/rhythmbox-0.9.4.tar.bz2) = 0d335864738d6de0d0e6acc2964f8bc4
+SHA256 (gnome2/rhythmbox-0.9.4.tar.bz2) = 1318d7bb28a8b60a5342eb12995c6b802d88e3d0db62a90a72af59f21e13947b
+SIZE (gnome2/rhythmbox-0.9.4.tar.bz2) = 2005808
diff --git a/audio/rhythmbox-devel/files/patch-configure b/audio/rhythmbox-devel/files/patch-configure
index 16297b13375..17a15a5f11b 100644
--- a/audio/rhythmbox-devel/files/patch-configure
+++ b/audio/rhythmbox-devel/files/patch-configure
@@ -1,18 +1,32 @@
---- configure.orig	Thu Feb  2 02:03:39 2006
-+++ configure	Thu Feb  2 02:04:34 2006
-@@ -21318,9 +21318,9 @@
+--- configure.orig	Mon Apr 17 03:03:22 2006
++++ configure	Mon Apr 17 03:04:12 2006
+@@ -21375,14 +21375,14 @@ echo "${ECHO_T}yes" >&6
  	enable_hal02=yes
  fi
    fi
 -  if test x$enable_hal05 == xyes || test x$enable_hal02 == xyes; then
 +  if test x$enable_hal05 = xyes || test x$enable_hal02 = xyes; then
        enable_hal=yes
+ 
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_HAL 1
+ _ACEOF
+ 
 -      if test x$enable_hal05 == xyes; then
 +      if test x$enable_hal05 = xyes; then
  
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_HAL_0_5 1
-@@ -22121,7 +22121,7 @@
+@@ -22104,7 +22104,7 @@ echo "${ECHO_T}yes" >&6
+ 	have_gnome_media_profiles=yes
+ fi
+ 
+-   if test x$have_gnome_media_profiles == xno; then
++   if test x$have_gnome_media_profiles = xno; then
+       { { echo "$as_me:$LINENO: error: Track transfer support explicitly requested but gnome-media-profiles not found." >&5
+ echo "$as_me: error: Track transfer support explicitly requested but gnome-media-profiles not found." >&2;}
+    { (exit 1); exit 1; }; }
+@@ -22311,7 +22311,7 @@ echo "${ECHO_T}yes" >&6
  	have_avahi_05=yes
  fi
  fi
@@ -21,8 +35,8 @@
     have_avahi=yes
  else
     have_avahi=no
-@@ -22208,7 +22208,7 @@
- 
+@@ -22399,7 +22399,7 @@ _ACEOF
+       use_avahi=yes
        { echo "$as_me:$LINENO: Detected Avahi, using it for mDNS/DNS-SD" >&5
  echo "$as_me: Detected Avahi, using it for mDNS/DNS-SD" >&6;}
 -      if test x$have_avahi_06 == xyes; then
@@ -30,7 +44,7 @@
  
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_AVAHI_0_6 1
-@@ -22275,7 +22275,7 @@
+@@ -22468,7 +22468,7 @@ _ACEOF
     { echo "$as_me:$LINENO: Using Avahi for mDNS/DNS-SD" >&5
  echo "$as_me: Using Avahi for mDNS/DNS-SD" >&6;}
  
@@ -39,7 +53,7 @@
  
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_AVAHI_0_6 1
-@@ -23069,7 +23069,7 @@
+@@ -23289,7 +23289,7 @@ fi
  
  
  if test x"$x_includes" != x"NONE" && test -n "$x_includes" ; then
@@ -48,3 +62,12 @@
  fi
  if test x"$x_libraries" != x"NONE" && test -n "$x_libraries" ; then
  	LIBS=-L`echo $x_libraries | sed -e "s/:/ -L/g"`
+@@ -26298,7 +26298,7 @@ if test "${with_internal_libsexy+set}" =
+ else
+   with_internal_libsexy=no
+ fi;
+-if test "x$with_internal_libsexy" == "xno"; then
++if test "x$with_internal_libsexy" = "xno"; then
+ 
+ pkg_failed=no
+ echo "$as_me:$LINENO: checking for LIBSEXY" >&5
diff --git a/audio/rhythmbox-devel/files/patch-metadata_rb-metadata-dbus-client.c b/audio/rhythmbox-devel/files/patch-metadata_rb-metadata-dbus-client.c
new file mode 100644
index 00000000000..12a66019dfe
--- /dev/null
+++ b/audio/rhythmbox-devel/files/patch-metadata_rb-metadata-dbus-client.c
@@ -0,0 +1,10 @@
+--- metadata/rb-metadata-dbus-client.c.orig	Mon Apr 17 03:08:10 2006
++++ metadata/rb-metadata-dbus-client.c	Mon Apr 17 03:08:25 2006
+@@ -53,6 +53,7 @@
+ #include <unistd.h>
+ #include <sys/types.h>
+ #include <sys/wait.h>
++#include <signal.h>
+ #include <string.h>
+ #include <stdlib.h>
+ 
diff --git a/audio/rhythmbox-devel/files/patch-rhythmdb_rhythmdb-query-model.c b/audio/rhythmbox-devel/files/patch-rhythmdb_rhythmdb-query-model.c
new file mode 100644
index 00000000000..18c4cc67256
--- /dev/null
+++ b/audio/rhythmbox-devel/files/patch-rhythmdb_rhythmdb-query-model.c
@@ -0,0 +1,13 @@
+--- rhythmdb/rhythmdb-query-model.c.orig	Mon Apr 17 03:09:23 2006
++++ rhythmdb/rhythmdb-query-model.c	Mon Apr 17 03:09:35 2006
+@@ -2191,8 +2191,8 @@ rhythmdb_query_model_album_sort_func (Rh
+ {
+ 	const char *a_val;
+ 	const char *b_val;
+-	ulong a_num;
+-	ulong b_num;
++	gulong a_num;
++	gulong b_num;
+ 	gint ret;
+ 
+ 	/* Sort by album name */
diff --git a/audio/rhythmbox-devel/files/patch-widgets_rb-song-info.c b/audio/rhythmbox-devel/files/patch-widgets_rb-song-info.c
new file mode 100644
index 00000000000..e7a9db55797
--- /dev/null
+++ b/audio/rhythmbox-devel/files/patch-widgets_rb-song-info.c
@@ -0,0 +1,29 @@
+--- widgets/rb-song-info.c.orig	Mon Apr 17 03:10:40 2006
++++ widgets/rb-song-info.c	Mon Apr 17 03:11:42 2006
+@@ -750,7 +750,7 @@ rb_song_info_populate_dialog (RBSongInfo
+ {
+ 	const char *text;
+ 	char *tmp;
+-	ulong num;
++	gulong num;
+ 	
+ 	g_assert (song_info->priv->current_entry);
+ 
+@@ -1063,7 +1063,7 @@ rb_song_info_update_rating (RBSongInfo *
+ static void
+ rb_song_info_update_year (RBSongInfo *song_info)
+ {
+-	ulong year;
++	gulong year;
+ 	char *text;
+ 
+ 	year = rhythmdb_entry_get_ulong (song_info->priv->current_entry, RHYTHMDB_PROP_YEAR);
+@@ -1183,7 +1183,7 @@ rb_song_info_sync_entries_multiple (RBSo
+ 		g_value_set_ulong (&val, discn);
+ 
+ 		for (tem = dialog->priv->selected_entries; tem; tem = tem->next) {
+-			ulong entry_disc_num;
++			gulong entry_disc_num;
+ 			
+ 			entry = (RhythmDBEntry *)tem->data;
+ 			entry_disc_num = rhythmdb_entry_get_ulong (entry, RHYTHMDB_PROP_DISC_NUMBER);
diff --git a/audio/rhythmbox-devel/pkg-plist b/audio/rhythmbox-devel/pkg-plist
index a44eff88c5d..c9b4d432178 100644
--- a/audio/rhythmbox-devel/pkg-plist
+++ b/audio/rhythmbox-devel/pkg-plist
@@ -2,162 +2,88 @@ bin/rhythmbox
 lib/bonobo/librb-nautilus-context-menu.a
 lib/bonobo/librb-nautilus-context-menu.la
 lib/bonobo/librb-nautilus-context-menu.so
+lib/rhythmbox/plugins/audioscrobbler.rb-plugin
+lib/rhythmbox/plugins/libaudioscrobbler.a
+lib/rhythmbox/plugins/libaudioscrobbler.la
+lib/rhythmbox/plugins/libaudioscrobbler.so
+%%PYTHON%%lib/rhythmbox/plugins/pythonconsole.py
+%%PYTHON%%lib/rhythmbox/plugins/pythonconsole.pyc
+%%PYTHON%%lib/rhythmbox/plugins/pythonconsole.pyo
+%%PYTHON%%lib/rhythmbox/plugins/pythonconsole.rb-plugin
 libdata/bonobo/servers/GNOME_Rhythmbox.server
 libdata/bonobo/servers/Rhythmbox_Nautilus_Context_Menu.server
 libdata/pkgconfig/rhythmbox.pc
+libexec/rhythmbox-metadata
 share/dbus-1/services/org.gnome.Rhythmbox.service
-%%DOCSDIR%%/ch01.html
-%%DOCSDIR%%/ch02.html
-%%DOCSDIR%%/ch03.html
-%%DOCSDIR%%/ch04.html
-%%DOCSDIR%%/ch05.html
-%%DOCSDIR%%/ch06.html
-%%DOCSDIR%%/ch07.html
-%%DOCSDIR%%/ch08.html
-%%DOCSDIR%%/home.png
-%%DOCSDIR%%/index.html
-%%DOCSDIR%%/index.sgml
-%%DOCSDIR%%/left.png
-%%DOCSDIR%%/rhythmbox-RBCellRendererPixbuf.html
-%%DOCSDIR%%/rhythmbox-RBSource.html
-%%DOCSDIR%%/rhythmbox-eel-gconf-extensions.html
-%%DOCSDIR%%/rhythmbox-rb-cell-renderer-rating.html
-%%DOCSDIR%%/rhythmbox-rb-debug.html
-%%DOCSDIR%%/rhythmbox-rb-dialog.html
-%%DOCSDIR%%/rhythmbox-rb-druid.html
-%%DOCSDIR%%/rhythmbox-rb-entry-view.html
-%%DOCSDIR%%/rhythmbox-rb-enums.html
-%%DOCSDIR%%/rhythmbox-rb-file-helpers.html
-%%DOCSDIR%%/rhythmbox-rb-glade-helpers.html
-%%DOCSDIR%%/rhythmbox-rb-header.html
-%%DOCSDIR%%/rhythmbox-rb-history.html
-%%DOCSDIR%%/rhythmbox-rb-iradio-source.html
-%%DOCSDIR%%/rhythmbox-rb-library-source.html
-%%DOCSDIR%%/rhythmbox-rb-load-failure-dialog.html
-%%DOCSDIR%%/rhythmbox-rb-metadata.html
-%%DOCSDIR%%/rhythmbox-rb-new-station-dialog.html
-%%DOCSDIR%%/rhythmbox-rb-play-order-linear-loop.html
-%%DOCSDIR%%/rhythmbox-rb-play-order-linear.html
-%%DOCSDIR%%/rhythmbox-rb-play-order-random-by-age-and-rating.html
-%%DOCSDIR%%/rhythmbox-rb-play-order-random-by-age.html
-%%DOCSDIR%%/rhythmbox-rb-play-order-random-by-rating.html
-%%DOCSDIR%%/rhythmbox-rb-play-order-random-equal-weights.html
-%%DOCSDIR%%/rhythmbox-rb-play-order-random.html
-%%DOCSDIR%%/rhythmbox-rb-play-order-shuffle.html
-%%DOCSDIR%%/rhythmbox-rb-play-order.html
-%%DOCSDIR%%/rhythmbox-rb-player.html
-%%DOCSDIR%%/rhythmbox-rb-playlist-manager.html
-%%DOCSDIR%%/rhythmbox-rb-playlist-source-recorder.html
-%%DOCSDIR%%/rhythmbox-rb-playlist-source.html
-%%DOCSDIR%%/rhythmbox-rb-preferences.html
-%%DOCSDIR%%/rhythmbox-rb-property-view.html
-%%DOCSDIR%%/rhythmbox-rb-query-creator.html
-%%DOCSDIR%%/rhythmbox-rb-rating-helper.html
-%%DOCSDIR%%/rhythmbox-rb-rating.html
-%%DOCSDIR%%/rhythmbox-rb-recorder.html
-%%DOCSDIR%%/rhythmbox-rb-search-entry.html
-%%DOCSDIR%%/rhythmbox-rb-shell-clipboard.html
-%%DOCSDIR%%/rhythmbox-rb-shell-player.html
-%%DOCSDIR%%/rhythmbox-rb-shell-preferences.html
-%%DOCSDIR%%/rhythmbox-rb-shell.html
-%%DOCSDIR%%/rhythmbox-rb-song-display-box.html
-%%DOCSDIR%%/rhythmbox-rb-song-info.html
-%%DOCSDIR%%/rhythmbox-rb-source-header.html
-%%DOCSDIR%%/rhythmbox-rb-sourcelist-model.html
-%%DOCSDIR%%/rhythmbox-rb-sourcelist.html
-%%DOCSDIR%%/rhythmbox-rb-station-properties-dialog.html
-%%DOCSDIR%%/rhythmbox-rb-statusbar.html
-%%DOCSDIR%%/rhythmbox-rb-stock-icons.html
-%%DOCSDIR%%/rhythmbox-rb-string-helpers.html
-%%DOCSDIR%%/rhythmbox-rb-tray-icon.html
-%%DOCSDIR%%/rhythmbox-rb-tree-dnd.html
-%%DOCSDIR%%/rhythmbox-rb-tree-model-sort.html
-%%DOCSDIR%%/rhythmbox-rb-util.html
-%%DOCSDIR%%/rhythmbox-rhythmdb-property-model.html
-%%DOCSDIR%%/rhythmbox-rhythmdb-query-model.html
-%%DOCSDIR%%/rhythmbox-rhythmdb-tree.html
-%%DOCSDIR%%/rhythmbox-rhythmdb.html
-%%DOCSDIR%%/rhythmbox.devhelp
-%%DOCSDIR%%/right.png
-%%DOCSDIR%%/style.css
-%%DOCSDIR%%/up.png
 share/gnome/application-registry/rhythmbox.applications
 share/gnome/applications/rhythmbox.desktop
-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/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/idl/Rhythmbox.idl
 share/gnome/mime-info/rhythmbox.keys
 share/gnome/omf/rhythmbox/rhythmbox-C.omf
-share/gnome/omf/rhythmbox/rhythmbox-ja.omf
+share/gnome/omf/rhythmbox/rhythmbox-es.omf
+share/gnome/omf/rhythmbox/rhythmbox-fr.omf
+share/gnome/omf/rhythmbox/rhythmbox-ru.omf
 share/gnome/pixmaps/rhythmbox.png
 share/gnome/rhythmbox/art/about-logo.png
+share/gnome/rhythmbox/art/media-eject.png
 share/gnome/rhythmbox/art/rhythmbox-no-star.png
 share/gnome/rhythmbox/art/rhythmbox-podcast.png
 share/gnome/rhythmbox/art/rhythmbox-set-star.png
@@ -170,6 +96,7 @@ share/gnome/rhythmbox/glade/druid.glade
 share/gnome/rhythmbox/glade/general-prefs.glade
 share/gnome/rhythmbox/glade/library-prefs.glade
 share/gnome/rhythmbox/glade/load-failure.glade
+share/gnome/rhythmbox/glade/plugins.glade
 share/gnome/rhythmbox/glade/podcast-feed-properties.glade
 share/gnome/rhythmbox/glade/podcast-new.glade
 share/gnome/rhythmbox/glade/podcast-prefs.glade
@@ -237,14 +164,22 @@ 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
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
 @dirrm share/gnome/rhythmbox/glade
 @dirrm share/gnome/rhythmbox/art
 @dirrm share/gnome/rhythmbox
 @dirrm share/gnome/omf/rhythmbox
-@dirrm share/gnome/help/rhythmbox/ja/figures
-@dirrm share/gnome/help/rhythmbox/ja
+@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
-@dirrm %%DOCSDIR%%
+@dirrm lib/rhythmbox/plugins
+@dirrm lib/rhythmbox
diff --git a/audio/rhythmbox/Makefile b/audio/rhythmbox/Makefile
index 53f9c815851..884de328b4a 100644
--- a/audio/rhythmbox/Makefile
+++ b/audio/rhythmbox/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	rhythmbox
-PORTVERSION=	0.9.3.1
-PORTREVISION=	1
+PORTVERSION=	0.9.4
 CATEGORIES=	audio gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.9
@@ -20,15 +19,18 @@ COMMENT=	Audio player for the Gnome 2 desktop environment
 LIB_DEPENDS=	musicbrainz.4:${PORTSDIR}/audio/libmusicbrainz \
 		id3tag.0:${PORTSDIR}/audio/libid3tag \
 		totem-plparser.1:${PORTSDIR}/multimedia/totem-gstreamer \
-		dbus-1.2:${PORTSDIR}/devel/dbus
+		dbus-1.2:${PORTSDIR}/devel/dbus \
+		sexy.1:${PORTSDIR}/x11-toolkits/libsexy \
+		gnome-media-profiles.0:${PORTSDIR}/audio/gnomemedia2
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 INSTALLS_OMF=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack intlhack gnomeprefix libgnomeui nautiluscdburner
+WANT_GNOME=	yes
 USE_GSTREAMER=	flac mad gnomevfs gconf jpeg
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-nautilus-menu
 CONFIGURE_ENV=	LIBS="-lm" \
 		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \
@@ -39,7 +41,8 @@ GCONF_SCHEMAS=	rhythmbox.schemas
 OPTIONS=	IPOD "Enable iPod support" off \
 		DAAP "Enable iTunes music sharing" off \
 		FAAD "Enable FAAD decoder support" off \
-		NOTIFY "Enable libnotify support" on
+		NOTIFY "Enable libnotify support" on \
+		VORBIS "Enable Ogg/Vorbis support" on
 
 .include <bsd.port.pre.mk>
 
@@ -51,11 +54,7 @@ BROKEN=	Does not build on 4.X
 CONFIGURE_ARGS+=	--enable-ipod
 .endif
 
-.if exists(${LOCALBASE}/lib/libvorbis.so)
-WITH_VORBIS=	yes
-.endif
-
-.ifdef (WITH_VORBIS)
+.if !defined(WITHOUT_VORBIS)
 USE_GSTREAMER+=		vorbis
 .else
 CONFIGURE_ARGS+=	--disable-vorbis --disable-vorbistest
@@ -82,11 +81,15 @@ LIB_DEPENDS+=		notify.1:${PORTSDIR}/devel/libnotify
 CONFIGURE_ARGS+=	--disable-libnotify
 .endif
 
-pre-everything::
-.if !defined(WITH_VORBIS)
-	@${ECHO_MSG}
-	@${ECHO_MSG} "Define WITH_VORBIS to enable Vorbis support"
-	@${ECHO_MSG}
+.if ${HAVE_GNOME:Mpygtk2}!=""
+USE_PYTHON=	yes
+.include "${PORTSDIR}/Mk/bsd.python.mk"
+USE_GNOME+=	pygtk2
+CONFIGURE_ARGS+=--enable-python
+PLIST_SUB+=	PYTHON=""
+.else
+CONFIGURE_ARGS+=--disable-python
+PLIST_SUB+=	PYTHON="@comment "
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/audio/rhythmbox/distinfo b/audio/rhythmbox/distinfo
index 840e27898dc..ec5c6718de7 100644
--- a/audio/rhythmbox/distinfo
+++ b/audio/rhythmbox/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/rhythmbox-0.9.3.1.tar.bz2) = 0b63402c35c10de5581d79f5157a0739
-SHA256 (gnome2/rhythmbox-0.9.3.1.tar.bz2) = 8f25b3beba0954a39a2eabe12216f732f7880d313dd213767d57838a6d581976
-SIZE (gnome2/rhythmbox-0.9.3.1.tar.bz2) = 2579756
+MD5 (gnome2/rhythmbox-0.9.4.tar.bz2) = 0d335864738d6de0d0e6acc2964f8bc4
+SHA256 (gnome2/rhythmbox-0.9.4.tar.bz2) = 1318d7bb28a8b60a5342eb12995c6b802d88e3d0db62a90a72af59f21e13947b
+SIZE (gnome2/rhythmbox-0.9.4.tar.bz2) = 2005808
diff --git a/audio/rhythmbox/files/patch-configure b/audio/rhythmbox/files/patch-configure
index 16297b13375..17a15a5f11b 100644
--- a/audio/rhythmbox/files/patch-configure
+++ b/audio/rhythmbox/files/patch-configure
@@ -1,18 +1,32 @@
---- configure.orig	Thu Feb  2 02:03:39 2006
-+++ configure	Thu Feb  2 02:04:34 2006
-@@ -21318,9 +21318,9 @@
+--- configure.orig	Mon Apr 17 03:03:22 2006
++++ configure	Mon Apr 17 03:04:12 2006
+@@ -21375,14 +21375,14 @@ echo "${ECHO_T}yes" >&6
  	enable_hal02=yes
  fi
    fi
 -  if test x$enable_hal05 == xyes || test x$enable_hal02 == xyes; then
 +  if test x$enable_hal05 = xyes || test x$enable_hal02 = xyes; then
        enable_hal=yes
+ 
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_HAL 1
+ _ACEOF
+ 
 -      if test x$enable_hal05 == xyes; then
 +      if test x$enable_hal05 = xyes; then
  
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_HAL_0_5 1
-@@ -22121,7 +22121,7 @@
+@@ -22104,7 +22104,7 @@ echo "${ECHO_T}yes" >&6
+ 	have_gnome_media_profiles=yes
+ fi
+ 
+-   if test x$have_gnome_media_profiles == xno; then
++   if test x$have_gnome_media_profiles = xno; then
+       { { echo "$as_me:$LINENO: error: Track transfer support explicitly requested but gnome-media-profiles not found." >&5
+ echo "$as_me: error: Track transfer support explicitly requested but gnome-media-profiles not found." >&2;}
+    { (exit 1); exit 1; }; }
+@@ -22311,7 +22311,7 @@ echo "${ECHO_T}yes" >&6
  	have_avahi_05=yes
  fi
  fi
@@ -21,8 +35,8 @@
     have_avahi=yes
  else
     have_avahi=no
-@@ -22208,7 +22208,7 @@
- 
+@@ -22399,7 +22399,7 @@ _ACEOF
+       use_avahi=yes
        { echo "$as_me:$LINENO: Detected Avahi, using it for mDNS/DNS-SD" >&5
  echo "$as_me: Detected Avahi, using it for mDNS/DNS-SD" >&6;}
 -      if test x$have_avahi_06 == xyes; then
@@ -30,7 +44,7 @@
  
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_AVAHI_0_6 1
-@@ -22275,7 +22275,7 @@
+@@ -22468,7 +22468,7 @@ _ACEOF
     { echo "$as_me:$LINENO: Using Avahi for mDNS/DNS-SD" >&5
  echo "$as_me: Using Avahi for mDNS/DNS-SD" >&6;}
  
@@ -39,7 +53,7 @@
  
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_AVAHI_0_6 1
-@@ -23069,7 +23069,7 @@
+@@ -23289,7 +23289,7 @@ fi
  
  
  if test x"$x_includes" != x"NONE" && test -n "$x_includes" ; then
@@ -48,3 +62,12 @@
  fi
  if test x"$x_libraries" != x"NONE" && test -n "$x_libraries" ; then
  	LIBS=-L`echo $x_libraries | sed -e "s/:/ -L/g"`
+@@ -26298,7 +26298,7 @@ if test "${with_internal_libsexy+set}" =
+ else
+   with_internal_libsexy=no
+ fi;
+-if test "x$with_internal_libsexy" == "xno"; then
++if test "x$with_internal_libsexy" = "xno"; then
+ 
+ pkg_failed=no
+ echo "$as_me:$LINENO: checking for LIBSEXY" >&5
diff --git a/audio/rhythmbox/files/patch-metadata_rb-metadata-dbus-client.c b/audio/rhythmbox/files/patch-metadata_rb-metadata-dbus-client.c
new file mode 100644
index 00000000000..12a66019dfe
--- /dev/null
+++ b/audio/rhythmbox/files/patch-metadata_rb-metadata-dbus-client.c
@@ -0,0 +1,10 @@
+--- metadata/rb-metadata-dbus-client.c.orig	Mon Apr 17 03:08:10 2006
++++ metadata/rb-metadata-dbus-client.c	Mon Apr 17 03:08:25 2006
+@@ -53,6 +53,7 @@
+ #include <unistd.h>
+ #include <sys/types.h>
+ #include <sys/wait.h>
++#include <signal.h>
+ #include <string.h>
+ #include <stdlib.h>
+ 
diff --git a/audio/rhythmbox/files/patch-rhythmdb_rhythmdb-query-model.c b/audio/rhythmbox/files/patch-rhythmdb_rhythmdb-query-model.c
new file mode 100644
index 00000000000..18c4cc67256
--- /dev/null
+++ b/audio/rhythmbox/files/patch-rhythmdb_rhythmdb-query-model.c
@@ -0,0 +1,13 @@
+--- rhythmdb/rhythmdb-query-model.c.orig	Mon Apr 17 03:09:23 2006
++++ rhythmdb/rhythmdb-query-model.c	Mon Apr 17 03:09:35 2006
+@@ -2191,8 +2191,8 @@ rhythmdb_query_model_album_sort_func (Rh
+ {
+ 	const char *a_val;
+ 	const char *b_val;
+-	ulong a_num;
+-	ulong b_num;
++	gulong a_num;
++	gulong b_num;
+ 	gint ret;
+ 
+ 	/* Sort by album name */
diff --git a/audio/rhythmbox/files/patch-widgets_rb-song-info.c b/audio/rhythmbox/files/patch-widgets_rb-song-info.c
new file mode 100644
index 00000000000..e7a9db55797
--- /dev/null
+++ b/audio/rhythmbox/files/patch-widgets_rb-song-info.c
@@ -0,0 +1,29 @@
+--- widgets/rb-song-info.c.orig	Mon Apr 17 03:10:40 2006
++++ widgets/rb-song-info.c	Mon Apr 17 03:11:42 2006
+@@ -750,7 +750,7 @@ rb_song_info_populate_dialog (RBSongInfo
+ {
+ 	const char *text;
+ 	char *tmp;
+-	ulong num;
++	gulong num;
+ 	
+ 	g_assert (song_info->priv->current_entry);
+ 
+@@ -1063,7 +1063,7 @@ rb_song_info_update_rating (RBSongInfo *
+ static void
+ rb_song_info_update_year (RBSongInfo *song_info)
+ {
+-	ulong year;
++	gulong year;
+ 	char *text;
+ 
+ 	year = rhythmdb_entry_get_ulong (song_info->priv->current_entry, RHYTHMDB_PROP_YEAR);
+@@ -1183,7 +1183,7 @@ rb_song_info_sync_entries_multiple (RBSo
+ 		g_value_set_ulong (&val, discn);
+ 
+ 		for (tem = dialog->priv->selected_entries; tem; tem = tem->next) {
+-			ulong entry_disc_num;
++			gulong entry_disc_num;
+ 			
+ 			entry = (RhythmDBEntry *)tem->data;
+ 			entry_disc_num = rhythmdb_entry_get_ulong (entry, RHYTHMDB_PROP_DISC_NUMBER);
diff --git a/audio/rhythmbox/pkg-plist b/audio/rhythmbox/pkg-plist
index a44eff88c5d..c9b4d432178 100644
--- a/audio/rhythmbox/pkg-plist
+++ b/audio/rhythmbox/pkg-plist
@@ -2,162 +2,88 @@ bin/rhythmbox
 lib/bonobo/librb-nautilus-context-menu.a
 lib/bonobo/librb-nautilus-context-menu.la
 lib/bonobo/librb-nautilus-context-menu.so
+lib/rhythmbox/plugins/audioscrobbler.rb-plugin
+lib/rhythmbox/plugins/libaudioscrobbler.a
+lib/rhythmbox/plugins/libaudioscrobbler.la
+lib/rhythmbox/plugins/libaudioscrobbler.so
+%%PYTHON%%lib/rhythmbox/plugins/pythonconsole.py
+%%PYTHON%%lib/rhythmbox/plugins/pythonconsole.pyc
+%%PYTHON%%lib/rhythmbox/plugins/pythonconsole.pyo
+%%PYTHON%%lib/rhythmbox/plugins/pythonconsole.rb-plugin
 libdata/bonobo/servers/GNOME_Rhythmbox.server
 libdata/bonobo/servers/Rhythmbox_Nautilus_Context_Menu.server
 libdata/pkgconfig/rhythmbox.pc
+libexec/rhythmbox-metadata
 share/dbus-1/services/org.gnome.Rhythmbox.service
-%%DOCSDIR%%/ch01.html
-%%DOCSDIR%%/ch02.html
-%%DOCSDIR%%/ch03.html
-%%DOCSDIR%%/ch04.html
-%%DOCSDIR%%/ch05.html
-%%DOCSDIR%%/ch06.html
-%%DOCSDIR%%/ch07.html
-%%DOCSDIR%%/ch08.html
-%%DOCSDIR%%/home.png
-%%DOCSDIR%%/index.html
-%%DOCSDIR%%/index.sgml
-%%DOCSDIR%%/left.png
-%%DOCSDIR%%/rhythmbox-RBCellRendererPixbuf.html
-%%DOCSDIR%%/rhythmbox-RBSource.html
-%%DOCSDIR%%/rhythmbox-eel-gconf-extensions.html
-%%DOCSDIR%%/rhythmbox-rb-cell-renderer-rating.html
-%%DOCSDIR%%/rhythmbox-rb-debug.html
-%%DOCSDIR%%/rhythmbox-rb-dialog.html
-%%DOCSDIR%%/rhythmbox-rb-druid.html
-%%DOCSDIR%%/rhythmbox-rb-entry-view.html
-%%DOCSDIR%%/rhythmbox-rb-enums.html
-%%DOCSDIR%%/rhythmbox-rb-file-helpers.html
-%%DOCSDIR%%/rhythmbox-rb-glade-helpers.html
-%%DOCSDIR%%/rhythmbox-rb-header.html
-%%DOCSDIR%%/rhythmbox-rb-history.html
-%%DOCSDIR%%/rhythmbox-rb-iradio-source.html
-%%DOCSDIR%%/rhythmbox-rb-library-source.html
-%%DOCSDIR%%/rhythmbox-rb-load-failure-dialog.html
-%%DOCSDIR%%/rhythmbox-rb-metadata.html
-%%DOCSDIR%%/rhythmbox-rb-new-station-dialog.html
-%%DOCSDIR%%/rhythmbox-rb-play-order-linear-loop.html
-%%DOCSDIR%%/rhythmbox-rb-play-order-linear.html
-%%DOCSDIR%%/rhythmbox-rb-play-order-random-by-age-and-rating.html
-%%DOCSDIR%%/rhythmbox-rb-play-order-random-by-age.html
-%%DOCSDIR%%/rhythmbox-rb-play-order-random-by-rating.html
-%%DOCSDIR%%/rhythmbox-rb-play-order-random-equal-weights.html
-%%DOCSDIR%%/rhythmbox-rb-play-order-random.html
-%%DOCSDIR%%/rhythmbox-rb-play-order-shuffle.html
-%%DOCSDIR%%/rhythmbox-rb-play-order.html
-%%DOCSDIR%%/rhythmbox-rb-player.html
-%%DOCSDIR%%/rhythmbox-rb-playlist-manager.html
-%%DOCSDIR%%/rhythmbox-rb-playlist-source-recorder.html
-%%DOCSDIR%%/rhythmbox-rb-playlist-source.html
-%%DOCSDIR%%/rhythmbox-rb-preferences.html
-%%DOCSDIR%%/rhythmbox-rb-property-view.html
-%%DOCSDIR%%/rhythmbox-rb-query-creator.html
-%%DOCSDIR%%/rhythmbox-rb-rating-helper.html
-%%DOCSDIR%%/rhythmbox-rb-rating.html
-%%DOCSDIR%%/rhythmbox-rb-recorder.html
-%%DOCSDIR%%/rhythmbox-rb-search-entry.html
-%%DOCSDIR%%/rhythmbox-rb-shell-clipboard.html
-%%DOCSDIR%%/rhythmbox-rb-shell-player.html
-%%DOCSDIR%%/rhythmbox-rb-shell-preferences.html
-%%DOCSDIR%%/rhythmbox-rb-shell.html
-%%DOCSDIR%%/rhythmbox-rb-song-display-box.html
-%%DOCSDIR%%/rhythmbox-rb-song-info.html
-%%DOCSDIR%%/rhythmbox-rb-source-header.html
-%%DOCSDIR%%/rhythmbox-rb-sourcelist-model.html
-%%DOCSDIR%%/rhythmbox-rb-sourcelist.html
-%%DOCSDIR%%/rhythmbox-rb-station-properties-dialog.html
-%%DOCSDIR%%/rhythmbox-rb-statusbar.html
-%%DOCSDIR%%/rhythmbox-rb-stock-icons.html
-%%DOCSDIR%%/rhythmbox-rb-string-helpers.html
-%%DOCSDIR%%/rhythmbox-rb-tray-icon.html
-%%DOCSDIR%%/rhythmbox-rb-tree-dnd.html
-%%DOCSDIR%%/rhythmbox-rb-tree-model-sort.html
-%%DOCSDIR%%/rhythmbox-rb-util.html
-%%DOCSDIR%%/rhythmbox-rhythmdb-property-model.html
-%%DOCSDIR%%/rhythmbox-rhythmdb-query-model.html
-%%DOCSDIR%%/rhythmbox-rhythmdb-tree.html
-%%DOCSDIR%%/rhythmbox-rhythmdb.html
-%%DOCSDIR%%/rhythmbox.devhelp
-%%DOCSDIR%%/right.png
-%%DOCSDIR%%/style.css
-%%DOCSDIR%%/up.png
 share/gnome/application-registry/rhythmbox.applications
 share/gnome/applications/rhythmbox.desktop
-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/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/idl/Rhythmbox.idl
 share/gnome/mime-info/rhythmbox.keys
 share/gnome/omf/rhythmbox/rhythmbox-C.omf
-share/gnome/omf/rhythmbox/rhythmbox-ja.omf
+share/gnome/omf/rhythmbox/rhythmbox-es.omf
+share/gnome/omf/rhythmbox/rhythmbox-fr.omf
+share/gnome/omf/rhythmbox/rhythmbox-ru.omf
 share/gnome/pixmaps/rhythmbox.png
 share/gnome/rhythmbox/art/about-logo.png
+share/gnome/rhythmbox/art/media-eject.png
 share/gnome/rhythmbox/art/rhythmbox-no-star.png
 share/gnome/rhythmbox/art/rhythmbox-podcast.png
 share/gnome/rhythmbox/art/rhythmbox-set-star.png
@@ -170,6 +96,7 @@ share/gnome/rhythmbox/glade/druid.glade
 share/gnome/rhythmbox/glade/general-prefs.glade
 share/gnome/rhythmbox/glade/library-prefs.glade
 share/gnome/rhythmbox/glade/load-failure.glade
+share/gnome/rhythmbox/glade/plugins.glade
 share/gnome/rhythmbox/glade/podcast-feed-properties.glade
 share/gnome/rhythmbox/glade/podcast-new.glade
 share/gnome/rhythmbox/glade/podcast-prefs.glade
@@ -237,14 +164,22 @@ 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
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
 @dirrm share/gnome/rhythmbox/glade
 @dirrm share/gnome/rhythmbox/art
 @dirrm share/gnome/rhythmbox
 @dirrm share/gnome/omf/rhythmbox
-@dirrm share/gnome/help/rhythmbox/ja/figures
-@dirrm share/gnome/help/rhythmbox/ja
+@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
-@dirrm %%DOCSDIR%%
+@dirrm lib/rhythmbox/plugins
+@dirrm lib/rhythmbox