===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/Makefile,v
retrieving revision 1.64
retrieving revision 1.147
diff -u -r1.64 -r1.147
--- src/usr.bin/Makefile	2000/05/28 18:39:42	1.64
+++ src/usr.bin/Makefile	2014/10/07 19:37:04	1.147
@@ -1,38 +1,37 @@
-#	$OpenBSD: Makefile,v 1.64 2000/05/28 18:39:42 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.147 2014/10/07 19:37:04 tedu Exp $
 
 .include <bsd.own.mk>
 
-SUBDIR= apply apropos arch asa at aucat audioctl 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 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 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 arch at aucat audioctl awk banner \
+	basename bc bgplg \
+	biff cal calendar cap_mkdb cdio chpass cmp col colrm \
+	column comm compress cpp crontab csplit ctags cu cut \
+	dc deroff diff diff3 dirname du encrypt env expand false file \
+	find fgen finger fmt fold from fstat ftp gencat getcap \
+	getconf getent getopt gprof grep head hexdump htpasswd id indent \
+	infocmp ipcrm ipcs \
+	join jot kdump keynote ktrace lam last lastcomm leave less lex \
+	libtool lndir \
+	locale locate lock logger login logname look lorder \
+	m4 mail make man mandoc mesg mg \
+	midiplay mixerctl mkdep mklocale mktemp modstat nc netstat \
+	newsyslog \
+	nfsstat nice nm nl nohup openssl pagesize passwd paste patch pctr \
+	pkg-config pkill \
+	pr printenv printf quota radioctl rcs rdist rdistd \
+	readlink renice rev rpcgen rpcinfo rs rup rusers rwall \
+	sdiff script sed sendbug shar showmount signify skey \
+	skeyaudit skeyinfo skeyinit sndiod \
+	sort spell split sqlite3 ssh stat su systat \
+	sudo tail talk tcopy tcpbench tee telnet tftp tic tip time \
+	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 which who whois write x99token xargs xinstall \
+	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
 .endif
 
 .include <bsd.subdir.mk>