===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/Makefile,v
retrieving revision 1.38
retrieving revision 1.99
diff -u -r1.38 -r1.99
--- src/usr.bin/Makefile	1997/02/09 23:58:12	1.38
+++ src/usr.bin/Makefile	2005/12/27 18:44:02	1.99
@@ -1,45 +1,40 @@
-#	$OpenBSD: Makefile,v 1.38 1997/02/09 23:58:12 millert Exp $
-#	$NetBSD: Makefile,v 1.62 1996/03/10 05:45:43 thorpej Exp $
-#	from: @(#)Makefile	5.8.1.1 (Berkeley) 5/8/91
+#	$OpenBSD: Makefile,v 1.99 2005/12/27 18:44:02 deraadt Exp $
 
 .include <bsd.own.mk>
 
-SUBDIR= apply apropos arch asa at aucat awk banner basename bdes biff cal \
-	calendar cap_mkdb cdio checknr chflags chpass cksum cmp col colcrt \
-	colrm column comm compile_et compress cpp crontab ctags cut dirname \
-	du elf2olf encrypt env error expand false file file2c find finger fmt \
-	fold from fsplit fstat ftp gencat getconf getopt head hexdump id \
-	indent \
-	info_mkdb ipcrm ipcs join jot kdump ktrace lam last lastcomm leave \
-	less lex lndir locate lock logger login.millert logname look lorder m4 \
-	machine mail make man mesg mk_cmds mkdep mkfifo mkstr mktemp modstat \
-	msgs nc netstat newsyslog \
-	nfsstat nice nohup oldrdist pagesize passwd paste patch pr printenv \
-	printf quota rdist rdistd renice rev rlogin rpcgen rpcinfo rs \
-	rsh rup ruptime rusers rwall rwho \
-	script sed shar showmount skey skeyinit soelim sort split \
-	su sup systat tail talk tcopy tee telnet tftp time \
-	tip tn3270 touch tput tr true tset tsort tty ul uname unexpand \
-	unifdef uniq units unvis users uudecode uuencode \
-	vacation vgrind vi vim vis vmstat w wall wc what whatis whereis \
-	which who whois window write \
-	xargs xinstall xlint xstr yacc yes \
-	gprof
+SUBDIR= apply apropos ar arch asa asn1_compile at aucat audioctl awk banner \
+	basename bc bdes \
+	biff cal calendar cap_mkdb cdio checknr chpass cmp col \
+	colcrt colrm column comm compile_et compress cpp crontab ctags cut \
+	dc deroff diff diff3 dirname du elf2olf encrypt env expand false file \
+	file2c find fgen finger fmt fold from fsplit fstat ftp gencat getcap \
+	getconf getent getopt gprof grep gzsig head hexdump id indent \
+	infocmp ipcrm ipcs \
+	join jot kdump keynote ktrace lam last lastcomm leave less lex lndir \
+	locate lock logger login logname look lorder m4 mail make man mesg mg \
+	midiplay mixerctl mkdep mklocale mkstr mktemp modstat msgs nc netstat \
+	newsyslog \
+	nfsstat nice nm nohup oldrdist pagesize passwd paste patch pctr pkill \
+	pmdb pr printenv printf quota radioctl ranlib rdist rdistd readlink \
+	renice rev rpcgen rpcinfo rs rsh rup ruptime rusers rwall rwho \
+	sdiff script sectok sed shar showmount skey \
+	skeyaudit skeyinfo skeyinit sort spell split ssh stat su sup systat \
+	sudo tail talk tcopy tee telnet tftp tic time tip tn3270 top touch \
+	tput tr true tset tsort tty usbhidaction usbhidctl ul uname \
+	unexpand unifdef uniq units \
+	unvis users uudecode uuencode vacation vgrind vi vis vmstat w wall wc \
+	what whatis which who whois window write x99token xargs xinstall xlint \
+	xstr yacc yes
 
-.if defined(YP)
+.if (${YP:L} == "yes")
 SUBDIR+=ypcat ypmatch ypwhich
 .endif
 
-# Don't use the standard tool chain on the alpha or mips.
-.if (${MACHINE_ARCH} != "alpha" && ${MACHINE_ARCH} != "mips" && ${MACHINE_ARCH} != "powerpc")
-SUBDIR+= ar nm ranlib size strip strings
+.if (${ELF_TOOLCHAIN:L} == "no")
+SUBDIR+= strip strings
 .endif
 
 .if   make(clean) || make(cleandir) || make(obj)
-SUBDIR+= pctr elf2ecoff elf2aout
-.elif ${MACHINE_ARCH} == "i386"
-SUBDIR+= pctr
-.elif ${MACHINE_ARCH} == "mips"
 SUBDIR+= elf2ecoff elf2aout
 .endif