Add rhythmbox after a repo copy from net-rhythmbox. Rhythmbox is an

audio player for GNOME 2 that is a re-merge of the net-rhythmbox code plus
the original rhythmbox code.

17 files changed, 275 insertions, 462 deletions

diff --git a/audio/Makefile b/audio/Makefile
index 29a09e15d42c..35f429f3188a 100644
--- a/audio/Makefile
+++ b/audio/Makefile
@@ -233,6 +233,7 @@
     SUBDIR += replay
     SUBDIR += resid
     SUBDIR += rexima
+    SUBDIR += rhythmbox
     SUBDIR += rio
     SUBDIR += rio500
     SUBDIR += rioutil
diff --git a/audio/rhythmbox-devel/Makefile b/audio/rhythmbox-devel/Makefile
index 1640b894c557..b7f03ab3bca9 100644
--- a/audio/rhythmbox-devel/Makefile
+++ b/audio/rhythmbox-devel/Makefile
@@ -1,17 +1,18 @@
-# New ports collection makefile for:	net-rhythmbox
-# Date created:		14 February 2003
-# Whom:			Hendrik Scholz <hendrik@scholz.net>
+# New ports collection makefile for:	rhythmbox
+# Date created:		17 August 2003
+# Whom:			Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-PORTNAME=	net-rhythmbox
-PORTVERSION=	0.4.8
-PORTREVISION=	2
+PORTNAME=	rhythmbox
+PORTVERSION=	0.5.1
 CATEGORIES=	audio gnome
-MASTER_SITES=	http://web.verbum.org/net-rhythmbox/
+MASTER_SITES=	${MASTER_SITE_GNOME}
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.5
+DIST_SUBDIR=	gnome2
 
-MAINTAINER=	hendrik@scholz.net
+MAINTAINER=	marcus@freebsd.org
 COMMENT=	Audio player for the Gnome 2 desktop environment
 
 LIB_DEPENDS=	musicbrainz.2:${PORTSDIR}/audio/libmusicbrainz \
@@ -19,44 +20,31 @@ LIB_DEPENDS=	musicbrainz.2:${PORTSDIR}/audio/libmusicbrainz \
 		FLAC.5:${PORTSDIR}/audio/flac \
 		mad.1:${PORTSDIR}/audio/mad
 
+USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack gnomeprefix libgnomeui
 USE_LIBTOOL=	yes
 CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \
 		CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include"
-CONFIGURE_ARGS=	--disable-lirc
 
 .include <bsd.port.pre.mk>
 
-.if exists(${LOCALBASE}/lib/libxosd.so)
-WITH_XOSD=	yes
-.endif
 .if exists(${LOCALBASE}/lib/libvorbis.so)
-WITH_VORBIS=  yes
+WITH_VORBIS=	yes
 .endif
 
-.ifdef (WITH_XOSD)
-LIB_DEPENDS+=   xosd.4:${PORTSDIR}/misc/xosd
-.else
-CONFIGURE_ARGS+=    --disable-xosd
-.endif
 .ifdef (WITH_VORBIS)
-LIB_DEPENDS+=   vorbis.2:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS+=		vorbis.2:${PORTSDIR}/audio/libvorbis
 .else
-CONFIGURE_ARGS+=    --disable-vorbistest
+CONFIGURE_ARGS+=	--disable-vorbistest
 .endif
 
 pre-everything::
-.if !defined(WITH_XOSD)
-	@${ECHO_CMD}
-	@${ECHO_CMD} "define WITH_XOSD to enable On-Screen-Display support"
-	@${ECHO_CMD}
-.endif
 .if !defined(WITH_VORBIS)
