The FreeBSD GNOME team is proud to annunce the release of GNOME 2.22.0 for

FreeBSD.  The official GNOME 2.22 release notes can be found at
http://library.gnome.org/misc/release-notes/2.22/ .  On the FreeBSD front,
this release features an updated hal port with support for video4linux
devices, DRM (Direct Rendering), and better support of removable media.  Work
is also underway to tie webkit more closely into GNOME.  As part of the
GNOME 2.22 upgrade, GStreamer received a rather large upgrade as well.
Be sure to consult UPDATING on the proper steps to upgrade all of your
GNOME ports.

This release would not have been possible without the contributions and
testing efforts of the following people:

Pawel Worach
kan
edwin
Peter Ulrich Kruppa
J. W. Ballantine
Yasuda Keisuke
Andriy Gapon

12 files changed, 172 insertions, 190 deletions

diff --git a/sysutils/nautilus-cd-burner/Makefile b/sysutils/nautilus-cd-burner/Makefile
index 9900ba6a5edf..531684648a58 100644
--- a/sysutils/nautilus-cd-burner/Makefile
+++ b/sysutils/nautilus-cd-burner/Makefile
@@ -3,29 +3,31 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/sysutils/nautilus-cd-burner/Makefile,v 1.134 2007/09/18 00:44:04 marcus Exp $
+#   $MCom: ports/sysutils/nautilus-cd-burner/Makefile,v 1.141 2008/03/15 19:36:22 ahze Exp $
 #
 
 PORTNAME=	nautilus-cd-burner
-PORTVERSION=	2.20.0
+PORTVERSION=	2.22.0
 PORTREVISION=	1
 CATEGORIES=	sysutils gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	CD burner view for Nautilus
 
-RUN_DEPENDS=	cdrdao:${PORTSDIR}/sysutils/cdrdao
+BUILD_DEPENDS=	gnome-mount:${PORTSDIR}/sysutils/gnome-mount
+RUN_DEPENDS=	gnome-mount:${PORTSDIR}/sysutils/gnome-mount \
+		cdrdao:${PORTSDIR}/sysutils/cdrdao
 
+CONFIGURE_ARGS=	--enable-gnome-mount
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
 USE_XLIB=	yes
 USE_GMAKE=	yes
 GNOME_DESKTOP_VERSION=2
 USE_GNOME=	gnomeprefix gnomehack intlhack nautilus2 ltverhack \
-		desktopfileutils
+		desktopfileutils ltasneededhack
 USE_CDRTOOLS=	yes
 INSTALLS_ICONS=	yes
 USE_AUTOTOOLS=	libtool:15
@@ -36,8 +38,7 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 GCONF_SCHEMAS=	nautilus-cd-burner.schemas
 
 OPTIONS=	DVD "Enable DVD support" on \
-		CJK "Use cdrtools-cjk instead of cdrtools" off \
-		GNOMEMOUNT "Enable sysutils/gnome-mount support" off
+		CJK "Use cdrtools-cjk instead of cdrtools" off
 
 .include <bsd.port.pre.mk>
 
@@ -49,14 +50,6 @@ WITHOUT_DVD=	yes
 RUN_DEPENDS+=	growisofs:${PORTSDIR}/sysutils/dvd+rw-tools
 .endif
 
-.if defined(WITH_GNOMEMOUNT)
-BUILD_DEPENDS+=	gnome-mount:${PORTSDIR}/sysutils/gnome-mount
-RUN_DEPENDS+=	gnome-mount:${PORTSDIR}/sysutils/gnome-mount
-CONFIGURE_ARGS+=	--enable-gnome-mount
-.else
-CONFIGURE_ARGS+=	--disable-gnome-mount
-.endif
-
 post-install:
 	-@update-desktop-database
 	@${CAT} ${PKGMESSAGE}
