[pkgsrc/trunk]: pkgsrc/x11/xinit xinit: don't use GNU expr extensions

[maya <maya%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/320103d39d43
branches:  trunk
changeset: 363044:320103d39d43
user:      maya <maya%pkgsrc.org@localhost>
date:      Wed May 31 05:29:34 2017 +0000

description:
xinit: don't use GNU expr extensions
Already committed upstream and in NetBSD

>From John Vogel

diffstat:

 x11/xinit/Makefile                 |   4 ++--
 x11/xinit/distinfo                 |   3 ++-
 x11/xinit/patches/patch-startx.cpp |  22 ++++++++++++++++++++++
 3 files changed, 26 insertions(+), 3 deletions(-)

diffs (51 lines):

diff -r fda005f3c0c1 -r 320103d39d43 x11/xinit/Makefile
--- a/x11/xinit/Makefile        Wed May 31 05:22:09 2017 +0000
+++ b/x11/xinit/Makefile        Wed May 31 05:29:34 2017 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.23 2017/02/23 06:20:07 tnn Exp $
+# $NetBSD: Makefile,v 1.24 2017/05/31 05:29:34 maya Exp $
 
 DISTNAME=              xinit-1.3.4
-PKGREVISION=           1
+PKGREVISION=           2
 CATEGORIES=            x11
 MASTER_SITES=          ${MASTER_SITE_XORG:=app/}
 EXTRACT_SUFX=          .tar.bz2
diff -r fda005f3c0c1 -r 320103d39d43 x11/xinit/distinfo
--- a/x11/xinit/distinfo        Wed May 31 05:22:09 2017 +0000
+++ b/x11/xinit/distinfo        Wed May 31 05:29:34 2017 +0000
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.13 2015/11/04 03:29:07 agc Exp $
+$NetBSD: distinfo,v 1.14 2017/05/31 05:29:34 maya 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
diff -r fda005f3c0c1 -r 320103d39d43 x11/xinit/patches/patch-startx.cpp
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/xinit/patches/patch-startx.cpp        Wed May 31 05:29:34 2017 +0000
@@ -0,0 +1,22 @@
+$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