10 files changed, 210 insertions, 67 deletions

diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile
index 4e26bb410594..8196ee761a8b 100644
--- a/x11/gdm/Makefile
+++ b/x11/gdm/Makefile
@@ -3,30 +3,29 @@
 # Whom:                Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
+#    $MCom: ports/x11/gdm/Makefile,v 1.29 2006/04/26 19:40:44 marcus Exp $
 #
 
 PORTNAME=	gdm
-PORTVERSION=	2.8.0.7
-PORTREVISION=	3
+PORTVERSION=	2.14.4
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=		sources/${PORTNAME:S/2$//}/2.8
+MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME 2 version of xdm display manager
 
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_X_PREFIX=	yes
 INSTALLS_OMF=	yes
-USE_RC_SUBR=	gdm.sh
+INSTALLS_ICONS=	yes
+USE_RC_SUBR=	gdm
 USE_GMAKE=	yes
-USE_GNOME=	gnomehack intlhack gnomehier libgnomeui librsvg2
+USE_GNOME=	gnomehack intlhack gnomehier libgnomeui librsvg2 gnomedocutils \
+		gnomeprefix
 GNU_CONFIGURE=	yes
-USE_REINPLACE=	yes
-CONFIGURE_ARGS=	--localstatedir=/var --datadir=${PREFIX}/share/gnome \
-		--with-html-dir=${GNOME_HTML_DIR} \
-		--disable-gtk-doc \
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib" \
 		GTKDOC="false"
@@ -34,9 +33,11 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 GDMDIR?=	${PREFIX}/etc/gdm
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
+GNOME_LOCALSTATEDIR=	/var
+
 MAN1=		gdm.1
 
-OPTIONS=	IPV6 "Enable IPv6 support" off
+OPTIONS=	IPV6 "Enable IPv6 support" on
 
 .include <bsd.port.pre.mk>
 
@@ -52,7 +53,7 @@ PLIST_SUB+=	PAM_MISC=""
 PLIST_SUB+=	PAM_MISC="@comment "
 .endif
 
-.if defined(WITH_IPV6)
+.if !defined(WITHOUT_IPV6)
 CONFIGURE_ARGS+=	--enable-ipv6
 .else
 CONFIGURE_ARGS+=	--disable-ipv6
@@ -70,6 +71,8 @@ post-install:
 .if !defined(PACKAGE_BUILDING)
 	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 .endif
+	${INSTALL_DATA} ${WRKSRC}/config/gdm.conf-custom \
+		${PREFIX}/etc/gdm/custom.conf.default
 	@${MKDIR} ${PREFIX}/etc/gdm/Sessions
 	@${SED} -e 's|%%PREFIX%%|${PREFIX}|g' < ${PKGDIR}/pkg-message \
 		| /usr/bin/fmt 75 79 > ${PKGMESSAGE}
diff --git a/x11/gdm/distinfo b/x11/gdm/distinfo
index 722b409079fa..c877394be637 100644
--- a/x11/gdm/distinfo
+++ b/x11/gdm/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gdm-2.8.0.7.tar.bz2) = 566a1e3d656b6b536414f287ead2db7e
-SHA256 (gnome2/gdm-2.8.0.7.tar.bz2) = bd83a23cad86de545f57a7c38cb9b7fa52aedc5bd2f8103f1cc7a35b0bfc6a10
-SIZE (gnome2/gdm-2.8.0.7.tar.bz2) = 2777760
+MD5 (gnome2/gdm-2.14.4.tar.bz2) = 04cbd92e0c264787328e3373da3ebc11
+SHA256 (gnome2/gdm-2.14.4.tar.bz2) = 0050b544e87bc09290433e477bd4043c644f8dc9b03531b135fa5f5b3b1395b6
+SIZE (gnome2/gdm-2.14.4.tar.bz2) = 3041769
diff --git a/x11/gdm/files/gdm.sh.in b/x11/gdm/files/gdm.in
index 816c2d283dd7..1b9d3e640ade 100644
--- a/x11/gdm/files/gdm.sh.in
+++ b/x11/gdm/files/gdm.in
@@ -1,5 +1,6 @@
 #!/bin/sh
 # $FreeBSD$
+#    $MCom: ports/x11/gdm/files/gdm.in,v 1.5 2006/03/06 19:02:27 marcus Exp $
 
 # PROVIDE: gdm
 # REQUIRE: LOGIN cleanvar moused
