7 files changed, 14 insertions, 38 deletions

diff --git a/x11/gdm2/Makefile b/x11/gdm2/Makefile
index ef96b92dbe70..9f7641b4e109 100644
--- a/x11/gdm2/Makefile
+++ b/x11/gdm2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gdm2
-PORTVERSION=	2.4.0.2
+PORTVERSION=	2.4.0.3
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=		2.0.0/sources/${PORTNAME:S/2$//}
diff --git a/x11/gdm2/distinfo b/x11/gdm2/distinfo
index 250ea139c840..958a20064ec3 100644
--- a/x11/gdm2/distinfo
+++ b/x11/gdm2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gdm-2.4.0.2.tar.bz2) = e349d25bcef445ed44327610b3a42d5f
+MD5 (gnome2/gdm-2.4.0.3.tar.bz2) = 6a859267d43f8bb652ececc6d68d37b4
diff --git a/x11/gdm2/files/patch-ag b/x11/gdm2/files/patch-ag
deleted file mode 100644
index dca3ff5bbf9b..000000000000
--- a/x11/gdm2/files/patch-ag
+++ /dev/null
@@ -1,11 +0,0 @@
---- config/Default.orig	Mon May 20 23:53:42 2002
-+++ config/Default	Mon May 20 23:53:55 2002
-@@ -1,7 +1,7 @@
- #!/bin/sh
- 
- #Color is now handled by gdmgreeter itself
--#/usr/bin/X11/xsetroot -solid "#007777"
-+#/usr/X11R6/bin/xsetroot -solid "#007777"
- 
- 
- 
diff --git a/x11/gdm2/files/patch-ah b/x11/gdm2/files/patch-ah
deleted file mode 100644
index 53dfab40a1bc..000000000000
--- a/x11/gdm2/files/patch-ah
+++ /dev/null
@@ -1,9 +0,0 @@
---- config/PreSession.orig	Mon May 20 23:54:34 2002
-+++ config/PreSession	Mon May 20 23:55:03 2002
-@@ -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/gdm2/files/patch-ai b/x11/gdm2/files/patch-ai
deleted file mode 100644
index b79b89270fc5..000000000000
--- a/x11/gdm2/files/patch-ai
+++ /dev/null
@@ -1,9 +0,0 @@
---- config/PostSession.orig	Mon May 20 23:55:40 2002
-+++ config/PostSession	Mon May 20 23:55:56 2002
-@@ -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/gdm2/files/patch-al b/x11/gdm2/files/patch-al
index 2b72bfecdfc3..731d036cf486 100644
--- a/x11/gdm2/files/patch-al
+++ b/x11/gdm2/files/patch-al
@@ -1,7 +1,10 @@
---- config/gnomerc.in.orig	Mon May 20 23:56:25 2002
-+++ config/gnomerc.in	Mon May 20 23:56:45 2002
-@@ -1 +1,4 @@
-+#!/bin/csh
-+
-+unsetenv LC_CTYPE
- exec @EXPANDED_BINDIR@/gnome-session
+--- 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/pkg-plist b/x11/gdm2/pkg-plist
index de59d56363f8..86c6aa197656 100644
--- a/x11/gdm2/pkg-plist
+++ b/x11/gdm2/pkg-plist
@@ -1,5 +1,6 @@
 bin/gdm
 bin/gdm-binary
+bin/gdmXnest
 bin/gdmXnestchooser
 bin/gdmchooser
 bin/gdmflexiserver
@@ -30,6 +31,7 @@ share/gnome/gdm/gdmchooser.glade
 share/gnome/gdm/gdmsetup.glade
 share/gnome/gdm/themes/happygnome/GdmGreeterTheme.desktop
 share/gnome/gdm/themes/happygnome/background.svg
+share/gnome/gdm/themes/happygnome/disconnect.png
 share/gnome/gdm/themes/happygnome/gnome-logo.png
 share/gnome/gdm/themes/happygnome/happygnome.xml
 share/gnome/gdm/themes/happygnome/options.png