Module Name: src
Committed By: mrg
Date: Tue Aug 16 01:05:19 UTC 2016
Modified Files:
src/distrib/sets: Makefile mkvars.mk sets.subr
Log Message:
support xorg_server_ver define, currently settable to 110 (1.10.x)
or 118 (1.18.x).
To generate a diff of this commit:
cvs rdiff -u -r1.102 -r1.103 src/distrib/sets/Makefile
cvs rdiff -u -r1.28 -r1.29 src/distrib/sets/mkvars.mk
cvs rdiff -u -r1.176 -r1.177 src/distrib/sets/sets.subr
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/Makefile
diff -u src/distrib/sets/Makefile:1.102 src/distrib/sets/Makefile:1.103
--- src/distrib/sets/Makefile:1.102 Wed May 25 00:07:20 2016
+++ src/distrib/sets/Makefile Tue Aug 16 01:05:19 2016
@@ -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 @@ MAKESRCTARS_FLAGS+= -q
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}
Index: src/distrib/sets/mkvars.mk
diff -u src/distrib/sets/mkvars.mk:1.28 src/distrib/sets/mkvars.mk:1.29
--- src/distrib/sets/mkvars.mk:1.28 Wed May 25 00:14:47 2016
+++ src/distrib/sets/mkvars.mk Tue Aug 16 01:05:19 2016
@@ -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 @@ MKEXTRAVARS= \
MACHINE_CPU \
HAVE_GCC \
HAVE_GDB \
+ HAVE_XORG_SERVER_VER \
HAVE_BINUTILS \
HAVE_LIBGCC_EH \
HAVE_SSP \
Index: src/distrib/sets/sets.subr
diff -u src/distrib/sets/sets.subr:1.176 src/distrib/sets/sets.subr:1.177
--- src/distrib/sets/sets.subr:1.176 Wed May 25 00:14:47 2016
+++ src/distrib/sets/sets.subr Tue Aug 16 01:05:19 2016
@@ -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 @@ SUBST="${SUBST};s#@MACHINE@#${MACHINE}#g
# 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 @@ SUBST="${SUBST};s#@MACHINE@#${MACHINE}#g
# 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 @@ list_set_files()
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))
