update to 2.20.2

This switches to the gnome-2.20 branch, too many changes to list here.
(The update has taken a while because the XDMCP code relies on
IPv6-mapped IPv4 sockets which is not so easy on NetBSD.)

11 files changed, 235 insertions, 305 deletions

diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile
index f67a757d76f..ee8117940b9 100644
--- a/x11/gdm/Makefile
+++ b/x11/gdm/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.133 2007/10/11 09:46:51 hauke Exp $
+# $NetBSD: Makefile,v 1.134 2007/11/30 20:08:37 drochner Exp $
 #
 
-DISTNAME=	gdm-2.18.4
-PKGREVISION=	5
+DISTNAME=	gdm-2.20.2
 CATEGORIES=	x11 gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gdm/2.18/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gdm/2.20/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -36,6 +35,8 @@ INSTALL_MAKE_FLAGS+=	GDM_CUSTOM_CONF=${EGDIR:Q}/custom.conf
 INSTALL_MAKE_FLAGS+=	sysconfdir=${EGDIR:Q}
 MAKE_ENV+=		CHMOD=${CHMOD:Q} CHOWN=${CHOWN:Q}
 
+#CONFIGURE_ARGS+=	--disable-ipv6
+
 OWN_DIRS=		${PKG_SYSCONFDIR}/Init
 OWN_DIRS+=		${PKG_SYSCONFDIR}/PostLogin
 OWN_DIRS+=		${PKG_SYSCONFDIR}/PostSession
@@ -153,7 +154,7 @@ PRINT_PLIST_AWK+=	/gdmopen/ { print "$${GDMOPEN}" $$0; next }
 .include "../../graphics/librsvg/buildlink3.mk"
 .include "../../textproc/gnome-doc-utils/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
-.include "../../textproc/scrollkeeper/omf.mk"
+.include "../../mk/omf-scrollkeeper.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 
 post-install:
diff --git a/x11/gdm/PLIST b/x11/gdm/PLIST
index 9e4533e9cd9..0934096c264 100644
--- a/x11/gdm/PLIST
+++ b/x11/gdm/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.34 2007/08/16 12:47:03 obache Exp $
+@comment $NetBSD: PLIST,v 1.35 2007/11/30 20:08:37 drochner Exp $
 ${DMX}bin/gdm-dmx-reconnect-proxy
 bin/gdmXnest
 bin/gdmXnestchooser
@@ -21,10 +21,6 @@ sbin/gdm-restart
 sbin/gdm-safe-restart
 sbin/gdm-stop
 sbin/gdmsetup
-share/applications/gdmflexiserver-xnest.desktop
-share/applications/gdmflexiserver.desktop
-share/applications/gdmphotosetup.desktop
-share/applications/gdmsetup.desktop
 share/examples/gdm/Init/Default
 share/examples/gdm/PostLogin/Default.sample
 share/examples/gdm/PostSession/Default
@@ -40,6 +36,10 @@ share/examples/gdm/modules/factory-AccessKeyMouseEvents
 share/examples/rc.d/gdm
 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
@@ -49,55 +49,43 @@ 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/help.png
-share/gdm/themes/circles/options.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.xml
-share/gdm/themes/happygnome-list/options.png
+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/options.png
 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/figures/gdm_window.png
-share/gnome/help/gdm/de/gdm.xml
-share/gnome/help/gdm/de/legal.xml
-share/gnome/help/gdm/es/figures/gdm_window.png
+share/gnome/help/gdm/en_GB/gdm.xml
 share/gnome/help/gdm/es/gdm.xml
-share/gnome/help/gdm/es/legal.xml
-share/gnome/help/gdm/fr/figures/gdm_window.png
 share/gnome/help/gdm/fr/gdm.xml
-share/gnome/help/gdm/fr/legal.xml
-share/gnome/help/gdm/it/figures/gdm_window.png
-share/gnome/help/gdm/it/gdm.xml
-share/gnome/help/gdm/it/legal.xml
-share/gnome/help/gdm/ja/figures/gdm_window.png
-share/gnome/help/gdm/ja/gdm.xml
-share/gnome/help/gdm/ja/legal.xml
-share/gnome/help/gdm/ko/figures/gdm_window.png
 share/gnome/help/gdm/ko/gdm.xml
