Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. =================================================================== RCS file: /ftp/cvs/cvsroot/src/distrib/sets/sets.subr,v rcsdiff: /ftp/cvs/cvsroot/src/distrib/sets/sets.subr,v: warning: Unknown phrases like `commitid ...;' are present. retrieving revision 1.169 retrieving revision 1.170 diff -u -p -r1.169 -r1.170 --- src/distrib/sets/sets.subr 2015/06/27 15:41:26 1.169 +++ src/distrib/sets/sets.subr 2015/06/27 16:21:07 1.170 @@ -1,4 +1,4 @@ -# $NetBSD: sets.subr,v 1.169 2015/06/27 15:41:26 matt Exp $ +# $NetBSD: sets.subr,v 1.170 2015/06/27 16:21:07 matt 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.169 2015/06/27 15:41:26 matt Exp $ +# # $NetBSD: sets.subr,v 1.170 2015/06/27 16:21:07 matt Exp $ # . base-sys-root [keyword[,...]] # ./altroot base-sys-root # ./bin base-sys-root @@ -303,6 +303,8 @@ list_set_files() ignoredkeywords["compatfile"] = 1 ignoredkeywords["compattestdir"] = 1 ignoredkeywords["compattestfile"] = 1 + ignoredkeywords["compatx11dir"] = 1 + ignoredkeywords["compatx11file"] = 1 for (vi in needvars) { nv = needvars[vi] kw = tolower(nv) @@ -325,6 +327,11 @@ list_set_files() compatdirkeywords["compattestdir"] = 1 compatfilekeywords["compattestfile"] = 1 } + if (wanted["compatx11"]) { + doingcompatx11 = 1; + compatdirkeywords["compatx11dir"] = 1 + compatfilekeywords["compatx11file"] = 1 + } } if (("kmod" in wanted) && ("compatmodules" in wanted)) {