Module Name: src
Committed By: aymeric
Date: Sat Aug 8 22:26:59 UTC 2015
Modified Files:
src/external/mit/xorg: xorg-pkg-ver.mk
Log Message:
Fix bracket expressions by moving '-' to the end of them. GNU awk choked.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/xorg-pkg-ver.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/xorg-pkg-ver.mk
diff -u src/external/mit/xorg/xorg-pkg-ver.mk:1.5 src/external/mit/xorg/xorg-pkg-ver.mk:1.6
--- src/external/mit/xorg/xorg-pkg-ver.mk:1.5 Wed Jul 22 07:58:00 2015
+++ src/external/mit/xorg/xorg-pkg-ver.mk Sat Aug 8 22:26:59 2015
@@ -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 @@ CPPFLAGS+= -DVERSION=\"${XORG_PKG_PACKAG
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 @@ CPPFLAGS+= -DPACKAGE_STRING=\"${XORG_PKG
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; \