-share/gnome/help/gdm/ko/legal.xml
+share/gnome/help/gdm/oc/gdm.xml
+share/gnome/help/gdm/sv/gdm.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
-share/gnome/help/gdm/zh_HK/figures/gdm_window.png
-share/gnome/help/gdm/zh_HK/gdm.xml
-share/gnome/help/gdm/zh_HK/legal.xml
-share/gnome/help/gdm/zh_TW/figures/gdm_window.png
-share/gnome/help/gdm/zh_TW/gdm.xml
-share/gnome/help/gdm/zh_TW/legal.xml
 share/icons/hicolor/16x16/apps/gdm-xnest.png
-share/icons/hicolor/32x32/apps/gdm-setup.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
@@ -136,6 +124,7 @@ 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
@@ -161,6 +150,7 @@ 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
@@ -168,9 +158,12 @@ 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
@@ -179,17 +172,14 @@ 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-it.omf
-share/omf/gdm/gdm-ja.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/omf/gdm/gdm-zh_CN.omf
-share/omf/gdm/gdm-zh_HK.omf
-share/omf/gdm/gdm-zh_TW.omf
-share/pixmaps/NetBSD.xpm
+share/pixmaps/${OPSYS}.xpm
 share/pixmaps/faces/astronaut.jpg
 share/pixmaps/faces/baseball.png
 share/pixmaps/faces/butterfly.png
@@ -215,10 +205,6 @@ 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/login-photo.png
 share/pixmaps/nobody.png
 share/pixmaps/nohost.png
 share/xsessions/gnome.desktop
@@ -226,29 +212,21 @@ share/xsessions/gnome.desktop
 @dirrm share/pixmaps/faces
 @comment in xdg-dirs: @dirrm share/pixmaps
 @dirrm share/omf/gdm
-@comment in scrollkeeper: @dirrm share/omf
+@comment in rarian: @dirrm share/omf
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/scalable/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/48x48/apps
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor/32x32/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/24x24/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/22x22/apps
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor/16x16/apps
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor
-@dirrm share/gnome/help/gdm/zh_TW/figures
-@dirrm share/gnome/help/gdm/zh_TW
-@dirrm share/gnome/help/gdm/zh_HK/figures
-@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/ko/figures
+@dirrm share/gnome/help/gdm/sv
+@dirrm share/gnome/help/gdm/oc
 @dirrm share/gnome/help/gdm/ko
-@dirrm share/gnome/help/gdm/ja/figures
-@dirrm share/gnome/help/gdm/ja
-@dirrm share/gnome/help/gdm/it/figures
-@dirrm share/gnome/help/gdm/it
-@dirrm share/gnome/help/gdm/fr/figures
 @dirrm share/gnome/help/gdm/fr
-@dirrm share/gnome/help/gdm/es/figures
 @dirrm share/gnome/help/gdm/es
-@dirrm share/gnome/help/gdm/de/figures
-@dirrm share/gnome/help/gdm/de
+@dirrm share/gnome/help/gdm/en_GB
 @dirrm share/gnome/help/gdm/C
 @dirrm share/gnome/help/gdm
 @comment in gnome2-dirs: @dirrm share/gnome/help
@@ -256,6 +234,7 @@ share/xsessions/gnome.desktop
 @dirrm share/gdm/themes/happygnome
 @dirrm share/gdm/themes/circles
 @dirrm share/gdm/themes
+@dirrm share/gdm/applications
 @dirrm share/gdm/BuiltInSessions
 @dirrm share/gdm
 @dirrm share/examples/gdm/modules
@@ -264,5 +243,4 @@ share/xsessions/gnome.desktop
 @dirrm share/examples/gdm/PostLogin
 @dirrm share/examples/gdm/Init
 @dirrm share/examples/gdm
-@comment in xdg-dirs: @dirrm share/applications
 @comment in gtk2: @dirrm lib/gtk-2.0/modules
diff --git a/x11/gdm/distinfo b/x11/gdm/distinfo
index 4c8a0dee066..eac61e6f787 100644
--- a/x11/gdm/distinfo
+++ b/x11/gdm/distinfo
@@ -1,13 +1,14 @@
-$NetBSD: distinfo,v 1.51 2007/10/11 09:36:06 hauke Exp $
+$NetBSD: distinfo,v 1.52 2007/11/30 20:08:38 drochner Exp $
 
