[src/trunk]: src/external/mit/xorg Fix bracket expressions by moving '-' to t...

[aymeric <aymeric%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/21edbcde516e
branches:  trunk
changeset: 809906:21edbcde516e
user:      aymeric <aymeric%NetBSD.org@localhost>
date:      Sat Aug 08 22:26:59 2015 +0000

description:
Fix bracket expressions by moving '-' to the end of them. GNU awk choked.

diffstat:

 external/mit/xorg/xorg-pkg-ver.mk |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r 8f1bcceadc09 -r 21edbcde516e external/mit/xorg/xorg-pkg-ver.mk
--- a/external/mit/xorg/xorg-pkg-ver.mk Sat Aug 08 17:21:19 2015 +0000
+++ b/external/mit/xorg/xorg-pkg-ver.mk Sat Aug 08 22:26:59 2015 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: xorg-pkg-ver.mk,v 1.5 2015/07/22 07:58:00 mrg Exp $
+#      $NetBSD: xorg-pkg-ver.mk,v 1.6 2015/08/08 22:26:59 aymeric Exp $
 
 # when including this make sure PROG is set so that $X11SRCDIR.$PROG
 # is a valid setting.  set XORG_PKG_VER_PROG if PROG is wrong.
@@ -24,7 +24,7 @@
 
 XORG_PKG_PACKAGE_STRING!= \
        awk -F= '/^PACKAGE_STRING=/ {                           \
-            match($$2, "[a-zA-Z-_]+[   ]+([0-9]+\\.)+[0-9]+"); \
+            match($$2, "[a-zA-Z_-]+[   ]+([0-9]+\\.)+[0-9]+"); \
             string = substr($$2, RSTART, RLENGTH);             \
             print string;                                      \
             exit 0;                                            \
@@ -35,7 +35,7 @@
 
 XORG_PKG_PACKAGE_NAME!= \
        awk -F= '/^PACKAGE_NAME=/ {                             \
-            match($$2, "'"'"'[a-zA-Z-_0-9]+'"'"'");            \
+            match($$2, "'"'"'[a-zA-Z0-9_-]+'"'"'");            \
             name = substr($$2, RSTART, RLENGTH);               \
             print name;                                        \
             exit 0;                                            \