5 files changed, 14 insertions, 20 deletions

diff --git a/audio/gnomemedia2/Makefile b/audio/gnomemedia2/Makefile
index 9a99d6238278..a5219831189b 100644
--- a/audio/gnomemedia2/Makefile
+++ b/audio/gnomemedia2/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gnomemedia2
-PORTVERSION=	2.10.0
-PORTREVISION=	3
+PORTVERSION=	2.10.1
 CATEGORIES=	audio gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-media/2.10
@@ -43,6 +42,9 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|%%CDROM%%|acd0|' ${WRKSRC}/configure
 .else
 	@${REINPLACE_CMD} -e 's|%%CDROM%%|acd0c|' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|lrint|rint|' \
+		${WRKSRC}/gnome-cd/gst-cdparanoia-cdrom.c \
+		${WRKSRC}/gst-mixer/src/volume.c
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/audio/gnomemedia2/distinfo b/audio/gnomemedia2/distinfo
index 10edadbbab8a..04e6f86733bc 100644
--- a/audio/gnomemedia2/distinfo
+++ b/audio/gnomemedia2/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gnome-media-2.10.0.tar.bz2) = e3b5a422881bfcb7f4082818075e8c88
-SIZE (gnome2/gnome-media-2.10.0.tar.bz2) = 3286571
+MD5 (gnome2/gnome-media-2.10.1.tar.bz2) = 3b8fc25c0f391ac869759c8f1ec01316
+SIZE (gnome2/gnome-media-2.10.1.tar.bz2) = 3328501
diff --git a/audio/gnomemedia2/files/patch-cddb-slave2_cddb-slave.c b/audio/gnomemedia2/files/patch-cddb-slave2_cddb-slave.c
deleted file mode 100644
index 4f57992f4a92..000000000000
--- a/audio/gnomemedia2/files/patch-cddb-slave2_cddb-slave.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- cddb-slave2/cddb-slave.c.orig	Sat Mar  5 03:42:22 2005
-+++ cddb-slave2/cddb-slave.c	Sat Mar  5 03:43:01 2005
-@@ -572,6 +572,7 @@ do_query_response (ConnectionData *cd,
- 		more = FALSE;
- 		break;
- 
-+	case 210:
- 	case 211:
- 		/* Should this be 210 as well? */
- 		cs_debug ("Multiple matches found\n<-- %s", response);
diff --git a/audio/gnomemedia2/files/patch-gnome-cd_gst-cdparanoia-cdrom.c b/audio/gnomemedia2/files/patch-gnome-cd_gst-cdparanoia-cdrom.c
index 2e153baaae6a..8d49db7bc871 100644
--- a/audio/gnomemedia2/files/patch-gnome-cd_gst-cdparanoia-cdrom.c
+++ b/audio/gnomemedia2/files/patch-gnome-cd_gst-cdparanoia-cdrom.c
@@ -1,6 +1,6 @@
---- gnome-cd/gst-cdparanoia-cdrom.c.orig	Mon Feb  7 12:39:31 2005
-+++ gnome-cd/gst-cdparanoia-cdrom.c	Sun Mar 20 04:42:32 2005
-@@ -1213,6 +1213,16 @@
+--- gnome-cd/gst-cdparanoia-cdrom.c.orig	Mon Apr  4 16:25:49 2005
++++ gnome-cd/gst-cdparanoia-cdrom.c	Mon Apr  4 16:26:14 2005
+@@ -1224,6 +1224,16 @@
  		*status = NULL;
  		return FALSE;
  	}
@@ -16,8 +16,8 @@
 +	realstatus->cd = GNOME_CDROM_STATUS_OK;
  #endif
  
- 	/* Get the volume */
-@@ -1443,15 +1453,18 @@
+ 	gst_cdparanoia_cdrom_close (lcd);
+@@ -1421,15 +1431,18 @@
  		return FALSE;
  	}
  
@@ -39,7 +39,7 @@
  	if (ioctl (fd, CDIOCGETVOL, 0) < 0) {
  #else
  	if (ioctl (fd, CDROM_GET_CAPABILITY, 0) < 0) {
-@@ -1463,6 +1476,7 @@
+@@ -1441,6 +1454,7 @@
  	}
  
  	close (fd);
diff --git a/audio/gnomemedia2/pkg-plist b/audio/gnomemedia2/pkg-plist
index 42fabcc9a822..d4b0694c11e6 100644
--- a/audio/gnomemedia2/pkg-plist
+++ b/audio/gnomemedia2/pkg-plist
@@ -452,6 +452,7 @@ share/locale/pt/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/pt_BR/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/ro/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/ru/LC_MESSAGES/gnome-media-2.0.mo
+share/locale/rw/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/sk/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/sl/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/sq/LC_MESSAGES/gnome-media-2.0.mo
@@ -465,6 +466,7 @@ share/locale/tr/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/uk/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/vi/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/wa/LC_MESSAGES/gnome-media-2.0.mo
+share/locale/xh/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-media-2.0.mo
 @dirrm share/gnome/pixmaps/gnome-media/gnome-sound-recorder