-SHA1 (gdm-2.18.4.tar.bz2) = 8bf2c8745d7c38f5f08641abed4ca103cad0ecb8
-RMD160 (gdm-2.18.4.tar.bz2) = 4922af1321f707279c1eb6354d1c56cc39bce20e
-Size (gdm-2.18.4.tar.bz2) = 3459899 bytes
-SHA1 (patch-aa) = 56232879fbb5d885aa164e94baf3368e950c433f
-SHA1 (patch-ab) = b151843608e3418962dfcbfd454cf0ba8aac39e0
+SHA1 (gdm-2.20.2.tar.bz2) = 4e2ad85df9ef61fa304c9a28cf7416a4121db12a
+RMD160 (gdm-2.20.2.tar.bz2) = 19d3bf99853391685a1d16b848c1d27a94502395
+Size (gdm-2.20.2.tar.bz2) = 3892711 bytes
+SHA1 (patch-aa) = a0658aa32382ae45a0d253436d2104d4501daa07
+SHA1 (patch-ab) = 43b565fcbe2e172f5e319b3d111d475646f481e0
 SHA1 (patch-ac) = 69b3539e50af0b32207b9ffeb7cb01645c9ece3c
 SHA1 (patch-ae) = c95265b55c968a0466e1ae50bbe58c121f05b027
-SHA1 (patch-ak) = e3eaf2dfa1e393f9808d22fe4384710a46a83afc
+SHA1 (patch-ak) = 99ca1a7ce804a1ae99903860e2b923c972ae95e6
 SHA1 (patch-al) = 3b66dd3f4cdea6a3af5cbd0ff65eb02ccdead483
-SHA1 (patch-am) = 12db3ab28d530096d03575a92c5493d6149c39ed
-SHA1 (patch-an) = 45a9d4a8b5c8fa6014664525ae3e27fe3ad15208
+SHA1 (patch-ao) = 4c493da32e94689d239209d155abba67e897c364
+SHA1 (patch-ap) = 0852874be8d7b466baff34939dfe9c965f9c34ea
+SHA1 (patch-aq) = 4417636865d45212a7fd9ad33d907eb8916a95b7
diff --git a/x11/gdm/patches/patch-aa b/x11/gdm/patches/patch-aa
index 4b6558fb2c3..701de5f9e5d 100644
--- a/x11/gdm/patches/patch-aa
+++ b/x11/gdm/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.21 2007/04/11 20:40:07 drochner Exp $
+$NetBSD: patch-aa,v 1.22 2007/11/30 20:08:38 drochner Exp $
 
---- configure.orig	2007-04-09 07:16:44.000000000 +0200
+--- configure.orig	2007-09-17 16:48:17.000000000 +0200
 +++ configure
-@@ -28786,7 +28786,9 @@ cat confdefs.h >>conftest.$ac_ext
+@@ -27195,7 +27195,9 @@ cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  #include <sys/statvfs.h>
@@ -12,23 +12,57 @@ $NetBSD: patch-aa,v 1.21 2007/04/11 20:40:07 drochner Exp $
  _ACEOF
  if { (ac_try="$ac_cpp conftest.$ac_ext"
  case "(($ac_try" in
-@@ -34136,6 +34138,15 @@ case "$host" in
- 	SOUND_PROGRAM=
-         GDMGNOMESESSIONCMD=gnome-session
+@@ -33464,6 +33466,18 @@ case "$host" in
+ 	HOST_UTMP_LINE_REMOTE=""
+ 	HOST_UTMP_PSEUDO_DEVICE="false"
  	;;
 +*netbsd*)
-+	GDM_USER_PATH="/bin:/usr/bin"
-+	HALT_COMMAND="/sbin/shutdown -p now"
-+	REBOOT_COMMAND="/sbin/shutdown -r now"
-+	SUSPEND_COMMAND="/usr/sbin/zzz"
-+	XSESSION_SHELL=/bin/sh
-+	SOUND_PROGRAM=/usr/bin/audioplay
-+	GDMGNOMESESSIONCMD="dbus-launch --exit-with-session gnome-session"
++	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"
 +	;;
  *)
