Update to 2.9.4.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@3398 df743ca5-7f9a-e211-a948-0013205c9059

7 files changed, 79 insertions, 72 deletions

diff --git a/sysutils/nautilus-cd-burner/Makefile b/sysutils/nautilus-cd-burner/Makefile
index 653a5429b..7c78219ca 100644
--- a/sysutils/nautilus-cd-burner/Makefile
+++ b/sysutils/nautilus-cd-burner/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	nautilus-cd-burner
-PORTVERSION=	2.8.5
-PORTREVISION=	3
+PORTVERSION=	2.9.4
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.8
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.9
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/sysutils/nautilus-cd-burner/distinfo b/sysutils/nautilus-cd-burner/distinfo
index 6b36ce4a8..97a52cf9b 100644
--- a/sysutils/nautilus-cd-burner/distinfo
+++ b/sysutils/nautilus-cd-burner/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/nautilus-cd-burner-2.8.5.tar.bz2) = 970173a3f93270950ca9fd247bdf07a7
-SIZE (gnome2/nautilus-cd-burner-2.8.5.tar.bz2) = 529099
+MD5 (gnome2/nautilus-cd-burner-2.9.4.tar.bz2) = 72e2ead22e7cfb7fbdd2986d13b0010d
+SIZE (gnome2/nautilus-cd-burner-2.9.4.tar.bz2) = 543931
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 a684ac82a..000000000
--- 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
index 87cd0836b..515cc0104 100644
--- a/sysutils/nautilus-cd-burner/files/patch-make-iso.c
+++ b/sysutils/nautilus-cd-burner/files/patch-make-iso.c
@@ -1,18 +1,18 @@
---- 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";
+--- make-iso.c.orig	Sun Jan  9 06:49:01 2005
++++ make-iso.c	Wed Jan 12 03:11:15 2005
+@@ -631,6 +631,7 @@
+ 	argv [i++] = "-r";
  	if (use_joliet) {
- 		argv[i++] = "-J";
+ 		argv [i++] = "-J";
 +		argv[i++] = "-joliet-long";
  	}
- 	argv[i++] = "-q";
- 	argv[i++] = "-graft-points";
-@@ -650,6 +651,7 @@
- 	argv[i++] = "-r";
+ 	/* Undocumented -input-charset option */
+ 	argv [i++] = "-input-charset";
+@@ -722,6 +723,7 @@
+ 	argv [i++] = "-r";
  	if (use_joliet) {
- 		argv[i++] = "-J";
+ 		argv [i++] = "-J";
 +		argv[i++] = "-joliet-long";
  	}
- 	argv[i++] = "-graft-points";
- 	argv[i++] = "-path-list";
+ 	argv [i++] = "-input-charset";
+ 	argv [i++] = "utf8";
diff --git a/sysutils/nautilus-cd-burner/files/patch-cd-drive.c b/sysutils/nautilus-cd-burner/files/patch-nautilus-burn-drive.c
index 1bcf94f3e..35445a042 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	Wed Sep 22 09:20:04 2004
-+++ cd-drive.c	Mon Oct  4 02:20:47 2004
-@@ -270,9 +270,21 @@
+--- nautilus-burn-drive.c.orig	Sat Jan  8 16:59:57 2005
++++ nautilus-burn-drive.c	Wed Jan 12 03:25:59 2005
+@@ -61,6 +61,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;
+@@ -148,7 +155,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;
+@@ -274,9 +281,21 @@
  {
  	int fd;
  	int mmc_profile;
@@ -8,12 +31,12 @@
 +	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);
  
 +#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 +45,15 @@
  	fd = open (device, O_RDWR|O_EXCL|O_NONBLOCK);
  	if (fd < 0) {
  		if (errno == EBUSY) {
-@@ -280,6 +292,7 @@
+@@ -284,6 +303,7 @@
  		}
- 		return CD_MEDIA_TYPE_ERROR;
+ 		return NAUTILUS_BURN_MEDIA_TYPE_ERROR;
  	}
 +#endif
  
  	mmc_profile = get_mmc_profile (fd);
  
-@@ -307,7 +320,11 @@
+@@ -311,7 +331,11 @@
  		}
  	}
  
@@ -42,21 +65,21 @@
  
  	switch (mmc_profile) {
  	case -1:
-@@ -442,10 +459,21 @@
- 	int secs;
- 	int mmc_profile;
+@@ -481,10 +505,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;
@@ -64,16 +87,16 @@
  
  	fd = open (device, O_RDWR|O_EXCL|O_NONBLOCK);
  	if (fd < 0) {
-@@ -454,6 +482,7 @@
+@@ -493,6 +528,7 @@
  		}
- 		return CD_MEDIA_SIZE_UNKNOWN;
+ 		return NAUTILUS_BURN_MEDIA_SIZE_UNKNOWN;
  	}
 +#endif
  
  	mmc_profile = get_mmc_profile (fd);
  
-@@ -476,7 +505,11 @@
- 		size = CD_MEDIA_SIZE_NA;
+@@ -515,7 +551,11 @@
+ 		size = NAUTILUS_BURN_MEDIA_SIZE_NA;
  	}
  
 +#ifdef __FreeBSD__
@@ -84,7 +107,7 @@
  
  	return size;
  }
-@@ -595,9 +628,81 @@
+@@ -639,9 +679,81 @@
  #endif /* USE_HAL */
  
  #if defined(__linux__) || defined(__FreeBSD__)
@@ -113,7 +136,7 @@
 +		return -1;
 +	}
 +#endif
- 
++
 +	get_read_write_speed (fd, &read_speed, &write_speed);
 +#ifdef __FreeBSD__
 +	cam_close_device (cam);
@@ -121,10 +144,10 @@
 +	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)
@@ -142,10 +165,10 @@
 +	if (cam == NULL) {
 +		return -1;
 +	}
-+
+ 
 +	fd = cam->fd;
 +#else
-+
+ 
 +	fd = open (device, O_RDWR|O_EXCL|O_NONBLOCK);
 +	if (fd < 0) {
 +		return -1;
@@ -159,14 +182,14 @@
 +	close (fd);
 +#endif
 +	max_speed = (int)floor  (read_speed) / CD_ROM_SPEED;
-+
+ 
 +	return max_speed;
 +}
 +#endif
  #endif /* __linux__ || __FreeBSD__ */
  
  #if defined (__linux__)
-@@ -800,49 +905,7 @@
+@@ -853,49 +965,7 @@
  	return NULL;
  }
  
@@ -177,7 +200,7 @@
 -	int fd;
 -	int max_speed;
 -	int read_speed, write_speed;
- 
+-
 -	max_speed = -1;
 -
 -	fd = open (device, O_RDWR|O_EXCL|O_NONBLOCK);
@@ -201,7 +224,7 @@
 -	int read_speed, write_speed;
 -
 -	max_speed = -1;
--
+ 
 -	fd = open (device, O_RDWR|O_EXCL|O_NONBLOCK);
 -	if (fd < 0) {
 -		return -1;
@@ -215,4 +238,4 @@
 -}
  
  static char *
- get_scsi_cd_name (int bus, int id, int lun, const char *dev,
+ get_scsi_cd_name (int               bus,
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 3b8b07293..ed8ab1366 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 Jan 10 16:38:54 2005
++++ nautilus-cd-burner.c	Wed Jan 12 03:20:29 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 @@
+@@ -720,8 +722,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 c73c94fd9..3033b2292 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