summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>1997-09-21 11:52:20 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>1997-09-21 11:52:20 +0000
commit19bc5ba298ed03321dc51faa21aa64615eb767d4 (patch)
treed4c105f3eb247944f1e65cea78a59989e0b1a531
parent7d6a29d2889b0d13f2913bd165f1ba9e94e0473c (diff)
$OpenBSD$
-rw-r--r--usr.bin/Makefile4
-rw-r--r--usr.bin/apply/Makefile3
-rw-r--r--usr.bin/apropos/Makefile3
-rw-r--r--usr.bin/ar/Makefile3
-rw-r--r--usr.bin/asa/Makefile3
-rw-r--r--usr.bin/at/Makefile3
-rw-r--r--usr.bin/banner/Makefile3
-rw-r--r--usr.bin/basename/Makefile3
-rw-r--r--usr.bin/bdes/Makefile3
-rw-r--r--usr.bin/biff/Makefile3
-rw-r--r--usr.bin/cal/Makefile3
-rw-r--r--usr.bin/calendar/Makefile3
-rw-r--r--usr.bin/cap_mkdb/Makefile3
-rw-r--r--usr.bin/checknr/Makefile3
-rw-r--r--usr.bin/chflags/Makefile3
-rw-r--r--usr.bin/chpass/Makefile3
-rw-r--r--usr.bin/cksum/Makefile3
-rw-r--r--usr.bin/cmp/Makefile3
-rw-r--r--usr.bin/col/Makefile3
-rw-r--r--usr.bin/colcrt/Makefile3
-rw-r--r--usr.bin/colrm/Makefile3
-rw-r--r--usr.bin/column/Makefile3
-rw-r--r--usr.bin/comm/Makefile3
-rw-r--r--usr.bin/ctags/Makefile3
-rw-r--r--usr.bin/cut/Makefile3
-rw-r--r--usr.bin/dirname/Makefile3
-rw-r--r--usr.bin/du/Makefile3
-rw-r--r--usr.bin/env/Makefile3
-rw-r--r--usr.bin/error/Makefile3
-rw-r--r--usr.bin/expand/Makefile3
-rw-r--r--usr.bin/file2c/Makefile3
-rw-r--r--usr.bin/fmt/Makefile3
-rw-r--r--usr.bin/fold/Makefile3
-rw-r--r--usr.bin/from/Makefile3
-rw-r--r--usr.bin/fstat/Makefile2
-rw-r--r--usr.bin/ftp/Makefile4
-rw-r--r--usr.bin/gencat/Makefile2
-rw-r--r--usr.bin/getconf/Makefile2
-rw-r--r--usr.bin/gprof/Makefile3
-rw-r--r--usr.bin/ipcs/Makefile3
-rw-r--r--usr.bin/jot/Makefile3
-rw-r--r--usr.bin/lam/Makefile3
-rw-r--r--usr.bin/last/Makefile3
-rw-r--r--usr.bin/lastcomm/Makefile3
-rw-r--r--usr.bin/leave/Makefile3
-rw-r--r--usr.bin/locate/Makefile5
-rw-r--r--usr.bin/locate/Makefile.inc4
-rw-r--r--usr.bin/logger/Makefile3
-rw-r--r--usr.bin/login/Makefile3
-rw-r--r--usr.bin/logname/Makefile3
-rw-r--r--usr.bin/look/Makefile3
-rw-r--r--usr.bin/lorder/Makefile3
-rw-r--r--usr.bin/m4/Makefile3
-rw-r--r--usr.bin/mail/Makefile3
-rw-r--r--usr.bin/make/Makefile4
-rw-r--r--usr.bin/make/Makefile.boot3
-rw-r--r--usr.bin/man/Makefile3
-rw-r--r--usr.bin/mesg/Makefile3
-rw-r--r--usr.bin/mkdep/Makefile3
-rw-r--r--usr.bin/mkfifo/Makefile3
-rw-r--r--usr.bin/mkstr/Makefile3
-rw-r--r--usr.bin/more/Makefile3
-rw-r--r--usr.bin/msgs/Makefile3
-rw-r--r--usr.bin/nc/Makefile3
-rw-r--r--usr.bin/netstat/Makefile3
-rw-r--r--usr.bin/nfsstat/Makefile4
-rw-r--r--usr.bin/nice/Makefile3
-rw-r--r--usr.bin/nm/Makefile3
-rw-r--r--usr.bin/nohup/Makefile3
-rw-r--r--usr.bin/pagesize/Makefile3
-rw-r--r--usr.bin/pctr/Makefile3
-rw-r--r--usr.bin/rdist/Makefile5
-rw-r--r--usr.bin/rev/Makefile3
-rw-r--r--usr.bin/rlogin/Makefile3
-rw-r--r--usr.bin/rpcgen/Makefile5
-rw-r--r--usr.bin/script/Makefile3
-rw-r--r--usr.bin/shar/Makefile3
-rw-r--r--usr.bin/showmount/Makefile3
-rw-r--r--usr.bin/size/Makefile3
-rw-r--r--usr.bin/skey/Makefile2
-rw-r--r--usr.bin/skeyaudit/Makefile2
-rw-r--r--usr.bin/skeyinfo/Makefile2
-rw-r--r--usr.bin/skeyinit/Makefile2
-rw-r--r--usr.bin/soelim/Makefile3
-rw-r--r--usr.bin/sort/Makefile3
-rw-r--r--usr.bin/split/Makefile3
-rw-r--r--usr.bin/strings/Makefile3
-rw-r--r--usr.bin/systat/Makefile3
-rw-r--r--usr.bin/tail/Makefile3
-rw-r--r--usr.bin/talk/Makefile3
-rw-r--r--usr.bin/tcopy/Makefile3
-rw-r--r--usr.bin/tee/Makefile3
-rw-r--r--usr.bin/telnet/Makefile3
-rw-r--r--usr.bin/tftp/Makefile3
-rw-r--r--usr.bin/time/Makefile3
-rw-r--r--usr.bin/tip/Makefile4
-rw-r--r--usr.bin/touch/Makefile3
-rw-r--r--usr.bin/tput/Makefile3
-rw-r--r--usr.bin/tr/Makefile3
-rw-r--r--usr.bin/tset/Makefile3
-rw-r--r--usr.bin/tsort/Makefile3
-rw-r--r--usr.bin/tty/Makefile3
-rw-r--r--usr.bin/ul/Makefile3
-rw-r--r--usr.bin/unexpand/Makefile3
-rw-r--r--usr.bin/unifdef/Makefile3
-rw-r--r--usr.bin/uniq/Makefile3
-rw-r--r--usr.bin/unvis/Makefile3
-rw-r--r--usr.bin/users/Makefile3
-rw-r--r--usr.bin/uudecode/Makefile3
-rw-r--r--usr.bin/uuencode/Makefile3
-rw-r--r--usr.bin/vacation/Makefile3
-rw-r--r--usr.bin/vgrind/Makefile3
-rw-r--r--usr.bin/vi/Makefile3
-rw-r--r--usr.bin/vis/Makefile3
-rw-r--r--usr.bin/vmstat/Makefile4
-rw-r--r--usr.bin/w/Makefile3
-rw-r--r--usr.bin/wall/Makefile3
-rw-r--r--usr.bin/what/Makefile3
-rw-r--r--usr.bin/whatis/Makefile3
-rw-r--r--usr.bin/who/Makefile3
-rw-r--r--usr.bin/whois/Makefile3
-rw-r--r--usr.bin/window/Makefile4
-rw-r--r--usr.bin/xargs/Makefile3
-rw-r--r--usr.bin/xinstall/Makefile3
-rw-r--r--usr.bin/xlint/Makefile3
-rw-r--r--usr.bin/xstr/Makefile3
-rw-r--r--usr.bin/yes/Makefile3
-rw-r--r--usr.bin/ypwhich/Makefile2
128 files changed, 130 insertions, 260 deletions
diff --git a/usr.bin/Makefile b/usr.bin/Makefile
index 1f112b95e63..a21d370c5dd 100644
--- a/usr.bin/Makefile
+++ b/usr.bin/Makefile
@@ -1,6 +1,4 @@
-# $OpenBSD: Makefile,v 1.46 1997/08/14 14:02:15 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.47 1997/09/21 11:48:14 deraadt Exp $
.include <bsd.own.mk>
diff --git a/usr.bin/apply/Makefile b/usr.bin/apply/Makefile
index 4e2b2a1a1c2..68ce192721d 100644
--- a/usr.bin/apply/Makefile
+++ b/usr.bin/apply/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 1996/06/26 05:31:12 deraadt Exp $
-# $NetBSD: Makefile,v 1.3 1995/03/25 03:38:16 glass Exp $
+# $OpenBSD: Makefile,v 1.3 1997/09/21 11:48:16 deraadt Exp $
PROG= apply
diff --git a/usr.bin/apropos/Makefile b/usr.bin/apropos/Makefile
index 602caacdfe7..19f24ce47b8 100644
--- a/usr.bin/apropos/Makefile
+++ b/usr.bin/apropos/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 1996/06/26 05:31:13 deraadt Exp $
-# $NetBSD: Makefile,v 1.4 1995/09/04 20:46:14 tls Exp $
+# $OpenBSD: Makefile,v 1.3 1997/09/21 11:48:17 deraadt Exp $
PROG= apropos
SRCS= apropos.c config.c
diff --git a/usr.bin/ar/Makefile b/usr.bin/ar/Makefile
index 451a43c087c..a759278e217 100644
--- a/usr.bin/ar/Makefile
+++ b/usr.bin/ar/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 1996/06/26 05:31:15 deraadt Exp $
-# $NetBSD: Makefile,v 1.7 1995/03/25 06:39:33 glass Exp $
+# $OpenBSD: Makefile,v 1.3 1997/09/21 11:48:19 deraadt Exp $
PROG= ar
CFLAGS+=-I${.CURDIR}
diff --git a/usr.bin/asa/Makefile b/usr.bin/asa/Makefile
index 17144fab6d5..f3b347563f5 100644
--- a/usr.bin/asa/Makefile
+++ b/usr.bin/asa/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 1996/09/02 06:46:59 etheisen Exp $
-# $NetBSD: Makefile,v 1.2 1995/03/25 18:04:51 glass Exp $
+# $OpenBSD: Makefile,v 1.4 1997/09/21 11:48:21 deraadt Exp $
PROG= asa
diff --git a/usr.bin/at/Makefile b/usr.bin/at/Makefile
index 355fad47448..abe30f921e8 100644
--- a/usr.bin/at/Makefile
+++ b/usr.bin/at/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 1997/03/01 23:40:08 millert Exp $
-# $NetBSD: Makefile,v 1.2 1995/03/25 18:13:27 glass Exp $
+# $OpenBSD: Makefile,v 1.4 1997/09/21 11:48:22 deraadt Exp $
PROG= at
SRCS= at.c panic.c parsetime.c perm.c
diff --git a/usr.bin/banner/Makefile b/usr.bin/banner/Makefile
index 0344560d285..3ce26fc6c0d 100644
--- a/usr.bin/banner/Makefile
+++ b/usr.bin/banner/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 1996/06/26 05:31:32 deraadt Exp $
-# $NetBSD: Makefile,v 1.1.1.1 1995/04/09 05:53:04 cgd Exp $
+# $OpenBSD: Makefile,v 1.3 1997/09/21 11:48:23 deraadt Exp $
PROG= banner
diff --git a/usr.bin/basename/Makefile b/usr.bin/basename/Makefile
index 50738635c3e..b74cfe54c2c 100644
--- a/usr.bin/basename/Makefile
+++ b/usr.bin/basename/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 1996/06/26 05:31:36 deraadt Exp $
-# $NetBSD: Makefile,v 1.4 1995/03/25 18:17:38 glass Exp $
+# $OpenBSD: Makefile,v 1.3 1997/09/21 11:48:25 deraadt Exp $
PROG= basename
MLINKS= basename.1 dirname.1
diff --git a/usr.bin/bdes/Makefile b/usr.bin/bdes/Makefile
index 013afbe6d85..515bd046c68 100644
--- a/usr.bin/bdes/Makefile
+++ b/usr.bin/bdes/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 1996/06/26 05:31:38 deraadt Exp $
-# $NetBSD: Makefile,v 1.1 1995/07/24 04:30:47 cgd Exp $
+# $OpenBSD: Makefile,v 1.4 1997/09/21 11:48:26 deraadt Exp $
MAN= bdes.1
PROG= bdes
diff --git a/usr.bin/biff/Makefile b/usr.bin/biff/Makefile
index 27ea22826a4..523042b016a 100644
--- a/usr.bin/biff/Makefile
+++ b/usr.bin/biff/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 1996/06/26 05:31:40 deraadt Exp $
-# $NetBSD: Makefile,v 1.3 1995/03/26 02:34:19 glass Exp $
+# $OpenBSD: Makefile,v 1.3 1997/09/21 11:48:28 deraadt Exp $
PROG= biff
diff --git a/usr.bin/cal/Makefile b/usr.bin/cal/Makefile
index 3cc7e39643e..3f64ce7b712 100644
--- a/usr.bin/cal/Makefile
+++ b/usr.bin/cal/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 1996/06/26 05:31:42 deraadt Exp $
-# $NetBSD: Makefile,v 1.3 1995/03/26 03:10:21 glass Exp $
+# $OpenBSD: Makefile,v 1.3 1997/09/21 11:48:29 deraadt Exp $
PROG= cal
diff --git a/usr.bin/calendar/Makefile b/usr.bin/calendar/Makefile
index a5b7e4c0c7a..9cef5c891f0 100644
--- a/usr.bin/calendar/Makefile
+++ b/usr.bin/calendar/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 1997/04/27 20:56:40 millert Exp $
-# from: @(#)Makefile 8.1 (Berkeley) 6/6/93
+# $OpenBSD: Makefile,v 1.6 1997/09/21 11:48:31 deraadt Exp $
PROG= calendar
SRCS= calendar.c io.c day.c ostern.c paskha.c
diff --git a/usr.bin/cap_mkdb/Makefile b/usr.bin/cap_mkdb/Makefile
index 577e95e98dd..d1d341283f8 100644
--- a/usr.bin/cap_mkdb/Makefile
+++ b/usr.bin/cap_mkdb/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 1996/06/26 05:31:47 deraadt Exp $
-# $NetBSD: Makefile,v 1.4 1995/03/26 03:59:33 glass Exp $
+# $OpenBSD: Makefile,v 1.3 1997/09/21 11:48:33 deraadt Exp $
PROG= cap_mkdb
diff --git a/usr.bin/checknr/Makefile b/usr.bin/checknr/Makefile
index 9f457dca6d7..a2fdf7a64b4 100644
--- a/usr.bin/checknr/Makefile
+++ b/usr.bin/checknr/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 1996/06/26 05:31:49 deraadt Exp $
-# $NetBSD: Makefile,v 1.3 1995/03/26 04:10:08 glass Exp $
+# $OpenBSD: Makefile,v 1.3 1997/09/21 11:48:34 deraadt Exp $
PROG= checknr
diff --git a/usr.bin/chflags/Makefile b/usr.bin/chflags/Makefile
index 8051f221012..d17130ae46b 100644
--- a/usr.bin/chflags/Makefile
+++ b/usr.bin/chflags/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 1996/06/26 05:31:51 deraadt Exp $
-# $NetBSD: Makefile,v 1.2 1994/11/14 20:27:21 jtc Exp $
+# $OpenBSD: Makefile,v 1.3 1997/09/21 11:48:36 deraadt Exp $
PROG= chflags
SRCS= chflags.c stat_flags.c
diff --git a/usr.bin/chpass/Makefile b/usr.bin/chpass/Makefile
index 3cb6d33d05a..d795b3c543b 100644
--- a/usr.bin/chpass/Makefile
+++ b/usr.bin/chpass/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 1997/04/19 21:26:25 millert Exp $
-# $NetBSD: Makefile,v 1.6 1996/05/15 21:50:39 jtc Exp $
+# $OpenBSD: Makefile,v 1.7 1997/09/21 11:48:37 deraadt Exp $
.include <bsd.own.mk>
diff --git a/usr.bin/cksum/Makefile b/usr.bin/cksum/Makefile
index 9e74093fd5e..1671de525ac 100644
--- a/usr.bin/cksum/Makefile
+++ b/usr.bin/cksum/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 1996/06/26 05:32:00 deraadt Exp $
-# $NetBSD: Makefile,v 1.6 1995/09/02 05:45:13 jtc Exp $
+# $OpenBSD: Makefile,v 1.3 1997/09/21 11:48:39 deraadt Exp $
PROG= cksum
SRCS= cksum.c crc.c print.c sum1.c sum2.c
diff --git a/usr.bin/cmp/Makefile b/usr.bin/cmp/Makefile
index 3dc0242e9be..60da75aefdd 100644
--- a/usr.bin/cmp/Makefile
+++ b/usr.bin/cmp/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 1996/06/26 05:32:04 deraadt Exp $
-# $NetBSD: Makefile,v 1.3 1995/09/08 03:22:54 tls Exp $
+# $OpenBSD: Makefile,v 1.3 1997/09/21 11:48:41 deraadt Exp $
PROG= cmp
SRCS= cmp.c misc.c regular.c special.c
diff --git a/usr.bin/col/Makefile b/usr.bin/col/Makefile
index 41e90c6d742..d16ffd3bcef 100644
--- a/usr.bin/col/Makefile
+++ b/usr.bin/col/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 1996/06/26 05:32:08 deraadt Exp $
-# $NetBSD: Makefile,v 1.3 1995/03/26 05:25:51 glass Exp $
+# $OpenBSD: Makefile,v 1.3 1997/09/21 11:48:42 deraadt Exp $
PROG= col
diff --git a/usr.bin/colcrt/Makefile b/usr.bin/colcrt/Makefile
index faa24b5946a..4d2f45bd850 100644
--- a/usr.bin/colcrt/Makefile
+++ b/usr.bin/colcrt/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 1996/06/26 05:32:11 deraadt Exp $
-# $NetBSD: Makefile,v 1.3 1995/03/26 05:30:58 glass Exp $
+# $OpenBSD: Makefile,v 1.3 1997/09/21 11:48:43 deraadt Exp $
PROG= colcrt
diff --git a/usr.bin/colrm/Makefile b/usr.bin/colrm/Makefile
index 9e4c497bc07..ede690d9bd6 100644
--- a/usr.bin/colrm/Makefile
+++ b/usr.bin/colrm/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 1996/06/26 05:32:13 deraadt Exp $
-# $NetBSD: Makefile,v 1.3 1995/03/26 09:03:59 glass Exp $
+# $OpenBSD: Makefile,v 1.3 1997/09/21 11:48:45 deraadt Exp $
PROG= colrm
diff --git a/usr.bin/column/Makefile b/usr.bin/column/Makefile
index 7ce65c0e533..f0a9faeb2ac 100644
--- a/usr.bin/column/Makefile
+++ b/usr.bin/column/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 1996/06/26 05:32:15 deraadt Exp $
-# $NetBSD: Makefile,v 1.3 1995/03/26 09:08:27 glass Exp $
+# $OpenBSD: Makefile,v 1.3 1997/09/21 11:48:46 deraadt Exp $
PROG= column
diff --git a/usr.bin/comm/Makefile b/usr.bin/comm/Makefile
index 35441331e97..2e76ca0f2f6 100644
--- a/usr.bin/comm/Makefile
+++ b/usr.bin/comm/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 1996/06/26 05:32:17 deraadt Exp $
-# $NetBSD: Makefile,v 1.3 1995/03/26 09:25:49 glass Exp $
+# $OpenBSD: Makefile,v 1.3 1997/09/21 11:48:47 deraadt Exp $
PROG= comm
diff --git a/usr.bin/ctags/Makefile b/usr.bin/ctags/Makefile
index ee1d437d0c7..4fc5eda8e78 100644
--- a/usr.bin/ctags/Makefile
+++ b/usr.bin/ctags/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 1996/06/26 05:32:27 deraadt Exp $
-# $NetBSD: Makefile,v 1.3 1995/03/26 20:14:03 glass Exp $
+# $OpenBSD: Makefile,v 1.3 1997/09/21 11:48:50 deraadt Exp $
PROG= ctags
CFLAGS+=-I${.CURDIR}
diff --git a/usr.bin/cut/Makefile b/usr.bin/cut/Makefile
index 81f527534dc..fac18308ded 100644
--- a/usr.bin/cut/Makefile
+++ b/usr.bin/cut/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 1996/06/26 05:32:33 deraadt Exp $
-# $NetBSD: Makefile,v 1.3 1995/03/26 20:51:24 glass Exp $
+# $OpenBSD: Makefile,v 1.3 1997/09/21 11:48:51 deraadt Exp $
PROG= cut
diff --git a/usr.bin/dirname/Makefile b/usr.bin/dirname/Makefile
index f7f015567f9..d9a5931c534 100644
--- a/usr.bin/dirname/Makefile
+++ b/usr.bin/dirname/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 1996/06/26 05:32:35 deraadt Exp $
-# $NetBSD: Makefile,v 1.3 1995/03/28 16:50:08 glass Exp $
+# $OpenBSD: Makefile,v 1.3 1997/09/21 11:48:53 deraadt Exp $
PROG= dirname
NOMAN= noman
diff --git a/usr.bin/du/Makefile b/usr.bin/du/Makefile
index faa9b3e1cb3..2cf1ff724eb 100644
--- a/usr.bin/du/Makefile
+++ b/usr.bin/du/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 1996/06/26 05:32:36 deraadt Exp $
-# $NetBSD: Makefile,v 1.7 1995/09/28 06:24:35 perry Exp $
+# $OpenBSD: Makefile,v 1.3 1997/09/21 11:48:54 deraadt Exp $
PROG= du
diff --git a/usr.bin/env/Makefile b/usr.bin/env/Makefile
index 21d1cf1fb89..a7f9a5a808f 100644
--- a/usr.bin/env/Makefile
+++ b/usr.bin/env/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 1996/06/26 05:32:39 deraadt Exp $
-# $NetBSD: Makefile,v 1.4 1995/09/28 07:34:35 perry Exp $
+# $OpenBSD: Makefile,v 1.3 1997/09/21 11:48:56 deraadt Exp $
PROG= env
diff --git a/usr.bin/error/Makefile b/usr.bin/error/Makefile
index 008752f14a5..798dca86962 100644
--- a/usr.bin/error/Makefile
+++ b/usr.bin/error/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 1996/06/26 05:32:41 deraadt Exp $
-# $NetBSD: Makefile,v 1.3 1995/09/02 06:15:10 jtc Exp $
+# $OpenBSD: Makefile,v 1.3 1997/09/21 11:48:58 deraadt Exp $
PROG= error
SRCS= main.c input.c pi.c subr.c filter.c touch.c
diff --git a/usr.bin/expand/Makefile b/usr.bin/expand/Makefile
index 3836fd99734..7b114de2c34 100644
--- a/usr.bin/expand/Makefile
+++ b/usr.bin/expand/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 1996/06/26 05:32:47 deraadt Exp $
-# $NetBSD: Makefile,v 1.3 1995/09/02 06:19:43 jtc Exp $
+# $OpenBSD: Makefile,v 1.3 1997/09/21 11:48:59 deraadt Exp $
PROG= expand
MLINKS= expand.1 unexpand.1
diff --git a/usr.bin/file2c/Makefile b/usr.bin/file2c/Makefile
index d7771892270..2ab3e3836c7 100644
--- a/usr.bin/file2c/Makefile
+++ b/usr.bin/file2c/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.1 1996/08/26 07:47:05 downsj Exp $
-# $FreeBSD: Makefile,v 1.1 1995/01/29 00:49:42 phk Exp $
+# $OpenBSD: Makefile,v 1.2 1997/09/21 11:49:01 deraadt Exp $
PROG= file2c
MAN1= file2c.1
diff --git a/usr.bin/fmt/Makefile b/usr.bin/fmt/Makefile
index fde222e206c..91311998888 100644
--- a/usr.bin/fmt/Makefile
+++ b/usr.bin/fmt/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 1996/06/26 05:33:20 deraadt Exp $
-# $NetBSD: Makefile,v 1.3 1995/09/01 01:29:39 jtc Exp $
+# $OpenBSD: Makefile,v 1.3 1997/09/21 11:49:03 deraadt Exp $
PROG= fmt
SRCS= fmt.c head.c
diff --git a/usr.bin/fold/Makefile b/usr.bin/fold/Makefile
index 50e52602510..24c3c844c93 100644
--- a/usr.bin/fold/Makefile
+++ b/usr.bin/fold/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 1996/06/26 05:33:22 deraadt Exp $
-# $NetBSD: Makefile,v 1.3 1995/09/01 01:42:41 jtc Exp $
+# $OpenBSD: Makefile,v 1.3 1997/09/21 11:49:05 deraadt Exp $
PROG= fold
diff --git a/usr.bin/from/Makefile b/usr.bin/from/Makefile
index 9ac69f20b47..e442ca03e68 100644
--- a/usr.bin/from/Makefile
+++ b/usr.bin/from/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 1996/06/26 05:33:26 deraadt Exp $
-# $NetBSD: Makefile,v 1.3 1995/09/01 01:39:08 jtc Exp $
+# $OpenBSD: Makefile,v 1.3 1997/09/21 11:49:06 deraadt Exp $
PROG= from
diff --git a/usr.bin/fstat/Makefile b/usr.bin/fstat/Makefile
index 2b618acd930..6137b2dea21 100644
--- a/usr.bin/fstat/Makefile
+++ b/usr.bin/fstat/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 1996/06/26 05:33:31 deraadt Exp $
+# $OpenBSD: Makefile,v 1.3 1997/09/21 11:49:07 deraadt Exp $
PROG= fstat
DPADD= ${LIBKVM}
diff --git a/usr.bin/ftp/Makefile b/usr.bin/ftp/Makefile
index c6359bf0d90..ec8d69f07b9 100644
--- a/usr.bin/ftp/Makefile
+++ b/usr.bin/ftp/Makefile
@@ -1,6 +1,4 @@
-# $OpenBSD: Makefile,v 1.12 1997/09/05 03:53:23 millert Exp $
-# $NetBSD: Makefile,v 1.13 1997/08/18 10:20:13 lukem Exp $
-# from: @(#)Makefile 8.2 (Berkeley) 4/3/94
+# $OpenBSD: Makefile,v 1.13 1997/09/21 11:49:09 deraadt Exp $
# Define SMALL to disable command line editing
#CFLAGS+=-DSMALL
diff --git a/usr.bin/gencat/Makefile b/usr.bin/gencat/Makefile
index e6345512c25..2adb7e9e0e2 100644
--- a/usr.bin/gencat/Makefile
+++ b/usr.bin/gencat/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 1997/06/11 15:31:07 kstailey Exp $
+# $OpenBSD: Makefile,v 1.5 1997/09/21 11:49:10 deraadt Exp $
PROG= gencat
MAN= gencat.1
diff --git a/usr.bin/getconf/Makefile b/usr.bin/getconf/Makefile
index 9543f2d341a..6737fa52f82 100644
--- a/usr.bin/getconf/Makefile
+++ b/usr.bin/getconf/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 1996/06/26 05:33:41 deraadt Exp $
+# $OpenBSD: Makefile,v 1.3 1997/09/21 11:49:12 deraadt Exp $
PROG=getconf
diff --git a/usr.bin/gprof/Makefile b/usr.bin/gprof/Makefile
index 60782f67d66..dc1e2df96e7 100644
--- a/usr.bin/gprof/Makefile
+++ b/usr.bin/gprof/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 1997/04/27 20:56:44 millert Exp $
-# $NetBSD: Makefile,v 1.14 1995/04/19 07:24:08 cgd Exp $
+# $OpenBSD: Makefile,v 1.6 1997/09/21 11:49:15 deraadt Exp $
.if (${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH} == "mips")
NOPROG=
diff --git a/usr.bin/ipcs/Makefile b/usr.bin/ipcs/Makefile
index 779b3408ace..4de189283f5 100644
--- a/usr.bin/ipcs/Makefile
+++ b/usr.bin/ipcs/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 1996/06/26 05:34:36 deraadt Exp $
-# $NetBSD: Makefile,v 1.7 1995/04/15 02:31:13 cgd Exp $
+# $OpenBSD: Makefile,v 1.3 1997/09/21 11:49:19 deraadt Exp $
PROG= ipcs
BINGRP= kmem
diff --git a/usr.bin/jot/Makefile b/usr.bin/jot/Makefile
index 11ace4a77ea..5462e00241b 100644
--- a/usr.bin/jot/Makefile
+++ b/usr.bin/jot/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 1996/06/26 05:34:40 deraadt Exp $
-# $NetBSD: Makefile,v 1.2 1994/11/14 20:27:34 jtc Exp $
+# $OpenBSD: Makefile,v 1.3 1997/09/21 11:49:22 deraadt Exp $
PROG= jot
diff --git a/usr.bin/lam/Makefile b/usr.bin/lam/Makefile
index c0e44139b2d..956087cd7f2 100644
--- a/usr.bin/lam/Makefile
+++ b/usr.bin/lam/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 1996/06/26 05:34:48 deraadt Exp $
-# $NetBSD: Makefile,v 1.2 1994/11/14 20:27:39 jtc Exp $
+# $OpenBSD: Makefile,v 1.3 1997/09/21 11:49:24 deraadt Exp $
PROG= lam
diff --git a/usr.bin/last/Makefile b/usr.bin/last/Makefile
index b5d05da24d4..809911dc798 100644
--- a/usr.bin/last/Makefile
+++ b/usr.bin/last/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 1996/06/26 05:34:50 deraadt Exp $
-# $NetBSD: Makefile,v 1.3 1994/12/21 22:41:22 jtc Exp $
+# $OpenBSD: Makefile,v 1.3 1997/09/21 11:49:26 deraadt Exp $
PROG= last
diff --git a/usr.bin/lastcomm/Makefile b/usr.bin/lastcomm/Makefile
index 1431f37010a..34b0a85e72f 100644
--- a/usr.bin/lastcomm/Makefile
+++ b/usr.bin/lastcomm/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 1996/06/26 05:34:52 deraadt Exp $
-# $NetBSD: Makefile,v 1.5 1995/10/22 01:43:40 ghudson Exp $
+# $OpenBSD: Makefile,v 1.4 1997/09/21 11:49:29 deraadt Exp $
PROG= lastcomm
DPADD= ${LIBMATH}
diff --git a/usr.bin/leave/Makefile b/usr.bin/leave/Makefile
index f8ac54de4d2..b161f4e8fb2 100644
--- a/usr.bin/leave/Makefile
+++ b/usr.bin/leave/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 1996/06/26 05:34:55 deraadt Exp $
-# $NetBSD: Makefile,v 1.3 1994/12/22 01:09:49 jtc Exp $
+# $OpenBSD: Makefile,v 1.3 1997/09/21 11:49:31 deraadt Exp $
PROG= leave
diff --git a/usr.bin/locate/Makefile b/usr.bin/locate/Makefile
index e5b8ff9d0c1..0fd0a182130 100644
--- a/usr.bin/locate/Makefile
+++ b/usr.bin/locate/Makefile
@@ -1,7 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 1996/09/15 16:50:33 michaels Exp $
-#
-# @(#)Makefile 8.1 (Berkeley) 6/6/93
-# $Id: Makefile,v 1.4 1996/09/15 16:50:33 michaels Exp $
+# $OpenBSD: Makefile,v 1.5 1997/09/21 11:49:33 deraadt Exp $
SUBDIR= bigram code locate
diff --git a/usr.bin/locate/Makefile.inc b/usr.bin/locate/Makefile.inc
index aaec3865a9b..b7db9d02a4c 100644
--- a/usr.bin/locate/Makefile.inc
+++ b/usr.bin/locate/Makefile.inc
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile.inc,v 1.2 1996/09/15 16:50:34 michaels Exp $
-#
-# $Id: Makefile.inc,v 1.2 1996/09/15 16:50:34 michaels Exp $
+# $OpenBSD: Makefile.inc,v 1.3 1997/09/21 11:49:35 deraadt Exp $
LIBEXECDIR?= /usr/libexec
diff --git a/usr.bin/logger/Makefile b/usr.bin/logger/Makefile
index 43e1667befe..15cb4cc2336 100644
--- a/usr.bin/logger/Makefile
+++ b/usr.bin/logger/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 1996/06/26 05:35:57 deraadt Exp $
-# $NetBSD: Makefile,v 1.3 1994/12/22 06:26:57 jtc Exp $
+# $OpenBSD: Makefile,v 1.3 1997/09/21 11:49:37 deraadt Exp $
PROG= logger
diff --git a/usr.bin/login/Makefile b/usr.bin/login/Makefile
index b866fdd7698..4d9df4f0564 100644
--- a/usr.bin/login/Makefile
+++ b/usr.bin/login/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.9 1997/04/19 21:26:26 millert Exp $
-# $NetBSD: Makefile,v 1.10 1994/12/23 06:52:56 jtc Exp $
+# $OpenBSD: Makefile,v 1.10 1997/09/21 11:49:39 deraadt Exp $
PROG= login
SRCS= login.c failedlogin.c
diff --git a/usr.bin/logname/Makefile b/usr.bin/logname/Makefile
index 66dca41fbde..627d9a057db 100644
--- a/usr.bin/logname/Makefile
+++ b/usr.bin/logname/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 1996/06/26 05:36:03 deraadt Exp $
-# $NetBSD: Makefile,v 1.3 1994/12/22 06:33:38 jtc Exp $
+# $OpenBSD: Makefile,v 1.3 1997/09/21 11:49:42 deraadt Exp $
PROG= logname
diff --git a/usr.bin/look/Makefile b/usr.bin/look/Makefile
index a1da7f67e99..f6ce4ae7785 100644
--- a/usr.bin/look/Makefile
+++ b/usr.bin/look/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 1996/06/26 05:36:05 deraadt Exp $
-# $NetBSD: Makefile,v 1.3 1994/12/23 01:10:55 jtc Exp $
+# $OpenBSD: Makefile,v 1.3 1997/09/21 11:49:44 deraadt Exp $
PROG= look
diff --git a/usr.bin/lorder/Makefile b/usr.bin/lorder/Makefile
index ab958f6bbeb..516ec946b0e 100644
--- a/usr.bin/lorder/Makefile
+++ b/usr.bin/lorder/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 1997/04/27 20:56:48 millert Exp $
-# $NetBSD: Makefile,v 1.9 1995/12/18 07:59:12 jonathan Exp $
+# $OpenBSD: Makefile,v 1.7 1997/09/21 11:49:46 deraadt Exp $
MAN= lorder.1
diff --git a/usr.bin/m4/Makefile b/usr.bin/m4/Makefile
index 7f7df268cae..b75b373c1ab 100644
--- a/usr.bin/m4/Makefile
+++ b/usr.bin/m4/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 1996/06/26 05:36:10 deraadt Exp $
-
+# $OpenBSD: Makefile,v 1.3 1997/09/21 11:49:47 deraadt Exp $
# -DEXTENDED
# if you want the paste & spaste macros.
diff --git a/usr.bin/mail/Makefile b/usr.bin/mail/Makefile
index bc9daa66cce..37765d90087 100644
--- a/usr.bin/mail/Makefile
+++ b/usr.bin/mail/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 1997/07/28 10:01:12 deraadt Exp $
-# $NetBSD: Makefile,v 1.8 1996/06/08 19:48:09 christos Exp $
+# $OpenBSD: Makefile,v 1.8 1997/09/21 11:49:50 deraadt Exp $
PROG= mail
SRCS= version.c aux.c cmd1.c cmd2.c cmd3.c cmdtab.c collect.c \
diff --git a/usr.bin/make/Makefile b/usr.bin/make/Makefile
index 94197df72bb..27e3624aca6 100644
--- a/usr.bin/make/Makefile
+++ b/usr.bin/make/Makefile
@@ -1,6 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 1996/11/30 21:08:48 millert Exp $
-# $NetBSD: Makefile,v 1.12 1996/11/06 17:58:58 christos Exp $
-# @(#)Makefile 5.2 (Berkeley) 12/28/90
+# $OpenBSD: Makefile,v 1.6 1997/09/21 11:49:52 deraadt Exp $
PROG= make
CFLAGS+= -I${.CURDIR} -Wall -Wno-unused #-Wmissing-prototypes -Wstrict-prototypes
diff --git a/usr.bin/make/Makefile.boot b/usr.bin/make/Makefile.boot
index c51fb1e01e2..20ddcaeda53 100644
--- a/usr.bin/make/Makefile.boot
+++ b/usr.bin/make/Makefile.boot
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile.boot,v 1.4 1997/04/01 07:28:02 millert Exp $
-# $NetBSD: Makefile.boot,v 1.8 1996/12/31 17:52:23 christos Exp $
+# $OpenBSD: Makefile.boot,v 1.5 1997/09/21 11:49:53 deraadt Exp $
#
# a very simple makefile...
#
diff --git a/usr.bin/man/Makefile b/usr.bin/man/Makefile
index 63dc8ee148b..a51de2d944d 100644
--- a/usr.bin/man/Makefile
+++ b/usr.bin/man/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 1996/06/26 05:36:59 deraadt Exp $
-# $NetBSD: Makefile,v 1.6 1995/09/28 06:05:11 tls Exp $
+# $OpenBSD: Makefile,v 1.3 1997/09/21 11:49:57 deraadt Exp $
PROG= man
SRCS= config.c man.c
diff --git a/usr.bin/mesg/Makefile b/usr.bin/mesg/Makefile
index bc47279900b..f3e8c3eb876 100644
--- a/usr.bin/mesg/Makefile
+++ b/usr.bin/mesg/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 1996/06/26 05:37:04 deraadt Exp $
-# $NetBSD: Makefile,v 1.3 1994/12/23 07:16:29 jtc Exp $
+# $OpenBSD: Makefile,v 1.3 1997/09/21 11:50:00 deraadt Exp $
PROG= mesg
diff --git a/usr.bin/mkdep/Makefile b/usr.bin/mkdep/Makefile
index f321659f8a9..74e6f63e094 100644
--- a/usr.bin/mkdep/Makefile
+++ b/usr.bin/mkdep/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 1997/04/27 20:56:50 millert Exp $
-# $NetBSD: Makefile,v 1.6 1994/12/23 07:34:55 jtc Exp $
+# $OpenBSD: Makefile,v 1.5 1997/09/21 11:50:02 deraadt Exp $
MAN= mkdep.1
diff --git a/usr.bin/mkfifo/Makefile b/usr.bin/mkfifo/Makefile
index 98c194f9bd8..ae91c610e1a 100644
--- a/usr.bin/mkfifo/Makefile
+++ b/usr.bin/mkfifo/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 1996/06/26 05:37:10 deraadt Exp $
-# $NetBSD: Makefile,v 1.3 1994/12/23 07:16:52 jtc Exp $
+# $OpenBSD: Makefile,v 1.3 1997/09/21 11:50:04 deraadt Exp $
PROG= mkfifo
diff --git a/usr.bin/mkstr/Makefile b/usr.bin/mkstr/Makefile
index e5edc293e5a..9145f04492e 100644
--- a/usr.bin/mkstr/Makefile
+++ b/usr.bin/mkstr/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 1996/06/26 05:37:12 deraadt Exp $
-# $NetBSD: Makefile,v 1.3 1995/09/28 06:22:18 tls Exp $
+# $OpenBSD: Makefile,v 1.3 1997/09/21 11:50:06 deraadt Exp $
PROG= mkstr
diff --git a/usr.bin/more/Makefile b/usr.bin/more/Makefile
index 94e834fd1cb..b7611c240f1 100644
--- a/usr.bin/more/Makefile
+++ b/usr.bin/more/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 1997/04/27 20:56:51 millert Exp $
-# @(#)Makefile 5.11 (Berkeley) 6/25/90
+# $OpenBSD: Makefile,v 1.8 1997/09/21 11:50:08 deraadt Exp $
PROG= more
DPADD= ${LIBTERM} ${LIBCOMPAT}
diff --git a/usr.bin/msgs/Makefile b/usr.bin/msgs/Makefile
index 49873d73310..f73804fb5b0 100644
--- a/usr.bin/msgs/Makefile
+++ b/usr.bin/msgs/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 1997/04/28 05:48:32 downsj Exp $
-# $NetBSD: Makefile,v 1.6 1995/09/28 06:57:37 tls Exp $
+# $OpenBSD: Makefile,v 1.5 1997/09/21 11:50:11 deraadt Exp $
PROG= msgs
DPADD= ${LIBTERMLIB}
diff --git a/usr.bin/nc/Makefile b/usr.bin/nc/Makefile
index 9170bcaba93..086a9e5ee8d 100644
--- a/usr.bin/nc/Makefile
+++ b/usr.bin/nc/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.1 1996/09/05 08:55:31 deraadt Exp $
-# $NetBSD: Makefile,v 1.11 1995/10/03 21:42:34 thorpej Exp $
+# $OpenBSD: Makefile,v 1.2 1997/09/21 11:50:13 deraadt Exp $
CFLAGS+= -DTELNET
PROG= nc
diff --git a/usr.bin/netstat/Makefile b/usr.bin/netstat/Makefile
index f165a4a5121..fa2b52ddd77 100644
--- a/usr.bin/netstat/Makefile
+++ b/usr.bin/netstat/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 1997/07/23 04:38:32 denny Exp $
-# $NetBSD: Makefile,v 1.11 1995/10/03 21:42:34 thorpej Exp $
+# $OpenBSD: Makefile,v 1.5 1997/09/21 11:50:15 deraadt Exp $
PROG= netstat
SRCS= if.c inet.c ipx.c iso.c main.c mbuf.c mroute.c ns.c route.c \
diff --git a/usr.bin/nfsstat/Makefile b/usr.bin/nfsstat/Makefile
index 0110fa511ad..2c49ca1efcc 100644
--- a/usr.bin/nfsstat/Makefile
+++ b/usr.bin/nfsstat/Makefile
@@ -1,6 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 1996/03/27 19:32:47 niklas Exp $
-# $NetBSD: Makefile,v 1.5 1996/03/03 17:21:25 thorpej Exp $
-# from: @(#)Makefile 8.1 (Berkeley) 6/6/93
+# $OpenBSD: Makefile,v 1.3 1997/09/21 11:50:17 deraadt Exp $
PROG= nfsstat
CFLAGS+=-DNFS
diff --git a/usr.bin/nice/Makefile b/usr.bin/nice/Makefile
index 0654ece68d6..b6008481308 100644
--- a/usr.bin/nice/Makefile
+++ b/usr.bin/nice/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 1996/06/26 05:37:30 deraadt Exp $
-# $NetBSD: Makefile,v 1.3 1995/08/31 23:30:56 jtc Exp $
+# $OpenBSD: Makefile,v 1.3 1997/09/21 11:50:19 deraadt Exp $
PROG= nice
diff --git a/usr.bin/nm/Makefile b/usr.bin/nm/Makefile
index 790e1ca83fe..c14a3c13035 100644
--- a/usr.bin/nm/Makefile
+++ b/usr.bin/nm/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 1996/06/26 05:37:32 deraadt Exp $
-# $NetBSD: Makefile,v 1.3 1995/08/31 23:41:57 jtc Exp $
+# $OpenBSD: Makefile,v 1.3 1997/09/21 11:50:21 deraadt Exp $
PROG= nm
diff --git a/usr.bin/nohup/Makefile b/usr.bin/nohup/Makefile
index 1aa4d750409..5c0bc8d89da 100644
--- a/usr.bin/nohup/Makefile
+++ b/usr.bin/nohup/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 1996/06/26 05:37:34 deraadt Exp $
-# $NetBSD: Makefile,v 1.3 1995/08/31 23:35:23 jtc Exp $
+# $OpenBSD: Makefile,v 1.3 1997/09/21 11:50:24 deraadt Exp $
PROG= nohup
diff --git a/usr.bin/pagesize/Makefile b/usr.bin/pagesize/Makefile
index 92771b5a963..f892df3d125 100644
--- a/usr.bin/pagesize/Makefile
+++ b/usr.bin/pagesize/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 1997/04/27 20:56:52 millert Exp $
-# $NetBSD: Makefile,v 1.6 1995/09/05 01:11:10 cgd Exp $
+# $OpenBSD: Makefile,v 1.5 1997/09/21 11:50:26 deraadt Exp $
MAN= pagesize.1
diff --git a/usr.bin/pctr/Makefile b/usr.bin/pctr/Makefile
index 4cbe4b008ff..a275c00acd7 100644
--- a/usr.bin/pctr/Makefile
+++ b/usr.bin/pctr/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.1 1996/08/14 22:31:47 dm Exp $
-# $NetBSD: Makefile,v 1.7 1995/09/28 06:24:35 perry Exp $
+# $OpenBSD: Makefile,v 1.2 1997/09/21 11:50:29 deraadt Exp $
PROG= pctr
NOMAN= yes
diff --git a/usr.bin/rdist/Makefile b/usr.bin/rdist/Makefile
index c7381ed0fc5..164a248edcd 100644
--- a/usr.bin/rdist/Makefile
+++ b/usr.bin/rdist/Makefile
@@ -1,6 +1,5 @@
-# $OpenBSD: Makefile,v 1.9 1997/07/22 06:59:37 millert Exp $
-#
-# from: @(#)Makefile 5.11 (Berkeley) 3/12/91
+# $OpenBSD: Makefile,v 1.10 1997/09/21 11:50:32 deraadt Exp $
+
PROG= rdist
CFLAGS+=-I. -DOS_H=\"os-openbsd.h\"
diff --git a/usr.bin/rev/Makefile b/usr.bin/rev/Makefile
index 4e08e07d686..0ecd4cc8c68 100644
--- a/usr.bin/rev/Makefile
+++ b/usr.bin/rev/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 1996/06/26 05:38:28 deraadt Exp $
-# $NetBSD: Makefile,v 1.3 1995/09/28 08:49:37 tls Exp $
+# $OpenBSD: Makefile,v 1.3 1997/09/21 11:50:34 deraadt Exp $
PROG= rev
diff --git a/usr.bin/rlogin/Makefile b/usr.bin/rlogin/Makefile
index 89dfba83647..16d4fbbb20a 100644
--- a/usr.bin/rlogin/Makefile
+++ b/usr.bin/rlogin/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 1997/04/19 21:26:28 millert Exp $
-# $NetBSD: Makefile,v 1.5 1995/03/21 07:58:28 cgd Exp $
+# $OpenBSD: Makefile,v 1.5 1997/09/21 11:50:36 deraadt Exp $
PROG= rlogin
SRCS= rlogin.c
diff --git a/usr.bin/rpcgen/Makefile b/usr.bin/rpcgen/Makefile
index c9210fd9904..b5decaa437a 100644
--- a/usr.bin/rpcgen/Makefile
+++ b/usr.bin/rpcgen/Makefile
@@ -1,6 +1,5 @@
-# $OpenBSD: Makefile,v 1.2 1996/06/26 05:38:34 deraadt Exp $
-# $NetBSD: Makefile,v 1.4 1995/06/11 21:49:50 pk Exp $
-#
+# $OpenBSD: Makefile,v 1.3 1997/09/21 11:50:38 deraadt Exp $
+
PROG= rpcgen
SRCS= rpc_clntout.c rpc_cout.c rpc_hout.c rpc_main.c rpc_parse.c rpc_scan.c \
rpc_svcout.c rpc_util.c rpc_sample.c rpc_tblout.c
diff --git a/usr.bin/script/Makefile b/usr.bin/script/Makefile
index 53cf0910033..d7dbf01c310 100644
--- a/usr.bin/script/Makefile
+++ b/usr.bin/script/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 1996/06/26 05:39:01 deraadt Exp $
-# $NetBSD: Makefile,v 1.3 1994/12/21 08:55:39 jtc Exp $
+# $OpenBSD: Makefile,v 1.3 1997/09/21 11:50:42 deraadt Exp $
PROG= script
LDADD= -lutil
diff --git a/usr.bin/shar/Makefile b/usr.bin/shar/Makefile
index 1a8026a505d..e85965f092c 100644
--- a/usr.bin/shar/Makefile
+++ b/usr.bin/shar/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 1997/04/27 20:56:53 millert Exp $
-# $NetBSD: Makefile,v 1.6 1994/12/22 12:30:52 cgd Exp $
+# $OpenBSD: Makefile,v 1.5 1997/09/21 11:50:44 deraadt Exp $
MAN= shar.1
diff --git a/usr.bin/showmount/Makefile b/usr.bin/showmount/Makefile
index bbb2deabc42..de050f6da13 100644
--- a/usr.bin/showmount/Makefile
+++ b/usr.bin/showmount/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 1996/06/26 05:39:15 deraadt Exp $
-# $NetBSD: Makefile,v 1.6 1994/12/22 12:30:53 cgd Exp $
+# $OpenBSD: Makefile,v 1.3 1997/09/21 11:50:46 deraadt Exp $
PROG= showmount
MAN= showmount.8
diff --git a/usr.bin/size/Makefile b/usr.bin/size/Makefile
index 322c709d35b..9cc055035b4 100644
--- a/usr.bin/size/Makefile
+++ b/usr.bin/size/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 1996/06/26 05:39:17 deraadt Exp $
-# $NetBSD: Makefile,v 1.3 1994/12/21 08:07:19 jtc Exp $
+# $OpenBSD: Makefile,v 1.3 1997/09/21 11:50:47 deraadt Exp $
PROG= size
diff --git a/usr.bin/skey/Makefile b/usr.bin/skey/Makefile
index f3e871f5a06..a32e64da341 100644
--- a/usr.bin/skey/Makefile
+++ b/usr.bin/skey/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.12 1997/07/23 04:24:37 millert Exp $
+# $OpenBSD: Makefile,v 1.13 1997/09/21 11:50:50 deraadt Exp $
PROG= skey
MAN= skey.1 skeyprune.8
diff --git a/usr.bin/skeyaudit/Makefile b/usr.bin/skeyaudit/Makefile
index 8769233b715..967b6727fbb 100644
--- a/usr.bin/skeyaudit/Makefile
+++ b/usr.bin/skeyaudit/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.1 1997/07/23 04:24:33 millert Exp $
+# $OpenBSD: Makefile,v 1.2 1997/09/21 11:50:51 deraadt Exp $
PROG= skeyaudit
BINOWN= root
diff --git a/usr.bin/skeyinfo/Makefile b/usr.bin/skeyinfo/Makefile
index 8c59930c648..1ca0f5836ec 100644
--- a/usr.bin/skeyinfo/Makefile
+++ b/usr.bin/skeyinfo/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.1 1997/07/23 04:10:52 millert Exp $
+# $OpenBSD: Makefile,v 1.2 1997/09/21 11:50:53 deraadt Exp $
PROG= skeyinfo
BINOWN= root
diff --git a/usr.bin/skeyinit/Makefile b/usr.bin/skeyinit/Makefile
index 52945ae4455..f2beaf1f55e 100644
--- a/usr.bin/skeyinit/Makefile
+++ b/usr.bin/skeyinit/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 1997/03/26 00:35:35 deraadt Exp $
+# $OpenBSD: Makefile,v 1.6 1997/09/21 11:50:55 deraadt Exp $
PROG= skeyinit
BINOWN=root
diff --git a/usr.bin/soelim/Makefile b/usr.bin/soelim/Makefile
index 6be166a28a2..4fad9a9bba6 100644
--- a/usr.bin/soelim/Makefile
+++ b/usr.bin/soelim/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 1996/06/26 05:39:25 deraadt Exp $
-# $NetBSD: Makefile,v 1.3 1994/12/21 08:11:23 jtc Exp $
+# $OpenBSD: Makefile,v 1.3 1997/09/21 11:50:56 deraadt Exp $
PROG= soelim
diff --git a/usr.bin/sort/Makefile b/usr.bin/sort/Makefile
index aed00b47835..c4978fdb619 100644
--- a/usr.bin/sort/Makefile
+++ b/usr.bin/sort/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.1 1997/01/20 19:39:46 millert Exp $
-# from: @(#)Makefile 8.1 (Berkeley) 6/6/93
+# $OpenBSD: Makefile,v 1.2 1997/09/21 11:50:57 deraadt Exp $
PROG= sort
SRCS= append.c fields.c files.c fsort.c init.c msort.c sort.c tmp.c
diff --git a/usr.bin/split/Makefile b/usr.bin/split/Makefile
index 2babfb9d8e0..e74d1a1f5d1 100644
--- a/usr.bin/split/Makefile
+++ b/usr.bin/split/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 1996/06/26 05:39:27 deraadt Exp $
-# $NetBSD: Makefile,v 1.3 1994/12/21 08:20:33 jtc Exp $
+# $OpenBSD: Makefile,v 1.3 1997/09/21 11:50:59 deraadt Exp $
PROG= split
diff --git a/usr.bin/strings/Makefile b/usr.bin/strings/Makefile
index ec7b114ff35..dfb377e7fd2 100644
--- a/usr.bin/strings/Makefile
+++ b/usr.bin/strings/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 1996/06/26 05:39:29 deraadt Exp $
-# $NetBSD: Makefile,v 1.3 1994/12/10 11:54:22 jtc Exp $
+# $OpenBSD: Makefile,v 1.3 1997/09/21 11:51:00 deraadt Exp $
PROG= strings
diff --git a/usr.bin/systat/Makefile b/usr.bin/systat/Makefile
index 33a391f724b..16dba3b3208 100644
--- a/usr.bin/systat/Makefile
+++ b/usr.bin/systat/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 1996/06/02 05:54:36 tholo Exp $
-# $NetBSD: Makefile,v 1.5 1996/05/10 23:16:30 thorpej Exp $
+# $OpenBSD: Makefile,v 1.5 1997/09/21 11:51:02 deraadt Exp $
PROG= systat
diff --git a/usr.bin/tail/Makefile b/usr.bin/tail/Makefile
index 42f7cd7cd10..6b94b2c250e 100644
--- a/usr.bin/tail/Makefile
+++ b/usr.bin/tail/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 1997/01/12 23:43:03 millert Exp $
-# $NetBSD: Makefile,v 1.3 1994/11/23 07:41:55 jtc Exp $
+# $OpenBSD: Makefile,v 1.4 1997/09/21 11:51:04 deraadt Exp $
PROG= tail
SRCS= forward.c read.c reverse.c tail.c
diff --git a/usr.bin/talk/Makefile b/usr.bin/talk/Makefile
index 117b5606194..4548b7a59fd 100644
--- a/usr.bin/talk/Makefile
+++ b/usr.bin/talk/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 1996/06/26 05:40:19 deraadt Exp $
-# $NetBSD: Makefile,v 1.3 1994/12/09 02:14:09 jtc Exp $
+# $OpenBSD: Makefile,v 1.4 1997/09/21 11:51:06 deraadt Exp $
PROG= talk
DPADD= ${LIBCURSES} ${LIBTERMLIB} ${LIBCOMPAT}
diff --git a/usr.bin/tcopy/Makefile b/usr.bin/tcopy/Makefile
index 185f6189569..8e488e8a2e2 100644
--- a/usr.bin/tcopy/Makefile
+++ b/usr.bin/tcopy/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 1996/06/26 05:40:28 deraadt Exp $
-# $NetBSD: Makefile,v 1.3 1994/12/09 02:14:35 jtc Exp $
+# $OpenBSD: Makefile,v 1.3 1997/09/21 11:51:07 deraadt Exp $
PROG= tcopy
diff --git a/usr.bin/tee/Makefile b/usr.bin/tee/Makefile
index c0dd457875f..17abecc711e 100644
--- a/usr.bin/tee/Makefile
+++ b/usr.bin/tee/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 1996/06/26 05:40:30 deraadt Exp $
-# $NetBSD: Makefile,v 1.4 1994/12/09 01:43:36 jtc Exp $
+# $OpenBSD: Makefile,v 1.3 1997/09/21 11:51:09 deraadt Exp $
PROG= tee
diff --git a/usr.bin/telnet/Makefile b/usr.bin/telnet/Makefile
index ddc3992de6d..359314d4f07 100644
--- a/usr.bin/telnet/Makefile
+++ b/usr.bin/telnet/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 1997/03/26 00:35:39 deraadt Exp $
-# $NetBSD: Makefile,v 1.6 1996/02/28 21:03:49 thorpej Exp $
+# $OpenBSD: Makefile,v 1.5 1997/09/21 11:51:10 deraadt Exp $
#
# Copyright (c) 1990 The Regents of the University of California.
# All rights reserved.
diff --git a/usr.bin/tftp/Makefile b/usr.bin/tftp/Makefile
index 10e2b97e8c5..42dc100768c 100644
--- a/usr.bin/tftp/Makefile
+++ b/usr.bin/tftp/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 1996/06/26 05:40:33 deraadt Exp $
-# $NetBSD: Makefile,v 1.3 1994/12/08 09:51:23 jtc Exp $
+# $OpenBSD: Makefile,v 1.3 1997/09/21 11:51:13 deraadt Exp $
PROG= tftp
SRCS= main.c tftp.c tftpsubs.c
diff --git a/usr.bin/time/Makefile b/usr.bin/time/Makefile
index 979255e07e4..bba032d0efa 100644
--- a/usr.bin/time/Makefile
+++ b/usr.bin/time/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 1996/06/26 05:40:38 deraadt Exp $
-# $NetBSD: Makefile,v 1.3 1994/12/08 09:36:55 jtc Exp $
+# $OpenBSD: Makefile,v 1.3 1997/09/21 11:51:14 deraadt Exp $
PROG= time
diff --git a/usr.bin/tip/Makefile b/usr.bin/tip/Makefile
index 569da25a163..aec4dc90dbd 100644
--- a/usr.bin/tip/Makefile
+++ b/usr.bin/tip/Makefile
@@ -1,6 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 1997/07/21 05:25:29 deraadt Exp $
-# $NetBSD: Makefile,v 1.5 1996/12/29 10:36:37 cgd Exp $
-# @(#)Makefile 8.1 (Berkeley) 6/6/93
+# $OpenBSD: Makefile,v 1.6 1997/09/21 11:51:16 deraadt Exp $
#
# Files are:
# /etc/remote remote host description file
diff --git a/usr.bin/touch/Makefile b/usr.bin/touch/Makefile
index 97f40783165..401bf455acf 100644
--- a/usr.bin/touch/Makefile
+++ b/usr.bin/touch/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 1996/06/26 05:41:43 deraadt Exp $
-# $NetBSD: Makefile,v 1.3 1994/12/07 09:19:47 jtc Exp $
+# $OpenBSD: Makefile,v 1.3 1997/09/21 11:51:19 deraadt Exp $
PROG= touch
diff --git a/usr.bin/tput/Makefile b/usr.bin/tput/Makefile
index 8a21bd6f2c8..5ad0bfdc0c4 100644
--- a/usr.bin/tput/Makefile
+++ b/usr.bin/tput/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 1997/03/07 21:54:48 gene Exp $
-# $NetBSD: Makefile,v 1.3 1994/12/07 08:49:07 jtc Exp $
+# $OpenBSD: Makefile,v 1.5 1997/09/21 11:51:21 deraadt Exp $
PROG= tput
DPADD= ${LIBTERMCAP}
diff --git a/usr.bin/tr/Makefile b/usr.bin/tr/Makefile
index b534698f099..0e7ddda2c34 100644
--- a/usr.bin/tr/Makefile
+++ b/usr.bin/tr/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 1996/06/26 05:41:48 deraadt Exp $
-# $NetBSD: Makefile,v 1.4 1994/12/07 08:35:02 jtc Exp $
+# $OpenBSD: Makefile,v 1.3 1997/09/21 11:51:22 deraadt Exp $
PROG= tr
SRCS= str.c tr.c
diff --git a/usr.bin/tset/Makefile b/usr.bin/tset/Makefile
index 8b748e09836..1d5849a8b6a 100644
--- a/usr.bin/tset/Makefile
+++ b/usr.bin/tset/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 1996/06/26 05:41:54 deraadt Exp $
-# $NetBSD: Makefile,v 1.3 1994/12/07 05:08:04 jtc Exp $
+# $OpenBSD: Makefile,v 1.3 1997/09/21 11:51:24 deraadt Exp $
PROG= tset
SRCS= map.c misc.c set.c term.c tset.c wrterm.c
diff --git a/usr.bin/tsort/Makefile b/usr.bin/tsort/Makefile
index d2b6c2ab321..5229e3110ca 100644
--- a/usr.bin/tsort/Makefile
+++ b/usr.bin/tsort/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 1996/06/26 05:41:59 deraadt Exp $
-# $NetBSD: Makefile,v 1.3 1994/12/07 01:06:23 jtc Exp $
+# $OpenBSD: Makefile,v 1.3 1997/09/21 11:51:25 deraadt Exp $
PROG= tsort
diff --git a/usr.bin/tty/Makefile b/usr.bin/tty/Makefile
index 60ca6211317..1431beb70e3 100644
--- a/usr.bin/tty/Makefile
+++ b/usr.bin/tty/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 1996/06/26 05:42:01 deraadt Exp $
-# $NetBSD: Makefile,v 1.3 1994/12/07 00:46:54 jtc Exp $
+# $OpenBSD: Makefile,v 1.3 1997/09/21 11:51:27 deraadt Exp $
PROG= tty
diff --git a/usr.bin/ul/Makefile b/usr.bin/ul/Makefile
index a55035223b4..ce63bdc3020 100644
--- a/usr.bin/ul/Makefile
+++ b/usr.bin/ul/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 1996/06/26 05:42:03 deraadt Exp $
-# $NetBSD: Makefile,v 1.3 1994/12/07 00:28:21 jtc Exp $
+# $OpenBSD: Makefile,v 1.3 1997/09/21 11:51:28 deraadt Exp $
PROG= ul
DPADD= ${LIBTERMCAP}
diff --git a/usr.bin/unexpand/Makefile b/usr.bin/unexpand/Makefile
index 4213fee36fb..e850216f00f 100644
--- a/usr.bin/unexpand/Makefile
+++ b/usr.bin/unexpand/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 1996/06/26 05:42:08 deraadt Exp $
-# $NetBSD: Makefile,v 1.3 1994/12/07 00:36:39 jtc Exp $
+# $OpenBSD: Makefile,v 1.3 1997/09/21 11:51:30 deraadt Exp $
PROG= unexpand
NOMAN= noman
diff --git a/usr.bin/unifdef/Makefile b/usr.bin/unifdef/Makefile
index 41a17987df4..3c17eaaf066 100644
--- a/usr.bin/unifdef/Makefile
+++ b/usr.bin/unifdef/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 1996/06/26 05:42:09 deraadt Exp $
-# $NetBSD: Makefile,v 1.3 1994/12/07 00:33:47 jtc Exp $
+# $OpenBSD: Makefile,v 1.3 1997/09/21 11:51:32 deraadt Exp $
PROG= unifdef
diff --git a/usr.bin/uniq/Makefile b/usr.bin/uniq/Makefile
index 4269e6d1920..52dadb7df4e 100644
--- a/usr.bin/uniq/Makefile
+++ b/usr.bin/uniq/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 1996/06/26 05:42:12 deraadt Exp $
-# $NetBSD: Makefile,v 1.3 1994/12/06 07:51:12 jtc Exp $
+# $OpenBSD: Makefile,v 1.3 1997/09/21 11:51:33 deraadt Exp $
PROG= uniq
diff --git a/usr.bin/unvis/Makefile b/usr.bin/unvis/Makefile
index 63c8bd56251..9b6e0f93288 100644
--- a/usr.bin/unvis/Makefile
+++ b/usr.bin/unvis/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 1996/06/26 05:42:17 deraadt Exp $
-# $NetBSD: Makefile,v 1.3 1994/12/06 07:36:07 jtc Exp $
+# $OpenBSD: Makefile,v 1.3 1997/09/21 11:51:36 deraadt Exp $
PROG= unvis
diff --git a/usr.bin/users/Makefile b/usr.bin/users/Makefile
index defc3606489..d66d972adb7 100644
--- a/usr.bin/users/Makefile
+++ b/usr.bin/users/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 1996/06/26 05:42:19 deraadt Exp $
-# $NetBSD: Makefile,v 1.3 1994/12/06 07:32:26 jtc Exp $
+# $OpenBSD: Makefile,v 1.3 1997/09/21 11:51:37 deraadt Exp $
PROG= users
diff --git a/usr.bin/uudecode/Makefile b/usr.bin/uudecode/Makefile
index d80f3376b42..171815d7811 100644
--- a/usr.bin/uudecode/Makefile
+++ b/usr.bin/uudecode/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 1996/06/26 05:42:21 deraadt Exp $
-# $NetBSD: Makefile,v 1.3 1994/11/17 07:39:34 jtc Exp $
+# $OpenBSD: Makefile,v 1.3 1997/09/21 11:51:39 deraadt Exp $
PROG= uudecode
NOMAN= noman
diff --git a/usr.bin/uuencode/Makefile b/usr.bin/uuencode/Makefile
index 0d40494abe8..c79e802b8a5 100644
--- a/usr.bin/uuencode/Makefile
+++ b/usr.bin/uuencode/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 1996/06/26 05:42:22 deraadt Exp $
-# $NetBSD: Makefile,v 1.4 1994/12/22 12:31:20 cgd Exp $
+# $OpenBSD: Makefile,v 1.5 1997/09/21 11:51:40 deraadt Exp $
PROG= uuencode
MAN= uuencode.1 uuencode.5
diff --git a/usr.bin/vacation/Makefile b/usr.bin/vacation/Makefile
index ffa81318566..2ce16a59da3 100644
--- a/usr.bin/vacation/Makefile
+++ b/usr.bin/vacation/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 1996/06/26 05:42:25 deraadt Exp $
-# $NetBSD: Makefile,v 1.3 1994/11/17 07:55:49 jtc Exp $
+# $OpenBSD: Makefile,v 1.3 1997/09/21 11:51:42 deraadt Exp $
PROG= vacation
diff --git a/usr.bin/vgrind/Makefile b/usr.bin/vgrind/Makefile
index 2af2aa68595..cccaf7a0753 100644
--- a/usr.bin/vgrind/Makefile
+++ b/usr.bin/vgrind/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 1997/04/27 20:56:57 millert Exp $
-# $NetBSD: Makefile,v 1.5 1994/12/23 21:11:56 pk Exp $
+# $OpenBSD: Makefile,v 1.5 1997/09/21 11:51:44 deraadt Exp $
PROG= vfontedpr
SRCS= regexp.c vfontedpr.c
diff --git a/usr.bin/vi/Makefile b/usr.bin/vi/Makefile
index 52c0bacb5ae..06f07227fbc 100644
--- a/usr.bin/vi/Makefile
+++ b/usr.bin/vi/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 1997/07/27 22:27:52 downsj Exp $
-# $NetBSD: Makefile,v 1.7 1996/05/20 03:47:00 mrg Exp $
+# $OpenBSD: Makefile,v 1.7 1997/09/21 11:51:46 deraadt Exp $
SUBDIR= build
#SUBDIR+=docs/USD.doc/edit docs/USD.doc/exref docs/USD.doc/vi.ref docs/USD.doc/vitut
diff --git a/usr.bin/vis/Makefile b/usr.bin/vis/Makefile
index 3a7c1c4f316..28236038d75 100644
--- a/usr.bin/vis/Makefile
+++ b/usr.bin/vis/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 1996/06/26 05:42:37 deraadt Exp $
-# $NetBSD: Makefile,v 1.3 1994/11/17 07:55:57 jtc Exp $
+# $OpenBSD: Makefile,v 1.3 1997/09/21 11:51:50 deraadt Exp $
PROG= vis
SRCS= vis.c foldit.c
diff --git a/usr.bin/vmstat/Makefile b/usr.bin/vmstat/Makefile
index 83a345f760e..a9b057cbe9e 100644
--- a/usr.bin/vmstat/Makefile
+++ b/usr.bin/vmstat/Makefile
@@ -1,6 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 1996/05/22 11:35:41 deraadt Exp $
-# $NetBSD: Makefile,v 1.15 1996/05/10 23:19:25 thorpej Exp $
-# @(#)Makefile 8.1 (Berkeley) 6/6/93
+# $OpenBSD: Makefile,v 1.4 1997/09/21 11:51:52 deraadt Exp $
PROG= vmstat
diff --git a/usr.bin/w/Makefile b/usr.bin/w/Makefile
index 8bfc85f7524..5071d300c96 100644
--- a/usr.bin/w/Makefile
+++ b/usr.bin/w/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 1996/06/26 05:42:42 deraadt Exp $
-
+# $OpenBSD: Makefile,v 1.3 1997/09/21 11:51:54 deraadt Exp $
PROG= w
SRCS= fmt.c pr_time.c proc_compare.c w.c
diff --git a/usr.bin/wall/Makefile b/usr.bin/wall/Makefile
index f9fbe234c43..c22a616b3dc 100644
--- a/usr.bin/wall/Makefile
+++ b/usr.bin/wall/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 1996/06/26 05:42:46 deraadt Exp $
-# $NetBSD: Makefile,v 1.3 1994/11/17 07:17:53 jtc Exp $
+# $OpenBSD: Makefile,v 1.3 1997/09/21 11:51:56 deraadt Exp $
PROG= wall
SRCS= ttymsg.c wall.c
diff --git a/usr.bin/what/Makefile b/usr.bin/what/Makefile
index 3b7416b759a..752492dd335 100644
--- a/usr.bin/what/Makefile
+++ b/usr.bin/what/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 1996/06/26 05:42:51 deraadt Exp $
-# $NetBSD: Makefile,v 1.3 1994/11/17 06:59:37 jtc Exp $
+# $OpenBSD: Makefile,v 1.3 1997/09/21 11:51:58 deraadt Exp $
PROG= what
diff --git a/usr.bin/whatis/Makefile b/usr.bin/whatis/Makefile
index 2a790f49f4a..9b844c2ef1a 100644
--- a/usr.bin/whatis/Makefile
+++ b/usr.bin/whatis/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 1996/06/26 05:42:53 deraadt Exp $
-
+# $OpenBSD: Makefile,v 1.3 1997/09/21 11:51:59 deraadt Exp $
PROG= whatis
SRCS= whatis.c config.c
diff --git a/usr.bin/who/Makefile b/usr.bin/who/Makefile
index e9448564bfa..a4bfc380afa 100644
--- a/usr.bin/who/Makefile
+++ b/usr.bin/who/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 1996/06/26 05:42:59 deraadt Exp $
-# $NetBSD: Makefile,v 1.3 1994/11/14 05:13:14 jtc Exp $
+# $OpenBSD: Makefile,v 1.3 1997/09/21 11:52:02 deraadt Exp $
PROG= who
diff --git a/usr.bin/whois/Makefile b/usr.bin/whois/Makefile
index bcc22b7210d..8ddf62321b2 100644
--- a/usr.bin/whois/Makefile
+++ b/usr.bin/whois/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 1996/06/26 05:43:01 deraadt Exp $
-# $NetBSD: Makefile,v 1.3 1994/11/14 05:13:23 jtc Exp $
+# $OpenBSD: Makefile,v 1.3 1997/09/21 11:52:04 deraadt Exp $
PROG= whois
diff --git a/usr.bin/window/Makefile b/usr.bin/window/Makefile
index 150d2cbf99e..2dc602fc8bd 100644
--- a/usr.bin/window/Makefile
+++ b/usr.bin/window/Makefile
@@ -1,6 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 1997/02/25 00:03:49 downsj Exp $
-# $NetBSD: Makefile,v 1.6 1995/12/21 05:24:49 mycroft Exp $
-# @(#)Makefile 8.1 (Berkeley) 6/6/93
+# $OpenBSD: Makefile,v 1.5 1997/09/21 11:52:06 deraadt Exp $
PROG= window
SRCS= char.c cmd.c cmd1.c cmd2.c cmd3.c cmd4.c cmd5.c cmd6.c cmd7.c \
diff --git a/usr.bin/xargs/Makefile b/usr.bin/xargs/Makefile
index 921a1f70408..0118885f85b 100644
--- a/usr.bin/xargs/Makefile
+++ b/usr.bin/xargs/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 1996/06/26 05:44:01 deraadt Exp $
-# $NetBSD: Makefile,v 1.3 1994/11/14 06:51:37 jtc Exp $
+# $OpenBSD: Makefile,v 1.3 1997/09/21 11:52:09 deraadt Exp $
PROG= xargs
diff --git a/usr.bin/xinstall/Makefile b/usr.bin/xinstall/Makefile
index 47f5baf4f5e..b6922ad5681 100644
--- a/usr.bin/xinstall/Makefile
+++ b/usr.bin/xinstall/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 1997/04/27 20:56:59 millert Exp $
-# $NetBSD: Makefile,v 1.7 1994/12/22 12:31:39 cgd Exp $
+# $OpenBSD: Makefile,v 1.5 1997/09/21 11:52:11 deraadt Exp $
PROG= xinstall
SRCS= stat_flags.c xinstall.c
diff --git a/usr.bin/xlint/Makefile b/usr.bin/xlint/Makefile
index 89fe2bc7a1b..78522e050b1 100644
--- a/usr.bin/xlint/Makefile
+++ b/usr.bin/xlint/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 1996/06/26 05:44:06 deraadt Exp $
-# $NetBSD: Makefile,v 1.2 1995/07/03 21:23:45 cgd Exp $
+# $OpenBSD: Makefile,v 1.3 1997/09/21 11:52:12 deraadt Exp $
SUBDIR= lint1 lint2 xlint llib
diff --git a/usr.bin/xstr/Makefile b/usr.bin/xstr/Makefile
index 620b6659b22..1a171a85793 100644
--- a/usr.bin/xstr/Makefile
+++ b/usr.bin/xstr/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 1996/06/26 05:44:32 deraadt Exp $
-# $NetBSD: Makefile,v 1.3 1994/11/14 04:56:21 jtc Exp $
+# $OpenBSD: Makefile,v 1.3 1997/09/21 11:52:15 deraadt Exp $
PROG= xstr
diff --git a/usr.bin/yes/Makefile b/usr.bin/yes/Makefile
index b5a19438ab7..a6b87ace02c 100644
--- a/usr.bin/yes/Makefile
+++ b/usr.bin/yes/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 1996/06/26 05:44:43 deraadt Exp $
-# $NetBSD: Makefile,v 1.3 1994/11/14 04:56:13 jtc Exp $
+# $OpenBSD: Makefile,v 1.3 1997/09/21 11:52:17 deraadt Exp $
PROG= yes
diff --git a/usr.bin/ypwhich/Makefile b/usr.bin/ypwhich/Makefile
index 301e2cd1dd1..c81fe379c68 100644
--- a/usr.bin/ypwhich/Makefile
+++ b/usr.bin/ypwhich/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 1996/05/21 21:32:43 deraadt Exp $
+# $OpenBSD: Makefile,v 1.3 1997/09/21 11:52:19 deraadt Exp $
# from: @(#)Makefile 5.8 (Berkeley) 7/28/90
PROG= ypwhich