Update to 2.9.4. HALT_COMMAND and REBOOT_COMMAND are now passed as part

of MAKE_ENV.


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

2 files changed, 0 insertions, 50 deletions

diff --git a/x11/gnome-session/files/patch-gnome-session_logout.c b/x11/gnome-session/files/patch-gnome-session_logout.c
deleted file mode 100644
index f82aefdc7..000000000
--- a/x11/gnome-session/files/patch-gnome-session_logout.c
+++ /dev/null
@@ -1,36 +0,0 @@
---- gnome-session/logout.c.orig	Sun May  9 15:45:34 2004
-+++ gnome-session/logout.c	Sun May  9 15:48:29 2004
-@@ -37,12 +37,20 @@
- 
- static gchar *halt_command[] =
- {
-+#ifdef __FreeBSD__
-+  HALT_COMMAND, "-p", "now", NULL
-+#else
-   HALT_COMMAND, NULL
-+#endif
- };
- 
- static gchar *reboot_command[] =
- {
-+#ifdef __FreeBSD__
-+  REBOOT_COMMAND, "-r", "now", NULL
-+#else
-   REBOOT_COMMAND, NULL
-+#endif
- };
- 
- /* What action to take upon shutdown */
-@@ -401,8 +409,12 @@
-    */
-   s = g_strconcat ("/var/lock/console/", g_get_user_name (), NULL);
-   t = g_strconcat ("/var/run/console/", g_get_user_name (), NULL);
-+#ifndef __FreeBSD__
-   if (((geteuid () == 0) || g_file_exists (t) || g_file_exists(s)) &&
-       access (halt_command[0], X_OK) == 0)
-+#else
-+  if (access (halt_command[0], X_OK) == 0)
-+#endif
-     {
-       GtkWidget *title, *spacer;
-       GtkWidget *action_vbox, *hbox;
diff --git a/x11/gnome-session/files/patch-gnome-session_manager.c b/x11/gnome-session/files/patch-gnome-session_manager.c
deleted file mode 100644
index 7e56843ac..000000000
--- a/x11/gnome-session/files/patch-gnome-session_manager.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- gnome-session/manager.c.orig	Tue Oct 12 14:04:26 2004
-+++ gnome-session/manager.c	Tue Oct 12 14:05:51 2004
-@@ -1042,9 +1042,10 @@
- 
-       if (interact_ping_replied)
- 	{
-+	  IceConn ice_conn;
- 	  gsm_verbose ("have interact_list; sending ping with data to client %p\n", client);
- 	  print_client (client);
--	  IceConn ice_conn = SmsGetIceConnection (client->connection);
-+	  ice_conn = SmsGetIceConnection (client->connection);
- 	  interact_ping_replied = FALSE;
- 	  IcePing (ice_conn, interact_ping_reply, (IcePointer)client);
- 	}