From 1d34802093700c42832f703886327a29d5a59898 Mon Sep 17 00:00:00 2001 From: adamw Date: Tue, 11 Jan 2005 16:06:05 +0000 Subject: 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 --- x11/gnome-session/Makefile | 4 ++- x11/gnome-session/distinfo | 4 +-- .../files/patch-gnome-session_logout.c | 36 ---------------------- .../files/patch-gnome-session_manager.c | 14 --------- x11/gnome-session/pkg-plist | 1 + x11/gnomesession/Makefile | 4 ++- x11/gnomesession/distinfo | 4 +-- .../files/patch-gnome-session_logout.c | 36 ---------------------- .../files/patch-gnome-session_manager.c | 14 --------- x11/gnomesession/pkg-plist | 1 + 10 files changed, 12 insertions(+), 106 deletions(-) delete mode 100644 x11/gnome-session/files/patch-gnome-session_logout.c delete mode 100644 x11/gnome-session/files/patch-gnome-session_manager.c delete mode 100644 x11/gnomesession/files/patch-gnome-session_logout.c delete mode 100644 x11/gnomesession/files/patch-gnome-session_manager.c (limited to 'x11') diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile index 27f77eb43..2533573bf 100644 --- a/x11/gnome-session/Makefile +++ b/x11/gnome-session/Makefile @@ -6,7 +6,7 @@ # PORTNAME= gnomesession -PORTVERSION= 2.9.2 +PORTVERSION= 2.9.4 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} \ http://people.FreeBSD.org/~marcus/:local \ @@ -31,6 +31,8 @@ CONFIGURE_ARGS= --with-halt-command=/sbin/shutdown \ --with-reboot-command=/sbin/shutdown CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" +MAKE_ENV+= HALT_COMMAND="/sbin/halt -p" \ + REBOOT_COMMAND="/sbin/reboot" MAN1= gnome-session.1 gnome-smproxy.1 gnome-wm.1 \ session-properties.1 gnome-session-save.1 diff --git a/x11/gnome-session/distinfo b/x11/gnome-session/distinfo index 5521724eb..441bf5285 100644 --- a/x11/gnome-session/distinfo +++ b/x11/gnome-session/distinfo @@ -1,4 +1,4 @@ -MD5 (gnome2/gnome-session-2.9.2.tar.bz2) = 1f604cf52e909ab3dfe92696d0ce65c6 -SIZE (gnome2/gnome-session-2.9.2.tar.bz2) = 889496 +MD5 (gnome2/gnome-session-2.9.4.tar.bz2) = 85077a3dc14ce353bda22408f78e92c3 +SIZE (gnome2/gnome-session-2.9.4.tar.bz2) = 901242 MD5 (gnome2/gnome-splash28.png) = 2ac880af4ca6929a82f8b64912b95a55 SIZE (gnome2/gnome-splash28.png) = 121715 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); - } diff --git a/x11/gnome-session/pkg-plist b/x11/gnome-session/pkg-plist index 5b5e5681f..9057b1397 100644 --- a/x11/gnome-session/pkg-plist +++ b/x11/gnome-session/pkg-plist @@ -79,3 +79,4 @@ share/locale/vi/LC_MESSAGES/gnome-session-2.0.mo share/locale/wa/LC_MESSAGES/gnome-session-2.0.mo share/locale/zh_CN/LC_MESSAGES/gnome-session-2.0.mo share/locale/zh_TW/LC_MESSAGES/gnome-session-2.0.mo +share/locale/zu/LC_MESSAGES/gnome-session-2.0.mo diff --git a/x11/gnomesession/Makefile b/x11/gnomesession/Makefile index 27f77eb43..2533573bf 100644 --- a/x11/gnomesession/Makefile +++ b/x11/gnomesession/Makefile @@ -6,7 +6,7 @@ # PORTNAME= gnomesession -PORTVERSION= 2.9.2 +PORTVERSION= 2.9.4 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} \ http://people.FreeBSD.org/~marcus/:local \ @@ -31,6 +31,8 @@ CONFIGURE_ARGS= --with-halt-command=/sbin/shutdown \ --with-reboot-command=/sbin/shutdown CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" +MAKE_ENV+= HALT_COMMAND="/sbin/halt -p" \ + REBOOT_COMMAND="/sbin/reboot" MAN1= gnome-session.1 gnome-smproxy.1 gnome-wm.1 \ session-properties.1 gnome-session-save.1 diff --git a/x11/gnomesession/distinfo b/x11/gnomesession/distinfo index 5521724eb..441bf5285 100644 --- a/x11/gnomesession/distinfo +++ b/x11/gnomesession/distinfo @@ -1,4 +1,4 @@ -MD5 (gnome2/gnome-session-2.9.2.tar.bz2) = 1f604cf52e909ab3dfe92696d0ce65c6 -SIZE (gnome2/gnome-session-2.9.2.tar.bz2) = 889496 +MD5 (gnome2/gnome-session-2.9.4.tar.bz2) = 85077a3dc14ce353bda22408f78e92c3 +SIZE (gnome2/gnome-session-2.9.4.tar.bz2) = 901242 MD5 (gnome2/gnome-splash28.png) = 2ac880af4ca6929a82f8b64912b95a55 SIZE (gnome2/gnome-splash28.png) = 121715 diff --git a/x11/gnomesession/files/patch-gnome-session_logout.c b/x11/gnomesession/files/patch-gnome-session_logout.c deleted file mode 100644 index f82aefdc7..000000000 --- a/x11/gnomesession/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/gnomesession/files/patch-gnome-session_manager.c b/x11/gnomesession/files/patch-gnome-session_manager.c deleted file mode 100644 index 7e56843ac..000000000 --- a/x11/gnomesession/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); - } diff --git a/x11/gnomesession/pkg-plist b/x11/gnomesession/pkg-plist index 5b5e5681f..9057b1397 100644 --- a/x11/gnomesession/pkg-plist +++ b/x11/gnomesession/pkg-plist @@ -79,3 +79,4 @@ share/locale/vi/LC_MESSAGES/gnome-session-2.0.mo share/locale/wa/LC_MESSAGES/gnome-session-2.0.mo share/locale/zh_CN/LC_MESSAGES/gnome-session-2.0.mo share/locale/zh_TW/LC_MESSAGES/gnome-session-2.0.mo +share/locale/zu/LC_MESSAGES/gnome-session-2.0.mo -- cgit v1.2.3