author: Joe Marcus Clarke <marcus@FreeBSD.org> 2009-01-10 05:22:13 +0000
committer: Joe Marcus Clarke <marcus@FreeBSD.org> 2009-01-10 05:22:13 +0000
commit: 610ae5681637c1051a0c17b54e29d97f53da2f3a (patch)
tree: c231a1eb74b07e444fa7363012cb84bf23d83ce0 /x11/gdm
parent: 15b6544926b07a98710eeb765baf03e3fc9a195c (diff)
download: ports-610ae5681637c1051a0c17b54e29d97f53da2f3a.tar.gz
ports-610ae5681637c1051a0c17b54e29d97f53da2f3a.zip
31 files changed, 462 insertions, 541 deletions
diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile
index 2daced2d3639..42a182d4b50d 100644
--- a/x11/gdm/Makefile
+++ b/x11/gdm/Makefile
@@ -3,11 +3,12 @@
 # Whom:                Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11/gdm/Makefile,v 1.117 2008/03/22 04:21:52 mezz Exp $
+#   $MCom: ports/x11/gdm/Makefile,v 1.142 2009/01/10 01:59:22 mezz Exp $
 #
 
 PORTNAME=	gdm
-PORTVERSION=	2.20.8
+PORTVERSION=	2.24.1
+PORTREVISION=	3
 CATEGORIES=	x11 gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -16,27 +17,27 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME 2 version of xdm display manager
 
 BUILD_DEPENDS=	zenity:${PORTSDIR}/x11/zenity
-LIB_DEPENDS=	popt.0:${PORTSDIR}/devel/popt \
-		ck-connector.0:${PORTSDIR}/sysutils/consolekit
+LIB_DEPENDS=	ck-connector.0:${PORTSDIR}/sysutils/consolekit \
+    		execinfo:${PORTSDIR}/devel/libexecinfo
 RUN_DEPENDS=	zenity:${PORTSDIR}/x11/zenity \
-		xrdb:${PORTSDIR}/x11/xrdb
+		${LOCALBASE}/libexec/gnome-settings-daemon:${PORTSDIR}/sysutils/gnome-settings-daemon
 
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
 USE_LDCONFIG=	yes
 USE_XORG=	dmx dmxproto
-INSTALLS_OMF=	yes
 INSTALLS_ICONS=	yes
 USE_RC_SUBR=	gdm
 USE_GNOME_SUBR=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomehack intlhack gnomehier librsvg2 gnomedocutils \
-		gnomeprefix
+USE_GNOME=	gnomehack intlhack gnomehier libgnomeui librsvg2 gnomedocutils \
+		gnomeprefix gnomepanel
+GCONF_SCHEMAS=	gdm-simple-greeter.schemas
 GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--with-working-directory=${PREFIX}/etc/gdm/home
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib" \
 		GTKDOC="false"
-CONFIGURE_ARGS=--with-console-kit=yes
 
 SUB_FILES+=	gdm.pam
 
@@ -45,11 +46,8 @@ PKGMESSAGE=	${WRKDIR}/pkg-message
 
 GNOME_LOCALSTATEDIR=	/var
 
-MAN1=		gdm.1
-
-OPTIONS=	IPV6 "Enable IPv6 support" off \
-		KEYRING "Enable GnomeKeyring/PAM integration" on \
-		LOG_LIMIT "Limit ~/.xsession-errors size" on
+OPTIONS=	IPV6 "Enable IPv6 support" on \
+		KEYRING "Enable GnomeKeyring/PAM integration" on
 
 .include <bsd.port.pre.mk>
 
@@ -66,25 +64,28 @@ CONFIGURE_ARGS+=	--enable-ipv6
 CONFIGURE_ARGS+=	--disable-ipv6
 .endif
 
