From 35981369b190d359e0a6f81f02528179f85fa330 Mon Sep 17 00:00:00 2001
From: matthieu <matthieu@openbsd.org>
Date: Wed, 11 Jul 2018 19:03:50 +0000
Subject: [PATCH] Remove Xstartup and Xreset script. Xenodm uses GiveConsole
 and TakeConsole

---
 app/xenodm/Makefile.bsd-wrapper | 4 ++--
 app/xenodm/config/Makefile.am   | 4 +---
 app/xenodm/configure.ac         | 2 --
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/app/xenodm/Makefile.bsd-wrapper b/app/xenodm/Makefile.bsd-wrapper
index f2a87b5b3..63bc02b61 100644
--- a/app/xenodm/Makefile.bsd-wrapper
+++ b/app/xenodm/Makefile.bsd-wrapper
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.bsd-wrapper,v 1.1 2016/10/23 08:30:37 matthieu Exp $
+# $OpenBSD: Makefile.bsd-wrapper,v 1.2 2018/07/11 19:03:50 matthieu Exp $
 .include <bsd.own.mk>
 
 XENODMCONFIGDIR=/etc/X11/xenodm
@@ -25,7 +25,7 @@ realinstall:
 XENODMCONFIGFILES= \
 	xenodm-config Xresources Xservers
 XENODMCONFIGSCRIPTS= \
-	Xsession GiveConsole TakeConsole Xsetup_0 Xstartup Xreset
+	Xsession GiveConsole TakeConsole Xsetup_0
 
 afterinstall:
 	$(INSTALL_DATA) ${.CURDIR}/config/OpenBSD_1bpp.xpm $(DESTDIR)$(PIXMAPDIR)
diff --git a/app/xenodm/config/Makefile.am b/app/xenodm/config/Makefile.am
index 5af005d2d..e551cadd7 100644
--- a/app/xenodm/config/Makefile.am
+++ b/app/xenodm/config/Makefile.am
@@ -9,9 +9,7 @@ xenodmconfig_DATA = \
 	Xservers
 
 xenodmscript_SCRIPTS = \
-	Xreset \
-	Xsession \
-	Xstartup
+	Xsession
 
 dist_xenodmscript_SCRIPTS = \
 	GiveConsole \
diff --git a/app/xenodm/configure.ac b/app/xenodm/configure.ac
index 76702564e..5e1230f20 100644
--- a/app/xenodm/configure.ac
+++ b/app/xenodm/configure.ac
@@ -328,10 +328,8 @@ AC_CONFIG_FILES([Makefile
 		include/Makefile
 		man/Makefile
 		xenodm/Makefile
-		config/Xreset
 		config/Xresources
 		config/Xservers
 		config/Xsession
-		config/Xstartup
 		config/xenodm-config])
 AC_OUTPUT