Begin the de-orbit burn of the GNOME 1.4 desktop. This is phase I. All

core desktop components are being removed.

13 files changed, 0 insertions, 530 deletions

diff --git a/x11/gdm/files/patch-ab b/x11/gdm/files/patch-ab
deleted file mode 100644
index cd73530..0000000
--- a/x11/gdm/files/patch-ab
+++ /dev/null
@@ -1,78 +0,0 @@
-
-$FreeBSD$
-
---- config/gdm.conf.in.orig	Fri Nov 16 13:42:13 2001
-+++ config/gdm.conf.in	Thu Dec 20 11:35:10 2001
-@@ -5,7 +5,7 @@
- # want gdm to kill/restart the server, turn this on
- AlwaysRestartServer=false
- Configurator=@EXPANDED_GDMCONFIGDIR@/gdmconfig --disable-sound --disable-crash-dialog
--GnomeDefaultSession=@EXPANDED_DATADIR@/gnome/default.session
-+GnomeDefaultSession=@EXPANDED_DATADIR@/default.session
- Chooser=@EXPANDED_BINDIR@/gdmchooser --disable-sound --disable-crash-dialog
- DefaultPath=/bin:/usr/bin:/usr/bin/X11:/usr/local/bin:@EXPANDED_BINDIR@
- DisplayInitDir=@EXPANDED_SYSCONFDIR@/gdm/Init
-@@ -13,7 +13,7 @@
- Group=gdm
- HaltCommand=/sbin/shutdown -h now
- KillInitClients=true
--LogDir=@EXPANDED_AUTHDIR@
-+LogDir=/var/log
- PidFile=/var/run/gdm.pid
- PostSessionScriptDir=@EXPANDED_SYSCONFDIR@/gdm/PostSession/
- PreSessionScriptDir=@EXPANDED_SYSCONFDIR@/gdm/PreSession/
-@@ -22,7 +22,7 @@
- FailsafeXServer=
- XKeepsCrashing=@EXPANDED_SYSCONFDIR@/gdm/XKeepsCrashing
- RebootCommand=/sbin/shutdown -r now
--RootPath=/sbin:/usr/sbin:/bin:/usr/bin:/usr/bin/X11:/usr/local/bin:@EXPANDED_BINDIR@
-+RootPath=/sbin:/usr/sbin:/bin:/usr/bin:/usr/X11R6/bin:/usr/local/bin:@EXPANDED_BINDIR@
- ServAuthDir=@EXPANDED_AUTHDIR@
- SessionDir=@EXPANDED_SYSCONFDIR@/gdm/Sessions/
- SuspendCommand=
-@@ -33,9 +33,9 @@
- TimedLoginEnable=false
- TimedLogin=
- TimedLoginDelay=30
--StandardXServer=/usr/bin/X11/X
-+StandardXServer=@EXPANDED_BINDIR@/X
- FlexibleXServers=5
--Xnest=/usr/bin/X11/Xnest -name Xnest
-+Xnest=@EXPANDED_BINDIR@/Xnest -name Xnest
- 
- [security]
- # If any distributions ship with this one off, they should be shot
-@@ -68,7 +68,7 @@
- Willing=@EXPANDED_SYSCONFDIR@/gdm/Xwilling
- 
- [gui]
--GtkRC=@EXPANDED_DATADIR@/themes/Default/gtk/gtkrc
-+GtkRC=@EXPANDED_DATADIR@/../themes/Default/gtk/gtkrc
- MaxIconWidth=128
- MaxIconHeight=128
- 
-@@ -77,14 +77,14 @@
- ConfigAvailable=true
- Browser=false
- DefaultFace=@EXPANDED_PIXMAPDIR@/nobody.png
--DefaultLocale=en_US
-+DefaultLocale=en_US.ISO_8859-1
- # These are things excluded from the face browser, not from logging in
- Exclude=bin,daemon,adm,lp,sync,shutdown,halt,mail,news,uucp,operator,nobody,gdm,postgres,pvm,rpm
--Font=-*-helvetica-bold-r-normal-*-*-180-*-*-*-*-*-*,*
-+Font=-*-helvetica-bold-r-normal-*-*-180-*-*-*-*-*-*,*-r-*,*
- GlobalFaceDir=@EXPANDED_DATADIR@/faces/
- Icon=@EXPANDED_PIXMAPDIR@/gdm.xpm
- LocaleFile=@EXPANDED_LOCALEDIR@/locale.alias
--Logo=@EXPANDED_PIXMAPDIR@/gnome-logo-large.png
-+Logo=@EXPANDED_PIXMAPDIR@/Daemon.png
- Quiver=true
- SystemMenu=true
- Welcome=Welcome to %n
-@@ -137,5 +137,5 @@
- 
- [server-Standard]
- name=Standard server
--command=/usr/bin/X11/X
-+command=@EXPANDED_BINDIR@/X
- flexible=true
diff --git a/x11/gdm/files/patch-ag b/x11/gdm/files/patch-ag
deleted file mode 100644
index 9011312..0000000
--- a/x11/gdm/files/patch-ag
+++ /dev/null
@@ -1,7 +0,0 @@
---- config/Default.orig	Fri Mar 30 19:27:22 2001
-+++ config/Default	Tue May  8 11:30:59 2001
-@@ -3,3 +3,3 @@
- #Color is now handled by gdmgreeter itself
--#/usr/bin/X11/xsetroot -solid "#007777"
-+#/usr/X11R6/bin/xsetroot -solid "#007777"
- 
diff --git a/x11/gdm/files/patch-ah b/x11/gdm/files/patch-ah
deleted file mode 100644
index f536eab..0000000
--- a/x11/gdm/files/patch-ah
+++ /dev/null
@@ -1,9 +0,0 @@
---- config/PreSession.orig	Sun Jun  3 14:45:40 2001
-+++ config/PreSession	Sun Jun  3 14:47:23 2001
-@@ -1,4 +1,4 @@
- #!/bin/sh
--if [ -x /usr/bin/X11/sessreg ]; then
--	/usr/bin/X11/sessreg -a -w /var/log/wtmp -u none -l $DISPLAY $USER
-+if [ -x /usr/X11R6/bin/sessreg ]; then
-+	/usr/X11R6/bin/sessreg -a -w /var/log/wtmp -u none -l $DISPLAY -x /usr/X11R6/lib/X11/xdm/Xservers $USER
- fi
diff --git a/x11/gdm/files/patch-ai b/x11/gdm/files/patch-ai
deleted file mode 100644
index 47d98e7..0000000
--- a/x11/gdm/files/patch-ai
+++ /dev/null
@@ -1,9 +0,0 @@
---- config/PostSession.orig	Sun Jun  3 14:48:43 2001
-+++ config/PostSession	Sun Jun  3 14:49:15 2001
-@@ -1,4 +1,4 @@
- #!/bin/sh
--if [ -x /usr/bin/X11/sessreg ]; then
--	/usr/bin/X11/sessreg -d -w /var/log/wtmp -u none -l $DISPLAY $USER
-+if [ -x /usr/X11R6/bin/sessreg ]; then
-+	/usr/X11R6/bin/sessreg -d -w /var/log/wtmp -u none -l $DISPLAY -x /usr/X11R6/lib/X11/xdm/Xservers $USER
- fi
diff --git a/x11/gdm/files/patch-al b/x11/gdm/files/patch-al
deleted file mode 100644
index 1a731f3..0000000
--- a/x11/gdm/files/patch-al
+++ /dev/null
@@ -1,8 +0,0 @@
---- config/gnomerc.in.orig	Thu Feb 15 19:41:46 2001
-+++ config/gnomerc.in	Fri Apr 20 18:48:24 2001
-@@ -1 +1,4 @@
--@EXPANDED_BINDIR@/gnome-session
-+#!/bin/csh
-+
-+unsetenv LC_CTYPE
-+exec @EXPANDED_BINDIR@/gnome-session
diff --git a/x11/gdm/files/patch-ap b/x11/gdm/files/patch-ap
deleted file mode 100644
index e971ac1..0000000
--- a/x11/gdm/files/patch-ap
+++ /dev/null
@@ -1,77 +0,0 @@
-
-$FreeBSD$
-
---- config/locale.alias.orig	Thu Dec 20 11:40:42 2001
-+++ config/locale.alias	Thu Dec 20 11:40:47 2001
-@@ -29,39 +29,38 @@
- catalan		ca_ES.ISO-8859-1
- chinese(simplified)	zh_CN.GB2312
- chinese(traditional)	zh_TW
--croatian	hr_HR.ISO-8859-2
--czech		cs_CZ.ISO-8859-2
-+croatian	hr_HR.ISO_8859-2
-+czech		cs_CZ.ISO_8859-2
- danish          da_DK.ISO-8859-1
--dansk		da_DK.ISO-8859-1
--deutsch		de_DE.ISO-8859-1
--dutch		nl_NL.ISO-8859-1
--english		en.ISO-8859-1
--english.us	en_US.ISO-8859-1
--english.gb	en_GB.ISO-8859-1
--finnish         fi_FI.ISO-8859-1
--french		fr_FR.ISO-8859-1
--galician	gl_ES.ISO-8859-1
--german		de_DE.ISO-8859-1
--greek           el_GR.ISO-8859-7
--hebrew          iw_IL.ISO-8859-8
--hrvatski	hr_HR.ISO-8859-2
--hungarian       hu_HU.ISO-8859-2
--icelandic       is_IS.ISO-8859-1
--italian         it_IT.ISO-8859-1
--japanese	ja_JP.SJIS
--japanese.euc	ja_JP.eucJP
--korean          ko_KR.eucKR
--lithuanian	lt_LT.ISO-8859-13
--norwegian       no_NO.ISO-8859-1
--nynorsk		nn_NO.ISO-8859-1
--polish          pl_PL.ISO-8859-2
--portuguese      pt_PT.ISO-8859-1
--portuguese.br	pt_BR.ISO-8859-1
--romanian        ro_RO.ISO-8859-2
-+dansk		da_DK.ISO_8859-1
-+deutsch		de_DE.ISO_8859-1
-+dutch		nl_NL.ISO_8859-1
-+english		en_US.ISO_8859-1
-+english.us	en_US.ISO_8859-1
-+english.gb	en_GB.ISO_8859-1
-+finnish         fi_FI.ISO_8859-1
-+french		fr_FR.ISO_8859-1
-+galician	gl_ES.ISO_8859-1
-+german		de_DE.ISO_8859-1
-+greek           el_GR.ISO_8859-7
-+hebrew          iw_IL.ISO_8859-8
-+hrvatski	hr_HR.ISO_8859-2
-+hungarian       hu_HU.ISO_8859-2
-+icelandic       is_IS.ISO_8859-1
-+italian         it_IT.ISO_8859-1
-+japanese	ja_JP.EUC
-+korean          ko_KR.EUC
-+lithuanian	lt_LT.ISO_8859-13
-+norwegian       no_NO.ISO_8859-1
-+nynorsk		nn_NO.ISO_8859-1
-+polish          pl_PL.ISO_8859-2
-+portuguese      pt_PT.ISO_8859-1
-+portuguese.br	pt_BR.ISO_8859-1
-+romanian        ro_RO.ISO_8859-2
- russian         ru_RU.KOI8-R
--slovak          sk_SK.ISO-8859-2
--slovenian       sl_SI.ISO-8859-2
--spanish         es_ES.ISO-8859-1
--swedish         sv_SE.ISO-8859-1
--turkish         tr_TR.ISO-8859-9
-+slovak          sk_SK.ISO_8859-2
-+slovenian       sl_SI.ISO_8859-2
-+spanish         es_ES.ISO_8859-1
-+swedish         sv_SE.ISO_8859-1
-+turkish         tr_TR.ISO_8859-9
- ukrainian	uk_UA.KOI8-U
diff --git a/x11/gdm/files/patch-at b/x11/gdm/files/patch-at
deleted file mode 100644
index fe089e7..0000000
--- a/x11/gdm/files/patch-at
+++ /dev/null
@@ -1,15 +0,0 @@
-
-$FreeBSD$
-
---- utils/Makefile.in.orig	Wed Mar 13 17:52:05 2002
-+++ utils/Makefile.in	Wed Mar 13 17:52:32 2002
-@@ -195,8 +195,7 @@
- gdmaskpass_LDADD = \
- 	$(GNOME_LIBDIR)		\
- 	$(INTLLIBS)		\
--	-lpam			\
--	-lpam_misc
-+	-lpam
- 
- 
- gdmopen_LDADD = \
diff --git a/x11/gdm/files/patch-config.h.in b/x11/gdm/files/patch-config.h.in
deleted file mode 100644
index 0ef9569..0000000
--- a/x11/gdm/files/patch-config.h.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- config.h.in.orig	Thu Jan 10 11:06:01 2002
-+++ config.h.in	Thu Jan 10 11:06:18 2002
-@@ -6,6 +6,7 @@
- #undef HAVE_CATGETS
- #undef HAVE_GETTEXT
- #undef HAVE_LC_MESSAGES
-+#undef HAVE_LOGINCAP
- #undef HAVE_STPCPY
- #undef HAVE_PAM
- #undef HAVE_TCPWRAPPERS
diff --git a/x11/gdm/files/patch-config_Makefile.in b/x11/gdm/files/patch-config_Makefile.in
deleted file mode 100644
index 2afd9ee..0000000
--- a/x11/gdm/files/patch-config_Makefile.in
+++ /dev/null
@@ -1,92 +0,0 @@
---- config/Makefile.in.orig	Tue Mar 12 18:00:50 2002
-+++ config/Makefile.in	Fri Aug  9 18:26:26 2002
-@@ -298,27 +298,30 @@
- 	fi
- 	$(INSTALL_DATA) gdm.conf $(confdir)/factory-gdm.conf
- 
--	$(INSTALL_SCRIPT) $(srcdir)/XKeepsCrashing $(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 $(localedir)/locale.alias; then \
--		cp $(localedir)/locale.alias $(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 $(localedir)/locale.alias
-+	$(INSTALL_DATA) $(srcdir)/locale.alias $(DESTDIR)$(localedir)/factory-locale.alias
- 
- 	if test '!' -d $(sessdir); then \
- 		$(mkinstalldirs) $(sessdir); \
- 		chmod 755 $(sessdir); \
- 	fi
- 
--	-if test -f $(sessdir)/Xsession; then \
--		cp $(sessdir)/Xsession $(sessdir)/Xsession.orig; \
-+	if test '!' -f $(DESTDIR)$(sessdir)/Xsession; then \
-+	    	$(INSTALL_SCRIPT) Xsession $(DESTDIR)$(sessdir)/Xsession; \
- 	fi
--	$(INSTALL_SCRIPT) $(srcdir)/Xsession $(sessdir)/Xsession
-+	$(INSTALL_SCRIPT) Xsession $(DESTDIR)$(sessdir)/factory-Xsession
- 
--	-if test -f $(sessdir)/Gnome; then \
--		cp $(sessdir)/Gnome $(sessdir)/Gnome.orig; \
-+	if test '!' -f $(DESTDIR)$(sessdir)/Gnome; then \
-+	    	$(INSTALL_SCRIPT) Gnome $(DESTDIR)$(sessdir)/Gnome; \
- 	fi
--	$(INSTALL_SCRIPT) Gnome $(sessdir)/Gnome
-+	$(INSTALL_SCRIPT) Gnome $(DESTDIR)$(sessdir)/factory-Gnome
- 
- 	-if test -f /etc/redhat-release; then \
- 		if test -f $(sessdir)/Default; then \
-@@ -331,37 +334,38 @@
- 		$(mkinstalldirs) $(initdir); \
- 		chmod 755 $(initdir); \
- 	fi
--	-if test -f $(initdir)/Default; then \
--		cp $(initdir)/Default $(initdir)/Default.orig; \
-+	if test '!' -f $(DESTDIR)$(initdir)/Default; then \
-+	    	$(INSTALL_SCRIPT) $(srcdir)/Default $(DESTDIR)$(initdir)/Default; \
- 	fi
--	$(INSTALL_SCRIPT) $(srcdir)/Default $(initdir)/Default
-+	$(INSTALL_SCRIPT) $(srcdir)/Default $(DESTDIR)$(initdir)/factory-Default
- 
- 	if test '!' -d $(predir); then \
- 		$(mkinstalldirs) $(predir); \
- 		chmod 755 $(predir); \
- 	fi
--	-if test -f $(predir)/Default; then \
--		cp $(predir)/Default $(predir)/Default.orig; \
-+	if test '!' -f $(DESTDIR)$(predir)/Default; then \
-+	    	$(INSTALL_SCRIPT) $(srcdir)/PreSession $(DESTDIR)$(predir)/Default; \
- 	fi
--	$(INSTALL_SCRIPT) $(srcdir)/PreSession $(predir)/Default
-+	$(INSTALL_SCRIPT) $(srcdir)/PreSession $(DESTDIR)$(predir)/factory-Default
- 
- 	if test '!' -d $(postdir); then \
- 		$(mkinstalldirs) $(postdir); \
- 		chmod 755 $(postdir); \
- 	fi
--	-if test -f $(postdir)/Default; then \
--		cp $(postdir)/Default $(postdir)/Default.orig; \
-+	if test '!' -f $(DESTDIR)$(postdir)/Default; then \
-+	    	$(INSTALL_SCRIPT) $(srcdir)/PostSession $(DESTDIR)$(postdir)/Default; \
- 	fi
--	$(INSTALL_SCRIPT) $(srcdir)/PostSession $(postdir)/Default
-+	$(INSTALL_SCRIPT) $(srcdir)/PostSession $(DESTDIR)$(postdir)/factory-Default
- 
- 	if test '!' -d $(gnomercdir); then \
- 		$(mkinstalldirs) $(gnomercdir); \
- 		chmod 755 $(gnomercdir); \
- 	fi
- 
--	if test '!' -f $(gnomercdir)/gnomerc; then \
-+	 if test '!' -f $(DESTDIR)$(gnomercdir)/gnomerc; then \
- 		$(INSTALL_SCRIPT) gnomerc $(gnomercdir)/gnomerc; \
- 	fi
-+	$(INSTALL_SCRIPT) gnomerc $(DESTDIR)$(gnomercdir)/factory-gnomerc
- 
- 	if test '!' -d $(authdir); then \
- 		$(mkinstalldirs) $(authdir); \
diff --git a/x11/gdm/files/patch-configure b/x11/gdm/files/patch-configure
deleted file mode 100644
index 1ec92cf..0000000
--- a/x11/gdm/files/patch-configure
+++ /dev/null
@@ -1,66 +0,0 @@
-
-$FreeBSD$
-
---- configure.orig	Wed Mar 13 00:58:30 2002
-+++ configure	Thu Jul 18 13:27:09 2002
-@@ -5874,6 +5874,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'
-@@ -8575,6 +8576,52 @@
- done
- 
- fi
-+
-+
-+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
- 
- 
- if test x$enable_authentication_scheme = xpam -a x$have_pam = xno ; then
diff --git a/x11/gdm/files/patch-daemon::slave.c b/x11/gdm/files/patch-daemon::slave.c
deleted file mode 100644
index 060a89f..0000000
--- a/x11/gdm/files/patch-daemon::slave.c
+++ /dev/null
@@ -1,118 +0,0 @@
-
-$FreeBSD$
-
---- daemon/slave.c.orig	Tue Jan  1 04:48:07 2002
-+++ daemon/slave.c	Fri Jan 11 15:51:27 2002
-@@ -45,6 +45,11 @@
- #include <time.h>
- #include <syslog.h>
- 
-+#ifdef HAVE_LOGINCAP
-+#include <unistd.h>
-+#include <login_cap.h>
-+#endif
-+
- #include <vicious.h>
- 
- #include "gdm.h"
-@@ -140,6 +145,8 @@
- static gboolean x_error_occured = FALSE;
- static gboolean gdm_got_usr2 = FALSE;
- 
-+static void		changeUser(struct passwd *pwent, char *login);
-+
- /* ignore handlers */
- static int
- ignore_xerror_handler (Display *disp, XErrorEvent *evt)
-@@ -1785,6 +1792,27 @@
- 
- }
- 
-+#ifdef HAVE_LOGINCAP
-+void changeUser(struct passwd *pwent, char *login) {
-+	if (setsid() == -1)
-+		gdm_child_exit (DISPLAY_REMANAGE, _("gdm_slave_session_start: setsid() failed for %s. Aborting."), login);
-+	if (setusercontext(NULL, pwent, pwent->pw_uid, LOGIN_SETALL) == -1)
-+		gdm_child_exit (DISPLAY_REMANAGE, _("gdm_slave_session_start: setusercontext() failed for %s. Aborting."), login);
-+}
-+#else
-+void changeUser(struct passwd *pwent, char *login) {
-+	setpgid(0, 0);
-+	umask(022);
-+	/* setup the user's correct group */
-+	if (setgid(pwent->pw_gid) < 0)
-+		gdm_child_exit (DISPLAY_REMANAGE, _("gdm_slave_session_start: Could not setgid %d. Aborting."), pwent->pw_gid);
-+	if (initgroups(login, pwent->pw_gid) < 0)
-+		gdm_child_exit (DISPLAY_REMANAGE, _("gdm_slave_session_start: initgroups() failed for %s. Aborting."), login);
-+	if (setuid(pwent->pw_uid) < 0) 
-+		gdm_child_exit (DISPLAY_REMANAGE, _("gdm_slave_session_start: Could not become %s. Aborting."), login);
-+}
-+#endif
-+
- static char *
- dequote (const char *in)
- {
-@@ -1840,12 +1871,6 @@
- 	if (gnome_session != NULL)
- 		ve_setenv ("GDM_GNOME_SESSION", gnome_session, TRUE);
- 
--	/* Special PATH for root */
--	if (pwent->pw_uid == 0)
--		ve_setenv ("PATH", GdmRootPath, TRUE);
--	else
--		ve_setenv ("PATH", GdmDefaultPath, TRUE);
--
- 	/* Eeeeek, this no lookie as a correct language code, let's
- 	 * try unaliasing it */
- 	if (strlen (language) < 3 ||
-@@ -1853,14 +1878,31 @@
- 		language = unaliaslang (language);
- 	}
- 
--	/* Set locale */
-+	changeUser(pwent, login);
-+
-+	/*
-+	 * Set locale. XXX in the HAVE_LOGINCAP case we override user's
-+	 * default language, but there is no other way around, because there
-+	 * is no way to select "Use user's default language" in the GDM, so
-+	 * that we either have to give up ability to select language other
-+	 * one specified in the login.conf, or just ignore default setting.
-+	 * I selected the latter, which is suboptimal, but at least gives
-+	 * some freedom to the user.
-+	 */
- 	ve_setenv ("LANG", language, TRUE);
- 	ve_setenv ("GDM_LANG", language, TRUE);
-+
-+#ifndef HAVE_LOGINCAP
-+
-+	/* Special PATH for root */
-+	if (pwent->pw_uid == 0) 
-+		ve_setenv("PATH", GdmRootPath, TRUE);
-+	else
-+		ve_setenv("PATH", GdmDefaultPath, TRUE);
-+#else
-+	 /* Do not reset PATH */
-+#endif
-     
--	setpgid (0, 0);
--	
--	umask (022);
--	
- 	/* setup the verify env vars */
- 	if ( ! gdm_verify_setup_env (d))
- 		gdm_child_exit (DISPLAY_REMANAGE,
-@@ -1870,12 +1912,8 @@
- 
- 	/* setup egid to the correct group,
- 	 * not to leave the egid around */
--	setegid (pwent->pw_gid);
-+	/*setegid (pwent->pw_gid);*/
- 
--	if (setuid (pwent->pw_uid) < 0) 
--		gdm_child_exit (DISPLAY_REMANAGE,
--				_("gdm_slave_session_start: Could not become %s. Aborting."), login);
--	
- 	chdir (home_dir);
- 
- 	/* anality, make sure nothing is in memory for gnome_config
diff --git a/x11/gdm/files/patch-docs::Makefile.in b/x11/gdm/files/patch-docs::Makefile.in
deleted file mode 100644
index 91ccdd3..0000000
--- a/x11/gdm/files/patch-docs::Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- docs/Makefile.in	2002/03/13 23:43:57	1.1
-+++ docs/Makefile.in	2002/03/13 23:44:08
-@@ -147,7 +147,7 @@
- XPM_LIBS = @XPM_LIBS@
- ZVT_LIBS = @ZVT_LIBS@
- 
--SUBDIRS = C eu gdmconfig
-+SUBDIRS = C gdmconfig
- 
- EXTRA_DIST = sgmldocs.make
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/x11/gdm/files/patch-gui::gdmlogin.c b/x11/gdm/files/patch-gui::gdmlogin.c
deleted file mode 100644
index 69eb353..0000000
--- a/x11/gdm/files/patch-gui::gdmlogin.c
+++ /dev/null
@@ -1,27 +0,0 @@
-
---- gui/gdmlogin.c.orig	Mon Dec 31 21:51:17 2001
-+++ gui/gdmlogin.c	Tue Jan 29 18:12:12 2002
-@@ -3326,7 +3326,9 @@
- static gboolean
- gdm_login_check_exclude (struct passwd *pwent)
- {
-+#ifdef HAVE_SHADOW
- 	const char * const lockout_passes[] = { "*", "!!", NULL };
-+#endif
- 	gint i;
- 
- 	if ( ! GdmAllowRoot && pwent->pw_uid == 0)
-@@ -3335,11 +3337,13 @@
- 	if ( ! GdmAllowRemoteRoot && ! login_is_local && pwent->pw_uid == 0)
- 		return TRUE;
- 
-+#ifdef HAVE_SHADOW
- 	for (i=0 ; lockout_passes[i] != NULL ; i++)  {
- 		if (strcmp (lockout_passes[i], pwent->pw_passwd) == 0) {
- 			return TRUE;
- 		}
- 	}
-+#endif
- 
- 	if (GdmExclude != NULL &&
- 	    GdmExclude[0] != '\0') {