Update to 2.8.0.5:

2.8.0.5 stuff:

- gdmflexiserver supports --startnew option so that
  gdmflexiserver can be told to not pop-up the dialog
  asking if the user wants to start a current session.
  With this option it just always starts a new session.
  This allows running gdmflexiserver from the
  screensaver, where the pop-up can't be interacted
  with due to the nature of the screensaver.
  (Brian Cameron)

- Now gdmflexiserver supports gnome-screensaver if
  available, then defaults to xscreensaver.
  (William Jon McCann)

- Bug corrected in dwellmouselistener which caused it
  to always fail to recognize gestures.  (Brian
  Cameron)

- Added warning message if gdmgreeter theme supports
  face browser but does not have pam-message defined.
  (Brian Cameron)

- gdmsetup and gdmphotosetup now only map right/left
  mouse buttons to button1 when running under GDM.
  When running as user, honor user defaults.
  (Brian Cameron)

- XdmcpFill() failure is now logged as debug, since
  this happens when the client disconnects from the
  XDMCP server before the session was setup.
  (Bastien Nocera)

- gdmsetup fixed so when user modifies Include/Exclude
  list, the automatic/timed dropdown lists are updated
  immediately instead of having to stop and restart
  gdmsetup to see the users in the list.

- Correct illegal reference to build directory in
  installed .la files. (Stanislav Brabec)

- Removed test that causes needless syslog() message
  on Solaris when auditing is turned off.  New docs
  explaining how to setup autologin on Solaris.
  (Brian Cameron)

- Translation updates (Gabor Kelemen, Priit Laes, Kjartan
  Maraas, Ankit Patel, Ignacio Casal Quinteiro, Hendrick
  Richter, Erdal Ronahi, Satoru SATOH, Francisco Javier F.
  Serrador, Alexander Shopov, Clytie Siddall, Tommi
  Vainikainen, Funda Wang, Vincent van Adrighem,
  Adam Weinberger)

2.8.0.4 stuff:

- Corrected syslog debugging so it works better.
  (Brian Cameron)

- Minor fix for clean 64 bit compilation.  (Brian
  Cameron)

- Fix address of website in README (Tommi Vainikainen)

- Translation updates (\305\275ygimantas Beru\304\215ka,
   Hendrik Brandt, Baris Cicek, Maxim Dziumanenko, Artur
   Flinta, Raphael Higino, Gabor Kelemen, Priit Laes,
   Chao-Hsiung Liao, Duarte Loreto, Jordi Mallach,
   Christophe Merlet, Ankit Patel, Changwoo Ryu, Francisco
   Javier F. Serrador, Nickolay V. Shmyrev, Clytie Siddall,
   Slobodan D. Sredojevic, Mugurel Tudor, Miloslav Trmac,
   Vincent van Adrighem)

2.8.0.3 stuff:

- The GDM website has moved to a new location
  http://www.gnome.org/projects/gdm/, and the GDM
  mail alias has moved from gdm@sunsite.dk to
  gdm-list@gnome.org.  README, and GDM docs updated
  with the new information and corrected broken link
  to the GDM Theme section at http://art.gnome.org/
  (Brian Cameron)

- Installation location of gdmphotosetup.desktop
  has moved from the deprecated /usr/share/gnome/capplets
  to /usr/share/applications (Mark McLoughlin/Brian
  Cameron)

- Honor default session when logging in via autologin.
  (Hans Petter Jansson).

- Removed spaces in locale name since it caused GDM
  to discard the locales.  (Frederic Crozat)

- Added missing tooltips (Rodrigo Moya)

- Corrected reading of configuration file in
  gdmflexiserver so it works.  Fixes corrupted
  Session selection dialog presented to user.
  (Brian Cameron)

- Correct use-after-free with the dynamic session in
  the sessions list, corrects tooltip corruption.
  (Joe Marcus Clarke)

