Update to the latest GNOME 2 snapshot.

8 files changed, 9 insertions, 224 deletions

diff --git a/x11/gdm2/Makefile b/x11/gdm2/Makefile
index 85137a6252e9..0beaea0551da 100644
--- a/x11/gdm2/Makefile
+++ b/x11/gdm2/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	gdm2
-PORTVERSION=	2.3.90.3
+PORTVERSION=	2.3.90.6
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=		pre-gnome2/releases/gnome-2.0-desktop-20020525
+MASTER_SITE_SUBDIR=		pre-gnome2/releases/gnome-2.0-desktop-20020607
 DISTNAME=	gdm-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
diff --git a/x11/gdm2/distinfo b/x11/gdm2/distinfo
index 4fdca20c7f87..c2aaf97cd188 100644
--- a/x11/gdm2/distinfo
+++ b/x11/gdm2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gdm-2.3.90.3.tar.bz2) = 8545d607c518b8b0819d27bcc66c800e
+MD5 (gnome2/gdm-2.3.90.6.tar.bz2) = f3e6f339c6c322c7346fbb1516e09ad0
diff --git a/x11/gdm2/files/patch-ab b/x11/gdm2/files/patch-ab
index 4165942a4b05..e98b9c539a34 100644
--- a/x11/gdm2/files/patch-ab
+++ b/x11/gdm2/files/patch-ab
@@ -1,5 +1,5 @@
---- config/gdm.conf.in.orig	Mon May 20 23:50:34 2002
-+++ config/gdm.conf.in	Mon May 20 23:53:04 2002
+--- config/gdm.conf.in.orig	Sat Jun  1 12:10:13 2002
++++ config/gdm.conf.in	Tue Jun 11 16:45:25 2002
 @@ -17,7 +17,7 @@
  # want gdm to kill/restart the server, turn this on
  AlwaysRestartServer=false
@@ -34,7 +34,7 @@
 -StandardXServer=/usr/X11R6/bin/X
 +StandardXServer=@EXPANDED_BINDIR@/X
  FlexibleXServers=5
--Xnest=/usr/X11R6/bin/Xnest -name Xnest
+-Xnest=/usr/X11R6/bin/Xnest -name Xnest -kb
 +Xnest=@EXPANDED_BINDIR@/Xnest -name Xnest
  
  [security]
