Switch to xenodm(1).

Tested by tb@, Do it now deraadt@

11 files changed, 46 insertions, 42 deletions

diff --git a/app/Makefile b/app/Makefile
index 89b5567e5..34bba1563 100644
--- a/app/Makefile
+++ b/app/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.34 2016/04/25 19:25:31 matthieu Exp $
+# $OpenBSD: Makefile,v 1.35 2017/02/26 16:39:22 matthieu Exp $
 .include <bsd.xconf.mk>
 
 SUBDIR= bdftopcf mkfontscale mkfontdir \
@@ -7,7 +7,7 @@ SUBDIR= bdftopcf mkfontscale mkfontdir \
 	rgb scripts sessreg setxkbmap showfont \
 	smproxy twm viewres x11perf xauth xbacklight xbiff xcalc \
 	xclipboard xclock xcmsdb xcompmgr xconsole  \
-	xdm xdpyinfo xedit xev xeyes xf86dga \
+	xenodm xdpyinfo xedit xev xeyes xf86dga \
 	xfd xfontsel xfsinfo xfwp xgamma xgc xhost \
 	xinit xinput xkbcomp xkbevd xkbprint xkbutils xkill xload xlogo \
 	xlsatoms xlsclients xlsfonts xmag xman xmessage \
diff --git a/distrib/notes/README.amd64 b/distrib/notes/README.amd64
index 4a588cc91..b264c24b0 100644
--- a/distrib/notes/README.amd64
+++ b/distrib/notes/README.amd64
@@ -6,7 +6,7 @@ Conventions used in this document:
     manual page available in section 1 of the manual pages for further
     reading, viewed by typing "man 1 somename".
 
-1. Start either xdm(1) or startx(1).
+1. Start either xenodm(1) or startx(1).
 
    a. Start xdm(1), the X display manager by activating the xdm_flags option
       in /etc/rc.conf.local(8).
@@ -27,4 +27,4 @@ Conventions used in this document:
 
 problem_blurb
 
-$OpenBSD: README.amd64,v 1.10 2016/04/02 10:50:50 matthieu Exp $
+$OpenBSD: README.amd64,v 1.11 2017/02/26 16:39:22 matthieu Exp $
diff --git a/distrib/notes/README.i386 b/distrib/notes/README.i386
index ea628cbd2..5edf47866 100644
--- a/distrib/notes/README.i386
+++ b/distrib/notes/README.i386
@@ -6,7 +6,7 @@ Conventions used in this document:
     manual page available in section 1 of the manual pages for further
     reading, viewed by typing "man 1 somename".
 
-1. Start either xdm(1) or startx(1).
+1. Start either xenodm(1) or startx(1).
 
    a. Start xdm(1), the X display manager by activating the xdm_flags option
       in /etc/rc.conf.local(8).
@@ -27,4 +27,4 @@ Conventions used in this document:
 
 problem_blurb
 
-$OpenBSD: README.i386,v 1.10 2016/04/02 10:50:50 matthieu Exp $
+$OpenBSD: README.i386,v 1.11 2017/02/26 16:39:22 matthieu Exp $
diff --git a/distrib/notes/README.loongson b/distrib/notes/README.loongson
index 373dac8d9..94270ca83 100644
--- a/distrib/notes/README.loongson
+++ b/distrib/notes/README.loongson
@@ -10,11 +10,12 @@ provides an unaccelerated frame buffer for use with the X server.
 No xorg.conf is needed in this configuration, unless you want to 
 change default options.
 
-To start xdm, the X display manager, activate the xdm_flags option in
-/etc/rc.conf.local(8). You will need to disable the console getty in /etc/ttys.
+To start xenodm, the X display manager, activate the xenodm_flags
+option in /etc/rc.conf.local(8). You will need to disable the console
+getty in /etc/ttys.
 
 Alternatively, you can log in at the console and run `startx'.
 
 problem_blurb
 
-$OpenBSD: README.loongson,v 1.4 2014/07/30 20:06:30 matthieu Exp $
+$OpenBSD: README.loongson,v 1.5 2017/02/26 16:39:22 matthieu Exp $
diff --git a/distrib/notes/README.luna88k b/distrib/notes/README.luna88k
index 55de645e5..1632ecb1b 100644
--- a/distrib/notes/README.luna88k
+++ b/distrib/notes/README.luna88k
@@ -9,11 +9,12 @@ buffers, but currently only supports monochrome mode.
 No xorg.conf is needed in this configuration, unless you want to 
 change default options.
 
-To start xdm, the X display manager, activate the xdm_flags option in
-/etc/rc.conf.local(8). You will need to disable the console getty in /etc/ttys.
+To start xenodm, the X display manager, activate the xenodm_flags
+option in /etc/rc.conf.local(8). You will need to disable the console
+getty in /etc/ttys.
 
 Alternatively, you can log in on console and use `startx'.
 
 problem_blurb
 
