summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--bin/Makefile10
-rw-r--r--libexec/Makefile13
-rw-r--r--sbin/Makefile5
-rw-r--r--usr.sbin/Makefile33
4 files changed, 29 insertions, 32 deletions
diff --git a/bin/Makefile b/bin/Makefile
index d8028fc689b..bd7a65ff868 100644
--- a/bin/Makefile
+++ b/bin/Makefile
@@ -1,7 +1,9 @@
-# $OpenBSD: Makefile,v 1.9 2002/06/06 16:46:36 provos Exp $
+# $OpenBSD: Makefile,v 1.10 2007/05/18 16:08:12 deraadt Exp $
-SUBDIR= cat chio chmod cp csh date dd df domainname echo ed expr hostname \
- kill ksh ln ls md5 mkdir mt mv pax ps pwd rcp rm rmail rmdir \
- sleep stty sync systrace test
+SUBDIR= cat chio chmod cp csh date dd df domainname echo \
+ ed expr hostname kill ksh ln ls md5 mkdir mt \
+ mv pax ps pwd rcp rm rmail rmdir sleep stty \
+ sync systrace test
.include <bsd.subdir.mk>
+
diff --git a/libexec/Makefile b/libexec/Makefile
index 2d74f7751cd..aa6b2f3ee1e 100644
--- a/libexec/Makefile
+++ b/libexec/Makefile
@@ -1,14 +1,15 @@
# from: @(#)Makefile 5.7 (Berkeley) 4/1/91
-# $OpenBSD: Makefile,v 1.43 2006/12/28 20:04:13 deraadt Exp $
+# $OpenBSD: Makefile,v 1.44 2007/05/18 16:08:12 deraadt Exp $
.include <bsd.own.mk>
SUBDIR= comsat fingerd ftpd getNAME getty identd lockspool \
- mail.local makewhatis \
- rpc.rquotad rpc.rstatd rpc.rusersd rpc.rwalld rpc.sprayd spamd \
- spamlogd spamd-setup rshd talkd tcpd tftp-proxy tftpd uucpd
-SUBDIR+=login_passwd login_skey login_reject \
- login_chpass login_lchpass login_token login_radius login_tis
+ mail.local makewhatis rpc.rquotad rpc.rstatd rpc.rusersd \
+ rpc.rwalld rpc.sprayd spamd spamlogd spamd-setup rshd \
+ talkd tcpd tftp-proxy tftpd uucpd
+
+SUBDIR+=login_passwd login_skey login_reject login_chpass \
+ login_lchpass login_token login_radius login_tis
.if (${YP:L} == "yes")
SUBDIR+=rpc.yppasswdd
diff --git a/sbin/Makefile b/sbin/Makefile
index c99e2a3c337..b42b8588dd1 100644
--- a/sbin/Makefile
+++ b/sbin/Makefile
@@ -1,7 +1,4 @@
-# $OpenBSD: Makefile,v 1.81 2007/05/18 07:18:55 deraadt Exp $
-
-# Not ported: XNSrouted enpload scsiformat startslip
-# Missing: icheck
+# $OpenBSD: Makefile,v 1.82 2007/05/18 16:08:12 deraadt Exp $
SUBDIR= atactl badsect bioctl brconfig ccdconfig clri dhclient \
disklabel dmesg dump dumpfs fdisk fsck fsck_ext2fs fsck_ffs \
diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile
index 2ca865d5a2b..eb01ae8500e 100644
--- a/usr.sbin/Makefile
+++ b/usr.sbin/Makefile
@@ -1,24 +1,21 @@
-# $OpenBSD: Makefile,v 1.133 2007/01/31 08:32:16 pyr Exp $
+# $OpenBSD: Makefile,v 1.134 2007/05/18 16:08:12 deraadt Exp $
.include <bsd.own.mk>
-SUBDIR= ac accton acpidump adduser amd apm apmd arp authpf \
- bgpctl bgpd bind chroot config cron dev_mkdb dhcpd dhcrelay \
- dvmrpctl dvmrpd \
- edquota eeprom fdformat ftp-proxy gpioctl hostapd \
- hoststatectl hoststated hotplugd httpd \
- ifstated inetd iostat kgmon kvm_mkdb lpr mailwrapper map-mbone \
- memconfig mopd mrinfo mrouted mtrace mtree netgroup_mkdb ntpd \
- openssl ospfctl ospfd pkg_add popa3d portmap ppp pppd pppoe procmap \
- pstat pwd_mkdb quot quotaon rarpd rbootd rdate rdconfig repquota \
- ripctl ripd \
- rmt rpc.bootparamd rpc.lockd rwhod sa sasyncd sensorsd sliplogin \
- slstats spamdb spray syslogc syslogd tcpdrop tcpdump \
- timed tokenadm tokeninit traceroute trpt usbdevs user vipw vnconfig \
- watchdogd wsconscfg wsfontload wsmoused zdump zic ztsscale
-
-# IPv6
-SUBDIR+=faithd ndp rip6query route6d rtadvd rtsold traceroute6
+SUBDIR= ac accton acpidump adduser amd apm apmd arp \
+ authpf bgpctl bgpd bind chroot config cron dev_mkdb \
+ dhcpd dhcrelay dvmrpctl dvmrpd edquota eeprom faithd fdformat \
+ ftp-proxy gpioctl hostapd hoststatectl hoststated hotplugd \
+ httpd ifstated inetd iostat kgmon kvm_mkdb lpr mailwrapper \
+ map-mbone memconfig mopd mrinfo mrouted mtrace mtree ndp \
+ netgroup_mkdb ntpd openssl ospfctl ospfd pkg_add popa3d portmap \
+ ppp pppd pppoe procmap pstat pwd_mkdb quot quotaon \
+ rarpd rbootd rdate rdconfig repquota rip6query ripctl ripd \
+ rmt route6d rpc.bootparamd rpc.lockd rtadvd rtsold rwhod sa \
+ sasyncd sensorsd sliplogin slstats spamdb spray syslogc syslogd \
+ tcpdrop tcpdump timed tokenadm tokeninit traceroute traceroute6 \
+ trpt usbdevs user vipw vnconfig watchdogd wsconscfg wsfontload \
+ wsmoused zdump zic ztsscale
.if (${AFS:L} == "yes")
SUBDIR+=afs