17 files changed, 112 insertions, 312 deletions

diff --git a/x11/gdm2/Makefile b/x11/gdm2/Makefile
index a7936f0e8f8a..1b1bbdd63130 100644
--- a/x11/gdm2/Makefile
+++ b/x11/gdm2/Makefile
@@ -6,7 +6,8 @@
 #
 
 PORTNAME=	gdm2
-PORTVERSION=	2.4.1.6
+PORTVERSION=	2.4.4.1
+PORTREVISION=	1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=		sources/${PORTNAME:S/2$//}/2.4
@@ -23,10 +24,12 @@ USE_GNOME=	gnomeprefix gnomehack gnomehier libgnomeui librsvg2
 GNU_CONFIGURE=	yes
 USE_REINPLACE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
+		LDFLAGS="-L${LOCALBASE}/lib"
 
 GDMDIR?=	${PREFIX}/etc/gdm
 
+MAN1=		gdm.1
+
 .include <bsd.port.pre.mk>
 
 .if exists(/usr/include/security/pam_misc.h)
@@ -35,15 +38,6 @@ PLIST_SUB=	PAM_MISC=""
 PLIST_SUB=	PAM_MISC="@comment "
 .endif
 
-.if !defined(BATCH) && !defined(PACKAGE_BUILDING)
-IS_INTERACTIVE=	yes
-.endif
-
-.if !defined(BATCH) && !defined(PACKAGE_BUILDING)
-pre-fetch:
-	${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
-.endif
-
 post-extract:
 	@${SED} -e "s,%%PREFIX%%,${PREFIX},g" \
 		${FILESDIR}/gdm.sh.sample > ${WRKSRC}/gdm.sh.sample
diff --git a/x11/gdm2/distinfo b/x11/gdm2/distinfo
index c864a5809534..2e71c2da729e 100644
--- a/x11/gdm2/distinfo
+++ b/x11/gdm2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gdm-2.4.1.6.tar.bz2) = ef8cba099c650bd46661b764db2717bd
+MD5 (gnome2/gdm-2.4.4.1.tar.bz2) = 50e5fd07bf1a15b1638f41787415f81c
diff --git a/x11/gdm2/files/patch-ab b/x11/gdm2/files/patch-ab
index 10b04a198600..c3380dabafba 100644
--- a/x11/gdm2/files/patch-ab
+++ b/x11/gdm2/files/patch-ab
@@ -1,84 +1,47 @@
---- config/gdm.conf.in.orig	Fri Aug 23 18:53:53 2002
-+++ config/gdm.conf.in	Sun Oct 13 17:57:14 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 @@
+--- config/gdm.conf.in.orig	Wed Aug 20 13:40:45 2003
++++ config/gdm.conf.in	Wed Aug 20 22:29:47 2003
+@@ -73,7 +73,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@
+ #KillInitClients=true
+-LogDir=@EXPANDED_LOGDIR@
 +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/
-@@ -72,7 +72,7 @@
+ # Note that a post login script is run before a PreSession script.
+@@ -93,7 +93,7 @@
  # Reboot, Halt and suspend commands, you can add different commands
  # separated by a semicolon and gdm will use the first one it can find
- RebootCommand=/sbin/shutdown -r now;/usr/sbin/shutdown -r now
--HaltCommand=/usr/bin/poweroff;/sbin/poweroff;/sbin/shutdown -h now;/usr/sbin/shutdown -h now
+ #RebootCommand=/usr/bin/reboot;/sbin/reboot;/sbin/shutdown -r now;/usr/sbin/shutdown -r now
+-#HaltCommand=/usr/bin/poweroff;/sbin/poweroff;/sbin/shutdown -h now;/usr/sbin/shutdown -h now
 +HaltCommand=/sbin/shutdown -p now;/usr/sbin/shutdown -p now
- SuspendCommand=
+ #SuspendCommand=
  # Probably should not touch the below this is the standard setup
  ServAuthDir=@EXPANDED_AUTHDIR@
-@@ -84,16 +84,16 @@
- 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
+@@ -123,7 +123,7 @@
  # we force X to use specific vts.  turn VTAllocation to false if this
  # is causing problems.
- FirstVT=7
--VTAllocation=true
+ #FirstVT=7
+-#VTAllocation=true
 +VTAllocation=false
- 
- [security]
- # If any distributions ship with this one off, they should be shot
-@@ -153,7 +153,7 @@
+ # Should double login be treated with a warning (and possibility to change
+ # vts on linux systems for console logins)
+ #DoubleLoginWarning=true
+@@ -200,7 +200,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/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 vt9
- 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
+ #MaxIconWidth=128
+ #MaxIconHeight=128
+@@ -372,7 +372,7 @@
+ # to the command line
+ [server-Chooser]
+ name=Chooser server
+-command=@X_SERVER@
++command=@X_SERVER@ vt9
+ # Make this not appear in the flexible servers for now, but if you
+ # wish to allow a chooser server then make this true.  This is the
+ # only way to make a flexible chooser server that behaves nicely.
diff --git a/x11/gdm2/files/patch-at b/x11/gdm2/files/patch-at
deleted file mode 100644
index 2e73a9b0b71f..000000000000
--- a/x11/gdm2/files/patch-at
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
deleted file mode 100644
index 0f65061f2425..000000000000
--- a/x11/gdm2/files/patch-config_Makefile.in
+++ /dev/null
@@ -1,101 +0,0 @@
---- 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 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_PostSession b/x11/gdm2/files/patch-config_PostSession
deleted file mode 100644
index 98433e06673e..000000000000
--- a/x11/gdm2/files/patch-config_PostSession
+++ /dev/null
@@ -1,11 +0,0 @@
---- config/PostSession.orig	Wed Dec  4 14:05:13 2002
-+++ config/PostSession	Wed Dec  4 14:05:34 2002
-@@ -2,7 +2,7 @@
- 
- PATH=/usr/bin/X11:/usr/X11R6/bin:/opt/X11R6/bin:$PATH
- 
--if command -v sessreg > /dev/null 2>&1; then
-+if /usr/bin/which -s sessreg > /dev/null 2>&1; then
- 	sessreg -d -w /var/log/wtmp -u /var/run/utmp -x "$X_SERVERS" -h "$REMOTE_HOST" -l $DISPLAY $USER
- fi
- exit 0
diff --git a/x11/gdm2/files/patch-config_PreSession b/x11/gdm2/files/patch-config_PreSession
deleted file mode 100644
index 4a37fa9db2f9..000000000000
--- a/x11/gdm2/files/patch-config_PreSession
+++ /dev/null
@@ -1,16 +0,0 @@
---- config/PreSession.orig	Wed Dec  4 14:05:38 2002
-+++ config/PreSession	Wed Dec  4 14:06:04 2002
-@@ -8,11 +8,11 @@
- #
- PATH=/usr/bin/X11:/usr/X11R6/bin:/opt/X11R6/bin:$PATH
- 
--if command -v xsetroot > /dev/null 2>&1; then
-+if /usr/bin/which -s xsetroot > /dev/null 2>&1; then
- 	xsetroot -cursor_name left_ptr -solid "#363047"
- fi
- 
--if command -v sessreg > /dev/null 2>&1; then
-+if /usr/bin/which -s sessreg > /dev/null 2>&1; then
- 	# some output for easy debugging
- 	echo "$0: Registering your session with wtmp and utmp"
- 	echo "$0: running: sessreg -a -w /var/log/wtmp -u /var/run/utmp -x \"$X_SERVERS\" -h \"$REMOTE_HOST\" -l $DISPLAY $USER"
diff --git a/x11/gdm2/files/patch-config_locale.alias b/x11/gdm2/files/patch-config_locale.alias
index c29dfa7f5bcb..45001031a696 100644
--- a/x11/gdm2/files/patch-config_locale.alias
+++ b/x11/gdm2/files/patch-config_locale.alias
@@ -1,5 +1,5 @@
---- config/locale.alias.orig	Sat Mar 15 05:31:02 2003
-+++ config/locale.alias	Mon May  5 21:44:02 2003
+--- config/locale.alias.orig	Thu May 15 22:56:46 2003
++++ config/locale.alias	Mon Sep 15 23:41:05 2003
 @@ -14,76 +14,36 @@
  #
  #		- George
@@ -83,30 +83,30 @@
 +Croatian               hr_HR.UTF-8,hr_HR.ISO_8859-2
 +Czech                  cs_CZ.UTF-8,cs_CZ.ISO_8859-2
 +Danish                 da_DK.UTF-8,da_DK.ISO_8859-1
-+Dutch                  nl_NL.UTF-8,nl_NL.ISO_8859-1
++Dutch                  nl_NL.UTF-8,nl_NL.ISO_8859-15
 +Estonian               et_EE.UTF-8,et_EE.ISO_8859-15
 +English(American)      en_US.UTF-8,en_US.ISO_8859-1
 +English(Australian)    en_AU.UTF-8,en_AU.ISO_8859-1
 +English(British)       en_GB.UTF-8,en_GB.ISO_8859-1
-+Finnish                        fi_FI.UTF-8,fi_FI.ISO_8859-1
-+French                 fr_FR.UTF-8,fr_FR.ISO_8859-1
-+German                 de_DE.UTF-8,de_DE.ISO_8859-1
++Finnish                        fi_FI.UTF-8,fi_FI.ISO_8859-15
++French                 fr_FR.UTF-8,fr_FR.ISO_8859-15
++German                 de_DE.UTF-8,de_DE.ISO_8859-15
 +Greek                  el_GR.UTF-8,el_GR.ISO_8859-7
 +Hungarian              hu_HU.UTF-8,hu_HU.ISO_8859-2
 +Icelandic              is_IS.UTF-8,is_IS.ISO_8859-1
-+Italian                        it_IT.UTF-8,it_IT.ISO_8859-1
++Italian                        it_IT.UTF-8,it_IT.ISO_8859-15
 +Japanese               ja_JP.UTF-8,ja_JP.EUC
 +Korean                 ko_KR.UTF-8,ko_KR.EUC
 +Lithuanian             lt_LT.UTF-8,lt_LT.ISO_8859-4
 +Norwegian(bokmal)      no_NO.UTF-8,no_NO.ISO_8859-1
 +Polish                 pl_PL.UTF-8,pl_PL.ISO_8859-2
-+Portuguese             pt_PT.UTF-8,pt_PT.ISO_8859-1
++Portuguese             pt_PT.UTF-8,pt_PT.ISO_8859-15
 +Portuguese(Brazilian)  pt_BR.UTF-8,pt_BR.ISO8859-1
 +Romanian               ro_RO.UTF-8,ro_RO.ISO8859-2
 +Russian                        ru_RU.UTF-8,ru_RU.ISO_8859-5
 +Slovak                 sk_SK.UTF-8,sk_SK.ISO_8859-2
 +Slovenian              sl_SI.UTF-8,sl_SI.ISO_8859-2
-+Spanish                        es_ES.UTF-8,es_ES.ISO_8859-1
++Spanish                        es_ES.UTF-8,es_ES.ISO_8859-15
 +Swedish                        sv_SE.UTF-8,sv_SE.ISO_8859-1
 +Turkish                        tr_TR.UTF-8,tr_TR.ISO_8859-9
 +Ukrainian              uk_UA.UTF-8,uk_UA.ISO8859-5
diff --git a/x11/gdm2/files/patch-configure b/x11/gdm2/files/patch-configure
index e6e122ab8c2d..cbbc44334163 100644
--- a/x11/gdm2/files/patch-configure
+++ b/x11/gdm2/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	Mon May  5 12:32:19 2003
-+++ configure	Mon May  5 21:45:38 2003
-@@ -9772,6 +9772,8 @@
+--- configure.orig	Sat Jun 28 18:15:07 2003
++++ configure	Sat Jun 28 18:15:08 2003
+@@ -20222,6 +20222,8 @@
  cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
diff --git a/x11/gdm2/files/patch-daemon_gdm.c b/x11/gdm2/files/patch-daemon_gdm.c
index 76c115f8b982..787890f2a06e 100644
--- a/x11/gdm2/files/patch-daemon_gdm.c
+++ b/x11/gdm2/files/patch-daemon_gdm.c
@@ -1,6 +1,6 @@
---- 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 @@
+--- daemon/gdm.c.orig	Wed Jun 25 17:04:49 2003
++++ daemon/gdm.c	Sat Jun 28 18:17:44 2003
+@@ -38,7 +38,7 @@
  #include <locale.h>
  
  /* This should be moved to auth.c I suppose */
diff --git a/x11/gdm2/files/patch-daemon_slave.c b/x11/gdm2/files/patch-daemon_slave.c
deleted file mode 100644
index 27ac0544a6df..000000000000
--- a/x11/gdm2/files/patch-daemon_slave.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- 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
deleted file mode 100644
index 33924be670f7..000000000000
--- a/x11/gdm2/files/patch-gui::gdmsetup.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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);
- 
diff --git a/x11/gdm2/files/patch-gui_gdmphotosetup.c b/x11/gdm2/files/patch-gui_gdmphotosetup.c
deleted file mode 100644
index 6121bdf93f9f..000000000000
--- a/x11/gdm2/files/patch-gui_gdmphotosetup.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- gui/gdmphotosetup.c.orig	Mon May  5 21:47:14 2003
-+++ gui/gdmphotosetup.c	Mon May  5 21:47:39 2003
-@@ -22,6 +22,7 @@
- #include <libgnome/libgnome.h>
- #include <libgnomeui/libgnomeui.h>
- #include <sys/types.h>
-+#include <signal.h>
- #include <sys/stat.h>
- #include <fcntl.h>
- #include <errno.h>
diff --git a/x11/gdm2/files/patch-ltmain.sh b/x11/gdm2/files/patch-ltmain.sh
index c99e4f3bc218..04395ca76c1d 100644
--- a/x11/gdm2/files/patch-ltmain.sh
+++ b/x11/gdm2/files/patch-ltmain.sh
@@ -1,5 +1,5 @@
---- ltmain.sh.orig	Tue Jul  1 14:15:27 2003
-+++ ltmain.sh	Fri Aug  1 15:54:24 2003
+--- ltmain.sh.orig	Tue Jun 24 14:39:01 2003
++++ ltmain.sh	Sat Jun 28 18:20:02 2003
 @@ -1280,7 +1280,7 @@
  	  esac
  	elif test "X$arg" = "X-lc_r"; then
