- Update to 2.15.1

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

4 files changed, 101 insertions, 0 deletions

diff --git a/sysutils/nautilus-cd-burner/files/patch-configure b/sysutils/nautilus-cd-burner/files/patch-configure
new file mode 100644
index 000000000..e8dbb4a5b
--- /dev/null
+++ b/sysutils/nautilus-cd-burner/files/patch-configure
@@ -0,0 +1,27 @@
+--- configure.orig	Thu Jul 22 10:27:35 2004
++++ configure	Thu Jul 22 10:29:32 2004
+@@ -21015,6 +21015,8 @@
+ if eval "test \"\${$as_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
++  ac_check_lib_save_LIBS=$LIBS
++  LIBS="-lintl $LIBS"
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -21097,6 +21099,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
++      LIBS=$ac_check_lib_save_LIBS
+ fi
+ echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+@@ -21104,6 +21107,7 @@
+   cat >>confdefs.h <<_ACEOF
+ #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
++LIBS="-lintl $LIBS"
+ 
+ fi
+ done
diff --git a/sysutils/nautilus-cd-burner/files/patch-mapping-protocol.c b/sysutils/nautilus-cd-burner/files/patch-mapping-protocol.c
new file mode 100644
index 000000000..aab64aa8a
--- /dev/null
+++ b/sysutils/nautilus-cd-burner/files/patch-mapping-protocol.c
@@ -0,0 +1,11 @@
+--- mapping-protocol.c.orig	Tue May 17 17:14:35 2005
++++ mapping-protocol.c	Tue May 17 17:15:24 2005
+@@ -24,6 +24,8 @@
+  *          William Jon McCann <mccann@jhu.edu>
+  */
+ 
++#include <sys/types.h>
++#include <sys/time.h>
+ #include <unistd.h>
+ #include <string.h>
+ #include <fcntl.h>
diff --git a/sysutils/nautilus-cd-burner/files/patch-nautilus-burn-drive.c b/sysutils/nautilus-cd-burner/files/patch-nautilus-burn-drive.c
new file mode 100644
index 000000000..e836eb982
--- /dev/null
+++ b/sysutils/nautilus-cd-burner/files/patch-nautilus-burn-drive.c
@@ -0,0 +1,30 @@
+--- nautilus-burn-drive.c.orig	Tue Aug 23 11:55:56 2005
++++ nautilus-burn-drive.c	Sat Sep 10 20:32:26 2005
+@@ -471,7 +471,6 @@ get_disc_type (const char *dev_path)
+ 	struct cd_toc_entry              entry;
+ 	int                              i;
+ #endif
+-	int                              type;
+ #ifndef CDROM_DATA_TRACK
+ #define CDROM_DATA_TRACK 4
+ #endif
+@@ -483,6 +482,10 @@ get_disc_type (const char *dev_path)
+ 
+ 	if (ioctl (fd, CDIOREADTOCHEADER, &header) < 0) {
+ 		close (fd);
++		if (errno == EINVAL)
++			/* If you try to read the TOC header of a blank disc
++			 * on FreeBSD, you get EINVAL. */
++			return CDS_NO_INFO;
+ 	    	return -1;
+ 	}
+ 
+@@ -649,7 +652,7 @@ nautilus_burn_drive_get_media_type_from_
+ 		*is_blank = mmc_profile & 0x10000;
+ 
+ 	disc_type = get_disc_type (device);
+-	disc_type_get_info (disc_type, is_blank, has_data, has_audio);
++	disc_type_get_info (disc_type, NULL, has_data, has_audio);
+ 
+ 	switch (mmc_profile & 0xFFFF) {
+ 	case -1:
diff --git a/sysutils/nautilus-cd-burner/files/patch-nautilus-cd-burner.c b/sysutils/nautilus-cd-burner/files/patch-nautilus-cd-burner.c
new file mode 100644
index 000000000..9d286fda0
--- /dev/null
+++ b/sysutils/nautilus-cd-burner/files/patch-nautilus-cd-burner.c
@@ -0,0 +1,33 @@
+--- nautilus-cd-burner.c.orig	Wed May 11 18:56:59 2005
++++ nautilus-cd-burner.c	Tue May 17 17:11:49 2005
+@@ -25,6 +25,8 @@
+  *          William Jon McCann <mccann@jhu.edu>
+  */
+ 
++#include <sys/types.h>
++#include <sys/stat.h>
+ #include <time.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+@@ -1103,10 +1105,20 @@ burn_cd (const NautilusBurnDrive *drive,
+ 		}
+ 
+ 		if (res == NAUTILUS_BURN_RECORDER_RESULT_RETRY) {
++			gchar *path1;
++
++			path1 = g_strdup_printf ("%s/.ncb", g_get_home_dir());
++
++			if (!g_file_test (path1, G_FILE_TEST_EXISTS)) {
++				mkdir (path1, 0700);
++			}
++
+ 			g_free (toc_filename);
+ 			g_free (filename);
+ 
+-			filename = g_build_filename (g_get_tmp_dir (), "image.iso.XXXXXX", NULL);
++			filename = g_build_filename (path1, "image.iso.XXXXXX", NULL);
++			g_free (path1);
++
+ 			fd = g_mkstemp (filename);
+ 			close (fd);
+