-.if defined(WITHOUT_LOG_LIMIT)
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-daemon_slave.c
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|root:root|root:wheel|g' \
-		${WRKSRC}/config/Makefile.in
+		${WRKSRC}/data/Makefile.in
+	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
+	    	${WRKSRC}/daemon/gdm-session-worker.c \
+		${WRKSRC}/data/gconf.path
+	@${REINPLACE_CMD} -e 's|/bin/true|/usr/bin/true|g' \
+	    	${WRKSRC}/data/session-setup.entries
 	@${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|g' \
-		${WRKSRC}/configure ${WRKSRC}/po/*.po ${WRKSRC}/gui/*.glade \
-		${WRKSRC}/daemon/*.c ${WRKSRC}/docs/*/*.*
-	@${REINPLACE_CMD} -e 's|/etc/gdm/gdm.conf|${PREFIX}/etc/gdm/gdm.conf|' \
-		${WRKSRC}/docs/gdm.1
+		${WRKSRC}/configure ${WRKSRC}/daemon/*.c ${WRKSRC}/po/*.po
 
 post-install:
+	${INSTALL_DATA} ${WRKSRC}/data/gconf.path \
+	    	${PREFIX}/share/gdm/gconf.path
+	${INSTALL_DATA} ${WRKSRC}/data/session-setup.entries \
+	    	${PREFIX}/share/gdm/session-setup.entries
 .if !defined(PACKAGE_BUILDING)
 	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 .endif
-	${INSTALL_DATA} ${WRKSRC}/config/gdm.conf-custom \
+	${INSTALL_DATA} ${WRKSRC}/data/gdm.conf-custom \
 		${PREFIX}/etc/gdm/custom.conf.default
+	${MKDIR} ${PREFIX}/share/xsessions
 	${INSTALL_DATA} ${WRKDIR}/gdm.pam ${PREFIX}/etc/pam.d/gdm
 	@${MKDIR} ${PREFIX}/etc/gdm/Sessions
 	@${SED} -e 's|%%PREFIX%%|${PREFIX}|g' < ${PKGDIR}/pkg-message \
diff --git a/x11/gdm/distinfo b/x11/gdm/distinfo
index e1471686b775..70511a9d1f11 100644
--- a/x11/gdm/distinfo
+++ b/x11/gdm/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gdm-2.20.8.tar.bz2) = c183b017280e6ef25ad38d618aac2271
-SHA256 (gnome2/gdm-2.20.8.tar.bz2) = cef608d263866003f573a9b80d29c635a74ee73343d3f45bb381cf50b5c52894
-SIZE (gnome2/gdm-2.20.8.tar.bz2) = 3932232
+MD5 (gnome2/gdm-2.24.1.tar.bz2) = 31139d7a79096463b127b4790058b056
+SHA256 (gnome2/gdm-2.24.1.tar.bz2) = 8869f464818a1626e481bba5c562bdb972ffb74f1a9da91d01199fa860ee040f
+SIZE (gnome2/gdm-2.24.1.tar.bz2) = 2579979
diff --git a/x11/gdm/files/extra-patch-daemon_slave.c b/x11/gdm/files/extra-patch-daemon_slave.c
deleted file mode 100644
index b493dcd80ad9..000000000000
--- a/x11/gdm/files/extra-patch-daemon_slave.c
+++ /dev/null
@@ -1,26 +0,0 @@
---- daemon/slave.c.orig	2007-09-17 10:45:50.000000000 -0400
-+++ daemon/slave.c	2007-09-25 13:42:06.000000000 -0400
-@@ -373,8 +373,7 @@
- 			break;
- 		}
- 
--		if G_UNLIKELY (d->xsession_errors_bytes >= MAX_XSESSION_ERRORS_BYTES ||
--			       got_xfsz_signal)
-+		if G_UNLIKELY (got_xfsz_signal)
- 			continue;
- 
- 		/* write until we succeed in writing something */
-@@ -397,13 +396,6 @@
- 
- 		d->xsession_errors_bytes += r;
- 
--		if G_UNLIKELY (d->xsession_errors_bytes >= MAX_XSESSION_ERRORS_BYTES &&
--			       ! got_xfsz_signal) {
--			VE_IGNORE_EINTR (write (d->xsession_errors_fd,
--						"\n...Too much output, ignoring rest...\n",
--						strlen ("\n...Too much output, ignoring rest...\n")));
--		}
--
- 		/* there wasn't more then buf available, so no need to try reading
- 		 * again, unless we really want to */
- 		if (r < sizeof (buf) && ! read_until_eof)
diff --git a/x11/gdm/files/gdm.in b/x11/gdm/files/gdm.in
index 370a40fa1c02..ecb043cd5041 100644
--- a/x11/gdm/files/gdm.in
+++ b/x11/gdm/files/gdm.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 # $FreeBSD$
-#    $MCom: ports/x11/gdm/files/gdm.in,v 1.28 2008/03/11 04:21:47 mezz Exp $
+#    $MCom: ports/x11/gdm/files/gdm.in,v 1.32 2008/08/17 17:31:43 marcus Exp $
 
 # PROVIDE: gdm
 # REQUIRE: LOGIN cleanvar moused syscons dbus
@@ -18,7 +18,7 @@ gdm_preserve_base_pam_conf=${gdm_preserve_base_pam_conf-NO}
 
 export PATH=/bin:/sbin:/usr/bin:/usr/sbin:%%LOCALBASE%%/bin:%%LOCALBASE%%/sbin
 
-name=gdm
+name="gdm"
 rcvar=`set_rcvar`
 command="%%PREFIX%%/sbin/${name}"
 pidfile="/var/run/${name}.pid"
diff --git a/x11/gdm/files/patch-common_Makefile.in b/x11/gdm/files/patch-common_Makefile.in
new file mode 100644
index 000000000000..2ab0a50015ea
--- /dev/null
+++ b/x11/gdm/files/patch-common_Makefile.in
@@ -0,0 +1,20 @@
+--- common/Makefile.in.orig	2008-08-20 14:34:16.000000000 -0400
++++ common/Makefile.in	2008-08-20 14:36:50.000000000 -0400
+@@ -428,7 +428,8 @@ gdm_crash_logger_CPPFLAGS = \
+ 	-DLOCALSTATEDIR=\"$(localstatedir)\"	\
+ 	$(NULL)
+ 
+-gdm_crash_logger_LDADD = $(GTHREAD_LIBS)
++gdm_crash_logger_LDADD = $(GTHREAD_LIBS)	\
++			 -lexecinfo
+ @MKDTEMP_MISSING_FALSE@MKDTEMP_FILES = 
+ @MKDTEMP_MISSING_TRUE@MKDTEMP_FILES = mkdtemp.c mkdtemp.h
+ libgdmcommon_la_SOURCES = \
+@@ -473,6 +474,7 @@ libgdmcommon_la_CFLAGS = \
+ 	$(NULL)
+ 
+ libgdmcommon_la_LIBADD = \
++	-lexecinfo			\
+ 	$(NULL)
+ 
+ libgdmcommon_la_LDFLAGS = \
diff --git a/x11/gdm/files/patch-common_gdm-address.c b/x11/gdm/files/patch-common_gdm-address.c
new file mode 100644
index 000000000000..4c38474cb637
--- /dev/null
+++ b/x11/gdm/files/patch-common_gdm-address.c
@@ -0,0 +1,27 @@
+--- common/gdm-address.c.orig	2008-04-17 23:29:27.000000000 -0400
++++ common/gdm-address.c	2008-05-02 14:36:15.000000000 -0400
+@@ -29,6 +29,8 @@
+ #include <stropts.h>
+ #endif
+ #include <string.h>
++#include <sys/types.h>
++#include <sys/param.h>
+ #ifdef HAVE_SYS_SOCKET_H
+ #include <sys/socket.h>
+ #endif
+@@ -37,7 +39,6 @@
+ #endif
+ #include <netdb.h>
+ #include <sys/ioctl.h>
+-#include <net/if.h>
+ 
+ #ifndef G_OS_WIN32
+ #include <sys/select.h>
+@@ -47,6 +48,7 @@
+ #include <winsock2.h>
+ #include <ws2tcpip.h>
+ #endif
++#include <net/if.h>
+ 
+ #include <glib-object.h>
+ 
diff --git a/x11/gdm/files/patch-common_gdm-common.c b/x11/gdm/files/patch-common_gdm-common.c
new file mode 100644
index 000000000000..9fa4acafa6c8
--- /dev/null
+++ b/x11/gdm/files/patch-common_gdm-common.c
@@ -0,0 +1,13 @@
+--- common/gdm-common.c.orig	2007-12-23 10:29:20.000000000 +0100
++++ common/gdm-common.c	2007-12-23 10:29:34.000000000 +0100
+@@ -33,6 +33,10 @@
+ 
+ #include "gdm-common.h"
+ 
++#ifndef ENODATA
++#define ENODATA EAGAIN
++#endif
++
+ void
+ gdm_set_fatal_warnings_if_unstable (void)
+ {
diff --git a/x11/gdm/files/patch-common_gdm-settings-keys.h b/x11/gdm/files/patch-common_gdm-settings-keys.h
new file mode 100644
index 000000000000..06ebc0800e18
--- /dev/null
+++ b/x11/gdm/files/patch-common_gdm-settings-keys.h
@@ -0,0 +1,10 @@
+--- common/gdm-settings-keys.h.orig	2008-02-20 16:27:34.000000000 -0500
++++ common/gdm-settings-keys.h	2008-02-25 22:23:35.000000000 -0500
+@@ -30,6 +30,7 @@ G_BEGIN_DECLS
+ #define GDM_KEY_TIMED_LOGIN_ENABLE "daemon/TimedLoginEnable"
+ #define GDM_KEY_TIMED_LOGIN_USER "daemon/TimedLogin"
+ #define GDM_KEY_TIMED_LOGIN_DELAY "daemon/TimedLoginDelay"
++#define GDM_KEY_VT "daemon/VT"
+ 
+ #define GDM_KEY_XDMCP_ENABLE "xdmcp/Enable"
+ #define GDM_KEY_MAX_PENDING "xdmcp/MaxPending"
diff --git a/x11/gdm/files/patch-config.h.in b/x11/gdm/files/patch-config.h.in
new file mode 100644
index 000000000000..d17901da1124
--- /dev/null
+++ b/x11/gdm/files/patch-config.h.in
@@ -0,0 +1,12 @@
+--- config.h.in.orig	2007-11-02 20:48:28.000000000 -0400
++++ config.h.in	2007-11-02 20:49:39.000000000 -0400
+@@ -23,6 +23,9 @@
+ #undef HAVE_LC_MESSAGES
+ #undef HAVE_LIBSM
+ #undef HAVE_LIBXDMCP
++#undef HAVE_LOGIN
++#undef HAVE_LOGOUT
++#undef HAVE_LOGWTMP
+ #undef HAVE_LOGINCAP
+ #undef HAVE_LOGINDEVPERM
+ #undef HAVE_LOGINRESTRICTIONS
diff --git a/x11/gdm/files/patch-config_gdm.conf.in b/x11/gdm/files/patch-config_gdm.conf.in
deleted file mode 100644
index 6382bd445fd8..000000000000
--- a/x11/gdm/files/patch-config_gdm.conf.in
+++ /dev/null
@@ -1,17 +0,0 @@
---- config/gdm.conf.in.orig	Mon Apr  9 01:15:16 2007
-+++ config/gdm.conf.in	Mon Apr  9 09:38:08 2007
-@@ -174,11 +174,11 @@
- # using this Xnest, the value should be true.
- XnestUnscaledFontPath=@X_XNEST_UNSCALED_FONTPATH@
- 
--# Automatic VT allocation.  Right now only works on Linux.  This way we force
-+# Automatic VT allocation.  This way we force
- # X to use specific vts.  Turn VTAllocation to false if this is causing
- # problems.
--#FirstVT=7
--#VTAllocation=true
-+FirstVT=9
-+VTAllocation=true
- # Should double login be treated with a warning (and possibility to change VT's
- # on Linux and FreeBSD systems for console logins)
- #DoubleLoginWarning=true
diff --git a/x11/gdm/files/patch-config_locale.alias b/x11/gdm/files/patch-config_locale.alias
deleted file mode 100644
index eb004366166d..000000000000
--- a/x11/gdm/files/patch-config_locale.alias
+++ /dev/null
@@ -1,191 +0,0 @@
---- config/locale.alias.orig	2008-03-10 21:53:02.000000000 -0500
-+++ config/locale.alias	2008-03-10 21:53:37.000000000 -0500
-@@ -14,134 +14,57 @@
- #
- #		- George
- 
--C(POSIX)		C,POSIX
--Afrikaans		af_ZA.UTF-8,af_ZA
--Albanian		sq_AL.UTF-8,sq_AL
--Amharic			am_ET.UTF-8,am_ET
--Arabic(Egypt)		ar_EG.UTF-8,ar_EG
--Arabic(Lebanon)		ar_LB.UTF-8,ar_LB
--Arabic(SaudiArabia)	ar_SA.UTF-8,ar_SA
--Armenian		hy_AM.UTF-8,hy_AM
--Azerbaijani		az_AZ.UTF-8,az_AZ
--Azerbaijani(Iran)	az_IR.UTF-8,az_IR
--Basque			eu_ES.UTF-8,eu_ES
--Belarusian		be_BY.UTF-8,be_BY
--Belarusian(Latin)	be_BY.UTF-8@latin,be_BY@latin
--Bengali			bn_BD.UTF-8,bn_BD
--Bengali(India)		bn_IN.UTF-8,bn_IN
--Bosnian			bs_BA.UTF-8,bs_BA
--Breton			br_FR.UTF-8,br_FR
--Bulgarian		bg_BG.UTF-8,bg_BG
--Catalan			ca_ES.UTF-8,ca_ES
--Chinese(ChinaMainland)	zh_CN.UTF-8,zh_CN
--Chinese(GB18030)	zh_CN.GB18030
--Chinese(Hong-Kong)	zh_HK.UTF-8,zh_HK
--Chinese(Singapore)	zh_SG.UTF-8,zh_SG
--Chinese(Taiwan)		zh_TW.UTF-8,zh_TW
--Croatian		hr_HR.UTF-8,hr_HR
--Czech			cs_CZ.UTF-8,cs_CZ
--Danish			da_DK.UTF-8,da_DK
--Dutch			nl_NL.UTF-8,nl_NL
--Dutch(Belgium)		nl_BE.UTF-8,nl_BE
--English(Australia)	en_AU.UTF-8,en_AU
--English(Canada)		en_CA.UTF-8,en_CA
--English(Ireland)	en_IE.UTF-8,en_IE
--English(Malta)		en_MT.UTF-8,en_MT
--English(NewZealand)	en_NZ.UTF-8,en_NZ
--English(SouthAfrica)	en_ZA.UTF-8,en_ZA
--English(UK)		en_GB.UTF-8,en_GB
--English(USA)		en_US.UTF-8,en_US
--Esperanto		eo.UTF-8,eo
--Estonian		et_EE.UTF-8,et_EE
--Finnish			fi_FI.UTF-8,fi_FI
--French			fr_FR.UTF-8,fr_FR
--French(Belgium)		fr_BE.UTF-8,fr_BE
--French(Canada)		fr_CA.UTF-8,fr_CA
--French(Luxembourg)	fr_LU.UTF-8,fr_LU
--French(Switzerland)	fr_CH.UTF-8,fr_CH
--Galician		gl_ES.UTF-8,gl_ES
--German			de_DE.UTF-8,de_DE
--German(Austria)		de_AT.UTF-8,de_AT
--German(Switzerland)	de_CH.UTF-8,de_CH
--German(Luxembourg)	de_LU.UTF-8,de_LU
--Greek			el_GR.UTF-8,el_GR
--Greek(Cyprus)		el_CY.UTF-8,el_CY
--Gujarati		gu_IN.UTF-8,gu_IN
--Hebrew			he_IL.UTF-8,he_IL
--Hindi			hi_IN.UTF-8,hi_IN
--Hungarian		hu_HU.UTF-8,hu_HU
--Icelandic		is_IS.UTF-8,is_IS
--Indonesian		id_ID.UTF-8,id_ID
--Interlingua		ia.UTF-8,ia
--Irish			ga_IE.UTF-8,ga_IE
--Italian			it_IT.UTF-8,it_IT
--Japanese		ja_JP.UTF-8,ja_JP
--Kannada			kn_IN.UTF-8,kn_IN
--Kazakh			kk_KZ.UTF-8,kk_KZ 
--Kinyarwanda		rw_RW.UTF-8,rw_RW
--Korean			ko_KR.UTF-8,ko_KR
--Latvian			lv_LV.UTF-8,lv_LV
--Limburgish		li_NL.UTF-8,li_NL
--Limburgish(Belgium)	li_BE.UTF-8,li_BE
--Limburgish(Germany)	li_DE.UTF-8,li_DE
--Lithuanian		lt_LT.UTF-8,lt_LT
--Macedonian		mk_MK.UTF-8,mk_MK
--Malayalam		ml_IN.UTF-8,ml_IN
--Malay			ms_MY.UTF-8,ms_MY
--Maltese			mt_MT.UTF-8,mt_MT
--Maori			mi_NZ.UTF-8,mi_NZ	
--Marathi			mr_IN.UTF-8,mr_IN
--Mongolian		mn_MN.UTF-8,mn_MN
--Nepali			ne_NP.UTF-8,ne_NP
--NorthernSotho		nso_ZA.UTF-8,nso_ZA
--Norwegian(bokmal)	nb_NO.UTF-8,nb_NO,no_NO.UTF-8,no_NO
--Norwegian(nynorsk)	nn_NO.UTF-8,nn_NO
--Oriya			or_IN.UTF-8,or_IN
--Persian			fa_IR.UTF-8,fa_IR
--Polish			pl_PL.UTF-8,pl_PL
--Portuguese(Brazilian)	pt_BR.UTF-8,pt_BR
--Portuguese		pt_PT.UTF-8,pt_PT
--Punjabi			pa_IN.UTF-8,pa_IN
--Romanian		ro_RO.UTF-8,ro_RO
--Russian			ru_RU.UTF-8,ru_RU
--Serbian			sr_CS.UTF-8,sr_CS,sr_YU@cyrillic,sr_YU
--Serbian(Montenegro)	sr_ME.UTF-8
--Serbian(Serbia)		sr_RS.UTF-8
--Serbian(Bosnia)		sh_BA.UTF-8,sh_BA
--Serbian(Latin)		sr_CS.UTF-8@Latn,sr_CS@Latn,sr_YU@Latn
--Serbian(Jekavian)	sr_CS.UTF-8@ije,sr_CS@ije,sr_YU@ije
--Slovak			sk_SK.UTF-8,sk_SK
--Slovenian		sl_SI.UTF-8,sl_SI
--Spanish			es_ES.UTF-8,es_ES
--Spanish(Argentina)	es_AR.UTF-8,es_AR
--Spanish(Bolivia)	es_BO.UTF-8,es_BO
--Spanish(Chile)		es_CL.UTF-8,es_CL
--Spanish(Colombia)	es_CO.UTF-8,es_CO
--Spanish(CostaRica)	es_CR.UTF-8,es_CR
--Spanish(Ecuador)	es_EC.UTF-8,es_EC
--Spanish(Guatemala)	es_GT.UTF-8,es_GT
--Spanish(Mexico)		es_MX.UTF-8,es_MX
--Spanish(Nicaragua)	es_NI.UTF-8,es_NI
--Spanish(Panama)		es_PA.UTF-8,es_PA
--Spanish(Peru)		es_PE.UTF-8,es_PE
--Spanish(Paraguay)	es_PY.UTF-8,es_PY
--Spanish(ElSalvador)	es_SV.UTF-8,es_SV
--Spanish(Uruguay)	es_UY.UTF-8,es_UY
--Spanish(Venezuela)	es_VE.UTF-8,es_VE
--Swedish(Finland)	sv_FI.UTF-8,sv_FI
--Swedish			sv_SE.UTF-8,sv_SE
--Tagalog			tl_PH.UTF-8,tl_PH
--Tajik			tg_TJ.UTF-8,tg_TJ
--Tamil			ta_IN.UTF-8,ta_IN
--Telugu			te_IN.UTF-8,te_IN
--Thai			th_TH.UTF-8,th_TH
--Turkish			tr_TR.UTF-8,tr_TR
--Ukrainian		uk_UA.UTF-8,uk_UA
--Uzbek			uz_UZ.UTF-8,uz_UZ
--Uzbek(Latin)		uz_UZ.UTF-8@Latn,uz_UZ@Latn
--Vietnamese		vi_VN.UTF-8,vi_VN
--Walloon			wa_BE.UTF-8,wa_BE
--Welsh			cy_GB.UTF-8,cy_GB
--Xhosa			xh_ZA.UTF-8,xh_ZA
--Yiddish			yi.UTF-8,yi
--Zulu			zu_ZA.UTF-8,zu_ZA
-+C(POSIX)   C,POSIX
-+Afrikaans              af_ZA.UTF-8,af_ZA.ISO8859-15,af_ZA.ISO8859-1
-+Amharic                am_ET.UTF-8
-+Armenian               hy_AM.UTF-8
-+Basque                 eu_ES.UTF-8,eu_ES.ISO8859-15,eu_ES.ISO8859-1
-+Byelorussian           be_BY.UTF-8,be_BY.CP1131,be_BY.CP1251,be_BY.ISO8859-5
-+Bulgarian              bg_BG.UTF-8,bg_BG.CP1251
-+Catalan                ca_ES.UTF-8,ca_ES.ISO8859-15,ca_ES.ISO8859-1
-+Chinese(simplified)    zh_CN.UTF-8,zh_CN.EUC,zh_CN.eucCN
-+Chinese(traditional)   zh_TW.UTF-8,zh_TW.Big5
-+Chinese(Hong-Kong)     zh_HK.UTF-8,zh_HK.Big5HKSCS
-+Croatian               hr_HR.UTF-8,hr_HR.ISO8859-2
-+Czech                  cs_CZ.UTF-8,cs_CZ.ISO8859-2
-+Danish                 da_DK.UTF-8,da_DK.ISO8859-15,da_DK.ISO8859-1
-+Dutch                  nl_NL.UTF-8,nl_NL.ISO8859-15,nl_NL.ISO8859-1
-+Dutch(Belgian)         nl_BE.UTF-8,nl_BE.ISO8859-15,nl_BE.ISO8859-1
-+English(American)      en_US.UTF-8,en_US.ISO8859-1,en_US.ISO8859-15
-+English(Australian)    en_AU.UTF-8,en_AU.ISO8859-1,en_AU.ISO8859-15
-+English(British)       en_GB.UTF-8,en_GB.ISO8859-1,en_GB.ISO8859-15
-+English(Canadian)      en_CA.UTF-8,en_CA.ISO8859-1,en_CA.ISO8859-15
-+English(Irish)         en_IE.UTF-8,en_IE.ISO8859-1,en_IE.ISO8859-15
-+English(New-Zealand)   en_NZ.UTF-8,en_NZ.ISO8859-1,en_NZ.ISO8859-15
-+Estonian               et_EE.UTF-8,et_EE.ISO8859-15
-+Finnish                fi_FI.UTF-8,fi_FI.ISO8859-15,fi_FI.ISO8859-1
-+French                 fr_FR.UTF-8,fr_FR.ISO8859-15,fr_FR.ISO8859-1
-+French(Belgium)        fr_BE.UTF-8,fr_BE.ISO8859-15,fr_BE.ISO8859-1
-+French(Canadian)       fr_CA.UTF-8,fr_CA.ISO8859-1,fr_CA.ISO8859-15
-+French(Swiss)          fr_CH.UTF-8,fr_CH.ISO8859-15,fr_CH.ISO8859-1
-+German                 de_DE.UTF-8,de_DE.ISO8859-15,de_DE.ISO8859-1
-+German(Austria)        de_AT.UTF-8,de_AT.ISO8859-15,de_AT.ISO8859-1
-+German(Switzerland)    de_CH.UTF-8,de_CH.ISO8859-15,de_CH.ISO8859-1
-+Greek                  el_GR.UTF-8,el_GR.ISO8859-7
-+Hebrew                 he_IL.UTF-8
-+Hindi                  hi_IN.ISCII-DEV
-+Hungarian              hu_HU.UTF-8,hu_HU.ISO8859-2
-+Icelandic              is_IS.UTF-8,is_IS.ISO8859-1,is_IS.ISO8859-15
-+Italian                it_IT.UTF-8,it_IT.ISO8859-15,it_IT.ISO8859-1
-+Italian(Swiss)         it_CH.UTF-8,it_CH.ISO8859-15,it_CH.ISO8859-1
-+Japanese               ja_JP.UTF-8,ja_JP.EUC,ja_JP.eucJP
-+Korean                 ko_KR.UTF-8,ko_KR.EUC,ko_KR.eucKR
-+Lithuanian             lt_LT.UTF-8,lt_LT.ISO8859-4,lt_LT.ISO8859-13
-+Norwegian(bokmal)      nb_NO.UTF-8,nb_NO.ISO8859-1,nb_NO.ISO8859-15,no_NO.UTF-8,no_NO.ISO8859-1,no_NO.ISO8859-15
-+Polish                 pl_PL.UTF-8,pl_PL.ISO8859-2
-+Portuguese             pt_PT.UTF-8,pt_PT.ISO8859-15,pt_PT.ISO8859-1
-+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.ISO8859-5
-+Serbian                sr_YU.UTF-8,sr_YU.ISO8859-2,sr_YU.ISO8859-5
-+Slovak                 sk_SK.UTF-8,sk_SK.ISO8859-2
-+Slovenian              sl_SI.UTF-8,sl_SI.ISO8859-2
-+Spanish                es_ES.UTF-8,es_ES.ISO8859-15,es_ES.ISO8859-1
-+Swedish                sv_SV.UTF-8,sv_SE.ISO8859-1
-+Turkish                tr_TR.UTF-8,tr_TR.ISO8859-9
-+Ukrainian              uk_UA.UTF-8,uk_UA.ISO8859-5
diff --git a/x11/gdm/files/patch-configure b/x11/gdm/files/patch-configure
deleted file mode 100644
index 18b1e2742f57..000000000000
--- a/x11/gdm/files/patch-configure
+++ /dev/null
@@ -1,137 +0,0 @@
---- configure.orig	2007-10-22 00:31:04.000000000 -0400
-+++ configure	2007-10-22 00:34:52.000000000 -0400
-@@ -29593,15 +29592,13 @@ fi
- { echo "$as_me:$LINENO: result: $ac_cv_lib_util_login" >&5
- echo "${ECHO_T}$ac_cv_lib_util_login" >&6; }
- if test $ac_cv_lib_util_login = yes; then
--  cat >>confdefs.h <<_ACEOF
--#define HAVE_LIBUTIL 1
-+  cat >>confdefs.h <<\_ACEOF
-+#define HAVE_LOGIN 1
- _ACEOF
--
--  LIBS="-lutil $LIBS"
--
-+
-+			  	EXTRA_DAEMON_LIBS="$EXTRA_DAEMON_LIBS -lutil"
- fi
- 
--
- { echo "$as_me:$LINENO: checking for logout in -lutil" >&5
- echo $ECHO_N "checking for logout in -lutil... $ECHO_C" >&6; }
- if test "${ac_cv_lib_util_logout+set}" = set; then
-@@ -29664,12 +29661,80 @@ fi
- { echo "$as_me:$LINENO: result: $ac_cv_lib_util_logout" >&5
- echo "${ECHO_T}$ac_cv_lib_util_logout" >&6; }
- if test $ac_cv_lib_util_logout = yes; then
--  cat >>confdefs.h <<_ACEOF
--#define HAVE_LIBUTIL 1
-+  cat >>confdefs.h <<\_ACEOF
-+#define HAVE_LOGOUT 1
-+_ACEOF
-+
-+			   	EXTRA_DAEMON_LIBS="$EXTRA_DAEMON_LIBS -lutil"
-+fi
-+
-+{ echo "$as_me:$LINENO: checking for logwtmp in -lutil" >&5
-+echo $ECHO_N "checking for logwtmp in -lutil... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_util_logwtmp+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lutil  $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char logwtmp ();
-+int
-+main ()
-+{
-+return logwtmp ();
-+  ;
-+  return 0;
-+}
- _ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-+  ac_cv_lib_util_logwtmp=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
- 
--  LIBS="-lutil $LIBS"
-+	ac_cv_lib_util_logwtmp=no
-+fi
- 
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_util_logwtmp" >&5
-+echo "${ECHO_T}$ac_cv_lib_util_logwtmp" >&6; }
-+if test $ac_cv_lib_util_logwtmp = yes; then
-+  cat >>confdefs.h <<\_ACEOF
-+#define HAVE_LOGWTMP 1
-+_ACEOF
-+
-+			    	EXTRA_DAEMON_LIBS="$EXTRA_DAEMON_LIBS -lutil"
- fi
- 
- 
-@@ -33472,18 +33537,18 @@ esac
- 
- # allow user to override the host-specific default
- 
--test "x$GDM_USER_PATH" == x && GDM_USER_PATH=${HOST_GDM_USER_PATH}
--test "x$GDM_HALT_COMMAND" == x && GDM_HALT_COMMAND=${HOST_GDM_HALT_COMMAND}
--test "x$HALT_COMMAND" == x && HALT_COMMAND=${HOST_HALT_COMMAND}
--test "x$REBOOT_COMMAND" == x && REBOOT_COMMAND=${HOST_REBOOT_COMMAND}
--test "x$SUSPEND_COMMAND" == x && SUSPEND_COMMAND=${HOST_SUSPEND_COMMAND}
--test "x$XSESSION_SHELL" == x && XSESSION_SHELL=${HOST_XSESSION_SHELL}
--test "x$SOUND_PROGRAM" == x && SOUND_PROGRAM=${HOST_SOUND_PROGRAM}
--test "x$GDMGNOMESESSIONCMD" == x && GDMGNOMESESSIONCMD=${HOST_GDMGNOMESESSIONCMD}
--test "x$UTMP_LINE_ATTACHED" == x && UTMP_LINE_ATTACHED=${HOST_UTMP_LINE_ATTACHED}
--test "x$UTMP_LINE_REMOTE" == x && UTMP_LINE_REMOTE=${HOST_UTMP_LINE_REMOTE}
--test "x$UTMP_PSEUDO_DEVICE" == x && UTMP_PSEUDO_DEVICE=${HOST_UTMP_PSEUDO_DEVICE}
--test "x$GDM_RBAC_SYSCMD_KEYS" == x && GDM_RBAC_SYSCMD_KEYS=${HOST_GDM_RBAC_SYSCMD_KEYS}
-+test "x$GDM_USER_PATH" = x && GDM_USER_PATH=${HOST_GDM_USER_PATH}
-+test "x$GDM_HALT_COMMAND" = x && GDM_HALT_COMMAND=${HOST_GDM_HALT_COMMAND}
-+test "x$HALT_COMMAND" = x && HALT_COMMAND=${HOST_HALT_COMMAND}
-+test "x$REBOOT_COMMAND" = x && REBOOT_COMMAND=${HOST_REBOOT_COMMAND}
-+test "x$SUSPEND_COMMAND" = x && SUSPEND_COMMAND=${HOST_SUSPEND_COMMAND}
-+test "x$XSESSION_SHELL" = x && XSESSION_SHELL=${HOST_XSESSION_SHELL}
-+test "x$SOUND_PROGRAM" = x && SOUND_PROGRAM=${HOST_SOUND_PROGRAM}
-+test "x$GDMGNOMESESSIONCMD" = x && GDMGNOMESESSIONCMD=${HOST_GDMGNOMESESSIONCMD}
-+test "x$UTMP_LINE_ATTACHED" = x && UTMP_LINE_ATTACHED=${HOST_UTMP_LINE_ATTACHED}
-+test "x$UTMP_LINE_REMOTE" = x && UTMP_LINE_REMOTE=${HOST_UTMP_LINE_REMOTE}
-+test "x$UTMP_PSEUDO_DEVICE" = x && UTMP_PSEUDO_DEVICE=${HOST_UTMP_PSEUDO_DEVICE}
-+test "x$GDM_RBAC_SYSCMD_KEYS" = x && GDM_RBAC_SYSCMD_KEYS=${HOST_GDM_RBAC_SYSCMD_KEYS}
- 
- # On Solaris, the /usr/bin/Xserver script is used to decide whether to
- # use Xsun or Xorg, so this is used on Solaris.
diff --git a/x11/gdm/files/patch-daemon-gdm-server.c b/x11/gdm/files/patch-daemon-gdm-server.c
new file mode 100644
index 000000000000..079c62c66b6a
--- /dev/null
+++ b/x11/gdm/files/patch-daemon-gdm-server.c
@@ -0,0 +1,73 @@
+--- daemon/gdm-server.c.orig	2008-03-17 19:11:00.000000000 -0400
++++ daemon/gdm-server.c	2008-08-25 16:11:10.000000000 -0400
+@@ -44,6 +44,10 @@
+ #include "gdm-common.h"
+ #include "gdm-signal-handler.h"
+ 
++#include "gdm-settings.h"
++#include "gdm-settings-direct.h"
++#include "gdm-settings-keys.h"
++
+ #include "gdm-server.h"
+ 
+ extern char **environ;
+@@ -77,6 +81,7 @@ struct GdmServerPrivate
+         char    *parent_display_name;
+         char    *parent_auth_file;
+         char    *chosen_hostname;
++        char    *vt;
+ 
+         guint    child_watch_id;
+ };
+@@ -306,7 +311,7 @@ gdm_server_resolve_command_line (GdmServ
+                 argv[len++] = g_strdup ("tcp");
+         }
+ 
+-        if (vtarg != NULL && ! gotvtarg) {
++        if (vtarg != NULL && ! gotvtarg && strncmp (server->priv->display_name, ":0", 2) == 0) {
+                 argv[len++] = g_strdup (vtarg);
+         }
+ 
+@@ -673,7 +678,7 @@ gdm_server_start (GdmServer *server)
+         gboolean res;
+ 
+         /* fork X server process */
+-        res = gdm_server_spawn (server, NULL);
++        res = gdm_server_spawn (server, server->priv->vt);
+ 
+         return res;
+ }
+@@ -925,12 +930,33 @@ static void
+ gdm_server_init (GdmServer *server)
+ {
+ 
++        int vt;
++        gboolean has_vt;
++        GdmSettings *settings = NULL;
+         server->priv = GDM_SERVER_GET_PRIVATE (server);
+ 
++
++        settings = gdm_settings_new();
++        if (settings == NULL) {
++                g_assert ("Unable to initialize settings");
++        }
++
++        if (! gdm_settings_direct_init (settings, GDMCONFDIR "/gdm.schemas", "/")) {
++                g_assert ("Unable to initialize settings");
++        }
++
++        has_vt =  gdm_settings_direct_get_int (GDM_KEY_VT, &vt);
++
++        g_object_unref (settings);
++
+         server->priv->pid = -1;
+         server->priv->command = g_strdup (X_SERVER " -br -verbose");
+         server->priv->log_dir = g_strdup (LOGDIR);
+ 
++        if (has_vt) {
++                server->priv->vt = g_strdup_printf ("vt %d", vt);
++        }
++
+         add_ready_handler (server);
+ }
+ 
diff --git a/x11/gdm/files/patch-daemon-gdm-xdmcp-display-factory.c b/x11/gdm/files/patch-daemon-gdm-xdmcp-display-factory.c
new file mode 100644
index 000000000000..e3062eeeaa89
--- /dev/null
+++ b/x11/gdm/files/patch-daemon-gdm-xdmcp-display-factory.c
@@ -0,0 +1,10 @@
+--- daemon/gdm-xdmcp-display-factory.c.orig	2007-11-01 10:15:58.269325570 -0400
++++ daemon/gdm-xdmcp-display-factory.c	2007-11-01 10:20:19.093220785 -0400
+@@ -35,6 +35,7 @@
+ #include <netdb.h>
+ #include <arpa/inet.h>
+ #include <net/if.h>
++#include <netinet/in.h>
+ #ifdef HAVE_SYS_SOCKIO_H
+ #include <sys/sockio.h>
+ #endif
diff --git a/x11/gdm/files/patch-daemon_Makefile.in b/x11/gdm/files/patch-daemon_Makefile.in
new file mode 100644
index 000000000000..9186a23e387f
--- /dev/null
+++ b/x11/gdm/files/patch-daemon_Makefile.in
@@ -0,0 +1,10 @@
+--- daemon/Makefile.in.orig	2007-11-02 20:54:53.000000000 -0400
++++ daemon/Makefile.in	2007-11-02 20:55:08.000000000 -0400
+@@ -451,6 +451,7 @@ test_session_SOURCES = \
+ 
+ test_session_LDADD = \
+ 	$(DAEMON_LIBS)		\
++	$(EXTRA_DAEMON_LIBS)	\
+ 	$(PAM_LIBS)		\
+ 	$(top_builddir)/common/libgdmcommon.la	\
+ 	$(NULL)
diff --git a/x11/gdm/files/patch-daemon_gdm-session-worker.c b/x11/gdm/files/patch-daemon_gdm-session-worker.c
new file mode 100644
index 000000000000..5f3a1b9ee2f0
--- /dev/null
+++ b/x11/gdm/files/patch-daemon_gdm-session-worker.c
@@ -0,0 +1,11 @@
+--- daemon/gdm-session-worker.c.orig        2008-07-30 19:15:47.000000000 -0400
++++ daemon/gdm-session-worker.c        2008-08-25 12:50:00.000000000 -0400
+@@ -332,7 +332,7 @@ gdm_session_execute (const char *file,
+                          * what to search if PATH is unset. POSIX may, dunno.
+                          */
+ 
+-                        path = "/bin:/usr/bin:.";
++                        path = "/bin:/usr/bin:/usr/local/bin:.";
+                 }
+ 
+                 len = strlen (file) + 1;
diff --git a/x11/gdm/files/patch-daemon_gdmconsolekit.c b/x11/gdm/files/patch-daemon_gdmconsolekit.c
deleted file mode 100644
index b07647071d08..000000000000
--- a/x11/gdm/files/patch-daemon_gdmconsolekit.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- daemon/gdmconsolekit.c.orig	2007-08-30 22:57:18.000000000 -0400
-+++ daemon/gdmconsolekit.c	2007-08-30 22:57:35.000000000 -0400
-@@ -457,7 +457,7 @@ open_ck_session (struct passwd *pwent,
- 		char *device;
- 
- 		/* FIXME: how does xorg construct this */
--		device = g_strdup_printf ("/dev/tty%d", d->vt);
-+		device = g_strdup_printf ("/dev/ttyv%d", d->vt - 1);
- 		add_param_string (&iter_struct, "x11-display-device", device);
- 		g_free (device);
- 	}
diff --git a/x11/gdm/files/patch-config_Xsession.in b/x11/gdm/files/patch-data_Xsession.in
index c2f25be0e9dd..894c97d1620c 100644
--- a/x11/gdm/files/patch-config_Xsession.in
+++ b/x11/gdm/files/patch-data_Xsession.in
@@ -1,5 +1,5 @@
---- config/Xsession.in.orig	2008-05-12 20:25:54.000000000 -0400
-+++ config/Xsession.in	2008-06-09 01:29:59.000000000 -0400
+--- data/Xsession.in.orig	2008-05-12 20:25:54.000000000 -0400
++++ data/Xsession.in	2008-06-09 01:29:59.000000000 -0400
 @@ -231,12 +231,31 @@ if [ "x$command" = "xdefault" ] ; then
    fi
  fi
diff --git a/x11/gdm/files/patch-data_gconf.path b/x11/gdm/files/patch-data_gconf.path
new file mode 100644
index 000000000000..2efdb3cc975d
--- /dev/null
+++ b/x11/gdm/files/patch-data_gconf.path
@@ -0,0 +1,9 @@
+--- data/gconf.path.orig	2008-12-26 17:04:03.000000000 -0500
++++ data/gconf.path	2008-12-26 17:04:13.000000000 -0500
+@@ -1,5 +1,5 @@
+ # treat system-wide settings as mandatory
+-xml:readonly:/etc/gconf/gconf.xml.system
++xml:readonly:%%LOCALBASE%%/etc/gconf/gconf.xml.system
+ 
+ # override some settings
+ # we treat settings in this location as
diff --git a/x11/gdm/files/patch-data_gdm.schemas.in.in b/x11/gdm/files/patch-data_gdm.schemas.in.in
new file mode 100644
index 000000000000..ae5572ddde3e
--- /dev/null
+++ b/x11/gdm/files/patch-data_gdm.schemas.in.in
@@ -0,0 +1,14 @@
+--- data/gdm.schemas.in.in.orig	2007-12-13 12:14:19.000000000 -0500
++++ data/gdm.schemas.in.in	2007-12-13 12:15:05.000000000 -0500
+@@ -11,6 +11,11 @@
+       <signature>s</signature>
+       <default>gdm</default>
+     </schema>
++    <schema>
++      <key>daemon/VT</key>
++      <signature>i</signature>
++      <default>9</default>
++    </schema>
+ 
+     <schema>
+       <key>xdmcp/Enable</key>
diff --git a/x11/gdm/files/patch-data_greeter-autostart_gdm-simple-greeter.desktop.in.in b/x11/gdm/files/patch-data_greeter-autostart_gdm-simple-greeter.desktop.in.in
new file mode 100644
index 000000000000..7febf5165bdd
--- /dev/null
+++ b/x11/gdm/files/patch-data_greeter-autostart_gdm-simple-greeter.desktop.in.in
@@ -0,0 +1,7 @@
+--- data/greeter-autostart/gdm-simple-greeter.desktop.in.in.orig	2008-11-23 22:22:04.000000000 -0500
++++ data/greeter-autostart/gdm-simple-greeter.desktop.in.in	2008-11-23 22:22:09.000000000 -0500
+@@ -5,4 +5,3 @@ Exec=@LIBEXECDIR@/gdm-simple-greeter
+ OnlyShowIn=GNOME;
+ X-GNOME-Autostart-Phase=Application
+ X-GNOME-Autostart-Notify=true
+-X-GNOME-AutoRestart=true
diff --git a/x11/gdm/files/patch-gui_gdmchooser.c b/x11/gdm/files/patch-gui_gdmchooser.c
deleted file mode 100644
index 42ce461e242e..000000000000
--- a/x11/gdm/files/patch-gui_gdmchooser.c
+++ /dev/null
@@ -1,18 +0,0 @@
-
-$FreeBSD$
-
---- gui/gdmchooser.c.orig
-+++ gui/gdmchooser.c
-@@ -1123,6 +1123,12 @@
- 		have_ipv6 = FALSE;
- 	else
- 		have_ipv6 = TRUE;
-+	/* Net- & FreeBSD default to V6ONLY */
-+	{
-+		int no = 0;
-+		setsockopt(sockfd, IPPROTO_IPV6, IPV6_V6ONLY, &no, sizeof(no));
-+	}
-+
- #endif
- 	if ( ! have_ipv6) {
- 		if ((sockfd = socket (AF_INET, SOCK_DGRAM, 0)) == -1) {
diff --git a/x11/gdm/files/patch-gui_gdmsetup.c b/x11/gdm/files/patch-gui_gdmsetup.c
deleted file mode 100644
index 423000cb6fec..000000000000
--- a/x11/gdm/files/patch-gui_gdmsetup.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- gui/gdmsetup.c.orig	Thu Jun 30 16:47:06 2005
-+++ gui/gdmsetup.c	Mon Jul  4 02:53:12 2005
-@@ -3270,7 +3271,7 @@ theme_install_response (GtkWidget *choos
- 		/* HACK! */
- 		argv[0] = chown;
- 		argv[1] = "-R";
--		argv[2] = "root:root";
-+		argv[2] = "root:wheel";
- 		argv[3] = quoted;
- 		argv[4] = NULL;
- 		simple_spawn_sync (argv);
diff --git a/x11/gdm/files/patch-gui_simple-chooser_gdm-host-chooser-widget.c b/x11/gdm/files/patch-gui_simple-chooser_gdm-host-chooser-widget.c
new file mode 100644
index 000000000000..6f0c08d8a00a
--- /dev/null
+++ b/x11/gdm/files/patch-gui_simple-chooser_gdm-host-chooser-widget.c
@@ -0,0 +1,20 @@
+--- gui/simple-chooser/gdm-host-chooser-widget.c.orig	2008-03-04 14:42:37.000000000 -0500
++++ gui/simple-chooser/gdm-host-chooser-widget.c	2008-08-03 01:48:49.000000000 -0400
+@@ -442,7 +442,7 @@ find_broadcast_addresses (GdmHostChooser
+                         /* paranoia */
+                         ifreq.ifr_name[sizeof (ifreq.ifr_name) - 1] = '\0';
+ 
+-                        if (ioctl (sock, SIOCGIFFLAGS, &ifreq) < 0) {
++                        if ((ioctl (sock, SIOCGIFFLAGS, &ifreq) < 0) && (errno != ENXIO)) {
+                                 g_warning ("Could not get SIOCGIFFLAGS for %s", ifr[i].ifr_name);
+                         }
+ 
+@@ -542,6 +542,8 @@ xdmcp_init (GdmHostChooserWidget *widget
+ #ifdef ENABLE_IPV6
+         widget->priv->socket_fd = socket (AF_INET6, SOCK_DGRAM, 0);
+         if (widget->priv->socket_fd != -1) {
++                int no = 0;
++                setsockopt(widget->priv->socket_fd, IPPROTO_IPV6, IPV6_V6ONLY, &no, sizeof(no));
+                 widget->priv->have_ipv6 = TRUE;
+         }
+ #endif
diff --git a/x11/gdm/files/patch-gui_simple-greeter_Makefile.in b/x11/gdm/files/patch-gui_simple-greeter_Makefile.in
new file mode 100644
index 000000000000..56d49b99bf92
--- /dev/null
+++ b/x11/gdm/files/patch-gui_simple-greeter_Makefile.in
@@ -0,0 +1,11 @@
+--- gui/simple-greeter/Makefile.in.orig	2008-02-13 01:57:37.000000000 -0500
++++ gui/simple-greeter/Makefile.in	2008-02-13 01:57:44.000000000 -0500
+@@ -445,7 +445,7 @@ INCLUDES = \
+ 	-DGDMCONFDIR=\"$(gdmconfdir)\"                  \
+ 	-DDATADIR=\""$(datadir)"\"		 	\
+ 	-DSYSCONFDIR=\""$(sysconfdir)"\"		\
+-	-DLIBLOCALEDIR=\""$(prefix)/lib/locale"\"	\
++	-DLIBLOCALEDIR=\""$(prefix)/share/locale"\"	\
+ 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" 	\
+ 	-DGLADEDIR=\""$(pkgdatadir)"\" 	\
+ 	-DLIBEXECDIR=\""$(libexecdir)"\" 		\
diff --git a/x11/gdm/files/patch-gui_simple-greeter_gdm-languages.c b/x11/gdm/files/patch-gui_simple-greeter_gdm-languages.c
new file mode 100644
index 000000000000..9116dc917a64
--- /dev/null
+++ b/x11/gdm/files/patch-gui_simple-greeter_gdm-languages.c
@@ -0,0 +1,45 @@
+--- gui/simple-greeter/gdm-languages.c.orig	2008-11-22 17:16:42.000000000 -0500
++++ gui/simple-greeter/gdm-languages.c	2008-11-22 17:29:05.000000000 -0500
+@@ -168,13 +168,13 @@ gdm_parse_language_name (const char *nam
+                         *codesetp = NULL;
+                 }
+ 
+-                if (*codesetp != NULL) {
++/*                if (*codesetp != NULL) {
+                         char *codeset;
+ 
+                         codeset = normalize_codeset (*codesetp);
+                         g_free (*codesetp);
+                         *codesetp = codeset;
+-                }
++                }*/
+         }
+ 
+         if (modifierp != NULL) {
+@@ -353,7 +353,7 @@ add_locale (const char *language_name)
+         if (language_name_is_utf8 (language_name)) {
+                 name = g_strdup (language_name);
+         } else {
+-                name = g_strdup_printf ("%s.utf8", language_name);
++                name = g_strdup_printf ("%s.UTF-8", language_name);
+ 
+                 if (!language_name_is_utf8 (name)) {
+                         g_free (name);
+@@ -482,7 +482,7 @@ select_dirs (const struct dirent *dirent
+                                 struct stat st;
+                                 char       *path;
+ 
+-                                path = g_build_filename (GNOMELOCALEDIR, dirent->d_name, NULL);
++                                path = g_build_filename ("/usr/share/locale", dirent->d_name, NULL);
+                                 if (g_stat (path, &st) == 0) {
+                                         mode = st.st_mode;
+                                 }
+@@ -502,7 +502,7 @@ collect_locales_from_directory (void)
+         int             ndirents;
+         int             cnt;
+ 
+-        ndirents = scandir (GNOMELOCALEDIR, &dirents, select_dirs, alphasort);
++        ndirents = scandir ("/usr/share/locale", &dirents, select_dirs, alphasort);
+ 
+         for (cnt = 0; cnt < ndirents; ++cnt) {
+                 add_locale (dirents[cnt]->d_name);
diff --git a/x11/gdm/files/patch-gui_simple-greeter_gdm-remote-login-window.c b/x11/gdm/files/patch-gui_simple-greeter_gdm-remote-login-window.c
new file mode 100644
index 000000000000..059d72cf456b
--- /dev/null
+++ b/x11/gdm/files/patch-gui_simple-greeter_gdm-remote-login-window.c
@@ -0,0 +1,10 @@
+--- gui/simple-greeter/gdm-remote-login-window.c.orig	2008-03-24 11:27:13.000000000 +0100
++++ gui/simple-greeter/gdm-remote-login-window.c	2008-03-24 11:27:31.000000000 +0100
+@@ -25,6 +25,7 @@
+ #include <unistd.h>
+ #include <sys/types.h>
+ #include <sys/wait.h>
++#include <sys/signal.h>
+ #include <errno.h>
+ 
+ #include <glib.h>
diff --git a/x11/gdm/files/patch-gui_simple-greeter_gdm-user-manager.c b/x11/gdm/files/patch-gui_simple-greeter_gdm-user-manager.c
new file mode 100644
index 000000000000..d666bc1fd826
--- /dev/null
+++ b/x11/gdm/files/patch-gui_simple-greeter_gdm-user-manager.c
@@ -0,0 +1,51 @@
+--- gui/simple-greeter/gdm-user-manager.c.orig	2008-04-29 13:38:43.000000000 -0400
++++ gui/simple-greeter/gdm-user-manager.c	2008-05-03 13:27:52.000000000 -0400
+@@ -1269,17 +1269,23 @@ reload_passwd (GdmUserManager *manager)
+         GSList        *old_users;
+         GSList        *new_users;
+         GSList        *list;
+-        FILE          *fp;
++#ifndef __FreeBSD__
++       FILE          *fp;
++#endif
+ 
+         old_users = NULL;
+         new_users = NULL;
+ 
++#ifdef __FreeBSD__
++        setpwent ();
++#else
+         errno = 0;
+         fp = fopen (PATH_PASSWD, "r");
+         if (fp == NULL) {
+                 g_warning ("Unable to open %s: %s", PATH_PASSWD, g_strerror (errno));
+                 goto out;
+         }
++#endif
+ 
+         g_hash_table_foreach (manager->priv->users, listify_hash_values_hfunc, &old_users);
+         g_slist_foreach (old_users, (GFunc) g_object_ref, NULL);
+@@ -1292,7 +1298,11 @@ reload_passwd (GdmUserManager *manager)
+                 }
+         }
+ 
++#ifdef __FreeBSD__
++        for (pwent = getpwent (); pwent != NULL; pwent = getpwent ()) {
++#else
+         for (pwent = fgetpwent (fp); pwent != NULL; pwent = fgetpwent (fp)) {
++#endif
+                 GdmUser *user;
+ 
+                 user = NULL;
+@@ -1355,7 +1365,11 @@ reload_passwd (GdmUserManager *manager)
+  out:
+         /* Cleanup */
+ 
++#ifdef __FreeBSD__
++	endpwent ();
++#else
+         fclose (fp);
++#endif
+ 
+         g_slist_foreach (new_users, (GFunc) g_object_thaw_notify, NULL);
+         g_slist_foreach (new_users, (GFunc) g_object_unref, NULL);
diff --git a/x11/gdm/pkg-install b/x11/gdm/pkg-install
index b775c107227c..788a1a610c81 100644
--- a/x11/gdm/pkg-install
+++ b/x11/gdm/pkg-install
@@ -24,9 +24,13 @@ POST-INSTALL)
 
 	if ${PW} user show "${USER}" 2>/dev/null; then
 		echo "You already have a user \"${USER}\", so I will use it."
+		uhome=`${PW} user show ${USER} | awk -F: '{print $9}'`
+		if [ x"${uhome}" = x"/nonexistent" -o x"${uhome}" = x"/var/gdm" ]; then
+		    ${PW} usermod ${USER} -d "${PKG_PREFIX}/etc/gdm/home"
+		fi
 	else
 		if ${PW} useradd ${USER} -u ${UID} -g ${GROUP} -h - \
-			-d "/nonexistent" -s /sbin/nologin -c "GNOME Display Manager"
+			-d "${PKG_PREFIX}/etc/gdm/home" -s /sbin/nologin -c "GNOME Display Manager"
 		then
 			echo "Added user \"${USER}\"."
 		else
@@ -36,10 +40,24 @@ POST-INSTALL)
 	fi
 	${MKDIR} -p /var/gdm
 	${MKDIR} -p /var/log/gdm
+	${CHMOD} 0755 /var/log/gdm
+	${CHOWN} root:wheel /var/log/gdm
 	${CHOWN} -R root:${GROUP} /var/gdm
 	${CHMOD} 1770 /var/gdm
+	${MKDIR} -p /var/run/gdm
+	${CHOWN} root:${GROUP} /var/run/gdm
+	${CHMOD} 1777 /var/run/gdm
 	${CHOWN} root:wheel ${PKG_PREFIX}/share/gdm
 	${CHMOD} 0755 ${PKG_PREFIX}/share/gdm
+	${MKDIR} -p ${PKG_PREFIX}/etc/gdm/home
+	${CHOWN} root:${GROUP} ${PKG_PREFIX}/etc/gdm/home
+	${CHMOD} 1770 ${PKG_PREFIX}/etc/gdm/home
+	install  -o root -g wheel -m 444 ${PKG_PREFIX}/share/gdm/gconf.path ${PKG_PREFIX}/etc/gdm/home/.gconf.path
+	gconftool-2 --direct --config-source=xml:merged:${PKG_PREFIX}/etc/gdm/home/.gconf.mandatory --recursive-unset /
+	gconftool-2 --direct --config-source=xml:merged:${PKG_PREFIX}/etc/gdm/home/.gconf.mandatory --load ${PKG_PREFIX}/share/gdm/session-setup.entries
+	${CHOWN} -R root:gdm ${PKG_PREFIX}/etc/gdm/home/.gconf.mandatory
+	${CHMOD} 1750 ${PKG_PREFIX}/etc/gdm/home/.gconf.mandatory
+	${CHMOD} 1640 ${PKG_PREFIX}/etc/gdm/home/.gconf.mandatory/*.xml
 
 	${MKDIR} -p ${PKG_PREFIX}/etc/dm/Sessions
 	exit 0
diff --git a/x11/gdm/pkg-message b/x11/gdm/pkg-message
index 9131c3eb44c6..03810155292d 100644
--- a/x11/gdm/pkg-message
+++ b/x11/gdm/pkg-message
@@ -1,12 +1,6 @@
 GDM is installed.
 
-Do _NOT_ use /etc/ttys to start gdm at boot time.  This will result in gdm 
-hanging or restarting constantly. Instead, add gdm_enable="YES" to 
+Do _NOT_ use /etc/ttys to start gdm at boot time.  This will result in gdm
+hanging or restarting constantly. Instead, add gdm_enable="YES" to
 /etc/rc.conf. GDM will be started automatic on the next reboot.
 
-GDM uses its own locale.alias file to determine its language and especially
-the GNOME 2 fontencoding. This file is located in
-%%PREFIX%%/etc/gdm/locale.alias.  By default, the character set for every 
-country using the EURO currency is set to ISO8859-15 in order to enable the 
-EURO sign. If you do not feel comfortable with this, edit this file according 
-to your preferences.
diff --git a/x11/gdm/pkg-plist b/x11/gdm/pkg-plist
index ea47c5c3a2e9..d56a2a2073f7 100644
--- a/x11/gdm/pkg-plist
+++ b/x11/gdm/pkg-plist
@@ -1,68 +1,45 @@
-bin/gdm-dmx-reconnect-proxy
-bin/gdmXnest
-bin/gdmXnestchooser
-bin/gdmdynamic
+bin/gdm-screenshot
 bin/gdmflexiserver
-bin/gdmphotosetup
-bin/gdmthemetester
+etc/dbus-1/system.d/gdm.conf
 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/custom.conf %D/etc/gdm/custom.conf.default; then rm -f %D/etc/gdm/custom.conf; fi
 etc/gdm/custom.conf.default
 @exec [ -f %B/custom.conf ] || cp %B/%f %B/custom.conf
-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/gdm/gdm.schemas
 etc/pam.d/gdm
-lib/gtk-2.0/modules/libdwellmouselistener.a
-lib/gtk-2.0/modules/libdwellmouselistener.la
-lib/gtk-2.0/modules/libdwellmouselistener.so
-lib/gtk-2.0/modules/libkeymouselistener.a
-lib/gtk-2.0/modules/libkeymouselistener.la
-lib/gtk-2.0/modules/libkeymouselistener.so
-libexec/gdmchooser
-libexec/gdmgreeter
-libexec/gdmlogin
-libexec/gdmtranslate
+libdata/bonobo/servers/GNOME_FastUserSwitchApplet.server
+libexec/gdm-crash-logger
+libexec/gdm-factory-slave
+libexec/gdm-host-chooser
+libexec/gdm-product-slave
+libexec/gdm-session-worker
+libexec/gdm-simple-chooser
+libexec/gdm-simple-greeter
+libexec/gdm-simple-slave
+libexec/gdm-user-switch-applet
+libexec/gdm-xdmcp-chooser-slave
 sbin/gdm
 sbin/gdm-binary
 sbin/gdm-restart
 sbin/gdm-safe-restart
 sbin/gdm-stop
-sbin/gdmsetup
-%%DATADIR%%/BuiltInSessions/default.desktop
-%%DATADIR%%/applications/gdmflexiserver-xnest.desktop
-%%DATADIR%%/applications/gdmflexiserver.desktop
-%%DATADIR%%/applications/gdmphotosetup.desktop
-%%DATADIR%%/applications/gdmsetup.desktop
-%%DATADIR%%/defaults.conf
-%%DATADIR%%/factory-defaults.conf
-%%DATADIR%%/gdmchooser.glade
-%%DATADIR%%/gdmphotosetup.glade
-%%DATADIR%%/gdmsetup.glade
-%%DATADIR%%/themes/circles/GdmGreeterTheme.desktop
-%%DATADIR%%/themes/circles/background.svg
-%%DATADIR%%/themes/circles/circles.xml
-%%DATADIR%%/themes/circles/flower.png
-%%DATADIR%%/themes/circles/screenshot.png
-%%DATADIR%%/themes/happygnome-list/GdmGreeterTheme.desktop
-%%DATADIR%%/themes/happygnome-list/background.svg
-%%DATADIR%%/themes/happygnome-list/gnome-logo.svg
-%%DATADIR%%/themes/happygnome-list/happygnome-list.xml
-%%DATADIR%%/themes/happygnome-list/screenshot.png
-%%DATADIR%%/themes/happygnome/GdmGreeterTheme.desktop
-%%DATADIR%%/themes/happygnome/background.svg
-%%DATADIR%%/themes/happygnome/gnome-logo.svg
-%%DATADIR%%/themes/happygnome/happygnome.xml
-%%DATADIR%%/themes/happygnome/screenshot.png
+%%DATADIR%%/autostart/LoginWindow/at-spi-registryd-wrapper.desktop
+%%DATADIR%%/autostart/LoginWindow/gdm-simple-greeter.desktop
+%%DATADIR%%/autostart/LoginWindow/gnome-mag.desktop
+%%DATADIR%%/autostart/LoginWindow/gnome-power-manager.desktop
+%%DATADIR%%/autostart/LoginWindow/gnome-settings-daemon.desktop
+%%DATADIR%%/autostart/LoginWindow/gok.desktop
+%%DATADIR%%/autostart/LoginWindow/metacity.desktop
+%%DATADIR%%/autostart/LoginWindow/orca-screen-reader.desktop
+%%DATADIR%%/gconf.path
+%%DATADIR%%/gdb-cmd
+%%DATADIR%%/gdm-greeter-login-window.glade
+%%DATADIR%%/session-setup.entries
+share/gnome-2.0/ui/GNOME_FastUserSwitchApplet.xml
 share/gnome/help/gdm/C/gdm.xml
 share/gnome/help/gdm/C/legal.xml
 share/gnome/help/gdm/de/gdm.xml
@@ -71,25 +48,12 @@ share/gnome/help/gdm/es/gdm.xml
 share/gnome/help/gdm/fr/gdm.xml
 share/gnome/help/gdm/ko/gdm.xml
 share/gnome/help/gdm/oc/gdm.xml
+share/gnome/help/gdm/ru/gdm.xml
 share/gnome/help/gdm/sv/gdm.xml
 share/gnome/help/gdm/uk/gdm.xml
 share/icons/hicolor/16x16/apps/gdm-xnest.png
-share/icons/hicolor/16x16/apps/gdmflexiserver.png
-share/icons/hicolor/16x16/apps/gdmsetup.png
-share/icons/hicolor/22x22/apps/gdmflexiserver.png
-share/icons/hicolor/22x22/apps/gdmsetup.png
-share/icons/hicolor/24x24/apps/gdmflexiserver.png
-share/icons/hicolor/24x24/apps/gdmsetup.png
+share/icons/hicolor/32x32/apps/gdm-setup.png
 share/icons/hicolor/32x32/apps/gdm-xnest.png
-share/icons/hicolor/32x32/apps/gdmflexiserver.png
-share/icons/hicolor/32x32/apps/gdmsetup.png
-share/icons/hicolor/48x48/apps/gdm-login-photo.png
-share/icons/hicolor/48x48/apps/gdm-xnest.png
-share/icons/hicolor/48x48/apps/gdm.png
-share/icons/hicolor/48x48/apps/gdmflexiserver.png
-share/icons/hicolor/48x48/apps/gdmsetup.png
-share/icons/hicolor/scalable/apps/gdmflexiserver.svg
-share/icons/hicolor/scalable/apps/gdmsetup.svg
 share/locale/af/LC_MESSAGES/gdm.mo
 share/locale/am/LC_MESSAGES/gdm.mo
 share/locale/ar/LC_MESSAGES/gdm.mo
@@ -115,6 +79,7 @@ share/locale/eu/LC_MESSAGES/gdm.mo
 share/locale/fa/LC_MESSAGES/gdm.mo
 share/locale/fi/LC_MESSAGES/gdm.mo
 share/locale/fr/LC_MESSAGES/gdm.mo
+share/locale/fur/LC_MESSAGES/gdm.mo
 share/locale/ga/LC_MESSAGES/gdm.mo
 share/locale/gl/LC_MESSAGES/gdm.mo
 share/locale/gu/LC_MESSAGES/gdm.mo
@@ -131,8 +96,10 @@ share/locale/ka/LC_MESSAGES/gdm.mo
 share/locale/kn/LC_MESSAGES/gdm.mo
 share/locale/ko/LC_MESSAGES/gdm.mo
 share/locale/ku/LC_MESSAGES/gdm.mo
+share/locale/la/LC_MESSAGES/gdm.mo
 share/locale/lt/LC_MESSAGES/gdm.mo
 share/locale/lv/LC_MESSAGES/gdm.mo
+share/locale/mai/LC_MESSAGES/gdm.mo
 share/locale/mg/LC_MESSAGES/gdm.mo
 share/locale/mi/LC_MESSAGES/gdm.mo
 share/locale/mk/LC_MESSAGES/gdm.mo
@@ -149,6 +116,7 @@ share/locale/oc/LC_MESSAGES/gdm.mo
 share/locale/or/LC_MESSAGES/gdm.mo
 share/locale/pa/LC_MESSAGES/gdm.mo
 share/locale/pl/LC_MESSAGES/gdm.mo
+share/locale/ps/LC_MESSAGES/gdm.mo
 share/locale/pt/LC_MESSAGES/gdm.mo
 share/locale/pt_BR/LC_MESSAGES/gdm.mo
 share/locale/ro/LC_MESSAGES/gdm.mo
@@ -159,15 +127,13 @@ share/locale/sk/LC_MESSAGES/gdm.mo
 share/locale/sl/LC_MESSAGES/gdm.mo
 share/locale/sq/LC_MESSAGES/gdm.mo
 share/locale/sr/LC_MESSAGES/gdm.mo
-share/locale/sr@Latn/LC_MESSAGES/gdm.mo
+share/locale/sr@latin/LC_MESSAGES/gdm.mo
 share/locale/sv/LC_MESSAGES/gdm.mo
 share/locale/ta/LC_MESSAGES/gdm.mo
 share/locale/te/LC_MESSAGES/gdm.mo
 share/locale/th/LC_MESSAGES/gdm.mo
 share/locale/tr/LC_MESSAGES/gdm.mo
 share/locale/uk/LC_MESSAGES/gdm.mo
-share/locale/uz/LC_MESSAGES/gdm.mo
-share/locale/uz@cyrillic/LC_MESSAGES/gdm.mo
 share/locale/vi/LC_MESSAGES/gdm.mo
 share/locale/wa/LC_MESSAGES/gdm.mo
 share/locale/xh/LC_MESSAGES/gdm.mo
@@ -175,15 +141,6 @@ share/locale/zh_CN/LC_MESSAGES/gdm.mo
 share/locale/zh_HK/LC_MESSAGES/gdm.mo
 share/locale/zh_TW/LC_MESSAGES/gdm.mo
 share/locale/zu/LC_MESSAGES/gdm.mo
-share/omf/gdm/gdm-C.omf
-share/omf/gdm/gdm-de.omf
-share/omf/gdm/gdm-en_GB.omf
-share/omf/gdm/gdm-es.omf
-share/omf/gdm/gdm-fr.omf
-share/omf/gdm/gdm-ko.omf
-share/omf/gdm/gdm-oc.omf
-share/omf/gdm/gdm-sv.omf
-share/omf/gdm/gdm-uk.omf
 share/pixmaps/faces/astronaut.jpg
 share/pixmaps/faces/baseball.png
 share/pixmaps/faces/butterfly.png
@@ -209,14 +166,17 @@ share/pixmaps/faces/sunset.jpg
 share/pixmaps/faces/tennis-ball.png
 share/pixmaps/faces/yellow-rose.jpg
 share/pixmaps/gdm-foot-logo.png
+share/pixmaps/gdm-setup.png
+share/pixmaps/gdm-xnest.png
+share/pixmaps/gdm.png
 share/pixmaps/nobody.png
 share/pixmaps/nohost.png
-share/xsessions/gnome.desktop
-@dirrm share/xsessions
+@exec mkdir -p %D/share/xsessions
+@dirrmtry share/xsessions
 @dirrm share/pixmaps/faces
-@dirrm share/omf/gdm
 @dirrm share/gnome/help/gdm/uk
 @dirrm share/gnome/help/gdm/sv
+@dirrm share/gnome/help/gdm/ru
 @dirrm share/gnome/help/gdm/oc
 @dirrm share/gnome/help/gdm/ko
 @dirrm share/gnome/help/gdm/fr
@@ -225,40 +185,40 @@ share/xsessions/gnome.desktop
 @dirrm share/gnome/help/gdm/de
 @dirrm share/gnome/help/gdm/C
 @dirrm share/gnome/help/gdm
-@dirrm %%DATADIR%%/themes/happygnome-list
-@dirrm %%DATADIR%%/themes/happygnome
-@dirrm %%DATADIR%%/themes/circles
-@dirrm %%DATADIR%%/themes
-@dirrm %%DATADIR%%/applications
-@dirrm %%DATADIR%%/BuiltInSessions
+@dirrm %%DATADIR%%/autostart/LoginWindow
+@dirrm %%DATADIR%%/autostart
 @dirrm %%DATADIR%%
-@dirrm etc/gdm/modules
 @dirrm etc/gdm/Sessions
 @dirrm etc/gdm/PreSession
 @dirrm etc/gdm/PostSession
 @dirrm etc/gdm/PostLogin
 @dirrm etc/gdm/Init
-@dirrm etc/gdm
+@dirrmtry etc/gdm/home
+@dirrmtry etc/gdm
 @dirrmtry etc/dm/Sessions
 @dirrmtry etc/dm
+@dirrmtry sbin
 @dirrmtry share/log/gdm
 @dirrmtry share/log
 @unexec /bin/rm -rf /var/gdm 2>/dev/null || /usr/bin/true
 @unexec /bin/rm -rf /var/log/gdm 2>/dev/null || /usr/bin/true
+@unexec /bin/rm -rf /var/run/gdm 2>/dev/null || /usr/bin/true
 @dirrmtry share/locale/zu/LC_MESSAGES
 @dirrmtry share/locale/zu
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_HK
 @dirrmtry share/locale/xh/LC_MESSAGES
 @dirrmtry share/locale/xh
-@dirrmtry share/locale/uz@cyrillic/LC_MESSAGES
-@dirrmtry share/locale/uz@cyrillic
 @dirrmtry share/locale/te/LC_MESSAGES
 @dirrmtry share/locale/te
+@dirrmtry share/locale/sr@latin/LC_MESSAGES
+@dirrmtry share/locale/sr@latin
 @dirrmtry share/locale/si/LC_MESSAGES
 @dirrmtry share/locale/si
 @dirrmtry share/locale/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
+@dirrmtry share/locale/ps/LC_MESSAGES
+@dirrmtry share/locale/ps
 @dirrmtry share/locale/oc/LC_MESSAGES
 @dirrmtry share/locale/oc
 @dirrmtry share/locale/nso/LC_MESSAGES
@@ -269,10 +229,16 @@ share/xsessions/gnome.desktop
 @dirrmtry share/locale/mi
 @dirrmtry share/locale/mg/LC_MESSAGES
 @dirrmtry share/locale/mg
+@dirrmtry share/locale/mai/LC_MESSAGES
+@dirrmtry share/locale/mai
+@dirrmtry share/locale/la/LC_MESSAGES
+@dirrmtry share/locale/la
 @dirrmtry share/locale/ku/LC_MESSAGES
 @dirrmtry share/locale/ku
 @dirrmtry share/locale/hy/LC_MESSAGES
 @dirrmtry share/locale/hy
+@dirrmtry share/locale/fur/LC_MESSAGES
+@dirrmtry share/locale/fur
 @dirrmtry share/locale/dz/LC_MESSAGES
 @dirrmtry share/locale/dz
 @dirrmtry share/locale/bn_IN/LC_MESSAGES
author	Joe Marcus Clarke <marcus@FreeBSD.org>	2009-01-10 05:22:13 +0000
committer	Joe Marcus Clarke <marcus@FreeBSD.org>	2009-01-10 05:22:13 +0000
commit	610ae5681637c1051a0c17b54e29d97f53da2f3a (patch)
tree	c231a1eb74b07e444fa7363012cb84bf23d83ce0 /x11/gdm
parent	15b6544926b07a98710eeb765baf03e3fc9a195c (diff)
download	ports-610ae5681637c1051a0c17b54e29d97f53da2f3a.tar.gz ports-610ae5681637c1051a0c17b54e29d97f53da2f3a.zip