===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/Makefile,v
retrieving revision 1.20
retrieving revision 1.119
diff -u -r1.20 -r1.119
--- src/usr.bin/Makefile	1996/08/19 11:07:03	1.20
+++ src/usr.bin/Makefile	2010/10/29 14:47:14	1.119
@@ -1,35 +1,39 @@
-#	$OpenBSD: Makefile,v 1.20 1996/08/19 11:07:03 downsj Exp $
-#	$NetBSD: Makefile,v 1.62 1996/03/10 05:45:43 thorpej Exp $
-#	from: @(#)Makefile	5.8.1.1 (Berkeley) 5/8/91
+#	$OpenBSD: Makefile,v 1.119 2010/10/29 14:47:14 millert Exp $
 
-SUBDIR=	apply apropos arch asa at awk banner basename bdes biff cal calendar \
-	cap_mkdb checknr chflags chpass cksum cmp col colcrt colrm column \
-	comm compress cpp crontab ctags cut dirname du encrypt \
-	env error expand false file find finger fmt fold fpr from \
-	fsplit fstat ftp gencat getconf getopt 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 mkdep mkfifo mkstr modstat msgs netstat newsyslog \
-	nfsstat nice nohup oldrdist pagesize passwd paste patch pr printenv \
-	printf quota rdist rdistd renice rev rlogin rpcgen rpcinfo rs \
-	rsh rup ruptime rusers rwall rwho \
-	script sed shar showmount skey skeyinit soelim split \
-	su sup systat tail talk tcopy tee telnet tftp time \
-	tip tn3270 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 whereis \
-	which who whois window write \
-	xargs xinstall xlint xstr yacc yes ypcat ypmatch ypwhich
+.include <bsd.own.mk>
 
-# Don't use the standard tool chain on the alpha or mips.
-.if (${MACHINE_ARCH} != "alpha" && ${MACHINE_ARCH} != "mips")
-SUBDIR+= ar gprof nm ranlib size strip strings
+SUBDIR= apply apropos ar arch asa asn1_compile at aucat audioctl awk banner \
+	basename bc bdes bgplg \
+	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 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 vi vis vmstat w wall wc \
+	what whatis which who whois write x99token xargs xinstall xlint \
+	xstr yacc yes
+
+.if (${YP:L} == "yes")
+SUBDIR+=ypcat ypmatch ypwhich
 .endif
 
-.if   make(clean) || make(cleandir) || make(obj)
-SUBDIR+= pctr
-.elif ${MACHINE_ARCH} == "i386"
-SUBDIR+= pctr
+.if (${ELF_TOOLCHAIN:L} == "no")
+SUBDIR+= strip strings
 .endif
 
 .include <bsd.subdir.mk>