Module Name:	src
Committed By:	lukem
Date:		Mon Dec 29 03:13:29 UTC 2003

Modified Files:
	src/distrib/sets: Makefile checkflist listpkgs makeflist makeobsolete
	    makeplist maketars sets.subr syspkgdeps
	src/distrib/sets/lists/base: gcc.mi md.acorn26 md.alpha md.amd64
	    md.amiga md.bebox md.cats md.hpcarm md.i386 md.macppc md.netwinder
	    md.news68k md.newsmips md.pmax md.shark md.sparc md.sparc64 md.sun2
	    md.sun3 md.vax md.x68k mi shl.elf shl.mi
	src/distrib/sets/lists/comp: ad.arm ad.m68k ad.mips ad.powerpc gcc.mi
	    md.acorn26 md.acorn32 md.algor md.alpha md.amd64 md.amiga md.arc
	    md.atari md.bebox md.cats md.cesfic md.cobalt md.dreamcast
	    md.evbmips md.evbppc md.evbsh3 md.hp300 md.hpcmips md.hpcsh md.i386
	    md.ibmnws md.luna68k md.mac68k md.macppc md.mipsco md.mmeye
	    md.mvme68k md.mvmeppc md.news68k md.newsmips md.next68k md.ofppc
	    md.pc532 md.playstation2 md.pmax md.pmppc md.prep md.sandpoint
	    md.sbmips md.sgimips md.sparc md.sparc64 md.sun2 md.sun3 md.vax
	    md.x68k mi shl.elf shl.mi
	src/distrib/sets/lists/etc: mi
	src/distrib/sets/lists/games: mi
	src/distrib/sets/lists/man: mi
	src/distrib/sets/lists/misc: mi
	src/distrib/sets/lists/text: mi
	src/distrib/sets/lists/xbase3: mi
	src/distrib/sets/lists/xbase4: mi
	src/distrib/sets/lists/xcomp3: mi
	src/distrib/sets/lists/xcomp4: mi
	src/distrib/sets/lists/xserver3: mi
Added Files:
	src/distrib/sets/lists/base: md.sandpoint
Removed Files:
	src/distrib/sets: sets.defaults
	src/distrib/sets/lists/base: krb.mi krb.shl.elf krb.shl.mi krb4.mi
	    krb4.shl.elf krb4.shl.mi obsolete.acorn26 obsolete.alpha
	    obsolete.amd64 obsolete.amiga obsolete.bebox obsolete.cats
	    obsolete.gcc obsolete.hpcarm obsolete.i386 obsolete.macppc
	    obsolete.mi obsolete.netwinder obsolete.news68k obsolete.newsmips
	    obsolete.pmax obsolete.sandpoint obsolete.shark obsolete.sparc
	    obsolete.sparc64 obsolete.sun2 obsolete.sun3 obsolete.vax
	    obsolete.x68k
	src/distrib/sets/lists/comp: krb.mi krb.shl.elf krb.shl.mi krb4.lint.mi
	    krb4.mi krb4.shl.elf krb4.shl.mi lint.mi obsolete.acorn26
	    obsolete.acorn32 obsolete.algor obsolete.alpha obsolete.amd64
	    obsolete.amiga obsolete.arc obsolete.arm obsolete.atari
	    obsolete.bebox obsolete.cats obsolete.cesfic obsolete.cobalt
	    obsolete.dreamcast obsolete.evbmips obsolete.evbppc obsolete.evbsh3
	    obsolete.gcc obsolete.hp300 obsolete.hpcmips obsolete.hpcsh
	    obsolete.i386 obsolete.ibmnws obsolete.luna68k obsolete.m68k
	    obsolete.mac68k obsolete.macppc obsolete.mi obsolete.mips
	    obsolete.mipsco obsolete.mmeye obsolete.mvme68k obsolete.mvmeppc
	    obsolete.news68k obsolete.newsmips obsolete.next68k obsolete.ofppc
	    obsolete.pc532 obsolete.playstation2 obsolete.pmax obsolete.pmppc
	    obsolete.powerpc obsolete.prep obsolete.sandpoint obsolete.sbmips
	    obsolete.sgimips obsolete.sparc obsolete.sparc64 obsolete.sun2
	    obsolete.sun3 obsolete.vax obsolete.x68k
	src/distrib/sets/lists/etc: obsolete.mi
	src/distrib/sets/lists/games: obsolete.mi
	src/distrib/sets/lists/man: krb.mi krb4.mi obsolete.mi
	src/distrib/sets/lists/misc: krb.mi obsolete.mi
	src/distrib/sets/lists/text: obsolete.mi
	src/distrib/sets/lists/xbase3: obsolete.mi
	src/distrib/sets/lists/xbase4: obsolete.mi
	src/distrib/sets/lists/xcomp3: obsolete.mi
	src/distrib/sets/lists/xcomp4: obsolete.mi
	src/distrib/sets/lists/xserver3: obsolete.alpha obsolete.mi

