===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/Makefile,v
retrieving revision 1.53
retrieving revision 1.116
diff -u -r1.53 -r1.116
--- src/usr.bin/Makefile	1998/08/10 16:47:17	1.53
+++ src/usr.bin/Makefile	2010/09/23 18:58:41	1.116
@@ -1,43 +1,39 @@
-#	$OpenBSD: Makefile,v 1.53 1998/08/10 16:47:17 millert Exp $
+#	$OpenBSD: Makefile,v 1.116 2010/09/23 18:58:41 pirofti 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 \
-	info_mkdb ipcrm ipcs join jot kdump ktrace lam last lastcomm leave \
-	less lex lndir locate lock logger login logname look lorder m4 \
-	machine mail make man mesg mixerctl mkdep mkfifo mkstr mktemp \
-	modstat msgs nc netstat newsyslog \
-	nfsstat nice nohup oldrdist pagesize passwd paste patch 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 su sup systat 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 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 sectok 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 write x99token xargs xinstall xlint \
+	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+= pctr elf2ecoff elf2aout
-.elif ${MACHINE_ARCH} == "i386"
-SUBDIR+= pctr
-.elif ${MACHINE_ARCH} == "mips"
-SUBDIR+= elf2ecoff elf2aout
+.if (${ELF_TOOLCHAIN:L} == "no")
+SUBDIR+= strip strings
 .endif
 
 .include <bsd.subdir.mk>