diff --git a/x11/gdm/files/patch-config_gdm.conf.in b/x11/gdm/files/patch-config_gdm.conf.in
index 60781d1af357..43e2c566c5a1 100644
--- a/x11/gdm/files/patch-config_gdm.conf.in
+++ b/x11/gdm/files/patch-config_gdm.conf.in
@@ -1,35 +1,26 @@
---- config/gdm.conf.in.orig	Thu Oct  6 19:25:45 2005
-+++ config/gdm.conf.in	Mon Dec  5 21:56:18 2005
-@@ -76,7 +76,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_LOGDIR@
-+LogDir=/var/log
- # You should probably never change this value unless you have a weird setup
- PidFile=/var/run/gdm.pid
- # Note that a post login script is run before a PreSession script.
-@@ -131,11 +131,11 @@
+--- config/gdm.conf.in.orig	Fri Apr  7 15:47:20 2006
++++ config/gdm.conf.in	Wed Apr 12 01:53:30 2006
+@@ -156,11 +156,11 @@ StandardXServer=@X_SERVER@
  #FlexiReapDelayMinutes=5
- # the X nest command
+ # The X nest command.
  Xnest=@X_XNEST_PATH@/Xnest @X_XNEST_CONFIG_OPTIONS@
--# Automatic VT allocation.  Right now only works on Linux.  This way
+-# 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.
+ # 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
- # vts on linux and freebsd systems for console logins)
+ # Should double login be treated with a warning (and possibility to change VT's
+ # on Linux and FreeBSD systems for console logins)
  #DoubleLoginWarning=true
-@@ -250,7 +250,7 @@
- # The specific gtkrc file we use.  It should be the full path to the gtkrc
- # that we need.  Unless you need a specific gtkrc that doesn't correspond to
- # a specific theme, then just use the GtkTheme key
--#GtkRC=@EXPANDED_DATADIR@/themes/Default/gtk-2.0/gtkrc
-+#GtkRC=@EXPANDED_DATADIR@/../themes/Default/gtk-2.0/gtkrc
+@@ -283,7 +283,7 @@ Enable=false
+ # The specific gtkrc file we use.  It should be the full path to the gtkrc that
+ # we need.  Unless you need a specific gtkrc that doesn't correspond to a
+ # specific theme, then just use the GtkTheme key.
+-#GtkRC=@datadir@/themes/Default/gtk-2.0/gtkrc
++#GtkRC=@datadir@/../themes/Default/gtk-2.0/gtkrc
  
- # The GTK+ theme to use for the gui
+ # The GTK+ theme to use for the GUI.
  #GtkTheme=Default
diff --git a/x11/gdm/files/patch-config_locale.alias b/x11/gdm/files/patch-config_locale.alias
index ca653e463eec..c983c422eb75 100644
--- a/x11/gdm/files/patch-config_locale.alias
+++ b/x11/gdm/files/patch-config_locale.alias
@@ -34,7 +34,7 @@
 -English(Canada)		en_CA.UTF-8,en_CA
 -English(Ireland)	en_IE.UTF-8,en_IE
 -English(SouthAfrica)	en_ZA.UTF-8,en_ZA
--Esparanto		eo.UTF-8,eo
+-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
diff --git a/x11/gdm/files/patch-configure b/x11/gdm/files/patch-configure
index 72f2005ff721..ae54f1460b87 100644
--- a/x11/gdm/files/patch-configure
+++ b/x11/gdm/files/patch-configure
@@ -1,17 +1,17 @@
---- configure.orig	Sat Jun 11 03:35:18 2005
-+++ configure	Sat Jun 11 03:43:21 2005
-@@ -22412,6 +22412,8 @@
+--- configure.orig	Wed Mar 29 13:51:40 2006
++++ configure	Wed Mar 29 14:15:56 2006
+@@ -22965,6 +22965,8 @@ _ACEOF
  cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
 +#include <sys/types.h>
 +#include <sys/socket.h>
  $ac_includes_default
- int
- main ()
-@@ -30210,6 +30212,13 @@
-         SUSPEND_COMMAND="/usr/openwin/bin/sys-suspend -n"
+ #include <$ac_header>
+ _ACEOF
+@@ -32415,6 +32417,13 @@ case "$host" in
          XSESSION_SHELL=/bin/ksh
+         SOUND_PROGRAM=/usr/bin/audioplay
          ;;
 +*freebsd*)
 +	GDM_USER_PATH="/bin:/usr/bin"
