diff options
| author | David Gwynne <dlg@cvs.openbsd.org> | 2012-03-05 11:15:42 +0000 |
|---|---|---|
| committer | David Gwynne <dlg@cvs.openbsd.org> | 2012-03-05 11:15:42 +0000 |
| commit | 6a35fe7e39d59137939af707f37b0c97bb5bf78f (patch) | |
| tree | ce2c7a1d012475b7d74b38c406f513babf7bfc59 | |
| parent | ffdf22a23a673b7930d5be92e54bd70c560fcc0b (diff) | |
swap out libexec/tftpd for usr.sbin/tftpd
ok henning@ sthen@ mikeb@
deraadt@ wants this
| -rw-r--r-- | libexec/Makefile | 4 | ||||
| -rw-r--r-- | usr.sbin/Makefile | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/libexec/Makefile b/libexec/Makefile index 9ac7b243524..8b4c6f5224e 100644 --- a/libexec/Makefile +++ b/libexec/Makefile @@ -1,12 +1,12 @@ # from: @(#)Makefile 5.7 (Berkeley) 4/1/91 -# $OpenBSD: Makefile,v 1.49 2012/01/26 18:45:41 dhill Exp $ +# $OpenBSD: Makefile,v 1.50 2012/03/05 11:15:41 dlg Exp $ .include <bsd.own.mk> SUBDIR= comsat fingerd ftpd getty identd lockspool \ mail.local makewhatis rpc.rquotad rpc.rstatd rpc.rusersd \ rpc.rwalld rpc.sprayd security spamd spamlogd spamd-setup rshd \ - talkd tcpd tftp-proxy tftpd uucpd + talkd tcpd tftp-proxy uucpd SUBDIR+=login_passwd login_skey login_reject login_chpass \ login_lchpass login_token login_radius login_tis login_yubikey diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile index 55cbece7387..6bfbd8c72fc 100644 --- a/usr.sbin/Makefile +++ b/usr.sbin/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.160 2012/02/19 11:34:36 robert Exp $ +# $OpenBSD: Makefile,v 1.161 2012/03/05 11:15:41 dlg Exp $ .include <bsd.own.mk> @@ -14,7 +14,7 @@ SUBDIR= ac accton acpidump adduser amd apm apmd arp \ rarpd rbootd rdate relayctl relayd repquota rip6query ripctl ripd \ rmt route6d rpc.bootparamd rpc.lockd rpc.statd rtadvd rtsold rwhod \ sa sasyncd sensorsd sliplogin slstats smtpd snmpctl snmpd spamdb \ - spray syslogc syslogd sysmerge tcpdrop tcpdump tokenadm \ + spray syslogc syslogd sysmerge tcpdrop tcpdump tftpd tokenadm \ tokeninit traceroute traceroute6 trpt usbdevs user vipw watchdogd \ wsconscfg wsfontload wsmoused zdump zic ztsscale |