Thu Dec 3 13:45:11 2009 UTC ()
Put ${MKXORG} back to MKVARS.  It doesn't exist in bsd.own.mk but used here
to generate th set list keywork "xorg" in list_set_files().  Hopefully fix
some of reported build failures.


(uebayasi)
diff -r1.101 -r1.102 src/distrib/sets/sets.subr
cvs diff -r1.101 -r1.102 src/distrib/sets/sets.subr (expand / switch to unified diff)

--- src/distrib/sets/sets.subr 2009/12/02 17:56:14 1.101
+++ src/distrib/sets/sets.subr 2009/12/03 13:45:11 1.102
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: sets.subr,v 1.101 2009/12/02 17:56:14 uebayasi Exp $ 1# $NetBSD: sets.subr,v 1.102 2009/12/03 13:45:11 uebayasi Exp $
2# 2#
3 3
4# 4#
5# The following variables contain defaults for sets.subr functions and callers: 5# The following variables contain defaults for sets.subr functions and callers:
6# setsdir path to src/distrib/sets 6# setsdir path to src/distrib/sets
7# nlists list of base sets 7# nlists list of base sets
8# xlists list of x11 sets 8# xlists list of x11 sets
9# extlists list of extsrc sets 9# extlists list of extsrc sets
10# obsolete controls if obsolete files are selected instead 10# obsolete controls if obsolete files are selected instead
11# module if != "no", enable MODULE sets 11# module if != "no", enable MODULE sets
12# shlib shared library format (a.out, elf, or "") 12# shlib shared library format (a.out, elf, or "")
13# stlib static library format (a.out, elf) 13# stlib static library format (a.out, elf)
14# 14#
@@ -21,26 +21,27 @@ @@ -21,26 +21,27 @@
21# HAVE_GDB 21# HAVE_GDB
22# TOOLCHAIN_MISSING 22# TOOLCHAIN_MISSING
23# OBJECT_FMT 23# OBJECT_FMT
24# as well as: 24# as well as:
25# 25#
26 26
27# XXX don't hardcode 27# XXX don't hardcode
28MKEXTRAVARS="\ 28MKEXTRAVARS="\
29 EXTSRCS \ 29 EXTSRCS \
30 MKBFD \ 30 MKBFD \
31 MKCOMPAT \ 31 MKCOMPAT \
32 MKDYNAMICROOT \ 32 MKDYNAMICROOT \
33 MKMANPAGES \ 33 MKMANPAGES \
 34 MKXORG \
34 USE_INET6 \ 35 USE_INET6 \
35 USE_KERBEROS \ 36 USE_KERBEROS \
36 USE_LDAP \ 37 USE_LDAP \
37 USE_YP \ 38 USE_YP \
38 NETBSDSRCDIR \ 39 NETBSDSRCDIR \
39 MAKEVERBOSE \ 40 MAKEVERBOSE \
40" 41"
41# 42#
42# The following variables refer to tools that are used when building sets: 43# The following variables refer to tools that are used when building sets:
43# 44#
44: ${AWK:=awk} 45: ${AWK:=awk}
45: ${CKSUM:=cksum} 46: ${CKSUM:=cksum}
46: ${COMM:=comm} 47: ${COMM:=comm}
@@ -208,27 +209,27 @@ extlists="extbase extcomp extetc" @@ -208,27 +209,27 @@ extlists="extbase extcomp extetc"
208OSRELEASE=`${HOST_SH} ${NETBSDSRCDIR}/sys/conf/osrelease.sh` 209OSRELEASE=`${HOST_SH} ${NETBSDSRCDIR}/sys/conf/osrelease.sh`
209MODULEDIR="stand/${MACHINE}/${OSRELEASE}/modules" 210MODULEDIR="stand/${MACHINE}/${OSRELEASE}/modules"
210SUBST="s#@MODULEDIR@#${MODULEDIR}#g" 211SUBST="s#@MODULEDIR@#${MODULEDIR}#g"
211SUBST="${SUBST};s#@OSRELEASE@#${OSRELEASE}#g" 212SUBST="${SUBST};s#@OSRELEASE@#${OSRELEASE}#g"
212SUBST="${SUBST};s#@MACHINE@#${MACHINE}#g" 213SUBST="${SUBST};s#@MACHINE@#${MACHINE}#g"
213 214
214# 215#
215# list_set_files setfile [...] 216# list_set_files setfile [...]
216#  217#
217# Produce a packing list for setfile(s). 218# Produce a packing list for setfile(s).
218# In each file, a record consists of a path and a System Package name, 219# In each file, a record consists of a path and a System Package name,
219# separated by whitespace. E.g., 220# separated by whitespace. E.g.,
220# 221#
221# # $NetBSD: sets.subr,v 1.101 2009/12/02 17:56:14 uebayasi Exp $ 222# # $NetBSD: sets.subr,v 1.102 2009/12/03 13:45:11 uebayasi Exp $
222# . base-sys-root [keyword[,...]] 223# . base-sys-root [keyword[,...]]
223# ./altroot base-sys-root 224# ./altroot base-sys-root
224# ./bin base-sys-root 225# ./bin base-sys-root
225# ./bin/[ base-util-root 226# ./bin/[ base-util-root
226# ./bin/cat base-util-root 227# ./bin/cat base-util-root
227# [...] 228# [...]
228# 229#
229# A # in the first column marks a comment. 230# A # in the first column marks a comment.
230# 231#
231# If ${obsolete} != 0, only entries with an "obsolete" keyword will 232# If ${obsolete} != 0, only entries with an "obsolete" keyword will
232# be printed. All other keywords must be present. 233# be printed. All other keywords must be present.
233# 234#
234# The third field is an optional comma separated list of keywords to 235# The third field is an optional comma separated list of keywords to