===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/Makefile,v
retrieving revision 1.105
retrieving revision 1.114
diff -u -r1.105 -r1.114
--- src/usr.bin/Makefile	2008/02/27 09:21:32	1.105
+++ src/usr.bin/Makefile	2010/06/26 03:59:34	1.114
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.105 2008/02/27 09:21:32 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.114 2010/06/26 03:59:34 deraadt Exp $
 
 .include <bsd.own.mk>
 
@@ -6,25 +6,26 @@
 	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 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 \
+	locate lock logger login logname look lorder \
+	m4 mail make man mandoc mesg mg \
 	midiplay mixerctl mkdep mklocale mkstr mktemp modstat msgs nc netstat \
 	newsyslog \
-	nfsstat nice nm nohup oldrdist opencvs 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 \
+	skeyaudit skeyinfo skeyinit sort spell split ssh stat su systat \
+	sudo tail talk tcopy tcpbench tee telnet tftp tic time tip tn3270 \
+	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")
@@ -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>