Index: head/sysutils/nautilus-cd-burner/Makefile
===================================================================
--- head/sysutils/nautilus-cd-burner/Makefile	(revision 205092)
+++ head/sysutils/nautilus-cd-burner/Makefile	(revision 205093)
@@ -1,63 +1,64 @@
 # New ports collection makefile for:	nautilus-cd-burner
 # Date created:				13 April 2003
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
 #   $MCom: ports/sysutils/nautilus-cd-burner/Makefile,v 1.134 2007/09/18 00:44:04 marcus Exp $
 #
 
 PORTNAME=	nautilus-cd-burner
 PORTVERSION=	2.20.0
+PORTREVISION=	1
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	CD burner view for Nautilus
 
 RUN_DEPENDS=	cdrdao:${PORTSDIR}/sysutils/cdrdao
 
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
 USE_XLIB=	yes
 USE_GMAKE=	yes
 GNOME_DESKTOP_VERSION=2
 USE_GNOME=	gnomeprefix gnomehack intlhack nautilus2 ltverhack \
 		desktopfileutils
 USE_CDRTOOLS=	yes
 INSTALLS_ICONS=	yes
 USE_AUTOTOOLS=	libtool:15
 USE_LDCONFIG=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
 GCONF_SCHEMAS=	nautilus-cd-burner.schemas
 
 OPTIONS=	DVD "Enable DVD support" on \
 		CJK "Use cdrtools-cjk instead of cdrtools" off \
 		GNOMEMOUNT "Enable sysutils/gnome-mount support" off
 
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_CJK)
 WITHOUT_DVD=	yes
 .endif
 
 .if !defined(WITHOUT_DVD)
 RUN_DEPENDS+=	growisofs:${PORTSDIR}/sysutils/dvd+rw-tools
 .endif
 
 .if defined(WITH_GNOMEMOUNT)
 BUILD_DEPENDS+=	gnome-mount:${PORTSDIR}/sysutils/gnome-mount
 RUN_DEPENDS+=	gnome-mount:${PORTSDIR}/sysutils/gnome-mount
 CONFIGURE_ARGS+=	--enable-gnome-mount
 .else
 CONFIGURE_ARGS+=	--disable-gnome-mount
 .endif
 
 post-install:
 	-@update-desktop-database
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>

Property changes on: head/sysutils/nautilus-cd-burner/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.43
\ No newline at end of property
+1.44
\ No newline at end of property
Index: head/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive-monitor.c
===================================================================
--- head/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive-monitor.c	(revision 205092)
+++ head/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive-monitor.c	(revision 205093)
@@ -1,38 +1,48 @@
---- src/nautilus-burn-drive-monitor.c.orig	Fri Sep 29 14:18:23 2006
-+++ src/nautilus-burn-drive-monitor.c	Sun Nov 19 13:28:16 2006
-@@ -683,6 +683,8 @@ hal_drive_from_udi (LibHalContext *ctx,
+--- src/nautilus-burn-drive-monitor.c.orig	2007-07-10 15:06:23.000000000 -0400
++++ src/nautilus-burn-drive-monitor.c	2008-01-05 13:51:44.000000000 -0500
+@@ -618,7 +618,8 @@ nautilus_burn_drive_monitor_get_drive_fo
+ 		 */
+ 		if (drive->priv->device != NULL &&
+ 		   (strcmp (drive->priv->device, target) == 0 ||
+-                    strcmp (drive->priv->device, device) == 0)) {
++                    strcmp (drive->priv->device, device) == 0 ||
++                    strcmp (drive->priv->cdrecord_device, device) == 0)) {
+ 			ret = nautilus_burn_drive_ref (drive);
+ 			break;
+ 		}
+@@ -683,6 +684,8 @@ hal_drive_from_udi (LibHalContext *ctx,
  	NautilusBurnDrive        *drive;
  	char                    **write_speeds = NULL;
  	char                     *raw_device = NULL;
 +	char                     *cam_path = NULL;
 +	char                     *cam_device = NULL;
  
  	LIBHAL_CHECK_LIBHALCONTEXT (ctx, FALSE);
  
-@@ -711,6 +713,8 @@ hal_drive_from_udi (LibHalContext *ctx,
+@@ -711,6 +714,8 @@ hal_drive_from_udi (LibHalContext *ctx,
  
  		LIBHAL_PROP_EXTRACT_STRING  ("block.device",               drive->priv->device);
  		LIBHAL_PROP_EXTRACT_STRING  ("block.solaris.raw_device",   raw_device);
-+		LIBHAL_PROP_EXTRACT_STRING ("block.freebsd.atapi_cam_device", cam_device);
++		LIBHAL_PROP_EXTRACT_STRING  ("block.freebsd.atapi_cam_device", cam_device);
 +		LIBHAL_PROP_EXTRACT_STRING  ("block.freebsd.cam_path",     cam_path);
  		LIBHAL_PROP_EXTRACT_STRING  ("storage.model",              drive->priv->display_name);
  
  		LIBHAL_PROP_EXTRACT_INT ("storage.cdrom.read_speed",   drive->priv->max_speed_read);
-@@ -734,6 +738,17 @@ hal_drive_from_udi (LibHalContext *ctx,
- 	if (raw_device != NULL) {
- 		g_free (drive->priv->device);
+@@ -736,6 +741,17 @@ hal_drive_from_udi (LibHalContext *ctx,
  		drive->priv->device = raw_device;
-+	}
-+
+ 	}
+ 
 +	if (cam_device != NULL) {
 +		g_free (drive->priv->device);
 +		drive->priv->device = cam_device;
 +	}
 +
 +	if (cam_path != NULL) {
 +		drive->priv->cdrecord_device = cam_path;
 +	} else {
 +		drive->priv->cdrecord_device = g_strdup (drive->priv->device);
- 	}
- 
++	}
++
  	drive->priv->drive_udi = g_strdup (udi);
+ 	drive->priv->write_speeds = hal_parse_write_speeds (write_speeds);
+ 	/* we do not own write_speeds so do not free it. */

Property changes on: head/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive-monitor.c
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.2
\ No newline at end of property
+1.3
\ No newline at end of property