summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2003-07-22 17:15:41 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2003-07-22 17:15:41 +0000
commitabed2307ad3d6f09d84e8980716b09c12f6d8fc7 (patch)
tree907971d8f122e2b0715f2384b82020471ee3b516
parent25685fa91ebb7b712245211fb175b55b6db8427a (diff)
switch to our own diff/diff3 (sdiff goes bye bye)
-rw-r--r--gnu/usr.bin/Makefile6
-rw-r--r--usr.bin/Makefile20
2 files changed, 13 insertions, 13 deletions
diff --git a/gnu/usr.bin/Makefile b/gnu/usr.bin/Makefile
index 22c251e0125..5f67229cffb 100644
--- a/gnu/usr.bin/Makefile
+++ b/gnu/usr.bin/Makefile
@@ -1,12 +1,12 @@
-# $OpenBSD: Makefile,v 1.34 2003/07/22 17:15:12 brad Exp $
+# $OpenBSD: Makefile,v 1.35 2003/07/22 17:15:40 deraadt Exp $
# $NetBSD: Makefile,v 1.35 1996/04/03 21:20:52 chuck Exp $
.include <bsd.own.mk>
-SUBDIR+= bc cvs diff diff3
+SUBDIR+= bc cvs
SUBDIR+=../egcs/gcc
#SUBDIR+= gcc
-SUBDIR+= groff gzip lynx rcs sdiff sendbug
+SUBDIR+= groff gzip lynx rcs sendbug
SUBDIR+= binutils
# some ports use binutils gas and ld, most do not (yet).
diff --git a/usr.bin/Makefile b/usr.bin/Makefile
index cab0811a5ba..d2ed72242a7 100644
--- a/usr.bin/Makefile
+++ b/usr.bin/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.84 2003/07/22 17:15:13 brad Exp $
+# $OpenBSD: Makefile,v 1.85 2003/07/22 17:15:39 deraadt Exp $
.include <bsd.own.mk>
@@ -6,15 +6,15 @@ SUBDIR= apply apropos arch asa asn1_compile 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 expand false file file2c \
- find fgen finger fmt fold from fsplit fstat ftp gencat getconf getopt \
- gprof grep 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 pmdb pr printenv \
- printf quota radioctl rdist rdistd readlink renice rev rpcgen rpcinfo \
- rs rsh \
+ deroff diff diff3 dirname du elf2olf encrypt env expand false file \
+ file2c find fgen finger fmt fold from fsplit fstat ftp gencat getconf \
+ getopt gprof grep 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 pmdb 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 \