diff --git a/x11/gdm2/files/patch-ap b/x11/gdm2/files/patch-ap
index fa2852604e44..e69de29bb2d1 100644
--- a/x11/gdm2/files/patch-ap
+++ b/x11/gdm2/files/patch-ap
@@ -1,79 +0,0 @@
---- config/locale.alias.orig	Wed May  1 13:01:47 2002
-+++ config/locale.alias	Tue May 21 00:01:09 2002
-@@ -26,42 +26,41 @@
- # it with the rest of us.  Send it using the `glibcbug' script to
- # bugs@gnu.org.
- 
--catalan		ca_ES.ISO-8859-1
-+catalan		ca_ES.ISO_8859-1
- chinese(simplified)	zh_CN.GB2312
- chinese(traditional)	zh_TW.Big5
--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.us	en_US.ISO-8859-1
--english.gb	en_GB.ISO-8859-1
--estonian	et_EE.ISO-8859-15
--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
-+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.us	en_US.ISO_8859-1
-+english.gb	en_GB.ISO_8859-1
-+estonian	et_EE.ISO_8859-15
-+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/gdm2/files/patch-daemon::slave.c b/x11/gdm2/files/patch-daemon::slave.c
index f3722dcec3c1..e69de29bb2d1 100644
--- a/x11/gdm2/files/patch-daemon::slave.c
+++ b/x11/gdm2/files/patch-daemon::slave.c
@@ -1,111 +0,0 @@
---- daemon/slave.c.orig	Tue May 21 00:04:14 2002
-+++ daemon/slave.c	Tue May 21 00:17:55 2002
-@@ -26,6 +26,10 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <unistd.h>
-+#ifdef HAVE_LOGINCAP
-+#include <login_cap.h>
-+#endif
-+
- #include <fcntl.h>
- #include <sys/types.h>
- #include <sys/stat.h>
-@@ -2008,6 +2012,7 @@
- 		   const char *session,
- 		   const char *save_session,
- 		   const char *language,
-+		   gboolean def_language,
- 		   const char *gnome_session,
- 		   gboolean usrcfgok,
- 		   gboolean savesess,
-@@ -2023,6 +2028,11 @@
- 
- 	gdm_clearenv ();
- 
-+	if (setsid() < 0)
-+	    /* should never happen */
-+	    gdm_error (_("%s: setsid() failed: %s!"),
-+	    		"session_child_run", strerror(errno));
-+
- 	/* Prepare user session */
- 	gnome_setenv ("XAUTHORITY", d->userauth, TRUE);
- 	gnome_setenv ("DISPLAY", d->name, TRUE);
-@@ -2050,10 +2060,6 @@
- 		language = unaliaslang (language);
- 	}
- 
--	/* Set locale */
--	gnome_setenv ("LANG", language, TRUE);
--	gnome_setenv ("GDM_LANG", language, TRUE);
--    
- 	setpgid (0, 0);
- 	
- 	umask (022);
-@@ -2069,10 +2075,35 @@
- 	 * not to leave the egid around */
- 	setegid (pwent->pw_gid);
- 
-+#ifdef HAVE_LOGINCAP
-+	if (setusercontext (NULL, pwent, pwent->pw_uid,
-+	    		    LOGIN_SETLOGIN | LOGIN_SETPATH |
-+			    LOGIN_SETPRIORITY | LOGIN_SETRESOURCES |
-+			    LOGIN_SETUMASK | LOGIN_SETUSER) < 0)
-+	    	gdm_child_exit (DISPLAY_REMANAGE,
-+				_("%s: setusercontext() failed for %s. "
-+				  "Aborting."), "gdm_slave_session_start",
-+				login);
-+	/* A different language was selected, or taken from the saved
-+	 * prefs of the user */
-+	if ( ! def_language) {
-+	    gnome_setenv ("LANG", language, TRUE);
-+	    gnome_setenv ("GDM_LANG", language, TRUE);
-+	} else {
-+	    /* setusercontext sets up user languages */
-+	    gnome_setenv ("GDM_LANG", g_getenv ("LANG"), TRUE);
-+	}
-+#else
-+
- 	if (setuid (pwent->pw_uid) < 0) 
- 		gdm_child_exit (DISPLAY_REMANAGE,
- 				_("gdm_slave_session_start: Could not become %s. Aborting."), login);
- 	
-+	/* Set locale */
-+	gnome_setenv ("LANG", language, TRUE);
-+	gnome_setenv ("GDM_LANG", language, TRUE);
-+#endif
-+
- 	chdir (home_dir);
- 
- 	/* anality, make sure nothing is in memory for gnome_config
-@@ -2259,6 +2290,7 @@
-     char *gnome_session = NULL;
-     gboolean savesess = FALSE, savelang = FALSE, savegnomesess = FALSE;
-     gboolean usrcfgok = FALSE, sessoptok = FALSE, authok = FALSE;
-+    gboolean def_language = FALSE;
-     const char *home_dir = NULL;
-     gboolean home_dir_ok = FALSE;
-     pid_t pid;
-@@ -2392,12 +2424,13 @@
- 		    language = g_strdup (lang);
- 	    else
- 		    language = g_strdup (GdmDefaultLocale);
--	    savelang = TRUE;
- 
- 	    if (ve_string_empty (language)) {
- 		    g_free (language);
- 		    language = g_strdup ("C");
- 	    }
-+
-+	    def_language = TRUE;
-     }
- 
-     /* save this session as the users session */
-@@ -2499,6 +2532,7 @@
- 			   session,
- 			   save_session,
- 			   language,
-+			   def_language,
- 			   gnome_session,
- 			   usrcfgok,
- 			   savesess,
diff --git a/x11/gdm2/files/patch-gui::gdmlogin.c b/x11/gdm2/files/patch-gui::gdmlogin.c
index 379619b734ca..e69de29bb2d1 100644
--- a/x11/gdm2/files/patch-gui::gdmlogin.c
+++ b/x11/gdm2/files/patch-gui::gdmlogin.c
@@ -1,26 +0,0 @@
---- gui/gdmlogin.c.orig	Tue May 21 00:19:12 2002
-+++ gui/gdmlogin.c	Tue May 21 00:20:02 2002
-@@ -3419,7 +3419,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)
-@@ -3428,11 +3430,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') {
diff --git a/x11/gdm2/pkg-message b/x11/gdm2/pkg-message
index 86f8373665b9..3f44dbe90135 100644
--- a/x11/gdm2/pkg-message
+++ b/x11/gdm2/pkg-message
@@ -14,7 +14,7 @@ gdm     session         required        pam_permit.so
 - To enable GDM after booting, edit your /etc/ttys(5), and change the line
   for ttyv8 to
 
-ttyv8   "/usr/X11R6/bin/gdm -nodaemon"  xterm   on
+ttyv8   "/usr/X11R6/bin/gdm --nodaemon"  xterm   on
 
 These notes were written by:  Yukihiro Nakai <nakai@FreeBSD.org>
 and updated by: Joe Marcus Clarke <marcus@marcuscom.com>
diff --git a/x11/gdm2/pkg-plist b/x11/gdm2/pkg-plist
index 82d68c1a0f39..13cbb9e4d710 100644
--- a/x11/gdm2/pkg-plist
+++ b/x11/gdm2/pkg-plist
@@ -27,7 +27,7 @@ share/gnome/applications/gdmsetup.desktop
 share/gnome/capplets/gdmphotosetup.desktop
 share/gnome/gdm/gdmchooser.glade
 share/gnome/gdm/gdmsetup.glade
-share/gnome/gdm/themes/circles/GdmGreeterTheme.info
+share/gnome/gdm/themes/circles/GdmGreeterTheme.desktop
 share/gnome/gdm/themes/circles/background.svg
 share/gnome/gdm/themes/circles/circles.xml
 share/gnome/gdm/themes/circles/flower.png
@@ -38,6 +38,7 @@ share/gnome/pixmaps/gdm.xpm
 share/gnome/pixmaps/login-photo.png
 share/gnome/pixmaps/nobody.png
 share/gnome/pixmaps/nohost.png
+share/locale/ar/LC_MESSAGES/gdm-2.4.mo
 share/locale/az/LC_MESSAGES/gdm-2.4.mo
 share/locale/ca/LC_MESSAGES/gdm-2.4.mo
 share/locale/cs/LC_MESSAGES/gdm-2.4.mo