summaryrefslogtreecommitdiff
path: root/external
diff options
context:
space:
mode:
authormrg <mrg@NetBSD.org>2018-05-31 09:31:39 +0000
committermrg <mrg@NetBSD.org>2018-05-31 09:31:39 +0000
commit3bc178ebfcaa70bc5875a6bf613ce83209090ff4 (patch)
tree294f222b8695401ade17f70be80acbb0a16f2fd9 /external
parent2b6721f67023087bea0f94014660d60ff80ea2b4 (diff)
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 (limited to 'external')
-rw-r--r--external/mit/xorg/xorg-pkg-ver.mk15
1 files changed, 13 insertions, 2 deletions
diff --git a/external/mit/xorg/xorg-pkg-ver.mk b/external/mit/xorg/xorg-pkg-ver.mk
index b7423db4f7c..928215bdea0 100644
--- a/external/mit/xorg/xorg-pkg-ver.mk
+++ b/external/mit/xorg/xorg-pkg-ver.mk
@@ -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_PACKAGE_STRING:Q}\"
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