===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/Makefile,v
retrieving revision 1.77
retrieving revision 1.103
diff -u -r1.77 -r1.103
--- src/usr.bin/Makefile	2002/05/06 22:23:53	1.77
+++ src/usr.bin/Makefile	2006/12/12 16:37:32	1.103
@@ -1,23 +1,28 @@
-#	$OpenBSD: Makefile,v 1.77 2002/05/06 22:23:53 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.103 2006/12/12 16:37:32 reyk Exp $
 
 .include <bsd.own.mk>
 
-SUBDIR= apply apropos arch asa at aucat audioctl awk banner basename bdes \
-	biff cal calendar cap_mkdb cdio checknr chpass cksum cmp col \
-	colcrt colrm column comm compile_et compress cpp crontab ctags cut \
-	deroff dirname du elf2olf encrypt env error expand false file file2c \
-	find fgen 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 mg midiplay mixerctl \
-	mkdep mkstr mktemp modstat msgs nc netstat newsyslog nfsstat nice \
-	nohup oldrdist pagesize passwd paste patch pctr 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 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 elf2olf 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 \
+	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 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 \
 	xstr yacc yes
@@ -26,10 +31,8 @@
 SUBDIR+=ypcat ypmatch ypwhich
 .endif
 
-# Don't use the standard tool chain on the alpha, powerpc, and hppa.
-.if (${MACHINE_ARCH} != "alpha" && ${MACHINE_ARCH} != "powerpc" && \
-    ${MACHINE_ARCH} != "hppa" && ${MACHINE_ARCH} != "sparc64")
-SUBDIR+= ar nm ranlib size strip strings
+.if (${ELF_TOOLCHAIN:L} == "no")
+SUBDIR+= strip strings
 .endif
 
 .if   make(clean) || make(cleandir) || make(obj)