diff --git a/x11/gdm2/pkg-install b/x11/gdm2/pkg-install
index e373a44e33ca..b8f29b328edf 100644
--- a/x11/gdm2/pkg-install
+++ b/x11/gdm2/pkg-install
@@ -40,7 +40,3 @@ if [ "$2" = "POST-INSTALL" ]; then
 	${CHMOD} 0750 ${PKG_PREFIX}/share/gnome/gdm
 	exit 0
 fi
-
-if [ -z "${BATCH}" ]; then
-	/usr/bin/dialog --yesno "GDM may contain vulnerabilities leading local root compromise, and it is reported widely with various security sites and groups. It is not recommended that this port be installed in public environment. Do you wish to accept the security risk and build GDM anyway?" 10 60 || /usr/bin/false
-fi
diff --git a/x11/gdm2/pkg-message b/x11/gdm2/pkg-message
index 91ce3698bdce..6f3b7dcba333 100644
--- a/x11/gdm2/pkg-message
+++ b/x11/gdm2/pkg-message
@@ -1,20 +1,25 @@
 GDM is installed.
 
-Please note the following:
-- This port has been tested on 5.0-CURRENT and 4.4-RELEASE and higher.
-- If you are running a version of FreeBSD prior to 4.5-PRERELEASE, you should 
-  append these lines to your /etc/pam.conf, otherwise GDM will refuse all 
-  logins:
+Do _NOT_ use /etc/ttys to start gdm at boot time.  This will result in gdm 
+hanging or restarting constantly.  Instead, copy the included gdm.sh.sample 
+script to gdm.sh, and restart.  This script is found, by default, in
+/usr/X11R6/etc/rc.d.
 
