Wed Dec 2 14:11:20 2009 UTC ()
Define lists of MK* variable names as _MKVARS.yes and _MKVARS.no.  They're
referred to by syspkg.


(uebayasi)
diff -r1.599 -r1.600 src/share/mk/bsd.own.mk
cvs diff -r1.599 -r1.600 src/share/mk/bsd.own.mk (expand / switch to unified diff)

--- src/share/mk/bsd.own.mk 2009/12/01 09:09:40 1.599
+++ src/share/mk/bsd.own.mk 2009/12/02 14:11:20 1.600
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: bsd.own.mk,v 1.599 2009/12/01 09:09:40 uebayasi Exp $ 1# $NetBSD: bsd.own.mk,v 1.600 2009/12/02 14:11:20 uebayasi Exp $
2 2
3.if !defined(_BSD_OWN_MK_) 3.if !defined(_BSD_OWN_MK_)
4_BSD_OWN_MK_=1 4_BSD_OWN_MK_=1
5 5
6MAKECONF?= /etc/mk.conf 6MAKECONF?= /etc/mk.conf
7.-include "${MAKECONF}" 7.-include "${MAKECONF}"
8 8
9# 9#
10# CPU model, derived from MACHINE_ARCH 10# CPU model, derived from MACHINE_ARCH
11# 11#
12MACHINE_CPU= ${MACHINE_ARCH:C/mipse[bl]/mips/:C/mips64e[bl]/mips/:C/sh3e[bl]/sh3/:S/m68000/m68k/:S/armeb/arm/} 12MACHINE_CPU= ${MACHINE_ARCH:C/mipse[bl]/mips/:C/mips64e[bl]/mips/:C/sh3e[bl]/sh3/:S/m68000/m68k/:S/armeb/arm/}
13 13
14# 14#
@@ -655,60 +655,62 @@ MKCOMPAT?= yes @@ -655,60 +655,62 @@ MKCOMPAT?= yes
655MKCOMPAT:= no 655MKCOMPAT:= no
656.endif 656.endif
657 657
658# 658#
659# MK* backward compatibility. 659# MK* backward compatibility.
660# 660#
661.if defined(MKBFD) 661.if defined(MKBFD)
662MKBINUTILS?= ${MKBFD} 662MKBINUTILS?= ${MKBFD}
663.endif 663.endif
664 664
665# 665#
666# MK* options which default to "yes". 666# MK* options which default to "yes".
667# 667#
668.for var in \ 668_MKVARS.yes= \
669 MKATF \ 669 MKATF \
670 MKBINUTILS \ 670 MKBINUTILS \
671 MKCATPAGES MKCRYPTO MKCOMPLEX MKCVS \ 671 MKCATPAGES MKCRYPTO MKCOMPLEX MKCVS \
672 MKDOC \ 672 MKDOC \
673 MKGCC MKGCCCMDS MKGDB \ 673 MKGCC MKGCCCMDS MKGDB \
674 MKHESIOD MKHTML \ 674 MKHESIOD MKHTML \
675 MKIEEEFP MKINET6 MKINFO MKIPFILTER MKISCSI \ 675 MKIEEEFP MKINET6 MKINFO MKIPFILTER MKISCSI \
676 MKKERBEROS \ 676 MKKERBEROS \
677 MKKMOD \ 677 MKKMOD \
678 MKLDAP MKLINKLIB MKLINT \ 678 MKLDAP MKLINKLIB MKLINT \
679 MKMAN \ 679 MKMAN \
680 MKMDNS \ 680 MKMDNS \
681 MKNLS \ 681 MKNLS \
682 MKOBJ \ 682 MKOBJ \
683 MKPAM \ 683 MKPAM \
684 MKPF MKPIC MKPICINSTALL MKPICLIB MKPOSTFIX MKPROFILE \ 684 MKPF MKPIC MKPICINSTALL MKPICLIB MKPOSTFIX MKPROFILE \
685 MKSHARE MKSKEY MKSTATICLIB \ 685 MKSHARE MKSKEY MKSTATICLIB \
686 MKX11FONTS \ 686 MKX11FONTS \
687 MKYP 687 MKYP
 688.for var in ${_MKVARS.yes}
688${var}?= yes 689${var}?= yes
689.endfor 690.endfor
690 691
691# 692#
692# MK* options which default to "no". 693# MK* options which default to "no".
693# 694#
694.for var in \ 695_MKVARS.no= \
695 MKCRYPTO_IDEA MKCRYPTO_MDC2 MKCRYPTO_RC5 MKDEBUG MKDEBUGLIB \ 696 MKCRYPTO_IDEA MKCRYPTO_MDC2 MKCRYPTO_RC5 MKDEBUG MKDEBUGLIB \
696 MKEXTSRC \ 697 MKEXTSRC \
697 MKLVM \ 698 MKLVM \
698 MKMANDOC MKMANZ MKOBJDIRS \ 699 MKMANDOC MKMANZ MKOBJDIRS \
699 MKPCC MKPCCCMDS \ 700 MKPCC MKPCCCMDS \
700 MKSOFTFLOAT MKSTRIPIDENT \ 701 MKSOFTFLOAT MKSTRIPIDENT \
701 MKUNPRIVED MKUPDATE MKX11  702 MKUNPRIVED MKUPDATE MKX11
 703.for var in ${_MKVARS.no}
702${var}?=no 704${var}?=no
703.endfor 705.endfor
704 706
705# 707#
706# Do we default to XFree86 or Xorg for this platform? 708# Do we default to XFree86 or Xorg for this platform?
707# 709#
708.if ${MACHINE} == "alpha" || ${MACHINE} == "acorn32" || \ 710.if ${MACHINE} == "alpha" || ${MACHINE} == "acorn32" || \
709 ${MACHINE} == "amiga" || ${MACHINE} == "cats" || \ 711 ${MACHINE} == "amiga" || ${MACHINE} == "cats" || \
710 ${MACHINE} == "dreamcast" || ${MACHINE} == "ews4800mips" || \ 712 ${MACHINE} == "dreamcast" || ${MACHINE} == "ews4800mips" || \
711 ${MACHINE} == "hpcarm" || ${MACHINE} == "hpcmips" || \ 713 ${MACHINE} == "hpcarm" || ${MACHINE} == "hpcmips" || \
712 ${MACHINE} == "hpcsh" || ${MACHINE} == "mac68k" || \ 714 ${MACHINE} == "hpcsh" || ${MACHINE} == "mac68k" || \
713 ${MACHINE} == "netwinder" || ${MACHINE} == "newsmips" || \ 715 ${MACHINE} == "netwinder" || ${MACHINE} == "newsmips" || \
714 ${MACHINE} == "ofppc" || ${MACHINE} == "pmax" || \ 716 ${MACHINE} == "ofppc" || ${MACHINE} == "pmax" || \