Update to 2.6.0.8.

This commit is contained in:
Joe Marcus Clarke 2005-03-08 02:06:28 +00:00
parent 167ed1819c
commit 4060c72851
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=130577
5 changed files with 25 additions and 21 deletions

View file

@ -6,7 +6,7 @@
#
PORTNAME= gdm
PORTVERSION= 2.6.0.7
PORTVERSION= 2.6.0.8
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.6

View file

@ -1,2 +1,2 @@
MD5 (gnome2/gdm-2.6.0.7.tar.bz2) = d3c7d5e605fb5a27f59e228d49469fd6
SIZE (gnome2/gdm-2.6.0.7.tar.bz2) = 3345365
MD5 (gnome2/gdm-2.6.0.8.tar.bz2) = 2c51b452686378097bb58e5fc02e2d04
SIZE (gnome2/gdm-2.6.0.8.tar.bz2) = 3357597

View file

@ -1,5 +1,5 @@
--- config/gdm.conf.in.orig
+++ config/gdm.conf.in
--- config/gdm.conf.in.orig Mon Feb 14 17:49:35 2005
+++ config/gdm.conf.in Mon Mar 7 20:53:24 2005
@@ -76,7 +76,7 @@
# To try to kill all clients started at greeter time or in the Init script.
# doesn't always work, only if those clients have a window of their own
@ -9,17 +9,7 @@
# You should probably never change this value unless you have a weird setup
PidFile=/var/run/gdm.pid
# Note that a post login script is run before a PreSession script.
@@ -96,7 +96,8 @@
# Reboot, Halt and suspend commands, you can add different commands
# separated by a semicolon and gdm will use the first one it can find
#RebootCommand=/usr/bin/reboot;/sbin/reboot;/sbin/shutdown -r now;/usr/sbin/shutdown -r now
-#HaltCommand=/usr/bin/poweroff;/sbin/poweroff;/sbin/shutdown -h now;/usr/sbin/shutdown -h now
+RebootCommand=/sbin/shutdown -r now;/usr/sbin/shutdown -r now
+HaltCommand=/sbin/shutdown -p now;/usr/sbin/shutdown -p now
#SuspendCommand=
# Probably should not touch the below this is the standard setup
ServAuthDir=@EXPANDED_AUTHDIR@
@@ -131,11 +132,11 @@
@@ -131,11 +131,11 @@
#FlexiReapDelayMinutes=5
# the X nest command
Xnest=@X_XNEST_PATH@/Xnest @X_XNEST_CONFIG_OPTIONS@
@ -34,7 +24,7 @@
# Should double login be treated with a warning (and possibility to change
# vts on linux and freebsd systems for console logins)
#DoubleLoginWarning=true
@@ -240,7 +241,7 @@
@@ -240,7 +240,7 @@
# The specific gtkrc file we use. It should be the full path to the gtkrc
# that we need. Unless you need a specific gtkrc that doesn't correspond to
# a specific theme, then just use the GtkTheme key

View file

@ -1,6 +1,6 @@
--- config/locale.alias.orig Tue Aug 3 19:38:53 2004
+++ config/locale.alias Thu Aug 19 13:11:27 2004
@@ -14,88 +14,50 @@
@@ -14,89 +14,50 @@
#
# - George
@ -51,6 +51,7 @@
-Italian it_IT.UTF-8,it_IT
-Japanese ja_JP.UTF-8,ja_JP
-Kannada kn_IN.UTF-8,kn_IN
-Kinyarwanda rw_RW.UTF-8,rw_RW
-Korean ko_KR.UTF-8,ko_KR
-Latvian lv_LV.UTF-8,lv_LV
-Lithuanian lt_LT.UTF-8,lt_LT

View file

@ -1,6 +1,6 @@
--- configure.orig Sat Jun 28 18:15:07 2003
+++ configure Sat Jun 28 18:15:08 2003
@@ -20222,6 +20222,8 @@
--- configure.orig Mon Mar 7 20:58:02 2005
+++ configure Mon Mar 7 20:59:44 2005
@@ -21643,6 +21643,8 @@
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@ -9,3 +9,16 @@
$ac_includes_default
int
main ()
@@ -28959,6 +28961,12 @@
REBOOT_COMMAND="/sbin/init 6"
SUSPEND_COMMAND="/usr/openwin/bin/sys-suspend -n"
;;
+*freebsd*)
+ GDM_USER_PATH="/bin:/usr/bin"
+ HALT_COMMAND="/sbin/shutdown -p now;/usr/sbin/shutdown -p now"
+ REBOOT_COMMAND="/sbin/shutdown -r now;/usr/sbin/shutdown -r now"
+ SUSPEND_COMMAND="/usr/sbin/zzz"
+ ;;
*)
GDM_USER_PATH="/bin:/usr/bin"
HALT_COMMAND="/usr/bin/poweroff;/sbin/poweroff;/sbin/shutdown -h now;/usr/sbin/shutdown -h now"