-# gdm config
-gdm     auth            requisite       pam_unix.so     try_first_pass
-gdm     account         requisite       pam_unix.so     try_first_pass
-gdm     session         required        pam_permit.so
+GDM uses its own locale.alias file to determine its language and especially
+the GNOME-2 fontencoding. This file is located, by default, in 
+/usr/X11R6/etc/gdm/locale.alias.  By default, the character set for every 
+county using the EURO currency is set to ISO8859-15 in order to enable the 
+EURO sign. If you don't feel comfortable with this, edit this file according 
+to your preferences.
 
-- Do _NOT_ use /etc/ttys to start gdm at boot time.  This will result in gdm 
-  hanging or restarting constantly.  Instead, copy the included gdm.sh.sample 
-  script to gdm.sh, and restart.  This script is found, by default, in
-  /usr/X11R6/etc/rc.d.
+If you are running 5.x and you are running 5.1-RELEASE or earlier, GDM will 
+fail to work due to a bug in OpenPAM.  You can download a patch from
+http://www.FreeBSD.org/~marcus/pam_get_user.c.diff.  You must also have the
+FreeBSD src tree on your system.  Do the following to apply the patch:
 
-These notes were written by:  Yukihiro Nakai <nakai@FreeBSD.org>
-and updated by: Joe Marcus Clarke <marcus@FreeBSD.org>
+# cd /usr
+# patch -p < /path/to/pam_get_user.c.diff
+
+
+Then rebuild and install world.  Note, this bug does _NOT_ affect FreeBSD
+4.x.
diff --git a/x11/gdm2/pkg-plist b/x11/gdm2/pkg-plist
index 2068ea98c795..d5a0e5916241 100644
--- a/x11/gdm2/pkg-plist
+++ b/x11/gdm2/pkg-plist
@@ -6,42 +6,35 @@ bin/gdmchooser
 bin/gdmflexiserver
 bin/gdmgreeter
 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