Log Message:
Significant overhaul of how the sets are used:

* Add an optional third field to the sets file which is a list of
  comma separated keywords that control if the line is printed.
  Currently supported keywords
	kerberos4	${MKKERBEROS4} != no
	kerberos	${MKKERBEROS} != no
	lint		${MKLINT} != no
	obsolete	${obsolete} != 0.
			In this case, non obsolete files are not printed.
  (This will allow future support for builds with variables such as
  MKHESIOD and MKYP set to "no".)

* Use sh(1)'s getopts where appropriate, and otherwise cleanup the
  various scripts.

* Move defaults for sets.subr from sets.defaults into sets.subr.
  Move replicated code for determining stuff such as shlibs type
  from various scripts into sets.subr.

* Merge the obsolete.*, krb.*, krb4.* and lint.* into the appropriate
  main lists with the relevant third field keyword(s).


To generate a diff of this commit:
cvs rdiff -r1.37 -r1.38 src/distrib/sets/Makefile
cvs rdiff -r1.23 -r1.24 src/distrib/sets/checkflist
cvs rdiff -r1.6 -r1.7 src/distrib/sets/listpkgs
cvs rdiff -r1.66 -r1.67 src/distrib/sets/makeflist
cvs rdiff -r1.21 -r1.22 src/distrib/sets/makeobsolete
cvs rdiff -r1.11 -r1.12 src/distrib/sets/makeplist
cvs rdiff -r1.46 -r1.47 src/distrib/sets/maketars
cvs rdiff -r1.5 -r0 src/distrib/sets/sets.defaults
cvs rdiff -r1.8 -r1.9 src/distrib/sets/sets.subr
cvs rdiff -r1.2 -r1.3 src/distrib/sets/syspkgdeps
cvs rdiff -r1.1 -r1.2 src/distrib/sets/lists/base/gcc.mi \
    src/distrib/sets/lists/base/md.cats
cvs rdiff -r1.1 -r0 src/distrib/sets/lists/base/krb.mi \
    src/distrib/sets/lists/base/krb.shl.elf \
    src/distrib/sets/lists/base/krb.shl.mi \
    src/distrib/sets/lists/base/krb4.mi \
    src/distrib/sets/lists/base/krb4.shl.elf \
    src/distrib/sets/lists/base/krb4.shl.mi \
    src/distrib/sets/lists/base/obsolete.gcc \
    src/distrib/sets/lists/base/obsolete.shark
cvs rdiff -r1.2 -r1.3 src/distrib/sets/lists/base/md.acorn26
cvs rdiff -r1.30 -r1.31 src/distrib/sets/lists/base/md.alpha
cvs rdiff -r1.5 -r1.6 src/distrib/sets/lists/base/md.amd64 \
    src/distrib/sets/lists/base/md.hpcarm \
    src/distrib/sets/lists/base/md.netwinder
cvs rdiff -r1.50 -r1.51 src/distrib/sets/lists/base/md.amiga
cvs rdiff -r1.10 -r1.11 src/distrib/sets/lists/base/md.bebox
cvs rdiff -r1.104 -r1.105 src/distrib/sets/lists/base/md.i386
cvs rdiff -r1.20 -r1.21 src/distrib/sets/lists/base/md.macppc
cvs rdiff -r1.3 -r1.4 src/distrib/sets/lists/base/md.news68k \
    src/distrib/sets/lists/base/md.newsmips \
    src/distrib/sets/lists/base/md.shark