diff --git a/x11/gdm/files/patch-daemon_gdmconfig.c b/x11/gdm/files/patch-daemon_gdmconfig.c
new file mode 100644
index 000000000000..9ebf10c997e1
--- /dev/null
+++ b/x11/gdm/files/patch-daemon_gdmconfig.c
@@ -0,0 +1,10 @@
+--- daemon/gdmconfig.c.orig	Thu Jan  5 16:57:06 2006
++++ daemon/gdmconfig.c	Thu Jan  5 16:57:44 2006
+@@ -39,6 +39,7 @@
+ #include <fcntl.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
++#include <sys/resource.h>
+ #include <signal.h>
+ #include <pwd.h>
+ #include <grp.h>
diff --git a/x11/gdm/files/patch-daemon_server.c b/x11/gdm/files/patch-daemon_server.c
new file mode 100644
index 000000000000..57f028bfd263
--- /dev/null
+++ b/x11/gdm/files/patch-daemon_server.c
@@ -0,0 +1,10 @@
+--- daemon/server.c.orig	Thu Jan  5 16:58:37 2006
++++ daemon/server.c	Thu Jan  5 16:58:46 2006
+@@ -29,6 +29,7 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <sys/wait.h>
++#include <sys/resource.h>
+ #include <strings.h>
+ #include <signal.h>
+ #include <syslog.h>
diff --git a/x11/gdm/files/patch-gui_greeter_gdmthemetester.in b/x11/gdm/files/patch-gui_greeter_gdmthemetester.in
new file mode 100644
index 000000000000..988efc3fbd84
--- /dev/null
+++ b/x11/gdm/files/patch-gui_greeter_gdmthemetester.in
@@ -0,0 +1,112 @@
+--- gui/greeter/gdmthemetester.in.orig	Wed Apr 12 01:57:25 2006
++++ gui/greeter/gdmthemetester.in	Wed Apr 12 01:57:12 2006
+@@ -0,0 +1,109 @@
++#!/bin/sh
++
++gdmwhich () {
++  COMMAND="$1"
++  OUTPUT=
++  IFS=:
++  for dir in $PATH
++  do
++    if test -x "$dir/$COMMAND" ; then
++      if test "x$OUTPUT" = "x" ; then
++        OUTPUT="$dir/$COMMAND"
++      fi
++    fi
++  done
++  IFS=$OLD_IFS
++  echo "$OUTPUT"
++}
++
++echo
++echo "GDM Theme Tester"
++echo
++echo "Be sure to test all the environments:"
++echo " console, console-timed, flexi, remote-flexi, xdmcp"
++echo "Also be sure to test using caps lock"
++echo
++
++XNEST=`gdmwhich Xnest`
++GDMXNEST=`gdmwhich gdmXnest`
++GDMGREETER="@libexecdir@/gdmgreeter"
++
++if [ x$XNEST = x ]; then
++	echo "ERROR: Xnest not found"
++        echo ""
++	exit 1
++fi
++
++if [ x$GDMXNEST = x ]; then
++	echo "ERROR: gdmXnest not found"
++        echo ""
++	exit 1
++fi
++
++if [ x$GDMGREETER = x ]; then
++	echo "ERROR: gdmgreeter not found"
++        echo ""
++	exit 1
++fi
++
++USAGE="
++Usage: $0 <environment> <theme>
++<environment> is one of: console, console-timed, flexi, remote-flexi, xdmcp
++<theme> is either the path of the theme or the name of an installed theme
++
++If you set the environment variable XNESTSIZE to <width>x<height> (e.g. 800x600)
++you can test the greeter at that resolution
++"
++if [ "$#" != 2 ]; then
++	echo "$USAGE"
++	exit 1
++fi
++
++GDM_THEME="$2"
++DOING_GDM_DEVELOPMENT=yes
++GDM_PARENT_DISPLAY="$DISPLAY"
++export GDM_THEME DOING_GDM_DEVELOPMENT GDM_PARENT_DISPLAY
++
++case $1 in
++console)
++	GDM_IS_LOCAL=yes
++	export GDM_IS_LOCAL
++	;;
++console-timed)
++	GDM_IS_LOCAL=yes
++	GDM_FAKE_TIMED=yes
++	export GDM_IS_LOCAL GDM_FAKE_TIMED
++	;;
++flexi)
++	GDM_IS_LOCAL=yes
++	GDM_FLEXI_SERVER=yes
++	export GDM_IS_LOCAL GDM_FLEXI_SERVER
++	;;
++remote-flexi)
++	GDM_FLEXI_SERVER=yes
++	export GDM_FLEXI_SERVER
++	;;
++xdmcp)
++	;;
++*)
++	echo "$USAGE"
++	exit 1
++	;;
++esac
++
++if [ "x$XNESTSIZE" = x ] ; then
++  eval `gdmXnest -b`
++else
++  eval `gdmXnest -b -o "-geometry $XNESTSIZE"`
++fi
++export DISPLAY
++
++if [ "x$GDM_PARENT_DISPLAY" = "x$DISPLAY" ]; then
++	echo "ERROR: Can't start the Xnest server"
++	exit 1
++fi
++
++# This may not be necessary
++sleep 1
++
++@libexecdir@/gdmgreeter
diff --git a/x11/gdm/pkg-plist b/x11/gdm/pkg-plist
index efcba3605e39..7288ec2f5d69 100644
--- a/x11/gdm/pkg-plist
+++ b/x11/gdm/pkg-plist
@@ -11,9 +11,9 @@ 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/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
@@ -29,8 +29,8 @@ lib/gtk-2.0/modules/libkeymouselistener.la
 lib/gtk-2.0/modules/libkeymouselistener.so
 %%PAM_MISC%%libexec/gdmaskpass
 libexec/gdmchooser
