Update to 0.8.8. Some of this work was done by adamw, especially the iPod

testing and patching.

5 files changed, 61 insertions, 18 deletions

diff --git a/audio/rhythmbox/Makefile b/audio/rhythmbox/Makefile
index 9140ca076c82..b3dd57b7bd47 100644
--- a/audio/rhythmbox/Makefile
+++ b/audio/rhythmbox/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	rhythmbox
-PORTVERSION=	0.8.5
-PORTREVISION=	3
+PORTVERSION=	0.8.8
 CATEGORIES=	audio gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.8
@@ -26,6 +25,7 @@ USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack intlhack gnomeprefix libgnomeui
 USE_LIBTOOL_VER=15
+CONFIGURE_ARGS=	--enable-nautilus-menu
 CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lm" \
 		CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include"
 
diff --git a/audio/rhythmbox/distinfo b/audio/rhythmbox/distinfo
index 7aa75942399c..47e7558cbbb1 100644
--- a/audio/rhythmbox/distinfo
+++ b/audio/rhythmbox/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/rhythmbox-0.8.5.tar.bz2) = 50d2ebb835f89e01c6fb0531d65c1341
-SIZE (gnome2/rhythmbox-0.8.5.tar.bz2) = 1787019
+MD5 (gnome2/rhythmbox-0.8.8.tar.bz2) = 46cd84b3b67f85009aa48e0e301124fe
+SIZE (gnome2/rhythmbox-0.8.8.tar.bz2) = 2435338
diff --git a/audio/rhythmbox/files/patch-data_rhythmbox.pc.in b/audio/rhythmbox/files/patch-data_rhythmbox.pc.in
deleted file mode 100644
index 62a003b414a9..000000000000
--- a/audio/rhythmbox/files/patch-data_rhythmbox.pc.in
+++ /dev/null
@@ -1,14 +0,0 @@
---- data/rhythmbox.pc.in.orig	Fri Aug 20 00:38:45 2004
-+++ data/rhythmbox.pc.in	Fri Aug 20 00:39:21 2004
-@@ -1,7 +1,8 @@
- prefix=@prefix@
--libdir=${prefix}/lib
--includedir=${prefix}/include
--idldir=${prefix}/share/idl
-+exec_prefix=@exec_prefix@
-+libdir=@libdir@
-+includedir=@includedir@
-+idldir=@datadir@/idl
- 
- Name: Rhythmbox
- Description: Rhythmbox
diff --git a/audio/rhythmbox/files/patch-sources_rb-ipod-source.c b/audio/rhythmbox/files/patch-sources_rb-ipod-source.c
new file mode 100644
index 000000000000..61fbb19a5cd5
--- /dev/null
+++ b/audio/rhythmbox/files/patch-sources_rb-ipod-source.c
@@ -0,0 +1,18 @@
+--- sources/rb-ipod-source.c.orig	Sun Sep 19 17:05:37 2004
++++ sources/rb-ipod-source.c	Sun Sep 19 17:05:49 2004
+@@ -234,6 +234,7 @@
+ 		}
+ 
+ 		/* Set disc number */
++		/*
+ 		if (song->cd_nr != 0) {
+ 			GValue value = {0, };
+ 			g_value_init (&value, G_TYPE_ULONG);
+@@ -243,6 +244,7 @@
+ 					    &value);
+ 			g_value_unset (&value);
+ 		}
++		*/
+ 		
+ 		/* Set bitrate */
+ 		if (song->bitrate != 0) {
diff --git a/audio/rhythmbox/pkg-plist b/audio/rhythmbox/pkg-plist
index a3939a9707e3..c686d90f6868 100644
--- a/audio/rhythmbox/pkg-plist
+++ b/audio/rhythmbox/pkg-plist
@@ -20,6 +20,7 @@ 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
@@ -30,16 +31,21 @@ share/gnome/help/rhythmbox/C/figures/rb-nobrowse-play.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-statusbar.png
 share/gnome/help/rhythmbox/C/figures/rb-toolbar-editor.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
@@ -47,10 +53,37 @@ 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/idl/Rhythmbox.idl
 share/gnome/mime-info/rhythmbox.keys
 share/gnome/omf/rhythmbox/rhythmbox-C.omf
 @exec scrollkeeper-install -q %D/share/gnome/omf/rhythmbox/rhythmbox-C.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/rhythmbox/rhythmbox-ja.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/rhythmbox/rhythmbox-ja.omf 2>/dev/null || /usr/bin/true
 share/gnome/pixmaps/rhythmbox.png
 share/gnome/rhythmbox/art/about-logo.png
 share/gnome/rhythmbox/art/rhythmbox-album.png
@@ -108,9 +141,11 @@ share/locale/en_CA/LC_MESSAGES/rhythmbox.mo
 share/locale/en_GB/LC_MESSAGES/rhythmbox.mo
 share/locale/es/LC_MESSAGES/rhythmbox.mo
 share/locale/et/LC_MESSAGES/rhythmbox.mo
+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/he/LC_MESSAGES/rhythmbox.mo
 share/locale/hr/LC_MESSAGES/rhythmbox.mo
 share/locale/hu/LC_MESSAGES/rhythmbox.mo
 share/locale/id/LC_MESSAGES/rhythmbox.mo
@@ -122,6 +157,7 @@ share/locale/lt/LC_MESSAGES/rhythmbox.mo
 share/locale/lv/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/nl/LC_MESSAGES/rhythmbox.mo
 share/locale/no/LC_MESSAGES/rhythmbox.mo
 share/locale/pa/LC_MESSAGES/rhythmbox.mo
@@ -143,7 +179,10 @@ share/locale/zh_TW/LC_MESSAGES/rhythmbox.mo
 @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/C/figures
 @dirrm share/gnome/help/rhythmbox/C
 @dirrm share/gnome/help/rhythmbox
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/rhythmbox/rhythmbox-C.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/rhythmbox/rhythmbox-ja.omf 2>/dev/null || /usr/bin/true