head	1.2;
access;
symbols
	pkgsrc-2017Q4:1.1.0.8
	pkgsrc-2017Q4-base:1.1
	pkgsrc-2017Q3:1.1.0.6
	pkgsrc-2017Q3-base:1.1
	pkgsrc-2017Q2:1.1.0.2
	pkgsrc-2017Q2-base:1.1;
locks; strict;
comment	@// @;


1.2
date	2018.03.10.08.04.22;	author wiz;	state dead;
branches;
next	1.1;
commitid	gXSioor4QoC6XStA;

1.1
date	2017.05.31.05.29.34;	author maya;	state Exp;
branches;
next	;
commitid	kEnwO8s38T2xbvTz;


desc
@@


1.2
log
@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
@
text
@$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
@


1.1
log
@xinit: don't use GNU expr extensions
Already committed upstream and in NetBSD

From John Vogel
@
text
@d1 1
a1 1
$NetBSD$
@