-libexec/gdmlogin
 libexec/gdmgreeter
+libexec/gdmlogin
 libexec/gdmtranslate
 sbin/gdm
 sbin/gdm-binary
@@ -43,6 +43,8 @@ share/gnome/applications/gdmflexiserver.desktop
 share/gnome/applications/gdmphotosetup.desktop
 share/gnome/applications/gdmsetup.desktop
 share/gnome/gdm/BuiltInSessions/default.desktop
+share/gnome/gdm/defaults.conf
+share/gnome/gdm/factory-defaults.conf
 share/gnome/gdm/gdmchooser.glade
 share/gnome/gdm/gdmphotosetup.glade
 share/gnome/gdm/gdmsetup.glade
@@ -55,22 +57,16 @@ share/gnome/gdm/themes/circles/options.png
 share/gnome/gdm/themes/circles/screenshot.png
 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/gnome-logo.svg
 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
-share/gnome/gdm/themes/happygnome/gnome-logo.png
+share/gnome/gdm/themes/happygnome/gnome-logo.svg
 share/gnome/gdm/themes/happygnome/happygnome.xml
 share/gnome/gdm/themes/happygnome/options.png
 share/gnome/gdm/themes/happygnome/screenshot.png
-share/gnome/gdm/themes/happygnome/session.png
-share/gnome/gdm/themes/happygnome/system.png
 share/gnome/help/gdm/C/gdm.xml
 share/gnome/help/gdm/C/legal.xml
 share/gnome/help/gdm/de/figures/gdm_window.png
@@ -94,6 +90,8 @@ share/gnome/help/gdm/ko/legal.xml
 share/gnome/help/gdm/sv/figures/gdm_window.png
 share/gnome/help/gdm/sv/gdm.xml
 share/gnome/help/gdm/sv/legal.xml
+share/gnome/help/gdm/uk/gdm.xml
+share/gnome/help/gdm/uk/legal.xml
 share/gnome/help/gdm/zh_CN/figures/gdm_window.png
 share/gnome/help/gdm/zh_CN/gdm.xml
 share/gnome/help/gdm/zh_CN/legal.xml
@@ -111,6 +109,7 @@ share/gnome/omf/gdm/gdm-it.omf
 share/gnome/omf/gdm/gdm-ja.omf
 share/gnome/omf/gdm/gdm-ko.omf
 share/gnome/omf/gdm/gdm-sv.omf
+share/gnome/omf/gdm/gdm-uk.omf
 share/gnome/omf/gdm/gdm-zh_CN.omf
 share/gnome/omf/gdm/gdm-zh_HK.omf
 share/gnome/omf/gdm/gdm-zh_TW.omf
@@ -162,6 +161,7 @@ share/locale/cs/LC_MESSAGES/gdm.mo
 share/locale/cy/LC_MESSAGES/gdm.mo
 share/locale/da/LC_MESSAGES/gdm.mo
 share/locale/de/LC_MESSAGES/gdm.mo