-$OpenBSD: README.luna88k,v 1.3 2014/07/30 20:06:30 matthieu Exp $
+$OpenBSD: README.luna88k,v 1.4 2017/02/26 16:39:22 matthieu Exp $
diff --git a/distrib/notes/README.macppc b/distrib/notes/README.macppc
index ebe6ec965..eed434b72 100644
--- a/distrib/notes/README.macppc
+++ b/distrib/notes/README.macppc
@@ -26,7 +26,7 @@ Unaccelerated, framebuffer driver
 
 The wsfb driver uses whatever graphics mode the console is set to
 (by Mac OS) as a dumb unaccelerated framebuffer in 8 bits per pixel.
-You should be able to use 'startx' or xdm to start X without further
+You should be able to use 'startx' or xenodm to start X without further
 configuration.
 
 Mousekeys (Or how to deal with a One Button Mouse)
@@ -80,4 +80,4 @@ button 2 and mouse button 3 respectively.
 
 problem_blurb
 
-$OpenBSD: README.macppc,v 1.11 2016/02/20 11:00:01 matthieu Exp $
+$OpenBSD: README.macppc,v 1.12 2017/02/26 16:39:22 matthieu Exp $
diff --git a/distrib/notes/README.sgi b/distrib/notes/README.sgi
index 64b9f383d..b087788e3 100644
--- a/distrib/notes/README.sgi
+++ b/distrib/notes/README.sgi
@@ -10,11 +10,12 @@ with the X server.
 No xorg.conf is needed in this configuration, unless you want to 
 change default options.
 
