Update to 2.11.7.

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

3 files changed, 19 insertions, 60 deletions

diff --git a/sysutils/nautilus-cd-burner/Makefile b/sysutils/nautilus-cd-burner/Makefile
index aaaf94775..16376a766 100644
--- a/sysutils/nautilus-cd-burner/Makefile
+++ b/sysutils/nautilus-cd-burner/Makefile
@@ -3,12 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/sysutils/nautilus-cd-burner/Makefile,v 1.71 2005/08/09 23:46:44 marcus Exp $
+#   $MCom: ports/sysutils/nautilus-cd-burner/Makefile,v 1.72 2005/08/10 03:00:16 marcus Exp $
 #
 
 PORTNAME=	nautilus-cd-burner
-PORTVERSION=	2.11.6
-PORTREVISION=	2
+PORTVERSION=	2.11.7
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.11
diff --git a/sysutils/nautilus-cd-burner/distinfo b/sysutils/nautilus-cd-burner/distinfo
index d7708f011..afed563ce 100644
--- a/sysutils/nautilus-cd-burner/distinfo
+++ b/sysutils/nautilus-cd-burner/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/nautilus-cd-burner-2.11.6.tar.bz2) = ad4c124980d740c709acf631007c01e9
-SIZE (gnome2/nautilus-cd-burner-2.11.6.tar.bz2) = 602641
+MD5 (gnome2/nautilus-cd-burner-2.11.7.tar.bz2) = 3874a54b177cea400bb6c8a089c71e31
+SIZE (gnome2/nautilus-cd-burner-2.11.7.tar.bz2) = 607499
diff --git a/sysutils/nautilus-cd-burner/files/patch-nautilus-burn-drive.c b/sysutils/nautilus-cd-burner/files/patch-nautilus-burn-drive.c
index 4568f6bb9..adfb54b1c 100644
--- a/sysutils/nautilus-cd-burner/files/patch-nautilus-burn-drive.c
+++ b/sysutils/nautilus-cd-burner/files/patch-nautilus-burn-drive.c
@@ -1,59 +1,19 @@
---- nautilus-burn-drive.c.orig	Thu Aug  4 16:23:24 2005
-+++ nautilus-burn-drive.c	Tue Aug  9 22:56:36 2005
-@@ -48,6 +48,14 @@
- #include <sys/cdio.h>
- #include <sys/cdrio.h>
- #include <camlib.h>
-+#define CDS_DISC_OK 0
-+#define CDS_AUDIO   100
-+#define CDS_DATA_1  101
-+#define CDS_DATA_2  102
-+#define CDS_MIXED   105
-+#define CDS_NO_INFO -1
-+#define CDS_XA_2_1  103
-+#define CDS_XA_2_2  104
- #endif /* __FreeBSD__ */
- 
- #ifdef HAVE_SYS_CDIO_H
-@@ -470,11 +478,12 @@ get_disc_type (const char *dev_path)
- 
- 	fd = open (dev_path, O_RDONLY|O_NONBLOCK);
- 	if (fd < 0) {
--	    	return -1;
-+	    	return CDS_NO_INFO;
+--- nautilus-burn-drive.c.orig	Mon Aug 22 18:58:32 2005
++++ nautilus-burn-drive.c	Mon Aug 22 20:20:06 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
+@@ -481,7 +480,7 @@ get_disc_type (const char *dev_path)
+ 	    	return -1;
  	}
  
 -	if (ioctl (fd, CDIOREADTOCHEADER, &header) == 0) {
--	    	return -1;
-+	if (ioctl (fd, CDIOREADTOCHEADER, &header) != CDS_DISC_OK) {
-+		close (fd);
-+	    	return CDS_NO_INFO;
- 	}
- 
- 	type = CDS_DATA_1;
-@@ -484,7 +493,7 @@ get_disc_type (const char *dev_path)
- 		entry.track++) {
- 	    	entry.address_format = CD_LBA_FORMAT;
- 		if (ioctl (fd, CDIOREADTOCENTRY, &entry) == 0) {
--		    	if (entry.entry.control & CDROM_DATA_TRACK) {
-+		    	if (!(entry.entry.control & CDROM_DATA_TRACK)) {
- 			    	type = CDS_AUDIO;
- 				break;
- 			}
-@@ -506,6 +515,7 @@ get_disc_type (const char *dev_path)
++	if (ioctl (fd, CDIOREADTOCHEADER, &header) != 0) {
+ 		close (fd);
+ 	    	return -1;
  	}
- 
- #endif /* defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)*/
-+	close (fd);
- 	return type;
- #elif defined(__linux__)
- 	fd = open (dev_path, O_RDONLY|O_NONBLOCK);
-@@ -627,8 +637,6 @@ nautilus_burn_drive_get_media_type_from_
- 
- 			return NAUTILUS_BURN_MEDIA_TYPE_UNKNOWN;
- 		}
--	} else {
--		g_warning ("Could not read MMC profile of %s", device);
- 	}
- 
- 	close_ioctl_handle (ioctl_handle);