Module Name: src
Committed By: aymeric
Date: Sun Aug 9 10:09:07 UTC 2015
Modified Files:
src/external/mit/xorg: xorg-pkg-ver.mk
Log Message:
use ${TOOL_AWK} instead of host dependant awk. From mrg@.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 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.7 src/external/mit/xorg/xorg-pkg-ver.mk:1.8
--- src/external/mit/xorg/xorg-pkg-ver.mk:1.7 Sat Aug 8 23:06:36 2015
+++ src/external/mit/xorg/xorg-pkg-ver.mk Sun Aug 9 10:09:07 2015
@@ -1,4 +1,4 @@
-# $NetBSD: xorg-pkg-ver.mk,v 1.7 2015/08/08 23:06:36 aymeric Exp $
+# $NetBSD: xorg-pkg-ver.mk,v 1.8 2015/08/09 10:09:07 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.
@@ -11,7 +11,7 @@ _XORG_PKG_CONFIGURE_PATH= ${X11SRCDIR.${
.if exists(${X11SRCDIR.${XORG_PKG_VER_PROG}}/configure)
XORG_PKG_PACKAGE_VERSION!= \
- awk -F= '/^PACKAGE_VERSION=/ { \
+ ${TOOL_AWK} -F= '/^PACKAGE_VERSION=/ { \
match($$2, "([0-9]+\\.)+[0-9]+"); \
version = substr($$2, RSTART, RLENGTH); \
print version; \
@@ -23,7 +23,7 @@ CPPFLAGS+= -DVERSION=\"${XORG_PKG_PACKAG
.endif
XORG_PKG_PACKAGE_STRING!= \
- awk -F= '/^PACKAGE_STRING=/ { \
+ ${TOOL_AWK} -F= '/^PACKAGE_STRING=/ { \
match($$2, "[-_a-zA-Z]+[ ]+([0-9]+\\.)+[0-9]+"); \
string = substr($$2, RSTART, RLENGTH); \
print string; \
@@ -34,7 +34,7 @@ CPPFLAGS+= -DPACKAGE_STRING=\"${XORG_PKG
.endif
XORG_PKG_PACKAGE_NAME!= \
- awk -F= '/^PACKAGE_NAME=/ { \
+ ${TOOL_AWK} -F= '/^PACKAGE_NAME=/ { \
match($$2, "'"'"'[-_a-zA-Z0-9]+'"'"'"); \
name = substr($$2, RSTART, RLENGTH); \
print name; \
