Index: x11/gdm/Makefile
===================================================================
--- x11/gdm/Makefile    (revision 18834)
+++ x11/gdm/Makefile    (working copy)
@@ -16,18 +16,18 @@
                ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes
 LIB_DEPENDS=   libck-connector.so:${PORTSDIR}/sysutils/consolekit \
                libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
-               libpolkit-gtk-1.so:${PORTSDIR}/sysutils/polkit-gnome \
                libupower-glib.so:${PORTSDIR}/sysutils/upower \
                libnss3.so:${PORTSDIR}/security/nss \
                libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \
                libaccountsservice.so:${PORTSDIR}/sysutils/accountsservice \
-               libxklavier.so:${PORTSDIR}/x11/libxklavier \
+               libexecinfo.so:${PORTSDIR}/devel/libexecinfo \
                libcanberra-gtk3.so:${PORTSDIR}/audio/libcanberra-gtk3
 RUN_DEPENDS=   zenity>=3.0.0:${PORTSDIR}/x11/zenity3 \
                gnome-settings-daemon>=3.0.0:${PORTSDIR}/sysutils/gnome-settings-daemon \
                gnome-keyring-3:${PORTSDIR}/security/gnome-keyring3 \
                gnome-session>=3.0.0:${PORTSDIR}/x11/gnome-session \
                gnome-icon-theme-symbolic>=0:${PORTSDIR}/x11-themes/gnome-icon-theme-symbolic \
+               polkit-gnome>=0.105:${PORTSDIR}/sysutils/polkit-gnome \
                ${LOCALBASE}/libexec/at-spi2-registryd:${PORTSDIR}/accessibility/at-spi2-core \
                ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes
 # used in scripts
@@ -36,9 +36,13 @@
                xmodmap:${PORTSDIR}/x11/xmodmap \
                xterm:${PORTSDIR}/x11/xterm

+CONFLICTS=     gdm-2.[0-9]*
+
 USERS=         gdm
 GROUPS=                gdm

+NO_STAGE=      yes
+LATEST_LINK=   gdm3
 USE_XZ=                yes
 USE_LDCONFIG=  yes
 USE_XORG=      dmx dmxproto
@@ -47,25 +51,35 @@
 USE_RC_SUBR=   gdm
 USE_GNOME_SUBR=        yes
 USES=          gettext gmake pathfix pkgconfig
-USE_GNOME=     dconf gnomehier gnomeprefix intlhack librsvg2 gnomepanel3
+USE_GNOME=     dconf gnomehier gnomeprefix intlhack introspection librsvg2 gnomepanel3
 GNU_CONFIGURE= yes
 GLIB_SCHEMAS=  org.gnome.login-screen.gschema.xml
-CONFIGURE_ARGS=        --with-working-directory=${PREFIX}/etc/gdm/home \
+CONFIGURE_ARGS=        --disable-static \
+               --mandir=${PREFIX}/man \
+               --with-lang-file=${PREFIX}/etc/gdm/i18n \
                --with-at-spi-registryd-directory=${LOCALBASE}/libexec \
+               --with-custom-conf=${PREFIX}/etc/gdm/custom.conf \
+               --with-dbus-sys=${PREFIX}/etc/dbus-1/system.d \
+               --with-log-dir=/var/log/gdm \
+               --with-working-directory=${PREFIX}/etc/gdm/home \
+               --with-sysconfsubdir=gdm \
+               --with-pid-file=/var/run/gdm.pid \
+               --with-dmconfdir=${LOCALBASE}/share/xsessions \
+               --with-screenshot-dir=/var/run/gdm/greeter \
                --enable-authentication-scheme=pam \
-               --with-console-kit \
-               --with-initial-vt=9 \
+               --with-user=gdm \
+               --with-group=gdm \
+               --with-initial-vt=09 \
                --with-systemd=no
+
 # this is a hack until we can get our own pam dir and dir in order.
 CONFIGURE_ARGS+=--with-default-pam-config=redhat
 CPPFLAGS+=     -I${LOCALBASE}/include -DHAS_SA_LEN
 LDFLAGS+=      -L${LOCALBASE}/lib
-CONFIGLIBS=    -lm
-CONFIGURE_ENV= LIBS="${CONFIGLIBS}" \
-               GTKDOC="false" \
-               ac_cv_header_execinfo_h=no

-SUB_FILES+=    gdm.pam
+SUB_FILES+=    gdm-launch-environment \
+               gdm-password \
+               gdm-autologin

 GDMDIR?=       ${PREFIX}/etc/gdm
 PKGMESSAGE=    ${WRKDIR}/pkg-message
@@ -83,7 +97,7 @@
 .endif

 .if ${PORT_OPTIONS:MKEYRING}
-LIB_DEPENDS+=  libgnome-keyring.so:${PORTSDIR}/security/libgnome-keyring
+LIB_DEPENDS+=  gnome-keyring:${PORTSDIR}/security/libgnome-keyring
 lib/libgdmsimplegreeter.so.1
@@ -222,8 +219,6 @@
 share/pixmaps/nobody.png
 share/pixmaps/nohost.png
 @exec mkdir -p %D/share/xsessions
-@exec dconf update
-@unexec dconf update
 @dirrm /var/gdm
 @dirrm /var/cache/gdm
 @dirrmtry share/xsessions
@@ -269,11 +264,14 @@
 @dirrmtry etc/gdm/home/.config/dconf
 @dirrmtry etc/gdm/home/.config
 @dirrmtry etc/gdm/home
+@dirrmtry etc/gdm/Sessions
 @dirrmtry etc/gdm/PreSession
 @dirrmtry etc/gdm/PostSession
 @dirrmtry etc/gdm/PostLogin
 @dirrmtry etc/gdm/Init
 @dirrmtry etc/gdm
+@dirrmtry etc/dm/Sessions
+@dirrmtry etc/dm
 @dirrm etc/dconf/db/gdm.d/locks
 @dirrm etc/dconf/db/gdm.d
 @dirrmtry share/locale/zu/LC_MESSAGES
@@ -342,3 +340,4 @@
 @dirrmtry share/locale/as
 @dirrmtry share/locale/an/LC_MESSAGES
 @dirrmtry share/locale/an
+@mode 1777 /var/run/gdm