-         GDM_USER_PATH="/bin:/usr/bin"
-         HALT_COMMAND="/usr/bin/poweroff;/sbin/poweroff;/sbin/shutdown -h now;/usr/sbin/shutdown -h now"
-@@ -34199,6 +34210,11 @@ elif test -x /usr/bin/X; then
+ 	HOST_GDM_USER_PATH="/bin:/usr/bin"
+ 	HOST_HALT_COMMAND="/usr/bin/poweroff;/sbin/poweroff;/sbin/shutdown -h now;/usr/sbin/shutdown -h now"
+@@ -33480,18 +33494,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.
+@@ -33564,6 +33578,11 @@ elif test -x /usr/bin/X; then
     X_SERVER_PATH="/usr/bin"
     X_SERVER="/usr/bin/X"
     X_CONFIG_OPTIONS="-audit 0"
@@ -40,7 +74,7 @@ $NetBSD: patch-aa,v 1.21 2007/04/11 20:40:07 drochner Exp $
  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
-@@ -34208,6 +34224,7 @@ else
+@@ -33573,6 +33592,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
diff --git a/x11/gdm/patches/patch-ab b/x11/gdm/patches/patch-ab
index ddae0fd6b4d..12e07374bc0 100644
--- a/x11/gdm/patches/patch-ab
+++ b/x11/gdm/patches/patch-ab
@@ -1,10 +1,10 @@
-$NetBSD: patch-ab,v 1.16 2006/07/26 12:36:12 drochner Exp $
+$NetBSD: patch-ab,v 1.17 2007/11/30 20:08:38 drochner Exp $
 
---- daemon/gdmconfig.c.orig	2006-05-12 07:58:21.000000000 +0200
-+++ daemon/gdmconfig.c
-@@ -38,7 +38,7 @@
- #include <ctype.h>
+--- ./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>
diff --git a/x11/gdm/patches/patch-ak b/x11/gdm/patches/patch-ak
index 33a1df84fb9..fe2f72ff57b 100644
--- a/x11/gdm/patches/patch-ak
+++ b/x11/gdm/patches/patch-ak
@@ -1,16 +1,18 @@
-$NetBSD: patch-ak,v 1.3 2006/03/30 21:25:48 jmmv Exp $
+$NetBSD: patch-ak,v 1.4 2007/11/30 20:08:38 drochner Exp $
 
---- gui/greeter/Makefile.in.orig	2006-03-13 22:42:37.000000000 +0100
+--- gui/greeter/Makefile.in.orig	2007-09-17 16:48:25.000000000 +0200
 +++ gui/greeter/Makefile.in
-@@ -386,9 +386,8 @@ gdmgreeter_SOURCES = \
- 	greeter_system.h 
+@@ -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)/vicious-extensions/libviciousui-minimal.a \
++	$(top_builddir)/gui/libgdmgreeter.a \
+ 	$(top_builddir)/common/libgdmcommon.a \
  	$(GLIB_LIBS)		\
  	$(GOBJECT_LIBS)		\
