Update to 2.10.1, now with FreeBSD support included! Please test this!

4 files changed, 5 insertions, 279 deletions

diff --git a/sysutils/nautilus-cd-burner/Makefile b/sysutils/nautilus-cd-burner/Makefile
index 88badb5387fe..123f6dfd7cad 100644
--- a/sysutils/nautilus-cd-burner/Makefile
+++ b/sysutils/nautilus-cd-burner/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	nautilus-cd-burner
-PORTVERSION=	2.10.0
+PORTVERSION=	2.10.1
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.10
diff --git a/sysutils/nautilus-cd-burner/distinfo b/sysutils/nautilus-cd-burner/distinfo
index 960dd8c03871..85a29cb38c8e 100644
--- a/sysutils/nautilus-cd-burner/distinfo
+++ b/sysutils/nautilus-cd-burner/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/nautilus-cd-burner-2.10.0.tar.bz2) = eba87e8b043cbd0a94d3371aa869bcf1
-SIZE (gnome2/nautilus-cd-burner-2.10.0.tar.bz2) = 623320
+MD5 (gnome2/nautilus-cd-burner-2.10.1.tar.bz2) = ce2b3bd588ca77190976e2487badc17d
+SIZE (gnome2/nautilus-cd-burner-2.10.1.tar.bz2) = 515526
diff --git a/sysutils/nautilus-cd-burner/files/patch-nautilus-burn-drive.c b/sysutils/nautilus-cd-burner/files/patch-nautilus-burn-drive.c
deleted file mode 100644
index c2299e5721cb..000000000000
--- a/sysutils/nautilus-cd-burner/files/patch-nautilus-burn-drive.c
+++ /dev/null
@@ -1,276 +0,0 @@
---- 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;
-+#ifdef __FreeBSD__
-+	struct cam_device *cam;
-+#endif
- 
- 	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 NAUTILUS_BURN_MEDIA_TYPE_ERROR;
-+	}
-+
-+	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) {
- 		if (errno == EBUSY) {
-@@ -293,6 +312,7 @@
- 		}
- 		return NAUTILUS_BURN_MEDIA_TYPE_ERROR;
- 	}
-+#endif
- 
- 	mmc_profile = get_mmc_profile (fd);
- 
-@@ -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;
- 		}
- 	}
- 
-+#ifdef __FreeBSD__
-+	cam_close_device (cam);
-+#else
- 	close (fd);
-+#endif
- 
- 	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, NAUTILUS_BURN_MEDIA_SIZE_UNKNOWN);
- 
- 	secs = 0;
-+#ifdef __FreeBSD__
-+	cam = cam_open_device (device, O_RDWR);
-+	if (cam == NULL) {
-+		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) {
- 		if (errno == EBUSY) {
-@@ -581,6 +627,7 @@
- 		}
- 		return NAUTILUS_BURN_MEDIA_SIZE_UNKNOWN;
- 	}
-+#endif
- 
- 	mmc_profile = get_mmc_profile (fd);
- 
-@@ -603,7 +650,11 @@
- 		size = NAUTILUS_BURN_MEDIA_SIZE_NA;
- 	}
- 
-+#ifdef __FreeBSD__
-+	cam_close_device (cam);
-+#else
- 	close (fd);
-+#endif
- 
- 	return size;
- }
-@@ -896,9 +947,81 @@
- #endif /* USE_HAL */
- 
- #if defined(__linux__) || defined(__FreeBSD__)
-+static int
-+get_device_max_write_speed (char *device)
-+{
-+	int fd;
-+	int max_speed;
-+	int read_speed, write_speed;
-+#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);
-+#else
-+	close (fd);
-+#endif
-+	max_speed = (int)floor  (write_speed) / CD_ROM_SPEED;
-+
-+	return max_speed;
-+}
- 
-+#if !defined(__linux)
-+static int
-+get_device_max_read_speed (char *device)
-+{
-+	int fd;
-+	int max_speed;
-+	int read_speed, write_speed;
-+#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);
-+#else
-+	close (fd);
-+#endif
-+	max_speed = (int)floor  (read_speed) / CD_ROM_SPEED;
-+ 
-+	return max_speed;
-+}
-+#endif
- #endif /* __linux__ || __FreeBSD__ */
- 
- #if defined (__linux__)
-@@ -1111,50 +1234,6 @@
- 		}
- 	}
- 	return NULL;
--}
--
--#if !defined(__linux)
--static int
--get_device_max_read_speed (char *device)
--{
--	int fd;
--	int max_speed;
--	int read_speed, write_speed;
--
--	max_speed = -1;
--
--	if ((fd = open (device, O_RDWR | O_EXCL | O_NONBLOCK)) < 0
--	    && (fd = open (device, O_RDONLY | O_EXCL | O_NONBLOCK)) < 0) {
--		return -1;
--	}
--
--	get_read_write_speed (fd, &read_speed, &write_speed);
--	close (fd);
--	max_speed = (int)floor  (read_speed) / CD_ROM_SPEED;
--
--	return max_speed;
--}
--#endif
--
--static int
--get_device_max_write_speed (char *device)
--{
--	int fd;
--	int max_speed;
--	int read_speed, write_speed;
--
--	max_speed = -1;
--
--	if ((fd = open (device, O_RDWR | O_EXCL | O_NONBLOCK)) < 0
--	    && (fd = open (device, O_RDONLY | O_EXCL | O_NONBLOCK)) < 0) {
--		return -1;
--	}
--
--	get_read_write_speed (fd, &read_speed, &write_speed);
--	close (fd);
--	max_speed = (int)floor  (write_speed) / CD_ROM_SPEED;
--
--	return max_speed;
- }
- 
- static char *
diff --git a/sysutils/nautilus-cd-burner/pkg-plist b/sysutils/nautilus-cd-burner/pkg-plist
index 3c9bbef70ddb..93541a1e419c 100644
--- a/sysutils/nautilus-cd-burner/pkg-plist
+++ b/sysutils/nautilus-cd-burner/pkg-plist
@@ -67,6 +67,7 @@ share/locale/pt/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/pt_BR/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/ro/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/ru/LC_MESSAGES/nautilus-cd-burner.mo
+share/locale/rw/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/sk/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/sl/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/sq/LC_MESSAGES/nautilus-cd-burner.mo
@@ -78,6 +79,7 @@ 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
 share/locale/vi/LC_MESSAGES/nautilus-cd-burner.mo
+share/locale/xh/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/zh_CN/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/zh_TW/LC_MESSAGES/nautilus-cd-burner.mo
 @dirrm share/gnome/nautilus-cd-burner