[src/trunk]: src/share/mk add a HAVE_XORG_SERVER_VER for use in sets. clean ...

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

details:   https://anonhg.NetBSD.org/src/rev/3ebe59875121
branches:  trunk
changeset: 347156:3ebe59875121
user:      mrg <mrg%NetBSD.org@localhost>
date:      Tue Aug 16 01:03:07 2016 +0000

description:
add a HAVE_XORG_SERVER_VER for use in sets.  clean up the x11
defines a little for modern xorg, particularly the version.

diffstat:

 share/mk/bsd.own.mk |   6 ++++--
 share/mk/bsd.x11.mk |  20 ++++++++++++++------
 2 files changed, 18 insertions(+), 8 deletions(-)

diffs (68 lines):

diff -r 92577ab47141 -r 3ebe59875121 share/mk/bsd.own.mk
--- a/share/mk/bsd.own.mk       Tue Aug 16 00:55:09 2016 +0000
+++ b/share/mk/bsd.own.mk       Tue Aug 16 01:03:07 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.own.mk,v 1.940 2016/08/15 21:52:46 mrg Exp $
+#      $NetBSD: bsd.own.mk,v 1.941 2016/08/16 01:03:07 mrg Exp $
 
 # This needs to be before bsd.init.mk
 .if defined(BSD_MK_COMPAT_FILE)
@@ -1389,7 +1389,9 @@
 .endfor
 
 # During transition from xorg-server 1.10 to 1.18
-.if 0
+HAVE_XORG_SERVER_VER?=110
+
+.if ${HAVE_XORG_SERVER_VER:U0} == "118"
 XORG_SERVER_SUBDIR?=xorg-server
 .else
 XORG_SERVER_SUBDIR?=xorg-server.old
diff -r 92577ab47141 -r 3ebe59875121 share/mk/bsd.x11.mk
--- a/share/mk/bsd.x11.mk       Tue Aug 16 00:55:09 2016 +0000
+++ b/share/mk/bsd.x11.mk       Tue Aug 16 01:03:07 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.x11.mk,v 1.119 2016/05/29 03:02:07 nakayama Exp $
+#      $NetBSD: bsd.x11.mk,v 1.120 2016/08/16 01:03:07 mrg Exp $
 
 .include <bsd.init.mk>
 
@@ -90,7 +90,7 @@
 X11FLAGS.EXTENSION+=   -DXF86VIDMODE
 
 #      ServerDefines
-X11FLAGS.SERVER+=      -DXINPUT -DXFreeXDGA -DXF86VIDMODE
+X11FLAGS.SERVER+=      -DXINPUT -DXFreeXDGA -DXF86VIDMODE -DXSERVER_LIBPCIACCESS
 .endif
 
 .if ${MACHINE_ARCH} == "alpha" || \
@@ -117,17 +117,25 @@
 X11FLAGS.LOADABLE=     -DXFree86LOADER -DIN_MODULE -DXFree86Module \
                        ${${ACTIVE_CXX} == "gcc":? -fno-merge-constants :}
 .endif
+
+# XXX FIX ME
+XORG_SERVER_MAJOR=     1
+.if ${XORG_SERVER_SUBDIR:Uxorg-server.old} == "xorg-server.old"
+XORG_SERVER_MINOR=     10
+XORG_SERVER_TEENY=     6
+.else
+XORG_SERVER_MINOR=     18
+XORG_SERVER_TEENY=     4
+.endif
   
-# XXX FIX ME
 XVENDORNAMESHORT=      '"X.Org"'
 XVENDORNAME=           '"The X.Org Foundation"'
-XORG_RELEASE=          '"Release 1.10.6"'
+XORG_RELEASE=          '"Release ${XORG_SERVER_MAJOR}.${XORG_SERVER_MINOR}.${XORG_SERVER_TEENY}"'
 __XKBDEFRULES__=       '"xorg"'
 XLOCALE.DEFINES=       -DXLOCALEDIR=\"${X11LIBDIR}/locale\" \
                        -DXLOCALELIBDIR=\"${X11LIBDIR}/locale\"
 
-# XXX oh yeah, fix me later
-XORG_VERSION_CURRENT="(((1) * 10000000) + ((10) * 100000) + ((6) * 1000) + 0)"
+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]+");       \