-@exec [ -f %B/Default ] || cp %B/%f %B/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
-etc/gdm/PostSession/factory-Default
-@exec [ -f %B/Default ] || cp %B/%f %B/Default
-@unexec if cmp -s %D/etc/gdm/PreSession/Default %D/etc/gdm/PreSession/factory-Default; then rm -f %D/etc/gdm/PreSession/Default; fi
-etc/gdm/PreSession/factory-Default
-@exec [ -f %B/Default ] || cp %B/%f %B/Default
-@unexec if cmp -s %D/etc/gdm/Sessions/Gnome %D/etc/gdm/Sessions/factory-Gnome; then rm -f %D/etc/gdm/Sessions/Gnome; fi
-etc/gdm/Sessions/factory-Gnome
-@exec [ -f %B/Gnome ] || cp %B/%f %B/Gnome
-@unexec if cmp -s %D/etc/gdm/Sessions/Xsession %D/etc/gdm/Sessions/factory-Xsession; then rm -f %D/etc/gdm/Sessions/Xsession; fi
-etc/gdm/Sessions/factory-Xsession
-@exec [ -f %B/Xsession ] || cp %B/%f %B/Xsession
-@unexec if cmp -s %D/etc/gdm/XKeepsCrashing %D/etc/gdm/factory-XKeepsCrashing; then rm -f %D/etc/gdm/XKeepsCrashing; fi
-etc/gdm/factory-XKeepsCrashing
-@exec [ -f %B/XKeepsCrashing ] || cp %B/%f %B/XKeepsCrashing
-@unexec if cmp -s %D/etc/gdm/gnomerc %D/etc/gdm/factory-gnomerc; then rm -f %D/etc/gdm/gnomerc; fi
-etc/gdm/factory-gnomerc
-@exec [ -f %B/gnomerc ] || cp %B/%f %B/gnomerc
+etc/dm/Sessions/Default.desktop
+etc/dm/Sessions/gnome.desktop
+etc/gdm/Init/Default
+etc/gdm/PostLogin/Default.sample
+etc/gdm/PostSession/Default
+etc/gdm/PreSession/Default
+etc/gdm/XKeepsCrashing
+etc/gdm/Xsession
 @unexec if cmp -s %D/etc/gdm/gdm.conf %D/etc/gdm/factory-gdm.conf; then rm -f %D/etc/gdm/gdm.conf; fi
 etc/gdm/factory-gdm.conf
 @exec [ -f %B/gdm.conf ] || cp %B/%f %B/gdm.conf