- Translation updates (Laurent Dhima, Raphael Higino,
  Rhys Jones, Gabor Kelemen, Priit Laes, Kjartan Maraas,
  Kostas Papadimas, Ignacio Casal Quinteiro, Francisco
  Javier F. Serrador, Alexander Shopov, Terance Sola,
  Marcel Telka, Mugurel Tudor, Funda Wang

2.8.0.2 stuff:

- GDM now supports more dynamic configuration.  The
  gdm daemon supports the --config option which allows
  an alternative configuration file to be supported.
  The --with-configdir configure option may also be
  used to specify a system-wide configuration location
  so the gdm.conf file can be located on a mounted
  directory.  To support machine-specific configuration,
  an existing %sysconfdir/gdm configuration file will
  override a system-wide configuration file.  Refer
  to the GDM documentation for more information.
  (Brian Cameron)

- New configuration option AlwaysLoginCurrentSession
  which will automatically switch the user to their
  previous session without asking.  This feature is
  turned off by default. (William Jon McCann)

- Now Use24Clock setting support "auto" which will
  use the system default for date/time formatting.
  (Tommi Vainikainen)

- Better backwards compatibility support for Welcome
  and RemoteWelcome.  If using an old gdm.conf (older
  than 2.8.0.0) file that does not have settings for
  DefaultWelcome and/or DefaultRemoteWelcome, GDM will
  now continue to work as it did before 2.8.0.0.
  (Brian Cameron)

- Usability improvements to gdmsetup.  "Face Browser"
  tab renamed to "User".  Now tabs no longer have
  mnemonics, since this violates HIG.  Fixed broken
  sensitivity on the "Users" tab.  Improved labels.
  (Brian Cameron)

- Support HIG style button layout in gdmlogin.
  (William Jon McCann)

- Use GTK+ themed icon stock_person before falling
  back to the DefaultFace.  (William Jon McCann)

- Usability improvements to the face browser when using
  gdmgreeter, now the background behind the userlist
  translucent.  (William Jon McCann)

- Usability improvements to gdmphotosetup, and now
  better follows HIG.   (William Jon McCann)

- New selection of face browser images.  (William
  Jon McCann)

- No longer stat or read face images from remote home
  directories.  (William Jon McCann)

- New gdmflexiserver command "GET_CONFIG_FILE" which
  will return the location of the configuration file
  being used by the daemon.  (Brian Cameron)

- Now gdmflexiserver command "GET_CONFIG" works.
  Previously it only returned a value if the value
  was set in the gdm.conf file.  Now it returns
  compiled-in default values if gdm.conf has no
  setting.  (Brian Cameron)

- Support DragonFly VT. (Joerg Sonnenberger)

- GDM configure script now Supports TCP Wrappers on Solaris.
  (Brian Cameron)

- Many string/grammar improvements. (Tommi Vainikainen,
  Brian Cameron)

- Better C89 compiler support.  (Jens Granseuer)

- Translation updates (Hendrik Brandt, Nikos Charonitakis,
  Pawan Chitrakar, Laurent Dhima, Raphael Higino, Theppitak
  Karoonboonyanan, Gabor Kelemen, Priit Laes, Chao-Hsiung Liao,
  Kjartan Maraas, William Jon McCann, Ankit Patel, Hendrik Richter,
  Francisco Javier F. Serrador, Alexander Shopov, Clytie Siddall,
  Terance Sola, Marcel Telka, Miloslav Trmac, Tommi Vainikainen,
  Funda Wang, Adam Weinberger, \305\275ygimantas Beru\304\215ka

6 files changed, 88 insertions, 142 deletions

diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile
index c068098ee18..08814ee31ad 100644
--- a/x11/gdm/Makefile
+++ b/x11/gdm/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.88 2005/09/27 22:19:41 mjl Exp $
+# $NetBSD: Makefile,v 1.89 2005/10/14 21:47:01 jmmv Exp $
 #
 
-DISTNAME=	gdm-2.8.0.1
+DISTNAME=	gdm-2.8.0.5
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gdm/2.8/}
 EXTRACT_SUFX=	.tar.bz2
@@ -126,9 +126,11 @@ post-install:
 	${INSTALL_DATA} ${DISTDIR}/Daemon.png ${PREFIX}/share/pixmaps
 
 .include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/libglade2/buildlink3.mk"
 .include "../../devel/libgnome/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
+.include "../../devel/pango/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../graphics/libart2/buildlink3.mk"
 .include "../../graphics/libgnomecanvas/buildlink3.mk"
diff --git a/x11/gdm/PLIST b/x11/gdm/PLIST
index 27ac70a69a0..934e75d1c8a 100644
--- a/x11/gdm/PLIST
+++ b/x11/gdm/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.21 2005/09/17 19:09:54 minskim Exp $
+@comment $NetBSD: PLIST,v 1.22 2005/10/14 21:47:01 jmmv Exp $
 ${DMX}bin/gdm-dmx-reconnect-proxy
 bin/gdmXnest
 bin/gdmXnestchooser
@@ -22,6 +22,7 @@ sbin/gdm-stop
 sbin/gdmsetup
 share/applications/gdmflexiserver-xnest.desktop
 share/applications/gdmflexiserver.desktop
+share/applications/gdmphotosetup.desktop
 share/applications/gdmsetup.desktop
 share/doc/gdm/Daemon.README
 share/examples/gdm/Init/Default
@@ -30,8 +31,6 @@ share/examples/gdm/PostSession/Default
 share/examples/gdm/PreSession/Default
 share/examples/gdm/XKeepsCrashing
 share/examples/gdm/Xsession
-share/examples/gdm/factory-gdm.conf
-share/examples/gdm/gdm.conf
 share/examples/gdm/locale.alias
 share/examples/gdm/modules/AccessDwellMouseEvents
 share/examples/gdm/modules/AccessKeyMouseEvents
@@ -40,6 +39,7 @@ share/examples/gdm/modules/factory-AccessKeyMouseEvents
 share/examples/rc.d/gdm
 share/gdm/BuiltInSessions/default.desktop
 share/gdm/gdmchooser.glade
+share/gdm/gdmphotosetup.glade
 share/gdm/gdmsetup.glade
 share/gdm/themes/circles/GdmGreeterTheme.desktop
 share/gdm/themes/circles/background.svg
@@ -66,7 +66,6 @@ share/gdm/themes/happygnome/options.png
 share/gdm/themes/happygnome/screenshot.png
 share/gdm/themes/happygnome/session.png
 share/gdm/themes/happygnome/system.png
-share/gnome/capplets/gdmphotosetup.desktop
 share/gnome/help/gdm/C/gdm.xml
 share/gnome/help/gdm/C/legal.xml
 share/gnome/help/gdm/de/figures/gdm_window.png
@@ -136,6 +135,7 @@ ${PKGLOCALEDIR}/locale/is/LC_MESSAGES/gdm.mo
 ${PKGLOCALEDIR}/locale/it/LC_MESSAGES/gdm.mo
 ${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/gdm.mo
 ${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/gdm.mo
+${PKGLOCALEDIR}/locale/ku/LC_MESSAGES/gdm.mo
 ${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/gdm.mo
 ${PKGLOCALEDIR}/locale/lv/LC_MESSAGES/gdm.mo
 ${PKGLOCALEDIR}/locale/mi/LC_MESSAGES/gdm.mo
@@ -185,16 +185,30 @@ share/omf/gdm/gdm-zh_CN.omf
 share/omf/gdm/gdm-zh_HK.omf
 share/omf/gdm/gdm-zh_TW.omf
 share/pixmaps/Daemon.png
-share/pixmaps/faces/bonfire.jpg
-share/pixmaps/faces/cdrom.jpg
-share/pixmaps/faces/clock.jpg
-share/pixmaps/faces/daisy.jpg
+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/hollyleaf.jpg
-share/pixmaps/faces/lamas.jpg
-share/pixmaps/faces/seal.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/skyline.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/gdm-setup.png
 share/pixmaps/gdm-xnest.png
@@ -233,8 +247,6 @@ share/xsessions/gnome.desktop
 @dirrm share/gnome/help/gdm/C
 @dirrm share/gnome/help/gdm
 @comment in gnome2-dirs: @dirrm share/gnome/help
-@dirrm share/gnome/capplets
-@comment in gnome2-dirs: @dirrm share/gnome
 @dirrm share/gdm/themes/happygnome-list
 @dirrm share/gdm/themes/happygnome
 @dirrm share/gdm/themes/circles
diff --git a/x11/gdm/distinfo b/x11/gdm/distinfo
index 109c3e2d886..980a4239894 100644
--- a/x11/gdm/distinfo
+++ b/x11/gdm/distinfo
@@ -1,20 +1,18 @@
-$NetBSD: distinfo,v 1.27 2005/08/21 11:30:55 jmmv Exp $
+$NetBSD: distinfo,v 1.28 2005/10/14 21:47:01 jmmv Exp $
 
-SHA1 (gdm-2.8.0.1.tar.bz2) = 6ae66c933bf86a44951373019a6d5526ae312acd
-RMD160 (gdm-2.8.0.1.tar.bz2) = af697627b42ff1478ffcaba61a15949f7512a23b
-Size (gdm-2.8.0.1.tar.bz2) = 3522871 bytes
+SHA1 (gdm-2.8.0.5.tar.bz2) = e3a392d69a7715a1243ff06d5c42b38ac862da08
+RMD160 (gdm-2.8.0.5.tar.bz2) = 3ca5d2dcf00edb0bc7fc6c5a053e788beb2c7392
+Size (gdm-2.8.0.5.tar.bz2) = 2758902 bytes
 SHA1 (Daemon.README) = eb1e6af52adc02ded77af17e8953134b7e60d23b
 RMD160 (Daemon.README) = 39edd92ed4314397080f32a8caff0ac3f716ecf4
 Size (Daemon.README) = 2191 bytes
 SHA1 (Daemon.png) = e77a42c644beecd66c4b95c0ae68c08c728a4e6d
 RMD160 (Daemon.png) = eb317dc7ac501ee03aac1276856eee14674e3da7
 Size (Daemon.png) = 15725 bytes
-SHA1 (patch-aa) = 8e81767c1cdb0d85ffcf3cf62a37ac0cb7ac8634
+SHA1 (patch-aa) = 649f62f21f55822afb17753cacda9a4bc8873595
 SHA1 (patch-ac) = bcb4656d9467737d62b69a1dd3f3750d5607fef3
 SHA1 (patch-ad) = 4f4c4395ba6de7235069fe7ff9877381e9bc997a
 SHA1 (patch-ae) = 55b66f0f32701f6911db88c0b7da29758a7b2b95
 SHA1 (patch-af) = 467afc3ee4d555fac4d5d26e49c3ff8b098e7369
 SHA1 (patch-ag) = 467552a6da5c83fcc3a37e59d1f4cd63241dee0d
-SHA1 (patch-ai) = 263b4a326574bdbf03a350028e157427b36144f4
-SHA1 (patch-aj) = 4aa63ab6e190dc80c298e6317e7f7882f5a319f9
 SHA1 (patch-ak) = b35c36326ce70c4840716bda948843c883876124
diff --git a/x11/gdm/patches/patch-aa b/x11/gdm/patches/patch-aa
index 84da253b340..a2785051a1d 100644
--- a/x11/gdm/patches/patch-aa
+++ b/x11/gdm/patches/patch-aa
@@ -1,42 +1,58 @@
-$NetBSD: patch-aa,v 1.14 2005/06/26 16:52:14 jmmv Exp $
+$NetBSD: patch-aa,v 1.15 2005/10/14 21:47:01 jmmv Exp $
 
---- configure.orig	2005-06-10 20:53:51.000000000 +0200
+--- configure.orig	2005-10-04 05:31:08.000000000 +0200
 +++ configure
-@@ -22412,7 +22412,8 @@ _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
--$ac_includes_default
-+#include <sys/types.h>
-+#include <sys/socket.h>
- int
- main ()
- {
-@@ -22876,13 +22877,13 @@ echo "${ECHO_T}yes" >&6
+@@ -23168,12 +23168,12 @@ else
+   if test "x$ac_cv_env_DAEMON_CFLAGS_set" = "xset"; then
+ 	pkg_cv_DAEMON_CFLAGS=$ac_cv_env_DAEMON_CFLAGS_value
+ elif test -n "$PKG_CONFIG"; then
+-	if { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists \"gtk+-2.0 >= \$GTK_REQUIRED\" >/dev/null 2>&1") >&5
+-  ($PKG_CONFIG --exists "gtk+-2.0 >= $GTK_REQUIRED" >/dev/null 2>&1) 2>&5
++	if { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists \"gtk+-2.0 >= \$GTK_REQUIRED libgnome-2.0 >= \$LIBGNOME_REQUIRED\" >/dev/null 2>&1") >&5
++  ($PKG_CONFIG --exists "gtk+-2.0 >= $GTK_REQUIRED libgnome-2.0 >= $LIBGNOME_REQUIRED" >/dev/null 2>&1) 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+-		pkg_cv_DAEMON_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= $GTK_REQUIRED" 2>/dev/null`
++		pkg_cv_DAEMON_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= $GTK_REQUIRED libgnome-2.0 >= $LIBGNOME_REQUIRED" 2>/dev/null`
+ 	else
+ 		pkg_failed=yes
+ 	fi
+@@ -23191,12 +23191,12 @@ else
+   if test "x$ac_cv_env_DAEMON_LIBS_set" = "xset"; then
+ 	pkg_cv_DAEMON_LIBS=$ac_cv_env_DAEMON_LIBS_value
+ elif test -n "$PKG_CONFIG"; then
+-	if { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists \"gtk+-2.0 >= \$GTK_REQUIRED\" >/dev/null 2>&1") >&5
+-  ($PKG_CONFIG --exists "gtk+-2.0 >= $GTK_REQUIRED" >/dev/null 2>&1) 2>&5
++	if { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists \"gtk+-2.0 >= \$GTK_REQUIRED libgnome-2.0 >= \$LIBGNOME_REQUIRED\" >/dev/null 2>&1") >&5
++  ($PKG_CONFIG --exists "gtk+-2.0 >= $GTK_REQUIRED libgnome-2.0 >= $LIBGNOME_REQUIRED" >/dev/null 2>&1) 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+-		pkg_cv_DAEMON_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= $GTK_REQUIRED" 2>/dev/null`
++		pkg_cv_DAEMON_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= $GTK_REQUIRED libgnome-2.0 >= $LIBGNOME_REQUIRED" 2>/dev/null`
+ 	else
+ 		pkg_failed=yes
+ 	fi
+@@ -23208,18 +23208,18 @@ echo "$as_me:$LINENO: result: $pkg_cv_DA
+ echo "${ECHO_T}$pkg_cv_DAEMON_LIBS" >&6
  
-             echo "$as_me:$LINENO: checking DAEMON_CFLAGS" >&5
- echo $ECHO_N "checking DAEMON_CFLAGS... $ECHO_C" >&6
--            DAEMON_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= $GTK_REQUIRED"`
-+            DAEMON_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= $GTK_REQUIRED libgnome-2.0"`
-             echo "$as_me:$LINENO: result: $DAEMON_CFLAGS" >&5
- echo "${ECHO_T}$DAEMON_CFLAGS" >&6
+ if test $pkg_failed = yes; then
+-	DAEMON_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk+-2.0 >= $GTK_REQUIRED"`
++	DAEMON_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk+-2.0 >= $GTK_REQUIRED libgnome-2.0 >= $LIBGNOME_REQUIRED"`
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$DAEMON_PKG_ERRORS" 1>&5
  
-             echo "$as_me:$LINENO: checking DAEMON_LIBS" >&5
- echo $ECHO_N "checking DAEMON_LIBS... $ECHO_C" >&6
--            DAEMON_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= $GTK_REQUIRED"`
-+            DAEMON_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= $GTK_REQUIRED libgnome-2.0"`
-             echo "$as_me:$LINENO: result: $DAEMON_LIBS" >&5
- echo "${ECHO_T}$DAEMON_LIBS" >&6
-         else
-@@ -30269,6 +30270,11 @@ else
-    X_CONFIG_OPTIONS="-audit 0"
- fi
+-	{ { echo "$as_me:$LINENO: error: Package requirements (gtk+-2.0 >= $GTK_REQUIRED) were not met.
++	{ { echo "$as_me:$LINENO: error: Package requirements (gtk+-2.0 >= $GTK_REQUIRED libgnome-2.0 >= $LIBGNOME_REQUIRED) were not met.
+ Consider adjusting the PKG_CONFIG_PATH environment variable if you
+ installed software in a non-standard prefix.
+ 
+ Alternatively you may set the DAEMON_CFLAGS and DAEMON_LIBS environment variables
+ to avoid the need to call pkg-config.  See the pkg-config man page for
+ more details." >&5
+-echo "$as_me: error: Package requirements (gtk+-2.0 >= $GTK_REQUIRED) were not met.
++echo "$as_me: error: Package requirements (gtk+-2.0 >= $GTK_REQUIRED libgnome-2.0 >= $LIBGNOME_REQUIRED) were not met.
+ Consider adjusting the PKG_CONFIG_PATH environment variable if you
+ installed software in a non-standard prefix.
  
-+X_PATH="${X11BASE}/bin"
-+X_SERVER_PATH="${X11BASE}/bin"
-+X_SERVER="${X11BASE}/bin/X ${X_SERVER_ARGS}"
-+GDM_CONF_PATH="${X11BASE}/bin:${PREFIX}/bin:/usr/bin:/bin"
-+
- # Don't add EXPANDED_BINDIR to GDM_USER_PATH if it is already in the PATH.
- if test "x$EXPANDED_BINDIR" != "x/bin" -a "x$EXPANDED_BINDIR" != "x/usr/bin"; then
-    GDM_USER_PATH="$GDM_USER_PATH:$EXPANDED_BINDIR"
diff --git a/x11/gdm/patches/patch-ai b/x11/gdm/patches/patch-ai
deleted file mode 100644
index 4898547b9b8..00000000000
--- a/x11/gdm/patches/patch-ai
+++ /dev/null
@@ -1,60 +0,0 @@
-$NetBSD: patch-ai,v 1.3 2005/07/13 13:10:27 wiz Exp $
-
---- daemon/getvt.c.orig	2005-07-10 09:22:22.000000000 +0000
-+++ daemon/getvt.c
-@@ -18,16 +18,16 @@
- extern int GdmFirstVT;
- extern gboolean GdmVTAllocation;
- 
--#if defined (__linux__) || defined (__FreeBSD__)
-+#if defined (__linux__) || defined (__FreeBSD__) || defined(__DragonFly__)
- 
- #ifdef __linux__
- #include <sys/vt.h>
- #endif
--#ifdef __FreeBSD__
-+#if defined(__FreeBSD__) || defined(__DragonFly__)
- #include <sys/consio.h>
- #endif
- 
--#ifdef __FreeBSD__
-+#if defined( __FreeBSD__) || defined(__DragonFly__)
- static const char*
- __itovty(int val)
- {
-@@ -51,7 +51,7 @@ open_vt (int vtno)
- 
- #if defined (__linux__)
- 	vtname = g_strdup_printf ("/dev/tty%d", vtno);
--#elif defined (__FreeBSD__)
-+#elif defined (__FreeBSD__) || defined(__DragonFly__)
- 	vtname = g_strdup_printf ("/dev/ttyv%s", __itovty(vtno - 1));
- #endif
- 	do {
-@@ -104,7 +104,7 @@ get_free_vt (int *vtfd)
- 
- #if defined (__linux__)
- 		if ((ioctl(fd, VT_OPENQRY, &vtno) < 0) || (vtno == -1)) {
--#elif defined (__FreeBSD__)
-+#elif defined (__FreeBSD__) || defined(__DragonFly__)
- 		if (ioctl(fd, VT_OPENQRY, &vtno) == -1) {
- #endif
- 			vtno = -1;
-@@ -177,7 +177,7 @@ gdm_get_cur_vt (void)
- {
- #if defined (__linux__)
- 	struct vt_stat s;
--#elif defined (__FreeBSD__)
-+#elif defined (__FreeBSD__) || defined(__DragonFly__)
- 	int vtno;
- #endif
- 	int fd;
-@@ -203,7 +203,7 @@ gdm_get_cur_vt (void)
- 	*/
- 
- 	return s.v_active;
--#elif defined (__FreeBSD__)
-+#elif defined (__FreeBSD__) || defined(__DragonFly__)
- 	if (ioctl (fd, VT_GETACTIVE, &vtno) == -1) {
- 		VE_IGNORE_EINTR (close (fd));
- 		return -1;
diff --git a/x11/gdm/patches/patch-aj b/x11/gdm/patches/patch-aj
deleted file mode 100644
index e27af61fcc8..00000000000
--- a/x11/gdm/patches/patch-aj
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-aj,v 1.1 2005/07/13 13:10:27 wiz Exp $
-
---- daemon/gdm.c.orig	2005-07-10 09:24:31.000000000 +0000
-+++ daemon/gdm.c
-@@ -4249,7 +4249,7 @@ gdm_handle_user_message (GdmConnection *
- 			return;
- 		}
- 
--#if defined(__linux__) || defined(__FreeBSD__)
-+#if defined(__linux__) || defined(__FreeBSD__) || defined(__DragonFly__)
- 		gdm_connection_printf (conn, "OK %d\n", gdm_get_cur_vt ());
- #else
- 		gdm_connection_write (conn, "ERROR 8 Virtual terminals not supported\n");
-@@ -4275,7 +4275,7 @@ gdm_handle_user_message (GdmConnection *
- 			return;
- 		}
- 
--#if defined(__linux__) || defined(__FreeBSD__)
-+#if defined(__linux__) || defined(__FreeBSD__) || defined(__DragonFly__)
- 		gdm_change_vt (vt);
- 		for (li = displays; li != NULL; li = li->next) {
- 			GdmDisplay *disp = li->data;