===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/Makefile,v
retrieving revision 1.66
retrieving revision 1.125
diff -u -r1.66 -r1.125
--- src/usr.bin/Makefile	2000/07/19 23:43:27	1.66
+++ src/usr.bin/Makefile	2012/08/30 15:53:47	1.125
@@ -1,38 +1,40 @@
-#	$OpenBSD: Makefile,v 1.66 2000/07/19 23:43:27 mickey Exp $
+#	$OpenBSD: Makefile,v 1.125 2012/08/30 15:53:47 kettenis Exp $
 
 .include <bsd.own.mk>
 
-SUBDIR= apply apropos arch asa at aucat audioctl awk banner basename bdes \
-	biff cal calendar cap_mkdb cdio checknr 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 gprof \
-	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 mkstr mktemp modstat msgs nc netstat newsyslog nfsstat nice \
-	nohup oldrdist pagesize passwd paste patch pctr pr printenv printf quota \
-	rdist rdistd readlink renice rev rlogin rpcgen rpcinfo rs rsh rup \
-	ruptime rusers rwall rwho script sed shar showmount skey skeyaudit \
-	skeyinfo skeyinit sort split ssh su sup systat sudo tail talk tcopy \
-	tee telnet tftp tic time tip tn3270 top touch tput tr true tset tsort \
-	tty 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 xargs xinstall xlint xstr yacc yes
+SUBDIR= apply apropos ar arch asa asn1_compile at aucat audioctl awk banner \
+	basename bc bdes bgplg \
+	biff cal calendar cap_mkdb cdio chpass cmp col colrm \
+	column comm compile_et compress cpp crontab csplit ctags cut \
+	dc deroff diff diff3 dirname du 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 \
+	libtool lndir \
+	locate lock logger login logname look lorder \
+	m4 mail make man mandoc mesg mg \
+	midiplay mixerctl mkdep mklocale mkstr mktemp modstat nc netstat \
+	newsyslog \
+	nfsstat nice nm nohup oldrdist pagesize passwd paste patch pctr \
+	pkg-config pkill \
+	pr printenv printf quota radioctl ranlib rcs rdist rdistd \
+	readlink renice rev rpcgen rpcinfo rs rsh rup ruptime rusers rwall \
+	rwho sdiff script sed sendbug shar showmount skey \
+	skeyaudit skeyinfo skeyinit sort spell split sqlite3 ssh stat su systat \
+	sudo tail talk tcopy tcpbench tee telnet tftp tic time tip \
+	tmux top touch tput tr true tset tsort tty usbhidaction usbhidctl \
+	ul uname unexpand unifdef uniq units \
+	unvis users uudecode uuencode vacation vi vis vmstat w wall wc \
+	what whatis which who whois write x99token xargs xinstall \
+	xstr yacc yes
 
-.if (${YP} == "yes")
+.if (${YP:L} == "yes")
 SUBDIR+=ypcat ypmatch ypwhich
 .endif
 
-# Don't use the standard tool chain on the alpha, mips, powerpc, and hppa.
-.if (${MACHINE_ARCH} != "alpha" && ${MACHINE_ARCH} != "mips" && ${MACHINE_ARCH} != "powerpc" && ${MACHINE_ARCH} != "hppa")
-SUBDIR+= ar nm ranlib size strip strings
-.endif
-
-.if   make(clean) || make(cleandir) || make(obj)
-SUBDIR+= elf2ecoff elf2aout
-.elif ${MACHINE_ARCH} == "mips"
-SUBDIR+= elf2ecoff elf2aout
+.if (${ELF_TOOLCHAIN:L} == "no")
+SUBDIR+= strip strings
 .endif
 
 .include <bsd.subdir.mk>