diff --git a/x11/gdm/patches/patch-am b/x11/gdm/patches/patch-am
deleted file mode 100644
index 80d4cb263cb..00000000000
--- a/x11/gdm/patches/patch-am
+++ /dev/null
@@ -1,100 +0,0 @@
-$NetBSD: patch-am,v 1.3 2007/10/11 09:35:11 hauke Exp $
-
---- daemon/verify-shadow.c.orig	2007-07-30 22:06:56.000000000 +0200
-+++ daemon/verify-shadow.c
-@@ -199,7 +199,7 @@ authenticate_again:
- 
-     if (pwent == NULL) {
- 	    gdm_sleep_no_signal (gdm_get_value_int (GDM_KEY_RETRY_DELAY));
--	    gdm_error (_("Couldn't authenticate user \"%s\""), login);
-+	    gdm_error ("Couldn't authenticate user");
- 
- 	    print_cant_auth_errbox ();
- 
-@@ -213,7 +213,7 @@ authenticate_again:
-     if (ppasswd == NULL || (ppasswd[0] != '\0' &&
- 			    strcmp (crypt (passwd, ppasswd), ppasswd) != 0)) {
- 	    gdm_sleep_no_signal (gdm_get_value_int (GDM_KEY_RETRY_DELAY));
--	    gdm_error (_("Couldn't authenticate user \"%s\""), login);
-+	    gdm_error ("Couldn't authenticate user");
- 
- 	    print_cant_auth_errbox ();
- 
-@@ -226,7 +226,7 @@ authenticate_again:
-     if ( ( ! gdm_get_value_bool (GDM_KEY_ALLOW_ROOT)||
- 	  ( ! gdm_get_value_bool (GDM_KEY_ALLOW_REMOTE_ROOT) && ! local) ) &&
- 	pwent->pw_uid == 0) {
--	    gdm_error (_("Root login disallowed on display '%s'"), display);
-+	    gdm_error ("Root login disallowed on display '%s'", display);
- 	    gdm_slave_greeter_ctl_no_ret (GDM_ERRBOX,
- 					  _("The system administrator "
- 					    "is not allowed to login "
-@@ -244,7 +244,7 @@ authenticate_again:
-     /* Check with the 'loginrestrictions' function
-        if the user has been disallowed */
-     if (loginrestrictions (login, 0, NULL, &message) != 0) {
--	    gdm_error (_("User %s not allowed to log in"), login);
-+	    gdm_error ("User not allowed to log in");
- 	    gdm_slave_greeter_ctl_no_ret (GDM_ERRBOX,
- 					  _("\nThe system administrator "
- 					    "has disabled your "
-@@ -268,7 +268,7 @@ authenticate_again:
- 	(strcmp (pwent->pw_shell, "/sbin/nologin") == 0 ||
- 	 strcmp (pwent->pw_shell, "/bin/true") == 0 ||
- 	 strcmp (pwent->pw_shell, "/bin/false") == 0)) {
--	    gdm_error (_("User %s not allowed to log in"), login);
-+	    gdm_error ("User not allowed to log in");
- 	    gdm_slave_greeter_ctl_no_ret (GDM_ERRBOX,
- 					  _("\nThe system administrator "
- 					    "has disabled your "
-@@ -293,7 +293,7 @@ authenticate_again:
-     }
- 
-     if ( ! gdm_setup_gids (login, pwent->pw_gid)) {
--	    gdm_error (_("Cannot set user group for %s"), login);
-+	    gdm_error ("Cannot set user group");
- 	    gdm_slave_greeter_ctl_no_ret (GDM_ERRBOX,
- 					  _("\nCannot set your user group; "
- 					    "you will not be able to log in. "
-@@ -306,7 +306,7 @@ authenticate_again:
- 
-     switch (passwdexpired (login, &info_msg)) {
-     case 1 :
--	    gdm_error (_("Password of %s has expired"), login);
-+	    gdm_error ("User password has expired");
- 	    gdm_error_box (d, GTK_MESSAGE_ERROR,
- 			   _("You are required to change your password.\n"
- 			     "Please choose a new one."));
-@@ -380,7 +380,7 @@ authenticate_again:
- 	    break;
- 
-     case 2 :
--	    gdm_error (_("Password of %s has expired"), login);
-+	    gdm_error ("User password has expired");
- 	    gdm_error_box (d, GTK_MESSAGE_ERROR,
- 			   _("Your password has expired.\n"
- 			     "Only a system administrator can now change it"));
-@@ -389,7 +389,7 @@ authenticate_again:
- 	    break;    
- 
-     case -1 :
--	    gdm_error (_("Internal error on passwdexpired"));
-+	    gdm_error ("Internal error on passwdexpired");
- 	    gdm_error_box (d, GTK_MESSAGE_ERROR,
- 			   _("An internal error occurred. You will not be able to log in.\n"
- 			     "Please try again later or contact your system administrator."));
-@@ -426,12 +426,12 @@ gdm_verify_setup_user (GdmDisplay *d, co
- 
- 	pwent = getpwnam (login);
- 	if (pwent == NULL) {
--		gdm_error (_("Cannot get passwd structure for %s"), login);
-+		gdm_error ("Cannot get passwd structure for user");
- 		return FALSE;
- 	}
- 
- 	if ( ! gdm_setup_gids (login, pwent->pw_gid)) {
--		gdm_error (_("Cannot set user group for %s"), login);
-+		gdm_error ("Cannot set user group");
- 		gdm_error_box (d,
- 			       GTK_MESSAGE_ERROR,
- 			       _("\nCannot set your user group; "
diff --git a/x11/gdm/patches/patch-an b/x11/gdm/patches/patch-an
deleted file mode 100644
index 19655b8f9ec..00000000000
--- a/x11/gdm/patches/patch-an
+++ /dev/null
@@ -1,100 +0,0 @@
-$NetBSD: patch-an,v 1.1 2007/10/11 09:35:11 hauke Exp $
-
---- daemon/verify-crypt.c.orig	2007-07-30 22:06:56.000000000 +0200
-+++ daemon/verify-crypt.c
-@@ -178,7 +178,7 @@ authenticate_again:
- 
-     if (pwent == NULL) {
- 	    gdm_sleep_no_signal (gdm_get_value_int (GDM_KEY_RETRY_DELAY));
--	    gdm_error (_("Couldn't authenticate user \"%s\""), login);
-+	    gdm_error ("Couldn't authenticate user");
- 
- 	    print_cant_auth_errbox ();
- 
-@@ -192,7 +192,7 @@ authenticate_again:
-     if (ppasswd == NULL || (ppasswd[0] != '\0' &&
- 			    strcmp (crypt (passwd, ppasswd), ppasswd) != 0)) {
- 	    gdm_sleep_no_signal (gdm_get_value_int (GDM_KEY_RETRY_DELAY));
--	    gdm_error (_("Couldn't authenticate user \"%s\""), login);
-+	    gdm_error ("Couldn't authenticate user");
- 
- 	    print_cant_auth_errbox ();
- 
-@@ -205,7 +205,7 @@ authenticate_again:
-     if ( ( ! gdm_get_value_bool (GDM_KEY_ALLOW_ROOT)||
- 	  ( ! gdm_get_value_bool (GDM_KEY_ALLOW_REMOTE_ROOT) && ! local) ) &&
- 	pwent->pw_uid == 0) {
--	    gdm_error (_("Root login disallowed on display '%s'"), display);
-+	    gdm_error ("Root login disallowed on display '%s'", display);
- 	    gdm_slave_greeter_ctl_no_ret (GDM_ERRBOX,
- 					  _("The system administrator "
- 					    "is not allowed to login "
-@@ -223,7 +223,7 @@ authenticate_again:
-     /* Check with the 'loginrestrictions' function
-        if the user has been disallowed */
-     if (loginrestrictions (login, 0, NULL, &message) != 0) {
--	    gdm_error (_("User %s not allowed to log in"), login);
-+	    gdm_error ("User not allowed to log in");
- 	    gdm_slave_greeter_ctl_no_ret (GDM_ERRBOX,
- 					  _("\nThe system administrator "
- 					    "has disabled your "
-@@ -247,7 +247,7 @@ authenticate_again:
- 	(strcmp (pwent->pw_shell, "/sbin/nologin") == 0 ||
- 	 strcmp (pwent->pw_shell, "/bin/true") == 0 ||
- 	 strcmp (pwent->pw_shell, "/bin/false") == 0)) {
--	    gdm_error (_("User %s not allowed to log in"), login);
-+	    gdm_error ("User not allowed to log in");
- 	    gdm_slave_greeter_ctl_no_ret (GDM_ERRBOX,
- 					  _("\nThe system administrator "
- 					    "has disabled your "
-@@ -272,7 +272,7 @@ authenticate_again:
-     }
- 
-     if ( ! gdm_setup_gids (login, pwent->pw_gid)) {
--	    gdm_error (_("Cannot set user group for %s"), login);
-+	    gdm_error ("Cannot set user group");
- 	    gdm_slave_greeter_ctl_no_ret (GDM_ERRBOX,
- 					  _("\nCannot set your user group; "
- 					    "you will not be able to log in. "
-@@ -285,7 +285,7 @@ authenticate_again:
- 
-     switch (passwdexpired (login, &info_msg)) {
-     case 1 :
--	    gdm_error (_("Password of %s has expired"), login);
-+	    gdm_error ("User password has expired");
- 	    gdm_error_box (d, GTK_MESSAGE_ERROR,
- 			   _("You are required to change your password.\n"
- 			     "Please choose a new one."));
-@@ -358,7 +358,7 @@ authenticate_again:
- 	    break;
- 
-     case 2 :
--	    gdm_error (_("Password of %s has expired"), login);
-+	    gdm_error ("User password has expired");
- 	    gdm_error_box (d, GTK_MESSAGE_ERROR,
- 			   _("Your password has expired.\n"
- 			     "Only a system administrator can now change it"));
-@@ -367,7 +367,7 @@ authenticate_again:
- 	    break;    
- 
-     case -1 :
--	    gdm_error (_("Internal error on passwdexpired"));
-+	    gdm_error ("Internal error on passwdexpired");
- 	    gdm_error_box (d, GTK_MESSAGE_ERROR,
- 			   _("An internal error occurred. You will not be able to log in.\n"
- 			     "Please try again later or contact your system administrator."));
-@@ -405,12 +405,12 @@ gdm_verify_setup_user (GdmDisplay *d,
- 
- 	pwent = getpwnam (login);
- 	if (pwent == NULL) {
--		gdm_error (_("Cannot get passwd structure for %s"), login);
-+		gdm_error ("Cannot get passwd structure for %s", login);
- 		return FALSE;
- 	}
- 
- 	if ( ! gdm_setup_gids (login, pwent->pw_gid)) {
--		gdm_error (_("Cannot set user group for %s"), login);
-+		gdm_error ("Cannot set user group");
- 		gdm_error_box (d,
- 			       GTK_MESSAGE_ERROR,
- 			       _("\nCannot set your user group; "
diff --git a/x11/gdm/patches/patch-ao b/x11/gdm/patches/patch-ao
new file mode 100644
index 00000000000..494f427a60d
--- /dev/null
+++ b/x11/gdm/patches/patch-ao
@@ -0,0 +1,22 @@
+$NetBSD: patch-ao,v 1.1 2007/11/30 20:08:39 drochner Exp $
+
+--- ./daemon/slave.c.orig	2007-09-17 16:45:50.000000000 +0200
++++ ./daemon/slave.c
+@@ -3694,7 +3694,7 @@ session_child_run (struct passwd *pwent,
+ 				       "/usr/local/share/:/usr/share/";
+ 
+ 		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);
+ 
+@@ -3792,7 +3792,7 @@ session_child_run (struct passwd *pwent,
+ 		gdm_child_exit (DISPLAY_REMANAGE,
+ 				_("%s: setusercontext () failed for %s. "
+ 				  "Aborting."), "session_child_run",
+-				login);
++				login_user);
+ #else
+ 	if G_UNLIKELY (setuid (pwent->pw_uid) < 0)
+ 		gdm_child_exit (DISPLAY_REMANAGE,
diff --git a/x11/gdm/patches/patch-ap b/x11/gdm/patches/patch-ap
new file mode 100644
index 00000000000..24c32a2cb71
--- /dev/null
+++ b/x11/gdm/patches/patch-ap
@@ -0,0 +1,74 @@
+$NetBSD: patch-ap,v 1.1 2007/11/30 20:08:39 drochner Exp $
+
+--- ./daemon/gdm-xdmcp-manager.c.orig	2007-11-27 00:12:29.000000000 +0100
++++ ./daemon/gdm-xdmcp-manager.c
+@@ -63,7 +63,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;
+@@ -369,12 +369,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);
+ }
+@@ -404,6 +406,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) {
+ 		g_warning ("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) {
+ 		g_warning ("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/x11/gdm/patches/patch-aq b/x11/gdm/patches/patch-aq
new file mode 100644
index 00000000000..5835456ac26
--- /dev/null
+++ b/x11/gdm/patches/patch-aq
@@ -0,0 +1,18 @@
+$NetBSD: patch-aq,v 1.1 2007/11/30 20:08:39 drochner Exp $
+
+--- ./gui/gdmchooser.c.orig	2007-11-27 00:11:04.000000000 +0100
++++ ./gui/gdmchooser.c
+@@ -1123,6 +1123,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) {