[src/trunk]: src/share/mk update for xorg-server 21.1.3.

[mrg <mrg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/fad8b1749894
branches:  trunk
changeset: 368480:fad8b1749894
user:      mrg <mrg%NetBSD.org@localhost>
date:      Fri Jul 15 04:51:29 2022 +0000

description:
update for xorg-server 21.1.3.

diffstat:

 share/mk/bsd.x11.mk |  13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)

diffs (38 lines):

diff -r 6c6b93469426 -r fad8b1749894 share/mk/bsd.x11.mk
--- a/share/mk/bsd.x11.mk       Fri Jul 15 04:47:55 2022 +0000
+++ b/share/mk/bsd.x11.mk       Fri Jul 15 04:51:29 2022 +0000
@@ -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 @@
 .endif
 
 # XXX FIX ME
+.if ${XORG_SERVER_SUBDIR:Uxorg-server.old} == "xorg-server.old"
 XORG_SERVER_MAJOR=     1
-.if ${XORG_SERVER_SUBDIR:Uxorg-server.old} == "xorg-server.old"
 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 @@
 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); \