-@unexec if cmp -s %D/etc/gdm/locale.alias %D/etc/gdm/factory-locale.alias; then rm -f %D/etc/gdm/locale.alias; fi
-etc/gdm/factory-locale.alias
-@exec [ -f %B/locale.alias ] || cp %B/%f %B/locale.alias
+etc/gdm/locale.alias
+@unexec if cmp -s %D/etc/gdm/modules/AccessDwellMouseEvents %D/etc/gdm/modules/factory-AccessDwellMouseEvents; then rm -f %D/etc/gdm/modules/AccessDwellMouseEvents; fi
+etc/gdm/modules/factory-AccessDwellMouseEvents
+@exec [ -f %B/AccessDwellMouseEvents ] || cp %B/%f %B/AccessDwellMouseEvents
+@unexec if cmp -s %D/etc/gdm/modules/AccessKeyMouseEvents %D/etc/gdm/modules/factory-AccessKeyMouseEvents; then rm -f %D/etc/gdm/modules/AccessKeyMouseEvents; fi
+etc/gdm/modules/factory-AccessKeyMouseEvents
+@exec [ -f %B/AccessKeyMouseEvents ] || cp %B/%f %B/AccessKeyMouseEvents
 etc/rc.d/gdm.sh.sample
+lib/gtk-2.0/modules/libdwellmouselistener.so
+lib/gtk-2.0/modules/libkeymouselistener.so
+%%PAM_MISC%%libexec/gdmaskpass
+libexec/gdmtranslate
 sbin/gdm-restart
 sbin/gdm-safe-restart
 sbin/gdm-stop