-To start xdm, the X display manager, activate the xdm_flags option in
-/etc/rc.conf.local(8). You will need to disable the console getty in /etc/ttys.
+To start xenodm, the X display manager, activate the xenodm_flags
+option in /etc/rc.conf.local(8). You will need to disable the console
+getty in /etc/ttys.
 
 Alternatively, you can log in at the console and run `startx'.
 
 problem_blurb
 
-$OpenBSD: README.sgi,v 1.6 2014/07/30 20:06:30 matthieu Exp $
+$OpenBSD: README.sgi,v 1.7 2017/02/26 16:39:22 matthieu Exp $
diff --git a/distrib/notes/README.sparc64 b/distrib/notes/README.sparc64
index 581bcfc73..6cff41adf 100644
--- a/distrib/notes/README.sparc64
+++ b/distrib/notes/README.sparc64
@@ -13,8 +13,9 @@ This setup is by far the easiest to configure and is supported on just
 about every machine OpenBSD/sparc64 runs on (both PCI and SBus based
 machines).  These setup do not require any configuration file.
 
-To use xdm from rc.conf, it is necessary to disable /dev/console in
-/etc/ttys, change the 'status' of /dev/console to 'off'.
+To use xenodm from rc.conf.local(8), it is necessary to disable
+/dev/console in /etc/ttys, change the 'status' of /dev/console to
+'off'.
 
 Single, accelerated display
 ---------------------------
@@ -90,9 +91,10 @@ displays and their location relative to the first, as in:
 
 See xorg.conf(5) for more options.
 
-To use xdm from rc.conf.local(8), it is necessary to disable /dev/console in
-/etc/ttys, change the 'status' of /dev/console to 'off'.
+To use xenodm from rc.conf.local(8), it is necessary to disable
+/dev/console in /etc/ttys, change the 'status' of /dev/console to
+'off'.
 
 problem_blurb
 
-$OpenBSD: README.sparc64,v 1.11 2014/07/30 20:06:30 matthieu Exp $
+$OpenBSD: README.sparc64,v 1.12 2017/02/26 16:39:22 matthieu Exp $
diff --git a/distrib/sets/lists/xbase/mi b/distrib/sets/lists/xbase/mi
index eb1857552..81d1463eb 100644
--- a/distrib/sets/lists/xbase/mi
+++ b/distrib/sets/lists/xbase/mi
@@ -2,9 +2,8 @@
 ./etc/X11
 ./etc/X11/app-defaults
 ./etc/X11/twm
-./etc/X11/xdm
-./etc/X11/xdm/chooser
-./etc/X11/xdm/pixmaps
+./etc/X11/xenodm
+./etc/X11/xenodm/pixmaps
 ./etc/X11/xinit
 ./etc/X11/xsm
 ./etc/fonts
@@ -116,7 +115,7 @@
 ./usr/X11R6/bin/xcompmgr
 ./usr/X11R6/bin/xconsole
 ./usr/X11R6/bin/xcutsel
-./usr/X11R6/bin/xdm
+./usr/X11R6/bin/xenodm
 ./usr/X11R6/bin/xdpr
 ./usr/X11R6/bin/xdpyinfo
 ./usr/X11R6/bin/xedit
diff --git a/distrib/sets/lists/xetc/mi b/distrib/sets/lists/xetc/mi
index 94c97033e..154352b83 100644
--- a/distrib/sets/lists/xetc/mi
+++ b/distrib/sets/lists/xetc/mi
@@ -1,15 +1,15 @@
 ./etc/X11/twm/system.twmrc
-./etc/X11/xdm/GiveConsole
-./etc/X11/xdm/TakeConsole
-./etc/X11/xdm/Xaccess
-./etc/X11/xdm/Xreset
-./etc/X11/xdm/Xresources
-./etc/X11/xdm/Xservers
-./etc/X11/xdm/Xsession
-./etc/X11/xdm/Xsetup_0
-./etc/X11/xdm/Xstartup
-./etc/X11/xdm/Xwilling
-./etc/X11/xdm/xdm-config
+./etc/X11/xenodm/GiveConsole
+./etc/X11/xenodm/TakeConsole
+./etc/X11/xenodm/Xaccess
+./etc/X11/xenodm/Xreset
+./etc/X11/xenodm/Xresources
+./etc/X11/xenodm/Xservers
+./etc/X11/xenodm/Xsession
+./etc/X11/xenodm/Xsetup_0
+./etc/X11/xenodm/Xstartup
+./etc/X11/xenodm/Xwilling
+./etc/X11/xenodm/xenodm-config
 ./etc/X11/xinit/xinitrc
 ./etc/X11/xsm/system.xsm
 ./etc/fonts/conf.d/10-scale-bitmap-fonts.conf
diff --git a/distrib/sets/lists/xshare/mi b/distrib/sets/lists/xshare/mi
index 48bf0e06c..e2fb08bbf 100644
--- a/distrib/sets/lists/xshare/mi
+++ b/distrib/sets/lists/xshare/mi
@@ -1,7 +1,7 @@
-./etc/X11/xdm/pixmaps/OpenBSD_15bpp.xpm
-./etc/X11/xdm/pixmaps/OpenBSD_1bpp.xpm
-./etc/X11/xdm/pixmaps/OpenBSD_4bpp.xpm
-./etc/X11/xdm/pixmaps/OpenBSD_8bpp.xpm
+./etc/X11/xenodm/pixmaps/OpenBSD_15bpp.xpm
+./etc/X11/xenodm/pixmaps/OpenBSD_1bpp.xpm
+./etc/X11/xenodm/pixmaps/OpenBSD_4bpp.xpm
+./etc/X11/xenodm/pixmaps/OpenBSD_8bpp.xpm
 ./usr/X11R6/bin/gccmakedep
 ./usr/X11R6/bin/startx
 ./usr/X11R6/bin/x11perfcomp
@@ -860,7 +860,7 @@
 ./usr/X11R6/man/man1/xcompmgr.1
 ./usr/X11R6/man/man1/xconsole.1
 ./usr/X11R6/man/man1/xcutsel.1
-./usr/X11R6/man/man1/xdm.1
+./usr/X11R6/man/man1/xenodm.1
 ./usr/X11R6/man/man1/xdpr.1
 ./usr/X11R6/man/man1/xdpyinfo.1
 ./usr/X11R6/man/man1/xedit.1