Update to 0.6.10.

6 files changed, 16 insertions, 42 deletions

diff --git a/audio/rhythmbox-devel/Makefile b/audio/rhythmbox-devel/Makefile
index 5d0fb61..c6a9931 100644
--- a/audio/rhythmbox-devel/Makefile
+++ b/audio/rhythmbox-devel/Makefile
@@ -6,11 +6,12 @@
 #
 
 PORTNAME=	rhythmbox
-PORTVERSION=	0.6.8
-PORTREVISION=	1
+PORTVERSION=	0.6.10
 CATEGORIES=	audio gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.6
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
+		${MASTER_SITE_GNOME}
+MASTER_SITE_SUBDIR=	rhythmbox \
+			sources/${PORTNAME}/0.6
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	marcus@FreeBSD.org
@@ -21,7 +22,7 @@ LIB_DEPENDS=	musicbrainz.4:${PORTSDIR}/audio/libmusicbrainz \
 		mad.2:${PORTSDIR}/audio/libmad \
 		id3tag.2:${PORTSDIR}/audio/libid3tag
 
-USE_BZIP2=	yes
+#USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack gnomeprefix libgnomeui
diff --git a/audio/rhythmbox-devel/distinfo b/audio/rhythmbox-devel/distinfo
index 55cc416..8f8ae5f 100644
--- a/audio/rhythmbox-devel/distinfo
+++ b/audio/rhythmbox-devel/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/rhythmbox-0.6.8.tar.bz2) = b7940fa4e56a66a19476a959385b79b1
-SIZE (gnome2/rhythmbox-0.6.8.tar.bz2) = 1580541
+MD5 (gnome2/rhythmbox-0.6.10.tar.gz) = 826410e4b42c931dff25e7deab7d550d
+SIZE (gnome2/rhythmbox-0.6.10.tar.gz) = 1970523
diff --git a/audio/rhythmbox-devel/files/patch-shell_rb-shell.c b/audio/rhythmbox-devel/files/patch-shell_rb-shell.c
deleted file mode 100644
index 21af556..0000000
--- a/audio/rhythmbox-devel/files/patch-shell_rb-shell.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- shell/rb-shell.c.orig	Thu Jan 22 03:35:39 2004
-+++ shell/rb-shell.c	Thu Jan 22 03:36:04 2004
-@@ -610,10 +610,10 @@
- {
- 	RBShell *shell = RB_SHELL (bonobo_object (_servant));
- 	RBPlaylist *parser;
-+	GnomeVFSURI *vfsuri = gnome_vfs_uri_new (uri);
- 
- 	rb_debug ("handling uri: %s", uri);
- 
--	GnomeVFSURI *vfsuri = gnome_vfs_uri_new (uri);
- 	if (!vfsuri) {
- 		rb_error_dialog (_("Unable to parse URI \"%s\"\n"), uri);
- 		return;
diff --git a/audio/rhythmbox/Makefile b/audio/rhythmbox/Makefile
index 5d0fb61..c6a9931 100644
--- a/audio/rhythmbox/Makefile
+++ b/audio/rhythmbox/Makefile
@@ -6,11 +6,12 @@
 #
 
 PORTNAME=	rhythmbox
-PORTVERSION=	0.6.8
-PORTREVISION=	1
+PORTVERSION=	0.6.10
 CATEGORIES=	audio gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.6
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
+		${MASTER_SITE_GNOME}
+MASTER_SITE_SUBDIR=	rhythmbox \
+			sources/${PORTNAME}/0.6
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	marcus@FreeBSD.org
@@ -21,7 +22,7 @@ LIB_DEPENDS=	musicbrainz.4:${PORTSDIR}/audio/libmusicbrainz \
 		mad.2:${PORTSDIR}/audio/libmad \
 		id3tag.2:${PORTSDIR}/audio/libid3tag
 
-USE_BZIP2=	yes
+#USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack gnomeprefix libgnomeui
diff --git a/audio/rhythmbox/distinfo b/audio/rhythmbox/distinfo
index 55cc416..8f8ae5f 100644
--- a/audio/rhythmbox/distinfo
+++ b/audio/rhythmbox/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/rhythmbox-0.6.8.tar.bz2) = b7940fa4e56a66a19476a959385b79b1
-SIZE (gnome2/rhythmbox-0.6.8.tar.bz2) = 1580541
+MD5 (gnome2/rhythmbox-0.6.10.tar.gz) = 826410e4b42c931dff25e7deab7d550d
+SIZE (gnome2/rhythmbox-0.6.10.tar.gz) = 1970523
diff --git a/audio/rhythmbox/files/patch-shell_rb-shell.c b/audio/rhythmbox/files/patch-shell_rb-shell.c
deleted file mode 100644
index 21af556..0000000
--- a/audio/rhythmbox/files/patch-shell_rb-shell.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- shell/rb-shell.c.orig	Thu Jan 22 03:35:39 2004
-+++ shell/rb-shell.c	Thu Jan 22 03:36:04 2004
-@@ -610,10 +610,10 @@
- {
- 	RBShell *shell = RB_SHELL (bonobo_object (_servant));
- 	RBPlaylist *parser;
-+	GnomeVFSURI *vfsuri = gnome_vfs_uri_new (uri);
- 
- 	rb_debug ("handling uri: %s", uri);
- 
--	GnomeVFSURI *vfsuri = gnome_vfs_uri_new (uri);
- 	if (!vfsuri) {
- 		rb_error_dialog (_("Unable to parse URI \"%s\"\n"), uri);
- 		return;