-%%PAM_MISC%%sbin/gdmaskpass
 sbin/gdmconfig
 share/gnome/applications/gdmflexiserver-xnest.desktop
 share/gnome/applications/gdmflexiserver.desktop
@@ -49,6 +42,15 @@ share/gnome/applications/gdmsetup.desktop
 share/gnome/capplets/gdmphotosetup.desktop
 share/gnome/gdm/gdmchooser.glade
 share/gnome/gdm/gdmsetup.glade
+share/gnome/gdm/themes/happygnome-list/GdmGreeterTheme.desktop
+share/gnome/gdm/themes/happygnome-list/background.svg
+share/gnome/gdm/themes/happygnome-list/disconnect.png
+share/gnome/gdm/themes/happygnome-list/gnome-logo.png
+share/gnome/gdm/themes/happygnome-list/happygnome.xml
+share/gnome/gdm/themes/happygnome-list/options.png
+share/gnome/gdm/themes/happygnome-list/screenshot.png
+share/gnome/gdm/themes/happygnome-list/session.png
+share/gnome/gdm/themes/happygnome-list/system.png
 share/gnome/gdm/themes/happygnome/GdmGreeterTheme.desktop
 share/gnome/gdm/themes/happygnome/background.svg
 share/gnome/gdm/themes/happygnome/disconnect.png
@@ -65,6 +67,10 @@ 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/help/gdm/C/gdm.xml
+share/gnome/help/gdm/C/legal.xml
+share/gnome/omf/gdm/gdm-C.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gdm/gdm-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/pixmaps/gdm-foot-logo.png
 share/gnome/pixmaps/gdm.png
 share/gnome/pixmaps/login-photo.png
@@ -78,6 +84,7 @@ share/locale/bg/LC_MESSAGES/gdm-2.4.mo
 share/locale/bn/LC_MESSAGES/gdm-2.4.mo
 share/locale/ca/LC_MESSAGES/gdm-2.4.mo
 share/locale/cs/LC_MESSAGES/gdm-2.4.mo
+share/locale/cy/LC_MESSAGES/gdm-2.4.mo
 share/locale/da/LC_MESSAGES/gdm-2.4.mo
 share/locale/de/LC_MESSAGES/gdm-2.4.mo
 share/locale/el/LC_MESSAGES/gdm-2.4.mo
@@ -112,6 +119,7 @@ share/locale/ro/LC_MESSAGES/gdm-2.4.mo
 share/locale/ru/LC_MESSAGES/gdm-2.4.mo
 share/locale/sk/LC_MESSAGES/gdm-2.4.mo
 share/locale/sl/LC_MESSAGES/gdm-2.4.mo
+share/locale/sq/LC_MESSAGES/gdm-2.4.mo
 share/locale/sr/LC_MESSAGES/gdm-2.4.mo
 share/locale/sr@Latn/LC_MESSAGES/gdm-2.4.mo
 share/locale/sv/LC_MESSAGES/gdm-2.4.mo
@@ -123,7 +131,13 @@ share/locale/vi/LC_MESSAGES/gdm-2.4.mo
 share/locale/wa/LC_MESSAGES/gdm-2.4.mo
 share/locale/zh_CN/LC_MESSAGES/gdm-2.4.mo
 share/locale/zh_TW/LC_MESSAGES/gdm-2.4.mo
+@dirrm share/gnome/omf/gdm
+@dirrm share/gnome/help/gdm/C
 @dirrm share/gnome/gdm/themes/happygnome
+@dirrm share/gnome/gdm/themes/happygnome-list
 @dirrm share/gnome/gdm/themes/circles
 @dirrm share/gnome/gdm/themes
 @dirrm etc/pam.d
+@dirrm etc/gdm/modules
+@unexec /bin/rmdir %D/etc/dm 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gdm/gdm-C.omf 2>/dev/null || /usr/bin/true