Update to 0.6.1.

Reminded by:	adamw
Obtained from:	FreeBSD ports tree


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@1428 df743ca5-7f9a-e211-a948-0013205c9059

8 files changed, 12 insertions, 60 deletions

diff --git a/audio/rhythmbox-devel/Makefile b/audio/rhythmbox-devel/Makefile
index df9aa67d4..5293267a2 100644
--- a/audio/rhythmbox-devel/Makefile
+++ b/audio/rhythmbox-devel/Makefile
@@ -2,11 +2,11 @@
 # Date created:		17 August 2003
 # Whom:			Joe Marcus Clarke <marcus@FreeBSD.org>
 #
-# $FreeBSD: ports/audio/rhythmbox/Makefile,v 1.16 2003/11/12 03:03:08 marcus Exp $
+# $FreeBSD: ports/audio/rhythmbox/Makefile,v 1.19 2003/12/07 03:58:43 marcus Exp $
 #
 
 PORTNAME=	rhythmbox
-PORTVERSION=	0.6.0
+PORTVERSION=	0.6.1
 PORTREVISION=	1
 CATEGORIES=	audio gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
@@ -18,7 +18,8 @@ COMMENT=	Audio player for the Gnome 2 desktop environment
 
 LIB_DEPENDS=	musicbrainz.3:${PORTSDIR}/audio/libmusicbrainz \
 		FLAC.5:${PORTSDIR}/audio/flac \
