===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/Makefile,v
retrieving revision 1.106
retrieving revision 1.120
diff -u -r1.106 -r1.120
--- src/usr.bin/Makefile	2008/02/27 10:19:21	1.106
+++ src/usr.bin/Makefile	2012/01/05 23:03:57	1.120
@@ -1,30 +1,31 @@
-#	$OpenBSD: Makefile,v 1.106 2008/02/27 10:19:21 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.120 2012/01/05 23:03:57 schwarze Exp $
 
 .include <bsd.own.mk>
 
-SUBDIR= apply apropos ar arch asa asn1_compile at aucat audioctl awk banner \
+SUBDIR= apply 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 \
+	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 elf2olf encrypt env expand false file \
+	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 mesg mg \
-	midiplay mixerctl mkdep mklocale mkstr mktemp modstat msgs nc netstat \
+	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 cvs pagesize passwd paste patch pctr \
+	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 sectok sed sendbug 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 \
+	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 vi vis vmstat w wall wc \
+	what which who whois write x99token xargs xinstall xlint \
 	xstr yacc yes
 
 .if (${YP:L} == "yes")
@@ -33,10 +34,6 @@
 
 .if (${ELF_TOOLCHAIN:L} == "no")
 SUBDIR+= strip strings
-.endif
-
-.if   make(clean) || make(cleandir) || make(obj)
-SUBDIR+= elf2ecoff elf2aout
 .endif
 
 .include <bsd.subdir.mk>