5 files changed, 56 insertions, 52 deletions

diff --git a/x11/gdm2/Makefile b/x11/gdm2/Makefile
index 0c5c376e309a..1689802d5ede 100644
--- a/x11/gdm2/Makefile
+++ b/x11/gdm2/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	gdm2
-PORTVERSION=	2.4.0.7
+PORTVERSION=	2.4.0.8
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=		2.0.0/sources/${PORTNAME:S/2$//}
+MASTER_SITE_SUBDIR=		2.0.1/sources/${PORTNAME:S/2$//}
 DISTNAME=	gdm-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
diff --git a/x11/gdm2/distinfo b/x11/gdm2/distinfo
index c2c42a9380e3..eb3f450ea045 100644
--- a/x11/gdm2/distinfo
+++ b/x11/gdm2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gdm-2.4.0.7.tar.bz2) = 892eaea253560233c582636678f5ec2a
+MD5 (gnome2/gdm-2.4.0.8.tar.bz2) = cf5083c5ac01c8ac84b63031e30d3155
diff --git a/x11/gdm2/files/patch-ab b/x11/gdm2/files/patch-ab
index bf064d59ae71..d70b7a8424c4 100644
--- a/x11/gdm2/files/patch-ab
+++ b/x11/gdm2/files/patch-ab
@@ -1,45 +1,46 @@
---- config/gdm.conf.in.orig	Wed Aug  7 23:50:26 2002
-+++ config/gdm.conf.in	Fri Aug  9 17:13:47 2002
-@@ -17,7 +17,7 @@
- # want gdm to kill/restart the server, turn this on
- AlwaysRestartServer=false
+--- config/gdm.conf.in.orig	Wed Aug 14 22:13:10 2002
++++ config/gdm.conf.in	Tue Aug 20 16:43:26 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
-@@ -26,7 +26,7 @@
- Group=gdm
- HaltCommand=/sbin/shutdown -h now
+ # 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/
- PreSessionScriptDir=@EXPANDED_SYSCONFDIR@/gdm/PreSession/
-@@ -35,7 +35,7 @@
- FailsafeXServer=
- XKeepsCrashing=@EXPANDED_SYSCONFDIR@/gdm/XKeepsCrashing
- RebootCommand=/sbin/shutdown -r now
--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@
- ServAuthDir=@EXPANDED_AUTHDIR@
- SessionDir=@EXPANDED_SYSCONFDIR@/gdm/Sessions/
- SuspendCommand=
-@@ -46,9 +46,9 @@
- TimedLoginEnable=false
- TimedLogin=
- TimedLoginDelay=30
+@@ -80,11 +80,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
--Xnest=/usr/X11R6/bin/Xnest -name Xnest -kb
+ # the X nest command
+-Xnest=/usr/X11R6/bin/Xnest -name Xnest
 +Xnest=@EXPANDED_BINDIR@/Xnest -name Xnest
  
  [security]
  # If any distributions ship with this one off, they should be shot
-@@ -81,7 +81,7 @@
+@@ -118,7 +118,7 @@
  Willing=@EXPANDED_SYSCONFDIR@/gdm/Xwilling
  
  [gui]
@@ -48,7 +49,7 @@
  MaxIconWidth=128
  MaxIconHeight=128
  
-@@ -90,7 +90,7 @@
+@@ -127,7 +127,7 @@
  ConfigAvailable=true
  Browser=false
  DefaultFace=@EXPANDED_PIXMAPDIR@/nobody.png
@@ -56,9 +57,9 @@
 +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
- GlobalFaceDir=@EXPANDED_DATADIR@/faces/
-@@ -159,7 +159,7 @@
- 
+ # As an alternative to the above this is the minimum uid to show
+@@ -205,7 +205,7 @@
+ # Definition of the standard X server.
  [server-Standard]
  name=Standard server
 -command=/usr/X11R6/bin/X
@@ -66,7 +67,7 @@
  flexible=true
  
  # To use this server type you should add -query host or -indirect host
-@@ -167,7 +167,7 @@
+@@ -213,7 +213,7 @@
  [server-Terminal]
  name=Terminal server
  # Add -terminate to make things behave more nicely
diff --git a/x11/gdm2/files/patch-config_Makefile.in b/x11/gdm2/files/patch-config_Makefile.in
index 9eeef7f7cf7c..cd45ba7f3a66 100644
--- a/x11/gdm2/files/patch-config_Makefile.in
+++ b/x11/gdm2/files/patch-config_Makefile.in
@@ -1,6 +1,6 @@
---- config/Makefile.in.orig	Fri Aug  9 17:14:27 2002
-+++ config/Makefile.in	Fri Aug  9 17:34:18 2002
-@@ -282,71 +282,73 @@
+--- 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
  
@@ -11,9 +11,9 @@
 +	$(INSTALL_SCRIPT) $(srcdir)/XKeepsCrashing $(DESTDIR)$(confdir)/factory-XKeepsCrashing
  
 -	-if test -f $(DESTDIR)$(localedir)/locale.alias; then \
--		cp $(DESTDIR)$(localedir)/locale.alias $(DESTDIR)$(localedir)/locale.alias.orig; \
+-		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; \
++	    	$(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
@@ -24,26 +24,26 @@
  	fi
  
 -	-if test -f $(DESTDIR)$(sessdir)/Xsession; then \
--		cp $(DESTDIR)$(sessdir)/Xsession $(DESTDIR)$(sessdir)/Xsession.orig; \
+-		cp -f $(DESTDIR)$(sessdir)/Xsession $(DESTDIR)$(sessdir)/Xsession.orig; \
 +	if test '!' -f $(DESTDIR)$(sessdir)/Xsession; then \
-+		$(INSTALL_SCRIPT) Xsession $(DESTDIR)$(sessdir)/Xsession; \
++	    	$(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 $(DESTDIR)$(sessdir)/Gnome $(DESTDIR)$(sessdir)/Gnome.orig; \
+-		cp -f $(DESTDIR)$(sessdir)/Gnome $(DESTDIR)$(sessdir)/Gnome.orig; \
 +	if test '!' -f $(DESTDIR)$(sessdir)/Gnome; then \
-+		$(INSTALL_SCRIPT) Gnome $(DESTDIR)$(sessdir)/Gnome; \
++	    	$(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 $(DESTDIR)$(sessdir)/Default $(DESTDIR)$(sessdir)/Default.orig; \
+-			cp -f $(DESTDIR)$(sessdir)/Default $(DESTDIR)$(sessdir)/Default.orig; \
 +		if test '!' -f $(DESTDIR)$(sessdir)/Default; then \
-+			$(LN_S) -f $(sessdir)/Xsession $(DESTDIR)$(sessdir)/Default; \
++		    	$(LN_S) -f $(sessdir)/Xsession $(DESTDIR)$(sessdir)/Default; \
  		fi; \
 -		$(LN_S) -f $(sessdir)/Xsession $(DESTDIR)$(sessdir)/Default; \
  	fi
@@ -53,9 +53,9 @@
  		chmod 755 $(DESTDIR)$(initdir); \
  	fi
 -	-if test -f $(DESTDIR)$(initdir)/Default; then \
--		cp $(DESTDIR)$(initdir)/Default $(DESTDIR)$(initdir)/Default.orig; \
+-		cp -f $(DESTDIR)$(initdir)/Default $(DESTDIR)$(initdir)/Default.orig; \
 +	if test '!' -f $(DESTDIR)$(initdir)/Default; then \
-+		$(INSTALL_SCRIPT) $(srcdir)/Default $(DESTDIR)$(initdir)/Default; \
++	    	$(INSTALL_SCRIPT) $(srcdir)/Default $(DESTDIR)$(initdir)/Default; \
  	fi
 -	$(INSTALL_SCRIPT) $(srcdir)/Default $(DESTDIR)$(initdir)/Default
 +	$(INSTALL_SCRIPT) $(srcdir)/Default $(DESTDIR)$(initdir)/factory-Default
@@ -65,9 +65,9 @@
  		chmod 755 $(DESTDIR)$(predir); \
  	fi
 -	-if test -f $(DESTDIR)$(predir)/Default; then \
--		cp $(DESTDIR)$(predir)/Default $(DESTDIR)$(predir)/Default.orig; \
+-		cp -f $(DESTDIR)$(predir)/Default $(DESTDIR)$(predir)/Default.orig; \
 +	if test '!' -f $(DESTDIR)$(predir)/Default; then \
-+		$(INSTALL_SCRIPT) $(srcdir)/PreSession $(DESTDIR)$(predir)/Default; \
++	    	$(INSTALL_SCRIPT) $(srcdir)/PreSession $(DESTDIR)$(predir)/Default; \
  	fi
 -	$(INSTALL_SCRIPT) $(srcdir)/PreSession $(DESTDIR)$(predir)/Default
 +	$(INSTALL_SCRIPT) $(srcdir)/PreSession $(DESTDIR)$(predir)/factory-Default
@@ -77,9 +77,9 @@
  		chmod 755 $(DESTDIR)$(postdir); \
  	fi
 -	-if test -f $(DESTDIR)$(postdir)/Default; then \
--		cp $(DESTDIR)$(postdir)/Default $(DESTDIR)$(postdir)/Default.orig; \
+-		cp -f $(DESTDIR)$(postdir)/Default $(DESTDIR)$(postdir)/Default.orig; \
 +	if test '!' -f $(DESTDIR)$(postdir)/Default; then \
-+		$(INSTALL_SCRIPT) $(srcdir)/PostSession $(DESTDIR)$(postdir)/Default; \
++	    	$(INSTALL_SCRIPT) $(srcdir)/PostSession $(DESTDIR)$(postdir)/Default; \
  	fi
 -	$(INSTALL_SCRIPT) $(srcdir)/PostSession $(DESTDIR)$(postdir)/Default
 +	$(INSTALL_SCRIPT) $(srcdir)/PostSession $(DESTDIR)$(postdir)/factory-Default
@@ -90,9 +90,9 @@
  	fi
  
 -	-if test -f $(DESTDIR)$(gnomercdir)/gnomerc; then \
--		cp $(DESTDIR)$(gnomercdir)/gnomerc $(DESTDIR)$(gnomercdir)/gnomerc.orig; \
+-		cp -f $(DESTDIR)$(gnomercdir)/gnomerc $(DESTDIR)$(gnomercdir)/gnomerc.orig; \
 +	if test '!' -f $(DESTDIR)$(gnomercdir)/gnomerc; then \
-+		$(INSTALL_SCRIPT) gnomerc $(DESTDIR)$(gnomercdir)/gnomerc; \
++	    	$(INSTALL_SCRIPT) gnomerc $(DESTDIR)$(gnomercdir)/gnomerc; \
  	fi
 -	$(INSTALL_SCRIPT) gnomerc $(DESTDIR)$(gnomercdir)/gnomerc
 +	$(INSTALL_SCRIPT) gnomerc $(DESTDIR)$(gnomercdir)/factory-gnomerc
diff --git a/x11/gdm2/pkg-plist b/x11/gdm2/pkg-plist
index 2986c89f608e..4c2485f3bfaf 100644
--- a/x11/gdm2/pkg-plist
+++ b/x11/gdm2/pkg-plist
@@ -9,6 +9,7 @@ bin/gdmlogin
 bin/gdmmktemp
 bin/gdmphotosetup
 bin/gdmsetup
+bin/gdmthemetester
 @unexec if cmp -s %D/etc/gdm/Init/Default %D/etc/gdm/Init/factory-Default; then rm -f %D/etc/gdm/Init/Default; fi
 etc/gdm/Init/factory-Default
 @unexec if cmp -s %D/etc/gdm/PostSession/Default %D/etc/gdm/PostSession/factory-Default; then rm -f %D/etc/gdm/PostSession/Default; fi
@@ -30,6 +31,7 @@ etc/gdm/factory-locale.alias
 etc/rc.d/gdm.sh.sample
 sbin/gdm-restart
 sbin/gdm-safe-restart
+sbin/gdm-stop
 sbin/gdmaskpass
 sbin/gdmconfig
 share/gnome/applications/gdmflexiserver-xnest.desktop
@@ -54,7 +56,8 @@ share/gnome/gdm/themes/circles/flower.png
 share/gnome/gdm/themes/circles/help.png
 share/gnome/gdm/themes/circles/options.png
 share/gnome/gdm/themes/circles/screenshot.png
-share/gnome/pixmaps/gdm.xpm
+share/gnome/pixmaps/gdm-foot-logo.png
+share/gnome/pixmaps/gdm.png
 share/gnome/pixmaps/login-photo.png
 share/gnome/pixmaps/nobody.png
 share/gnome/pixmaps/nohost.png