cvs rdiff -r1.39 -r1.40 src/distrib/sets/lists/base/md.pmax
cvs rdiff -r0 -r1.3 src/distrib/sets/lists/base/md.sandpoint
cvs rdiff -r1.69 -r1.70 src/distrib/sets/lists/base/md.sparc
cvs rdiff -r1.15 -r1.16 src/distrib/sets/lists/base/md.sparc64
cvs rdiff -r1.4 -r1.5 src/distrib/sets/lists/base/md.sun2
cvs rdiff -r1.41 -r1.42 src/distrib/sets/lists/base/md.sun3
cvs rdiff -r1.23 -r1.24 src/distrib/sets/lists/base/md.vax
cvs rdiff -r1.37 -r1.38 src/distrib/sets/lists/base/md.x68k
cvs rdiff -r1.445 -r1.446 src/distrib/sets/lists/base/mi
cvs rdiff -r1.2 -r0 src/distrib/sets/lists/base/obsolete.acorn26 \
    src/distrib/sets/lists/base/obsolete.bebox \
    src/distrib/sets/lists/base/obsolete.cats \
    src/distrib/sets/lists/base/obsolete.macppc \
    src/distrib/sets/lists/base/obsolete.news68k \
    src/distrib/sets/lists/base/obsolete.newsmips \
    src/distrib/sets/lists/base/obsolete.sandpoint \
    src/distrib/sets/lists/base/obsolete.sparc64 \
    src/distrib/sets/lists/base/obsolete.sun2
cvs rdiff -r1.6 -r0 src/distrib/sets/lists/base/obsolete.alpha \
    src/distrib/sets/lists/base/obsolete.vax
cvs rdiff -r1.3 -r0 src/distrib/sets/lists/base/obsolete.amd64 \
    src/distrib/sets/lists/base/obsolete.hpcarm \
    src/distrib/sets/lists/base/obsolete.netwinder
cvs rdiff -r1.5 -r0 src/distrib/sets/lists/base/obsolete.amiga \
    src/distrib/sets/lists/base/obsolete.pmax
cvs rdiff -r1.15 -r0 src/distrib/sets/lists/base/obsolete.i386
cvs rdiff -r1.78 -r0 src/distrib/sets/lists/base/obsolete.mi
cvs rdiff -r1.7 -r0 src/distrib/sets/lists/base/obsolete.sparc
cvs rdiff -r1.4 -r0 src/distrib/sets/lists/base/obsolete.sun3 \
    src/distrib/sets/lists/base/obsolete.x68k
cvs rdiff -r1.82 -r1.83 src/distrib/sets/lists/base/shl.elf
cvs rdiff -r1.248 -r1.249 src/distrib/sets/lists/base/shl.mi
cvs rdiff -r1.17 -r1.18 src/distrib/sets/lists/comp/ad.arm
cvs rdiff -r1.32 -r1.33 src/distrib/sets/lists/comp/ad.m68k
cvs rdiff -r1.28 -r1.29 src/distrib/sets/lists/comp/ad.mips
cvs rdiff -r1.35 -r1.36 src/distrib/sets/lists/comp/ad.powerpc
cvs rdiff -r1.3 -r1.4 src/distrib/sets/lists/comp/gcc.mi
cvs rdiff -r1.1 -r0 src/distrib/sets/lists/comp/krb.mi \
    src/distrib/sets/lists/comp/krb.shl.elf \
    src/distrib/sets/lists/comp/krb.shl.mi \
    src/distrib/sets/lists/comp/krb4.lint.mi \
    src/distrib/sets/lists/comp/krb4.mi \
    src/distrib/sets/lists/comp/krb4.shl.elf \
    src/distrib/sets/lists/comp/krb4.shl.mi \
    src/distrib/sets/lists/comp/obsolete.amd64 \
    src/distrib/sets/lists/comp/obsolete.arc \
    src/distrib/sets/lists/comp/obsolete.cesfic \
    src/distrib/sets/lists/comp/obsolete.ibmnws \
    src/distrib/sets/lists/comp/obsolete.playstation2 \
    src/distrib/sets/lists/comp/obsolete.sbmips
cvs rdiff -r1.16 -r0 src/distrib/sets/lists/comp/lint.mi
cvs rdiff -r1.5 -r1.6 src/distrib/sets/lists/comp/md.acorn26 \
    src/distrib/sets/lists/comp/md.pmppc \
    src/distrib/sets/lists/comp/md.sbmips
cvs rdiff -r1.12 -r1.13 src/distrib/sets/lists/comp/md.acorn32 \
    src/distrib/sets/lists/comp/md.luna68k
cvs rdiff -r1.6 -r1.7 src/distrib/sets/lists/comp/md.algor \
    src/distrib/sets/lists/comp/md.cats \
    src/distrib/sets/lists/comp/md.dreamcast \
    src/distrib/sets/lists/comp/md.evbmips \
    src/distrib/sets/lists/comp/md.mvmeppc \
    src/distrib/sets/lists/comp/md.sgimips
