7 files changed, 157 insertions, 33 deletions
diff --git a/x11/gdm/files/gdm.sh.in b/x11/gdm/files/gdm.in
index 816c2d283dd7..1b9d3e640ade 100644
--- a/x11/gdm/files/gdm.sh.in
+++ b/x11/gdm/files/gdm.in
@@ -1,5 +1,6 @@
 #!/bin/sh
 # $FreeBSD$
+#    $MCom: ports/x11/gdm/files/gdm.in,v 1.5 2006/03/06 19:02:27 marcus Exp $
 
 # PROVIDE: gdm
 # REQUIRE: LOGIN cleanvar moused
diff --git a/x11/gdm/files/patch-config_gdm.conf.in b/x11/gdm/files/patch-config_gdm.conf.in
index 60781d1af357..43e2c566c5a1 100644
--- a/x11/gdm/files/patch-config_gdm.conf.in
+++ b/x11/gdm/files/patch-config_gdm.conf.in
@@ -1,35 +1,26 @@
---- config/gdm.conf.in.orig	Thu Oct  6 19:25:45 2005
-+++ config/gdm.conf.in	Mon Dec  5 21:56:18 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
- #KillInitClients=true
--LogDir=@EXPANDED_LOGDIR@
-+LogDir=/var/log
- # 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.
-@@ -131,11 +131,11 @@
+--- config/gdm.conf.in.orig	Fri Apr  7 15:47:20 2006
++++ config/gdm.conf.in	Wed Apr 12 01:53:30 2006
+@@ -156,11 +156,11 @@ StandardXServer=@X_SERVER@
  #FlexiReapDelayMinutes=5
- # the X nest command
+ # The X nest command.
  Xnest=@X_XNEST_PATH@/Xnest @X_XNEST_CONFIG_OPTIONS@
--# Automatic VT allocation.  Right now only works on Linux.  This way
+-# Automatic VT allocation.  Right now only works on Linux.  This way we force
 +# Automatic VT allocation.  This way
- # we force X to use specific vts.  turn VTAllocation to false if this
- # is causing problems.
+ # X to use specific vts.  turn VTAllocation to false if this is causing
+ # problems.
 -#FirstVT=7
 -#VTAllocation=true
 +FirstVT=9
 +VTAllocation=true
- # Should double login be treated with a warning (and possibility to change
- # vts on linux and freebsd systems for console logins)
+ # Should double login be treated with a warning (and possibility to change VT's
+ # on Linux and FreeBSD systems for console logins)
  #DoubleLoginWarning=true
-@@ -250,7 +250,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
--#GtkRC=@EXPANDED_DATADIR@/themes/Default/gtk-2.0/gtkrc
-+#GtkRC=@EXPANDED_DATADIR@/../themes/Default/gtk-2.0/gtkrc
+@@ -283,7 +283,7 @@ Enable=false
+ # 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.
+-#GtkRC=@datadir@/themes/Default/gtk-2.0/gtkrc
++#GtkRC=@datadir@/../themes/Default/gtk-2.0/gtkrc
  
- # The GTK+ theme to use for the gui
+ # The GTK+ theme to use for the GUI.
  #GtkTheme=Default
diff --git a/x11/gdm/files/patch-config_locale.alias b/x11/gdm/files/patch-config_locale.alias
index ca653e463eec..c983c422eb75 100644
--- a/x11/gdm/files/patch-config_locale.alias
+++ b/x11/gdm/files/patch-config_locale.alias
@@ -34,7 +34,7 @@
 -English(Canada)		en_CA.UTF-8,en_CA
 -English(Ireland)	en_IE.UTF-8,en_IE
 -English(SouthAfrica)	en_ZA.UTF-8,en_ZA
--Esparanto		eo.UTF-8,eo
+-Esperanto		eo.UTF-8,eo
 -Estonian		et_EE.UTF-8,et_EE
 -Finnish			fi_FI.UTF-8,fi_FI
 -French			fr_FR.UTF-8,fr_FR
diff --git a/x11/gdm/files/patch-configure b/x11/gdm/files/patch-configure
index 72f2005ff721..ae54f1460b87 100644
--- a/x11/gdm/files/patch-configure
+++ b/x11/gdm/files/patch-configure
@@ -1,17 +1,17 @@
---- configure.orig	Sat Jun 11 03:35:18 2005
-+++ configure	Sat Jun 11 03:43:21 2005
-@@ -22412,6 +22412,8 @@
+--- configure.orig	Wed Mar 29 13:51:40 2006
++++ configure	Wed Mar 29 14:15:56 2006
+@@ -22965,6 +22965,8 @@ _ACEOF
  cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
 +#include <sys/types.h>
 +#include <sys/socket.h>
  $ac_includes_default
- int
- main ()
-@@ -30210,6 +30212,13 @@
-         SUSPEND_COMMAND="/usr/openwin/bin/sys-suspend -n"
+ #include <$ac_header>
+ _ACEOF
+@@ -32415,6 +32417,13 @@ case "$host" in
          XSESSION_SHELL=/bin/ksh
+         SOUND_PROGRAM=/usr/bin/audioplay
          ;;
 +*freebsd*)
 +	GDM_USER_PATH="/bin:/usr/bin"
