Use nautilus-cd-burner to eject cd's instead of cdcontrol/eject. n-c-b

currently uses cdcontrol as its default method of ejecting cd's. However
with WITH_GNOMEMOUNT defined it will use gnome-mount (the preferred way since
it umounts then ejects the cd instead of just ejecting).

code based around the way sound-juicer handles ejecting cd's.


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

3 files changed, 55 insertions, 13 deletions

diff --git a/sysutils/gnome-control-center/Makefile b/sysutils/gnome-control-center/Makefile
index 27540f6b3..7ba778b56 100644
--- a/sysutils/gnome-control-center/Makefile
+++ b/sysutils/gnome-control-center/Makefile
@@ -3,12 +3,12 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/sysutils/gnome-control-center/Makefile,v 1.157 2007/10/15 17:48:45 mezz Exp $
+#   $MCom: ports/sysutils/gnome-control-center/Makefile,v 1.159 2007/10/29 12:28:45 ahze Exp $
 #
 
 PORTNAME=	gnome-control-center
 PORTVERSION=	2.20.1
-PORTREVISION=	2
+PORTREVISION=	4
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -26,7 +26,7 @@ USE_GMAKE=	yes
 GNOME_DESKTOP_VERSION=2
 USE_GSTREAMER=	good
 WANT_GNOME=	yes
-USE_GNOME=	gnomeprefix gnomehack intlhack metacity nautilus2 \
+USE_GNOME=	gnomeprefix gnomehack intlhack metacity nautiluscdburner \
 		gnomemenus desktopfileutils libgnomekbd gnomepanel
 GNU_CONFIGURE=	yes
 INSTALLS_OMF=	yes
@@ -35,6 +35,8 @@ USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--enable-gstreamer=0.10
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
+MAKE_ENV=	LIBNAUTILUSBURN_CFLAGS="`pkg-config --cflags libnautilus-burn`" \
+		LIBNAUTILUSBURN_LIBS="`pkg-config --libs libnautilus-burn`"
 
 GCONF_SCHEMAS=	apps_gnome_settings_daemon_default_editor.schemas \
 		apps_gnome_settings_daemon_keybindings.schemas \
diff --git a/sysutils/gnome-control-center/files/patch-gnome-settings-daemon_Makefile.in b/sysutils/gnome-control-center/files/patch-gnome-settings-daemon_Makefile.in
new file mode 100644
index 000000000..7b034d3be
--- /dev/null
+++ b/sysutils/gnome-control-center/files/patch-gnome-settings-daemon_Makefile.in
@@ -0,0 +1,18 @@
+--- gnome-settings-daemon/Makefile.in.orig	2007-10-30 20:03:01.428369527 -0400
++++ gnome-settings-daemon/Makefile.in	2007-10-30 20:05:12.563808528 -0400
+@@ -375,6 +375,7 @@
+ SUBDIRS = xrdb actions
+ INCLUDES = \
+ 	$(DBUS_CFLAGS)					\
++	$(LIBNAUTILUSBURN_CFLAGS)			\
+ 	$(LIBGNOMEKBD_CFLAGS)				\
+ 	$(GNOME_SETTINGS_DAEMON_CFLAGS)			\
+ 	$(FB_CFLAGS)					\
+@@ -411,6 +412,7 @@
+ #	$(AccessX_files)		
+ gnome_settings_daemon_LDADD = \
+ 	$(DBUS_LIBS)						\
++	$(LIBNAUTILUSBURN_LIBS)					\
+ 	$(LIBGNOMEKBD_LIBS)						\
+ 	$(top_builddir)/libbackground/libbackground.la			\
+ 	$(top_builddir)/libsounds/libsounds.a				\
diff --git a/sysutils/gnome-control-center/files/patch-gnome-settings-daemon_gnome-settings-multimedia-keys.c b/sysutils/gnome-control-center/files/patch-gnome-settings-daemon_gnome-settings-multimedia-keys.c
index 2664fcf8e..89ab3f5f5 100644
--- a/sysutils/gnome-control-center/files/patch-gnome-settings-daemon_gnome-settings-multimedia-keys.c
+++ b/sysutils/gnome-control-center/files/patch-gnome-settings-daemon_gnome-settings-multimedia-keys.c
@@ -1,19 +1,41 @@
 --- gnome-settings-daemon/gnome-settings-multimedia-keys.c.orig	2007-09-18 05:32:43.000000000 -0400
-+++ gnome-settings-daemon/gnome-settings-multimedia-keys.c	2007-10-28 13:45:28.000000000 -0400
-@@ -610,8 +610,11 @@
++++ gnome-settings-daemon/gnome-settings-multimedia-keys.c	2007-10-31 16:01:14.953632933 -0400
+@@ -31,6 +31,7 @@
+ #include <glib/gi18n.h>
+ #include <gdk/gdkx.h>
+ #include <gtk/gtk.h>
++#include <nautilus-burn.h>
+ 
+ #include "eggaccelerators.h"
+ 
+@@ -609,9 +610,24 @@
+ 					   GCONF_MISC_DIR "/eject_command", NULL);
  	if ((command != NULL) && (strcmp (command, "") != 0))
  		execute (acme, command, FALSE, FALSE);
- 	else
-+#if __FreeBSD__
-+		execute (acme, "cdcontrol eject", FALSE, FALSE);
-+#else
- 		execute (acme, "eject -T", FALSE, FALSE);
--
-+#endif
+-	else
+-		execute (acme, "eject -T", FALSE, FALSE);
++	else {
++		g_type_init ();
++		nautilus_burn_init ();
++		GList *drives, *drivelist;
++		NautilusBurnDriveMonitor *monitor;
++
++		monitor = nautilus_burn_get_drive_monitor ();
++		drives = nautilus_burn_drive_monitor_get_drives (monitor);
++
++		for (drivelist = drives; drivelist != NULL; drivelist = drivelist->next) {
++			NautilusBurnDrive *drive;
++			drive = drivelist->data;
+ 
++			nautilus_burn_drive_eject (drive);
++		}
++        	nautilus_burn_shutdown ();
++	}
++		
  	g_free (command);
  }
  
-@@ -708,7 +711,7 @@
+@@ -708,7 +724,7 @@
  		do_mail_action (acme);
  		break;
  	case SLEEP_KEY: