pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

gdm: Import gdm-2.20.11 as wip/gdm from x11/gdm



Module Name:	pkgsrc-wip
Committed By:	Dan Cîrnaț <dan%alt.md@localhost>
Pushed By:	cirnatdan
Date:		Thu Apr 15 12:52:23 2021 +0200
Changeset:	94f8b6ebb2673ff1226512f48be7cd19f5dc3662

Added Files:
	gdm2/DESCR
	gdm2/Makefile
	gdm2/PLIST
	gdm2/distinfo
	gdm2/files/NetBSD.xpm
	gdm2/files/custom.desktop
	gdm2/files/gdm.sh
	gdm2/options.mk
	gdm2/patches/patch-aa
	gdm2/patches/patch-ab
	gdm2/patches/patch-ac
	gdm2/patches/patch-ae
	gdm2/patches/patch-ak
	gdm2/patches/patch-al
	gdm2/patches/patch-ao
	gdm2/patches/patch-ap
	gdm2/patches/patch-aq
	gdm2/patches/patch-ar
	gdm2/patches/patch-as
	gdm2/patches/patch-at
	gdm2/patches/patch-common_gdm-config.h

Log Message:
gdm: Import gdm-2.20.11 as wip/gdm from x11/gdm

Candidate for removal: decade old unmaintained version
To be replaced by a newer version

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=94f8b6ebb2673ff1226512f48be7cd19f5dc3662

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 gdm2/DESCR                             |  12 ++
 gdm2/Makefile                          | 148 ++++++++++++++++++++++
 gdm2/PLIST                             | 213 +++++++++++++++++++++++++++++++
 gdm2/distinfo                          |  19 +++
 gdm2/files/NetBSD.xpm                  | 224 +++++++++++++++++++++++++++++++++
 gdm2/files/custom.desktop              |   7 ++
 gdm2/files/gdm.sh                      |  28 +++++
 gdm2/options.mk                        |  35 ++++++
 gdm2/patches/patch-aa                  |  84 +++++++++++++
 gdm2/patches/patch-ab                  |  13 ++
 gdm2/patches/patch-ac                  |  12 ++
 gdm2/patches/patch-ae                  |  49 ++++++++
 gdm2/patches/patch-ak                  |  18 +++
 gdm2/patches/patch-al                  |  28 +++++
 gdm2/patches/patch-ao                  |  22 ++++
 gdm2/patches/patch-ap                  |  74 +++++++++++
 gdm2/patches/patch-aq                  |  18 +++
 gdm2/patches/patch-ar                  |  16 +++
 gdm2/patches/patch-as                  |  15 +++
 gdm2/patches/patch-at                  |  78 ++++++++++++
 gdm2/patches/patch-common_gdm-config.h |  31 +++++
 21 files changed, 1144 insertions(+)

diffs:
diff --git a/gdm2/DESCR b/gdm2/DESCR
new file mode 100644
index 0000000000..123e2b2061
--- /dev/null
+++ b/gdm2/DESCR
@@ -0,0 +1,12 @@
+GDM is the GNOME Display Manager, it is the little proggie that runs
+in the background, runs your X sessions, presents you with a login box
+and then tells you to piss off because you forgot your password. It
+does pretty much everything that you would want to use xdm for, but
+doesn't involve as much crack.  It doesn't use any code from xdm, and
+has a more paranoid and safer design overall.  It also includes many
+features over xdm, the biggest one of which is that it is more user
+friendly, even if your X setup is failing.  The goal is that users
+should never, ever have to use the command line to customize or
+troubleshoot gdm.  It of course supports xdmcp, and in fact extends
+xdmcp a little bit in places where I thought xdm was lacking (but is
+still compatible with xdm's xdmcp).
diff --git a/gdm2/Makefile b/gdm2/Makefile
new file mode 100644
index 0000000000..7d871d479d
--- /dev/null
+++ b/gdm2/Makefile
@@ -0,0 +1,148 @@
+# $NetBSD: Makefile,v 1.200 2020/12/04 04:56:16 riastradh Exp $
+#
+
+DISTNAME=	gdm-2.20.11
+CATEGORIES=	x11 gnome
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gdm/2.20/}
+EXTRACT_SUFX=	.tar.bz2
+PREV_PKGPATH=	../../x11/gdm
+
+MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE=	https://www.gnome.org/
+COMMENT=	Gnome Display Manager (legacy) - a re-implementation of the xdm program
+
+DEPENDS+=	zenity>=2.16.0:../../x11/zenity
+
+USE_PKGLOCALEDIR=	YES
+GNU_CONFIGURE=		YES
+USE_LIBTOOL=		YES
+USE_TOOLS+=		gmake intltool msgfmt pkg-config
+BUILD_DEFS+=		VARBASE
+
+.include "options.mk"
+
+CONFIGURE_ARGS+=	--localstatedir=${VARBASE:Q}
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
+CONFIGURE_ARGS+=	--with-dmconfdir=${PKG_SYSCONFDIR:Q}/dm
+CONFIGURE_ARGS+=	--with-sysconfsubdir=
+CONFIGURE_ARGS+=	--with-prefetch=yes
+CONFIGURE_ENV+=		PREFIX=${PREFIX:Q}
+CONFIGURE_ENV+=		X11BASE=${X11BASE:Q}
+INSTALL_MAKE_FLAGS+=	${MAKE_FLAGS}
+INSTALL_MAKE_FLAGS+=	GDM_CUSTOM_CONF=${EGDIR:Q}/custom.conf
+INSTALL_MAKE_FLAGS+=	sysconfdir=${EGDIR:Q}
+MAKE_ENV+=		CHMOD=${CHMOD:Q} CHOWN=${CHOWN:Q}
+
+OWN_DIRS=		${PKG_SYSCONFDIR}/Init
+OWN_DIRS+=		${PKG_SYSCONFDIR}/PostLogin
+OWN_DIRS+=		${PKG_SYSCONFDIR}/PostSession
+OWN_DIRS+=		${PKG_SYSCONFDIR}/PreSession
+OWN_DIRS+=		${PKG_SYSCONFDIR}/dm
+OWN_DIRS+=		${PKG_SYSCONFDIR}/modules
+OWN_DIRS+=		${VARBASE}/gdm
+OWN_DIRS+=		${VARBASE}/log/gdm
+
+PKG_SYSCONFSUBDIR=	gdm
+EGDIR=			${PREFIX}/share/examples/gdm
+CONF_FILES=
+.for f in custom.conf locale.alias \
+	modules/AccessDwellMouseEvents modules/AccessKeyMouseEvents \
+	modules/factory-AccessDwellMouseEvents \
+	modules/factory-AccessKeyMouseEvents
+CONF_FILES+=		${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f}
+.endfor
+.for f in Init/Default PostLogin/Default.sample PostSession/Default \
+	PreSession/Default XKeepsCrashing Xsession
+CONF_FILES_PERMS+=	${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f} \
+			${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 0755
+.endfor
+RCD_SCRIPTS=		gdm
+
+.include "../../mk/bsd.prefs.mk"
+
+SUBST_CLASSES+=		desktop
+SUBST_MESSAGE.desktop=	Configuring GDM settings.
+SUBST_STAGE.desktop=	pre-configure
+SUBST_FILES.desktop+=	config/gdm.conf.in
+SUBST_SED.desktop=	-e 's/^_//g'
+SUBST_SED.desktop+=	-e 's|^User=gdm$$|User=${GDMOWN}|g'
+SUBST_SED.desktop+=	-e 's|^Group=gdm$$|Group=${GDMGRP}|g'
+SUBST_SED.desktop+=	-e 's|^\#GtkTheme=.*$$|GtkTheme=Clearlooks|g'
+SUBST_SED.desktop+=	-e 's|^\#FirstVT=.*$$|FirstVT=5|g'
+SUBST_SED.desktop+=	-e 's|^\#VTAllocation=.*$$|VTAllocation=true|g'
+.if ${OPSYS} == "NetBSD"
+SUBST_SED.desktop+=	-e 's|^\#Logo=.*$$|Logo=${PREFIX}/share/pixmaps/NetBSD.xpm|g'
+.endif
+.if ${OPSYS} == "NetBSD" || ${OPSYS} == "OpenBSD"
+SUBST_SED.desktop+=	-e 's|^\#RebootCommand=.*$$|RebootCommand=/sbin/shutdown -r now|g'
+SUBST_SED.desktop+=	-e 's|^\#HaltCommand=.*$$|HaltCommand=/sbin/shutdown -p now|g'
+.endif
+SUBST_SED.desktop+=	-e 's|^PreFetchProgram=.*$$|PreFetchProgram=${PREFIX}/libexec/gdmprefetch @${PKG_SYSCONFDIR}/gdmprefetchlist|g'
+
+SUBST_CLASSES+=		gdmsetup
+SUBST_MESSAGE.gdmsetup=	Patching gdmsetup theme installer to use ${REAL_ROOT_USER}:${REAL_ROOT_GROUP}
+SUBST_STAGE.gdmsetup=	pre-configure
+SUBST_FILES.gdmsetup=	gui/gdmsetup.c
+SUBST_SED.gdmsetup=	-e 's/root:root/${REAL_ROOT_USER}:${REAL_ROOT_GROUP}/g'
+
+.if ${OPSYS} == "SunOS"
+CFLAGS+=	-DSunOS
+GDMOWN=		daemon
+GDMGRP=		other
+.else
+GDMOWN=		daemon
+GDMGRP=		daemon
+.endif
+
+# The following forces the X server to start on the 5th virtual terminal.
+# This is suboptimal but matches the defaults for the xdm configuration,
+# which should work for most installations.  See the definition of
+# DEFAULTVT in xsrc/xfree/xc/programs/xdm/config/Imakefile.
+#
+# If we do not do this, we hit a very annoying and obscure problem: during
+# system startup, gdm starts before init spawns gettys.  If the X server
+# is started before init spawns the gettys (which easily happens on slow
+# machines), it grabs the first virtual terminal (instead of the first
+# "free" one).  Later on, when the first getty is started, it grabs the
+# same terminal X used (the first one).  As a result, only one of them
+# will receive key presses.  And on slow machines, X will have lost access
+# to the keyboard.
+.if (${OPSYS} == "NetBSD" || ${OPSYS} == "OpenBSD") && \
+    (${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64")
+CONFIGURE_ARGS+=	X_SERVER_ARGS="vt05"
+.endif
+
+PLIST_VARS+=		dmx
+.if exists(${X11BASE}/include/X11/extensions/dmxext.h)
+PLIST.dmx=		yes
+.endif
+PRINT_PLIST_AWK+=	/dmx/ { print "$${DMX}" $$0; next }
+
+PLIST_VARS+=		gdmopen
+.if exists(/usr/include/linux/vt.h) || ${OPSYS} == "SunOS"
+PLIST.gdmopen=		yes
+.endif
+PRINT_PLIST_AWK+=	/gdmopen/ { print "$${GDMOPEN}" $$0; next }
+
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/glib2/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
+.include "../../devel/pango/buildlink3.mk"
+.include "../../devel/popt/buildlink3.mk"
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+BUILDLINK_API_DEPENDS.libart+=	libart>=2.3.11
+.include "../../graphics/libart/buildlink3.mk"
+.include "../../graphics/libgnomecanvas/buildlink3.mk"
+.include "../../graphics/librsvg/buildlink3.mk"
+.include "../../security/tcp_wrappers/buildlink3.mk"
+.include "../../textproc/gnome-doc-utils/buildlink3.mk"
+.include "../../textproc/libxml2/buildlink3.mk"
+.include "../../mk/omf-scrollkeeper.mk"
+.include "../../x11/gtk2/buildlink3.mk"
+
+post-install:
+	${INSTALL_DATA} ${FILESDIR}/NetBSD.xpm ${DESTDIR}${PREFIX}/share/pixmaps
+	${INSTALL_DATA} ${FILESDIR}/custom.desktop \
+		${DESTDIR}${PREFIX}/share/gdm/BuiltInSessions
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/gdm2/PLIST b/gdm2/PLIST
new file mode 100644
index 0000000000..6ab9c2e6ad
--- /dev/null
+++ b/gdm2/PLIST
@@ -0,0 +1,213 @@
+@comment $NetBSD: PLIST,v 1.41 2014/03/11 14:05:19 jperkin Exp $
+${PLIST.dmx}bin/gdm-dmx-reconnect-proxy
+bin/gdmXnest
+bin/gdmXnestchooser
+bin/gdmdynamic
+bin/gdmflexiserver
+bin/gdmphotosetup
+bin/gdmthemetester
+lib/gtk-2.0/modules/libdwellmouselistener.la
+lib/gtk-2.0/modules/libkeymouselistener.la
+${PLIST.pam}libexec/gdmaskpass
+libexec/gdmchooser
+libexec/gdmgreeter
+libexec/gdmlogin
+${PLIST.gdmopen}libexec/gdmopen
+libexec/gdmprefetch
+libexec/gdmtranslate
+man/man1/gdm.1
+sbin/gdm
+sbin/gdm-binary
+sbin/gdm-restart
+sbin/gdm-safe-restart
+sbin/gdm-stop
+sbin/gdmsetup
+share/examples/gdm/Init/Default
+share/examples/gdm/PostLogin/Default.sample
+share/examples/gdm/PostSession/Default
+share/examples/gdm/PreSession/Default
+share/examples/gdm/XKeepsCrashing
+share/examples/gdm/Xsession
+share/examples/gdm/custom.conf
+share/examples/gdm/gdmprefetchlist
+share/examples/gdm/locale.alias
+share/examples/gdm/modules/AccessDwellMouseEvents
+share/examples/gdm/modules/AccessKeyMouseEvents
+share/examples/gdm/modules/factory-AccessDwellMouseEvents
+share/examples/gdm/modules/factory-AccessKeyMouseEvents
+share/gdm/BuiltInSessions/custom.desktop
+share/gdm/BuiltInSessions/default.desktop
+share/gdm/applications/gdmflexiserver-xnest.desktop
+share/gdm/applications/gdmflexiserver.desktop
+share/gdm/applications/gdmphotosetup.desktop
+share/gdm/applications/gdmsetup.desktop
+share/gdm/defaults.conf
+share/gdm/factory-defaults.conf
+share/gdm/gdmchooser.glade
+share/gdm/gdmphotosetup.glade
+share/gdm/gdmsetup.glade
+share/gdm/themes/circles/GdmGreeterTheme.desktop
+share/gdm/themes/circles/background.svg
+share/gdm/themes/circles/circles.xml
+share/gdm/themes/circles/flower.png
+share/gdm/themes/circles/screenshot.png
+share/gdm/themes/happygnome-list/GdmGreeterTheme.desktop
+share/gdm/themes/happygnome-list/background.svg
+share/gdm/themes/happygnome-list/gnome-logo.svg
+share/gdm/themes/happygnome-list/happygnome-list.xml
+share/gdm/themes/happygnome-list/screenshot.png
+share/gdm/themes/happygnome/GdmGreeterTheme.desktop
+share/gdm/themes/happygnome/background.svg
+share/gdm/themes/happygnome/gnome-logo.svg
+share/gdm/themes/happygnome/happygnome.xml
+share/gdm/themes/happygnome/screenshot.png
+share/gnome/help/gdm/C/gdm.xml
+share/gnome/help/gdm/C/legal.xml
+share/gnome/help/gdm/de/gdm.xml
+share/gnome/help/gdm/en_GB/gdm.xml
+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/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-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
+share/locale/as/LC_MESSAGES/gdm.mo
+share/locale/az/LC_MESSAGES/gdm.mo
+share/locale/be/LC_MESSAGES/gdm.mo
+share/locale/bg/LC_MESSAGES/gdm.mo
+share/locale/bn/LC_MESSAGES/gdm.mo
+share/locale/bn_IN/LC_MESSAGES/gdm.mo
+share/locale/bs/LC_MESSAGES/gdm.mo
+share/locale/ca/LC_MESSAGES/gdm.mo
+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
+share/locale/es/LC_MESSAGES/gdm.mo
+share/locale/et/LC_MESSAGES/gdm.mo
+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/ga/LC_MESSAGES/gdm.mo
+share/locale/gl/LC_MESSAGES/gdm.mo
+share/locale/gu/LC_MESSAGES/gdm.mo
+share/locale/he/LC_MESSAGES/gdm.mo
+share/locale/hi/LC_MESSAGES/gdm.mo
+share/locale/hr/LC_MESSAGES/gdm.mo
+share/locale/hu/LC_MESSAGES/gdm.mo
+share/locale/hy/LC_MESSAGES/gdm.mo
+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/kn/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
+share/locale/lv/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
+share/locale/ml/LC_MESSAGES/gdm.mo
+share/locale/mn/LC_MESSAGES/gdm.mo
+share/locale/mr/LC_MESSAGES/gdm.mo
+share/locale/ms/LC_MESSAGES/gdm.mo
+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/nso/LC_MESSAGES/gdm.mo
+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/pt/LC_MESSAGES/gdm.mo
+share/locale/pt_BR/LC_MESSAGES/gdm.mo
+share/locale/ro/LC_MESSAGES/gdm.mo
+share/locale/ru/LC_MESSAGES/gdm.mo
+share/locale/rw/LC_MESSAGES/gdm.mo
+share/locale/si/LC_MESSAGES/gdm.mo
+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/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
+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/NetBSD.xpm
+share/pixmaps/faces/astronaut.jpg
+share/pixmaps/faces/baseball.png
+share/pixmaps/faces/butterfly.png
+share/pixmaps/faces/cat-eye.jpg
+share/pixmaps/faces/chess.jpg
+share/pixmaps/faces/coffee.jpg
+share/pixmaps/faces/dice.jpg
+share/pixmaps/faces/energy-arc.jpg
+share/pixmaps/faces/fish.jpg
+share/pixmaps/faces/flake.jpg
+share/pixmaps/faces/flower.jpg
+share/pixmaps/faces/grapes.jpg
+share/pixmaps/faces/guitar.jpg
+share/pixmaps/faces/launch.jpg
+share/pixmaps/faces/leaf.jpg
+share/pixmaps/faces/lightning.jpg
+share/pixmaps/faces/penguin.jpg
+share/pixmaps/faces/puppy.jpg
+share/pixmaps/faces/sky.jpg
+share/pixmaps/faces/soccerball.png
+share/pixmaps/faces/sunflower.jpg
+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/nobody.png
+share/pixmaps/nohost.png
+share/xsessions/gnome.desktop
diff --git a/gdm2/distinfo b/gdm2/distinfo
new file mode 100644
index 0000000000..c4ea8a81c6
--- /dev/null
+++ b/gdm2/distinfo
@@ -0,0 +1,19 @@
+$NetBSD: distinfo,v 1.63 2015/11/04 03:28:29 agc Exp $
+
+SHA1 (gdm-2.20.11.tar.bz2) = be23bdf32b7a4254ac80983f4edf25cafa847ff3
+RMD160 (gdm-2.20.11.tar.bz2) = e400bb8a0b78a2e8b0da98edd2e0f3a7a0267f04
+SHA512 (gdm-2.20.11.tar.bz2) = ca8ce81161c640ef2753a35b8eb0fd8669a7e42dc6272b2aa7b4a9f525b4d03dc46bb5aa8d41b69aaba36c8715a220c92e75c169ce9d5af39b25853505abeb39
+Size (gdm-2.20.11.tar.bz2) = 4013059 bytes
+SHA1 (patch-aa) = 5e950a5271d3c399cb9e613b4c5b8557a0844656
+SHA1 (patch-ab) = 43b565fcbe2e172f5e319b3d111d475646f481e0
+SHA1 (patch-ac) = 69b3539e50af0b32207b9ffeb7cb01645c9ece3c
+SHA1 (patch-ae) = c95265b55c968a0466e1ae50bbe58c121f05b027
+SHA1 (patch-ak) = 99ca1a7ce804a1ae99903860e2b923c972ae95e6
+SHA1 (patch-al) = 3b66dd3f4cdea6a3af5cbd0ff65eb02ccdead483
+SHA1 (patch-ao) = c67c0b76db15c50dfb20d1cc9cd44d76ba7220f3
+SHA1 (patch-ap) = 634fae3ae86620229c66d48ae0e3f8d86d71b1af
+SHA1 (patch-aq) = 7885ca3774bb3cd91a800654368f9cd5cde806c7
+SHA1 (patch-ar) = 9783e336cd11b34e990291c25f0b70752edec012
+SHA1 (patch-as) = 13135a44949dac9ff23be4c8efb15baffd18b58b
+SHA1 (patch-at) = 4be192597cf1bb129e5b69f27d9d388bcd00b4e0
+SHA1 (patch-common_gdm-config.h) = 3719a2de866d20b46a834cca0dcdbf533d8c4add
diff --git a/gdm2/files/NetBSD.xpm b/gdm2/files/NetBSD.xpm
new file mode 100644
index 0000000000..ee8dc09d2d
--- /dev/null
+++ b/gdm2/files/NetBSD.xpm
@@ -0,0 +1,224 @@
+/* XPM */
+static char *NetBSD_new[] = {
+/* columns rows colors chars-per-pixel */
+"185 150 68 1",
+"  c #777777777777",
+". c #7AE47AE47AE4",
+"X c #F2F267671111",
+"o c #F2F269A51488",
+"O c #F37E6D801AB6",
+"+ c #F3F370701EF0",
+"@ c #F3F3732C2379",
+"# c #F40376C62939",
+"$ c #F4BD79892D01",
+"% c #F4F47E17348F",
+"& c #F4F480803737",
+"* c #F50382273B15",
+"= c #F5CC866B41C8",
+"- c #F5F5892945C6",
+"; c #F5F58D374C52",
+": c #F5F58F8F5050",
+"> c #F67F9261545E",
+", c #F6F696525A68",
+"< c #F6F699545EE7",
+"1 c #F7939CB96481",
+"2 c #F7F79F4968BE",
+"3 c #F7F7A1C86C52",
+"4 c #F7F7A5A57290",
+"5 c #F7F7A8A87721",
+"6 c #F8F8A7677535",
+"7 c #F8F8A8A87777",
+"8 c #F8F8AB797B89",
+"9 c #839D839D839D",
+"0 c #8B788B788B78",
+"q c #93AD93AD93AD",
+"w c #9D059D059D05",
+"e c #A353A353A353",
+"r c #AC09AC09AC09",
+"t c #B3F5B3F5B3F5",
+"y c #BD82BD82BD82",
+"u c #F8F8AF59819E",
+"i c #F8F8B19184E4",
+"p c #F9C7B63B8CBE",
+"a c #F9F9B8B88F8F",
+"s c #F9F9BBEA9580",
+"d c #FA6BBF309AA8",
+"f c #FAE0C1A79E84",
+"g c #FAFAC5BBA495",
+"h c #FAFAC7C7A8A8",
+"j c #FB3ACA93AC87",
+"k c #FBEDCE95B2CF",
+"l c #FBFBD0FBB68B",
+"z c #FC22D4BABC62",
+"x c #C493C493C493",
+"c c #CC75CC75CC75",
+"v c #D465D465D465",
+"b c #DCABDCABDCAB",
+"n c #FC3BD7D7C141",
+"m c #FCF0DA36C4FE",
+"M c #FCFCDE59CB57",
+"N c #FCFCE120CF4F",
+"B c #FDBFE477D4E4",
+"V c #FDFDE787D9B9",
+"C c #FDFDEA3BDDC8",
+"Z c #E540E540E540",
+"A c #EC9FEC9FEC9F",
+"S c #FE94EEA5E4E8",
+"D c #FEFEF0F0E7E7",
+"F c #FEFEF3C4ECCD",
+"G c #F4CDF4CDF4CD",
+"H c #FEFEF758F2AE",
+"J c #FF4AF9C2F62C",
+"K c none",
+/* pixels */
+"KKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKK",
+"KKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKK",
+"KKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKK",
+"KKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKK",
+"KKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKK",
+"KKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKJHHHHHHJKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKK",
+"KKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKJHFBjfi31>;;:;:;,<4phmSHJKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKK",
+"KKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKDzd4>$oXXXXoXoXXXXXXXXXXXXX%>8jVKKKKKKKKKKKKKKKKKKKKKKKKKKKK",
+"KKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKSMf2*+OoXXXXXXXXXXXXXXXXXXXXXXXXXXXoO*8zSKKKKKKKKKKKKKKKKKKKKKKKK",
+"KKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKJSMs,%@XXoXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXO%4nFKKKKKKKKKKKKKKKKKKKKK",
+"KKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKJSg1*oXXXXXXXXXXXXXXXXXXXXXXXXoXXOoO@*;<<<<<<<-*OOO-pSKKKKKKKKKKKKKKKKKKK",
+"KKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKFj8*oXXXoXXXXXXXXXXXXXXXXXXXXXXXO-1pjBFKKKKKKKKKKKKKDMju2sMKKKKKKKKKKKKKKKKK",
+"KKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKJBd>#OXXXXXXXXXXXXXXXXXXXXXXXXXX$:8zSHJKKKKKKKKKKKKKKKKKKKKKJFHKKKKKKKKKKKKKKKKK",
+"KKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKJDM8-#XXXXXXXXXXXXXXXXXXXXXXXXXXO%1jVJKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKK",
+"KKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKZbKCgJKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKFh2&ooXXXXXXXXXXXXXXXXXXXXXXXXXX@3lFKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKK",
+"KKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKc  vH<O2kFKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKCj8=XXXXXoXXXXXXXXXXXXXXXXXXXXXXX@1jJKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKK",
+"KKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKy  wGMOXO$4jVJKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKFBk8=#OXXXXXXXXXXXXXXXXXXXXXXXXXXXXO=pBJKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKK",
+"KKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKb.  cK4XXXXo%:amDHJKKKKKKKKKKKKKKKKKKKKKKKKKKKJHSMd1-#oXXXXXXXXXXXXXXXXXXXXXXXXXXXXXo+>jDKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKK",
+"KKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKJe  qGC@XXXXXXXX#;4dzSKKKKKKKKKKKKKKKKKKKJCmg81*OoXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXO4MKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKK",
+"KKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKb. .xKpoXXXXXXXXXXooO+%>18idhgggggpu3<-%OOoXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX%iSJKKKKHCmkgi4<<=****-<<8ajmVJKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKK",
+"KKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKGe  0GS*XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXo*sCJJCMh8:*$@oXXXXXXXXXXXXXoXo@$*<smSJKKKKKKKKKKKKKKKKKKKKKKKKKKKKKK",
+"KKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKv   xKgoXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXo%sVCh8:%oXXXXXXXXXXXXXXXXXXXXXXXXXXXXo*1hSJKKKKKKKKKKKKKKKKKKKKKKKKKKK",
+"KKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKq  0GF:XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX%3p2%oXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXO,hFKKKKKKKKKKKKKKKKKKKKKKKKK",
+"KKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKc   xKmoXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXO@OooXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX#@$**%#@OXo#7mJKKKKKKKKKKKKKKKKKKKKKK",
+"KKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKGq  0AK<XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXoO$*<8hzMVBCSSSBBMmhi<:7MJKKKKKKKKKKKKKKKKKKKK",
+"KKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKc   yKM@XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXo#<snVKKKKKKKKKKKKKKKKKKKKCMDKKKKKKKKKKKKKKKKKKKK",
+"KKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKG0  9AK8oXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXO,sMKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKK",
+"KKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKJx   tKC%oXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXo$,gSJKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKK",
+"KKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKG0  9ZKsXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXo+-dVJKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKK",
+"KKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKt   tKF*XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX+7mJKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKK",
+"KKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKG9  9ZKzoXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXO;gHKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKK",
+"KKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKt   rKJ:XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX@,zFKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKK",
+"KKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKZ9  9bKm@XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXo@4MJKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKK",
+"KKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKt   eKK3XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX@8VKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKK",
+"KKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKZ.  .bKV$XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXo%pSKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKK",
+"KKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKr   eJKpXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXo*pCKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKK",
+"KKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKZ.  .bKD%XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX#sSKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKK",
+"KKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKw   eGKgoXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX$sFKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKK",
+"KKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKb.   bKJ-XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX%sFKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKK",
+"KKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKJw   wGKk@XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXoo*sSKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKK",
+"KKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKv   .vKJ,XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXo%gDKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKK",
+"KKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKGw   0KKB@oXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX;jJKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKK",
+"KKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKv   .cKJ8oXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX#<zJKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKK",
+"KKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKGq   qGKS#XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXo$8MJKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKK",
+"KKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKc    cKKsoXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX;gSKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKK",
+"KKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKJ0   qAKF=XXXXXXXXXXXXXXXXXXXXXXXXXXXXO-pSKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKK",
+"KKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKx    xKKjOXXXXoXXXXXXXXXXXXXXXoXoo$;pNFKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKK",
+"KKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKG0   0AKJl7=#OoXXXXXXXXXXXXooO#-5jBJKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKK",
+"KKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKy    yKKKKKSmfi3>-%%$%%;,6ahMDKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKK",
+"KKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKA0   .GKKKKKKKKJKKJJJJJKJKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKK",
+"KKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKt    yKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKK",
+"KKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKA.   0AKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKK",
+"KKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKt.   tKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKK",
+"KKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKZ.   9ZKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKK",
+"KKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKe    tKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKK",
+"KKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKb9   9ZKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKK",
+"KKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKe    rKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKK",
+"KKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKb.    AKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKK",
+"KKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKJe    rJKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKK",
+"KKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKv    .bKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKK",
+"KKKKKKDMBSSSSSSSSSBJKKKKKKKKKKKKSMBSSDSSSSSSCMDKKKKKKKKKKKKq    eKKKKKKKKKKKKKKKKKKKKKKJGGAZZZZZZAZGGKKKKKKKKKKKKKKKKKKKKKKActwq00qercZJKKKKKKKKKGGGGZZZZZZZZAGGKKKKKKKKKKKKKKKKKKKKKKKKK",
+"KKKKKK8@#$$$$$$$$$#kKKKKKKKKKKKK8##$$$$$$$$$$#pKKKKKKKKKKKKv.   9vKKKKKKKKKKKKKKKKyew0009009...9....90wtcAKKKKKKKKKKKKKKGvw9     .    90rGKvweq0009099..9.....900wrcbGKKKKKKKKKKKKKKKKKKK",
+"KKKKKK8#OooXoXXXXXX,HKKKKKKKKKKKu#OooXXXoXXoO#sKKKKKKKKKKKKGq    wKKKKKKKKKKKKKKKK9                      9eZKKKKKKKKKKKAr     .0999      vKt          .             .0evGKKKKKKKKKKKKKKKK",
+"KKKKKKJCz8@XoXXXXXXOhKKKKKKKKKKKJCzp$oXXXXo,jCJKKKKKKKKKKKKKc.    vKKKKKKKKKKKKKKKctq         0rtrw        .yGKKKKKKKKA0     rZKKJbe     tKZyr.         qrrtre0         0yGKKKKKKKKKKKKKK",
+"KKKKKKKKKKB@XXXXXXXX$VKKKKKKKKKKKKKKD%XXXo8JKKKKKKKKKKKKKKKKGxxyyybKKKKKKKKKKKKKKKKKKv.      .ZKKKJGr..      rKKKKKKKA0    .cKKKKKKJc.   eKKKKb.       wJKKKKJJAce.       0vJKKKKKKKKKKKK",
+"KKKKKKKKKKK3XXXXXXXXo,JKKKKKKKKKKKKKK8XXXOMKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKK0      9ZKKKKKGy.     ..cKKKKKKt     rKKKKKKKKKy.  qGKKKGe       yKKKKKKKKKGbw       .tGKKKKKKKKKKK",
+"KKKKKKKKKKKsXXXXXXXXXXsJKKKKKKKKKKKKKjOXX*SKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKw      9AKKKKKKGe       qKKKKKZ.     bKKKKKKKKKGe  qGKKKKr       yKKKKKKKKKKKGt9       rGKKKKKKKKKK",
+"KKKKKKKKKKKsXXXXXXXXXXOjKKKKKKKKKKKKKmOXX;HKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKw      .ZKKKKKKKZ        ZKKKKy     .GKKKKKKKKKKb9 9AKKKKt       xKKKKKKKKKKKKKv9       tGKKKKKKKKK",
+"KKKKKKKKKKKsXXXXXXXXXXX$mKKKKKKKKKKKKB@XX<JKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKe      9ZKKKKKKKG0       cKKKKw      AKKKKKKKKKKKe 9AKKKKy       yKKKKKKKKKKKKKKx        xKKKKKKKKK",
+"KKKKKKKKKKKsXXX=oXXXXXXX=CKKKKKKKKKKKS$XX2KKKKKKKKKKKKKKKKKKKKKKKKKKKKKSlSKKKKKKKKKKKKw      9ZKKKKKKKKw       xKKKG0      xKKKKKKKKKKKb0eGKKKKy       yKKKKKKKKKKKKKKGw       9ZKKKKKKKK",
+"KKKKKKKKKKKdXXXC:XXXXXXXo:JKKKKKKKKKKS$Xo3KKKKKKKKKKKKKKKKKKKKKKKKKKKKJ>X8KKKKKKKKKKKKw      9AKKKKKKKKe       xKKKG0      qAKKKKKKKKKKKGJKKKKKy       yKKKKKKKKKKKKKKKb9       rKKKKKKKK",
+"KKKKKKKKKKKsXXXKC-XXXXXXXX7JKKKKKKKKKD$XX8KKKKKKKKKKKKKKKKKKKKKKKKKKKK4oX7KKKKKKKKKKKKw      9AKKKKKKKKw       vKKKG0       eGKKKKKKKKKKKKKKKKKy       xKKKKKKKKKKKKKKKKe       .bKKKKKKK",
+"KKKKKKKKKKKdXXXJKB%XXXXXXXoaJKKKKKKKKK%XXpKKKKKKKKKKKKKKKKKKKKKKKKKKHpoXX8KKKKKKKKKKKKw      9ZKKKKKKKG0      .GKKKKw        wAKKKKKKKKKKKKKKKKx       yKKKKKKKKKKKKKKKKv        rKKKKKKK",
+"KKKKKKKKKKKsXXoJKKkOXXXXXXo@jKKKKKKKKK%XopKKKKKKKKKKKKKKKKKKKKKKKKKF5OXXX7KKKKKKKKKKKKe      .AKKKKKKKv      .yKKKKKy         qvGKKKKKKKKKKKKKKy       yKKKKKKKKKKKKKKKKA0       0GKKKKKK",
+"KKKKKKKKKKKsXXXJKKKpoXXXXXXX#MKKKKKKKK%oXpKKKKKKKKKVjs8djVKKKKKKKKB;oXXXX8KKKKKKKKKKKKw      9AKKKKKKGq      wGKKKKKZ.          wZKKKKKKKKKKKKKy       xKKKKKKKKKKKKKKKKGw        ZKKKKKK",
+"KKKKKKKKKKKsXXXJKKKJ4XXXXXXXX#CKKKKKKK%XXpKKKKKKSs&XoXXoXo%hJKKKB4oXXXXXXO>>>>,8JKKKKKw      9ZKKKKKZw     .tGKKKKKKKr            eZKKKKKKKKKKKy       yKKKKKKKKKKKKKKKKKt        xKKKKKK",
+"KKKKKKKKKKKdXXoJKKKKS:XXXXXXXX;SKKKKKK%oXpKKKKKl&oXXXOOoXXXo<SJ2#XXXXXXXXXXXoXX*FKKKKKw      .ybbbcr9   .qrZJKKKKKKKKA0            .eAKKKKKKKKKy       yKKKKKKKKKKKKKKKKKx        tKKKKKK",
+"KKKKKKKKKKKsXXXJKKKKKB$XXXXXXXo2HKKKKK%XopKKKJsOXXXO6zma@XXXX>C@OoXXXXXXXXOOoOo,KKKKKKw                 9xGKKKKKKKKKKKb.             0vKKKKKKKKy       xKKKKKKKKKKKKKKKKKv        rKKKKKK",
+"KKKKKKKKKKKdXXXJKKKKKKzOXXXXXXXo8KKKKK%oXpKKKdOoXX+kKKKKgoXXXosljg$XXXXXX;jjjjjVKKKKKKw                   .evKKKKKKKKKKb0             .yKKKKKKKy       yKKKKKKKKKKKKKKKKKv        rKKKKKK",
+"KKKKKKKKKKKdXXoJKKKKKKKdOXXXXXXXosKKKK%XXpKKmOXXXopKKKKKV$XXXX$JKJ-XXXXXXdKKKKKKKKKKKKe       ecvcxr0       .eZKKKKKKKKKAe              tKKKKKKx       yKKKKKKKKKKKKKKKKKv        eKKKKKK",
+"KKKKKKKKKKKsoXXJKKKKKKKJ5ooXXXXXXOlKKK%XXpKJ;XXXX$BKKKKKB$XXXXXBKH-oXXXXXdKKKKKKKKKKKKw      .ZKKKKKGy0.      0ZKKKKKKKKKGx0            .vKKKKKy       yKKKKKKKKKKKKKKKKKv        rKKKKKK",
+"KKKKKKKKKKKsXXoJKKKKKKKKF:XXXXXXXX$mKK&XopKzooXXoOpMMMMj<oXXXXXfKJ;XXXXXXdKKKKKKKKKKKKw      0ZKKKKKKKv.       qGKKKKKKKKKKAy..          0AKKKKy       yKKKKKKKKKKKKKKKKKc        tKKKKKK",
+"KKKKKKKKKKKdXXXJKKKKKKKKKS$XXXXXXXo&CK&XXpJ1XXXXXXXXXXXXXXXXXXXsKJ-XXXXXXfKKKKKKKKKKKKe      9AKKKKKKKKx        tKKKKKKKKKKKKGt.          tKKKKy       xKKKKKKKKKKKKKKKKKt        vKKKKKK",
+"KKKKKKKKKKKsXXoJKKKKKKKKKKm@XXXXXXXo=S%XXpS&XXXXXXXXXXXXXXXXXoOmKH;oXXXXXdKKKKKKKKKKKKw      9ZKKKKKKKKKq       9AKKKKKKKKKKKKKv0         qGKKKy       yKKKKKKKKKKKKKKKKKe        AKKKKKK",
+"KKKKKKKKKKKsXXXJKKKKKKKKKKKfOoXXXXXXX;+XXpBoXXXXX=ghghghhhgghhMKKJ-XXXXXXdKKKKKKKKKKKKw      9ZKKKKKKKKKx        vKKKKKKKKKKKKKKZw        .ZKKKy       yKKKKKKKKKKKKKKKKGq       qJKKKKKK",
+"KKKKKKKKKKKdXXXKKKKKKKKKKKKJ8oXXXXXXXXXXXpzXXXXXo7KKKKKKKKKKKKKKKJ;XXXXXXfKKKKKKKKKKKKw      9ZKKKKKKKKKb.       tKKKKKKKKKKKKKKKA0        vKKKx       xKKKKKKKKKKKKKKKKZ.       tKKKKKKK",
+"KKKKKKKKKKKsXXXJKKKKKKKKKKKKJ,oXXXXXXXXXXpjXXXXXX1KKKKKKKKKKKKKKKJ;XXXXXXdKKKKKKKKKKKKe      9AKKKKKKKKKZ0       rZxbKKKKKKKKKKKKKb.       xKKKy       yKKKKKKKKKKKKKKKKy       9ZKKKKKKK",
+"KKKKKKKKKKKdXXXJKKKKKKKKKKKKKS*XXXXXXXXXXpjXXXXXo=FKKKKKKKKKKKKKKJ;XXXXXXdKKKKKKKKKKKKw      9ZKKKKKKKKKA9       rr wJKKKKKKKKKKKKJe       cKKKy       yKKKKKKKKKKKKKKKGq       eKKKKKKKK",
+"KKKKKKKKKKKpXXXCKKKKKKKKKKKKKKm$XXXXXXXXXpmoXXXXX@mKKKKKKKKKKKKKKJ-oXXXXXdKKKKKKKKKKKKw      9AKKKKKKKKKZ0       tr .bKKKKKKKKKKKKKx       vKKKy       xKKKKKKKKKKKKKKKv       9ZKKKKKKKK",
+"KKKKKKKKKKK6XXXBKKKKKKKKKKKKKKKjOXXXXXXXXpB#XXXXXX3KKKKKKKKKKKKKKH;XXXXXX8KKKKKKKKKKKKw      9ZKKKKKKKKKv        vt  eKKKKKKKKKKKKKZ      .ZKKKy       yKKKKKKKKKKKKKKG0       xKKKKKKKKK",
+"KKKKKKKKKKK1XXXzKKKKKKKKKKKKKKKJaXXXXXXXXpH-XXXXXXOhKKKKKKKKKHpMKJ;XXXXXo3KKKKKKKKKKKKe       ZKKKKKKKKKy       0Ay   cKKKKKKKKKKKKb      qGKKKy       tKKKKKKKKKKKKKJr       rJKKKKKKKKK",
+"KKKKKKKKKKK;XXXhKKKKKKKKKKKKKKKKJ1oXXXXXXpKsXXXXXXX@hJKKKKKKH8o>HJ-XXXXXX*KKKKKKKKKKKKw       cKKKKKKKKG0       rKv   0ZKKKKKKKKKKKc      xKKKKt       wKKKKKKKKKKKKKy.     .eGKKKKKKKKKK",
+"KKKKKKKKKKJ#XXX8KKKKKKKKKKKKKKKKKS-XXXXXXpKS$oXXXXXXO3MFHJHB2OXsKH;XXXXXXoMKKKKKKKKKKKq       rKKKKKKKKy       0AKZ    wAKKKKKKKKKGw     qGKKKKe       .GKKKKKKKKKKGy      .eJKKKKKKKKKKK",
+"KKKKKKKKKKBXXXX=FKKKKKKKKKKKKKKKKKM#XXXXXpKKfoXXXXXXoXX%;:*OXX=JKJ2XXXXXXX*zJKM8CKKKKG0       .vKKKKKKc.       vKKJ.    qZKKKKKKKKx.    .bKKKKGq        eGKKKKKKKKbw      .xGKKKKKKKKKKKK",
+"KKKKKKKKDj%XXXXX,lFKKKKKKKKKKKKKKKKjOXXXXpKKK6oXXXXXXXXXXXooX*BKKKfoXXXXXXXO@#oojKKGbe         .tvZbcw       qvKKKKe     .yAKKKKGt.    9cKKKJZy          0xZZZZvtq      9eZKKKKKKKKKKKKKK",
+"KKKKKKB:%OXXXXXXoO%-sKKKKKKKKKKKKKKJ8XXXX4KKKH8OXXXXXXXXXXXX=MKKKKD%XXXXXXXXXXO3DZw0..            ..       0tAKKKKKv.      9ette0.    qvKKZeq9             .999.      0rbGKKKKKKKKKKKKKKK",
+"KKKKKKjoooooOOoooooo=KKKKKKKKKKKKKKKH*XXX4KKKKJl=OXXXXXXooO3CKKKKKKk#XXoXXXoo%gJKv. ...   . .        ...0rcAKKKKKKKJvw.         .  .0xGKKKc  ....  ...          . .0rcAKKKKKKKKKKKKKKKKKK",
+"KKKKKKSdhhhhzzhhhhhgkKKKKKKKKKKKKKKKKm#%4SKKKKKKJz8-#oo#;uBKKKKKKKKKB8*OX@*3jFKKKAcccccccbbccxyyyyyxcvZGKKKKKKKKKKKKKKAxrq9     9qtvGKKKKKGxccccvcvbcccyyrerryyyvZGKKKKKKKKKKKKKKKKKKKKKK",
+"KKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKFHJKKKKKKKKKKJHFFHJKKKKKKKKKKKKKJFFFJJKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKGGGGZGGGJKKKKKKKKKKKKKKKKKKKKKKKKJKKKKKKKKKKKKKKKKKKKKKKKKKKKKKK",
+"KKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKK",
+"KKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKK",
+"KKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKK",
+"KKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKK",
+"KKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKK",
+"KKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKK",
+"KKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKGxxxxxxxAKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKK",
+"KKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKG9      rKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKK",
+"KKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKy      .ZKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKK",
+"KKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKA9      eKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKK",
+"KKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKy      .bKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKK",
+"KKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKA9      eKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKK",
+"KKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKt      .vKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKK",
+"KKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKZ.      wKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKK",
+"KKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKt       vKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKK",
+"KKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKZ       wJKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKK",
+"KKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKe       vKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKK",
+"KKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKb.      qGKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKK",
+"KKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKe      .cKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKK",
+"KKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKb       qGKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKK",
+"KKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKGw      .cKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKK",
+"KKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKv.      9GKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKK",
+"KKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKGw       xKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKK",
+"KKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKc       0GKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKK",
+"KKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKJ0       yKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKK",
+"KKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKx       9AKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKK",
+"KKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKG0       yKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKK",
+"KKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKx       9AKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKK",
+"KKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKA0       tKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKK",
+"KKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKy       .AKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKK",
+"KKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKA.      .tKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKK",
+"KKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKt.      9ZKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKK",
+"KKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKA.       eJKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKK",
+"KKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKr       9ZKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKK",
+"KKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKZ.       eKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKK",
+"KKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKr       .bKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKK",
+"KKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKZ.      .eKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKK",
+"KKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKGe        bKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKK",
+"KKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKb        eGKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKK",
+"KKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKq        bKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKK",
+"KKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKv.       rKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKK",
+"KKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKq       rKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKK",
+"KKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKc      .vKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKK",
+"KKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKGt    .xKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKK",
+"KKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKJcewrZKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKK",
+"KKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKJGKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKK",
+"KKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKK",
+"KKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKK",
+"KKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKK",
+"KKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKK",
+"KKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKK"
+};
diff --git a/gdm2/files/custom.desktop b/gdm2/files/custom.desktop
new file mode 100644
index 0000000000..a10f8490af
--- /dev/null
+++ b/gdm2/files/custom.desktop
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=User Defined Session
+Comment=This session runs your ~/.xsession file
+Exec=custom
+Icon=
+Type=Application
diff --git a/gdm2/files/gdm.sh b/gdm2/files/gdm.sh
new file mode 100755
index 0000000000..70fe7e9639
--- /dev/null
+++ b/gdm2/files/gdm.sh
@@ -0,0 +1,28 @@
+#!@RCD_SCRIPTS_SHELL@
+#
+# $NetBSD: gdm.sh,v 1.6 2011/10/07 22:37:06 shattered Exp $
+#
+
+# PROVIDE: gdm
+# REQUIRE: DAEMON LOGIN wscons
+# KEYWORD: shutdown
+
+if [ -f /etc/rc.subr ]; then
+	. /etc/rc.subr
+fi
+
+name="gdm"
+rcvar=${name}
+command="@PREFIX@/sbin/${name}"
+pidfile="/var/run/${name}.pid"
+procname="@PREFIX@/sbin/gdm-binary"
+required_files="@PKG_SYSCONFDIR@/custom.conf"
+extra_commands="reload"
+
+if [ -f /etc/rc.subr ]; then
+	load_rc_config ${name}
+	run_rc_command "$1"
+else
+	echo -n " ${name}"
+	${command} ${gdm_flags} ${command_args}
+fi
diff --git a/gdm2/options.mk b/gdm2/options.mk
new file mode 100644
index 0000000000..0155c67abc
--- /dev/null
+++ b/gdm2/options.mk
@@ -0,0 +1,35 @@
+# $NetBSD: options.mk,v 1.3 2014/06/10 13:53:47 joerg Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.gdm
+PKG_SUPPORTED_OPTIONS=	consolekit inet6 pam
+PKG_SUGGESTED_OPTIONS=	consolekit inet6
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Minet6)
+CONFIGURE_ARGS+=	--enable-ipv6
+.else
+CONFIGURE_ARGS+=	--disable-ipv6
+.endif
+
+.if !empty(PKG_OPTIONS:Mconsolekit)
+CONFIGURE_ARGS+=	--with-console-kit=yes
+.include "../../sysutils/consolekit/buildlink3.mk"
+.include "../../sysutils/dbus/buildlink3.mk"
+.include "../../sysutils/dbus-glib/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=	--with-console-kit=no
+.endif
+
+PLIST_VARS+=		pam
+.if !empty(PKG_OPTIONS:Mpam)
+.  include "../../mk/pam.buildlink3.mk"
+CONFIGURE_ARGS+=	--enable-authentication-scheme=pam
+.  if ${PAM_DEFAULT} == "linux-pam"
+PLIST.pam=		yes
+.  endif
+.elif exists(/etc/shadow)
+CONFIGURE_ARGS+=	--enable-authentication-scheme=shadow
+.else
+CONFIGURE_ARGS+=	--enable-authentication-scheme=crypt
+.endif
diff --git a/gdm2/patches/patch-aa b/gdm2/patches/patch-aa
new file mode 100644
index 0000000000..62200ee61e
--- /dev/null
+++ b/gdm2/patches/patch-aa
@@ -0,0 +1,84 @@
+$NetBSD: patch-aa,v 1.24 2009/08/18 19:31:30 drochner Exp $
+
+--- configure.orig	2009-03-19 06:00:24.000000000 +0100
++++ configure
+@@ -27448,7 +27448,9 @@ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ #include <sys/statvfs.h>
++#ifndef __NetBSD__
+ #include <sys/fstyp.h>
++#endif
+ _ACEOF
+ if { (ac_try="$ac_cpp conftest.$ac_ext"
+ case "(($ac_try" in
+@@ -33725,6 +33727,18 @@ case "$host" in
+ 	HOST_UTMP_LINE_REMOTE=""
+ 	HOST_UTMP_PSEUDO_DEVICE="false"
+ 	;;
++*netbsd*)
++	HOST_GDM_USER_PATH="/bin:/usr/bin"
++	HOST_HALT_COMMAND="/sbin/shutdown -p now"
++	HOST_REBOOT_COMMAND="/sbin/shutdown -r now"
++	HOST_SUSPEND_COMMAND="/usr/sbin/zzz"
++	HOST_XSESSION_SHELL=/bin/sh
++	HOST_SOUND_PROGRAM=/usr/bin/audioplay
++	HOST_GDMGNOMESESSIONCMD="dbus-launch --exit-with-session gnome-session"
++	HOST_UTMP_LINE_ATTACHED="/dev/console"
++	HOST_UTMP_LINE_REMOTE=""
++	HOST_UTMP_PSEUDO_DEVICE="false"
++	;;
+ *)
+ 	HOST_GDM_USER_PATH="/bin:/usr/bin"
+ 	HOST_HALT_COMMAND="/usr/bin/poweroff;/sbin/poweroff;/sbin/shutdown -h now;/usr/sbin/shutdown -h now"
+@@ -33741,18 +33755,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.
+@@ -33825,6 +33839,11 @@ elif test -x /usr/bin/X; then
+    X_SERVER_PATH="/usr/bin"
+    X_SERVER="/usr/bin/X"
+    X_CONFIG_OPTIONS="-audit 0"
++elif test "x${X11BASE}" != x; then
++   X_PATH="${X11BASE}/bin"
++   X_SERVER_PATH="${X11BASE}/bin"
++   X_SERVER="${X11BASE}/bin/X"
++   X_CONFIG_OPTIONS="-audit 0"
+ else
+    # what to do, what to do, this is wrong, but this just sets the
+    # defaults, perhaps this user is cross compiling or some such
+@@ -33834,6 +33853,7 @@ else
+    GDM_USER_PATH="$GDM_USER_PATH:/usr/bin/X11:/usr/X11R6/bin:/usr/local/bin:/opt/X11R6/bin"
+    X_CONFIG_OPTIONS="-audit 0"
+ fi
++X_CONFIG_OPTIONS="$X_SERVER_ARGS $X_CONFIG_OPTIONS"
+ 
+ # Use Xephyr if it is available.  It works better than Xnest since Xephyr
+ # supports the Xserver extensions, even if on a remote machine.
diff --git a/gdm2/patches/patch-ab b/gdm2/patches/patch-ab
new file mode 100644
index 0000000000..12e07374bc
--- /dev/null
+++ b/gdm2/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.17 2007/11/30 20:08:38 drochner Exp $
+
+--- ./daemon/gdm-daemon-config.c.orig	2007-09-28 17:00:37.000000000 +0200
++++ ./daemon/gdm-daemon-config.c
+@@ -40,7 +40,7 @@
+ #include <fcntl.h>
+ #include <string.h>
+ #include <sys/types.h>
+-#include <sys/resource.h>
++#include <sys/time.h>
+ #include <sys/stat.h>
+ #include <sys/resource.h>
+ #include <signal.h>
diff --git a/gdm2/patches/patch-ac b/gdm2/patches/patch-ac
new file mode 100644
index 0000000000..e0abebab17
--- /dev/null
+++ b/gdm2/patches/patch-ac
@@ -0,0 +1,12 @@
+$NetBSD: patch-ac,v 1.7 2006/05/20 17:26:16 joerg Exp $
+
+--- daemon/server.c.orig	2006-05-20 16:59:28.000000000 +0000
++++ daemon/server.c
+@@ -28,6 +28,7 @@
+ #include <pwd.h>
+ #include <grp.h>
+ #include <sys/types.h>
++#include <sys/time.h>
+ #include <sys/resource.h>
+ #include <sys/stat.h>
+ #include <sys/wait.h>
diff --git a/gdm2/patches/patch-ae b/gdm2/patches/patch-ae
new file mode 100644
index 0000000000..a165583b75
--- /dev/null
+++ b/gdm2/patches/patch-ae
@@ -0,0 +1,49 @@
+$NetBSD: patch-ae,v 1.13 2007/04/11 20:40:08 drochner Exp $
+
+--- config/Makefile.in.orig	2007-03-11 22:48:34.000000000 +0100
++++ config/Makefile.in
+@@ -582,10 +582,6 @@ install-data-hook: gdm.conf gdm.conf-cus
+ 		$(mkinstalldirs) $(DESTDIR)$(confdir); \
+ 		chmod 755 $(DESTDIR)$(confdir); \
+ 	fi
+-	if test '!' -d $(DESTDIR)$(dmconfdir); then \
+-		$(mkinstalldirs) $(DESTDIR)$(dmconfdir); \
+-		chmod 755 $(DESTDIR)$(dmconfdir); \
+-	fi
+ 	if test '!' -d `dirname $(DESTDIR)$(GDM_DEFAULTS_CONF)`; then \
+ 		$(mkinstalldirs) `dirname $(DESTDIR)$(GDM_DEFAULTS_CONF)`; \
+ 		chmod 755 `dirname $(DESTDIR)$(GDM_DEFAULTS_CONF)`; \
+@@ -614,10 +610,7 @@ install-data-hook: gdm.conf gdm.conf-cus
+ 	$(INSTALL_SCRIPT) $(srcdir)/XKeepsCrashing $(DESTDIR)$(confdir)/XKeepsCrashing
+ 	$(INSTALL_SCRIPT) Xsession $(DESTDIR)$(confdir)/Xsession
+ 
+-	-if test -f $(DESTDIR)$(gdmlocaledir)/locale.alias; then \
+-		cp -f $(DESTDIR)$(gdmlocaledir)/locale.alias $(DESTDIR)$(gdmlocaledir)/locale.alias.orig; \
+-	fi
+-	$(INSTALL_DATA) $(srcdir)/locale.alias $(DESTDIR)$(gdmlocaledir)/locale.alias
++	$(INSTALL_DATA) $(srcdir)/locale.alias $(DESTDIR)$(confdir)/locale.alias
+ 
+ 	if test '!' -d $(DESTDIR)$(bisessdir); then \
+ 		$(mkinstalldirs) $(DESTDIR)$(bisessdir); \
+@@ -695,20 +688,8 @@ install-data-hook: gdm.conf gdm.conf-cus
+ 		chmod 755 $(DESTDIR)$(gnomercdir); \
+ 	fi
+ 
+-	if test '!' -d $(DESTDIR)$(logdir); then \
+-		$(mkinstalldirs) $(DESTDIR)$(logdir); \
+-		chmod 755 $(DESTDIR)$(logdir); \
+-		chown root:root $(DESTDIR)$(logdir) || : ; \
+-	fi
+-
+-	if test '!' -d $(DESTDIR)$(authdir); then \
+-		$(mkinstalldirs) $(DESTDIR)$(authdir); \
+-		chmod 1770 $(DESTDIR)$(authdir); \
+-		chown root:gdm $(DESTDIR)$(authdir) || : ; \
+-	fi
+-
+ 	system=`uname`; \
+-	if test -f /usr/include/security/pam_appl.h; then \
++	if false; then \
+ 	  if test '!' -d $(DESTDIR)$(PAM_PREFIX)/pam.d; then \
+ 		$(mkinstalldirs) $(DESTDIR)$(PAM_PREFIX)/pam.d; \
+ 		chmod 755 $(DESTDIR)$(PAM_PREFIX)/pam.d; \
diff --git a/gdm2/patches/patch-ak b/gdm2/patches/patch-ak
new file mode 100644
index 0000000000..fe2f72ff57
--- /dev/null
+++ b/gdm2/patches/patch-ak
@@ -0,0 +1,18 @@
+$NetBSD: patch-ak,v 1.4 2007/11/30 20:08:38 drochner Exp $
+
+--- gui/greeter/Makefile.in.orig	2007-09-17 16:48:25.000000000 +0200
++++ gui/greeter/Makefile.in
+@@ -408,10 +408,9 @@ gdmgreeter_SOURCES = \
+ 
+ gdmgreeter_LDADD = \
+ 	$(EXTRA_GREETER_LIBS)   \
+-	-L$(top_builddir)/gui	\
+-	-lgdmwm			\
+-	-lgdmcommon		\
+-	-lgdmgreeter		\
++	$(top_builddir)/gui/libgdmwm.a \
++	$(top_builddir)/gui/libgdmcommon.a \
++	$(top_builddir)/gui/libgdmgreeter.a \
+ 	$(top_builddir)/common/libgdmcommon.a \
+ 	$(GLIB_LIBS)		\
+ 	$(GOBJECT_LIBS)		\
diff --git a/gdm2/patches/patch-al b/gdm2/patches/patch-al
new file mode 100644
index 0000000000..85edd1f2e4
--- /dev/null
+++ b/gdm2/patches/patch-al
@@ -0,0 +1,28 @@
+$NetBSD: patch-al,v 1.3 2006/09/22 19:57:00 drochner Exp $
+
+--- daemon/fstype.c.orig	2006-01-20 19:42:08.000000000 +0100
++++ daemon/fstype.c
+@@ -89,8 +89,10 @@ static int xatoi P_((char *cp));
+ 
+ #ifdef FSTYPE_STATVFS		/* SVR4.  */
+ #include <sys/statvfs.h>
++#ifndef __NetBSD__
+ #include <sys/fstyp.h>
+ #endif
++#endif
+ 
+ #ifdef FSTYPE_STATFS		/* 4.4BSD.  */
+ #include <sys/param.h>		/* NetBSD needs this.  */
+@@ -352,8 +354,12 @@ filesystem_type_uncached (char *path, ch
+ 	fstype_internal_error (1, errno, "%s", path);
+     }
+   else
++#ifdef __NetBSD__
++    type = fss.f_fstypename;
++#else
+     type = fss.f_basetype;
+ #endif
++#endif
+ 
+ #ifdef FSTYPE_STATFS		/* 4.4BSD.  */
+   struct statfs fss;
diff --git a/gdm2/patches/patch-ao b/gdm2/patches/patch-ao
new file mode 100644
index 0000000000..89b814ece2
--- /dev/null
+++ b/gdm2/patches/patch-ao
@@ -0,0 +1,22 @@
+$NetBSD: patch-ao,v 1.3 2009/04/07 11:40:20 drochner Exp $
+
+--- ./daemon/slave.c.orig	2009-03-19 05:59:27.000000000 +0100
++++ ./daemon/slave.c
+@@ -3721,7 +3721,7 @@ session_child_run (struct passwd *pwent,
+ 		char *new_system_data_dirs;
+ 
+ 		new_system_data_dirs = g_build_path (":",
+-			 old_system_data_dirs, DATADIR "/gdm/", NULL);
++			 old_system_data_dirs, DATADIR "/gdm/", DATADIR "/", NULL);
+ 
+ 		g_setenv ("XDG_DATA_DIRS", new_system_data_dirs, TRUE);
+ 
+@@ -3820,7 +3820,7 @@ session_child_run (struct passwd *pwent,
+ 		gdm_child_exit (DISPLAY_REMANAGE,
+ 				_("%s: setusercontext () failed for %s. "
+ 				  "Aborting."), "session_child_run",
+-				login ? login : "(null)");
++				login_user ? login_user : "(null)");
+ #else
+ 	if G_UNLIKELY (setuid (pwent->pw_uid) < 0)
+ 		gdm_child_exit (DISPLAY_REMANAGE,
diff --git a/gdm2/patches/patch-ap b/gdm2/patches/patch-ap
new file mode 100644
index 0000000000..8ec62f025e
--- /dev/null
+++ b/gdm2/patches/patch-ap
@@ -0,0 +1,74 @@
+$NetBSD: patch-ap,v 1.3 2009/04/07 11:40:20 drochner Exp $
+
+--- ./daemon/gdm-xdmcp-manager.c.orig	2009-03-19 05:59:27.000000000 +0100
++++ ./daemon/gdm-xdmcp-manager.c
+@@ -64,7 +64,7 @@
+  * On Sun, we need to define allow_severity and deny_severity to link
+  * against libwrap.
+  */
+-#ifdef __sun
++#if defined(__sun) || defined(__NetBSD__)
+ #include <syslog.h>
+ int allow_severity = LOG_INFO;
+ int deny_severity = LOG_WARNING;
+@@ -370,12 +370,14 @@ ai_flags_str (struct addrinfo *ai)
+ 		if (ai->ai_flags & AI_NUMERICSERV) {
+ 			g_string_append (str, "numserv ");
+ 		}
++#if 0
+ 		if (ai->ai_flags & AI_V4MAPPED) {
+ 			g_string_append (str, "v4mapped ");
+ 		}
+ 		if (ai->ai_flags & AI_ALL) {
+ 			g_string_append (str, "all ");
+ 		}
++#endif
+ 	}
+ 	return g_string_free (str, FALSE);
+ }
+@@ -405,6 +407,14 @@ create_socket (struct addrinfo *ai)
+ 		return sock;
+ 	}
+ 
++#if defined(__NetBSD__) && ENABLE_IPV6
++	/* NetBSD defaults to V6ONLY */
++	{
++	int no = 0;
++	setsockopt(sock, IPPROTO_IPV6, IPV6_V6ONLY, &no, sizeof(no));
++	}
++#endif
++
+ 	if (bind (sock, ai->ai_addr, ai->ai_addrlen) < 0) {
+ 		gdm_error ("bind: %s", g_strerror (errno));
+ 		close (sock);
+@@ -1259,7 +1269,9 @@ create_sa_from_request (ARRAY8 *req_addr
+ 
+ 	memset (&hints, 0, sizeof (hints));
+ 	hints.ai_family = family;
++#if !defined(__NetBSD__) || defined(AI_V4MAPPED)
+ 	hints.ai_flags = AI_V4MAPPED; /* this should convert IPv4 address to IPv6 if needed */
++#endif
+ 	if ((gaierr = getaddrinfo (host, serv, &hints, &ai_list)) != 0) {
+ 		gdm_debug ("Unable get address: %s", gai_strerror (gaierr));
+ 		return FALSE;
+@@ -1278,6 +1290,20 @@ create_sa_from_request (ARRAY8 *req_addr
+ 
+ 	freeaddrinfo (ai_list);
+ 
++#if defined(__NetBSD__) && !defined(AI_V4MAPPED)
++	if (!found && family == AF_INET6 && req_addr->length == 4 && sap) {
++		struct sockaddr_in6 *sa = g_malloc(sizeof(struct sockaddr_in6));
++		memset(sa, 0, sizeof(struct sockaddr_in6));
++		sa->sin6_len = sizeof(struct sockaddr_in6);
++		sa->sin6_family = AF_INET6;
++		sa->sin6_port = port;
++		memset(&sa->sin6_addr.s6_addr[10], 0xff, 2);
++		memcpy(&sa->sin6_addr.s6_addr[12], req_addr->data, 4);
++		*sap = sa;
++		found = TRUE;
++	}
++#endif
++
+ 	return found;
+ }
+ 
diff --git a/gdm2/patches/patch-aq b/gdm2/patches/patch-aq
new file mode 100644
index 0000000000..e7feb35e38
--- /dev/null
+++ b/gdm2/patches/patch-aq
@@ -0,0 +1,18 @@
+$NetBSD: patch-aq,v 1.2 2009/04/07 11:40:20 drochner Exp $
+
+--- gui/gdmchooser.c.orig	2008-09-03 20:35:57.000000000 +0200
++++ gui/gdmchooser.c
+@@ -1128,6 +1128,13 @@ gdm_chooser_xdmcp_init (char **hosts)
+ 		have_ipv6 = FALSE;
+ 	else
+ 		have_ipv6 = TRUE;
++#ifdef __NetBSD__
++	/* NetBSD defaults to V6ONLY */
++	{
++	int no = 0;
++	setsockopt(sockfd, IPPROTO_IPV6, IPV6_V6ONLY, &no, sizeof(no));
++	}
++#endif
+ #endif
+ 	if ( ! have_ipv6) {
+ 		if ((sockfd = socket (AF_INET, SOCK_DGRAM, 0)) == -1) {
diff --git a/gdm2/patches/patch-ar b/gdm2/patches/patch-ar
new file mode 100644
index 0000000000..f967ffe5d5
--- /dev/null
+++ b/gdm2/patches/patch-ar
@@ -0,0 +1,16 @@
+$NetBSD: patch-ar,v 1.3 2008/11/23 22:06:49 jmcneill Exp $
+
+--- daemon/gdmconsolekit.c.orig	2008-11-23 14:20:12.000000000 -0500
++++ daemon/gdmconsolekit.c	2008-11-23 14:21:02.000000000 -0500
+@@ -457,7 +457,11 @@
+ 		char *device;
+ 
+ 		/* FIXME: how does xorg construct this */
++#ifdef __NetBSD__
++		device = g_strdup_printf ("/dev/ttyE%d", d->vt - 1);
++#else
+ 		device = g_strdup_printf ("/dev/tty%d", d->vt);
++#endif
+ 		add_param_string (&iter_struct, "x11-display-device", device);
+ 		g_free (device);
+ 	}
diff --git a/gdm2/patches/patch-as b/gdm2/patches/patch-as
new file mode 100644
index 0000000000..1af5b6df96
--- /dev/null
+++ b/gdm2/patches/patch-as
@@ -0,0 +1,15 @@
+$NetBSD: patch-as,v 1.1 2008/11/23 22:06:49 jmcneill Exp $
+
+--- daemon/getvt.h.orig	2008-11-23 16:08:55.000000000 -0500
++++ daemon/getvt.h	2008-11-23 16:09:13.000000000 -0500
+@@ -31,6 +31,10 @@
+ #define GDM_USE_CONSIO_VT
+ #endif
+ 
++#if defined(__NetBSD__)
++#define GDM_USE_WSCONS_VT
++#endif
++
+ /* gets an argument we should pass to the X server, on
+  * linux for example we get the first empty vt (higher than
+  * or equal to GDM_KEY_FIRST_VT) and then return vt<number>
diff --git a/gdm2/patches/patch-at b/gdm2/patches/patch-at
new file mode 100644
index 0000000000..14d0dcf5e9
--- /dev/null
+++ b/gdm2/patches/patch-at
@@ -0,0 +1,78 @@
+$NetBSD: patch-at,v 1.1 2008/11/23 22:06:49 jmcneill Exp $
+
+--- daemon/getvt.c.orig	2008-06-30 13:53:13.000000000 -0400
++++ daemon/getvt.c	2008-11-23 16:21:46.000000000 -0500
+@@ -107,6 +107,8 @@ gdm_get_current_vtnum (Display *display)
+ 
+ #if defined (GDM_USE_SYS_VT)
+ #include <sys/vt.h>
++#elif defined (GDM_USE_WSCONS_VT)
++#include <dev/wscons/wsdisplay_usl_io.h>
+ #elif defined (GDM_USE_CONSIO_VT)
+ #include <sys/consio.h>
+ 
+@@ -139,12 +141,14 @@ gdm_get_vt_device (int vtno)
+ #endif
+ #elif defined (GDM_USE_CONSIO_VT)
+      vtname = g_strdup_printf ("/dev/ttyv%s", __itovty (vtno - 1));
++#elif defined (GDM_USE_WSCONS_VT)
++     vtname = g_strdup_printf ("/dev/ttyE%d", vtno - 1);
+ #endif
+ 
+    return vtname;
+ }
+ 
+-#if defined (GDM_USE_SYS_VT) || defined (GDM_USE_CONSIO_VT)
++#if defined (GDM_USE_SYS_VT) || defined (GDM_USE_CONSIO_VT) || defined(GDM_USE_WSCONS_VT)
+ 
+ #ifdef __sun
+ #define GDMCONSOLEDEVICE "/dev/vt/0"
+@@ -175,7 +179,7 @@ open_vt (int vtno)
+ 	return fd;
+ }
+ 
+-#if defined (GDM_USE_SYS_VT)
++#if defined (GDM_USE_SYS_VT) || defined (GDM_USE_WSCONS_VT)
+ 
+ static int 
+ get_free_vt_sys (int *vtfd)
+@@ -295,7 +299,7 @@ gdm_get_empty_vt_argument (int *fd, int 
+ 		return NULL;
+ 	}
+ 
+-#if defined (GDM_USE_SYS_VT)
++#if defined (GDM_USE_SYS_VT) || defined (GDM_USE_WSCONS_VT)
+ 	*vt = get_free_vt_sys (fd);
+ #elif defined (GDM_USE_CONSIO_VT)
+ 	*vt = get_free_vt_consio (fd);
+@@ -337,7 +341,7 @@ gdm_change_vt (int vt)
+ int
+ gdm_get_current_vt (void)
+ {
+-#if defined (GDM_USE_SYS_VT)
++#if defined (GDM_USE_SYS_VT) || defined (GDM_USE_WSCONS_VT)
+ 	struct vt_stat s;
+ #elif defined (GDM_USE_CONSIO_VT)
+ 	int vtno;
+@@ -355,7 +359,7 @@ gdm_get_current_vt (void)
+ 	} while G_UNLIKELY (errno == EINTR);
+ 	if (fd < 0)
+ 		return -1;
+-#if defined (GDM_USE_SYS_VT)
++#if defined (GDM_USE_SYS_VT) || defined (GDM_USE_WSCONS_VT)
+ 	ioctl (fd, VT_GETSTATE, &s);
+ 
+ 	VE_IGNORE_EINTR (close (fd));
+@@ -383,9 +387,9 @@ VE_IGNORE_EINTR (close (fd));
+ #endif
+ }
+ 
+-#else /* GDM_USE_SYS_VT || GDM_USE_CONSIO_VT - Here this is just
+-       * a stub, we do not know how to support this on other
+-       * platforms
++#else /* GDM_USE_SYS_VT || GDM_USE_CONSIO_VT || GDM_USE_WSCONS_VT -
++       * Here this is just a stub, we do not know how to support
++       * this on other platforms
+        */
+ 
+ char *
diff --git a/gdm2/patches/patch-common_gdm-config.h b/gdm2/patches/patch-common_gdm-config.h
new file mode 100644
index 0000000000..17bbbe7626
--- /dev/null
+++ b/gdm2/patches/patch-common_gdm-config.h
@@ -0,0 +1,31 @@
+$NetBSD: patch-common_gdm-config.h,v 1.1 2011/11/24 13:31:30 joerg Exp $
+
+--- common/gdm-config.h.orig	2011-11-24 00:34:23.000000000 +0000
++++ common/gdm-config.h
+@@ -157,7 +157,7 @@ gboolean               gdm_config_get_st
+ 							  char           **str);
+ gboolean               gdm_config_get_bool_for_id        (GdmConfig       *config,
+ 							  int              id,
+-							  gboolean        *bool);
++							  gboolean        *not_bool);
+ gboolean               gdm_config_get_int_for_id         (GdmConfig       *config,
+ 							  int              id,
+ 							  int             *integer);
+@@ -166,7 +166,7 @@ gboolean               gdm_config_set_st
+ 							  char            *str);
+ gboolean               gdm_config_set_bool_for_id        (GdmConfig       *config,
+ 							  int              id,
+-							  gboolean         bool);
++							  gboolean         not_bool);
+ gboolean               gdm_config_set_int_for_id         (GdmConfig       *config,
+ 							  int              id,
+ 							  int              integer);
+@@ -201,7 +201,7 @@ void                 gdm_config_value_se
+ void                 gdm_config_value_set_int          (GdmConfigValue  *value,
+ 							int              integer);
+ void                 gdm_config_value_set_bool         (GdmConfigValue  *value,
+-							gboolean         bool);
++							gboolean         not_bool);
+ char *               gdm_config_value_to_string        (const GdmConfigValue *value);
+ 
+ /* Config Entries */


Home | Main Index | Thread Index | Old Index