-	@${ECHO_CMD}
-	@${ECHO_CMD} "define WITH_VORBIS to enable Vorbis support"
-	@${ECHO_CMD}
+	@${ECHO_MSG}
+	@${ECHO_MSG} "Define WITH_VORBIS to enable Vorbis support"
+	@${ECHO_MSG}
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/audio/rhythmbox-devel/distinfo b/audio/rhythmbox-devel/distinfo
index 235294717ff8..c4510bb9f34a 100644
--- a/audio/rhythmbox-devel/distinfo
+++ b/audio/rhythmbox-devel/distinfo
@@ -1 +1 @@
-MD5 (net-rhythmbox-0.4.8.tar.gz) = e2dd382da135ea00ac93b0f27c12bcb9
+MD5 (gnome2/rhythmbox-0.5.1.tar.bz2) = 15e7d1c8a37a472068b55daf70e73b33
diff --git a/audio/rhythmbox-devel/files/patch-lib_getline.c b/audio/rhythmbox-devel/files/patch-lib_getline.c
deleted file mode 100644
index 448b0d9d0780..000000000000
--- a/audio/rhythmbox-devel/files/patch-lib_getline.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- lib/getline.c.orig	Fri Feb 14 20:42:13 2003
-+++ lib/getline.c	Fri Feb 14 20:44:09 2003
-@@ -43,6 +43,9 @@
- 
- # include "getstr.h"
- 
-+int getline (char **, size_t *, FILE *);
-+int getdelim (char **, size_t *, int, FILE *);
-+
- int
- getline (char **lineptr, size_t *n, FILE *stream)
- {
diff --git a/audio/rhythmbox-devel/files/patch-library_rb-library-main-thread.c b/audio/rhythmbox-devel/files/patch-library_rb-library-main-thread.c
deleted file mode 100644
index 44611505c449..000000000000
--- a/audio/rhythmbox-devel/files/patch-library_rb-library-main-thread.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- library/rb-library-main-thread.c.orig	Sat May 17 20:56:40 2003
-+++ library/rb-library-main-thread.c	Sat May 17 20:56:47 2003
-@@ -325,7 +325,7 @@
- 			rb_echo_area_end_task (echoarea, taskid);
- 		g_mutex_unlock (priv->lock);
- 
--		g_usleep (10);
-+		g_usleep (10000);
- 	}
- 
- 	return NULL;
diff --git a/audio/rhythmbox-devel/files/patch-library_rb-library-walker-thread.c b/audio/rhythmbox-devel/files/patch-library_rb-library-walker-thread.c
deleted file mode 100644
index 1301febfd7cc..000000000000
--- a/audio/rhythmbox-devel/files/patch-library_rb-library-walker-thread.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- library/rb-library-walker-thread.c.orig	Sun Feb  9 13:09:48 2003
-+++ library/rb-library-walker-thread.c	Sat May 17 21:02:36 2003
-@@ -325,7 +325,7 @@
- 
- 		g_mutex_unlock (thread->priv->lock);
- 
--		g_usleep (10);
-+		g_usleep (10000);
- 	}
- 
- 	return NULL;
diff --git a/audio/rhythmbox-devel/files/patch-library_rb-node.c b/audio/rhythmbox-devel/files/patch-library_rb-node.c
deleted file mode 100644
index ec9a5c35830d..000000000000
--- a/audio/rhythmbox-devel/files/patch-library_rb-node.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- library/rb-node.c.orig	Sun Feb  9 03:12:01 2003
-+++ library/rb-node.c	Mon Apr 21 20:27:45 2003
-@@ -852,7 +861,7 @@
- 			   int property_id)
- {
- 	GValue *ret;
--	long mtime;
-+	time_t mtime;
- 	char *retval;
- 	
- 	g_return_val_if_fail (RB_IS_NODE (node), NULL);
diff --git a/audio/rhythmbox-devel/pkg-descr b/audio/rhythmbox-devel/pkg-descr
index c60e36a5ddb4..39e0558c2ab3 100644
--- a/audio/rhythmbox-devel/pkg-descr
+++ b/audio/rhythmbox-devel/pkg-descr
@@ -1,12 +1,5 @@
-netRhythmbox is a branch of Rhythmbox focusing on feature completion and
-stability. Most interesting features in addition to the features of the
-main tree are:
+Rhythmbox is an integrated music management application, originally inspired by 
+Apple's iTunes.  It is free software, designed to work well under the GNOME 
+Desktop, and based on the powerful GStreamer media framework.
 
-	- Internet radio
-	- Playlist file (.pls) support
-	- Real error handling
-	- X OnScreen Display support
-	- A dynamic progress statusbar
-
-WWW: http://web.verbum.org/net-rhythmbox/
--- Hendrik Scholz <hendrik@scholz.net>
+WWW: http://web.rhythmbox.org/
diff --git a/audio/rhythmbox-devel/pkg-plist b/audio/rhythmbox-devel/pkg-plist
index f13e84904774..f56c0dc41ed1 100644
--- a/audio/rhythmbox-devel/pkg-plist
+++ b/audio/rhythmbox-devel/pkg-plist
@@ -1,146 +1,116 @@
-bin/net-rhythmbox
-etc/gconf/gconf.xml.defaults/apps/net-rhythmbox/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/net-rhythmbox/state/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/net-rhythmbox/state/iradio/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/net-rhythmbox/state/library/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/net-rhythmbox/ui/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/net-rhythmbox/ui/iradio/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/net-rhythmbox/ui/library/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/net-rhythmbox/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/net-rhythmbox/state/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/net-rhythmbox/state/iradio/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/net-rhythmbox/state/library/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/net-rhythmbox/ui/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/net-rhythmbox/ui/iradio/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/net-rhythmbox/ui/library/%gconf.xml
-etc/gconf/schemas/net-rhythmbox.schemas
-libdata/bonobo/servers/GNOME_netRhythmbox_Shell.server
-share/gnome/application-registry/net-rhythmbox.applications
-share/gnome/applications/net-rhythmbox.desktop
-share/gnome/gnome-2.0/ui/net-rhythmbox-audiocd-view.xml
-share/gnome/gnome-2.0/ui/net-rhythmbox-group-view.xml
-share/gnome/gnome-2.0/ui/net-rhythmbox-iradio-view.xml
-share/gnome/gnome-2.0/ui/net-rhythmbox-library-view.xml
-share/gnome/gnome-2.0/ui/net-rhythmbox-test-view-2.xml
-share/gnome/gnome-2.0/ui/net-rhythmbox-ui.xml
-share/gnome/help/net-rhythmbox/C/authors.xml
-share/gnome/help/net-rhythmbox/C/fdl-appendix.xml
-share/gnome/help/net-rhythmbox/C/figures/rb-adv.png
-share/gnome/help/net-rhythmbox/C/figures/rb-audio-cd.png
-share/gnome/help/net-rhythmbox/C/figures/rb-basic.png
-share/gnome/help/net-rhythmbox/C/figures/rb-browser.png
-share/gnome/help/net-rhythmbox/C/figures/rb-empty.png
-share/gnome/help/net-rhythmbox/C/figures/rb-full-play.png
-share/gnome/help/net-rhythmbox/C/figures/rb-group-create.png
-share/gnome/help/net-rhythmbox/C/figures/rb-group.png
-share/gnome/help/net-rhythmbox/C/figures/rb-imported.png
-share/gnome/help/net-rhythmbox/C/figures/rb-internet-radio.png
-share/gnome/help/net-rhythmbox/C/figures/rb-iradio-prefs.png
-share/gnome/help/net-rhythmbox/C/figures/rb-library-prefs.png
-share/gnome/help/net-rhythmbox/C/figures/rb-nextprev.png
-share/gnome/help/net-rhythmbox/C/figures/rb-nobrowse-play.png
-share/gnome/help/net-rhythmbox/C/figures/rb-notification-area-menu.png
-share/gnome/help/net-rhythmbox/C/figures/rb-notification-area.png
-share/gnome/help/net-rhythmbox/C/figures/rb-player.png
-share/gnome/help/net-rhythmbox/C/figures/rb-prefs.png
-share/gnome/help/net-rhythmbox/C/figures/rb-repeat.png
-share/gnome/help/net-rhythmbox/C/figures/rb-search.png
-share/gnome/help/net-rhythmbox/C/figures/rb-shuffle.png
-share/gnome/help/net-rhythmbox/C/figures/rb-sidebar.png
-share/gnome/help/net-rhythmbox/C/figures/rb-stats.png
-share/gnome/help/net-rhythmbox/C/figures/rb-toolbar-editor.png
-share/gnome/help/net-rhythmbox/C/figures/rb-toolbar.png
-share/gnome/help/net-rhythmbox/C/figures/rb-volume-mute.png
-share/gnome/help/net-rhythmbox/C/figures/rb-window.png
-share/gnome/help/net-rhythmbox/C/figures/rhythmbox-group.png
-share/gnome/help/net-rhythmbox/C/figures/rhythmbox-tray-icon.png
-share/gnome/help/net-rhythmbox/C/internet-radio.xml
-share/gnome/help/net-rhythmbox/C/legal.xml
-share/gnome/help/net-rhythmbox/C/net-rhythmbox.xml
-share/gnome/help/net-rhythmbox/C/quick-reference.xml
-share/gnome/help/net-rhythmbox/C/user-guide.xml
-share/gnome/net-rhythmbox/art/about-logo.png
-share/gnome/net-rhythmbox/art/rhythmbox-album.png
-share/gnome/net-rhythmbox/art/rhythmbox-audiocd.png
-share/gnome/net-rhythmbox/art/rhythmbox-dnd.png
-share/gnome/net-rhythmbox/art/rhythmbox-group.png
-share/gnome/net-rhythmbox/art/rhythmbox-iradio.png
-share/gnome/net-rhythmbox/art/rhythmbox-library.png
-share/gnome/net-rhythmbox/art/rhythmbox-next.png
-share/gnome/net-rhythmbox/art/rhythmbox-no-star.png
-share/gnome/net-rhythmbox/art/rhythmbox-pause.png
-share/gnome/net-rhythmbox/art/rhythmbox-play.png
-share/gnome/net-rhythmbox/art/rhythmbox-playing.png
-share/gnome/net-rhythmbox/art/rhythmbox-playlist.png
-share/gnome/net-rhythmbox/art/rhythmbox-previous.png
-share/gnome/net-rhythmbox/art/rhythmbox-repeat.png
-share/gnome/net-rhythmbox/art/rhythmbox-rewind.png
-share/gnome/net-rhythmbox/art/rhythmbox-set-star.png
-share/gnome/net-rhythmbox/art/rhythmbox-shuffle.png
-share/gnome/net-rhythmbox/art/rhythmbox-stop.png
-share/gnome/net-rhythmbox/art/rhythmbox-tray-icon.png
-share/gnome/net-rhythmbox/art/rhythmbox-unset-star.png
-share/gnome/net-rhythmbox/art/rhythmbox-visuals.png
-share/gnome/net-rhythmbox/art/rhythmbox-volume-max.png
-share/gnome/net-rhythmbox/art/rhythmbox-volume-medium.png
-share/gnome/net-rhythmbox/art/rhythmbox-volume-min.png
-share/gnome/net-rhythmbox/art/rhythmbox-volume-mute.png
-share/gnome/net-rhythmbox/art/rhythmbox-volume-zero.png
-share/gnome/net-rhythmbox/glade/buffering-dialog.glade
-share/gnome/net-rhythmbox/glade/general-prefs.glade
-share/gnome/net-rhythmbox/glade/iradio-prefs.glade
-share/gnome/net-rhythmbox/glade/library-prefs.glade
-share/gnome/net-rhythmbox/glade/song-info.glade
-share/gnome/net-rhythmbox/glade/station-new.glade
-share/gnome/net-rhythmbox/glade/station-properties.glade
-share/gnome/net-rhythmbox/glade/toolbar-editor.glade
-share/gnome/net-rhythmbox/glade/uri.glade
-share/gnome/net-rhythmbox/iradio-initial.xml
-share/gnome/net-rhythmbox/node-views/rb-node-view-albums.xml
-share/gnome/net-rhythmbox/node-views/rb-node-view-artists.xml
-share/gnome/net-rhythmbox/node-views/rb-node-view-cdaudio.xml
-share/gnome/net-rhythmbox/node-views/rb-node-view-genres.xml
-share/gnome/net-rhythmbox/node-views/rb-node-view-iradio-genres.xml
-share/gnome/net-rhythmbox/node-views/rb-node-view-iradio-stations.xml
-share/gnome/net-rhythmbox/node-views/rb-node-view-songs.xml
-share/gnome/omf/net-rhythmbox/rhythmbox-C.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/net-rhythmbox/rhythmbox-C.omf 2>/dev/null || /usr/bin/true
-share/gnome/pixmaps/net-rhythmbox.png
-share/locale/cs/LC_MESSAGES/netrhythmbox.mo
-share/locale/da/LC_MESSAGES/netrhythmbox.mo
-share/locale/de/LC_MESSAGES/netrhythmbox.mo
-share/locale/el/LC_MESSAGES/netrhythmbox.mo
-share/locale/es/LC_MESSAGES/netrhythmbox.mo
-share/locale/fr/LC_MESSAGES/netrhythmbox.mo
-share/locale/it/LC_MESSAGES/netrhythmbox.mo
-share/locale/ja/LC_MESSAGES/netrhythmbox.mo
-share/locale/ko/LC_MESSAGES/netrhythmbox.mo
-share/locale/ms/LC_MESSAGES/netrhythmbox.mo
-share/locale/no/LC_MESSAGES/netrhythmbox.mo
-share/locale/ru/LC_MESSAGES/netrhythmbox.mo
-share/locale/sv/LC_MESSAGES/netrhythmbox.mo
-share/locale/tr/LC_MESSAGES/netrhythmbox.mo
-share/locale/vi/LC_MESSAGES/netrhythmbox.mo
-@dirrm share/gnome/omf/net-rhythmbox
-@dirrm share/gnome/net-rhythmbox/node-views
-@dirrm share/gnome/net-rhythmbox/glade
-@dirrm share/gnome/net-rhythmbox/art
-@dirrm share/gnome/net-rhythmbox
-@dirrm share/gnome/help/net-rhythmbox/C/figures
-@dirrm share/gnome/help/net-rhythmbox/C
-@dirrm share/gnome/help/net-rhythmbox
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/net-rhythmbox/ui/library
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/net-rhythmbox/ui/iradio
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/net-rhythmbox/ui
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/net-rhythmbox/state/library
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/net-rhythmbox/state/iradio
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/net-rhythmbox/state
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/net-rhythmbox
-@dirrm etc/gconf/gconf.xml.defaults/apps/net-rhythmbox/ui/library
-@dirrm etc/gconf/gconf.xml.defaults/apps/net-rhythmbox/ui/iradio
-@dirrm etc/gconf/gconf.xml.defaults/apps/net-rhythmbox/ui
-@dirrm etc/gconf/gconf.xml.defaults/apps/net-rhythmbox/state/library
-@dirrm etc/gconf/gconf.xml.defaults/apps/net-rhythmbox/state/iradio
-@dirrm etc/gconf/gconf.xml.defaults/apps/net-rhythmbox/state
-@dirrm etc/gconf/gconf.xml.defaults/apps/net-rhythmbox
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/net-rhythmbox/rhythmbox-C.omf 2>/dev/null || /usr/bin/true
+bin/rhythmbox
+etc/gconf/gconf.xml.defaults/apps/rhythmbox/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/rhythmbox/state/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/rhythmbox/state/iradio/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/rhythmbox/state/library/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/rhythmbox/state/load_failure_dialog/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/rhythmbox/ui/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/rhythmbox/ui/library/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/rhythmbox/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/rhythmbox/state/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/rhythmbox/state/iradio/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/rhythmbox/state/library/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/rhythmbox/state/load_failure_dialog/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/rhythmbox/ui/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/rhythmbox/ui/library/%gconf.xml
+etc/gconf/schemas/rhythmbox.schemas
+lib/bonobo/librb-nautilus-context-menu.so
+libdata/bonobo/servers/GNOME_Rhythmbox.server
+libdata/bonobo/servers/Rhythmbox_Nautilus_Context_Menu.server
+libdata/pkgconfig/rhythmbox.pc
+share/gnome/application-registry/rhythmbox.applications
+share/gnome/applications/rhythmbox.desktop
+share/gnome/gnome-2.0/ui/rhythmbox-ui.xml
+share/gnome/pixmaps/rhythmbox.png
+share/gnome/rhythmbox/art/about-logo.png
+share/gnome/rhythmbox/art/rhythmbox-album.png
+share/gnome/rhythmbox/art/rhythmbox-audiocd.png
+share/gnome/rhythmbox/art/rhythmbox-dnd.png
+share/gnome/rhythmbox/art/rhythmbox-group.png
+share/gnome/rhythmbox/art/rhythmbox-iradio.png
+share/gnome/rhythmbox/art/rhythmbox-library.png
+share/gnome/rhythmbox/art/rhythmbox-next.png
+share/gnome/rhythmbox/art/rhythmbox-no-star.png
+share/gnome/rhythmbox/art/rhythmbox-pause.png
+share/gnome/rhythmbox/art/rhythmbox-paused.png
+share/gnome/rhythmbox/art/rhythmbox-play.png
+share/gnome/rhythmbox/art/rhythmbox-playing.png
+share/gnome/rhythmbox/art/rhythmbox-playlist.png
+share/gnome/rhythmbox/art/rhythmbox-previous.png
+share/gnome/rhythmbox/art/rhythmbox-repeat.png
+share/gnome/rhythmbox/art/rhythmbox-rewind.png
+share/gnome/rhythmbox/art/rhythmbox-set-star.png
+share/gnome/rhythmbox/art/rhythmbox-shuffle.png
+share/gnome/rhythmbox/art/rhythmbox-sound-juicer.png
+share/gnome/rhythmbox/art/rhythmbox-stop.png
+share/gnome/rhythmbox/art/rhythmbox-tray-icon.png
+share/gnome/rhythmbox/art/rhythmbox-unset-star.png
+share/gnome/rhythmbox/art/rhythmbox-visuals.png
+share/gnome/rhythmbox/art/rhythmbox-volume-max.png
+share/gnome/rhythmbox/art/rhythmbox-volume-medium.png
+share/gnome/rhythmbox/art/rhythmbox-volume-min.png
+share/gnome/rhythmbox/art/rhythmbox-volume-mute.png
+share/gnome/rhythmbox/art/rhythmbox-volume-zero.png
+share/gnome/rhythmbox/glade/buffering-dialog.glade
+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/song-info.glade
+share/gnome/rhythmbox/glade/station-new.glade
+share/gnome/rhythmbox/glade/station-properties.glade
+share/gnome/rhythmbox/glade/uri.glade
+share/gnome/rhythmbox/iradio-initial.pls
+share/gnome/rhythmbox/node-views/rb-node-view-albums.xml
+share/gnome/rhythmbox/node-views/rb-node-view-artists.xml
+share/gnome/rhythmbox/node-views/rb-node-view-cdaudio.xml
+share/gnome/rhythmbox/node-views/rb-node-view-genres.xml
+share/gnome/rhythmbox/node-views/rb-node-view-iradio-genres.xml
+share/gnome/rhythmbox/node-views/rb-node-view-iradio-stations.xml
+share/gnome/rhythmbox/node-views/rb-node-view-songs.xml
+share/idl/Rhythmbox.idl
+share/locale/am/LC_MESSAGES/rhythmbox.mo
+share/locale/be/LC_MESSAGES/rhythmbox.mo
+share/locale/cs/LC_MESSAGES/rhythmbox.mo
+share/locale/da/LC_MESSAGES/rhythmbox.mo
+share/locale/de/LC_MESSAGES/rhythmbox.mo
+share/locale/el/LC_MESSAGES/rhythmbox.mo
+share/locale/es/LC_MESSAGES/rhythmbox.mo
+share/locale/fi/LC_MESSAGES/rhythmbox.mo
+share/locale/fr/LC_MESSAGES/rhythmbox.mo
+share/locale/it/LC_MESSAGES/rhythmbox.mo
+share/locale/ja/LC_MESSAGES/rhythmbox.mo
+share/locale/ko/LC_MESSAGES/rhythmbox.mo
+share/locale/lv/LC_MESSAGES/rhythmbox.mo
+share/locale/ms/LC_MESSAGES/rhythmbox.mo
+share/locale/nl/LC_MESSAGES/rhythmbox.mo
+share/locale/no/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/ru/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/tr/LC_MESSAGES/rhythmbox.mo
+share/locale/vi/LC_MESSAGES/rhythmbox.mo
+share/locale/zh_TW/LC_MESSAGES/rhythmbox.mo
+@dirrm share/idl
+@dirrm share/gnome/rhythmbox/node-views
+@dirrm share/gnome/rhythmbox/glade
+@dirrm share/gnome/rhythmbox/art
+@dirrm share/gnome/rhythmbox
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/rhythmbox/ui/library
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/rhythmbox/ui
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/rhythmbox/state/load_failure_dialog
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/rhythmbox/state/library
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/rhythmbox/state/iradio
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/rhythmbox/state
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/rhythmbox
+@dirrm etc/gconf/gconf.xml.defaults/apps/rhythmbox/ui/library
+@dirrm etc/gconf/gconf.xml.defaults/apps/rhythmbox/ui
+@dirrm etc/gconf/gconf.xml.defaults/apps/rhythmbox/state/load_failure_dialog
+@dirrm etc/gconf/gconf.xml.defaults/apps/rhythmbox/state/library
+@dirrm etc/gconf/gconf.xml.defaults/apps/rhythmbox/state/iradio
+@dirrm etc/gconf/gconf.xml.defaults/apps/rhythmbox/state
+@dirrm etc/gconf/gconf.xml.defaults/apps/rhythmbox
diff --git a/audio/rhythmbox/Makefile b/audio/rhythmbox/Makefile
index 1640b894c557..b7f03ab3bca9 100644
--- a/audio/rhythmbox/Makefile
+++ b/audio/rhythmbox/Makefile
@@ -1,17 +1,18 @@
-# New ports collection makefile for:	net-rhythmbox
-# Date created:		14 February 2003
-# Whom:			Hendrik Scholz <hendrik@scholz.net>
+# New ports collection makefile for:	rhythmbox
+# Date created:		17 August 2003
+# Whom:			Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-PORTNAME=	net-rhythmbox
-PORTVERSION=	0.4.8
-PORTREVISION=	2
+PORTNAME=	rhythmbox
+PORTVERSION=	0.5.1
 CATEGORIES=	audio gnome
-MASTER_SITES=	http://web.verbum.org/net-rhythmbox/
+MASTER_SITES=	${MASTER_SITE_GNOME}
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.5
+DIST_SUBDIR=	gnome2
 
-MAINTAINER=	hendrik@scholz.net
+MAINTAINER=	marcus@freebsd.org
 COMMENT=	Audio player for the Gnome 2 desktop environment
 
 LIB_DEPENDS=	musicbrainz.2:${PORTSDIR}/audio/libmusicbrainz \
@@ -19,44 +20,31 @@ LIB_DEPENDS=	musicbrainz.2:${PORTSDIR}/audio/libmusicbrainz \
 		FLAC.5:${PORTSDIR}/audio/flac \
 		mad.1:${PORTSDIR}/audio/mad
 
+USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack gnomeprefix libgnomeui
 USE_LIBTOOL=	yes
 CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \
 		CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include"
-CONFIGURE_ARGS=	--disable-lirc
 
 .include <bsd.port.pre.mk>
 
-.if exists(${LOCALBASE}/lib/libxosd.so)
-WITH_XOSD=	yes
-.endif
 .if exists(${LOCALBASE}/lib/libvorbis.so)
-WITH_VORBIS=  yes
+WITH_VORBIS=	yes
 .endif
 
-.ifdef (WITH_XOSD)
-LIB_DEPENDS+=   xosd.4:${PORTSDIR}/misc/xosd
-.else
-CONFIGURE_ARGS+=    --disable-xosd
-.endif
 .ifdef (WITH_VORBIS)
-LIB_DEPENDS+=   vorbis.2:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS+=		vorbis.2:${PORTSDIR}/audio/libvorbis
 .else
-CONFIGURE_ARGS+=    --disable-vorbistest
+CONFIGURE_ARGS+=	--disable-vorbistest
 .endif
 
 pre-everything::
-.if !defined(WITH_XOSD)
-	@${ECHO_CMD}
-	@${ECHO_CMD} "define WITH_XOSD to enable On-Screen-Display support"
-	@${ECHO_CMD}
-.endif
 .if !defined(WITH_VORBIS)
-	@${ECHO_CMD}
-	@${ECHO_CMD} "define WITH_VORBIS to enable Vorbis support"
-	@${ECHO_CMD}
+	@${ECHO_MSG}
+	@${ECHO_MSG} "Define WITH_VORBIS to enable Vorbis support"
+	@${ECHO_MSG}
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/audio/rhythmbox/distinfo b/audio/rhythmbox/distinfo
index 235294717ff8..c4510bb9f34a 100644
--- a/audio/rhythmbox/distinfo
+++ b/audio/rhythmbox/distinfo
@@ -1 +1 @@
-MD5 (net-rhythmbox-0.4.8.tar.gz) = e2dd382da135ea00ac93b0f27c12bcb9
+MD5 (gnome2/rhythmbox-0.5.1.tar.bz2) = 15e7d1c8a37a472068b55daf70e73b33
diff --git a/audio/rhythmbox/files/patch-lib_getline.c b/audio/rhythmbox/files/patch-lib_getline.c
deleted file mode 100644
index 448b0d9d0780..000000000000
--- a/audio/rhythmbox/files/patch-lib_getline.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- lib/getline.c.orig	Fri Feb 14 20:42:13 2003
-+++ lib/getline.c	Fri Feb 14 20:44:09 2003
-@@ -43,6 +43,9 @@
- 
- # include "getstr.h"
- 
-+int getline (char **, size_t *, FILE *);
-+int getdelim (char **, size_t *, int, FILE *);
-+
- int
- getline (char **lineptr, size_t *n, FILE *stream)
- {
diff --git a/audio/rhythmbox/files/patch-library_rb-library-main-thread.c b/audio/rhythmbox/files/patch-library_rb-library-main-thread.c
deleted file mode 100644
index 44611505c449..000000000000
--- a/audio/rhythmbox/files/patch-library_rb-library-main-thread.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- library/rb-library-main-thread.c.orig	Sat May 17 20:56:40 2003
-+++ library/rb-library-main-thread.c	Sat May 17 20:56:47 2003
-@@ -325,7 +325,7 @@
- 			rb_echo_area_end_task (echoarea, taskid);
- 		g_mutex_unlock (priv->lock);
- 
--		g_usleep (10);
-+		g_usleep (10000);
- 	}
- 
- 	return NULL;
diff --git a/audio/rhythmbox/files/patch-library_rb-library-walker-thread.c b/audio/rhythmbox/files/patch-library_rb-library-walker-thread.c
deleted file mode 100644
index 1301febfd7cc..000000000000
--- a/audio/rhythmbox/files/patch-library_rb-library-walker-thread.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- library/rb-library-walker-thread.c.orig	Sun Feb  9 13:09:48 2003
-+++ library/rb-library-walker-thread.c	Sat May 17 21:02:36 2003
-@@ -325,7 +325,7 @@
- 
- 		g_mutex_unlock (thread->priv->lock);
- 
--		g_usleep (10);
-+		g_usleep (10000);
- 	}
- 
- 	return NULL;
diff --git a/audio/rhythmbox/files/patch-library_rb-node.c b/audio/rhythmbox/files/patch-library_rb-node.c
deleted file mode 100644
index ec9a5c35830d..000000000000
--- a/audio/rhythmbox/files/patch-library_rb-node.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- library/rb-node.c.orig	Sun Feb  9 03:12:01 2003
-+++ library/rb-node.c	Mon Apr 21 20:27:45 2003
-@@ -852,7 +861,7 @@
- 			   int property_id)
- {
- 	GValue *ret;
--	long mtime;
-+	time_t mtime;
- 	char *retval;
- 	
- 	g_return_val_if_fail (RB_IS_NODE (node), NULL);
diff --git a/audio/rhythmbox/pkg-descr b/audio/rhythmbox/pkg-descr
index c60e36a5ddb4..39e0558c2ab3 100644
--- a/audio/rhythmbox/pkg-descr
+++ b/audio/rhythmbox/pkg-descr
@@ -1,12 +1,5 @@
-netRhythmbox is a branch of Rhythmbox focusing on feature completion and
-stability. Most interesting features in addition to the features of the
-main tree are:
+Rhythmbox is an integrated music management application, originally inspired by 
+Apple's iTunes.  It is free software, designed to work well under the GNOME 
+Desktop, and based on the powerful GStreamer media framework.
 
-	- Internet radio
-	- Playlist file (.pls) support
-	- Real error handling
-	- X OnScreen Display support
-	- A dynamic progress statusbar
-
-WWW: http://web.verbum.org/net-rhythmbox/
--- Hendrik Scholz <hendrik@scholz.net>
+WWW: http://web.rhythmbox.org/
diff --git a/audio/rhythmbox/pkg-plist b/audio/rhythmbox/pkg-plist
index f13e84904774..f56c0dc41ed1 100644
--- a/audio/rhythmbox/pkg-plist
+++ b/audio/rhythmbox/pkg-plist
@@ -1,146 +1,116 @@
-bin/net-rhythmbox
-etc/gconf/gconf.xml.defaults/apps/net-rhythmbox/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/net-rhythmbox/state/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/net-rhythmbox/state/iradio/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/net-rhythmbox/state/library/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/net-rhythmbox/ui/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/net-rhythmbox/ui/iradio/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/net-rhythmbox/ui/library/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/net-rhythmbox/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/net-rhythmbox/state/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/net-rhythmbox/state/iradio/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/net-rhythmbox/state/library/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/net-rhythmbox/ui/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/net-rhythmbox/ui/iradio/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/net-rhythmbox/ui/library/%gconf.xml
-etc/gconf/schemas/net-rhythmbox.schemas
-libdata/bonobo/servers/GNOME_netRhythmbox_Shell.server
-share/gnome/application-registry/net-rhythmbox.applications
-share/gnome/applications/net-rhythmbox.desktop
-share/gnome/gnome-2.0/ui/net-rhythmbox-audiocd-view.xml
-share/gnome/gnome-2.0/ui/net-rhythmbox-group-view.xml
-share/gnome/gnome-2.0/ui/net-rhythmbox-iradio-view.xml
-share/gnome/gnome-2.0/ui/net-rhythmbox-library-view.xml
-share/gnome/gnome-2.0/ui/net-rhythmbox-test-view-2.xml
-share/gnome/gnome-2.0/ui/net-rhythmbox-ui.xml
-share/gnome/help/net-rhythmbox/C/authors.xml
-share/gnome/help/net-rhythmbox/C/fdl-appendix.xml
-share/gnome/help/net-rhythmbox/C/figures/rb-adv.png
-share/gnome/help/net-rhythmbox/C/figures/rb-audio-cd.png
-share/gnome/help/net-rhythmbox/C/figures/rb-basic.png
-share/gnome/help/net-rhythmbox/C/figures/rb-browser.png
-share/gnome/help/net-rhythmbox/C/figures/rb-empty.png
-share/gnome/help/net-rhythmbox/C/figures/rb-full-play.png
-share/gnome/help/net-rhythmbox/C/figures/rb-group-create.png
-share/gnome/help/net-rhythmbox/C/figures/rb-group.png
-share/gnome/help/net-rhythmbox/C/figures/rb-imported.png
-share/gnome/help/net-rhythmbox/C/figures/rb-internet-radio.png
-share/gnome/help/net-rhythmbox/C/figures/rb-iradio-prefs.png
-share/gnome/help/net-rhythmbox/C/figures/rb-library-prefs.png
-share/gnome/help/net-rhythmbox/C/figures/rb-nextprev.png
-share/gnome/help/net-rhythmbox/C/figures/rb-nobrowse-play.png
-share/gnome/help/net-rhythmbox/C/figures/rb-notification-area-menu.png
-share/gnome/help/net-rhythmbox/C/figures/rb-notification-area.png
-share/gnome/help/net-rhythmbox/C/figures/rb-player.png
-share/gnome/help/net-rhythmbox/C/figures/rb-prefs.png
-share/gnome/help/net-rhythmbox/C/figures/rb-repeat.png
-share/gnome/help/net-rhythmbox/C/figures/rb-search.png
-share/gnome/help/net-rhythmbox/C/figures/rb-shuffle.png
-share/gnome/help/net-rhythmbox/C/figures/rb-sidebar.png
-share/gnome/help/net-rhythmbox/C/figures/rb-stats.png
-share/gnome/help/net-rhythmbox/C/figures/rb-toolbar-editor.png
-share/gnome/help/net-rhythmbox/C/figures/rb-toolbar.png
-share/gnome/help/net-rhythmbox/C/figures/rb-volume-mute.png
-share/gnome/help/net-rhythmbox/C/figures/rb-window.png
-share/gnome/help/net-rhythmbox/C/figures/rhythmbox-group.png
-share/gnome/help/net-rhythmbox/C/figures/rhythmbox-tray-icon.png
-share/gnome/help/net-rhythmbox/C/internet-radio.xml
-share/gnome/help/net-rhythmbox/C/legal.xml
-share/gnome/help/net-rhythmbox/C/net-rhythmbox.xml
-share/gnome/help/net-rhythmbox/C/quick-reference.xml
-share/gnome/help/net-rhythmbox/C/user-guide.xml
-share/gnome/net-rhythmbox/art/about-logo.png
-share/gnome/net-rhythmbox/art/rhythmbox-album.png
-share/gnome/net-rhythmbox/art/rhythmbox-audiocd.png
-share/gnome/net-rhythmbox/art/rhythmbox-dnd.png
-share/gnome/net-rhythmbox/art/rhythmbox-group.png
-share/gnome/net-rhythmbox/art/rhythmbox-iradio.png
-share/gnome/net-rhythmbox/art/rhythmbox-library.png
-share/gnome/net-rhythmbox/art/rhythmbox-next.png
-share/gnome/net-rhythmbox/art/rhythmbox-no-star.png
-share/gnome/net-rhythmbox/art/rhythmbox-pause.png
-share/gnome/net-rhythmbox/art/rhythmbox-play.png
-share/gnome/net-rhythmbox/art/rhythmbox-playing.png
-share/gnome/net-rhythmbox/art/rhythmbox-playlist.png
-share/gnome/net-rhythmbox/art/rhythmbox-previous.png
-share/gnome/net-rhythmbox/art/rhythmbox-repeat.png
-share/gnome/net-rhythmbox/art/rhythmbox-rewind.png
-share/gnome/net-rhythmbox/art/rhythmbox-set-star.png
-share/gnome/net-rhythmbox/art/rhythmbox-shuffle.png
-share/gnome/net-rhythmbox/art/rhythmbox-stop.png
-share/gnome/net-rhythmbox/art/rhythmbox-tray-icon.png
-share/gnome/net-rhythmbox/art/rhythmbox-unset-star.png
-share/gnome/net-rhythmbox/art/rhythmbox-visuals.png
-share/gnome/net-rhythmbox/art/rhythmbox-volume-max.png
-share/gnome/net-rhythmbox/art/rhythmbox-volume-medium.png
-share/gnome/net-rhythmbox/art/rhythmbox-volume-min.png
-share/gnome/net-rhythmbox/art/rhythmbox-volume-mute.png
-share/gnome/net-rhythmbox/art/rhythmbox-volume-zero.png
-share/gnome/net-rhythmbox/glade/buffering-dialog.glade
-share/gnome/net-rhythmbox/glade/general-prefs.glade
-share/gnome/net-rhythmbox/glade/iradio-prefs.glade
-share/gnome/net-rhythmbox/glade/library-prefs.glade
-share/gnome/net-rhythmbox/glade/song-info.glade
-share/gnome/net-rhythmbox/glade/station-new.glade
-share/gnome/net-rhythmbox/glade/station-properties.glade
-share/gnome/net-rhythmbox/glade/toolbar-editor.glade
-share/gnome/net-rhythmbox/glade/uri.glade
-share/gnome/net-rhythmbox/iradio-initial.xml
-share/gnome/net-rhythmbox/node-views/rb-node-view-albums.xml
-share/gnome/net-rhythmbox/node-views/rb-node-view-artists.xml
-share/gnome/net-rhythmbox/node-views/rb-node-view-cdaudio.xml
-share/gnome/net-rhythmbox/node-views/rb-node-view-genres.xml
-share/gnome/net-rhythmbox/node-views/rb-node-view-iradio-genres.xml
-share/gnome/net-rhythmbox/node-views/rb-node-view-iradio-stations.xml
-share/gnome/net-rhythmbox/node-views/rb-node-view-songs.xml
-share/gnome/omf/net-rhythmbox/rhythmbox-C.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/net-rhythmbox/rhythmbox-C.omf 2>/dev/null || /usr/bin/true
-share/gnome/pixmaps/net-rhythmbox.png
-share/locale/cs/LC_MESSAGES/netrhythmbox.mo
-share/locale/da/LC_MESSAGES/netrhythmbox.mo
-share/locale/de/LC_MESSAGES/netrhythmbox.mo
-share/locale/el/LC_MESSAGES/netrhythmbox.mo
-share/locale/es/LC_MESSAGES/netrhythmbox.mo
-share/locale/fr/LC_MESSAGES/netrhythmbox.mo
-share/locale/it/LC_MESSAGES/netrhythmbox.mo
-share/locale/ja/LC_MESSAGES/netrhythmbox.mo
-share/locale/ko/LC_MESSAGES/netrhythmbox.mo
-share/locale/ms/LC_MESSAGES/netrhythmbox.mo
-share/locale/no/LC_MESSAGES/netrhythmbox.mo
-share/locale/ru/LC_MESSAGES/netrhythmbox.mo
-share/locale/sv/LC_MESSAGES/netrhythmbox.mo
-share/locale/tr/LC_MESSAGES/netrhythmbox.mo
-share/locale/vi/LC_MESSAGES/netrhythmbox.mo
-@dirrm share/gnome/omf/net-rhythmbox
-@dirrm share/gnome/net-rhythmbox/node-views
-@dirrm share/gnome/net-rhythmbox/glade
-@dirrm share/gnome/net-rhythmbox/art
-@dirrm share/gnome/net-rhythmbox
-@dirrm share/gnome/help/net-rhythmbox/C/figures
-@dirrm share/gnome/help/net-rhythmbox/C
-@dirrm share/gnome/help/net-rhythmbox
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/net-rhythmbox/ui/library
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/net-rhythmbox/ui/iradio
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/net-rhythmbox/ui
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/net-rhythmbox/state/library
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/net-rhythmbox/state/iradio
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/net-rhythmbox/state
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/net-rhythmbox
-@dirrm etc/gconf/gconf.xml.defaults/apps/net-rhythmbox/ui/library
-@dirrm etc/gconf/gconf.xml.defaults/apps/net-rhythmbox/ui/iradio
-@dirrm etc/gconf/gconf.xml.defaults/apps/net-rhythmbox/ui
-@dirrm etc/gconf/gconf.xml.defaults/apps/net-rhythmbox/state/library
-@dirrm etc/gconf/gconf.xml.defaults/apps/net-rhythmbox/state/iradio
-@dirrm etc/gconf/gconf.xml.defaults/apps/net-rhythmbox/state
-@dirrm etc/gconf/gconf.xml.defaults/apps/net-rhythmbox
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/net-rhythmbox/rhythmbox-C.omf 2>/dev/null || /usr/bin/true
+bin/rhythmbox
+etc/gconf/gconf.xml.defaults/apps/rhythmbox/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/rhythmbox/state/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/rhythmbox/state/iradio/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/rhythmbox/state/library/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/rhythmbox/state/load_failure_dialog/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/rhythmbox/ui/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/rhythmbox/ui/library/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/rhythmbox/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/rhythmbox/state/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/rhythmbox/state/iradio/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/rhythmbox/state/library/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/rhythmbox/state/load_failure_dialog/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/rhythmbox/ui/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/rhythmbox/ui/library/%gconf.xml
+etc/gconf/schemas/rhythmbox.schemas
+lib/bonobo/librb-nautilus-context-menu.so
+libdata/bonobo/servers/GNOME_Rhythmbox.server
+libdata/bonobo/servers/Rhythmbox_Nautilus_Context_Menu.server
+libdata/pkgconfig/rhythmbox.pc
+share/gnome/application-registry/rhythmbox.applications
+share/gnome/applications/rhythmbox.desktop
+share/gnome/gnome-2.0/ui/rhythmbox-ui.xml
+share/gnome/pixmaps/rhythmbox.png
+share/gnome/rhythmbox/art/about-logo.png
+share/gnome/rhythmbox/art/rhythmbox-album.png
+share/gnome/rhythmbox/art/rhythmbox-audiocd.png
+share/gnome/rhythmbox/art/rhythmbox-dnd.png
+share/gnome/rhythmbox/art/rhythmbox-group.png
+share/gnome/rhythmbox/art/rhythmbox-iradio.png
+share/gnome/rhythmbox/art/rhythmbox-library.png
+share/gnome/rhythmbox/art/rhythmbox-next.png
+share/gnome/rhythmbox/art/rhythmbox-no-star.png
+share/gnome/rhythmbox/art/rhythmbox-pause.png
+share/gnome/rhythmbox/art/rhythmbox-paused.png
+share/gnome/rhythmbox/art/rhythmbox-play.png
+share/gnome/rhythmbox/art/rhythmbox-playing.png
+share/gnome/rhythmbox/art/rhythmbox-playlist.png
+share/gnome/rhythmbox/art/rhythmbox-previous.png
+share/gnome/rhythmbox/art/rhythmbox-repeat.png
+share/gnome/rhythmbox/art/rhythmbox-rewind.png
+share/gnome/rhythmbox/art/rhythmbox-set-star.png
+share/gnome/rhythmbox/art/rhythmbox-shuffle.png
+share/gnome/rhythmbox/art/rhythmbox-sound-juicer.png
+share/gnome/rhythmbox/art/rhythmbox-stop.png
+share/gnome/rhythmbox/art/rhythmbox-tray-icon.png
+share/gnome/rhythmbox/art/rhythmbox-unset-star.png
+share/gnome/rhythmbox/art/rhythmbox-visuals.png
+share/gnome/rhythmbox/art/rhythmbox-volume-max.png
+share/gnome/rhythmbox/art/rhythmbox-volume-medium.png
+share/gnome/rhythmbox/art/rhythmbox-volume-min.png
+share/gnome/rhythmbox/art/rhythmbox-volume-mute.png
+share/gnome/rhythmbox/art/rhythmbox-volume-zero.png
+share/gnome/rhythmbox/glade/buffering-dialog.glade
+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/song-info.glade
+share/gnome/rhythmbox/glade/station-new.glade
+share/gnome/rhythmbox/glade/station-properties.glade
+share/gnome/rhythmbox/glade/uri.glade
+share/gnome/rhythmbox/iradio-initial.pls
+share/gnome/rhythmbox/node-views/rb-node-view-albums.xml
+share/gnome/rhythmbox/node-views/rb-node-view-artists.xml
+share/gnome/rhythmbox/node-views/rb-node-view-cdaudio.xml
+share/gnome/rhythmbox/node-views/rb-node-view-genres.xml
+share/gnome/rhythmbox/node-views/rb-node-view-iradio-genres.xml
+share/gnome/rhythmbox/node-views/rb-node-view-iradio-stations.xml
+share/gnome/rhythmbox/node-views/rb-node-view-songs.xml
+share/idl/Rhythmbox.idl
+share/locale/am/LC_MESSAGES/rhythmbox.mo
+share/locale/be/LC_MESSAGES/rhythmbox.mo
+share/locale/cs/LC_MESSAGES/rhythmbox.mo
+share/locale/da/LC_MESSAGES/rhythmbox.mo
+share/locale/de/LC_MESSAGES/rhythmbox.mo
+share/locale/el/LC_MESSAGES/rhythmbox.mo
+share/locale/es/LC_MESSAGES/rhythmbox.mo
+share/locale/fi/LC_MESSAGES/rhythmbox.mo
+share/locale/fr/LC_MESSAGES/rhythmbox.mo
+share/locale/it/LC_MESSAGES/rhythmbox.mo
+share/locale/ja/LC_MESSAGES/rhythmbox.mo
+share/locale/ko/LC_MESSAGES/rhythmbox.mo
+share/locale/lv/LC_MESSAGES/rhythmbox.mo
+share/locale/ms/LC_MESSAGES/rhythmbox.mo
+share/locale/nl/LC_MESSAGES/rhythmbox.mo
+share/locale/no/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/ru/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/tr/LC_MESSAGES/rhythmbox.mo
+share/locale/vi/LC_MESSAGES/rhythmbox.mo
+share/locale/zh_TW/LC_MESSAGES/rhythmbox.mo
+@dirrm share/idl
+@dirrm share/gnome/rhythmbox/node-views
+@dirrm share/gnome/rhythmbox/glade
+@dirrm share/gnome/rhythmbox/art
+@dirrm share/gnome/rhythmbox
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/rhythmbox/ui/library
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/rhythmbox/ui
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/rhythmbox/state/load_failure_dialog
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/rhythmbox/state/library
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/rhythmbox/state/iradio
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/rhythmbox/state
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/rhythmbox
+@dirrm etc/gconf/gconf.xml.defaults/apps/rhythmbox/ui/library
+@dirrm etc/gconf/gconf.xml.defaults/apps/rhythmbox/ui
+@dirrm etc/gconf/gconf.xml.defaults/apps/rhythmbox/state/load_failure_dialog
+@dirrm etc/gconf/gconf.xml.defaults/apps/rhythmbox/state/library
+@dirrm etc/gconf/gconf.xml.defaults/apps/rhythmbox/state/iradio
+@dirrm etc/gconf/gconf.xml.defaults/apps/rhythmbox/state
+@dirrm etc/gconf/gconf.xml.defaults/apps/rhythmbox