Module Name: src Committed By: mrg Date: Fri Jul 15 04:51:29 UTC 2022
Modified Files: src/share/mk: bsd.x11.mk Log Message: update for xorg-server 21.1.3. To generate a diff of this commit: cvs rdiff -u -r1.143 -r1.144 src/share/mk/bsd.x11.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/share/mk/bsd.x11.mk diff -u src/share/mk/bsd.x11.mk:1.143 src/share/mk/bsd.x11.mk:1.144 --- src/share/mk/bsd.x11.mk:1.143 Sun May 1 23:02:32 2022 +++ src/share/mk/bsd.x11.mk Fri Jul 15 04:51:29 2022 @@ -1,4 +1,4 @@ -# $NetBSD: bsd.x11.mk,v 1.143 2022/05/01 23:02:32 uwe Exp $ +# $NetBSD: bsd.x11.mk,v 1.144 2022/07/15 04:51:29 mrg Exp $ .include <bsd.init.mk> @@ -126,13 +126,16 @@ X11FLAGS.LOADABLE+= ${${ACTIVE_CXX} == " .endif # XXX FIX ME -XORG_SERVER_MAJOR= 1 .if ${XORG_SERVER_SUBDIR:Uxorg-server.old} == "xorg-server.old" +XORG_SERVER_MAJOR= 1 XORG_SERVER_MINOR= 10 XORG_SERVER_TEENY= 6 +XORG_VERSION_CURRENT="(((${XORG_SERVER_MAJOR}) * 10000000) + ((${XORG_SERVER_MINOR}) * 100000) + ((${XORG_SERVER_TEENY}) * 1000) + 0)" .else -XORG_SERVER_MINOR= 20 -XORG_SERVER_TEENY= 13 +XORG_SERVER_MAJOR= 21 +XORG_SERVER_MINOR= 1 +XORG_SERVER_TEENY= 3 +XORG_VERSION_CURRENT="((10000000) + ((${XORG_SERVER_MAJOR}) * 100000) + ((${XORG_SERVER_MINOR}) * 1000) + ${XORG_SERVER_TEENY})" .endif XVENDORNAMESHORT= '"X.Org"' @@ -142,8 +145,6 @@ __XKBDEFRULES__= '"xorg"' XLOCALE.DEFINES= -DXLOCALEDIR=\"${X11LIBDIR}/locale\" \ -DXLOCALELIBDIR=\"${X11LIBDIR}/locale\" -XORG_VERSION_CURRENT="(((${XORG_SERVER_MAJOR}) * 10000000) + ((${XORG_SERVER_MINOR}) * 100000) + ((${XORG_SERVER_TEENY}) * 1000) + 0)" - PRINT_PACKAGE_VERSION= awk '/^PACKAGE_VERSION=/ { \ match($$1, "([0-9]+\\.)+[0-9]+"); \ version = substr($$1, RSTART, RLENGTH); \