xinit: update to 1.4.0.

Alan Coopersmith (1):
      xinit 1.4.0

Emil Velikov (1):
      autogen.sh: use quoted string variables

Gaetan Nadon (3):
      Remove SCO support for SHELL_CMD and startx man page.
      Remove support for ancient A/UX 3.0 support
      Remove left over $(launchagents_DATA) in CLEANFILES

Hans de Goede (2):
      startx: Pass -keeptty when telling the server to start on the current tty
      startx: Fix startx picking an already used display number when -nolock is used

Ingo Schwarze (1):
      remove bogus \/ escapes

Jeremy Huddleston Sequoia (3):
      launchd: Install binaries into libexecdir
      startx: Add -listen tcp if nolisten_tcp is disabled for XQuartz
      startx: Add support for enabling IGLX for XQuartz

Mark Kettenis (1):
      startx: Don't use GNU expr extensions

Mihail Konev (1):
      autogen: add default patch prefix

Peter Hutterer (3):
      startx: fix comment typo
      startx: don't init defaultdisplay to :0
      autogen.sh: use exec instead of waiting for configure to finish

Tobias Stoeckmann (1):
      xinit: check for correct fork error code

3 files changed, 7 insertions, 31 deletions

diff --git a/x11/xinit/Makefile b/x11/xinit/Makefile
index bb3ac6f9239..6d2dfe8488e 100644
--- a/x11/xinit/Makefile
+++ b/x11/xinit/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.24 2017/05/31 05:29:34 maya Exp $
+# $NetBSD: Makefile,v 1.25 2018/03/10 08:04:22 wiz Exp $
 
-DISTNAME=		xinit-1.3.4
-PKGREVISION=		2
+DISTNAME=		xinit-1.4.0
 CATEGORIES=		x11
 MASTER_SITES=		${MASTER_SITE_XORG:=app/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/x11/xinit/distinfo b/x11/xinit/distinfo
index e6537f3771a..9e4d07942a6 100644
--- a/x11/xinit/distinfo
+++ b/x11/xinit/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.14 2017/05/31 05:29:34 maya Exp $
+$NetBSD: distinfo,v 1.15 2018/03/10 08:04:22 wiz Exp $
 
-SHA1 (xinit-1.3.4.tar.bz2) = de3469080d73ced1f7d7a1803e813bc6ea352072
-RMD160 (xinit-1.3.4.tar.bz2) = ee5b21766556c4a16e2538700b432a11890d7829
-SHA512 (xinit-1.3.4.tar.bz2) = ac31e4cac86fc5dd4c0e15cf37cb9ac470ef3ace4f86d0063c7e1091342fe64d41fcd12c1840bd8e1cef4cdd7f66bd2fa76bd4061641e9c70941d76d73d0df2e
-Size (xinit-1.3.4.tar.bz2) = 165881 bytes
-SHA1 (patch-startx.cpp) = 42ff6eb12b534a811e4c64b6ef11327c09c1a70d
+SHA1 (xinit-1.4.0.tar.bz2) = fcdca692b09a45f546016fff78718d1cf7e7852f
+RMD160 (xinit-1.4.0.tar.bz2) = 183488b2fcc421d786069c01c6a75991c06b84ca
+SHA512 (xinit-1.4.0.tar.bz2) = 53a29081130c1e195eb441ee77ccaa044b18b4cca3d2d5da3a6d67aa421dfd9718fa18b6be6232a41e40cf260c8190064c4d8d9ab771177bd5cd12e77a8fa79e
+Size (xinit-1.4.0.tar.bz2) = 174491 bytes
diff --git a/x11/xinit/patches/patch-startx.cpp b/x11/xinit/patches/patch-startx.cpp
deleted file mode 100644
index 6bfa7f2ab89..00000000000
--- a/x11/xinit/patches/patch-startx.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-startx.cpp,v 1.1 2017/05/31 05:29:34 maya Exp $
-
-Don't use GNU expr extensions
-
-Use the ':' operator instead of "match" and avoid the use of "\+".  Both
-constructions aren't specified by POSIX and not supported in BSD expr.
-Also drop the '^' from the regular expressions as it is implicit and
-POSIX leaves its behaviour undefined.
-
-https://cgit.freedesktop.org/xorg/app/xinit/commit/?id=e3bab0cc706880c22f2b205e7abad9d8c0227071app/xinit/commit/?id=e3bab0cc706880c22f2b205e7abad9d8c0227071
-
---- startx.cpp.orig	2014-09-11 17:31:42.000000000 +0000
-+++ startx.cpp
-@@ -217,7 +217,7 @@ fi
- XCOMM if no vt is specified add vtarg (which may be empty)
- have_vtarg="no"
- for i in $serverargs; do
--    if expr match "$i" '^vt[0-9]\+$' > /dev/null; then
-+    if expr "$i" : 'vt[0-9][0-9]*$' > /dev/null; then
-         have_vtarg="yes"
-     fi
- done