+share/locale/dz/LC_MESSAGES/gdm.mo
 share/locale/el/LC_MESSAGES/gdm.mo
 share/locale/en_CA/LC_MESSAGES/gdm.mo
 share/locale/en_GB/LC_MESSAGES/gdm.mo
@@ -182,6 +182,7 @@ share/locale/id/LC_MESSAGES/gdm.mo
 share/locale/is/LC_MESSAGES/gdm.mo
 share/locale/it/LC_MESSAGES/gdm.mo
 share/locale/ja/LC_MESSAGES/gdm.mo
+share/locale/ka/LC_MESSAGES/gdm.mo
 share/locale/ko/LC_MESSAGES/gdm.mo
 share/locale/ku/LC_MESSAGES/gdm.mo
 share/locale/lt/LC_MESSAGES/gdm.mo
@@ -196,7 +197,6 @@ share/locale/nb/LC_MESSAGES/gdm.mo
 share/locale/ne/LC_MESSAGES/gdm.mo
 share/locale/nl/LC_MESSAGES/gdm.mo
 share/locale/nn/LC_MESSAGES/gdm.mo
-share/locale/no/LC_MESSAGES/gdm.mo
 share/locale/nso/LC_MESSAGES/gdm.mo
 share/locale/pa/LC_MESSAGES/gdm.mo
 share/locale/pl/LC_MESSAGES/gdm.mo
@@ -219,11 +219,27 @@ share/locale/vi/LC_MESSAGES/gdm.mo
 share/locale/wa/LC_MESSAGES/gdm.mo
 share/locale/xh/LC_MESSAGES/gdm.mo
 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
+@dirrmtry share/locale/zu/LC_MESSAGES
+@dirrmtry share/locale/zu
+@dirrmtry share/locale/xh/LC_MESSAGES
+@dirrmtry share/locale/xh
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/nso/LC_MESSAGES
+@dirrmtry share/locale/nso
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
+@dirrmtry share/locale/mi/LC_MESSAGES
+@dirrmtry share/locale/mi
 @dirrmtry share/locale/ku/LC_MESSAGES
 @dirrmtry share/locale/ku
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
 @dirrm share/gnome/xsessions
+@dirrm share/gnome/pixmaps/faces
 @dirrm share/gnome/omf/gdm
 @dirrm share/gnome/help/gdm/zh_TW/figures
 @dirrm share/gnome/help/gdm/zh_TW
@@ -231,6 +247,7 @@ share/locale/zu/LC_MESSAGES/gdm.mo
 @dirrm share/gnome/help/gdm/zh_HK
 @dirrm share/gnome/help/gdm/zh_CN/figures
 @dirrm share/gnome/help/gdm/zh_CN
+@dirrm share/gnome/help/gdm/uk
 @dirrm share/gnome/help/gdm/sv/figures
 @dirrm share/gnome/help/gdm/sv
 @dirrm share/gnome/help/gdm/ko/figures
@@ -247,13 +264,12 @@ share/locale/zu/LC_MESSAGES/gdm.mo
 @dirrm share/gnome/help/gdm/de
 @dirrm share/gnome/help/gdm/C
 @dirrm share/gnome/help/gdm
-@dirrm share/gnome/gdm/themes/happygnome
 @dirrm share/gnome/gdm/themes/happygnome-list
+@dirrm share/gnome/gdm/themes/happygnome
 @dirrm share/gnome/gdm/themes/circles
 @dirrm share/gnome/gdm/themes
 @dirrm share/gnome/gdm/BuiltInSessions
 @dirrm share/gnome/gdm
-@dirrm share/gnome/pixmaps/faces
 @dirrm etc/pam.d
 @dirrm etc/gdm/modules
 @dirrm etc/gdm/Sessions
@@ -262,10 +278,10 @@ share/locale/zu/LC_MESSAGES/gdm.mo
 @dirrm etc/gdm/PostLogin
 @dirrm etc/gdm/Init
 @dirrm etc/gdm
-@unexec /bin/rmdir %D/etc/dm/Sessions 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/etc/dm 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/sbin 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/gnome/log/gdm 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/gnome/log 2>/dev/null || /usr/bin/true
+@dirrmtry etc/dm/Sessions
+@dirrmtry etc/dm
+@dirrmtry sbin
+@dirrmtry share/gnome/log/gdm
+@dirrmtry share/gnome/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