cvs rdiff -r1.44 -r1.45 src/distrib/sets/lists/comp/md.alpha \
    src/distrib/sets/lists/comp/md.x68k
cvs rdiff -r1.8 -r1.9 src/distrib/sets/lists/comp/md.amd64 \
    src/distrib/sets/lists/comp/md.sandpoint
cvs rdiff -r1.49 -r1.50 src/distrib/sets/lists/comp/md.amiga \
    src/distrib/sets/lists/comp/md.hp300
cvs rdiff -r1.15 -r1.16 src/distrib/sets/lists/comp/md.arc
cvs rdiff -r1.48 -r1.49 src/distrib/sets/lists/comp/md.atari
cvs rdiff -r1.23 -r1.24 src/distrib/sets/lists/comp/md.bebox
cvs rdiff -r1.2 -r1.3 src/distrib/sets/lists/comp/md.cesfic \
    src/distrib/sets/lists/comp/md.ibmnws
cvs rdiff -r1.14 -r1.15 src/distrib/sets/lists/comp/md.cobalt
cvs rdiff -r1.4 -r1.5 src/distrib/sets/lists/comp/md.evbppc \
    src/distrib/sets/lists/comp/md.ofppc \
    src/distrib/sets/lists/comp/md.playstation2
cvs rdiff -r1.19 -r1.20 src/distrib/sets/lists/comp/md.evbsh3 \
    src/distrib/sets/lists/comp/md.newsmips
cvs rdiff -r1.18 -r1.19 src/distrib/sets/lists/comp/md.hpcmips \
    src/distrib/sets/lists/comp/md.mmeye \
    src/distrib/sets/lists/comp/md.news68k
cvs rdiff -r1.13 -r1.14 src/distrib/sets/lists/comp/md.hpcsh
cvs rdiff -r1.77 -r1.78 src/distrib/sets/lists/comp/md.i386
cvs rdiff -r1.50 -r1.51 src/distrib/sets/lists/comp/md.mac68k
cvs rdiff -r1.26 -r1.27 src/distrib/sets/lists/comp/md.macppc \
    src/distrib/sets/lists/comp/md.mvme68k src/distrib/sets/lists/comp/md.vax
cvs rdiff -r1.10 -r1.11 src/distrib/sets/lists/comp/md.mipsco \
    src/distrib/sets/lists/comp/md.sun2
cvs rdiff -r1.25 -r1.26 src/distrib/sets/lists/comp/md.next68k
cvs rdiff -r1.41 -r1.42 src/distrib/sets/lists/comp/md.pc532
cvs rdiff -r1.51 -r1.52 src/distrib/sets/lists/comp/md.pmax
cvs rdiff -r1.16 -r1.17 src/distrib/sets/lists/comp/md.prep
cvs rdiff -r1.59 -r1.60 src/distrib/sets/lists/comp/md.sparc
cvs rdiff -r1.24 -r1.25 src/distrib/sets/lists/comp/md.sparc64
cvs rdiff -r1.52 -r1.53 src/distrib/sets/lists/comp/md.sun3
cvs rdiff -r1.648 -r1.649 src/distrib/sets/lists/comp/mi
cvs rdiff -r1.2 -r0 src/distrib/sets/lists/comp/obsolete.acorn26 \
    src/distrib/sets/lists/comp/obsolete.acorn32 \
    src/distrib/sets/lists/comp/obsolete.cats \
    src/distrib/sets/lists/comp/obsolete.evbppc \
    src/distrib/sets/lists/comp/obsolete.gcc \
    src/distrib/sets/lists/comp/obsolete.m68k \
    src/distrib/sets/lists/comp/obsolete.mips \
    src/distrib/sets/lists/comp/obsolete.mvmeppc \
    src/distrib/sets/lists/comp/obsolete.ofppc \
    src/distrib/sets/lists/comp/obsolete.pc532 \
    src/distrib/sets/lists/comp/obsolete.pmppc
cvs rdiff -r1.3 -r0 src/distrib/sets/lists/comp/obsolete.algor \
    src/distrib/sets/lists/comp/obsolete.atari \
    src/distrib/sets/lists/comp/obsolete.cobalt \
    src/distrib/sets/lists/comp/obsolete.evbmips \
    src/distrib/sets/lists/comp/obsolete.hp300 \
    src/distrib/sets/lists/comp/obsolete.hpcmips \
    src/distrib/sets/lists/comp/obsolete.luna68k \
    src/distrib/sets/lists/comp/obsolete.mac68k \
    src/distrib/sets/lists/comp/obsolete.mipsco \
    src/distrib/sets/lists/comp/obsolete.mvme68k \
    src/distrib/sets/lists/comp/obsolete.sgimips \
    src/distrib/sets/lists/comp/obsolete.vax
