[src/trunk]: src/external/mit/xorg fix XORG_PKG_PACKAGE_NAME to not include m...

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

details:   https://anonhg.NetBSD.org/src/rev/c5c36715b43b
branches:  trunk
changeset: 323104:c5c36715b43b
user:      mrg <mrg%NetBSD.org@localhost>
date:      Thu May 31 09:31:39 2018 +0000

description:
fix XORG_PKG_PACKAGE_NAME to not include multiple quotes for PACKAGE_NAME,
and add a XORG_PKG_RELEASE_DATE to define RELEASE_DATE.

diffstat:

 external/mit/xorg/xorg-pkg-ver.mk |  15 +++++++++++++--
 1 files changed, 13 insertions(+), 2 deletions(-)

diffs (34 lines):

diff -r 530ecb06c4b3 -r c5c36715b43b external/mit/xorg/xorg-pkg-ver.mk
--- a/external/mit/xorg/xorg-pkg-ver.mk Thu May 31 09:20:05 2018 +0000
+++ b/external/mit/xorg/xorg-pkg-ver.mk Thu May 31 09:31:39 2018 +0000
@@ -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 @@
 
 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 @@
 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