Wed Apr 17 18:07:53 2024 UTC (22d)
Pull up following revision(s) (requested by riastradh in ticket #1954):

	share/mk/bsd.lib.mk: revision 1.398
	share/mk/bsd.lib.mk: revision 1.399
	share/mk/bsd.x11.mk: revision 1.152
	(via patch)

PR/58104: Kouichi Hashikawa: Use ${TOOL_AWK}

Back-out unintented commit.


(martin)
diff -r1.124.6.1 -r1.124.6.2 src/share/mk/bsd.x11.mk
cvs diff -r1.124.6.1 -r1.124.6.2 src/share/mk/bsd.x11.mk (expand / switch to unified diff)

--- src/share/mk/bsd.x11.mk 2019/04/23 10:24:54 1.124.6.1
+++ src/share/mk/bsd.x11.mk 2024/04/17 18:07:53 1.124.6.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: bsd.x11.mk,v 1.124.6.1 2019/04/23 10:24:54 martin Exp $ 1# $NetBSD: bsd.x11.mk,v 1.124.6.2 2024/04/17 18:07:53 martin Exp $
2 2
3.include <bsd.init.mk> 3.include <bsd.init.mk>
4 4
5BINDIR= ${X11BINDIR} 5BINDIR= ${X11BINDIR}
6LIBDIR= ${X11USRLIBDIR} 6LIBDIR= ${X11USRLIBDIR}
7MANDIR= ${X11MANDIR} 7MANDIR= ${X11MANDIR}
8 8
9COPTS+= -fno-strict-aliasing 9COPTS+= -fno-strict-aliasing
10 10
11.include <bsd.sys.mk> 11.include <bsd.sys.mk>
12 12
13.if !defined(NOSSP) && (${USE_SSP:Uno} != "no") 13.if !defined(NOSSP) && (${USE_SSP:Uno} != "no")
14CPPFLAGS+= -DNO_ALLOCA 14CPPFLAGS+= -DNO_ALLOCA
@@ -134,27 +134,27 @@ XORG_SERVER_TEENY= 6 @@ -134,27 +134,27 @@ XORG_SERVER_TEENY= 6
134XORG_SERVER_MINOR= 18 134XORG_SERVER_MINOR= 18
135XORG_SERVER_TEENY= 4 135XORG_SERVER_TEENY= 4
136.endif 136.endif
137  137
138XVENDORNAMESHORT= '"X.Org"' 138XVENDORNAMESHORT= '"X.Org"'
139XVENDORNAME= '"The X.Org Foundation"' 139XVENDORNAME= '"The X.Org Foundation"'
140XORG_RELEASE= '"Release ${XORG_SERVER_MAJOR}.${XORG_SERVER_MINOR}.${XORG_SERVER_TEENY}"' 140XORG_RELEASE= '"Release ${XORG_SERVER_MAJOR}.${XORG_SERVER_MINOR}.${XORG_SERVER_TEENY}"'
141__XKBDEFRULES__= '"xorg"' 141__XKBDEFRULES__= '"xorg"'
142XLOCALE.DEFINES= -DXLOCALEDIR=\"${X11LIBDIR}/locale\" \ 142XLOCALE.DEFINES= -DXLOCALEDIR=\"${X11LIBDIR}/locale\" \
143 -DXLOCALELIBDIR=\"${X11LIBDIR}/locale\" 143 -DXLOCALELIBDIR=\"${X11LIBDIR}/locale\"
144 144
145XORG_VERSION_CURRENT="(((${XORG_SERVER_MAJOR}) * 10000000) + ((${XORG_SERVER_MINOR}) * 100000) + ((${XORG_SERVER_TEENY}) * 1000) + 0)" 145XORG_VERSION_CURRENT="(((${XORG_SERVER_MAJOR}) * 10000000) + ((${XORG_SERVER_MINOR}) * 100000) + ((${XORG_SERVER_TEENY}) * 1000) + 0)"
146 146
147PRINT_PACKAGE_VERSION= awk '/^PACKAGE_VERSION=/ { \ 147PRINT_PACKAGE_VERSION= ${TOOL_AWK} '/^PACKAGE_VERSION=/ { \
148 match($$1, "([0-9]+\\.)+[0-9]+"); \ 148 match($$1, "([0-9]+\\.)+[0-9]+"); \
149 version = substr($$1, RSTART, RLENGTH); \ 149 version = substr($$1, RSTART, RLENGTH); \
150 } END { print version }' 150 } END { print version }'
151 151
152 152
153# Commandline to convert 'XCOMM' comments and 'XHASH' to '#', among other 153# Commandline to convert 'XCOMM' comments and 'XHASH' to '#', among other
154# things. Transformed from the "CppSedMagic" macro from "Imake.rules". 154# things. Transformed from the "CppSedMagic" macro from "Imake.rules".
155# 155#
156X11TOOL_UNXCOMM= ${TOOL_SED} -e '/^\# *[0-9][0-9]* *.*$$/d' \ 156X11TOOL_UNXCOMM= ${TOOL_SED} -e '/^\# *[0-9][0-9]* *.*$$/d' \
157 -e '/^\#line *[0-9][0-9]* *.*$$/d' \ 157 -e '/^\#line *[0-9][0-9]* *.*$$/d' \
158 -e '/^[ ]*XCOMM$$/s/XCOMM/\#/' \ 158 -e '/^[ ]*XCOMM$$/s/XCOMM/\#/' \
159 -e '/^[ ]*XCOMM[^a-zA-Z0-9_]/s/XCOMM/\#/' \ 159 -e '/^[ ]*XCOMM[^a-zA-Z0-9_]/s/XCOMM/\#/' \
160 -e '/^[ ]*XHASH/s/XHASH/\#/' \ 160 -e '/^[ ]*XHASH/s/XHASH/\#/' \