cvs rdiff -r1.9 -r0 src/distrib/sets/lists/comp/obsolete.alpha
cvs rdiff -r1.6 -r0 src/distrib/sets/lists/comp/obsolete.amiga \
    src/distrib/sets/lists/comp/obsolete.bebox \
    src/distrib/sets/lists/comp/obsolete.evbsh3 \
    src/distrib/sets/lists/comp/obsolete.hpcsh \
    src/distrib/sets/lists/comp/obsolete.mmeye \
    src/distrib/sets/lists/comp/obsolete.sparc
cvs rdiff -r1.4 -r0 src/distrib/sets/lists/comp/obsolete.arm \
    src/distrib/sets/lists/comp/obsolete.dreamcast \
    src/distrib/sets/lists/comp/obsolete.news68k \
    src/distrib/sets/lists/comp/obsolete.next68k \
    src/distrib/sets/lists/comp/obsolete.sandpoint \
    src/distrib/sets/lists/comp/obsolete.sun3 \
    src/distrib/sets/lists/comp/obsolete.x68k
cvs rdiff -r1.7 -r0 src/distrib/sets/lists/comp/obsolete.i386 \
    src/distrib/sets/lists/comp/obsolete.pmax
cvs rdiff -r1.5 -r0 src/distrib/sets/lists/comp/obsolete.macppc \
    src/distrib/sets/lists/comp/obsolete.newsmips \
    src/distrib/sets/lists/comp/obsolete.powerpc \
    src/distrib/sets/lists/comp/obsolete.prep \
    src/distrib/sets/lists/comp/obsolete.sparc64 \
    src/distrib/sets/lists/comp/obsolete.sun2
cvs rdiff -r1.104 -r0 src/distrib/sets/lists/comp/obsolete.mi
cvs rdiff -r1.46 -r1.47 src/distrib/sets/lists/comp/shl.elf
cvs rdiff -r1.36 -r1.37 src/distrib/sets/lists/comp/shl.mi
cvs rdiff -r1.127 -r1.128 src/distrib/sets/lists/etc/mi
cvs rdiff -r1.14 -r0 src/distrib/sets/lists/etc/obsolete.mi
cvs rdiff -r1.28 -r1.29 src/distrib/sets/lists/games/mi
cvs rdiff -r1.7 -r0 src/distrib/sets/lists/games/obsolete.mi
cvs rdiff -r1.1 -r0 src/distrib/sets/lists/man/krb.mi \
    src/distrib/sets/lists/man/krb4.mi
cvs rdiff -r1.637 -r1.638 src/distrib/sets/lists/man/mi
cvs rdiff -r1.81 -r0 src/distrib/sets/lists/man/obsolete.mi
cvs rdiff -r1.1 -r0 src/distrib/sets/lists/misc/krb.mi
cvs rdiff -r1.91 -r1.92 src/distrib/sets/lists/misc/mi
cvs rdiff -r1.22 -r0 src/distrib/sets/lists/misc/obsolete.mi
cvs rdiff -r1.13 -r1.14 src/distrib/sets/lists/text/mi
cvs rdiff -r1.4 -r0 src/distrib/sets/lists/text/obsolete.mi
cvs rdiff -r1.3 -r1.4 src/distrib/sets/lists/xbase3/mi
cvs rdiff -r1.1 -r0 src/distrib/sets/lists/xbase3/obsolete.mi
cvs rdiff -r1.10 -r1.11 src/distrib/sets/lists/xbase4/mi
cvs rdiff -r1.2 -r0 src/distrib/sets/lists/xbase4/obsolete.mi
cvs rdiff -r1.3 -r1.4 src/distrib/sets/lists/xcomp3/mi
cvs rdiff -r1.1 -r0 src/distrib/sets/lists/xcomp3/obsolete.mi
cvs rdiff -r1.5 -r1.6 src/distrib/sets/lists/xcomp4/mi
cvs rdiff -r1.2 -r0 src/distrib/sets/lists/xcomp4/obsolete.mi
cvs rdiff -r1.2 -r1.3 src/distrib/sets/lists/xserver3/mi
cvs rdiff -r1.1 -r0 src/distrib/sets/lists/xserver3/obsolete.alpha \
    src/distrib/sets/lists/xserver3/obsolete.mi

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.