===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/Makefile,v
retrieving revision 1.89
retrieving revision 1.117
diff -u -r1.89 -r1.117
--- src/usr.bin/Makefile	2004/01/13 03:43:40	1.89
+++ src/usr.bin/Makefile	2010/10/17 08:40:35	1.117
@@ -1,27 +1,31 @@
-#	$OpenBSD: Makefile,v 1.89 2004/01/13 03:43:40 mickey Exp $
+#	$OpenBSD: Makefile,v 1.117 2010/10/17 08:40:35 djm Exp $
 
 .include <bsd.own.mk>
 
-SUBDIR= apply apropos arch asa asn1_compile at aucat audioctl awk banner \
-	basename bc bdes \
-	biff cal calendar cap_mkdb cdio checknr chpass cksum 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 getconf \
-	getopt gprof grep 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 nm nohup oldrdist pagesize passwd paste patch pctr pkill \
-	pmdb pr printenv printf quota radioctl rdist rdistd readlink renice \
-	rev rpcgen rpcinfo rs rsh \
-	rup ruptime rusers rwall rwho script sectok sed shar showmount skey \
-	skeyaudit skeyinfo skeyinit sort spell split ssh 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 \
+SUBDIR= apply apropos ar arch asa asn1_compile at aucat audioctl awk banner \
+	basename bc bdes bgplg \
+	biff cal calendar cap_mkdb cdio checknr chpass cmp col colcrt 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 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 \
+	pmdb 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 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 vgrind vi vis vmstat w wall wc \
-	what whatis which who whois window write x99token xargs xinstall xlint \
+	what whatis which who whois write x99token xargs xinstall xlint \
 	xstr yacc yes
 
 .if (${YP:L} == "yes")
@@ -29,11 +33,7 @@
 .endif
 
 .if (${ELF_TOOLCHAIN:L} == "no")
-SUBDIR+= ar ranlib strip strings
-.endif
-
-.if   make(clean) || make(cleandir) || make(obj)
-SUBDIR+= elf2ecoff elf2aout
+SUBDIR+= strip strings
 .endif
 
 .include <bsd.subdir.mk>