7 files changed, 101 insertions, 67 deletions

diff --git a/audio/gnome-media/Makefile b/audio/gnome-media/Makefile
index 7da933a5a0cf..ff31e07e5ee3 100644
--- a/audio/gnome-media/Makefile
+++ b/audio/gnome-media/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	gnomemedia2
-PORTVERSION=	2.8.0
-PORTREVISION=	4
+PORTVERSION=	2.10.0
+PORTREVISION=	2
 CATEGORIES=	audio gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-media/2.8
+MASTER_SITE_SUBDIR=	sources/gnome-media/2.10
 DISTNAME=	gnome-media-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
@@ -18,15 +18,15 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Multimedia applications for the GNOME 2 desktop
 
 USE_BZIP2=	yes
+INSTALLS_OMF=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL_VER=15
-INSTALLS_OMF=	yes
 INSTALLS_SHLIB=	yes
 USE_REINPLACE=	yes
 GNOME_DESKTOP_VERSION=2
-USE_GNOME=	gnomeprefix gnomehack intlhack gnomehier gnomedesktop \
-		gail
+USE_GNOME=	gnomeprefix gnomehack intlhack gnomedesktop \
+		gail nautiluscdburner
 USE_GSTREAMER=	esound cdparanoia
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/audio/gnome-media/distinfo b/audio/gnome-media/distinfo
index 57f2938ee07f..10edadbbab8a 100644
--- a/audio/gnome-media/distinfo
+++ b/audio/gnome-media/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gnome-media-2.8.0.tar.bz2) = c200cb577be1adb6bedb8c6528d738a1
-SIZE (gnome2/gnome-media-2.8.0.tar.bz2) = 3171171
+MD5 (gnome2/gnome-media-2.10.0.tar.bz2) = e3b5a422881bfcb7f4082818075e8c88
+SIZE (gnome2/gnome-media-2.10.0.tar.bz2) = 3286571
diff --git a/audio/gnome-media/files/patch-cddb-slave2_tcp.c b/audio/gnome-media/files/patch-cddb-slave2_tcp.c
new file mode 100644
index 000000000000..f316b7f01301
--- /dev/null
+++ b/audio/gnome-media/files/patch-cddb-slave2_tcp.c
@@ -0,0 +1,20 @@
+--- cddb-slave2/tcp.c.orig	Mon Sep 20 14:52:50 2004
++++ cddb-slave2/tcp.c	Sat Mar 12 03:30:52 2005
+@@ -265,7 +265,7 @@ gnet_tcp_socket_new_async (const GInetAd
+ 		continue;
+ 
+ 	      sa_in6->sin6_scope_id = ifindex;
+-	      con = connect (s->sockfd, (struct sockaddr *)&sa6, sizeof(s->sa));
++	      con = connect (s->sockfd, (struct sockaddr *)&sa6, sizeof(sa6));
+ 	      if (con == 0 || errno == EINPROGRESS)
+ 				break;
+ 
+@@ -283,7 +283,7 @@ gnet_tcp_socket_new_async (const GInetAd
+       memcpy(&sa, &addr->sa, sizeof(sa));
+       sa_in = (struct sockaddr_in *) &sa;
+       sa_in->sin_family = AF_INET;
+-      con = connect(s->sockfd, &sa, sizeof(s->sa));
++      con = connect(s->sockfd, &sa, sizeof(sa));
+     }
+ 
+   /* Connect (but non-blocking!) */
diff --git a/audio/gnome-media/files/patch-gnome-cd_Makefile.in b/audio/gnome-media/files/patch-gnome-cd_Makefile.in
new file mode 100644
index 000000000000..b534f8fec923
--- /dev/null
+++ b/audio/gnome-media/files/patch-gnome-cd_Makefile.in
@@ -0,0 +1,30 @@
+--- gnome-cd/Makefile.in.orig	Sat Mar 12 02:52:17 2005
++++ gnome-cd/Makefile.in	Sat Mar 12 03:03:20 2005
+@@ -282,8 +282,8 @@
+ libgnomemedia_cddbslave2_la_SOURCES = $(IDL_GENERATED)
+ @CDROM_HOST_SOLARIS_TRUE@@HAVE_GSTREAMER_FALSE@cd_sources = solaris-cdrom.c solaris-cdrom.h
+ 
+-@HAVE_GSTREAMER_TRUE@cd_sources = gst-cdparanoia-cdrom.c
+-@CDROM_HOST_BSD_TRUE@@HAVE_GSTREAMER_FALSE@cd_sources = bsd-cdrom.c bsd-cdrom.h
++#@HAVE_GSTREAMER_TRUE@cd_sources = gst-cdparanoia-cdrom.c
++@CDROM_HOST_BSD_TRUE@cd_sources = bsd-cdrom.c bsd-cdrom.h
+ @CDROM_HOST_LINUX_TRUE@@HAVE_GSTREAMER_FALSE@cd_sources = linux-cdrom.c linux-cdrom.h
+ 
+ bin_PROGRAMS = gnome-cd
+@@ -352,13 +352,13 @@
+ 	solaris-cdrom.h gst-cdparanoia-cdrom.c bsd-cdrom.c bsd-cdrom.h \
+ 	linux-cdrom.c linux-cdrom.h preferences.c preferences.h \
+ 	cd-selection.c cd-selection.h theme.c
+-@CDROM_HOST_BSD_TRUE@@HAVE_GSTREAMER_FALSE@am__objects_2 = \
+-@CDROM_HOST_BSD_TRUE@@HAVE_GSTREAMER_FALSE@	bsd-cdrom.$(OBJEXT)
++@CDROM_HOST_BSD_TRUE@am__objects_2 = \
++@CDROM_HOST_BSD_TRUE@	bsd-cdrom.$(OBJEXT)
+ @CDROM_HOST_LINUX_TRUE@@HAVE_GSTREAMER_FALSE@am__objects_2 = \
+ @CDROM_HOST_LINUX_TRUE@@HAVE_GSTREAMER_FALSE@	linux-cdrom.$(OBJEXT)
+ @CDROM_HOST_SOLARIS_TRUE@@HAVE_GSTREAMER_FALSE@am__objects_2 = \
+ @CDROM_HOST_SOLARIS_TRUE@@HAVE_GSTREAMER_FALSE@	solaris-cdrom.$(OBJEXT)
+-@HAVE_GSTREAMER_TRUE@am__objects_2 = gst-cdparanoia-cdrom.$(OBJEXT)
++#@HAVE_GSTREAMER_TRUE@am__objects_2 = gst-cdparanoia-cdrom.$(OBJEXT)
+ am_gnome_cd_OBJECTS = eggtrayicon.$(OBJEXT) gnome-cd.$(OBJEXT) \
+ 	callbacks.$(OBJEXT) cddb.$(OBJEXT) cdrom.$(OBJEXT) \
+ 	display.$(OBJEXT) $(am__objects_2) preferences.$(OBJEXT) \
diff --git a/audio/gnome-media/files/patch-gnome-cd_gst-cdparanoia-cdrom.c b/audio/gnome-media/files/patch-gnome-cd_gst-cdparanoia-cdrom.c
new file mode 100644
index 000000000000..4942519dde40
--- /dev/null
+++ b/audio/gnome-media/files/patch-gnome-cd_gst-cdparanoia-cdrom.c
@@ -0,0 +1,32 @@
+--- gnome-cd/gst-cdparanoia-cdrom.c.orig	Sat Mar 12 00:09:14 2005
++++ gnome-cd/gst-cdparanoia-cdrom.c	Sat Mar 12 00:19:15 2005
+@@ -1443,15 +1443,18 @@
+ 		return FALSE;
+ 	}
+ 
++#if !defined(__FreeBSD__)
++	/* XXX: One cannot send CDIOCCAPABILITY to an atapicam CD-ROM
++	 * device.
++	 */
++
+ 	fd = open (device, O_RDONLY | O_NONBLOCK);
+ 	if (fd < 0) {
+ 		return FALSE;
+ 	}
+ 
+ 	/* Fire a harmless ioctl at the device. */
+-#if defined(__FreeBSD__)
+-	if (ioctl (fd, CDIOCCAPABILITY, 0) < 0) {
+-#elif defined(__NetBSD__) || defined(__OpenBSD__)
++#if defined(__NetBSD__) || defined(__OpenBSD__)
+ 	if (ioctl (fd, CDIOCGETVOL, 0) < 0) {
+ #else
+ 	if (ioctl (fd, CDROM_GET_CAPABILITY, 0) < 0) {
+@@ -1463,6 +1466,7 @@
+ 	}
+ 
+ 	close (fd);
++#endif /* __FreeBSD__ */
+ 
+ 	return TRUE;
+ }
diff --git a/audio/gnome-media/files/patch-grecord_gsr-window.c b/audio/gnome-media/files/patch-grecord_gsr-window.c
deleted file mode 100644
index c26eb6889094..000000000000
--- a/audio/gnome-media/files/patch-grecord_gsr-window.c
+++ /dev/null
@@ -1,57 +0,0 @@
---- grecord/src/gsr-window.c.orig	Fri Dec 24 15:16:11 2004
-+++ grecord/src/gsr-window.c	Fri Dec 24 15:16:13 2004
-@@ -29,7 +29,7 @@
- #include <unistd.h>
- 
- #include <gnome.h>
--#include <libgnomevfs/gnome-vfs-utils.h>
-+#include <libgnomevfs/gnome-vfs.h>
- #include <gconf/gconf-client.h>
- #include <gst/gst.h>
- #include <gst/gconf/gconf.h>
-@@ -475,16 +475,41 @@
- {
- 	GSRWindowPrivate *priv;
-         GMAudioProfile *profile;
--	char *tmp;
-+	char *tmp, *src;
-+	GnomeVFSURI *src_uri, *dst_uri;
- 	
- 	priv = window->priv;
- 	
-         profile = gm_audio_profile_choose_get_active (priv->profile);
- 
--	tmp = g_strdup_printf ("%s.%s", name,
-+	tmp = g_strdup_printf ("file://%s.%s", name,
- 			       gm_audio_profile_get_extension (profile));
--	rename (priv->record_filename, tmp);
--	g_free (tmp);		
-+	src = g_strdup_printf ("file://%s", priv->record_filename);
-+	src_uri = gnome_vfs_uri_new (src);
-+	dst_uri = gnome_vfs_uri_new (tmp);
-+	g_free (src);
-+	g_free (tmp);
-+	if (src_uri && dst_uri) {
-+		GnomeVFSResult result;
-+		result = gnome_vfs_xfer_uri (src_uri, dst_uri,
-+			GNOME_VFS_XFER_DEFAULT,
-+			GNOME_VFS_XFER_ERROR_MODE_ABORT,
-+			GNOME_VFS_XFER_OVERWRITE_MODE_REPLACE,
-+			NULL, NULL);
-+		if (result == GNOME_VFS_OK) {
-+			char *title, *short_name;
-+			priv->filename = g_strdup_printf ("%s.%s",
-+				name, gm_audio_profile_get_extension (profile));
-+			short_name = g_path_get_basename (priv->filename);
-+			title = g_strdup_printf ("%s - Sound Recorder",
-+				short_name);
-+			gtk_window_set_title (GTK_WINDOW (window), title);
-+			priv->dirty = FALSE;
-+			g_free (title);
-+		}
-+		gnome_vfs_uri_unref (src_uri);
-+		gnome_vfs_uri_unref (dst_uri);
-+	}
- }
- 
- static void
diff --git a/audio/gnome-media/pkg-plist b/audio/gnome-media/pkg-plist
index a80344126abe..42fabcc9a822 100644
--- a/audio/gnome-media/pkg-plist
+++ b/audio/gnome-media/pkg-plist
@@ -22,16 +22,24 @@ libdata/bonobo/servers/GNOME_Media_CDDBSlave2.server
 libdata/pkgconfig/gnome-media-profiles.pc
 libexec/CDDBSlave2
 libexec/cddb-track-editor
+share/gnome/applications/cddb-slave.desktop
 share/gnome/applications/gnome-cd.desktop
 share/gnome/applications/gnome-sound-recorder.desktop
 share/gnome/applications/gnome-volume-control.desktop
+share/gnome/applications/gstreamer-properties.desktop
 share/gnome/applications/reclevel.desktop
 share/gnome/applications/vumeter.desktop
-share/gnome/control-center-2.0/capplets/cddb-slave.desktop
-share/gnome/control-center-2.0/capplets/gstreamer-properties.desktop
 share/gnome/gnome-media/glade/gnome-audio-profiles.glade2
+share/gnome/gnome-media/pixmaps/3dsound.png
+share/gnome/gnome-media/pixmaps/chain-broken.png
+share/gnome/gnome-media/pixmaps/chain.png
+share/gnome/gnome-media/pixmaps/headphones.png
 share/gnome/gnome-media/pixmaps/mixer.png
+share/gnome/gnome-media/pixmaps/noplay.png
+share/gnome/gnome-media/pixmaps/norecord.png
 share/gnome/gnome-media/pixmaps/phone.png
+share/gnome/gnome-media/pixmaps/play.png
+share/gnome/gnome-media/pixmaps/record.png
 share/gnome/gnome-media/pixmaps/tone.png
 share/gnome/gnome-media/pixmaps/video.png
 share/gnome/gnome-sound-recorder/ui/gsr.xml
@@ -434,6 +442,7 @@ share/locale/ml/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/mn/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/ms/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/nb/LC_MESSAGES/gnome-media-2.0.mo
+share/locale/ne/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/nl/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/nn/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/no/LC_MESSAGES/gnome-media-2.0.mo