7 files changed, 106 insertions, 79 deletions

diff --git a/sysutils/nautilus-cd-burner/Makefile b/sysutils/nautilus-cd-burner/Makefile
index f8eeb746a317..88badb5387fe 100644
--- a/sysutils/nautilus-cd-burner/Makefile
+++ b/sysutils/nautilus-cd-burner/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	nautilus-cd-burner
-PORTVERSION=	2.8.7
+PORTVERSION=	2.10.0
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.8
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.10
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/sysutils/nautilus-cd-burner/distinfo b/sysutils/nautilus-cd-burner/distinfo
index 723521ada8e0..960dd8c03871 100644
--- a/sysutils/nautilus-cd-burner/distinfo
+++ b/sysutils/nautilus-cd-burner/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/nautilus-cd-burner-2.8.7.tar.bz2) = b5b4b0074e5fa73d8e79a5cb221e0ca4
-SIZE (gnome2/nautilus-cd-burner-2.8.7.tar.bz2) = 561727
+MD5 (gnome2/nautilus-cd-burner-2.10.0.tar.bz2) = eba87e8b043cbd0a94d3371aa869bcf1
+SIZE (gnome2/nautilus-cd-burner-2.10.0.tar.bz2) = 623320
diff --git a/sysutils/nautilus-cd-burner/files/patch-bacon-cd-selection.c b/sysutils/nautilus-cd-burner/files/patch-bacon-cd-selection.c
deleted file mode 100644
index a684ac82a0de..000000000000
--- a/sysutils/nautilus-cd-burner/files/patch-bacon-cd-selection.c
+++ /dev/null
@@ -1,15 +0,0 @@
---- bacon-cd-selection.c.orig	Thu Nov  4 00:25:43 2004
-+++ bacon-cd-selection.c	Thu Nov  4 00:25:57 2004
-@@ -177,10 +177,10 @@
- static void
- bacon_cd_selection_init (BaconCdSelection *bcs)
- {
--	bcs->priv = g_new0 (BaconCdSelectionPrivate, 1);
--  
- 	GtkCellRenderer *cell;
- 	GtkListStore *store;
-+	bcs->priv = g_new0 (BaconCdSelectionPrivate, 1);
-+  
- 
-   store = gtk_list_store_new (1, G_TYPE_STRING);
- 	gtk_combo_box_set_model (GTK_COMBO_BOX (bcs),
diff --git a/sysutils/nautilus-cd-burner/files/patch-make-iso.c b/sysutils/nautilus-cd-burner/files/patch-make-iso.c
deleted file mode 100644
index 87cd0836b813..000000000000
--- a/sysutils/nautilus-cd-burner/files/patch-make-iso.c
+++ /dev/null
@@ -1,18 +0,0 @@
---- make-iso.c.orig	Fri Dec 19 13:06:34 2003
-+++ make-iso.c	Mon Dec 29 16:18:15 2003
-@@ -571,6 +571,7 @@
- 	argv[i++] = "-r";
- 	if (use_joliet) {
- 		argv[i++] = "-J";
-+		argv[i++] = "-joliet-long";
- 	}
- 	argv[i++] = "-q";
- 	argv[i++] = "-graft-points";
-@@ -650,6 +651,7 @@
- 	argv[i++] = "-r";
- 	if (use_joliet) {
- 		argv[i++] = "-J";
-+		argv[i++] = "-joliet-long";
- 	}
- 	argv[i++] = "-graft-points";
- 	argv[i++] = "-path-list";
diff --git a/sysutils/nautilus-cd-burner/files/patch-cd-drive.c b/sysutils/nautilus-cd-burner/files/patch-nautilus-burn-drive.c
index c666b1c2923c..c2299e5721cb 100644
--- a/sysutils/nautilus-cd-burner/files/patch-cd-drive.c
+++ b/sysutils/nautilus-cd-burner/files/patch-nautilus-burn-drive.c
@@ -1,6 +1,29 @@
---- cd-drive.c.orig	Thu Feb 10 14:39:59 2005
-+++ cd-drive.c	Tue Feb 15 03:34:40 2005
-@@ -261,9 +261,21 @@
+--- nautilus-burn-drive.c.orig	Tue Feb 22 19:34:17 2005
++++ nautilus-burn-drive.c	Tue Mar  1 00:46:50 2005
+@@ -62,6 +62,13 @@
+ 
+ #define CD_ROM_SPEED 176
+ 
++#if !defined(__linux)
++static int get_device_max_read_speed (char *device);
++#endif
++#if defined(__linux__) || defined(__FreeBSD__)
++static int get_device_max_write_speed (char *device);
++#endif
++
+ static struct {
+ 	const char *name;
+ 	gboolean can_write_cdr;
+@@ -149,7 +156,7 @@
+ 		   int                   *max_wr_speed,
+ 		   NautilusBurnDriveType *type)
+ {
+-	char *stdout_data, *rd_speed, *wr_speed, *drive_cap;
++	char *stdout_data, *drive_cap;
+ 
+ 	*max_rd_speed = -1;
+ 	*max_wr_speed = -1;
+@@ -278,6 +285,9 @@
  {
  	int fd;
  	int mmc_profile;
@@ -8,12 +31,16 @@
 +	struct cam_device *cam;
 +#endif
  
- 	g_return_val_if_fail (device != NULL, CD_MEDIA_TYPE_ERROR);
+ 	g_return_val_if_fail (device != NULL, NAUTILUS_BURN_MEDIA_TYPE_ERROR);
+ 
+@@ -286,6 +296,15 @@
+ 	if (has_data) *has_data = FALSE;
+ 	if (has_audio) *has_audio = FALSE;
  
 +#ifdef __FreeBSD__
 +	cam = cam_open_device (device, O_RDWR);
 +	if (cam == NULL) {
-+		return CD_MEDIA_TYPE_ERROR;
++		return NAUTILUS_BURN_MEDIA_TYPE_ERROR;
 +	}
 +
 +	fd = cam->fd;
@@ -22,15 +49,45 @@
  	if ((fd = open (device, O_RDWR | O_EXCL | O_NONBLOCK)) < 0
  	    && (fd = open (device, O_RDONLY | O_EXCL | O_NONBLOCK)) < 0) {
  		if (errno == EBUSY) {
-@@ -271,6 +283,7 @@
+@@ -293,6 +312,7 @@
  		}
- 		return CD_MEDIA_TYPE_ERROR;
+ 		return NAUTILUS_BURN_MEDIA_TYPE_ERROR;
  	}
 +#endif
  
  	mmc_profile = get_mmc_profile (fd);
  
-@@ -298,7 +311,11 @@
+@@ -303,12 +323,20 @@
+ 		opened = nautilus_burn_drive_door_open (mmc_profile, fd);
+ 
+ 		if (opened != FALSE) {
++#ifdef __FreeBSD__
++			cam_close_device (cam);
++#else
+ 			close (fd);
++#endif
+ 			return NAUTILUS_BURN_MEDIA_TYPE_ERROR;
+ 		} else {
+ 			int blank, rewrite, empty;
+ 			if (get_disc_status (fd, &empty, &rewrite, &blank) == 0) {
++#ifdef __FreeBSD__
++				cam_close_device (cam);
++#else
+ 				close (fd);
++#endif
+ 
+ 				if (is_rewritable)
+ 					*is_rewritable = rewrite;
+@@ -325,12 +353,20 @@
+ 				else
+ 					return NAUTILUS_BURN_MEDIA_TYPE_UNKNOWN;
+ 			}
++#ifdef __FreeBSD__
++			cam_close_device (cam);
++#else
+ 			close (fd);
++#endif
+ 			return NAUTILUS_BURN_MEDIA_TYPE_UNKNOWN;
  		}
  	}
  
@@ -40,40 +97,40 @@
  	close (fd);
 +#endif
  
- 	switch (mmc_profile) {
- 	case -1:
-@@ -433,10 +450,21 @@
- 	int secs;
- 	int mmc_profile;
+ 	if (is_blank)
+ 		*is_blank = mmc_profile & 0x10000;
+@@ -569,11 +605,21 @@
+ 	int    secs;
+ 	int    mmc_profile;
  	gint64 size;
 +#ifdef __FreeBSD__
 +	struct cam_device *cam;
 +#endif
  
- 	g_return_val_if_fail (device != NULL, CD_MEDIA_SIZE_UNKNOWN);
+ 	g_return_val_if_fail (device != NULL, NAUTILUS_BURN_MEDIA_SIZE_UNKNOWN);
  
  	secs = 0;
 +#ifdef __FreeBSD__
 +	cam = cam_open_device (device, O_RDWR);
 +	if (cam == NULL) {
-+		return CD_MEDIA_SIZE_UNKNOWN;
++		return NAUTILUS_BURN_MEDIA_SIZE_UNKNOWN;
 +	}
-+
+ 
 +	fd = cam->fd;
 +#else
- 
  	if ((fd = open (device, O_RDWR | O_EXCL | O_NONBLOCK)) < 0
  	    && (fd = open (device, O_RDONLY | O_EXCL | O_NONBLOCK)) < 0) {
-@@ -445,6 +473,7 @@
+ 		if (errno == EBUSY) {
+@@ -581,6 +627,7 @@
  		}
- 		return CD_MEDIA_SIZE_UNKNOWN;
+ 		return NAUTILUS_BURN_MEDIA_SIZE_UNKNOWN;
  	}
 +#endif
  
  	mmc_profile = get_mmc_profile (fd);
  
-@@ -467,7 +496,11 @@
- 		size = CD_MEDIA_SIZE_NA;
+@@ -603,7 +650,11 @@
+ 		size = NAUTILUS_BURN_MEDIA_SIZE_NA;
  	}
  
 +#ifdef __FreeBSD__
@@ -84,7 +141,7 @@
  
  	return size;
  }
-@@ -586,9 +619,81 @@
+@@ -896,9 +947,81 @@
  #endif /* USE_HAL */
  
  #if defined(__linux__) || defined(__FreeBSD__)
@@ -113,7 +170,7 @@
 +		return -1;
 +	}
 +#endif
- 
++
 +	get_read_write_speed (fd, &read_speed, &write_speed);
 +#ifdef __FreeBSD__
 +	cam_close_device (cam);
@@ -121,7 +178,7 @@
 +	close (fd);
 +#endif
 +	max_speed = (int)floor  (write_speed) / CD_ROM_SPEED;
- 
++
 +	return max_speed;
 +}
  
