Add gdm2.

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

11 files changed, 419 insertions, 0 deletions

diff --git a/x11/gdm2/files/gdm.sh.sample b/x11/gdm2/files/gdm.sh.sample
new file mode 100644
index 000000000..d2d25ee98
--- /dev/null
+++ b/x11/gdm2/files/gdm.sh.sample
@@ -0,0 +1,21 @@
+#!/bin/sh
+#
+# $FreeBSD: ports/x11/gdm2/files/gdm.sh.sample,v 1.2 2002/09/19 02:23:54 marcus Exp $
+
+PREFIX=%%PREFIX%%
+
+case "$1" in
+start)
+	${PREFIX}/bin/gdm
+	;;
+stop)
+	/usr/bin/killall -m gdm 2>/dev/null
+	;;
+*)
+	echo "Usage: `basename $0` start | stop"
+	exit 64
+	;;
+
+esac
+
+exit 0
diff --git a/x11/gdm2/files/patch-ab b/x11/gdm2/files/patch-ab
new file mode 100644
index 000000000..db8711ef3
--- /dev/null
+++ b/x11/gdm2/files/patch-ab
@@ -0,0 +1,69 @@
+--- config/gdm.conf.in.orig	Fri Aug 23 13:59:57 2002
++++ config/gdm.conf.in	Sun Aug 25 13:57:05 2002
+@@ -33,14 +33,14 @@
+ # The gdm configuration program that is run from the login screen, you should
+ # probably leave this alone
+ Configurator=@EXPANDED_GDMCONFIGDIR@/gdmsetup --disable-sound --disable-crash-dialog
+-GnomeDefaultSession=@EXPANDED_DATADIR@/gnome/default.session
++GnomeDefaultSession=@EXPANDED_DATADIR@/default.session
+ # The chooser program.  Must output the chosen host on stdout, probably you
+ # should leave this alone
+ Chooser=@EXPANDED_BINDIR@/gdmchooser
+ # Default path to set.  The profile scripts will likely override this
+ DefaultPath=/bin:/usr/bin:/usr/bin/X11:/usr/X11R6/bin:/usr/local/bin:@EXPANDED_BINDIR@
+ # Default path for root.  The profile scripts will likely override this
+-RootPath=/sbin:/usr/sbin:/bin:/usr/bin:/usr/bin/X11:/usr/X11R6/bin:/usr/local/bin:@EXPANDED_BINDIR@
++RootPath=/sbin:/usr/sbin:/bin:/usr/bin:/usr/X11R6/bin:/usr/local/bin:@EXPANDED_BINDIR@
+ DisplayInitDir=@EXPANDED_SYSCONFDIR@/gdm/Init
+ # Greeter for local (non-xdmcp) logins.  Change gdmlogin to gdmgreeter to
+ # get the new graphical greeter.
+@@ -57,7 +57,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_AUTHDIR@
++LogDir=/var/log
+ # You should probably never change this value unless you have a weird setup
+ PidFile=/var/run/gdm.pid
+ PostSessionScriptDir=@EXPANDED_SYSCONFDIR@/gdm/PostSession/
+@@ -84,11 +84,11 @@
+ UserAuthFBDir=/tmp
+ UserAuthFile=.Xauthority
+ # The X server to use if we can't figure out what else to run.
+-StandardXServer=/usr/X11R6/bin/X
++StandardXServer=@EXPANDED_BINDIR@/X
+ # The maximum number of flexible X servers to run.
+ FlexibleXServers=5
+ # the X nest command
+-Xnest=/usr/X11R6/bin/Xnest -name Xnest
++Xnest=@EXPANDED_BINDIR@/Xnest -name Xnest
+ # Automatic VT allocation.  Right now only works on Linux.  This way
+ # we force X to use specific vts.  turn VTAllocation to false if this
+ # is causing problems.
+@@ -153,7 +153,7 @@
+ # The 'theme'.  By default we're using the default gtk theme
+ # Of course assuming that gtk got installed in the same prefix,
+ # if not change this.
+-GtkRC=@EXPANDED_DATADIR@/themes/Default/gtk/gtkrc
++GtkRC=@EXPANDED_DATADIR@/../themes/Default/gtk-2.0/gtkrc
+ # Maximum size of an icon, larger icons are scaled down
+ MaxIconWidth=128
+ MaxIconHeight=128
+@@ -281,7 +281,7 @@
+ # Definition of the standard X server.
+ [server-Standard]
+ name=Standard server
+-command=/usr/X11R6/bin/X
++command=@EXPANDED_BINDIR@/X
+ flexible=true
+ 
+ # To use this server type you should add -query host or -indirect host
+@@ -289,7 +289,7 @@
+ [server-Terminal]
+ name=Terminal server
+ # Add -terminate to make things behave more nicely
+-command=/usr/X11R6/bin/X -terminate
++command=@EXPANDED_BINDIR@/X -terminate
+ # Make this not appear in the flexible servers (we need extra params
+ # anyway, and terminate would be bad for xdmcp)
+ flexible=false
diff --git a/x11/gdm2/files/patch-al b/x11/gdm2/files/patch-al
new file mode 100644
index 000000000..731d036cf
--- /dev/null
+++ b/x11/gdm2/files/patch-al
@@ -0,0 +1,10 @@
+--- config/gnomerc.in.orig	Wed Jul 24 15:52:07 2002
++++ config/gnomerc.in	Wed Jul 24 15:52:26 2002
+@@ -2,6 +2,7 @@
+ 
+ # Do we have gnome-volume-control?
+ # If so we should run it to load the gnome-volume-control settings
++LC_CTYPE= ; export LC_CTYPE
+ if command -v gnome-volume-control > /dev/null 2>&1; then
+ 	gnome-volume-control -i
+ else if [ -x @EXPANDED_BINDIR@/gnome-volume-control > /dev/null 2>&1; then
diff --git a/x11/gdm2/files/patch-at b/x11/gdm2/files/patch-at
new file mode 100644
index 000000000..2e73a9b0b
--- /dev/null
+++ b/x11/gdm2/files/patch-at
@@ -0,0 +1,11 @@
+--- utils/Makefile.in.orig	Tue May 21 00:01:55 2002
++++ utils/Makefile.in	Tue May 21 00:02:20 2002
+@@ -160,7 +160,7 @@
+ gdmmktemp_SOURCES =  	gdmmktemp.c
+ 
+ 
+-gdmaskpass_LDADD =  	$(INTLLIBS)			-lpam				-lpam_misc
++gdmaskpass_LDADD =  	$(INTLLIBS)			-lpam
+ 
+ 
+ gdmopen_LDADD =  	$(INTLLIBS)
diff --git a/x11/gdm2/files/patch-config_Makefile.in b/x11/gdm2/files/patch-config_Makefile.in
new file mode 100644
index 000000000..cd45ba7f3
--- /dev/null
+++ b/x11/gdm2/files/patch-config_Makefile.in
@@ -0,0 +1,101 @@
+--- config/Makefile.in.orig	Tue Aug 20 16:46:29 2002
++++ config/Makefile.in	Tue Aug 20 17:03:19 2002
+@@ -286,71 +286,73 @@
+ 	fi
+ 	$(INSTALL_DATA) gdm.conf $(DESTDIR)$(confdir)/factory-gdm.conf
+ 
+-	$(INSTALL_SCRIPT) $(srcdir)/XKeepsCrashing $(DESTDIR)$(confdir)/XKeepsCrashing
++	if test '!' -f $(DESTDIR)$(confdir)/XKeepsCrashing; then \
++	    	$(INSTALL_SCRIPT) $(srcdir)/XKeepsCrashing $(DESTDIR)$(confdir)/XKeepsCrashing; \
++	fi
++	$(INSTALL_SCRIPT) $(srcdir)/XKeepsCrashing $(DESTDIR)$(confdir)/factory-XKeepsCrashing
+ 
+-	-if test -f $(DESTDIR)$(localedir)/locale.alias; then \
+-		cp -f $(DESTDIR)$(localedir)/locale.alias $(DESTDIR)$(localedir)/locale.alias.orig; \
++	if test '!' -f $(DESTDIR)$(localedir)/locale.alias; then \
++	    	$(INSTALL_DATA) $(srcdir)/locale.alias $(DESTDIR)$(localedir)/locale.alias; \
+ 	fi
+-	$(INSTALL_DATA) $(srcdir)/locale.alias $(DESTDIR)$(localedir)/locale.alias
++	$(INSTALL_DATA) $(srcdir)/locale.alias $(DESTDIR)$(localedir)/factory-locale.alias
+ 
+ 	if test '!' -d $(DESTDIR)$(sessdir); then \
+ 		$(mkinstalldirs) $(DESTDIR)$(sessdir); \
+ 		chmod 755 $(DESTDIR)$(sessdir); \
+ 	fi
+ 
+-	-if test -f $(DESTDIR)$(sessdir)/Xsession; then \
+-		cp -f $(DESTDIR)$(sessdir)/Xsession $(DESTDIR)$(sessdir)/Xsession.orig; \
++	if test '!' -f $(DESTDIR)$(sessdir)/Xsession; then \
++	    	$(INSTALL_SCRIPT) Xsession $(DESTDIR)$(sessdir)/Xsession; \
+ 	fi
+-	$(INSTALL_SCRIPT) Xsession $(DESTDIR)$(sessdir)/Xsession
++	$(INSTALL_SCRIPT) Xsession $(DESTDIR)$(sessdir)/factory-Xsession
+ 
+-	-if test -f $(DESTDIR)$(sessdir)/Gnome; then \
+-		cp -f $(DESTDIR)$(sessdir)/Gnome $(DESTDIR)$(sessdir)/Gnome.orig; \
++	if test '!' -f $(DESTDIR)$(sessdir)/Gnome; then \
++	    	$(INSTALL_SCRIPT) Gnome $(DESTDIR)$(sessdir)/Gnome; \
+ 	fi
+-	$(INSTALL_SCRIPT) Gnome $(DESTDIR)$(sessdir)/Gnome
++	$(INSTALL_SCRIPT) Gnome $(DESTDIR)$(sessdir)/factory-Gnome
+ 
+ 	-if test -f /usr/bin/switchdesk; then \
+-		if test -f $(DESTDIR)$(sessdir)/Default; then \
+-			cp -f $(DESTDIR)$(sessdir)/Default $(DESTDIR)$(sessdir)/Default.orig; \
++		if test '!' -f $(DESTDIR)$(sessdir)/Default; then \
++		    	$(LN_S) -f $(sessdir)/Xsession $(DESTDIR)$(sessdir)/Default; \
+ 		fi; \
+-		$(LN_S) -f $(sessdir)/Xsession $(DESTDIR)$(sessdir)/Default; \
+ 	fi
+ 
+ 	if test '!' -d $(DESTDIR)$(initdir); then \
+ 		$(mkinstalldirs) $(DESTDIR)$(initdir); \
+ 		chmod 755 $(DESTDIR)$(initdir); \
+ 	fi
+-	-if test -f $(DESTDIR)$(initdir)/Default; then \
+-		cp -f $(DESTDIR)$(initdir)/Default $(DESTDIR)$(initdir)/Default.orig; \
++	if test '!' -f $(DESTDIR)$(initdir)/Default; then \
++	    	$(INSTALL_SCRIPT) $(srcdir)/Default $(DESTDIR)$(initdir)/Default; \
+ 	fi
+-	$(INSTALL_SCRIPT) $(srcdir)/Default $(DESTDIR)$(initdir)/Default
++	$(INSTALL_SCRIPT) $(srcdir)/Default $(DESTDIR)$(initdir)/factory-Default
+ 
+ 	if test '!' -d $(DESTDIR)$(predir); then \
+ 		$(mkinstalldirs) $(DESTDIR)$(predir); \
+ 		chmod 755 $(DESTDIR)$(predir); \
+ 	fi
+-	-if test -f $(DESTDIR)$(predir)/Default; then \
+-		cp -f $(DESTDIR)$(predir)/Default $(DESTDIR)$(predir)/Default.orig; \
++	if test '!' -f $(DESTDIR)$(predir)/Default; then \
++	    	$(INSTALL_SCRIPT) $(srcdir)/PreSession $(DESTDIR)$(predir)/Default; \
+ 	fi
+-	$(INSTALL_SCRIPT) $(srcdir)/PreSession $(DESTDIR)$(predir)/Default
++	$(INSTALL_SCRIPT) $(srcdir)/PreSession $(DESTDIR)$(predir)/factory-Default
+ 
+ 	if test '!' -d $(DESTDIR)$(postdir); then \
+ 		$(mkinstalldirs) $(DESTDIR)$(postdir); \
+ 		chmod 755 $(DESTDIR)$(postdir); \
+ 	fi
+-	-if test -f $(DESTDIR)$(postdir)/Default; then \
+-		cp -f $(DESTDIR)$(postdir)/Default $(DESTDIR)$(postdir)/Default.orig; \
++	if test '!' -f $(DESTDIR)$(postdir)/Default; then \
++	    	$(INSTALL_SCRIPT) $(srcdir)/PostSession $(DESTDIR)$(postdir)/Default; \
+ 	fi
+-	$(INSTALL_SCRIPT) $(srcdir)/PostSession $(DESTDIR)$(postdir)/Default
++	$(INSTALL_SCRIPT) $(srcdir)/PostSession $(DESTDIR)$(postdir)/factory-Default
+ 
+ 	if test '!' -d $(DESTDIR)$(gnomercdir); then \
+ 		$(mkinstalldirs) $(DESTDIR)$(gnomercdir); \
+ 		chmod 755 $(DESTDIR)$(gnomercdir); \
+ 	fi
+ 
+-	-if test -f $(DESTDIR)$(gnomercdir)/gnomerc; then \
+-		cp -f $(DESTDIR)$(gnomercdir)/gnomerc $(DESTDIR)$(gnomercdir)/gnomerc.orig; \
++	if test '!' -f $(DESTDIR)$(gnomercdir)/gnomerc; then \
++	    	$(INSTALL_SCRIPT) gnomerc $(DESTDIR)$(gnomercdir)/gnomerc; \
+ 	fi
+-	$(INSTALL_SCRIPT) gnomerc $(DESTDIR)$(gnomercdir)/gnomerc
++	$(INSTALL_SCRIPT) gnomerc $(DESTDIR)$(gnomercdir)/factory-gnomerc
+ 
+ 	if test '!' -d $(DESTDIR)$(authdir); then \
+ 		$(mkinstalldirs) $(DESTDIR)$(authdir); \
diff --git a/x11/gdm2/files/patch-config_locale.alias b/x11/gdm2/files/patch-config_locale.alias
new file mode 100644
index 000000000..a162ae142
--- /dev/null
+++ b/x11/gdm2/files/patch-config_locale.alias
@@ -0,0 +1,90 @@
+--- config/locale.alias.orig	Thu Aug 22 18:47:35 2002
++++ config/locale.alias	Wed Sep 18 22:18:10 2002
+@@ -14,54 +14,36 @@
+ #
+ #		- George
+ 
+-Azerbaijani		az_AZ.utf8,az_AZ
+-Arabic(Egypt)		ar_EG.utf8,ar_EG
+-Arabic(Lebanon)		ar_LB.utf8,ar_LB
+-Basque			eu_ES.utf8,eu_ES
+-Bulgarian		bg_BG.utf8,bg_BG
+-Catalan			ca_ES.utf8,ca_ES
+-Chinese(simplified)	zh_CN.utf8,zh_CN
+-Chinese(traditional)	zh_TW.utf8,zh_TW
+-Croatian		hr_HR.utf8,hr_HR
+-Czech			cs_CZ.utf8,cs_CZ
+-Danish			da_DK.utf8,da_DK
+-Dutch			nl_NL.utf8,nl_NL
+-Estonian		et_EE.utf8,et_EE
+-English(American)	en_US.utf8,en_US
+-English(Australian)	en_AU.utf8,en_AU
+-English(British)	en_GB.utf8,en_GB
+-English(Ireland)	en_IE.utf8,en_IE
+-Finnish			fi_FI.utf8,fi_FI
+-French			fr_FR.utf8,fr_FR
+-Galician		gl_ES.utf8,gl_ES
+-German			de_DE.utf8,de_DE
+-Greek			el_GR.utf8,el_GR
+-Hebrew			he_IL.utf8,he_IL
+-Hungarian		hu_HU.utf8,hu_HU
+-Icelandic		is_IS.utf8,is_IS
+-Irish			ga_IE.utf8,ga_IE
+-Italian			it_IT.utf8,it_IT
+-Japanese		ja_JP.utf8,ja_JP
+-Korean			ko_KR.utf8,ko_KR
+-Latvian			lv_LV.utf8,lv_LV
+-Lithuanian		lt_LT.utf8,lt_LT
+-Macedonian		mk_MK.utf8,mk_MK
+-Malay			ms_MY.utf8,ms_MY
+-Norwegian(bokmal)	no_NO.utf8,no_NO
+-Norwegian(nynorsk)	nn_NO.utf8,nn_NO
+-Polish			pl_PL.utf8,pl_PL
+-Portuguese		pt_PT.utf8,pt_PT
+-Portuguese(Brazilian)	pt_BR.utf8,pt_BR
+-Romanian		ro_RO.utf8,ro_RO
+-Russian			ru_RU.utf8,ru_RU
+-Slovak			sk_SK.utf8,sk_SK
+-Slovenian		sl_SI.utf8,sl_SI
+-Spanish			es_ES.utf8,es_ES
+-Spanish(Mexico)		es_MX.utf8,es_MX
+-Swedish			sv_SE.utf8,sv_SE
+-Swedish(Finland)	sv_FI.utf8,sv_FI
+-Tamil			ta_IN.utf8,ta_IN
+-Turkish			tr_TR.utf8,tr_TR
+-Ukrainian		uk_UA.utf8,uk_UA
+-Vietnamese		vi_VN.utf8,vi_VN
+-Walloon			wa_BE.utf8,wa_BE
++Bulgarian		bg_BG.utf8,bg_BG.CP1251
++Chinese(simplified)	zh_CN.utf8,zh_CN.EUC
++Chinese(traditional)	zh_TW.utf8,zh_TW.Big5
++Croatian		hr_HR.utf8,hr_HR.ISO_8859-2
++Czech			cs_CZ.utf8,cs_CZ.ISO_8859-2
++Danish			da_DK.utf8,da_DK.ISO_8859-1
++Dutch			nl_NL.utf8,nl_NL.ISO_8859-1
++Estonian		et_EE.utf8,et_EE.ISO_8859-15
++English(American)	en_US.utf8,en_US.ISO_8859-1
++English(Australian)	en_AU.utf8,en_AU.ISO_8859-1
++English(British)	en_GB.utf8,en_GB.ISO_8859-1
++Finnish			fi_FI.utf8,fi_FI.ISO_8859-1
++French			fr_FR.utf8,fr_FR.ISO_8859-1
++German			de_DE.utf8,de_DE.ISO_8859-1
++Greek			el_GR.utf8,el_GR.ISO_8859-7
++Hungarian		hu_HU.utf8,hu_HU.ISO_8859-2
++Icelandic		is_IS.utf8,is_IS.ISO_8859-1
++Italian			it_IT.utf8,it_IT.ISO_8859-1
++Japanese		ja_JP.utf8,ja_JP.EUC
++Korean			ko_KR.utf8,ko_KR.EUC
++Lithuanian		lt_LT.utf8,lt_LT.ISO_8859-4
++Norwegian(bokmal)	no_NO.utf8,no_NO.ISO_8859-1
++Polish			pl_PL.utf8,pl_PL.ISO_8859-2
++Portuguese		pt_PT.utf8,pt_PT.ISO_8859-1
++Portuguese(Brazilian)	pt_BR.utf8,pt_BR.ISO8859-1
++Romanian		ro_RO.utf8,ro_RO.ISO8859-2
++Russian			ru_RU.utf8,ru_RU.ISO_8859-5
++Slovak			sk_SK.utf8,sk_SK.ISO_8859-2
++Slovenian		sl_SI.utf8,sl_SI.ISO_8859-2
++Spanish			es_ES.utf8,es_ES.ISO_8859-1
++Swedish			sv_SE.utf8,sv_SE.ISO_8859-1
++Turkish			tr_TR.utf8,tr_TR.ISO_8859-9
++Ukrainian		uk_UA.utf8,uk_UA.ISO8859-5
diff --git a/x11/gdm2/files/patch-configure b/x11/gdm2/files/patch-configure
new file mode 100644
index 000000000..f0917807b
--- /dev/null
+++ b/x11/gdm2/files/patch-configure
@@ -0,0 +1,19 @@
+--- configure.orig	Wed Jul 17 17:49:15 2002
++++ configure	Wed Jul 17 17:51:03 2002
+@@ -7396,6 +7396,7 @@
+ 
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++$ac_aux_dir/ltconfig $LIBTOOL_DEPS
+ 
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+@@ -8531,6 +8532,8 @@
+   cat >conftest.$ac_ext <<_ACEOF
+ #line 8532 "configure"
+ #include "confdefs.h"
++#include <sys/types.h>
++#include <sys/socket.h>
+ $ac_includes_default
+ int
+ main ()
diff --git a/x11/gdm2/files/patch-configure.orig b/x11/gdm2/files/patch-configure.orig
new file mode 100644
index 000000000..740079442
--- /dev/null
+++ b/x11/gdm2/files/patch-configure.orig
@@ -0,0 +1,64 @@
+--- configure.orig	Mon May 20 23:47:49 2002
++++ configure	Mon May 20 23:47:42 2002
+@@ -7371,6 +7371,7 @@
+ 
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++$ac_aux_dir/ltconfig $LIBTOOL_DEPS
+ 
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+@@ -10963,6 +10964,53 @@
+ 		 GDMOPEN=gdmopen
+ fi
+ done
++
++for ac_hdr in sys/types.h login_cap.h
++do
++ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
++echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
++echo "configure:8583: checking for $ac_hdr" >&5
++if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  cat > conftest.$ac_ext <<EOF
++#line 8588 "configure"
++#include "confdefs.h"
++#include <$ac_hdr>
++EOF
++ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
++{ (eval echo configure:8593: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
++if test -z "$ac_err"; then
++  rm -rf conftest*
++  eval "ac_cv_header_$ac_safe=yes"
++else
++  echo "$ac_err" >&5
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  eval "ac_cv_header_$ac_safe=no"
++fi
++rm -f conftest*
++fi
++if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
++  echo "$ac_t""yes" 1>&6
++    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
++  cat >> confdefs.h <<EOF
++#define $ac_tr_hdr 1
++EOF
++
++                LIBS="$LIBS -lutil"
++                cat >> confdefs.h <<\EOF
++#define HAVE_LOGINCAP 1
++EOF
++
++else
++  echo "$ac_t""no" 1>&6
++fi
++done
++
++
+ 
+ have_pam=no
+ VRFY="verify-crypt"
diff --git a/x11/gdm2/files/patch-daemon_gdm.c b/x11/gdm2/files/patch-daemon_gdm.c
new file mode 100644
index 000000000..76c115f8b
--- /dev/null
+++ b/x11/gdm2/files/patch-daemon_gdm.c
@@ -0,0 +1,11 @@
+--- daemon/gdm.c.orig	Thu May 30 11:02:29 2002
++++ daemon/gdm.c	Thu May 30 10:59:19 2002
+@@ -36,7 +36,7 @@
+ #include <locale.h>
+ 
+ /* This should be moved to auth.c I suppose */
+-#include <X11/Xauth.h>
++/*#include <X11/Xauth.h>*/
+ 
+ #include <vicious.h>
+ 
diff --git a/x11/gdm2/files/patch-daemon_slave.c b/x11/gdm2/files/patch-daemon_slave.c
new file mode 100644
index 000000000..27ac0544a
--- /dev/null
+++ b/x11/gdm2/files/patch-daemon_slave.c
@@ -0,0 +1,12 @@
+--- daemon/slave.c.orig	Wed Sep 18 02:25:09 2002
++++ daemon/slave.c	Wed Sep 18 02:25:15 2002
+@@ -2327,7 +2327,8 @@
+ 	if (setusercontext (NULL, pwent, pwent->pw_uid,
+ 			    LOGIN_SETLOGIN | LOGIN_SETPATH |
+ 			    LOGIN_SETPRIORITY | LOGIN_SETRESOURCES |
+-			    LOGIN_SETUMASK | LOGIN_SETUSER) < 0)
++			    LOGIN_SETUMASK | LOGIN_SETUSER |
++			    LOGIN_SETENV) < 0)
+ 		gdm_child_exit (DISPLAY_REMANAGE,
+ 				_("%s: setusercontext() failed for %s. "
+ 				  "Aborting."), "gdm_slave_session_start",
diff --git a/x11/gdm2/files/patch-gui::gdmsetup.c b/x11/gdm2/files/patch-gui::gdmsetup.c
new file mode 100644
index 000000000..33924be67
--- /dev/null
+++ b/x11/gdm2/files/patch-gui::gdmsetup.c
@@ -0,0 +1,11 @@
+--- gui/gdmsetup.c.orig	Sun Aug  4 16:08:52 2002
++++ gui/gdmsetup.c	Sun Aug  4 16:09:09 2002
+@@ -1512,7 +1512,7 @@
+ 			success = TRUE;
+ 
+ 			/* HACK! */
+-			cmd = g_strdup_printf ("/bin/chown -R root.root %s", dir);
++			cmd = g_strdup_printf ("/usr/sbin/chown -R gdm:gdm %s", dir);
+ 			system (cmd);
+ 			g_free (cmd);
+