diff --git a/sysutils/nautilus-cd-burner/distinfo b/sysutils/nautilus-cd-burner/distinfo
index 95075e8ab2c7..029d3fe5eb2b 100644
--- a/sysutils/nautilus-cd-burner/distinfo
+++ b/sysutils/nautilus-cd-burner/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/nautilus-cd-burner-2.20.0.tar.bz2) = a7ddb02c33be107f6c9c1874b7703e9e
-SHA256 (gnome2/nautilus-cd-burner-2.20.0.tar.bz2) = fc7a91473bc3cab7cba8ef4185e8f62ea6ad50a4558d8bce1aa639a4397ec905
-SIZE (gnome2/nautilus-cd-burner-2.20.0.tar.bz2) = 730319
+MD5 (gnome2/nautilus-cd-burner-2.22.0.tar.bz2) = e75c61879a12ab329fd2f3081b7e5d76
+SHA256 (gnome2/nautilus-cd-burner-2.22.0.tar.bz2) = c8bc7d9211438e5f12c755226d953884bfdf16957084ec423dcf80f4acb4cd63
+SIZE (gnome2/nautilus-cd-burner-2.22.0.tar.bz2) = 734921
diff --git a/sysutils/nautilus-cd-burner/files/patch-src_list_cddrives.c b/sysutils/nautilus-cd-burner/files/patch-src_list_cddrives.c
index 7b228d462b33..71f43178c354 100644
--- a/sysutils/nautilus-cd-burner/files/patch-src_list_cddrives.c
+++ b/sysutils/nautilus-cd-burner/files/patch-src_list_cddrives.c
@@ -1,10 +1,10 @@
---- src/list_cddrives.c.orig	Sun Nov 19 13:36:40 2006
-+++ src/list_cddrives.c	Sun Nov 19 13:37:08 2006
+--- src/list_cddrives.c.orig	2008-01-21 11:14:45.000000000 -0500
++++ src/list_cddrives.c	2008-01-21 19:48:49.000000000 -0500
 @@ -49,6 +49,7 @@ list_drive_info (NautilusBurnDrive *driv
- 	g_print ("Drive:\n");
- 	g_print ("  name:\t\t\t%s\n", display_name);
- 	g_print ("  device:\t\t%s\n", nautilus_burn_drive_get_device (drive));
-+	g_print ("  cdrecord device:\t%s\n", nautilus_burn_drive_get_cdrecord_device (drive));
- 	g_print ("  door:\t\t\t%s\n", door_is_open ? "open" : "closed");
- 	g_print ("  type:\t\t\t%s\n", type_str);
- 	g_print ("  is mounted:\t\t%s\n", is_mounted ? "TRUE" : "FALSE");
+         g_print ("Drive:\n");
+         g_print ("  name:\t\t\t%s\n", display_name);
+         g_print ("  device:\t\t%s\n", nautilus_burn_drive_get_device (drive));
++        g_print ("  cdrecord device:\t%s\n", nautilus_burn_drive_get_cdrecord_device (drive));
+         g_print ("  door:\t\t\t%s\n", door_is_open ? "open" : "closed");
+         g_print ("  type:\t\t\t%s\n", type_str);
+         g_print ("  is mounted:\t\t%s\n", is_mounted ? "TRUE" : "FALSE");
diff --git a/sysutils/nautilus-cd-burner/files/patch-src_make-iso.c b/sysutils/nautilus-cd-burner/files/patch-src_make-iso.c
index f3fa05c13792..18183a421d3b 100644
--- a/sysutils/nautilus-cd-burner/files/patch-src_make-iso.c
+++ b/sysutils/nautilus-cd-burner/files/patch-src_make-iso.c
@@ -1,38 +1,38 @@
---- src/make-iso.c.orig	Sun Nov 19 13:34:29 2006
-+++ src/make-iso.c	Sun Nov 19 13:36:03 2006
+--- src/make-iso.c.orig        Sun Nov 19 13:34:29 2006
++++ src/make-iso.c        Sun Nov 19 13:36:03 2006
 @@ -1367,7 +1367,7 @@ get_disc_info (NautilusBurnIso   *iso,
- 							      &has_data,
- 							      &_has_audio);
- 	if (_has_audio) {
--		device_arg = g_strdup_printf ("%s", nautilus_burn_drive_get_device (drive));
-+		device_arg = g_strdup_printf ("%s", nautilus_burn_drive_get_cdrecord_device (drive));
+                                                               &has_data,
+                                                               &_has_audio);
+         if (_has_audio) {
+-                device_arg = g_strdup_printf ("%s", nautilus_burn_drive_get_device (drive));
++                device_arg = g_strdup_printf ("%s", nautilus_burn_drive_get_cdrecord_device (drive));
  
- 		argv = g_ptr_array_new ();
- 		g_ptr_array_add (argv, "cdrdao");
+                 argv = g_ptr_array_new ();
+                 g_ptr_array_add (argv, "cdrdao");
 @@ -1377,7 +1377,7 @@ get_disc_info (NautilusBurnIso   *iso,
- 		g_ptr_array_add (argv, NULL);
+                 g_ptr_array_add (argv, NULL);
  
- 	} else {
--		device_arg = g_strdup_printf ("-dev=%s", nautilus_burn_drive_get_device (drive));
-+		device_arg = g_strdup_printf ("-dev=%s", nautilus_burn_drive_get_cdrecord_device (drive));
+         } else {
+-                device_arg = g_strdup_printf ("-dev=%s", nautilus_burn_drive_get_device (drive));
++                device_arg = g_strdup_printf ("-dev=%s", nautilus_burn_drive_get_cdrecord_device (drive));
  
- 		argv = g_ptr_array_new ();
- 		g_ptr_array_add (argv, "readcd");
+                 argv = g_ptr_array_new ();
+                 g_ptr_array_add (argv, "readcd");
 @@ -1547,7 +1547,7 @@ nautilus_burn_iso_make_from_drive (Nauti
- 		g_ptr_array_add (argv, "--datafile");
- 		g_ptr_array_add (argv, (char *)filename);
- 		g_ptr_array_add (argv, "--device");
--		g_ptr_array_add (argv, (char *)nautilus_burn_drive_get_device (drive));
-+		g_ptr_array_add (argv, (char *)nautilus_burn_drive_get_cdrecord_device (drive));
- 		g_ptr_array_add (argv, "-v");
- 		g_ptr_array_add (argv, "2");
- 		g_ptr_array_add (argv, (char *)toc_filename_arg);
+                 g_ptr_array_add (argv, "--datafile");
+                 g_ptr_array_add (argv, (char *)filename);
+                 g_ptr_array_add (argv, "--device");
+-                g_ptr_array_add (argv, (char *)nautilus_burn_drive_get_device (drive));
++                g_ptr_array_add (argv, (char *)nautilus_burn_drive_get_cdrecord_device (drive));
+                 g_ptr_array_add (argv, "-v");
+                 g_ptr_array_add (argv, "2");
+                 g_ptr_array_add (argv, (char *)toc_filename_arg);
 @@ -1559,7 +1559,7 @@ nautilus_burn_iso_make_from_drive (Nauti
  
- 		filename_arg = g_strdup_printf ("f=%s", filename);
+                 filename_arg = g_strdup_printf ("f=%s", filename);
  
--		dev_arg = g_strdup_printf ("dev=%s", nautilus_burn_drive_get_device (drive));
-+		dev_arg = g_strdup_printf ("dev=%s", nautilus_burn_drive_get_cdrecord_device (drive));
+-                dev_arg = g_strdup_printf ("dev=%s", nautilus_burn_drive_get_device (drive));
++                dev_arg = g_strdup_printf ("dev=%s", nautilus_burn_drive_get_cdrecord_device (drive));
  
- 		argv = g_ptr_array_new ();
- 		g_ptr_array_add (argv, "readcd");
+                 argv = g_ptr_array_new ();
+                 g_ptr_array_add (argv, "readcd");
diff --git a/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive-monitor.c b/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive-monitor.c
index 58743c0fe275..2d62886636fa 100644
--- a/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive-monitor.c
+++ b/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive-monitor.c
@@ -1,48 +1,48 @@
---- src/nautilus-burn-drive-monitor.c.orig	2007-07-10 15:06:23.000000000 -0400
-+++ src/nautilus-burn-drive-monitor.c	2008-01-05 13:51:44.000000000 -0500
+--- src/nautilus-burn-drive-monitor.c.orig        2007-07-10 15:06:23.000000000 -0400
++++ src/nautilus-burn-drive-monitor.c        2008-01-05 13:51:44.000000000 -0500
 @@ -618,7 +618,8 @@ nautilus_burn_drive_monitor_get_drive_fo
- 		 */
- 		if (drive->priv->device != NULL &&
- 		   (strcmp (drive->priv->device, target) == 0 ||
+                  */
+                 if (drive->priv->device != NULL &&
+                    (strcmp (drive->priv->device, target) == 0 ||
 -                    strcmp (drive->priv->device, device) == 0)) {
 +                    strcmp (drive->priv->device, device) == 0 ||
 +                    strcmp (drive->priv->cdrecord_device, device) == 0)) {
- 			ret = nautilus_burn_drive_ref (drive);
- 			break;
- 		}
+                         ret = nautilus_burn_drive_ref (drive);
+                         break;
+                 }
 @@ -683,6 +684,8 @@ hal_drive_from_udi (LibHalContext *ctx,
- 	NautilusBurnDrive        *drive;
- 	char                    **write_speeds = NULL;
- 	char                     *raw_device = NULL;
-+	char                     *cam_path = NULL;
-+	char                     *cam_device = NULL;
+         NautilusBurnDrive        *drive;
+         char                    **write_speeds = NULL;
+         char                     *raw_device = NULL;
++        char                     *cam_path = NULL;
++        char                     *cam_device = NULL;
  
- 	LIBHAL_CHECK_LIBHALCONTEXT (ctx, FALSE);
+         LIBHAL_CHECK_LIBHALCONTEXT (ctx, FALSE);
  
 @@ -711,6 +714,8 @@ hal_drive_from_udi (LibHalContext *ctx,
  
- 		LIBHAL_PROP_EXTRACT_STRING  ("block.device",               drive->priv->device);
- 		LIBHAL_PROP_EXTRACT_STRING  ("block.solaris.raw_device",   raw_device);
-+		LIBHAL_PROP_EXTRACT_STRING  ("block.freebsd.atapi_cam_device", cam_device);
-+		LIBHAL_PROP_EXTRACT_STRING  ("block.freebsd.cam_path",     cam_path);
- 		LIBHAL_PROP_EXTRACT_STRING  ("storage.model",              drive->priv->display_name);
+                 LIBHAL_PROP_EXTRACT_STRING  ("block.device",               drive->priv->device);
+                 LIBHAL_PROP_EXTRACT_STRING  ("block.solaris.raw_device",   raw_device);
++                LIBHAL_PROP_EXTRACT_STRING  ("block.freebsd.atapi_cam_device", cam_device);
++                LIBHAL_PROP_EXTRACT_STRING  ("block.freebsd.cam_path",     cam_path);
+                 LIBHAL_PROP_EXTRACT_STRING  ("storage.model",              drive->priv->display_name);
  
- 		LIBHAL_PROP_EXTRACT_INT ("storage.cdrom.read_speed",   drive->priv->max_speed_read);
+                 LIBHAL_PROP_EXTRACT_INT ("storage.cdrom.read_speed",   drive->priv->max_speed_read);
 @@ -736,6 +741,17 @@ hal_drive_from_udi (LibHalContext *ctx,
- 		drive->priv->device = raw_device;
- 	}
+                 drive->priv->device = raw_device;
+         }
  
-+	if (cam_device != NULL) {
-+		g_free (drive->priv->device);
-+		drive->priv->device = cam_device;
-+	}
++        if (cam_device != NULL) {
++                g_free (drive->priv->device);
++                drive->priv->device = cam_device;
++        }
 +
-+	if (cam_path != NULL) {
-+		drive->priv->cdrecord_device = cam_path;
-+	} else {
-+		drive->priv->cdrecord_device = g_strdup (drive->priv->device);
-+	}
++        if (cam_path != NULL) {
++                drive->priv->cdrecord_device = cam_path;
++        } else {
++                drive->priv->cdrecord_device = g_strdup (drive->priv->device);
++        }
 +
- 	drive->priv->drive_udi = g_strdup (udi);
- 	drive->priv->write_speeds = hal_parse_write_speeds (write_speeds);
- 	/* we do not own write_speeds so do not free it. */
+         drive->priv->drive_udi = g_strdup (udi);
+         drive->priv->write_speeds = hal_parse_write_speeds (write_speeds);
+         /* we do not own write_speeds so do not free it. */
diff --git a/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive-private.h b/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive-private.h
index f70c5d4a2c65..a4da309cbb17 100644
--- a/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive-private.h
+++ b/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive-private.h
@@ -1,10 +1,10 @@
---- src/nautilus-burn-drive-private.h.orig	Sun Nov 19 13:43:24 2006
-+++ src/nautilus-burn-drive-private.h	Sun Nov 19 13:43:50 2006
+--- src/nautilus-burn-drive-private.h.orig        Sun Nov 19 13:43:24 2006
++++ src/nautilus-burn-drive-private.h        Sun Nov 19 13:43:50 2006
 @@ -34,6 +34,7 @@ struct NautilusBurnDrivePrivate {
  
- 	int                           type;
- 	char                         *device;
-+	char                         *cdrecord_device;
- 	char                         *display_name;
- 	int                           max_speed_write;
- 	int                           max_speed_read;
+         int                           type;
+         char                         *device;
++        char                         *cdrecord_device;
+         char                         *display_name;
+         int                           max_speed_write;
+         int                           max_speed_read;
diff --git a/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive-selection.c b/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive-selection.c
index 0210c9f4d32b..a3d5a2949a3e 100644
--- a/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive-selection.c
+++ b/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive-selection.c
@@ -1,29 +1,29 @@
---- src/nautilus-burn-drive-selection.c.orig	Sun Nov 19 13:39:17 2006
-+++ src/nautilus-burn-drive-selection.c	Sun Nov 19 13:39:30 2006
+--- src/nautilus-burn-drive-selection.c.orig        Sun Nov 19 13:39:17 2006
++++ src/nautilus-burn-drive-selection.c        Sun Nov 19 13:39:30 2006
 @@ -151,7 +151,7 @@ nautilus_burn_drive_selection_set_drive_
- 		       0, drive);
- 	g_signal_emit (G_OBJECT (selection),
- 		       nautilus_burn_drive_selection_table_signals [DEVICE_CHANGED],
--		       0, nautilus_burn_drive_get_device (drive));
-+		       0, nautilus_burn_drive_get_cdrecord_device (drive));
+                        0, drive);
+         g_signal_emit (G_OBJECT (selection),
+                        nautilus_burn_drive_selection_table_signals [DEVICE_CHANGED],
+-                       0, nautilus_burn_drive_get_device (drive));
++                       0, nautilus_burn_drive_get_cdrecord_device (drive));
  
- 	g_object_notify (G_OBJECT (selection), "device");
- 	g_object_notify (G_OBJECT (selection), "drive");
+         g_object_notify (G_OBJECT (selection), "device");
+         g_object_notify (G_OBJECT (selection), "drive");
 @@ -584,7 +584,7 @@ nautilus_burn_drive_selection_get_defaul
- 	if (drives == NULL) {
- 		device = "/dev/cdrom";
- 	} else {
--		device = nautilus_burn_drive_get_device (drives->data);
-+		device = nautilus_burn_drive_get_cdrecord_device (drives->data);
- 		g_list_foreach (drives, (GFunc)nautilus_burn_drive_unref, NULL);
- 		g_list_free (drives);
- 	}
+         if (drives == NULL) {
+                 device = "/dev/cdrom";
+         } else {
+-                device = nautilus_burn_drive_get_device (drives->data);
++                device = nautilus_burn_drive_get_cdrecord_device (drives->data);
+                 g_list_foreach (drives, (GFunc)nautilus_burn_drive_unref, NULL);
+                 g_list_free (drives);
+         }
 @@ -633,7 +633,7 @@ nautilus_burn_drive_selection_get_device
- 	g_return_val_if_fail (selection != NULL, NULL);
- 	g_return_val_if_fail (NAUTILUS_BURN_IS_DRIVE_SELECTION (selection), NULL);
+         g_return_val_if_fail (selection != NULL, NULL);
+         g_return_val_if_fail (NAUTILUS_BURN_IS_DRIVE_SELECTION (selection), NULL);
  
--	return selection->priv->selected_drive != NULL ? nautilus_burn_drive_get_device (selection->priv->selected_drive) : NULL;
-+	return selection->priv->selected_drive != NULL ? nautilus_burn_drive_get_cdrecord_device (selection->priv->selected_drive) : NULL;
+-        return selection->priv->selected_drive != NULL ? nautilus_burn_drive_get_device (selection->priv->selected_drive) : NULL;
++        return selection->priv->selected_drive != NULL ? nautilus_burn_drive_get_cdrecord_device (selection->priv->selected_drive) : NULL;
  }
  
  /**
diff --git a/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive.c b/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive.c
index cb0cd120ec2a..17a0384464ec 100644
--- a/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive.c
+++ b/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive.c
@@ -1,5 +1,5 @@
---- src/nautilus-burn-drive.c.orig	Fri Sep 29 12:55:36 2006
-+++ src/nautilus-burn-drive.c	Sun Nov 19 13:27:31 2006
+--- src/nautilus-burn-drive.c.orig        Fri Sep 29 12:55:36 2006
++++ src/nautilus-burn-drive.c        Sun Nov 19 13:27:31 2006
 @@ -266,6 +266,25 @@ nautilus_burn_drive_get_device (Nautilus
  }
  
@@ -17,41 +17,28 @@
 +const char *
 +nautilus_burn_drive_get_cdrecord_device (NautilusBurnDrive *drive)
 +{
-+	g_return_val_if_fail (drive != NULL, NULL);
++        g_return_val_if_fail (drive != NULL, NULL);
 +
-+	return drive->priv->cdrecord_device;
++        return drive->priv->cdrecord_device;
 +}
 +
 +/**
   * nautilus_burn_drive_get_drive_type:
   * @drive: #NautilusBurnDrive
   *
-@@ -808,8 +827,12 @@ nautilus_burn_drive_eject (NautilusBurnD
- #ifdef USE_GNOME_MOUNT
- 	cmd = g_strdup_printf ("gnome-mount --eject --no-ui --device=%s", drive->priv->device);
- #else
-+#ifdef __FreeBSD_
-+	cmd = g_strdup_printf ("cdcontrol -f %s eject", drive->priv->device);
-+#else
- 	cmd = g_strdup_printf ("eject %s", drive->priv->device);
- #endif
-+#endif
- 
- 	res = g_spawn_command_line_sync (cmd, NULL, NULL, NULL, NULL);
- 	g_free (cmd);
 @@ -1021,6 +1044,7 @@ nautilus_burn_drive_finalize (GObject *o
- 	g_free (drive->priv->write_speeds);
- 	g_free (drive->priv->display_name);
- 	g_free (drive->priv->device);
-+	g_free (drive->priv->cdrecord_device);
+         g_free (drive->priv->write_speeds);
+         g_free (drive->priv->display_name);
+         g_free (drive->priv->device);
++        g_free (drive->priv->cdrecord_device);
  
- 	if (G_OBJECT_CLASS (nautilus_burn_drive_parent_class)->finalize != NULL) {
- 		(* G_OBJECT_CLASS (nautilus_burn_drive_parent_class)->finalize) (object);
+         if (G_OBJECT_CLASS (nautilus_burn_drive_parent_class)->finalize != NULL) {
+                 (* G_OBJECT_CLASS (nautilus_burn_drive_parent_class)->finalize) (object);
 @@ -1038,6 +1062,7 @@ nautilus_burn_drive_init (NautilusBurnDr
- 	drive->priv->max_speed_read  = 0;
- 	drive->priv->write_speeds    = NULL;
- 	drive->priv->device          = NULL;
-+	drive->priv->cdrecord_device = NULL;
+         drive->priv->max_speed_read  = 0;
+         drive->priv->write_speeds    = NULL;
+         drive->priv->device          = NULL;
++        drive->priv->cdrecord_device = NULL;
  }
  
  /**
diff --git a/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive.h b/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive.h
index 034d495b509e..f033fa3ba295 100644
--- a/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive.h
+++ b/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive.h
@@ -1,5 +1,5 @@
---- src/nautilus-burn-drive.h.orig	Sun Nov 19 13:37:32 2006
-+++ src/nautilus-burn-drive.h	Sun Nov 19 13:37:55 2006
+--- src/nautilus-burn-drive.h.orig        Sun Nov 19 13:37:32 2006
++++ src/nautilus-burn-drive.h        Sun Nov 19 13:37:55 2006
 @@ -127,6 +127,7 @@ gboolean              nautilus_burn_driv
  int                   nautilus_burn_drive_get_drive_type           (NautilusBurnDrive       *drive);
  char *                nautilus_burn_drive_get_name_for_display     (NautilusBurnDrive       *drive);
diff --git a/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-recorder.c b/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-recorder.c
index 186f433fb659..85f6416abcfe 100644
--- a/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-recorder.c
+++ b/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-recorder.c
@@ -1,29 +1,29 @@
---- src/nautilus-burn-recorder.c.orig	Fri Sep 29 14:18:37 2006
-+++ src/nautilus-burn-recorder.c	Mon Nov 20 18:13:24 2006
+--- src/nautilus-burn-recorder.c.orig        Fri Sep 29 14:18:37 2006
++++ src/nautilus-burn-recorder.c        Mon Nov 20 18:13:24 2006
 @@ -1343,7 +1343,7 @@ nautilus_burn_recorder_write_cdrecord (N
- 		g_ptr_array_add (argv, "cdrdao");
- 		g_ptr_array_add (argv, "write");
- 		g_ptr_array_add (argv, "--device");
--		g_ptr_array_add (argv, (char *)nautilus_burn_drive_get_device (drive));
-+		g_ptr_array_add (argv, (char *)nautilus_burn_drive_get_cdrecord_device (drive));
- 		g_ptr_array_add (argv, "--speed");
- 		speed_str = g_strdup_printf ("%d", speed);
- 		g_ptr_array_add (argv, speed_str);
+                 g_ptr_array_add (argv, "cdrdao");
+                 g_ptr_array_add (argv, "write");
+                 g_ptr_array_add (argv, "--device");
+-                g_ptr_array_add (argv, (char *)nautilus_burn_drive_get_device (drive));
++                g_ptr_array_add (argv, (char *)nautilus_burn_drive_get_cdrecord_device (drive));
+                 g_ptr_array_add (argv, "--speed");
+                 speed_str = g_strdup_printf ("%d", speed);
+                 g_ptr_array_add (argv, speed_str);
 @@ -1375,7 +1375,7 @@ nautilus_burn_recorder_write_cdrecord (N
- 		if (speed != 0) {
- 			g_ptr_array_add (argv, speed_str);
- 		}
--		dev_str = g_strdup_printf ("dev=%s", nautilus_burn_drive_get_device (drive));
-+		dev_str = g_strdup_printf ("dev=%s", nautilus_burn_drive_get_cdrecord_device (drive));
- 		g_ptr_array_add (argv, dev_str);
- 		if (flags & NAUTILUS_BURN_RECORDER_WRITE_DUMMY_WRITE) {
- 			g_ptr_array_add (argv, "-dummy");
+                 if (speed != 0) {
+                         g_ptr_array_add (argv, speed_str);
+                 }
+-                dev_str = g_strdup_printf ("dev=%s", nautilus_burn_drive_get_device (drive));
++                dev_str = g_strdup_printf ("dev=%s", nautilus_burn_drive_get_cdrecord_device (drive));
+                 g_ptr_array_add (argv, dev_str);
+                 if (flags & NAUTILUS_BURN_RECORDER_WRITE_DUMMY_WRITE) {
+                         g_ptr_array_add (argv, "-dummy");
 @@ -1486,7 +1486,7 @@ nautilus_burn_recorder_blank_disc_cdreco
- 	argv = g_ptr_array_new ();
- 	g_ptr_array_add (argv, "cdrecord");
+         argv = g_ptr_array_new ();
+         g_ptr_array_add (argv, "cdrecord");
  
--	dev_str = g_strdup_printf ("dev=%s", nautilus_burn_drive_get_device (drive));
-+	dev_str = g_strdup_printf ("dev=%s", nautilus_burn_drive_get_cdrecord_device (drive));
- 	g_ptr_array_add (argv, dev_str);
- 	g_ptr_array_add (argv, "-v");
+-        dev_str = g_strdup_printf ("dev=%s", nautilus_burn_drive_get_device (drive));
++        dev_str = g_strdup_printf ("dev=%s", nautilus_burn_drive_get_cdrecord_device (drive));
+         g_ptr_array_add (argv, dev_str);
+         g_ptr_array_add (argv, "-v");
  
diff --git a/sysutils/nautilus-cd-burner/files/patch-src_nautilus-cd-burner.c b/sysutils/nautilus-cd-burner/files/patch-src_nautilus-cd-burner.c
index 9f729b800b17..3ed06173992e 100644
--- a/sysutils/nautilus-cd-burner/files/patch-src_nautilus-cd-burner.c
+++ b/sysutils/nautilus-cd-burner/files/patch-src_nautilus-cd-burner.c
@@ -1,5 +1,5 @@
---- src/nautilus-cd-burner.c.orig	Fri Jul 14 10:20:19 2006
-+++ src/nautilus-cd-burner.c	Sun Nov 19 13:41:34 2006
+--- src/nautilus-cd-burner.c.orig        Fri Jul 14 10:20:19 2006
++++ src/nautilus-cd-burner.c        Sun Nov 19 13:41:34 2006
 @@ -27,6 +27,8 @@
  
  #include "config.h"
@@ -10,11 +10,11 @@
  #include <stdio.h>
  #include <stdlib.h>
 @@ -246,7 +248,7 @@ selection_dialog_response (GtkWidget *di
- 		/* save selections */
- 		gconf_client = gconf_client_get_default ();
- 		gconf_client_set_int (gconf_client, "/apps/nautilus-cd-burner/default_speed", speed, NULL);
--		gconf_save_device (gconf_client, nautilus_burn_drive_get_device (drive));
-+		gconf_save_device (gconf_client, nautilus_burn_drive_get_cdrecord_device (drive));
- 		g_object_unref (gconf_client);
+                 /* save selections */
+                 gconf_client = gconf_client_get_default ();
+                 gconf_client_set_int (gconf_client, "/apps/nautilus-cd-burner/default_speed", speed, NULL);
+-                gconf_save_device (gconf_client, nautilus_burn_drive_get_device (drive));
++                gconf_save_device (gconf_client, nautilus_burn_drive_get_cdrecord_device (drive));
+                 g_object_unref (gconf_client);
  
- 		operation = ncb_operation_new ();
+                 operation = ncb_operation_new ();
diff --git a/sysutils/nautilus-cd-burner/pkg-plist b/sysutils/nautilus-cd-burner/pkg-plist
index efd6f53c256c..635ccb6e5989 100644
--- a/sysutils/nautilus-cd-burner/pkg-plist
+++ b/sysutils/nautilus-cd-burner/pkg-plist
@@ -1,5 +1,4 @@
 bin/nautilus-cd-burner
-etc/gnome-vfs-2.0/modules/mapping-modules.conf
 include/libnautilus-burn/nautilus-burn-drive-monitor.h
 include/libnautilus-burn/nautilus-burn-drive-selection.h
 include/libnautilus-burn/nautilus-burn-drive.h
@@ -7,18 +6,14 @@ include/libnautilus-burn/nautilus-burn-features.h
 include/libnautilus-burn/nautilus-burn-init.h
 include/libnautilus-burn/nautilus-burn-recorder.h
 include/libnautilus-burn/nautilus-burn.h
-lib/gnome-vfs-2.0/modules/libmapping.a
-lib/gnome-vfs-2.0/modules/libmapping.la
-lib/gnome-vfs-2.0/modules/libmapping.so
 lib/libnautilus-burn.a
 lib/libnautilus-burn.la
 lib/libnautilus-burn.so
 lib/libnautilus-burn.so.4
-lib/nautilus/extensions-1.0/libnautilus-burn-extension.a
-lib/nautilus/extensions-1.0/libnautilus-burn-extension.la
-lib/nautilus/extensions-1.0/libnautilus-burn-extension.so
+lib/nautilus/extensions-2.0/libnautilus-burn-extension.a
+lib/nautilus/extensions-2.0/libnautilus-burn-extension.la
+lib/nautilus/extensions-2.0/libnautilus-burn-extension.so
 libdata/pkgconfig/libnautilus-burn.pc
-libexec/mapping-daemon
 share/applications/nautilus-cd-burner-open-iso.desktop
 share/applications/nautilus-cd-burner.desktop
 share/icons/hicolor/16x16/apps/nautilus-cd-burner.png
@@ -27,6 +22,7 @@ share/icons/hicolor/24x24/apps/nautilus-cd-burner.png
 share/icons/hicolor/scalable/apps/nautilus-cd-burner.svg
 share/locale/am/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/ar/LC_MESSAGES/nautilus-cd-burner.mo
+share/locale/as/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/az/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/be/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/be@latin/LC_MESSAGES/nautilus-cd-burner.mo
@@ -62,6 +58,7 @@ share/locale/is/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/it/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/ja/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/ka/LC_MESSAGES/nautilus-cd-burner.mo
+share/locale/kn/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/ko/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/ku/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/lt/LC_MESSAGES/nautilus-cd-burner.mo
@@ -70,6 +67,7 @@ share/locale/mg/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/mk/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/ml/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/mn/LC_MESSAGES/nautilus-cd-burner.mo
+share/locale/mr/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/ms/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/nb/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/ne/LC_MESSAGES/nautilus-cd-burner.mo
@@ -112,6 +110,7 @@ share/locale/zh_TW/LC_MESSAGES/nautilus-cd-burner.mo
 %%DATADIR%%/cdspin8.png
 %%DATADIR%%/nautilus-cd-burner.glade
 @dirrm %%DATADIR%%
+@dirrmtry share/applications
 @dirrm include/libnautilus-burn
 @exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
 @unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
@@ -129,6 +128,8 @@ share/locale/zh_TW/LC_MESSAGES/nautilus-cd-burner.mo
 @dirrmtry share/locale/rw
 @dirrmtry share/locale/oc/LC_MESSAGES
 @dirrmtry share/locale/oc
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
 @dirrmtry share/locale/mg/LC_MESSAGES
 @dirrmtry share/locale/mg
 @dirrmtry share/locale/ku/LC_MESSAGES
@@ -141,4 +142,5 @@ share/locale/zh_TW/LC_MESSAGES/nautilus-cd-burner.mo
 @dirrmtry share/locale/bn_IN
 @dirrmtry share/locale/be@latin/LC_MESSAGES
 @dirrmtry share/locale/be@latin
-@dirrmtry share/applications
+@dirrmtry share/locale/as/LC_MESSAGES
+@dirrmtry share/locale/as