Wed Apr 17 18:04:57 2024 UTC (22d)
Pull up following revision(s) (requested by riastradh in ticket #1826):

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

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