@@ -135,23 +192,23 @@
 +#ifdef __FreeBSD__
 +	struct cam_device *cam;
 +#endif
-+
+ 
 +	max_speed = -1;
 +#ifdef __FreeBSD__
 +	cam = cam_open_device (device, O_RDWR);
 +	if (cam == NULL) {
 +		return -1;
 +	}
-+
++ 
 +	fd = cam->fd;
 +#else
-+
++ 
 +	fd = open (device, O_RDWR|O_EXCL|O_NONBLOCK);
 +	if (fd < 0) {
 +		return -1;
 +	}
 +#endif
-+
+ 
 +	get_read_write_speed (fd, &read_speed, &write_speed);
 +#ifdef __FreeBSD__
 +	cam_close_device (cam);
@@ -159,14 +216,14 @@
 +	close (fd);
 +#endif
 +	max_speed = (int)floor  (read_speed) / CD_ROM_SPEED;
-+
++ 
 +	return max_speed;
 +}
 +#endif
  #endif /* __linux__ || __FreeBSD__ */
  
  #if defined (__linux__)
-@@ -791,50 +896,6 @@
+@@ -1111,50 +1234,6 @@
  		}
  	}
  	return NULL;
diff --git a/sysutils/nautilus-cd-burner/files/patch-nautilus-cd-burner.c b/sysutils/nautilus-cd-burner/files/patch-nautilus-cd-burner.c
index 3b8b07293043..c545be7d5513 100644
--- a/sysutils/nautilus-cd-burner/files/patch-nautilus-cd-burner.c
+++ b/sysutils/nautilus-cd-burner/files/patch-nautilus-cd-burner.c
@@ -1,18 +1,18 @@
---- nautilus-cd-burner.c.orig	Sun Sep 19 18:44:15 2004
-+++ nautilus-cd-burner.c	Sun Oct 31 13:06:08 2004
-@@ -21,6 +21,8 @@
-   
-    Authors: Alexander Larsson <alexl@redhat.com>
- */
+--- nautilus-cd-burner.c.orig	Mon Feb 28 19:40:05 2005
++++ nautilus-cd-burner.c	Mon Feb 28 20:05:56 2005
+@@ -23,6 +23,8 @@
+  *          Bastien Nocera <hadess@hadess.net>
+  */
+ 
 +#include <sys/types.h>
 +#include <sys/stat.h>
  #include <gtk/gtk.h>
  #include <gtk/gtkfilesel.h>
  #include <gtk/gtkseparatormenuitem.h>
