===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/Makefile,v
retrieving revision 1.17
retrieving revision 1.157
diff -u -r1.17 -r1.157
--- src/usr.bin/Makefile	1996/08/08 23:38:27	1.17
+++ src/usr.bin/Makefile	2018/06/19 14:01:16	1.157
@@ -1,35 +1,38 @@
-#	$OpenBSD: Makefile,v 1.17 1996/08/08 23:38:27 deraadt 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.157 2018/06/19 14:01:16 reyk 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 \
-	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
-.endif
+SUBDIR= apply arch at aucat audioctl awk banner \
+	basename bc bgplg \
+	biff cal calendar cap_mkdb cdio chpass cmp col colrm \
+	column comm compress cpp crontab csplit ctags ctfconv ctfdump \
+	cu cut cvs \
+	dc deroff diff diff3 dirname doas du encrypt env expand false file \
+	find fgen finger fmt fold from fstat ftp gencat getcap \
+	getconf getent getopt gprof grep head hexdump htpasswd id indent \
+	infocmp ipcrm ipcs \
+	join jot kdump keynote ktrace lam last lastcomm ldap leave less lex \
+	libtool lndir \
+	locale locate lock logger login logname look lorder \
+	m4 mail make mandoc mesg mg \
+	midiplay mixerctl mkdep mklocale mktemp nc netstat \
+	newsyslog \
+	nfsstat nice nm nl nohup openssl pagesize passwd paste patch pctr \
+	pkg-config pkill \
+	pr printenv printf quota radioctl rcs rdist rdistd \
+	readlink renice rev rpcgen rpcinfo rs rup rusers rwall \
+	sdiff script sed sendbug shar showmount signify skey \
+	skeyaudit skeyinfo skeyinit sndiod \
+	sort spell split ssh stat su systat \
+	tail talk tcpbench tee telnet tftp tic time \
+	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 \
+	yacc yes
 
-.if   make(clean) || make(cleandir) || make(obj)
-SUBDIR+= pctrctl
-.elif ${MACHINE_ARCH} == "i386"
-SUBDIR+= pctrctl
+.if (${YP:L} == "yes")
+SUBDIR+=ypcat ypmatch ypwhich
 .endif
 
 .include <bsd.subdir.mk>