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.
This commit is contained in:
martin 2024-04-17 18:07:53 +00:00
parent 998dc44aaa
commit 6d2c4ca3ec
1 changed files with 2 additions and 2 deletions

View File

@ -1,4 +1,4 @@
# $NetBSD: bsd.x11.mk,v 1.124.6.1 2019/04/23 10:24:54 martin Exp $
# $NetBSD: bsd.x11.mk,v 1.124.6.2 2024/04/17 18:07:53 martin Exp $
.include <bsd.init.mk>
@ -144,7 +144,7 @@ XLOCALE.DEFINES= -DXLOCALEDIR=\"${X11LIBDIR}/locale\" \
XORG_VERSION_CURRENT="(((${XORG_SERVER_MAJOR}) * 10000000) + ((${XORG_SERVER_MINOR}) * 100000) + ((${XORG_SERVER_TEENY}) * 1000) + 0)"
PRINT_PACKAGE_VERSION= awk '/^PACKAGE_VERSION=/ { \
PRINT_PACKAGE_VERSION= ${TOOL_AWK} '/^PACKAGE_VERSION=/ { \
match($$1, "([0-9]+\\.)+[0-9]+"); \
version = substr($$1, RSTART, RLENGTH); \
} END { print version }'