Wed Apr 17 18:02:23 2024 UTC (22d)
Pull up following revision(s) (requested by riastradh in ticket #654):

	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.145.2.5 -r1.145.2.6 src/share/mk/bsd.x11.mk
cvs diff -r1.145.2.5 -r1.145.2.6 src/share/mk/bsd.x11.mk (expand / switch to unified diff)

--- src/share/mk/bsd.x11.mk 2023/10/26 15:23:02 1.145.2.5
+++ src/share/mk/bsd.x11.mk 2024/04/17 18:02:23 1.145.2.6
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: bsd.x11.mk,v 1.145.2.5 2023/10/26 15:23:02 martin Exp $ 1# $NetBSD: bsd.x11.mk,v 1.145.2.6 2024/04/17 18:02:23 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
@@ -135,27 +135,27 @@ XORG_VERSION_CURRENT="(((${XORG_SERVER_M @@ -135,27 +135,27 @@ XORG_VERSION_CURRENT="(((${XORG_SERVER_M
135XORG_SERVER_MAJOR= 21 135XORG_SERVER_MAJOR= 21
136XORG_SERVER_MINOR= 1 136XORG_SERVER_MINOR= 1
137XORG_SERVER_TEENY= 9 137XORG_SERVER_TEENY= 9
138XORG_VERSION_CURRENT="((10000000) + ((${XORG_SERVER_MAJOR}) * 100000) + ((${XORG_SERVER_MINOR}) * 1000) + ${XORG_SERVER_TEENY})" 138XORG_VERSION_CURRENT="((10000000) + ((${XORG_SERVER_MAJOR}) * 100000) + ((${XORG_SERVER_MINOR}) * 1000) + ${XORG_SERVER_TEENY})"
139.endif 139.endif
140 140
141XVENDORNAMESHORT= '"X.Org"' 141XVENDORNAMESHORT= '"X.Org"'
142XVENDORNAME= '"The X.Org Foundation"' 142XVENDORNAME= '"The X.Org Foundation"'
143XORG_RELEASE= '"Release ${XORG_SERVER_MAJOR}.${XORG_SERVER_MINOR}.${XORG_SERVER_TEENY}"' 143XORG_RELEASE= '"Release ${XORG_SERVER_MAJOR}.${XORG_SERVER_MINOR}.${XORG_SERVER_TEENY}"'
144__XKBDEFRULES__= '"xorg"' 144__XKBDEFRULES__= '"xorg"'
145XLOCALE.DEFINES= -DXLOCALEDIR=\"${X11LIBDIR}/locale\" \ 145XLOCALE.DEFINES= -DXLOCALEDIR=\"${X11LIBDIR}/locale\" \
146 -DXLOCALELIBDIR=\"${X11LIBDIR}/locale\" 146 -DXLOCALELIBDIR=\"${X11LIBDIR}/locale\"
147 147
148PRINT_PACKAGE_VERSION= awk '/^PACKAGE_VERSION=/ { \ 148PRINT_PACKAGE_VERSION= ${TOOL_AWK} '/^PACKAGE_VERSION=/ { \
149 match($$1, "([0-9]+\\.)+[0-9]+"); \ 149 match($$1, "([0-9]+\\.)+[0-9]+"); \
150 version = substr($$1, RSTART, RLENGTH); \ 150 version = substr($$1, RSTART, RLENGTH); \
151 } END { print version }' 151 } END { print version }'
152 152
153 153
154# Commandline to convert 'XCOMM' comments and 'XHASH' to '#', among other 154# Commandline to convert 'XCOMM' comments and 'XHASH' to '#', among other
155# things. Transformed from the "CppSedMagic" macro from "Imake.rules". 155# things. Transformed from the "CppSedMagic" macro from "Imake.rules".
156# 156#
157X11TOOL_UNXCOMM= ${TOOL_SED} -e '/^\# *[0-9][0-9]* *.*$$/d' \ 157X11TOOL_UNXCOMM= ${TOOL_SED} -e '/^\# *[0-9][0-9]* *.*$$/d' \
158 -e '/^\#line *[0-9][0-9]* *.*$$/d' \ 158 -e '/^\#line *[0-9][0-9]* *.*$$/d' \
159 -e '/^[ ]*XCOMM$$/s/XCOMM/\#/' \ 159 -e '/^[ ]*XCOMM$$/s/XCOMM/\#/' \
160 -e '/^[ ]*XCOMM[^a-zA-Z0-9_]/s/XCOMM/\#/' \ 160 -e '/^[ ]*XCOMM[^a-zA-Z0-9_]/s/XCOMM/\#/' \
161 -e '/^[ ]*XHASH/s/XHASH/\#/' \ 161 -e '/^[ ]*XHASH/s/XHASH/\#/' \