-@@ -632,8 +634,19 @@
+@@ -843,8 +845,19 @@
  		}
  
- 		if (res == RESULT_RETRY) {
+ 		if (res == NAUTILUS_BURN_RECORDER_RESULT_RETRY) {
 -			g_free (filename);
 -			filename = g_build_filename (g_get_tmp_dir (), "image.iso.XXXXXX", NULL);
 +			gchar *path1;
diff --git a/sysutils/nautilus-cd-burner/pkg-plist b/sysutils/nautilus-cd-burner/pkg-plist
index c73c94fd94d0..3c9bbef70ddb 100644
--- a/sysutils/nautilus-cd-burner/pkg-plist
+++ b/sysutils/nautilus-cd-burner/pkg-plist
@@ -1,12 +1,12 @@
 bin/nautilus-cd-burner
 etc/gnome-vfs-2.0/modules/mapping-modules.conf
-include/libnautilus-burn/bacon-cd-selection.h
-include/libnautilus-burn/cd-drive.h
-include/libnautilus-burn/cd-recorder.h
+include/libnautilus-burn/nautilus-burn-drive-selection.h
+include/libnautilus-burn/nautilus-burn-drive.h
+include/libnautilus-burn/nautilus-burn-recorder.h
 lib/gnome-vfs-2.0/modules/libmapping.so
 lib/libnautilus-burn.a
 lib/libnautilus-burn.so
-lib/libnautilus-burn.so.0
+lib/libnautilus-burn.so.1
 lib/nautilus/extensions-1.0/libnautilus-burn-extension.so
 libdata/pkgconfig/libnautilus-burn.pc
 libexec/mapping-daemon
@@ -53,10 +53,12 @@ share/locale/ja/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/ko/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/lt/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/lv/LC_MESSAGES/nautilus-cd-burner.mo
+share/locale/mk/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/mn/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/nl/LC_MESSAGES/nautilus-cd-burner.mo
+share/locale/nn/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/no/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/or/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/pa/LC_MESSAGES/nautilus-cd-burner.mo
@@ -71,6 +73,7 @@ share/locale/sq/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/sr/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/sr@Latn/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/sv/LC_MESSAGES/nautilus-cd-burner.mo
+share/locale/ta/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/th/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/tr/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/uk/LC_MESSAGES/nautilus-cd-burner.mo