-		mad.1:${PORTSDIR}/audio/mad
+		mad.2:${PORTSDIR}/audio/libmad \
+		id3tag.2:${PORTSDIR}/audio/libid3tag
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
diff --git a/audio/rhythmbox-devel/distinfo b/audio/rhythmbox-devel/distinfo
index e82342d64..2412d10ff 100644
--- a/audio/rhythmbox-devel/distinfo
+++ b/audio/rhythmbox-devel/distinfo
@@ -1 +1 @@
-MD5 (gnome2/rhythmbox-0.6.0.tar.bz2) = 4b2f613f3a9f0e66facdc571867093c1
+MD5 (gnome2/rhythmbox-0.6.1.tar.bz2) = 5791f9fb69c9a855d84e1e666b2e86a9
diff --git a/audio/rhythmbox-devel/files/patch-lib_rb-tree-dnd.c b/audio/rhythmbox-devel/files/patch-lib_rb-tree-dnd.c
deleted file mode 100644
index 5ce40a753..000000000
--- a/audio/rhythmbox-devel/files/patch-lib_rb-tree-dnd.c
+++ /dev/null
@@ -1,26 +0,0 @@
---- lib/rb-tree-dnd.c.orig	Tue Nov 11 20:58:54 2003
-+++ lib/rb-tree-dnd.c	Tue Nov 11 20:59:17 2003
-@@ -710,9 +710,10 @@
- 				 gint n_targets,
- 				 GdkDragAction actions)
- {
-+    	RbTreeDndData *priv_data;
-  	g_return_if_fail (GTK_IS_TREE_VIEW (tree_view));
- 
--	RbTreeDndData *priv_data = init_rb_tree_dnd_data (GTK_WIDGET(tree_view));
-+	priv_data = init_rb_tree_dnd_data (GTK_WIDGET(tree_view));
- 
- 	if (!priv_data->button_press_event_handler) {
- 
-@@ -746,9 +747,10 @@
- 			       gint n_targets,
- 			       GdkDragAction actions)
- {
-+    	RbTreeDndData *priv_data;
- 	g_return_if_fail (GTK_IS_TREE_VIEW (tree_view));
- 
--	RbTreeDndData *priv_data = init_rb_tree_dnd_data (GTK_WIDGET(tree_view));
-+	priv_data = init_rb_tree_dnd_data (GTK_WIDGET(tree_view));
- 
- 	if (!priv_data->drag_leave_handler) {
- 
diff --git a/audio/rhythmbox-devel/pkg-plist b/audio/rhythmbox-devel/pkg-plist
index 7e263f181..374370132 100644
--- a/audio/rhythmbox-devel/pkg-plist
+++ b/audio/rhythmbox-devel/pkg-plist
@@ -114,6 +114,7 @@ share/gnome/rhythmbox/node-views/rb-node-view-songs.xml
 share/locale/am/LC_MESSAGES/rhythmbox.mo
 share/locale/az/LC_MESSAGES/rhythmbox.mo
 share/locale/be/LC_MESSAGES/rhythmbox.mo
+share/locale/ca/LC_MESSAGES/rhythmbox.mo
 share/locale/cs/LC_MESSAGES/rhythmbox.mo
 share/locale/cy/LC_MESSAGES/rhythmbox.mo
 share/locale/da/LC_MESSAGES/rhythmbox.mo
diff --git a/audio/rhythmbox/Makefile b/audio/rhythmbox/Makefile
index df9aa67d4..5293267a2 100644
--- a/audio/rhythmbox/Makefile
+++ b/audio/rhythmbox/Makefile
@@ -2,11 +2,11 @@
 # Date created:		17 August 2003
 # Whom:			Joe Marcus Clarke <marcus@FreeBSD.org>
 #
-# $FreeBSD: ports/audio/rhythmbox/Makefile,v 1.16 2003/11/12 03:03:08 marcus Exp $
+# $FreeBSD: ports/audio/rhythmbox/Makefile,v 1.19 2003/12/07 03:58:43 marcus Exp $
 #
 
 PORTNAME=	rhythmbox
-PORTVERSION=	0.6.0
+PORTVERSION=	0.6.1
 PORTREVISION=	1
 CATEGORIES=	audio gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
@@ -18,7 +18,8 @@ COMMENT=	Audio player for the Gnome 2 desktop environment
 
 LIB_DEPENDS=	musicbrainz.3:${PORTSDIR}/audio/libmusicbrainz \
 		FLAC.5:${PORTSDIR}/audio/flac \
-		mad.1:${PORTSDIR}/audio/mad
+		mad.2:${PORTSDIR}/audio/libmad \
+		id3tag.2:${PORTSDIR}/audio/libid3tag
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
diff --git a/audio/rhythmbox/distinfo b/audio/rhythmbox/distinfo
index e82342d64..2412d10ff 100644
--- a/audio/rhythmbox/distinfo
+++ b/audio/rhythmbox/distinfo
@@ -1 +1 @@
-MD5 (gnome2/rhythmbox-0.6.0.tar.bz2) = 4b2f613f3a9f0e66facdc571867093c1
+MD5 (gnome2/rhythmbox-0.6.1.tar.bz2) = 5791f9fb69c9a855d84e1e666b2e86a9
diff --git a/audio/rhythmbox/files/patch-lib_rb-tree-dnd.c b/audio/rhythmbox/files/patch-lib_rb-tree-dnd.c
deleted file mode 100644
index 5ce40a753..000000000
--- a/audio/rhythmbox/files/patch-lib_rb-tree-dnd.c
+++ /dev/null
@@ -1,26 +0,0 @@
---- lib/rb-tree-dnd.c.orig	Tue Nov 11 20:58:54 2003
-+++ lib/rb-tree-dnd.c	Tue Nov 11 20:59:17 2003
-@@ -710,9 +710,10 @@
- 				 gint n_targets,
- 				 GdkDragAction actions)
- {
-+    	RbTreeDndData *priv_data;
-  	g_return_if_fail (GTK_IS_TREE_VIEW (tree_view));
- 
--	RbTreeDndData *priv_data = init_rb_tree_dnd_data (GTK_WIDGET(tree_view));
-+	priv_data = init_rb_tree_dnd_data (GTK_WIDGET(tree_view));
- 
- 	if (!priv_data->button_press_event_handler) {
- 
-@@ -746,9 +747,10 @@
- 			       gint n_targets,
- 			       GdkDragAction actions)
- {
-+    	RbTreeDndData *priv_data;
- 	g_return_if_fail (GTK_IS_TREE_VIEW (tree_view));
- 
--	RbTreeDndData *priv_data = init_rb_tree_dnd_data (GTK_WIDGET(tree_view));
-+	priv_data = init_rb_tree_dnd_data (GTK_WIDGET(tree_view));
- 
- 	if (!priv_data->drag_leave_handler) {
- 
diff --git a/audio/rhythmbox/pkg-plist b/audio/rhythmbox/pkg-plist
index 7e263f181..374370132 100644
--- a/audio/rhythmbox/pkg-plist
+++ b/audio/rhythmbox/pkg-plist
@@ -114,6 +114,7 @@ share/gnome/rhythmbox/node-views/rb-node-view-songs.xml
 share/locale/am/LC_MESSAGES/rhythmbox.mo
 share/locale/az/LC_MESSAGES/rhythmbox.mo
 share/locale/be/LC_MESSAGES/rhythmbox.mo
+share/locale/ca/LC_MESSAGES/rhythmbox.mo
 share/locale/cs/LC_MESSAGES/rhythmbox.mo
 share/locale/cy/LC_MESSAGES/rhythmbox.mo
 share/locale/da/LC_MESSAGES/rhythmbox.mo