diff --git a/x11/gdm/files/patch-daemon_gdmconfig.c b/x11/gdm/files/patch-daemon_gdmconfig.c
new file mode 100644
index 000000000000..9ebf10c997e1
--- /dev/null
+++ b/x11/gdm/files/patch-daemon_gdmconfig.c
@@ -0,0 +1,10 @@
+--- daemon/gdmconfig.c.orig	Thu Jan  5 16:57:06 2006
++++ daemon/gdmconfig.c	Thu Jan  5 16:57:44 2006
+@@ -39,6 +39,7 @@
+ #include <fcntl.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
++#include <sys/resource.h>
+ #include <signal.h>
+ #include <pwd.h>
+ #include <grp.h>
diff --git a/x11/gdm/files/patch-daemon_server.c b/x11/gdm/files/patch-daemon_server.c
new file mode 100644
index 000000000000..57f028bfd263
--- /dev/null
+++ b/x11/gdm/files/patch-daemon_server.c
@@ -0,0 +1,10 @@
+--- daemon/server.c.orig	Thu Jan  5 16:58:37 2006
++++ daemon/server.c	Thu Jan  5 16:58:46 2006
+@@ -29,6 +29,7 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <sys/wait.h>
++#include <sys/resource.h>
+ #include <strings.h>
+ #include <signal.h>
+ #include <syslog.h>
diff --git a/x11/gdm/files/patch-gui_greeter_gdmthemetester.in b/x11/gdm/files/patch-gui_greeter_gdmthemetester.in
new file mode 100644
index 000000000000..988efc3fbd84
--- /dev/null
+++ b/x11/gdm/files/patch-gui_greeter_gdmthemetester.in
@@ -0,0 +1,112 @@
+--- gui/greeter/gdmthemetester.in.orig	Wed Apr 12 01:57:25 2006
++++ gui/greeter/gdmthemetester.in	Wed Apr 12 01:57:12 2006
+@@ -0,0 +1,109 @@
++#!/bin/sh
++
++gdmwhich () {
++  COMMAND="$1"
++  OUTPUT=
++  IFS=:
++  for dir in $PATH
++  do
++    if test -x "$dir/$COMMAND" ; then
++      if test "x$OUTPUT" = "x" ; then
++        OUTPUT="$dir/$COMMAND"
++      fi
++    fi
++  done
++  IFS=$OLD_IFS
++  echo "$OUTPUT"
++}
++
++echo
++echo "GDM Theme Tester"
++echo
++echo "Be sure to test all the environments:"
++echo " console, console-timed, flexi, remote-flexi, xdmcp"
++echo "Also be sure to test using caps lock"
++echo
++
++XNEST=`gdmwhich Xnest`
++GDMXNEST=`gdmwhich gdmXnest`
++GDMGREETER="@libexecdir@/gdmgreeter"
++
++if [ x$XNEST = x ]; then
++	echo "ERROR: Xnest not found"
++        echo ""
++	exit 1
++fi
++
++if [ x$GDMXNEST = x ]; then
++	echo "ERROR: gdmXnest not found"
++        echo ""
++	exit 1
++fi
++
++if [ x$GDMGREETER = x ]; then
++	echo "ERROR: gdmgreeter not found"
++        echo ""
++	exit 1
++fi
++
++USAGE="
++Usage: $0 <environment> <theme>
++<environment> is one of: console, console-timed, flexi, remote-flexi, xdmcp
++<theme> is either the path of the theme or the name of an installed theme
++
++If you set the environment variable XNESTSIZE to <width>x<height> (e.g. 800x600)
++you can test the greeter at that resolution
++"
++if [ "$#" != 2 ]; then
++	echo "$USAGE"
++	exit 1
++fi
++
++GDM_THEME="$2"
++DOING_GDM_DEVELOPMENT=yes
++GDM_PARENT_DISPLAY="$DISPLAY"
++export GDM_THEME DOING_GDM_DEVELOPMENT GDM_PARENT_DISPLAY
++
++case $1 in
++console)
++	GDM_IS_LOCAL=yes
++	export GDM_IS_LOCAL
++	;;
++console-timed)
++	GDM_IS_LOCAL=yes
++	GDM_FAKE_TIMED=yes
++	export GDM_IS_LOCAL GDM_FAKE_TIMED
++	;;
++flexi)
++	GDM_IS_LOCAL=yes
++	GDM_FLEXI_SERVER=yes
++	export GDM_IS_LOCAL GDM_FLEXI_SERVER
++	;;
++remote-flexi)
++	GDM_FLEXI_SERVER=yes
++	export GDM_FLEXI_SERVER
++	;;
++xdmcp)
++	;;
++*)
++	echo "$USAGE"
++	exit 1
++	;;
++esac
++
++if [ "x$XNESTSIZE" = x ] ; then
++  eval `gdmXnest -b`
++else
++  eval `gdmXnest -b -o "-geometry $XNESTSIZE"`
++fi
++export DISPLAY
++
++if [ "x$GDM_PARENT_DISPLAY" = "x$DISPLAY" ]; then
++	echo "ERROR: Can't start the Xnest server"
++	exit 1
++fi
++
++# This may not be necessary
++sleep 1
++
++@libexecdir@/gdmgreeter