summaryrefslogtreecommitdiff
path: root/app/xinit
diff options
context:
space:
mode:
authorMatthieu Herrb <matthieu@cvs.openbsd.org>2015-06-20 10:12:40 +0000
committerMatthieu Herrb <matthieu@cvs.openbsd.org>2015-06-20 10:12:40 +0000
commit5affd5560a42956f657dc47d9918b94fe8dc17aa (patch)
treefd7420eb9aea00d8509f5dfda2396b3edaf4d731 /app/xinit
parentecb42d928335a3e6b083cdae174b326793079d69 (diff)
Now that nolisten tcp is the Xserver default, don't pass the option
in scripts anymore.
Diffstat (limited to 'app/xinit')
-rw-r--r--app/xinit/Makefile.bsd-wrapper6
-rw-r--r--app/xinit/openbsd/xserverrc3
2 files changed, 1 insertions, 8 deletions
diff --git a/app/xinit/Makefile.bsd-wrapper b/app/xinit/Makefile.bsd-wrapper
index 6e181b485..f981a84d0 100644
--- a/app/xinit/Makefile.bsd-wrapper
+++ b/app/xinit/Makefile.bsd-wrapper
@@ -1,7 +1,3 @@
-# $OpenBSD: Makefile.bsd-wrapper,v 1.6 2015/06/15 16:17:46 matthieu Exp $
-
-afterinstall:
- $(INSTALL) -m 644 ${.CURDIR}/openbsd/xserverrc \
- $(DESTDIR)/etc/X11/xinit
+# $OpenBSD: Makefile.bsd-wrapper,v 1.7 2015/06/20 10:12:39 matthieu Exp $
.include <bsd.xorg.mk>
diff --git a/app/xinit/openbsd/xserverrc b/app/xinit/openbsd/xserverrc
deleted file mode 100644
index 8c1e13822..000000000
--- a/app/xinit/openbsd/xserverrc
+++ /dev/null
@@ -1,3 +0,0 @@
-#! /bin/sh
-# $OpenBSD: xserverrc,v 1.1 2015/06/15 16:17:46 matthieu Exp $
-exec /usr/X11R6/bin/X -nolisten tcp "$@"