[src/trunk]: src/distrib/sets support xorg_server_ver define, currently setta...

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

details:   https://anonhg.NetBSD.org/src/rev/727fe02a5d18
branches:  trunk
changeset: 347157:727fe02a5d18
user:      mrg <mrg%NetBSD.org@localhost>
date:      Tue Aug 16 01:05:19 2016 +0000

description:
support xorg_server_ver define, currently settable to 110 (1.10.x)
or 118 (1.18.x).

diffstat:

 distrib/sets/Makefile  |   5 ++++-
 distrib/sets/mkvars.mk |   3 ++-
 distrib/sets/sets.subr |  10 ++++++++--
 3 files changed, 14 insertions(+), 4 deletions(-)

diffs (74 lines):

diff -r 3ebe59875121 -r 727fe02a5d18 distrib/sets/Makefile
--- a/distrib/sets/Makefile     Tue Aug 16 01:03:07 2016 +0000
+++ b/distrib/sets/Makefile     Tue Aug 16 01:05:19 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.102 2016/05/25 00:07:20 christos Exp $
+#      $NetBSD: Makefile,v 1.103 2016/08/16 01:05:19 mrg Exp $
 
 # Experimental RCS METALOG versioning
 # (Needs host's rcs(1) commands)
@@ -67,6 +67,9 @@
 MAKETARSETS!= ${SETSCMD} ./makeflist -l ${MAKEFLIST_FLAGS}
 .endif
 
+print_have_xorg_server_ver: .PHONY
+       @echo ${HAVE_XORG_SERVER_VER}
+
 print_have_gcc: .PHONY
        @echo ${HAVE_GCC}
 
diff -r 3ebe59875121 -r 727fe02a5d18 distrib/sets/mkvars.mk
--- a/distrib/sets/mkvars.mk    Tue Aug 16 01:03:07 2016 +0000
+++ b/distrib/sets/mkvars.mk    Tue Aug 16 01:05:19 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mkvars.mk,v 1.28 2016/05/25 00:14:47 christos Exp $
+# $NetBSD: mkvars.mk,v 1.29 2016/08/16 01:05:19 mrg Exp $
 
 MKEXTRAVARS= \
        MACHINE \
@@ -6,6 +6,7 @@
        MACHINE_CPU \
        HAVE_GCC \
        HAVE_GDB \
+       HAVE_XORG_SERVER_VER \
        HAVE_BINUTILS \
        HAVE_LIBGCC_EH \
        HAVE_SSP \
diff -r 3ebe59875121 -r 727fe02a5d18 distrib/sets/sets.subr
--- a/distrib/sets/sets.subr    Tue Aug 16 01:03:07 2016 +0000
+++ b/distrib/sets/sets.subr    Tue Aug 16 01:05:19 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: sets.subr,v 1.176 2016/05/25 00:14:47 christos Exp $
+#      $NetBSD: sets.subr,v 1.177 2016/08/16 01:05:19 mrg Exp $
 #
 
 #
@@ -179,7 +179,7 @@
 # In each file, a record consists of a path and a System Package name,
 # separated by whitespace. E.g.,
 #
-#      # $NetBSD: sets.subr,v 1.176 2016/05/25 00:14:47 christos Exp $
+#      # $NetBSD: sets.subr,v 1.177 2016/08/16 01:05:19 mrg Exp $
 #      .                       base-sys-root   [keyword[,...]]
 #      ./altroot               base-sys-root
 #      ./bin                   base-sys-root
@@ -272,6 +272,7 @@
 #      binutils=<n>            <n> = value of ${HAVE_BINUTILS}
 #      gcc=<n>                 <n> = value of ${HAVE_GCC}
 #      gdb=<n>                 <n> = value of ${HAVE_GDB}
+#      xorg_server_ver=<n>     <n> = value of ${HAVE_XORG_SERVER_VER}
 #
 #      use_inet6               ${USE_INET6} != no
 #      use_kerberos            ${USE_KERBEROS} != no
@@ -348,6 +349,11 @@
                                if ("gdb" in wanted)
                                        wanted["gdb=" "'"${HAVE_GDB}"'"] = 1
                        }
+                       if ("'"${MKXORG_SERVER}"'" != "no") {
+                               if ("xorg_server_ver" in wanted) {
+                                       wanted["xorg_server_ver=" "'"${HAVE_XORG_SERVER_VER}"'"] = 1
+                               }
+                       }
                        if (("man" in wanted) && ("catpages" in wanted))
                                wanted[".cat"] = 1
                        if (("man" in wanted) && ("manpages" in wanted))