Module Name: src
Committed By: mrg
Date: Thu May 31 09:31:39 UTC 2018
Modified Files:
src/external/mit/xorg: xorg-pkg-ver.mk
Log Message:
fix XORG_PKG_PACKAGE_NAME to not include multiple quotes for PACKAGE_NAME,
and add a XORG_PKG_RELEASE_DATE to define RELEASE_DATE.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 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.9 src/external/mit/xorg/xorg-pkg-ver.mk:1.10
--- src/external/mit/xorg/xorg-pkg-ver.mk:1.9 Sun May 27 01:14:51 2018
+++ src/external/mit/xorg/xorg-pkg-ver.mk Thu May 31 09:31:39 2018
@@ -1,4 +1,4 @@
-# $NetBSD: xorg-pkg-ver.mk,v 1.9 2018/05/27 01:14:51 christos Exp $
+# $NetBSD: xorg-pkg-ver.mk,v 1.10 2018/05/31 09:31:39 mrg 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.
@@ -35,7 +35,7 @@ CPPFLAGS+= -DPACKAGE_STRING=\"${XORG_PKG
XORG_PKG_PACKAGE_NAME!= \
${TOOL_AWK} -F= '/^PACKAGE_NAME=/ { \
- match($$2, "'"'"'[-_a-zA-Z0-9]+'"'"'"); \
+ match($$2, "[-_a-zA-Z0-9]+"); \
name = substr($$2, RSTART, RLENGTH); \
print name; \
exit 0; \
@@ -44,4 +44,15 @@ XORG_PKG_PACKAGE_NAME!= \
CPPFLAGS+= -DPACKAGE_NAME=\"${XORG_PKG_PACKAGE_NAME:Q}\"
.endif
+XORG_PKG_RELEASE_DATE!= \
+ ${TOOL_AWK} -F= '/^RELEASE_DATE=/ { \
+ match($$2, "[-_a-zA-Z0-9]+"); \
+ name = substr($$2, RSTART, RLENGTH); \
+ print name; \
+ exit 0; \
+ }' ${X11SRCDIR.${XORG_PKG_VER_PROG}}/configure
+.if !empty(XORG_PKG_RELEASE_DATE)
+CPPFLAGS+= -DRELEASE_DATE=\"${XORG_PKG_RELEASE_DATE:Q}\"
+.endif
+
.endif
