summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>1996-06-26 05:44:45 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>1996-06-26 05:44:45 +0000
commitf78c2ff8497d138d7dcd5ffdd1762b8506ac023a (patch)
treed866f71b8ad5a1e57f31fa90b31e9c70af075787
parent79e97129ab796ff93029b3a8d0d89519754bfece (diff)
rcsid
-rw-r--r--usr.bin/Makefile.inc3
-rw-r--r--usr.bin/apply/Makefile2
-rw-r--r--usr.bin/apply/apply.11
-rw-r--r--usr.bin/apply/apply.c3
-rw-r--r--usr.bin/apropos/Makefile2
-rw-r--r--usr.bin/apropos/apropos.11
-rw-r--r--usr.bin/apropos/apropos.c3
-rw-r--r--usr.bin/ar/Makefile2
-rw-r--r--usr.bin/ar/append.c3
-rw-r--r--usr.bin/ar/ar.11
-rw-r--r--usr.bin/ar/ar.51
-rw-r--r--usr.bin/ar/ar.c3
-rw-r--r--usr.bin/ar/archive.h1
-rw-r--r--usr.bin/ar/contents.c3
-rw-r--r--usr.bin/ar/delete.c3
-rw-r--r--usr.bin/ar/extern.h1
-rw-r--r--usr.bin/ar/extract.c3
-rw-r--r--usr.bin/ar/misc.c3
-rw-r--r--usr.bin/ar/move.c3
-rw-r--r--usr.bin/ar/pathnames.h1
-rw-r--r--usr.bin/ar/print.c3
-rw-r--r--usr.bin/ar/replace.c3
-rw-r--r--usr.bin/asa/Makefile1
-rw-r--r--usr.bin/asa/asa.11
-rw-r--r--usr.bin/asa/asa.c3
-rw-r--r--usr.bin/at/Makefile1
-rw-r--r--usr.bin/at/at.11
-rw-r--r--usr.bin/at/at.c3
-rw-r--r--usr.bin/at/at.h1
-rw-r--r--usr.bin/at/panic.c3
-rw-r--r--usr.bin/at/panic.h1
-rw-r--r--usr.bin/at/parsetime.c3
-rw-r--r--usr.bin/at/parsetime.h1
-rw-r--r--usr.bin/at/pathnames.h1
-rw-r--r--usr.bin/at/privs.h1
-rw-r--r--usr.bin/banner/Makefile1
-rw-r--r--usr.bin/banner/banner.11
-rw-r--r--usr.bin/banner/banner.c3
-rw-r--r--usr.bin/banner/banner.h1
-rw-r--r--usr.bin/banner/chset.c3
-rw-r--r--usr.bin/basename/Makefile2
-rw-r--r--usr.bin/basename/basename.11
-rw-r--r--usr.bin/basename/basename.c3
-rw-r--r--usr.bin/bdes/Makefile1
-rw-r--r--usr.bin/bdes/bdes.11
-rw-r--r--usr.bin/bdes/bdes.c3
-rw-r--r--usr.bin/biff/Makefile2
-rw-r--r--usr.bin/biff/biff.11
-rw-r--r--usr.bin/biff/biff.c3
-rw-r--r--usr.bin/cal/Makefile2
-rw-r--r--usr.bin/cal/cal.11
-rw-r--r--usr.bin/cal/cal.c3
-rw-r--r--usr.bin/calendar/Makefile2
-rw-r--r--usr.bin/calendar/calendar.11
-rw-r--r--usr.bin/calendar/calendar.c3
-rw-r--r--usr.bin/calendar/pathnames.h1
-rw-r--r--usr.bin/cap_mkdb/Makefile2
-rw-r--r--usr.bin/cap_mkdb/cap_mkdb.11
-rw-r--r--usr.bin/cap_mkdb/cap_mkdb.c3
-rw-r--r--usr.bin/checknr/Makefile2
-rw-r--r--usr.bin/checknr/checknr.11
-rw-r--r--usr.bin/checknr/checknr.c3
-rw-r--r--usr.bin/chflags/Makefile2
-rw-r--r--usr.bin/chflags/chflags.11
-rw-r--r--usr.bin/chflags/chflags.c3
-rw-r--r--usr.bin/chpass/Makefile2
-rw-r--r--usr.bin/chpass/chpass.11
-rw-r--r--usr.bin/chpass/chpass.c3
-rw-r--r--usr.bin/chpass/chpass.h1
-rw-r--r--usr.bin/chpass/edit.c3
-rw-r--r--usr.bin/chpass/field.c3
-rw-r--r--usr.bin/chpass/pathnames.h1
-rw-r--r--usr.bin/chpass/pw_copy.c2
-rw-r--r--usr.bin/chpass/pw_copy.h2
-rw-r--r--usr.bin/chpass/pw_yp.c3
-rw-r--r--usr.bin/chpass/table.c3
-rw-r--r--usr.bin/chpass/util.c3
-rw-r--r--usr.bin/cksum/Makefile2
-rw-r--r--usr.bin/cksum/cksum.11
-rw-r--r--usr.bin/cksum/cksum.c3
-rw-r--r--usr.bin/cksum/extern.h1
-rw-r--r--usr.bin/cksum/print.c3
-rw-r--r--usr.bin/cmp/Makefile2
-rw-r--r--usr.bin/cmp/cmp.11
-rw-r--r--usr.bin/cmp/cmp.c3
-rw-r--r--usr.bin/cmp/extern.h1
-rw-r--r--usr.bin/cmp/misc.c3
-rw-r--r--usr.bin/cmp/regular.c3
-rw-r--r--usr.bin/cmp/special.c3
-rw-r--r--usr.bin/col/Makefile2
-rw-r--r--usr.bin/col/README2
-rw-r--r--usr.bin/col/col.11
-rw-r--r--usr.bin/col/col.c3
-rw-r--r--usr.bin/colcrt/Makefile2
-rw-r--r--usr.bin/colcrt/colcrt.11
-rw-r--r--usr.bin/colcrt/colcrt.c3
-rw-r--r--usr.bin/colrm/Makefile2
-rw-r--r--usr.bin/colrm/colrm.11
-rw-r--r--usr.bin/colrm/colrm.c3
-rw-r--r--usr.bin/column/Makefile2
-rw-r--r--usr.bin/column/column.11
-rw-r--r--usr.bin/column/column.c3
-rw-r--r--usr.bin/comm/Makefile2
-rw-r--r--usr.bin/comm/comm.11
-rw-r--r--usr.bin/comm/comm.c3
-rw-r--r--usr.bin/compress/Makefile2
-rw-r--r--usr.bin/compress/compress.11
-rw-r--r--usr.bin/compress/compress.c3
-rw-r--r--usr.bin/compress/doc/revision.log2
-rw-r--r--usr.bin/compress/zcat.sh1
-rw-r--r--usr.bin/compress/zopen.31
-rw-r--r--usr.bin/compress/zopen.c3
-rw-r--r--usr.bin/cpp/Makefile2
-rw-r--r--usr.bin/cpp/cpp.sh2
-rw-r--r--usr.bin/crontab/Makefile2
-rw-r--r--usr.bin/ctags/C.c3
-rw-r--r--usr.bin/ctags/Makefile2
-rw-r--r--usr.bin/ctags/ctags.11
-rw-r--r--usr.bin/ctags/ctags.c3
-rw-r--r--usr.bin/ctags/ctags.h1
-rw-r--r--usr.bin/ctags/fortran.c3
-rw-r--r--usr.bin/ctags/lisp.c3
-rw-r--r--usr.bin/ctags/print.c3
-rw-r--r--usr.bin/ctags/test/ctags.test1
-rw-r--r--usr.bin/ctags/tree.c3
-rw-r--r--usr.bin/ctags/yacc.c3
-rw-r--r--usr.bin/cut/Makefile2
-rw-r--r--usr.bin/cut/cut.11
-rw-r--r--usr.bin/cut/cut.c3
-rw-r--r--usr.bin/dirname/Makefile2
-rw-r--r--usr.bin/dirname/dirname.c3
-rw-r--r--usr.bin/du/Makefile2
-rw-r--r--usr.bin/du/du.11
-rw-r--r--usr.bin/du/du.c3
-rw-r--r--usr.bin/env/Makefile2
-rw-r--r--usr.bin/env/env.12
-rw-r--r--usr.bin/env/env.c4
-rw-r--r--usr.bin/error/Makefile2
-rw-r--r--usr.bin/error/error.11
-rw-r--r--usr.bin/error/error.h1
-rw-r--r--usr.bin/error/filter.c3
-rw-r--r--usr.bin/error/input.c3
-rw-r--r--usr.bin/error/main.c3
-rw-r--r--usr.bin/error/pathnames.h1
-rw-r--r--usr.bin/error/pi.c3
-rw-r--r--usr.bin/error/subr.c3
-rw-r--r--usr.bin/error/touch.c3
-rw-r--r--usr.bin/expand/Makefile2
-rw-r--r--usr.bin/expand/expand.11
-rw-r--r--usr.bin/expand/expand.c3
-rw-r--r--usr.bin/false/Makefile3
-rw-r--r--usr.bin/false/false.12
-rw-r--r--usr.bin/false/false.sh2
-rw-r--r--usr.bin/file/LEGAL.NOTICE2
-rw-r--r--usr.bin/file/MAINT2
-rw-r--r--usr.bin/file/Makefile2
-rw-r--r--usr.bin/file/PORTING2
-rw-r--r--usr.bin/file/README2
-rw-r--r--usr.bin/file/apprentice.c4
-rw-r--r--usr.bin/file/ascmagic.c4
-rw-r--r--usr.bin/file/compress.c2
-rw-r--r--usr.bin/file/file.12
-rw-r--r--usr.bin/file/file.c4
-rw-r--r--usr.bin/file/file.h2
-rw-r--r--usr.bin/file/fsmagic.c4
-rw-r--r--usr.bin/file/is_tar.c2
-rw-r--r--usr.bin/file/magdir/Header2
-rw-r--r--usr.bin/file/magdir/Localstuff2
-rw-r--r--usr.bin/file/magdir/os91
-rw-r--r--usr.bin/file/magdir/rpm2
-rw-r--r--usr.bin/file/magdir/softquad2
-rw-r--r--usr.bin/file/magic.52
-rw-r--r--usr.bin/file/names.h2
-rw-r--r--usr.bin/file/patchlevel.h5
-rw-r--r--usr.bin/file/print.c4
-rw-r--r--usr.bin/file/softmagic.c4
-rw-r--r--usr.bin/file/tar.h2
-rw-r--r--usr.bin/file/tst/Makefile2
-rw-r--r--usr.bin/find/Makefile3
-rw-r--r--usr.bin/find/extern.h2
-rw-r--r--usr.bin/find/find.12
-rw-r--r--usr.bin/find/find.c4
-rw-r--r--usr.bin/find/find.h2
-rw-r--r--usr.bin/find/function.c4
-rw-r--r--usr.bin/find/ls.c4
-rw-r--r--usr.bin/find/main.c4
-rw-r--r--usr.bin/find/misc.c4
-rw-r--r--usr.bin/find/operator.c4
-rw-r--r--usr.bin/find/option.c4
-rw-r--r--usr.bin/finger/Makefile3
-rw-r--r--usr.bin/finger/extern.h2
-rw-r--r--usr.bin/finger/finger.12
-rw-r--r--usr.bin/finger/finger.c4
-rw-r--r--usr.bin/finger/finger.h2
-rw-r--r--usr.bin/finger/lprint.c4
-rw-r--r--usr.bin/finger/net.c4
-rw-r--r--usr.bin/finger/sprint.c4
-rw-r--r--usr.bin/finger/util.c4
-rw-r--r--usr.bin/fmt/Makefile2
-rw-r--r--usr.bin/fmt/fmt.11
-rw-r--r--usr.bin/fmt/fmt.c3
-rw-r--r--usr.bin/fold/Makefile2
-rw-r--r--usr.bin/fold/fold.11
-rw-r--r--usr.bin/fold/fold.c3
-rw-r--r--usr.bin/fpr/Makefile2
-rw-r--r--usr.bin/fpr/fpr.11
-rw-r--r--usr.bin/fpr/fpr.c3
-rw-r--r--usr.bin/from/Makefile2
-rw-r--r--usr.bin/from/from.11
-rw-r--r--usr.bin/from/from.c3
-rw-r--r--usr.bin/fsplit/Makefile3
-rw-r--r--usr.bin/fsplit/fsplit.11
-rw-r--r--usr.bin/fsplit/fsplit.c4
-rw-r--r--usr.bin/fstat/Makefile3
-rw-r--r--usr.bin/fstat/fstat.12
-rw-r--r--usr.bin/ftp/Makefile2
-rw-r--r--usr.bin/ftp/cmds.c3
-rw-r--r--usr.bin/ftp/cmdtab.c3
-rw-r--r--usr.bin/ftp/domacro.c3
-rw-r--r--usr.bin/ftp/extern.h1
-rw-r--r--usr.bin/ftp/ftp.11
-rw-r--r--usr.bin/ftp/ftp.c3
-rw-r--r--usr.bin/ftp/ftp_var.h1
-rw-r--r--usr.bin/ftp/main.c4
-rw-r--r--usr.bin/ftp/pathnames.h1
-rw-r--r--usr.bin/ftp/ruserpass.c1
-rw-r--r--usr.bin/gencat/Makefile2
-rw-r--r--usr.bin/gencat/gencat.c2
-rw-r--r--usr.bin/getconf/Makefile2
-rw-r--r--usr.bin/getconf/getconf.12
-rw-r--r--usr.bin/getconf/getconf.c4
-rw-r--r--usr.bin/getopt/Makefile2
-rw-r--r--usr.bin/getopt/getopt.12
-rw-r--r--usr.bin/getopt/getopt.c4
-rw-r--r--usr.bin/gprof/Makefile2
-rw-r--r--usr.bin/gprof/PSD.doc/Makefile2
-rw-r--r--usr.bin/gprof/PSD.doc/abstract.me1
-rw-r--r--usr.bin/gprof/PSD.doc/gathering.me1
-rw-r--r--usr.bin/gprof/PSD.doc/header.me1
-rw-r--r--usr.bin/gprof/PSD.doc/intro.me1
-rw-r--r--usr.bin/gprof/PSD.doc/postp.me1
-rw-r--r--usr.bin/gprof/PSD.doc/postp1.pic1
-rw-r--r--usr.bin/gprof/PSD.doc/postp2.pic1
-rw-r--r--usr.bin/gprof/PSD.doc/postp3.pic1
-rw-r--r--usr.bin/gprof/PSD.doc/pres1.pic1
-rw-r--r--usr.bin/gprof/PSD.doc/pres2.pic1
-rw-r--r--usr.bin/gprof/PSD.doc/present.me1
-rw-r--r--usr.bin/gprof/PSD.doc/profiling.me1
-rw-r--r--usr.bin/gprof/PSD.doc/refs.me1
-rw-r--r--usr.bin/gprof/alpha.c3
-rw-r--r--usr.bin/gprof/alpha.h1
-rw-r--r--usr.bin/gprof/arcs.c3
-rw-r--r--usr.bin/gprof/arm32.c3
-rw-r--r--usr.bin/gprof/arm32.h1
-rw-r--r--usr.bin/gprof/dfn.c3
-rw-r--r--usr.bin/gprof/gprof.11
-rw-r--r--usr.bin/gprof/gprof.c3
-rw-r--r--usr.bin/gprof/gprof.h1
-rw-r--r--usr.bin/gprof/hertz.c3
-rw-r--r--usr.bin/gprof/i386.c3
-rw-r--r--usr.bin/gprof/i386.h1
-rw-r--r--usr.bin/gprof/lookup.c3
-rw-r--r--usr.bin/gprof/m68k.c3
-rw-r--r--usr.bin/gprof/m68k.h1
-rw-r--r--usr.bin/gprof/mips.c3
-rw-r--r--usr.bin/gprof/mips.h1
-rw-r--r--usr.bin/gprof/ns32k.c3
-rw-r--r--usr.bin/gprof/ns32k.h1
-rw-r--r--usr.bin/gprof/pathnames.h1
-rw-r--r--usr.bin/gprof/pmax.c3
-rw-r--r--usr.bin/gprof/pmax.h1
-rw-r--r--usr.bin/gprof/printgprof.c3
-rw-r--r--usr.bin/gprof/printlist.c3
-rw-r--r--usr.bin/gprof/sparc.c3
-rw-r--r--usr.bin/gprof/sparc.h1
-rw-r--r--usr.bin/gprof/tahoe.c3
-rw-r--r--usr.bin/gprof/tahoe.h1
-rw-r--r--usr.bin/gprof/vax.c3
-rw-r--r--usr.bin/gprof/vax.h1
-rw-r--r--usr.bin/head/Makefile3
-rw-r--r--usr.bin/head/head.12
-rw-r--r--usr.bin/head/head.c4
-rw-r--r--usr.bin/hexdump/Makefile3
-rw-r--r--usr.bin/hexdump/conv.c4
-rw-r--r--usr.bin/hexdump/display.c4
-rw-r--r--usr.bin/hexdump/hexdump.12
-rw-r--r--usr.bin/hexdump/hexdump.c4
-rw-r--r--usr.bin/hexdump/hexdump.h2
-rw-r--r--usr.bin/hexdump/hexsyntax.c4
-rw-r--r--usr.bin/hexdump/od.12
-rw-r--r--usr.bin/hexdump/odsyntax.c4
-rw-r--r--usr.bin/hexdump/parse.c4
-rw-r--r--usr.bin/id/Makefile3
-rw-r--r--usr.bin/id/groups.12
-rw-r--r--usr.bin/id/groups.sh2
-rw-r--r--usr.bin/id/id.11
-rw-r--r--usr.bin/id/id.c4
-rw-r--r--usr.bin/id/whoami.12
-rw-r--r--usr.bin/id/whoami.sh2
-rw-r--r--usr.bin/indent/Makefile3
-rw-r--r--usr.bin/indent/args.c4
-rw-r--r--usr.bin/indent/indent.12
-rw-r--r--usr.bin/indent/indent.c4
-rw-r--r--usr.bin/indent/indent_codes.h2
-rw-r--r--usr.bin/indent/indent_globs.h2
-rw-r--r--usr.bin/indent/io.c4
-rw-r--r--usr.bin/indent/lexi.c4
-rw-r--r--usr.bin/indent/parse.c4
-rw-r--r--usr.bin/indent/pr_comment.c4
-rw-r--r--usr.bin/ipcrm/Makefile2
-rw-r--r--usr.bin/ipcrm/ipcrm.12
-rw-r--r--usr.bin/ipcrm/ipcrm.c2
-rw-r--r--usr.bin/ipcs/Makefile1
-rw-r--r--usr.bin/ipcs/ipcs.11
-rw-r--r--usr.bin/ipcs/ipcs.c1
-rw-r--r--usr.bin/join/Makefile3
-rw-r--r--usr.bin/join/join.12
-rw-r--r--usr.bin/join/join.c4
-rw-r--r--usr.bin/jot/Makefile2
-rw-r--r--usr.bin/jot/jot.11
-rw-r--r--usr.bin/jot/jot.c3
-rw-r--r--usr.bin/kdump/Makefile3
-rw-r--r--usr.bin/kdump/kdump.12
-rw-r--r--usr.bin/kdump/kdump.c4
-rw-r--r--usr.bin/kdump/mkioctls2
-rw-r--r--usr.bin/ktrace/Makefile3
-rw-r--r--usr.bin/ktrace/ktrace.12
-rw-r--r--usr.bin/ktrace/ktrace.c3
-rw-r--r--usr.bin/ktrace/ktrace.h2
-rw-r--r--usr.bin/ktrace/subr.c3
-rw-r--r--usr.bin/lam/Makefile2
-rw-r--r--usr.bin/lam/lam.11
-rw-r--r--usr.bin/lam/lam.c3
-rw-r--r--usr.bin/last/Makefile2
-rw-r--r--usr.bin/last/last.11
-rw-r--r--usr.bin/last/last.c3
-rw-r--r--usr.bin/lastcomm/Makefile2
-rw-r--r--usr.bin/lastcomm/lastcomm.11
-rw-r--r--usr.bin/lastcomm/lastcomm.c3
-rw-r--r--usr.bin/lastcomm/pathnames.h1
-rw-r--r--usr.bin/leave/Makefile2
-rw-r--r--usr.bin/leave/leave.11
-rw-r--r--usr.bin/leave/leave.c3
-rw-r--r--usr.bin/lex/FlexLexer.h4
-rw-r--r--usr.bin/lex/Makefile3
-rw-r--r--usr.bin/lex/ccl.c4
-rw-r--r--usr.bin/lex/config.h4
-rw-r--r--usr.bin/lex/dfa.c4
-rw-r--r--usr.bin/lex/ecs.c4
-rw-r--r--usr.bin/lex/flex.12
-rw-r--r--usr.bin/lex/flex.skl4
-rw-r--r--usr.bin/lex/flexdef.h4
-rw-r--r--usr.bin/lex/gen.c4
-rw-r--r--usr.bin/lex/initscan.c6
-rw-r--r--usr.bin/lex/libmain.c4
-rw-r--r--usr.bin/lex/libyywrap.c4
-rw-r--r--usr.bin/lex/main.c4
-rw-r--r--usr.bin/lex/misc.c4
-rw-r--r--usr.bin/lex/mkskel.sh2
-rw-r--r--usr.bin/lex/nfa.c4
-rw-r--r--usr.bin/lex/parse.y4
-rw-r--r--usr.bin/lex/pathnames.h2
-rw-r--r--usr.bin/lex/scan.l4
-rw-r--r--usr.bin/lex/sym.c4
-rw-r--r--usr.bin/lex/tblcmp.c4
-rw-r--r--usr.bin/lex/version.h2
-rw-r--r--usr.bin/lex/yylex.c4
-rw-r--r--usr.bin/locate/Makefile2
-rw-r--r--usr.bin/locate/bigram/Makefile2
-rw-r--r--usr.bin/locate/bigram/locate.bigram.c3
-rw-r--r--usr.bin/locate/code/Makefile2
-rw-r--r--usr.bin/locate/code/locate.code.c3
-rw-r--r--usr.bin/locate/locate/Makefile2
-rw-r--r--usr.bin/locate/locate/locate.11
-rw-r--r--usr.bin/locate/locate/locate.c3
-rw-r--r--usr.bin/locate/locate/locate.h1
-rw-r--r--usr.bin/locate/locate/pathnames.h1
-rw-r--r--usr.bin/locate/locate/updatedb.csh1
-rw-r--r--usr.bin/lock/Makefile3
-rw-r--r--usr.bin/lock/lock.11
-rw-r--r--usr.bin/lock/lock.c3
-rw-r--r--usr.bin/logger/Makefile2
-rw-r--r--usr.bin/logger/logger.11
-rw-r--r--usr.bin/logger/logger.c3
-rw-r--r--usr.bin/login/Makefile3
-rw-r--r--usr.bin/login/k5login.c3
-rw-r--r--usr.bin/login/klogin.c3
-rw-r--r--usr.bin/login/login.11
-rw-r--r--usr.bin/login/login.c3
-rw-r--r--usr.bin/login/pathnames.h1
-rw-r--r--usr.bin/logname/Makefile2
-rw-r--r--usr.bin/logname/logname.11
-rw-r--r--usr.bin/logname/logname.c3
-rw-r--r--usr.bin/look/Makefile2
-rw-r--r--usr.bin/look/look.11
-rw-r--r--usr.bin/look/look.c3
-rw-r--r--usr.bin/look/pathnames.h1
-rw-r--r--usr.bin/lorder/Makefile2
-rw-r--r--usr.bin/lorder/lorder.11
-rw-r--r--usr.bin/lorder/lorder.sh1
-rw-r--r--usr.bin/lorder/lorder.sh.gnm1
-rw-r--r--usr.bin/m4/Makefile3
-rw-r--r--usr.bin/m4/PSD.doc/Makefile3
-rw-r--r--usr.bin/m4/TEST/ack.m41
-rw-r--r--usr.bin/m4/TEST/hanoi.m41
-rw-r--r--usr.bin/m4/TEST/hash.m41
-rw-r--r--usr.bin/m4/TEST/sqroot.m41
-rw-r--r--usr.bin/m4/TEST/string.m41
-rw-r--r--usr.bin/m4/TEST/test.m41
-rw-r--r--usr.bin/m4/eval.c3
-rw-r--r--usr.bin/m4/expr.c3
-rw-r--r--usr.bin/m4/extern.h1
-rw-r--r--usr.bin/m4/look.c2
-rw-r--r--usr.bin/m4/m4.12
-rw-r--r--usr.bin/m4/main.c3
-rw-r--r--usr.bin/m4/mdef.h1
-rw-r--r--usr.bin/m4/misc.c3
-rw-r--r--usr.bin/m4/pathnames.h1
-rw-r--r--usr.bin/m4/serv.c3
-rw-r--r--usr.bin/m4/stdd.h1
-rw-r--r--usr.bin/machine/Makefile3
-rw-r--r--usr.bin/machine/machine.12
-rw-r--r--usr.bin/machine/machine.c4
-rw-r--r--usr.bin/make/Makefile.boot2
-rw-r--r--usr.bin/make/PSD.doc/Makefile2
-rw-r--r--usr.bin/make/bit.h1
-rw-r--r--usr.bin/make/buf.c3
-rw-r--r--usr.bin/make/buf.h1
-rw-r--r--usr.bin/make/compat.c3
-rw-r--r--usr.bin/make/cond.c3
-rw-r--r--usr.bin/make/config.h1
-rw-r--r--usr.bin/make/dir.c3
-rw-r--r--usr.bin/make/dir.h1
-rw-r--r--usr.bin/make/extern.h1
-rw-r--r--usr.bin/make/for.c3
-rw-r--r--usr.bin/make/hash.c3
-rw-r--r--usr.bin/make/hash.h1
-rw-r--r--usr.bin/make/job.c3
-rw-r--r--usr.bin/make/job.h1
-rw-r--r--usr.bin/make/list.h1
-rw-r--r--usr.bin/make/lst.h1
-rw-r--r--usr.bin/make/lst.lib/Makefile1
-rw-r--r--usr.bin/make/lst.lib/lstAppend.c3
-rw-r--r--usr.bin/make/lst.lib/lstAtEnd.c3
-rw-r--r--usr.bin/make/lst.lib/lstAtFront.c3
-rw-r--r--usr.bin/make/lst.lib/lstClose.c3
-rw-r--r--usr.bin/make/lst.lib/lstConcat.c3
-rw-r--r--usr.bin/make/lst.lib/lstDatum.c3
-rw-r--r--usr.bin/make/lst.lib/lstDeQueue.c3
-rw-r--r--usr.bin/make/lst.lib/lstDestroy.c3
-rw-r--r--usr.bin/make/lst.lib/lstDupl.c3
-rw-r--r--usr.bin/make/lst.lib/lstEnQueue.c3
-rw-r--r--usr.bin/make/lst.lib/lstFind.c3
-rw-r--r--usr.bin/make/lst.lib/lstFindFrom.c3
-rw-r--r--usr.bin/make/lst.lib/lstFirst.c3
-rw-r--r--usr.bin/make/lst.lib/lstForEach.c3
-rw-r--r--usr.bin/make/lst.lib/lstForEachFrom.c3
-rw-r--r--usr.bin/make/lst.lib/lstInit.c3
-rw-r--r--usr.bin/make/lst.lib/lstInsert.c3
-rw-r--r--usr.bin/make/lst.lib/lstInt.h1
-rw-r--r--usr.bin/make/lst.lib/lstIsAtEnd.c3
-rw-r--r--usr.bin/make/lst.lib/lstIsEmpty.c3
-rw-r--r--usr.bin/make/lst.lib/lstLast.c3
-rw-r--r--usr.bin/make/lst.lib/lstMember.c3
-rw-r--r--usr.bin/make/lst.lib/lstNext.c3
-rw-r--r--usr.bin/make/lst.lib/lstOpen.c3
-rw-r--r--usr.bin/make/lst.lib/lstRemove.c3
-rw-r--r--usr.bin/make/lst.lib/lstReplace.c3
-rw-r--r--usr.bin/make/lst.lib/lstSucc.c3
-rw-r--r--usr.bin/make/nonints.h1
-rw-r--r--usr.bin/make/sprite.h1
-rw-r--r--usr.bin/make/str.c3
-rw-r--r--usr.bin/make/suff.c3
-rw-r--r--usr.bin/make/util.c3
-rw-r--r--usr.bin/make/var.c3
-rw-r--r--usr.bin/man/Makefile2
-rw-r--r--usr.bin/man/config.c3
-rw-r--r--usr.bin/man/config.h1
-rw-r--r--usr.bin/man/man.12
-rw-r--r--usr.bin/man/man.c3
-rw-r--r--usr.bin/man/man.conf2
-rw-r--r--usr.bin/man/man.conf.52
-rw-r--r--usr.bin/man/pathnames.h1
-rw-r--r--usr.bin/mesg/Makefile2
-rw-r--r--usr.bin/mesg/mesg.11
-rw-r--r--usr.bin/mesg/mesg.c3
-rw-r--r--usr.bin/mkdep/Makefile2
-rw-r--r--usr.bin/mkdep/mkdep.11
-rw-r--r--usr.bin/mkdep/mkdep.append1
-rw-r--r--usr.bin/mkdep/mkdep.gcc.sh1
-rw-r--r--usr.bin/mkdep/mkdep.old.compiler1
-rw-r--r--usr.bin/mkdep/mkdep.sh1
-rw-r--r--usr.bin/mkdep/mkdep.ultrix1
-rw-r--r--usr.bin/mkfifo/Makefile2
-rw-r--r--usr.bin/mkfifo/mkfifo.11
-rw-r--r--usr.bin/mkfifo/mkfifo.c3
-rw-r--r--usr.bin/mkstr/Makefile2
-rw-r--r--usr.bin/mkstr/mkstr.11
-rw-r--r--usr.bin/mkstr/mkstr.c3
-rw-r--r--usr.bin/modstat/Makefile2
-rw-r--r--usr.bin/modstat/modstat.82
-rw-r--r--usr.bin/modstat/modstat.c2
-rw-r--r--usr.bin/modstat/pathnames.h2
-rw-r--r--usr.bin/msgs/Makefile2
-rw-r--r--usr.bin/msgs/msgs.11
-rw-r--r--usr.bin/msgs/msgs.c3
-rw-r--r--usr.bin/msgs/pathnames.h1
-rw-r--r--usr.bin/netstat/Makefile2
-rw-r--r--usr.bin/netstat/if.c3
-rw-r--r--usr.bin/netstat/inet.c3
-rw-r--r--usr.bin/netstat/iso.c3
-rw-r--r--usr.bin/netstat/main.c3
-rw-r--r--usr.bin/netstat/mbuf.c3
-rw-r--r--usr.bin/netstat/mroute.c1
-rw-r--r--usr.bin/netstat/netstat.11
-rw-r--r--usr.bin/netstat/netstat.h1
-rw-r--r--usr.bin/netstat/ns.c3
-rw-r--r--usr.bin/netstat/route.c3
-rw-r--r--usr.bin/netstat/unix.c3
-rw-r--r--usr.bin/newsyslog/Makefile2
-rw-r--r--usr.bin/newsyslog/newsyslog.82
-rw-r--r--usr.bin/newsyslog/newsyslog.c4
-rw-r--r--usr.bin/nice/Makefile2
-rw-r--r--usr.bin/nice/nice.11
-rw-r--r--usr.bin/nice/nice.c3
-rw-r--r--usr.bin/nm/Makefile2
-rw-r--r--usr.bin/nm/nm.11
-rw-r--r--usr.bin/nm/nm.c3
-rw-r--r--usr.bin/nohup/Makefile2
-rw-r--r--usr.bin/nohup/nohup.11
-rw-r--r--usr.bin/nohup/nohup.c3
-rw-r--r--usr.bin/oldrdist/Makefile3
-rw-r--r--usr.bin/oldrdist/defs.h2
-rw-r--r--usr.bin/oldrdist/docmd.c4
-rw-r--r--usr.bin/oldrdist/expand.c4
-rw-r--r--usr.bin/oldrdist/lookup.c4
-rw-r--r--usr.bin/oldrdist/main.c4
-rw-r--r--usr.bin/oldrdist/oldrdist.12
-rw-r--r--usr.bin/oldrdist/pathnames.h2
-rw-r--r--usr.bin/oldrdist/server.c4
-rw-r--r--usr.bin/pagesize/Makefile2
-rw-r--r--usr.bin/pagesize/pagesize.11
-rw-r--r--usr.bin/pagesize/pagesize.sh2
-rw-r--r--usr.bin/passwd/kpasswd_proto.h2
-rw-r--r--usr.bin/passwd/krb5_passwd.c4
-rw-r--r--usr.bin/passwd/krb_passwd.c4
-rw-r--r--usr.bin/passwd/local_passwd.c4
-rw-r--r--usr.bin/passwd/passwd.12
-rw-r--r--usr.bin/passwd/passwd.c4
-rw-r--r--usr.bin/passwd/yp_passwd.c4
-rw-r--r--usr.bin/paste/Makefile3
-rw-r--r--usr.bin/paste/paste.12
-rw-r--r--usr.bin/paste/paste.c4
-rw-r--r--usr.bin/pr/Makefile3
-rw-r--r--usr.bin/pr/egetopt.c4
-rw-r--r--usr.bin/pr/extern.h2
-rw-r--r--usr.bin/pr/pr.12
-rw-r--r--usr.bin/pr/pr.c4
-rw-r--r--usr.bin/pr/pr.h2
-rw-r--r--usr.bin/printenv/Makefile3
-rw-r--r--usr.bin/printenv/printenv.12
-rw-r--r--usr.bin/printenv/printenv.c4
-rw-r--r--usr.bin/printf/Makefile3
-rw-r--r--usr.bin/printf/printf.12
-rw-r--r--usr.bin/printf/printf.c4
-rw-r--r--usr.bin/quota/Makefile3
-rw-r--r--usr.bin/quota/quota.12
-rw-r--r--usr.bin/quota/quota.c4
-rw-r--r--usr.bin/ranlib/Makefile3
-rw-r--r--usr.bin/ranlib/build.c4
-rw-r--r--usr.bin/ranlib/misc.c4
-rw-r--r--usr.bin/ranlib/pathnames.h2
-rw-r--r--usr.bin/ranlib/ranlib.12
-rw-r--r--usr.bin/ranlib/ranlib.52
-rw-r--r--usr.bin/ranlib/ranlib.c4
-rw-r--r--usr.bin/ranlib/touch.c4
-rw-r--r--usr.bin/rdist/child.c4
-rw-r--r--usr.bin/rdist/client.c4
-rw-r--r--usr.bin/rdist/common.c4
-rw-r--r--usr.bin/rdist/config-data.h2
-rw-r--r--usr.bin/rdist/config-def.h2
-rw-r--r--usr.bin/rdist/config.h2
-rw-r--r--usr.bin/rdist/distopt.c4
-rw-r--r--usr.bin/rdist/docmd.c4
-rw-r--r--usr.bin/rdist/expand.c4
-rw-r--r--usr.bin/rdist/isexec.c4
-rw-r--r--usr.bin/rdist/lookup.c4
-rw-r--r--usr.bin/rdist/message.c4
-rw-r--r--usr.bin/rdist/os-openbsd.h2
-rw-r--r--usr.bin/rdist/pathnames.h2
-rw-r--r--usr.bin/rdist/paths.h2
-rw-r--r--usr.bin/rdist/rdist.12
-rw-r--r--usr.bin/rdist/rdist.c4
-rw-r--r--usr.bin/rdist/rshrcmd.c4
-rw-r--r--usr.bin/rdist/setargs.c4
-rw-r--r--usr.bin/rdist/signal.c4
-rw-r--r--usr.bin/rdist/types.h2
-rw-r--r--usr.bin/rdist/version.h2
-rw-r--r--usr.bin/rdistd/Makefile2
-rw-r--r--usr.bin/rdistd/filesys-os.c4
-rw-r--r--usr.bin/rdistd/filesys.c4
-rw-r--r--usr.bin/rdistd/filesys.h2
-rw-r--r--usr.bin/rdistd/message.c4
-rw-r--r--usr.bin/rdistd/rdistd.12
-rw-r--r--usr.bin/rdistd/rdistd.c4
-rw-r--r--usr.bin/rdistd/server.c4
-rw-r--r--usr.bin/renice/Makefile3
-rw-r--r--usr.bin/renice/renice.82
-rw-r--r--usr.bin/renice/renice.c4
-rw-r--r--usr.bin/rev/Makefile2
-rw-r--r--usr.bin/rev/rev.11
-rw-r--r--usr.bin/rev/rev.c3
-rw-r--r--usr.bin/rlogin/Makefile2
-rw-r--r--usr.bin/rlogin/des_rw.c3
-rw-r--r--usr.bin/rlogin/kcmd.c3
-rw-r--r--usr.bin/rlogin/krcmd.c3
-rw-r--r--usr.bin/rlogin/rlogin.11
-rw-r--r--usr.bin/rlogin/rlogin.c3
-rw-r--r--usr.bin/rpcgen/Makefile1
-rw-r--r--usr.bin/rpcgen/rpc_clntout.c1
-rw-r--r--usr.bin/rpcgen/rpc_cout.c1
-rw-r--r--usr.bin/rpcgen/rpc_hout.c1
-rw-r--r--usr.bin/rpcgen/rpc_parse.c1
-rw-r--r--usr.bin/rpcgen/rpc_parse.h1
-rw-r--r--usr.bin/rpcgen/rpc_sample.c1
-rw-r--r--usr.bin/rpcgen/rpc_scan.c1
-rw-r--r--usr.bin/rpcgen/rpc_scan.h1
-rw-r--r--usr.bin/rpcgen/rpc_svcout.c1
-rw-r--r--usr.bin/rpcgen/rpc_tblout.c1
-rw-r--r--usr.bin/rpcgen/rpc_util.c1
-rw-r--r--usr.bin/rpcgen/rpc_util.h1
-rw-r--r--usr.bin/rpcgen/rpcgen.11
-rw-r--r--usr.bin/rpcinfo/Makefile3
-rw-r--r--usr.bin/rpcinfo/rpcinfo.82
-rw-r--r--usr.bin/rpcinfo/rpcinfo.c4
-rw-r--r--usr.bin/rs/Makefile3
-rw-r--r--usr.bin/rs/rs.12
-rw-r--r--usr.bin/rs/rs.c2
-rw-r--r--usr.bin/rsh/Makefile3
-rw-r--r--usr.bin/rsh/pathnames.h2
-rw-r--r--usr.bin/rsh/rsh.12
-rw-r--r--usr.bin/rsh/rsh.c6
-rw-r--r--usr.bin/rup/Makefile2
-rw-r--r--usr.bin/rup/rup.12
-rw-r--r--usr.bin/rup/rup.c4
-rw-r--r--usr.bin/ruptime/Makefile3
-rw-r--r--usr.bin/ruptime/ruptime.12
-rw-r--r--usr.bin/ruptime/ruptime.c4
-rw-r--r--usr.bin/rusers/Makefile2
-rw-r--r--usr.bin/rusers/rusers.12
-rw-r--r--usr.bin/rusers/rusers.c4
-rw-r--r--usr.bin/rwall/Makefile2
-rw-r--r--usr.bin/rwall/rwall.12
-rw-r--r--usr.bin/rwall/rwall.c4
-rw-r--r--usr.bin/rwho/Makefile3
-rw-r--r--usr.bin/rwho/rwho.12
-rw-r--r--usr.bin/rwho/rwho.c4
-rw-r--r--usr.bin/script/Makefile2
-rw-r--r--usr.bin/script/script.11
-rw-r--r--usr.bin/script/script.c3
-rw-r--r--usr.bin/sed/Makefile3
-rw-r--r--usr.bin/sed/POSIX2
-rw-r--r--usr.bin/sed/TEST/hanoi.sed2
-rw-r--r--usr.bin/sed/TEST/math.sed2
-rw-r--r--usr.bin/sed/TEST/sed.test2
-rw-r--r--usr.bin/sed/compile.c4
-rw-r--r--usr.bin/sed/defs.h2
-rw-r--r--usr.bin/sed/extern.h2
-rw-r--r--usr.bin/sed/main.c4
-rw-r--r--usr.bin/sed/misc.c4
-rw-r--r--usr.bin/sed/process.c4
-rw-r--r--usr.bin/sed/sed.12
-rw-r--r--usr.bin/shar/Makefile2
-rw-r--r--usr.bin/shar/shar.11
-rw-r--r--usr.bin/shar/shar.sh1
-rw-r--r--usr.bin/showmount/Makefile2
-rw-r--r--usr.bin/showmount/showmount.81
-rw-r--r--usr.bin/showmount/showmount.c3
-rw-r--r--usr.bin/size/Makefile2
-rw-r--r--usr.bin/size/size.11
-rw-r--r--usr.bin/size/size.c3
-rw-r--r--usr.bin/skey/Makefile2
-rw-r--r--usr.bin/skey/skey.12
-rw-r--r--usr.bin/skey/skey.c2
-rw-r--r--usr.bin/skey/skeyaudit.12
-rw-r--r--usr.bin/skey/skeyaudit.sh2
-rw-r--r--usr.bin/skey/skeyinfo.12
-rw-r--r--usr.bin/skey/skeyinfo.sh2
-rw-r--r--usr.bin/skeyinit/Makefile2
-rw-r--r--usr.bin/skeyinit/skeyinit.11
-rw-r--r--usr.bin/skeyinit/skeyinit.c1
-rw-r--r--usr.bin/soelim/Makefile2
-rw-r--r--usr.bin/soelim/soelim.11
-rw-r--r--usr.bin/soelim/soelim.c3
-rw-r--r--usr.bin/split/Makefile2
-rw-r--r--usr.bin/split/split.11
-rw-r--r--usr.bin/split/split.c3
-rw-r--r--usr.bin/strings/Makefile2
-rw-r--r--usr.bin/strings/strings.11
-rw-r--r--usr.bin/strings/strings.c3
-rw-r--r--usr.bin/strip/Makefile3
-rw-r--r--usr.bin/strip/strip.12
-rw-r--r--usr.bin/strip/strip.c4
-rw-r--r--usr.bin/su/Makefile3
-rw-r--r--usr.bin/su/su.12
-rw-r--r--usr.bin/su/su.c4
-rw-r--r--usr.bin/sup/Makefile2
-rw-r--r--usr.bin/sup/Makefile.inc2
-rw-r--r--usr.bin/sup/src/Makefile.save2
-rw-r--r--usr.bin/sup/src/atoo.c2
-rw-r--r--usr.bin/sup/src/c.h2
-rw-r--r--usr.bin/sup/src/ci.c2
-rw-r--r--usr.bin/sup/src/cvt.c2
-rw-r--r--usr.bin/sup/src/errmsg.c2
-rw-r--r--usr.bin/sup/src/expand.c2
-rw-r--r--usr.bin/sup/src/ffilecopy.c2
-rw-r--r--usr.bin/sup/src/filecopy.c2
-rw-r--r--usr.bin/sup/src/libc.h5
-rw-r--r--usr.bin/sup/src/log.c5
-rw-r--r--usr.bin/sup/src/netcryptvoid.c5
-rw-r--r--usr.bin/sup/src/nxtarg.c2
-rw-r--r--usr.bin/sup/src/path.c2
-rw-r--r--usr.bin/sup/src/quit.c5
-rw-r--r--usr.bin/sup/src/run.c5
-rw-r--r--usr.bin/sup/src/salloc.c2
-rw-r--r--usr.bin/sup/src/scan.c5
-rw-r--r--usr.bin/sup/src/scm.c5
-rw-r--r--usr.bin/sup/src/scmio.c5
-rw-r--r--usr.bin/sup/src/skipto.c2
-rw-r--r--usr.bin/sup/src/stree.c5
-rw-r--r--usr.bin/sup/src/sup.15
-rw-r--r--usr.bin/sup/src/sup.h5
-rw-r--r--usr.bin/sup/src/supcdefs.h5
-rw-r--r--usr.bin/sup/src/supcmain.c5
-rw-r--r--usr.bin/sup/src/supcmeat.c5
-rw-r--r--usr.bin/sup/src/supcmisc.c5
-rw-r--r--usr.bin/sup/src/supcname.c5
-rw-r--r--usr.bin/sup/src/supcparse.c5
-rw-r--r--usr.bin/sup/src/supcvers.c5
-rw-r--r--usr.bin/sup/src/supfilesrv.c5
-rw-r--r--usr.bin/sup/src/supmsg.c5
-rw-r--r--usr.bin/sup/src/supmsg.h5
-rw-r--r--usr.bin/sup/src/supscan.c5
-rw-r--r--usr.bin/sup/src/supservers.85
-rw-r--r--usr.bin/sup/src/sysent.h5
-rw-r--r--usr.bin/sup/src/time.h2
-rw-r--r--usr.bin/sup/src/vprintf.c5
-rw-r--r--usr.bin/sup/sup/Makefile2
-rw-r--r--usr.bin/sup/supfilesrv/Makefile2
-rw-r--r--usr.bin/sup/supscan/Makefile2
-rw-r--r--usr.bin/systat/cmds.c3
-rw-r--r--usr.bin/systat/cmdtab.c3
-rw-r--r--usr.bin/systat/disks.c3
-rw-r--r--usr.bin/systat/extern.h1
-rw-r--r--usr.bin/systat/fetch.c3
-rw-r--r--usr.bin/systat/iostat.c3
-rw-r--r--usr.bin/systat/keyboard.c3
-rw-r--r--usr.bin/systat/main.c3
-rw-r--r--usr.bin/systat/mbufs.c3
-rw-r--r--usr.bin/systat/netcmds.c3
-rw-r--r--usr.bin/systat/netstat.c3
-rw-r--r--usr.bin/systat/pigs.c3
-rw-r--r--usr.bin/systat/swap.c3
-rw-r--r--usr.bin/systat/systat.11
-rw-r--r--usr.bin/systat/systat.h1
-rw-r--r--usr.bin/systat/vmstat.c3
-rw-r--r--usr.bin/tail/Makefile2
-rw-r--r--usr.bin/tail/extern.h1
-rw-r--r--usr.bin/tail/forward.c3
-rw-r--r--usr.bin/tail/misc.c4
-rw-r--r--usr.bin/tail/read.c3
-rw-r--r--usr.bin/tail/reverse.c3
-rw-r--r--usr.bin/tail/tail.11
-rw-r--r--usr.bin/tail/tail.c4
-rw-r--r--usr.bin/talk/Makefile2
-rw-r--r--usr.bin/talk/ctl.c3
-rw-r--r--usr.bin/talk/ctl_transact.c3
-rw-r--r--usr.bin/talk/display.c3
-rw-r--r--usr.bin/talk/get_addrs.c3
-rw-r--r--usr.bin/talk/get_names.c3
-rw-r--r--usr.bin/talk/init_disp.c3
-rw-r--r--usr.bin/talk/invite.c3
-rw-r--r--usr.bin/talk/io.c3
-rw-r--r--usr.bin/talk/look_up.c3
-rw-r--r--usr.bin/talk/msgs.c3
-rw-r--r--usr.bin/talk/talk.11
-rw-r--r--usr.bin/talk/talk.c3
-rw-r--r--usr.bin/talk/talk.h1
-rw-r--r--usr.bin/talk/talk_ctl.h1
-rw-r--r--usr.bin/tcopy/Makefile2
-rw-r--r--usr.bin/tcopy/pathnames.h1
-rw-r--r--usr.bin/tcopy/tcopy.11
-rw-r--r--usr.bin/tcopy/tcopy.c3
-rw-r--r--usr.bin/tee/Makefile2
-rw-r--r--usr.bin/tee/tee.11
-rw-r--r--usr.bin/tee/tee.c3
-rw-r--r--usr.bin/tftp/Makefile2
-rw-r--r--usr.bin/tftp/extern.h1
-rw-r--r--usr.bin/tftp/main.c3
-rw-r--r--usr.bin/tftp/tftp.11
-rw-r--r--usr.bin/tftp/tftp.c3
-rw-r--r--usr.bin/tftp/tftpsubs.c3
-rw-r--r--usr.bin/tftp/tftpsubs.h1
-rw-r--r--usr.bin/time/Makefile2
-rw-r--r--usr.bin/time/time.11
-rw-r--r--usr.bin/time/time.c3
-rw-r--r--usr.bin/tip/Makefile2
-rw-r--r--usr.bin/tip/acu.c3
-rw-r--r--usr.bin/tip/aculib/biz22.c3
-rw-r--r--usr.bin/tip/aculib/biz31.c3
-rw-r--r--usr.bin/tip/aculib/courier.c3
-rw-r--r--usr.bin/tip/aculib/df.c3
-rw-r--r--usr.bin/tip/aculib/dn11.c3
-rw-r--r--usr.bin/tip/aculib/hayes.c3
-rw-r--r--usr.bin/tip/aculib/t3000.c3
-rw-r--r--usr.bin/tip/aculib/v3451.c3
-rw-r--r--usr.bin/tip/aculib/v831.c3
-rw-r--r--usr.bin/tip/aculib/ventel.c3
-rw-r--r--usr.bin/tip/acutab.c3
-rw-r--r--usr.bin/tip/cmds.c3
-rw-r--r--usr.bin/tip/cmdtab.c3
-rw-r--r--usr.bin/tip/cu.c3
-rw-r--r--usr.bin/tip/hunt.c3
-rw-r--r--usr.bin/tip/log.c3
-rw-r--r--usr.bin/tip/partab.c3
-rw-r--r--usr.bin/tip/pathnames.h1
-rw-r--r--usr.bin/tip/remote.c3
-rw-r--r--usr.bin/tip/tip.11
-rw-r--r--usr.bin/tip/tip.c3
-rw-r--r--usr.bin/tip/tip.h1
-rw-r--r--usr.bin/tip/tipout.c3
-rw-r--r--usr.bin/tip/uucplock.c3
-rw-r--r--usr.bin/tip/value.c3
-rw-r--r--usr.bin/tip/vars.c3
-rw-r--r--usr.bin/tn3270/Makefile2
-rw-r--r--usr.bin/tn3270/Makefile.inc2
-rw-r--r--usr.bin/tn3270/api/api_bsd.c4
-rw-r--r--usr.bin/tn3270/api/api_exch.c4
-rw-r--r--usr.bin/tn3270/api/api_exch.h2
-rw-r--r--usr.bin/tn3270/api/apilib.c4
-rw-r--r--usr.bin/tn3270/api/apilib.h2
-rw-r--r--usr.bin/tn3270/api/asc_ebc.c4
-rw-r--r--usr.bin/tn3270/api/asc_ebc.h2
-rw-r--r--usr.bin/tn3270/api/astosc.c4
-rw-r--r--usr.bin/tn3270/api/astosc.h2
-rw-r--r--usr.bin/tn3270/api/dctype.c4
-rw-r--r--usr.bin/tn3270/api/dctype.h2
-rw-r--r--usr.bin/tn3270/api/disp_asc.c4
-rw-r--r--usr.bin/tn3270/api/disp_asc.h2
-rw-r--r--usr.bin/tn3270/api/ebc_disp.c4
-rw-r--r--usr.bin/tn3270/api/ebc_disp.h2
-rw-r--r--usr.bin/tn3270/ascii/default.map2
-rw-r--r--usr.bin/tn3270/ascii/map3270.c4
-rw-r--r--usr.bin/tn3270/ascii/map3270.h2
-rw-r--r--usr.bin/tn3270/ascii/mset.c4
-rw-r--r--usr.bin/tn3270/ascii/state.h2
-rw-r--r--usr.bin/tn3270/ascii/termin.c4
-rw-r--r--usr.bin/tn3270/ctlr/3180.kbd2
-rw-r--r--usr.bin/tn3270/ctlr/3270pc.kbd2
-rw-r--r--usr.bin/tn3270/ctlr/api.c4
-rw-r--r--usr.bin/tn3270/ctlr/api.h2
-rw-r--r--usr.bin/tn3270/ctlr/declare.h2
-rw-r--r--usr.bin/tn3270/ctlr/externs.h2
-rw-r--r--usr.bin/tn3270/ctlr/function.c4
-rw-r--r--usr.bin/tn3270/ctlr/function.h2
-rw-r--r--usr.bin/tn3270/ctlr/hostctlr.h2
-rw-r--r--usr.bin/tn3270/ctlr/inbound.c4
-rw-r--r--usr.bin/tn3270/ctlr/oia.c4
-rw-r--r--usr.bin/tn3270/ctlr/oia.h2
-rw-r--r--usr.bin/tn3270/ctlr/options.c4
-rw-r--r--usr.bin/tn3270/ctlr/options.h2
-rw-r--r--usr.bin/tn3270/ctlr/outbound.c4
-rw-r--r--usr.bin/tn3270/ctlr/screen.h2
-rw-r--r--usr.bin/tn3270/ctlr/scrnctlr.h2
-rw-r--r--usr.bin/tn3270/ctlr/unix.kbd2
-rw-r--r--usr.bin/tn3270/general/genbsubs.c4
-rw-r--r--usr.bin/tn3270/general/general.h2
-rw-r--r--usr.bin/tn3270/general/globals.c4
-rw-r--r--usr.bin/tn3270/general/globals.h2
-rw-r--r--usr.bin/tn3270/general/vaxbsubs.s2
-rw-r--r--usr.bin/tn3270/mset/Makefile2
-rw-r--r--usr.bin/tn3270/mset/map3270.52
-rw-r--r--usr.bin/tn3270/mset/mset.12
-rw-r--r--usr.bin/tn3270/sys_curses/system.c4
-rw-r--r--usr.bin/tn3270/sys_curses/telextrn.h2
-rw-r--r--usr.bin/tn3270/sys_curses/terminal.h2
-rw-r--r--usr.bin/tn3270/sys_curses/termout.c4
-rw-r--r--usr.bin/tn3270/tn3270/Makefile2
-rw-r--r--usr.bin/tn3270/tn3270/tn3270.12
-rw-r--r--usr.bin/tn3270/tools/mkastods/mkastods.c4
-rw-r--r--usr.bin/tn3270/tools/mkastosc/mkastosc.c4
-rw-r--r--usr.bin/tn3270/tools/mkdctype/ectype.c4
-rw-r--r--usr.bin/tn3270/tools/mkdctype/ectype.h2
-rw-r--r--usr.bin/tn3270/tools/mkdctype/mkdctype.c4
-rw-r--r--usr.bin/tn3270/tools/mkdstoas/mkdstoas.c4
-rw-r--r--usr.bin/tn3270/tools/mkhits/dohits.c4
-rw-r--r--usr.bin/tn3270/tools/mkhits/dohits.h2
-rw-r--r--usr.bin/tn3270/tools/mkhits/mkhits.c4
-rw-r--r--usr.bin/tn3270/tools/prt3270.c4
-rw-r--r--usr.bin/touch/Makefile2
-rw-r--r--usr.bin/touch/touch.11
-rw-r--r--usr.bin/touch/touch.c3
-rw-r--r--usr.bin/tput/Makefile2
-rw-r--r--usr.bin/tput/clear.sh1
-rw-r--r--usr.bin/tput/tput.11
-rw-r--r--usr.bin/tput/tput.c3
-rw-r--r--usr.bin/tr/Makefile2
-rw-r--r--usr.bin/tr/extern.h1
-rw-r--r--usr.bin/tr/str.c3
-rw-r--r--usr.bin/tr/tr.11
-rw-r--r--usr.bin/tr/tr.c3
-rw-r--r--usr.bin/true/Makefile3
-rw-r--r--usr.bin/true/true.12
-rw-r--r--usr.bin/true/true.sh2
-rw-r--r--usr.bin/tset/Makefile2
-rw-r--r--usr.bin/tset/extern.h1
-rw-r--r--usr.bin/tset/map.c3
-rw-r--r--usr.bin/tset/misc.c3
-rw-r--r--usr.bin/tset/set.c3
-rw-r--r--usr.bin/tset/term.c3
-rw-r--r--usr.bin/tset/tset.11
-rw-r--r--usr.bin/tset/tset.c3
-rw-r--r--usr.bin/tset/wrterm.c3
-rw-r--r--usr.bin/tsort/Makefile2
-rw-r--r--usr.bin/tsort/tsort.11
-rw-r--r--usr.bin/tsort/tsort.c3
-rw-r--r--usr.bin/tty/Makefile2
-rw-r--r--usr.bin/tty/tty.11
-rw-r--r--usr.bin/tty/tty.c3
-rw-r--r--usr.bin/ul/Makefile2
-rw-r--r--usr.bin/ul/ul.11
-rw-r--r--usr.bin/ul/ul.c3
-rw-r--r--usr.bin/uname/Makefile3
-rw-r--r--usr.bin/uname/uname.12
-rw-r--r--usr.bin/uname/uname.c4
-rw-r--r--usr.bin/unexpand/Makefile2
-rw-r--r--usr.bin/unexpand/unexpand.c3
-rw-r--r--usr.bin/unifdef/Makefile2
-rw-r--r--usr.bin/unifdef/unifdef.11
-rw-r--r--usr.bin/unifdef/unifdef.c3
-rw-r--r--usr.bin/uniq/Makefile2
-rw-r--r--usr.bin/uniq/uniq.11
-rw-r--r--usr.bin/uniq/uniq.c3
-rw-r--r--usr.bin/units/README1
-rw-r--r--usr.bin/units/pathnames.h1
-rw-r--r--usr.bin/units/units.11
-rw-r--r--usr.bin/units/units.c1
-rw-r--r--usr.bin/units/units.lib1
-rw-r--r--usr.bin/unvis/Makefile2
-rw-r--r--usr.bin/unvis/unvis.11
-rw-r--r--usr.bin/unvis/unvis.c4
-rw-r--r--usr.bin/users/Makefile2
-rw-r--r--usr.bin/users/users.11
-rw-r--r--usr.bin/users/users.c3
-rw-r--r--usr.bin/uudecode/Makefile2
-rw-r--r--usr.bin/uudecode/uudecode.c3
-rw-r--r--usr.bin/uuencode/Makefile2
-rw-r--r--usr.bin/uuencode/uuencode.11
-rw-r--r--usr.bin/uuencode/uuencode.51
-rw-r--r--usr.bin/uuencode/uuencode.c3
-rw-r--r--usr.bin/vacation/Makefile2
-rw-r--r--usr.bin/vacation/vacation.11
-rw-r--r--usr.bin/vacation/vacation.c3
-rw-r--r--usr.bin/vgrind/Makefile2
-rw-r--r--usr.bin/vgrind/RETEST/Makefile2
-rw-r--r--usr.bin/vgrind/RETEST/retest.c3
-rw-r--r--usr.bin/vgrind/extern.h1
-rw-r--r--usr.bin/vgrind/pathnames.h1
-rw-r--r--usr.bin/vgrind/regexp.c3
-rw-r--r--usr.bin/vgrind/vfontedpr.c3
-rw-r--r--usr.bin/vgrind/vgrind.11
-rw-r--r--usr.bin/vgrind/vgrind.sh1
-rw-r--r--usr.bin/vgrind/vgrindefs.51
-rw-r--r--usr.bin/vgrind/vgrindefs.c3
-rw-r--r--usr.bin/vgrind/vgrindefs.src1
-rw-r--r--usr.bin/vis/Makefile2
-rw-r--r--usr.bin/vis/foldit.c3
-rw-r--r--usr.bin/vis/vis.11
-rw-r--r--usr.bin/vis/vis.c3
-rw-r--r--usr.bin/vmstat/dkstats.c1
-rw-r--r--usr.bin/vmstat/dkstats.h1
-rw-r--r--usr.bin/vmstat/vmstat.81
-rw-r--r--usr.bin/w/Makefile3
-rw-r--r--usr.bin/w/extern.h2
-rw-r--r--usr.bin/w/pr_time.c2
-rw-r--r--usr.bin/w/proc_compare.c2
-rw-r--r--usr.bin/w/uptime.12
-rw-r--r--usr.bin/w/w.12
-rw-r--r--usr.bin/w/w.c2
-rw-r--r--usr.bin/wall/Makefile2
-rw-r--r--usr.bin/wall/ttymsg.c3
-rw-r--r--usr.bin/wall/wall.11
-rw-r--r--usr.bin/wall/wall.c3
-rw-r--r--usr.bin/wc/Makefile3
-rw-r--r--usr.bin/wc/wc.12
-rw-r--r--usr.bin/wc/wc.c4
-rw-r--r--usr.bin/what/Makefile2
-rw-r--r--usr.bin/what/what.11
-rw-r--r--usr.bin/what/what.c3
-rw-r--r--usr.bin/whatis/Makefile3
-rw-r--r--usr.bin/whatis/whatis.12
-rw-r--r--usr.bin/whatis/whatis.c2
-rw-r--r--usr.bin/whereis/Makefile3
-rw-r--r--usr.bin/whereis/whereis.11
-rw-r--r--usr.bin/whereis/whereis.c3
-rw-r--r--usr.bin/which/Makefile3
-rw-r--r--usr.bin/which/which.12
-rw-r--r--usr.bin/which/which.csh2
-rw-r--r--usr.bin/who/Makefile2
-rw-r--r--usr.bin/who/who.11
-rw-r--r--usr.bin/who/who.c3
-rw-r--r--usr.bin/whois/Makefile2
-rw-r--r--usr.bin/whois/whois.11
-rw-r--r--usr.bin/whois/whois.c3
-rw-r--r--usr.bin/window/Makefile2
-rw-r--r--usr.bin/window/README2
-rw-r--r--usr.bin/window/alias.h1
-rw-r--r--usr.bin/window/char.c3
-rw-r--r--usr.bin/window/char.h1
-rw-r--r--usr.bin/window/cmd.c3
-rw-r--r--usr.bin/window/cmd1.c3
-rw-r--r--usr.bin/window/cmd2.c3
-rw-r--r--usr.bin/window/cmd3.c3
-rw-r--r--usr.bin/window/cmd4.c3
-rw-r--r--usr.bin/window/cmd5.c3
-rw-r--r--usr.bin/window/cmd6.c3
-rw-r--r--usr.bin/window/cmd7.c3
-rw-r--r--usr.bin/window/compress.c3
-rw-r--r--usr.bin/window/context.c3
-rw-r--r--usr.bin/window/context.h1
-rw-r--r--usr.bin/window/defs.h1
-rw-r--r--usr.bin/window/error.c3
-rw-r--r--usr.bin/window/lcmd.c3
-rw-r--r--usr.bin/window/lcmd.h1
-rw-r--r--usr.bin/window/lcmd1.c3
-rw-r--r--usr.bin/window/lcmd2.c3
-rw-r--r--usr.bin/window/local.h1
-rw-r--r--usr.bin/window/main.c3
-rw-r--r--usr.bin/window/mloop.c3
-rw-r--r--usr.bin/window/parser.h1
-rw-r--r--usr.bin/window/parser1.c3
-rw-r--r--usr.bin/window/parser2.c3
-rw-r--r--usr.bin/window/parser3.c3
-rw-r--r--usr.bin/window/parser4.c3
-rw-r--r--usr.bin/window/parser5.c3
-rw-r--r--usr.bin/window/scanner.c3
-rw-r--r--usr.bin/window/startup.c3
-rw-r--r--usr.bin/window/string.c3
-rw-r--r--usr.bin/window/string.h1
-rw-r--r--usr.bin/window/token.h1
-rw-r--r--usr.bin/window/tt.h1
-rw-r--r--usr.bin/window/ttf100.c3
-rw-r--r--usr.bin/window/ttgeneric.c3
-rw-r--r--usr.bin/window/tth19.c3
-rw-r--r--usr.bin/window/tth29.c3
-rw-r--r--usr.bin/window/ttinit.c3
-rw-r--r--usr.bin/window/ttoutput.c3
-rw-r--r--usr.bin/window/tttermcap.c3
-rw-r--r--usr.bin/window/tttvi925.c3
-rw-r--r--usr.bin/window/ttwyse60.c3
-rw-r--r--usr.bin/window/ttwyse75.c3
-rw-r--r--usr.bin/window/ttzapple.c3
-rw-r--r--usr.bin/window/ttzentec.c3
-rw-r--r--usr.bin/window/value.h1
-rw-r--r--usr.bin/window/var.c3
-rw-r--r--usr.bin/window/var.h1
-rw-r--r--usr.bin/window/win.c3
-rw-r--r--usr.bin/window/window.11
-rw-r--r--usr.bin/window/windowrc2
-rw-r--r--usr.bin/window/ww.h1
-rw-r--r--usr.bin/window/wwadd.c3
-rw-r--r--usr.bin/window/wwalloc.c3
-rw-r--r--usr.bin/window/wwbox.c3
-rw-r--r--usr.bin/window/wwchild.c3
-rw-r--r--usr.bin/window/wwclose.c3
-rw-r--r--usr.bin/window/wwclreol.c3
-rw-r--r--usr.bin/window/wwclreos.c3
-rw-r--r--usr.bin/window/wwcursor.c3
-rw-r--r--usr.bin/window/wwdata.c3
-rw-r--r--usr.bin/window/wwdelchar.c3
-rw-r--r--usr.bin/window/wwdelete.c3
-rw-r--r--usr.bin/window/wwdelline.c3
-rw-r--r--usr.bin/window/wwdump.c3
-rw-r--r--usr.bin/window/wwend.c3
-rw-r--r--usr.bin/window/wwenviron.c3
-rw-r--r--usr.bin/window/wwerror.c3
-rw-r--r--usr.bin/window/wwflush.c3
-rw-r--r--usr.bin/window/wwframe.c3
-rw-r--r--usr.bin/window/wwgets.c3
-rw-r--r--usr.bin/window/wwinit.c3
-rw-r--r--usr.bin/window/wwinschar.c3
-rw-r--r--usr.bin/window/wwinsline.c3
-rw-r--r--usr.bin/window/wwiomux.c3
-rw-r--r--usr.bin/window/wwlabel.c3
-rw-r--r--usr.bin/window/wwmisc.c3
-rw-r--r--usr.bin/window/wwmove.c3
-rw-r--r--usr.bin/window/wwopen.c3
-rw-r--r--usr.bin/window/wwprintf.c3
-rw-r--r--usr.bin/window/wwpty.c3
-rw-r--r--usr.bin/window/wwputc.c3
-rw-r--r--usr.bin/window/wwputs.c3
-rw-r--r--usr.bin/window/wwredraw.c3
-rw-r--r--usr.bin/window/wwredrawwin.c3
-rw-r--r--usr.bin/window/wwrint.c3
-rw-r--r--usr.bin/window/wwscroll.c3
-rw-r--r--usr.bin/window/wwsize.c3
-rw-r--r--usr.bin/window/wwspawn.c3
-rw-r--r--usr.bin/window/wwsuspend.c3
-rw-r--r--usr.bin/window/wwterminfo.c2
-rw-r--r--usr.bin/window/wwtty.c3
-rw-r--r--usr.bin/window/wwunframe.c3
-rw-r--r--usr.bin/window/wwupdate.c3
-rw-r--r--usr.bin/window/wwwrite.c3
-rw-r--r--usr.bin/window/xx.c3
-rw-r--r--usr.bin/window/xx.h1
-rw-r--r--usr.bin/window/xxflush.c3
-rw-r--r--usr.bin/write/Makefile3
-rw-r--r--usr.bin/write/write.12
-rw-r--r--usr.bin/write/write.c3
-rw-r--r--usr.bin/xargs/Makefile2
-rw-r--r--usr.bin/xargs/pathnames.h1
-rw-r--r--usr.bin/xargs/xargs.11
-rw-r--r--usr.bin/xargs/xargs.c3
-rw-r--r--usr.bin/xinstall/Makefile2
-rw-r--r--usr.bin/xinstall/install.11
-rw-r--r--usr.bin/xinstall/pathnames.h1
-rw-r--r--usr.bin/xinstall/xinstall.c7
-rw-r--r--usr.bin/xlint/Makefile1
-rw-r--r--usr.bin/xlint/lint1/Makefile1
-rw-r--r--usr.bin/xlint/lint1/cgram.y3
-rw-r--r--usr.bin/xlint/lint1/decl.c3
-rw-r--r--usr.bin/xlint/lint1/emit.c3
-rw-r--r--usr.bin/xlint/lint1/emit1.c3
-rw-r--r--usr.bin/xlint/lint1/err.c3
-rw-r--r--usr.bin/xlint/lint1/externs.h1
-rw-r--r--usr.bin/xlint/lint1/externs1.h1
-rw-r--r--usr.bin/xlint/lint1/func.c3
-rw-r--r--usr.bin/xlint/lint1/init.c3
-rw-r--r--usr.bin/xlint/lint1/lint.h1
-rw-r--r--usr.bin/xlint/lint1/lint1.h1
-rw-r--r--usr.bin/xlint/lint1/main1.c3
-rw-r--r--usr.bin/xlint/lint1/mem.c3
-rw-r--r--usr.bin/xlint/lint1/mem1.c3
-rw-r--r--usr.bin/xlint/lint1/op.h1
-rw-r--r--usr.bin/xlint/lint1/param.h1
-rw-r--r--usr.bin/xlint/lint1/scan.l3
-rw-r--r--usr.bin/xlint/lint1/tree.c3
-rw-r--r--usr.bin/xlint/lint2/Makefile1
-rw-r--r--usr.bin/xlint/lint2/chk.c3
-rw-r--r--usr.bin/xlint/lint2/emit2.c3
-rw-r--r--usr.bin/xlint/lint2/externs2.h1
-rw-r--r--usr.bin/xlint/lint2/hash.c3
-rw-r--r--usr.bin/xlint/lint2/lint2.h1
-rw-r--r--usr.bin/xlint/lint2/main2.c3
-rw-r--r--usr.bin/xlint/lint2/mem2.c3
-rw-r--r--usr.bin/xlint/lint2/msg.c3
-rw-r--r--usr.bin/xlint/lint2/read.c3
-rw-r--r--usr.bin/xlint/llib/Makefile1
-rw-r--r--usr.bin/xlint/llib/llib-lposix1
-rw-r--r--usr.bin/xlint/llib/llib-lstdc1
-rw-r--r--usr.bin/xlint/xlint/Makefile1
-rw-r--r--usr.bin/xlint/xlint/lint.11
-rw-r--r--usr.bin/xlint/xlint/pathnames.h1
-rw-r--r--usr.bin/xlint/xlint/xlint.c3
-rw-r--r--usr.bin/xstr/Makefile2
-rw-r--r--usr.bin/xstr/pathnames.h1
-rw-r--r--usr.bin/xstr/xstr.11
-rw-r--r--usr.bin/xstr/xstr.c3
-rw-r--r--usr.bin/yacc/closure.c3
-rw-r--r--usr.bin/yacc/error.c3
-rw-r--r--usr.bin/yacc/lalr.c3
-rw-r--r--usr.bin/yacc/lr0.c3
-rw-r--r--usr.bin/yacc/main.c3
-rw-r--r--usr.bin/yacc/output.c3
-rw-r--r--usr.bin/yacc/symtab.c3
-rw-r--r--usr.bin/yacc/test/error.tab.h2
-rw-r--r--usr.bin/yacc/test/ftp.tab.h2
-rw-r--r--usr.bin/yacc/verbose.c3
-rw-r--r--usr.bin/yacc/warshall.c3
-rw-r--r--usr.bin/yacc/yacc.12
-rw-r--r--usr.bin/yes/Makefile2
-rw-r--r--usr.bin/yes/yes.11
-rw-r--r--usr.bin/yes/yes.c3
1183 files changed, 2019 insertions, 870 deletions
diff --git a/usr.bin/Makefile.inc b/usr.bin/Makefile.inc
index eea339c950d..d7788bfa2ba 100644
--- a/usr.bin/Makefile.inc
+++ b/usr.bin/Makefile.inc
@@ -1,4 +1,3 @@
-# from: @(#)Makefile.inc 5.1 (Berkeley) 5/11/90
-# $Id: Makefile.inc,v 1.1 1995/10/18 08:44:52 deraadt Exp $
+# $OpenBSD: Makefile.inc,v 1.2 1996/06/26 05:31:08 deraadt Exp $
BINDIR?= /usr/bin
diff --git a/usr.bin/apply/Makefile b/usr.bin/apply/Makefile
index d64a0285fa9..4e2b2a1a1c2 100644
--- a/usr.bin/apply/Makefile
+++ b/usr.bin/apply/Makefile
@@ -1,5 +1,5 @@
+# $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 $
-# @(#)Makefile 8.1 (Berkeley) 6/6/93
PROG= apply
diff --git a/usr.bin/apply/apply.1 b/usr.bin/apply/apply.1
index 3fdaa99a77d..c8312c8d900 100644
--- a/usr.bin/apply/apply.1
+++ b/usr.bin/apply/apply.1
@@ -1,3 +1,4 @@
+.\" $OpenBSD: apply.1,v 1.3 1996/06/26 05:31:12 deraadt Exp $
.\" $NetBSD: apply.1,v 1.4 1996/03/18 23:16:57 jtc Exp $
.\"
.\" Copyright (c) 1983, 1990, 1993
diff --git a/usr.bin/apply/apply.c b/usr.bin/apply/apply.c
index 221a033e392..329aa32797c 100644
--- a/usr.bin/apply/apply.c
+++ b/usr.bin/apply/apply.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: apply.c,v 1.2 1996/06/26 05:31:13 deraadt Exp $ */
/* $NetBSD: apply.c,v 1.3 1995/03/25 03:38:23 glass Exp $ */
/*-
@@ -40,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)apply.c 8.4 (Berkeley) 4/4/94";
#else
-static char rcsid[] = "$NetBSD: apply.c,v 1.3 1995/03/25 03:38:23 glass Exp $";
+static char rcsid[] = "$OpenBSD: apply.c,v 1.2 1996/06/26 05:31:13 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/apropos/Makefile b/usr.bin/apropos/Makefile
index 5bf0211b5a3..602caacdfe7 100644
--- a/usr.bin/apropos/Makefile
+++ b/usr.bin/apropos/Makefile
@@ -1,5 +1,5 @@
+# $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 $
-# @(#)Makefile 8.1 (Berkeley) 6/6/93
PROG= apropos
SRCS= apropos.c config.c
diff --git a/usr.bin/apropos/apropos.1 b/usr.bin/apropos/apropos.1
index 1e7eb7750bb..edd2f9b1930 100644
--- a/usr.bin/apropos/apropos.1
+++ b/usr.bin/apropos/apropos.1
@@ -1,3 +1,4 @@
+.\" $OpenBSD: apropos.1,v 1.2 1996/06/26 05:31:14 deraadt Exp $
.\" $NetBSD: apropos.1,v 1.4 1995/09/04 20:46:17 tls Exp $
.\"
.\" Copyright (c) 1989, 1990, 1993
diff --git a/usr.bin/apropos/apropos.c b/usr.bin/apropos/apropos.c
index 87c86fb3214..b430400e678 100644
--- a/usr.bin/apropos/apropos.c
+++ b/usr.bin/apropos/apropos.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: apropos.c,v 1.2 1996/06/26 05:31:14 deraadt Exp $ */
/* $NetBSD: apropos.c,v 1.5 1995/09/04 20:46:20 tls Exp $ */
/*
@@ -43,7 +44,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)apropos.c 8.8 (Berkeley) 5/4/95";
#else
-static char rcsid[] = "$NetBSD: apropos.c,v 1.5 1995/09/04 20:46:20 tls Exp $";
+static char rcsid[] = "$OpenBSD: apropos.c,v 1.2 1996/06/26 05:31:14 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/ar/Makefile b/usr.bin/ar/Makefile
index 25cedb393e6..451a43c087c 100644
--- a/usr.bin/ar/Makefile
+++ b/usr.bin/ar/Makefile
@@ -1,5 +1,5 @@
+# $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 $
-# @(#)Makefile 8.1 (Berkeley) 6/6/93
PROG= ar
CFLAGS+=-I${.CURDIR}
diff --git a/usr.bin/ar/append.c b/usr.bin/ar/append.c
index 04055ed6648..5d3dc169708 100644
--- a/usr.bin/ar/append.c
+++ b/usr.bin/ar/append.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: append.c,v 1.2 1996/06/26 05:31:16 deraadt Exp $ */
/* $NetBSD: append.c,v 1.5 1995/03/26 03:27:37 glass Exp $ */
/*-
@@ -40,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)append.c 8.3 (Berkeley) 4/2/94";
#else
-static char rcsid[] = "$NetBSD: append.c,v 1.5 1995/03/26 03:27:37 glass Exp $";
+static char rcsid[] = "$OpenBSD: append.c,v 1.2 1996/06/26 05:31:16 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/ar/ar.1 b/usr.bin/ar/ar.1
index 1898058c900..7e1a1964949 100644
--- a/usr.bin/ar/ar.1
+++ b/usr.bin/ar/ar.1
@@ -1,3 +1,4 @@
+.\" $OpenBSD: ar.1,v 1.2 1996/06/26 05:31:17 deraadt Exp $
.\" $NetBSD: ar.1,v 1.7 1995/08/18 15:05:11 pk Exp $
.\"
.\" Copyright (c) 1990, 1993
diff --git a/usr.bin/ar/ar.5 b/usr.bin/ar/ar.5
index 5d7c72bed43..f3f95236d76 100644
--- a/usr.bin/ar/ar.5
+++ b/usr.bin/ar/ar.5
@@ -1,3 +1,4 @@
+.\" $OpenBSD: ar.5,v 1.2 1996/06/26 05:31:17 deraadt Exp $
.\" $NetBSD: ar.5,v 1.2 1995/03/25 06:39:38 glass Exp $
.\"
.\" Copyright (c) 1990, 1991, 1993
diff --git a/usr.bin/ar/ar.c b/usr.bin/ar/ar.c
index fdbdc757198..4de5e562911 100644
--- a/usr.bin/ar/ar.c
+++ b/usr.bin/ar/ar.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: ar.c,v 1.2 1996/06/26 05:31:18 deraadt Exp $ */
/* $NetBSD: ar.c,v 1.5 1995/03/26 03:27:44 glass Exp $ */
/*-
@@ -46,7 +47,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)ar.c 8.3 (Berkeley) 4/2/94";
#else
-static char rcsid[] = "$NetBSD: ar.c,v 1.5 1995/03/26 03:27:44 glass Exp $";
+static char rcsid[] = "$OpenBSD: ar.c,v 1.2 1996/06/26 05:31:18 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/ar/archive.h b/usr.bin/ar/archive.h
index aca4c875adb..1ba81c2fab3 100644
--- a/usr.bin/ar/archive.h
+++ b/usr.bin/ar/archive.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: archive.h,v 1.2 1996/06/26 05:31:18 deraadt Exp $ */
/* $NetBSD: archive.h,v 1.6 1995/03/25 06:39:43 glass Exp $ */
/*-
diff --git a/usr.bin/ar/contents.c b/usr.bin/ar/contents.c
index 4aa7b26032a..866f88c9eef 100644
--- a/usr.bin/ar/contents.c
+++ b/usr.bin/ar/contents.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: contents.c,v 1.2 1996/06/26 05:31:19 deraadt Exp $ */
/* $NetBSD: contents.c,v 1.5 1995/03/26 03:27:49 glass Exp $ */
/*-
@@ -40,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)contents.c 8.3 (Berkeley) 4/2/94";
#else
-static char rcsid[] = "$NetBSD: contents.c,v 1.5 1995/03/26 03:27:49 glass Exp $";
+static char rcsid[] = "$OpenBSD: contents.c,v 1.2 1996/06/26 05:31:19 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/ar/delete.c b/usr.bin/ar/delete.c
index a4245a773bb..b138dacbab0 100644
--- a/usr.bin/ar/delete.c
+++ b/usr.bin/ar/delete.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: delete.c,v 1.2 1996/06/26 05:31:19 deraadt Exp $ */
/* $NetBSD: delete.c,v 1.5 1995/03/26 03:27:52 glass Exp $ */
/*-
@@ -40,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)delete.c 8.3 (Berkeley) 4/2/94";
#else
-static char rcsid[] = "$NetBSD: delete.c,v 1.5 1995/03/26 03:27:52 glass Exp $";
+static char rcsid[] = "$OpenBSD: delete.c,v 1.2 1996/06/26 05:31:19 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/ar/extern.h b/usr.bin/ar/extern.h
index ee606c5123b..16640e9cdcf 100644
--- a/usr.bin/ar/extern.h
+++ b/usr.bin/ar/extern.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: extern.h,v 1.2 1996/06/26 05:31:20 deraadt Exp $ */
/* $NetBSD: extern.h,v 1.4 1995/03/25 06:39:46 glass Exp $ */
/*-
diff --git a/usr.bin/ar/extract.c b/usr.bin/ar/extract.c
index 8d42841fe9d..7861c3356a1 100644
--- a/usr.bin/ar/extract.c
+++ b/usr.bin/ar/extract.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: extract.c,v 1.2 1996/06/26 05:31:20 deraadt Exp $ */
/* $NetBSD: extract.c,v 1.5 1995/03/26 03:27:53 glass Exp $ */
/*-
@@ -40,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)extract.c 8.3 (Berkeley) 4/2/94";
#else
-static char rcsid[] = "$NetBSD: extract.c,v 1.5 1995/03/26 03:27:53 glass Exp $";
+static char rcsid[] = "$OpenBSD: extract.c,v 1.2 1996/06/26 05:31:20 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/ar/misc.c b/usr.bin/ar/misc.c
index 0e71744f076..fe67b468843 100644
--- a/usr.bin/ar/misc.c
+++ b/usr.bin/ar/misc.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: misc.c,v 1.2 1996/06/26 05:31:21 deraadt Exp $ */
/* $NetBSD: misc.c,v 1.6 1995/03/26 03:27:55 glass Exp $ */
/*-
@@ -40,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)misc.c 8.3 (Berkeley) 4/2/94";
#else
-static char rcsid[] = "$NetBSD: misc.c,v 1.6 1995/03/26 03:27:55 glass Exp $";
+static char rcsid[] = "$OpenBSD: misc.c,v 1.2 1996/06/26 05:31:21 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/ar/move.c b/usr.bin/ar/move.c
index 039360d1059..7bc1d7668a0 100644
--- a/usr.bin/ar/move.c
+++ b/usr.bin/ar/move.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: move.c,v 1.2 1996/06/26 05:31:21 deraadt Exp $ */
/* $NetBSD: move.c,v 1.5 1995/03/26 03:27:57 glass Exp $ */
/*-
@@ -40,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)move.c 8.3 (Berkeley) 4/2/94";
#else
-static char rcsid[] = "$NetBSD: move.c,v 1.5 1995/03/26 03:27:57 glass Exp $";
+static char rcsid[] = "$OpenBSD: move.c,v 1.2 1996/06/26 05:31:21 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/ar/pathnames.h b/usr.bin/ar/pathnames.h
index f4ea52b6f50..2d628260a3f 100644
--- a/usr.bin/ar/pathnames.h
+++ b/usr.bin/ar/pathnames.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: pathnames.h,v 1.2 1996/06/26 05:31:22 deraadt Exp $ */
/* $NetBSD: pathnames.h,v 1.4 1995/03/25 06:39:50 glass Exp $ */
/*-
diff --git a/usr.bin/ar/print.c b/usr.bin/ar/print.c
index a85cc94cbe0..ed5490723f1 100644
--- a/usr.bin/ar/print.c
+++ b/usr.bin/ar/print.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: print.c,v 1.2 1996/06/26 05:31:22 deraadt Exp $ */
/* $NetBSD: print.c,v 1.5 1995/03/26 03:27:59 glass Exp $ */
/*-
@@ -40,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)print.c 8.3 (Berkeley) 4/2/94";
#else
-static char rcsid[] = "$NetBSD: print.c,v 1.5 1995/03/26 03:27:59 glass Exp $";
+static char rcsid[] = "$OpenBSD: print.c,v 1.2 1996/06/26 05:31:22 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/ar/replace.c b/usr.bin/ar/replace.c
index 93a201043cf..efce3c37d75 100644
--- a/usr.bin/ar/replace.c
+++ b/usr.bin/ar/replace.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: replace.c,v 1.2 1996/06/26 05:31:23 deraadt Exp $ */
/* $NetBSD: replace.c,v 1.6 1995/03/26 03:28:01 glass Exp $ */
/*-
@@ -40,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)replace.c 8.3 (Berkeley) 4/2/94";
#else
-static char rcsid[] = "$NetBSD: replace.c,v 1.6 1995/03/26 03:28:01 glass Exp $";
+static char rcsid[] = "$OpenBSD: replace.c,v 1.2 1996/06/26 05:31:23 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/asa/Makefile b/usr.bin/asa/Makefile
index 0b735619ab3..1437c9f1614 100644
--- a/usr.bin/asa/Makefile
+++ b/usr.bin/asa/Makefile
@@ -1,3 +1,4 @@
+# $OpenBSD: Makefile,v 1.2 1996/06/26 05:31:24 deraadt Exp $
# $NetBSD: Makefile,v 1.2 1995/03/25 18:04:51 glass Exp $
PROG= asa
diff --git a/usr.bin/asa/asa.1 b/usr.bin/asa/asa.1
index 1c557cbe13a..4befac896dc 100644
--- a/usr.bin/asa/asa.1
+++ b/usr.bin/asa/asa.1
@@ -1,3 +1,4 @@
+.\" $OpenBSD: asa.1,v 1.2 1996/06/26 05:31:24 deraadt Exp $
.\" $NetBSD: asa.1,v 1.4 1995/03/26 02:25:05 glass Exp $
.\"
.\" Copyright (c) 1993 Winning Strategies, Inc.
diff --git a/usr.bin/asa/asa.c b/usr.bin/asa/asa.c
index 0c883da70c8..e8a5d78dcf3 100644
--- a/usr.bin/asa/asa.c
+++ b/usr.bin/asa/asa.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: asa.c,v 1.2 1996/06/26 05:31:25 deraadt Exp $ */
/* $NetBSD: asa.c,v 1.10 1995/04/21 03:01:41 cgd Exp $ */
/*
@@ -31,7 +32,7 @@
*/
#ifndef lint
-static char rcsid[] = "$NetBSD: asa.c,v 1.10 1995/04/21 03:01:41 cgd Exp $";
+static char rcsid[] = "$OpenBSD: asa.c,v 1.2 1996/06/26 05:31:25 deraadt Exp $";
#endif
#include <stdio.h>
diff --git a/usr.bin/at/Makefile b/usr.bin/at/Makefile
index 7fe9731a81c..04608254878 100644
--- a/usr.bin/at/Makefile
+++ b/usr.bin/at/Makefile
@@ -1,3 +1,4 @@
+# $OpenBSD: Makefile,v 1.2 1996/06/26 05:31:26 deraadt Exp $
# $NetBSD: Makefile,v 1.2 1995/03/25 18:13:27 glass Exp $
PROG= at
diff --git a/usr.bin/at/at.1 b/usr.bin/at/at.1
index 329fb2e1084..84df0977c7a 100644
--- a/usr.bin/at/at.1
+++ b/usr.bin/at/at.1
@@ -1,3 +1,4 @@
+.\" $OpenBSD: at.1,v 1.2 1996/06/26 05:31:26 deraadt Exp $
.\" $NetBSD: at.1,v 1.6 1995/03/25 18:13:29 glass Exp $
.\"
.\"
diff --git a/usr.bin/at/at.c b/usr.bin/at/at.c
index d08f1e22952..d1de84d0c35 100644
--- a/usr.bin/at/at.c
+++ b/usr.bin/at/at.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: at.c,v 1.2 1996/06/26 05:31:27 deraadt Exp $ */
/* $NetBSD: at.c,v 1.4 1995/03/25 18:13:31 glass Exp $ */
/*
@@ -64,7 +65,7 @@
/* File scope variables */
#ifndef lint
-static char rcsid[] = "$NetBSD: at.c,v 1.4 1995/03/25 18:13:31 glass Exp $";
+static char rcsid[] = "$OpenBSD: at.c,v 1.2 1996/06/26 05:31:27 deraadt Exp $";
#endif
char *no_export[] =
diff --git a/usr.bin/at/at.h b/usr.bin/at/at.h
index ddbbbae30ea..46b07919f31 100644
--- a/usr.bin/at/at.h
+++ b/usr.bin/at/at.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: at.h,v 1.2 1996/06/26 05:31:28 deraadt Exp $ */
/* $NetBSD: at.h,v 1.2 1995/03/25 18:13:32 glass Exp $ */
/*
diff --git a/usr.bin/at/panic.c b/usr.bin/at/panic.c
index 24ab1d2ffdc..b616899085e 100644
--- a/usr.bin/at/panic.c
+++ b/usr.bin/at/panic.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: panic.c,v 1.2 1996/06/26 05:31:28 deraadt Exp $ */
/* $NetBSD: panic.c,v 1.2 1995/03/25 18:13:33 glass Exp $ */
/*
@@ -41,7 +42,7 @@
/* File scope variables */
#ifndef lint
-static char rcsid[] = "$NetBSD: panic.c,v 1.2 1995/03/25 18:13:33 glass Exp $";
+static char rcsid[] = "$OpenBSD: panic.c,v 1.2 1996/06/26 05:31:28 deraadt Exp $";
#endif
/* External variables */
diff --git a/usr.bin/at/panic.h b/usr.bin/at/panic.h
index ce34cb34937..6b7e468c5ea 100644
--- a/usr.bin/at/panic.h
+++ b/usr.bin/at/panic.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: panic.h,v 1.2 1996/06/26 05:31:29 deraadt Exp $ */
/* $NetBSD: panic.h,v 1.2 1995/03/25 18:13:35 glass Exp $ */
/*
diff --git a/usr.bin/at/parsetime.c b/usr.bin/at/parsetime.c
index 6a5f796ebc9..8f7ff34f7be 100644
--- a/usr.bin/at/parsetime.c
+++ b/usr.bin/at/parsetime.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: parsetime.c,v 1.3 1996/06/26 05:31:29 deraadt Exp $ */
/* $NetBSD: parsetime.c,v 1.3 1995/03/25 18:13:36 glass Exp $ */
/*
@@ -119,7 +120,7 @@ static size_t sc_len; /* scanner - lenght of token buffer */
static int sc_tokid; /* scanner - token id */
#ifndef lint
-static char rcsid[] = "$NetBSD: parsetime.c,v 1.3 1995/03/25 18:13:36 glass Exp $";
+static char rcsid[] = "$OpenBSD: parsetime.c,v 1.3 1996/06/26 05:31:29 deraadt Exp $";
#endif
/* Local functions */
diff --git a/usr.bin/at/parsetime.h b/usr.bin/at/parsetime.h
index f3827271787..827172e3283 100644
--- a/usr.bin/at/parsetime.h
+++ b/usr.bin/at/parsetime.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: parsetime.h,v 1.2 1996/06/26 05:31:30 deraadt Exp $ */
/* $NetBSD: parsetime.h,v 1.2 1995/03/25 18:13:37 glass Exp $ */
/*
diff --git a/usr.bin/at/pathnames.h b/usr.bin/at/pathnames.h
index 63df3d3245c..c6062242b09 100644
--- a/usr.bin/at/pathnames.h
+++ b/usr.bin/at/pathnames.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: pathnames.h,v 1.2 1996/06/26 05:31:31 deraadt Exp $ */
/* $NetBSD: pathnames.h,v 1.3 1995/03/25 18:13:38 glass Exp $ */
/*
diff --git a/usr.bin/at/privs.h b/usr.bin/at/privs.h
index d01c7a09048..b6790215f40 100644
--- a/usr.bin/at/privs.h
+++ b/usr.bin/at/privs.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: privs.h,v 1.2 1996/06/26 05:31:31 deraadt Exp $ */
/* $NetBSD: privs.h,v 1.3 1995/03/25 18:13:41 glass Exp $ */
/*
diff --git a/usr.bin/banner/Makefile b/usr.bin/banner/Makefile
index b8c83a19c31..0344560d285 100644
--- a/usr.bin/banner/Makefile
+++ b/usr.bin/banner/Makefile
@@ -1,3 +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 $
PROG= banner
diff --git a/usr.bin/banner/banner.1 b/usr.bin/banner/banner.1
index 5d7478d0c52..74015a621f6 100644
--- a/usr.bin/banner/banner.1
+++ b/usr.bin/banner/banner.1
@@ -1,3 +1,4 @@
+.\" $OpenBSD: banner.1,v 1.2 1996/06/26 05:31:33 deraadt Exp $
.\" $NetBSD: banner.1,v 1.1.1.1 1995/04/09 05:53:04 cgd Exp $
.\"
.\" @(#)Copyright (c) 1995, Simon J. Gerraty.
diff --git a/usr.bin/banner/banner.c b/usr.bin/banner/banner.c
index e90498a696c..58636620d43 100644
--- a/usr.bin/banner/banner.c
+++ b/usr.bin/banner/banner.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: banner.c,v 1.2 1996/06/26 05:31:33 deraadt Exp $ */
/* $NetBSD: banner.c,v 1.2 1995/04/09 06:00:15 cgd Exp $ */
/*
@@ -61,7 +62,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)printjob.c 8.2 (Berkeley) 4/16/94";
#else
-static char rcsid[] = "$NetBSD: banner.c,v 1.2 1995/04/09 06:00:15 cgd Exp $";
+static char rcsid[] = "$OpenBSD: banner.c,v 1.2 1996/06/26 05:31:33 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/banner/banner.h b/usr.bin/banner/banner.h
index 61bbffefbdd..c3b192f0d52 100644
--- a/usr.bin/banner/banner.h
+++ b/usr.bin/banner/banner.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: banner.h,v 1.2 1996/06/26 05:31:34 deraadt Exp $ */
/* $NetBSD: banner.h,v 1.2 1995/04/09 06:00:23 cgd Exp $ */
/*
diff --git a/usr.bin/banner/chset.c b/usr.bin/banner/chset.c
index d6b7f89a846..6d63ed39c8d 100644
--- a/usr.bin/banner/chset.c
+++ b/usr.bin/banner/chset.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: chset.c,v 1.2 1996/06/26 05:31:35 deraadt Exp $ */
/* $NetBSD: chset.c,v 1.2 1995/04/09 06:00:26 cgd Exp $ */
/*
@@ -55,7 +56,7 @@
#if 0
static char sccsid[] = "@(#)lpdchar.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$NetBSD: chset.c,v 1.2 1995/04/09 06:00:26 cgd Exp $";
+static char rcsid[] = "$OpenBSD: chset.c,v 1.2 1996/06/26 05:31:35 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/basename/Makefile b/usr.bin/basename/Makefile
index 038fcc81e9c..50738635c3e 100644
--- a/usr.bin/basename/Makefile
+++ b/usr.bin/basename/Makefile
@@ -1,5 +1,5 @@
+# $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 $
-# @(#)Makefile 8.1 (Berkeley) 6/6/93
PROG= basename
MLINKS= basename.1 dirname.1
diff --git a/usr.bin/basename/basename.1 b/usr.bin/basename/basename.1
index c6f217f5b59..2f0452e1002 100644
--- a/usr.bin/basename/basename.1
+++ b/usr.bin/basename/basename.1
@@ -1,3 +1,4 @@
+.\" $OpenBSD: basename.1,v 1.2 1996/06/26 05:31:36 deraadt Exp $
.\" $NetBSD: basename.1,v 1.9 1995/03/25 18:17:45 glass Exp $
.\"
.\" Copyright (c) 1990, 1993, 1994
diff --git a/usr.bin/basename/basename.c b/usr.bin/basename/basename.c
index 019863d59ef..2f335b78936 100644
--- a/usr.bin/basename/basename.c
+++ b/usr.bin/basename/basename.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: basename.c,v 1.2 1996/06/26 05:31:37 deraadt Exp $ */
/* $NetBSD: basename.c,v 1.9 1995/09/02 05:29:46 jtc Exp $ */
/*-
@@ -43,7 +44,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)basename.c 8.4 (Berkeley) 5/4/95";
#endif
-static char rcsid[] = "$NetBSD: basename.c,v 1.9 1995/09/02 05:29:46 jtc Exp $";
+static char rcsid[] = "$OpenBSD: basename.c,v 1.2 1996/06/26 05:31:37 deraadt Exp $";
#endif /* not lint */
#include <stdio.h>
diff --git a/usr.bin/bdes/Makefile b/usr.bin/bdes/Makefile
index 8b524558498..013afbe6d85 100644
--- a/usr.bin/bdes/Makefile
+++ b/usr.bin/bdes/Makefile
@@ -1,3 +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 $
MAN= bdes.1
diff --git a/usr.bin/bdes/bdes.1 b/usr.bin/bdes/bdes.1
index d72c5871138..5be8aefbf92 100644
--- a/usr.bin/bdes/bdes.1
+++ b/usr.bin/bdes/bdes.1
@@ -1,3 +1,4 @@
+.\" $OpenBSD: bdes.1,v 1.2 1996/06/26 05:31:38 deraadt Exp $
.\" $NetBSD: bdes.1,v 1.1 1995/07/24 04:30:51 cgd Exp $
.\"
.\" Copyright (c) 1991, 1993
diff --git a/usr.bin/bdes/bdes.c b/usr.bin/bdes/bdes.c
index 5e2324169db..db7dccea77d 100644
--- a/usr.bin/bdes/bdes.c
+++ b/usr.bin/bdes/bdes.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: bdes.c,v 1.2 1996/06/26 05:31:39 deraadt Exp $ */
/* $NetBSD: bdes.c,v 1.2 1995/03/26 03:33:19 glass Exp $ */
/*-
@@ -50,7 +51,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)bdes.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$NetBSD: bdes.c,v 1.2 1995/03/26 03:33:19 glass Exp $";
+static char rcsid[] = "$OpenBSD: bdes.c,v 1.2 1996/06/26 05:31:39 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/biff/Makefile b/usr.bin/biff/Makefile
index ca41adb9d50..27ea22826a4 100644
--- a/usr.bin/biff/Makefile
+++ b/usr.bin/biff/Makefile
@@ -1,5 +1,5 @@
+# $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 $
-# @(#)Makefile 8.1 (Berkeley) 6/6/93
PROG= biff
diff --git a/usr.bin/biff/biff.1 b/usr.bin/biff/biff.1
index 225c7c1584a..6a954dfe62e 100644
--- a/usr.bin/biff/biff.1
+++ b/usr.bin/biff/biff.1
@@ -1,3 +1,4 @@
+.\" $OpenBSD: biff.1,v 1.2 1996/06/26 05:31:40 deraadt Exp $
.\" $NetBSD: biff.1,v 1.3 1995/03/26 02:34:21 glass Exp $
.\"
.\" Copyright (c) 1980, 1990, 1993
diff --git a/usr.bin/biff/biff.c b/usr.bin/biff/biff.c
index 22c0c4d924a..52ebc42187f 100644
--- a/usr.bin/biff/biff.c
+++ b/usr.bin/biff/biff.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: biff.c,v 1.2 1996/06/26 05:31:41 deraadt Exp $ */
/* $NetBSD: biff.c,v 1.3 1995/03/26 02:34:22 glass Exp $ */
/*
@@ -43,7 +44,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)biff.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$NetBSD: biff.c,v 1.3 1995/03/26 02:34:22 glass Exp $";
+static char rcsid[] = "$OpenBSD: biff.c,v 1.2 1996/06/26 05:31:41 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/cal/Makefile b/usr.bin/cal/Makefile
index 51ea2f5ae7a..3cc7e39643e 100644
--- a/usr.bin/cal/Makefile
+++ b/usr.bin/cal/Makefile
@@ -1,5 +1,5 @@
+# $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 $
-# @(#)Makefile 8.1 (Berkeley) 6/6/93
PROG= cal
diff --git a/usr.bin/cal/cal.1 b/usr.bin/cal/cal.1
index 7eccffb6376..8e3be197919 100644
--- a/usr.bin/cal/cal.1
+++ b/usr.bin/cal/cal.1
@@ -1,3 +1,4 @@
+.\" $OpenBSD: cal.1,v 1.2 1996/06/26 05:31:43 deraadt Exp $
.\" $NetBSD: cal.1,v 1.6 1995/09/02 05:34:20 jtc Exp $
.\"
.\" Copyright (c) 1989, 1990, 1993
diff --git a/usr.bin/cal/cal.c b/usr.bin/cal/cal.c
index cd2b978ff0f..7b034eadf3f 100644
--- a/usr.bin/cal/cal.c
+++ b/usr.bin/cal/cal.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: cal.c,v 1.2 1996/06/26 05:31:43 deraadt Exp $ */
/* $NetBSD: cal.c,v 1.6 1995/03/26 03:10:24 glass Exp $ */
/*
@@ -46,7 +47,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)cal.c 8.4 (Berkeley) 4/2/94";
#else
-static char rcsid[] = "$NetBSD: cal.c,v 1.6 1995/03/26 03:10:24 glass Exp $";
+static char rcsid[] = "$OpenBSD: cal.c,v 1.2 1996/06/26 05:31:43 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/calendar/Makefile b/usr.bin/calendar/Makefile
index 19fea4d4e4a..b41b54725c0 100644
--- a/usr.bin/calendar/Makefile
+++ b/usr.bin/calendar/Makefile
@@ -1,5 +1,5 @@
+# $OpenBSD: Makefile,v 1.2 1996/06/26 05:31:44 deraadt Exp $
# $NetBSD: Makefile,v 1.6 1995/03/27 08:46:11 glass Exp $
-# @(#)Makefile 8.1 (Berkeley) 6/6/93
PROG= calendar
diff --git a/usr.bin/calendar/calendar.1 b/usr.bin/calendar/calendar.1
index baa769a3dba..636ef78adb0 100644
--- a/usr.bin/calendar/calendar.1
+++ b/usr.bin/calendar/calendar.1
@@ -1,3 +1,4 @@
+.\" $OpenBSD: calendar.1,v 1.2 1996/06/26 05:31:45 deraadt Exp $
.\" $NetBSD: calendar.1,v 1.7 1995/03/27 08:46:13 glass Exp $
.\"
.\" Copyright (c) 1989, 1990, 1993
diff --git a/usr.bin/calendar/calendar.c b/usr.bin/calendar/calendar.c
index 78ce34c3688..98ee5725866 100644
--- a/usr.bin/calendar/calendar.c
+++ b/usr.bin/calendar/calendar.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: calendar.c,v 1.2 1996/06/26 05:31:45 deraadt Exp $ */
/* $NetBSD: calendar.c,v 1.8 1995/09/02 05:38:38 jtc Exp $ */
/*
@@ -43,7 +44,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)calendar.c 8.4 (Berkeley) 1/7/95";
#endif
-static char rcsid[] = "$NetBSD: calendar.c,v 1.8 1995/09/02 05:38:38 jtc Exp $";
+static char rcsid[] = "$OpenBSD: calendar.c,v 1.2 1996/06/26 05:31:45 deraadt Exp $";
#endif /* not lint */
#include <sys/param.h>
diff --git a/usr.bin/calendar/pathnames.h b/usr.bin/calendar/pathnames.h
index 0c9dd8847bc..c4893978898 100644
--- a/usr.bin/calendar/pathnames.h
+++ b/usr.bin/calendar/pathnames.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: pathnames.h,v 1.2 1996/06/26 05:31:46 deraadt Exp $ */
/* $NetBSD: pathnames.h,v 1.3 1995/03/27 08:46:15 glass Exp $ */
/*
diff --git a/usr.bin/cap_mkdb/Makefile b/usr.bin/cap_mkdb/Makefile
index 01643fa327e..577e95e98dd 100644
--- a/usr.bin/cap_mkdb/Makefile
+++ b/usr.bin/cap_mkdb/Makefile
@@ -1,5 +1,5 @@
+# $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 $
-# @(#)Makefile 8.1 (Berkeley) 6/6/93
PROG= cap_mkdb
diff --git a/usr.bin/cap_mkdb/cap_mkdb.1 b/usr.bin/cap_mkdb/cap_mkdb.1
index 8345b525b4f..29d3195235c 100644
--- a/usr.bin/cap_mkdb/cap_mkdb.1
+++ b/usr.bin/cap_mkdb/cap_mkdb.1
@@ -1,3 +1,4 @@
+.\" $OpenBSD: cap_mkdb.1,v 1.2 1996/06/26 05:31:48 deraadt Exp $
.\" $NetBSD: cap_mkdb.1,v 1.4 1995/03/26 03:59:36 glass Exp $
.\"
.\" Copyright (c) 1992, 1993
diff --git a/usr.bin/cap_mkdb/cap_mkdb.c b/usr.bin/cap_mkdb/cap_mkdb.c
index 93486d8b935..a1789a5a822 100644
--- a/usr.bin/cap_mkdb/cap_mkdb.c
+++ b/usr.bin/cap_mkdb/cap_mkdb.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: cap_mkdb.c,v 1.2 1996/06/26 05:31:48 deraadt Exp $ */
/* $NetBSD: cap_mkdb.c,v 1.5 1995/09/02 05:47:12 jtc Exp $ */
/*-
@@ -43,7 +44,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)cap_mkdb.c 8.2 (Berkeley) 4/27/95";
#endif
-static char rcsid[] = "$NetBSD: cap_mkdb.c,v 1.5 1995/09/02 05:47:12 jtc Exp $";
+static char rcsid[] = "$OpenBSD: cap_mkdb.c,v 1.2 1996/06/26 05:31:48 deraadt Exp $";
#endif /* not lint */
#include <sys/param.h>
diff --git a/usr.bin/checknr/Makefile b/usr.bin/checknr/Makefile
index 0c107ae30d2..9f457dca6d7 100644
--- a/usr.bin/checknr/Makefile
+++ b/usr.bin/checknr/Makefile
@@ -1,5 +1,5 @@
+# $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 $
-# @(#)Makefile 8.1 (Berkeley) 6/6/93
PROG= checknr
diff --git a/usr.bin/checknr/checknr.1 b/usr.bin/checknr/checknr.1
index 1074000c796..46bb1c92db4 100644
--- a/usr.bin/checknr/checknr.1
+++ b/usr.bin/checknr/checknr.1
@@ -1,3 +1,4 @@
+.\" $OpenBSD: checknr.1,v 1.2 1996/06/26 05:31:50 deraadt Exp $
.\" $NetBSD: checknr.1,v 1.5 1995/03/26 04:10:14 glass Exp $
.\"
.\" Copyright (c) 1980, 1990, 1993
diff --git a/usr.bin/checknr/checknr.c b/usr.bin/checknr/checknr.c
index e9f19ce819b..114209d552b 100644
--- a/usr.bin/checknr/checknr.c
+++ b/usr.bin/checknr/checknr.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: checknr.c,v 1.2 1996/06/26 05:31:50 deraadt Exp $ */
/* $NetBSD: checknr.c,v 1.4 1995/03/26 04:10:19 glass Exp $ */
/*
@@ -43,7 +44,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)checknr.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$NetBSD: checknr.c,v 1.4 1995/03/26 04:10:19 glass Exp $";
+static char rcsid[] = "$OpenBSD: checknr.c,v 1.2 1996/06/26 05:31:50 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/chflags/Makefile b/usr.bin/chflags/Makefile
index 2d80df7fe49..8051f221012 100644
--- a/usr.bin/chflags/Makefile
+++ b/usr.bin/chflags/Makefile
@@ -1,5 +1,5 @@
+# $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 $
-# @(#)Makefile 8.1 (Berkeley) 6/6/93
PROG= chflags
SRCS= chflags.c stat_flags.c
diff --git a/usr.bin/chflags/chflags.1 b/usr.bin/chflags/chflags.1
index 2dc23ec07c5..dbc1848236e 100644
--- a/usr.bin/chflags/chflags.1
+++ b/usr.bin/chflags/chflags.1
@@ -1,3 +1,4 @@
+.\" $OpenBSD: chflags.1,v 1.2 1996/06/26 05:31:52 deraadt Exp $
.\" $NetBSD: chflags.1,v 1.4 1995/08/31 22:50:22 jtc Exp $
.\"
.\" Copyright (c) 1989, 1990, 1993, 1994
diff --git a/usr.bin/chflags/chflags.c b/usr.bin/chflags/chflags.c
index 3d28c60c03e..a5f01bed330 100644
--- a/usr.bin/chflags/chflags.c
+++ b/usr.bin/chflags/chflags.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: chflags.c,v 1.2 1996/06/26 05:31:52 deraadt Exp $ */
/* $NetBSD: chflags.c,v 1.4 1995/03/26 08:49:20 glass Exp $ */
/*
@@ -43,7 +44,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "from: @(#)chflags.c 8.5 (Berkeley) 4/1/94";
#else
-static char rcsid[] = "$NetBSD: chflags.c,v 1.4 1995/03/26 08:49:20 glass Exp $";
+static char rcsid[] = "$OpenBSD: chflags.c,v 1.2 1996/06/26 05:31:52 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/chpass/Makefile b/usr.bin/chpass/Makefile
index f6f19c838f6..5ecc1ca300f 100644
--- a/usr.bin/chpass/Makefile
+++ b/usr.bin/chpass/Makefile
@@ -1,5 +1,5 @@
+# $OpenBSD: Makefile,v 1.3 1996/06/26 05:31:53 deraadt Exp $
# $NetBSD: Makefile,v 1.6 1996/05/15 21:50:39 jtc Exp $
-# @(#)Makefile 8.2 (Berkeley) 4/2/94
PROG= chpass
SRCS= chpass.c edit.c field.c pw_yp.c table.c util.c getpwent.c
diff --git a/usr.bin/chpass/chpass.1 b/usr.bin/chpass/chpass.1
index 1a66a07f49b..36fa7331a3d 100644
--- a/usr.bin/chpass/chpass.1
+++ b/usr.bin/chpass/chpass.1
@@ -1,3 +1,4 @@
+.\" $OpenBSD: chpass.1,v 1.3 1996/06/26 05:31:54 deraadt Exp $
.\" $NetBSD: chpass.1,v 1.7 1996/05/15 21:50:40 jtc Exp $
.\"
.\" Copyright (c) 1988, 1990, 1993
diff --git a/usr.bin/chpass/chpass.c b/usr.bin/chpass/chpass.c
index a959b2fda5d..9b8e7fbda81 100644
--- a/usr.bin/chpass/chpass.c
+++ b/usr.bin/chpass/chpass.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: chpass.c,v 1.3 1996/06/26 05:31:54 deraadt Exp $ */
/* $NetBSD: chpass.c,v 1.8 1996/05/15 21:50:43 jtc Exp $ */
/*-
@@ -43,7 +44,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)chpass.c 8.4 (Berkeley) 4/2/94";
#else
-static char rcsid[] = "$NetBSD: chpass.c,v 1.8 1996/05/15 21:50:43 jtc Exp $";
+static char rcsid[] = "$OpenBSD: chpass.c,v 1.3 1996/06/26 05:31:54 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/chpass/chpass.h b/usr.bin/chpass/chpass.h
index 087556f4131..1183321034a 100644
--- a/usr.bin/chpass/chpass.h
+++ b/usr.bin/chpass/chpass.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: chpass.h,v 1.3 1996/06/26 05:31:55 deraadt Exp $ */
/* $NetBSD: chpass.h,v 1.4 1996/05/15 21:50:44 jtc Exp $ */
/*
diff --git a/usr.bin/chpass/edit.c b/usr.bin/chpass/edit.c
index afd0d7f862e..0ad632adbfc 100644
--- a/usr.bin/chpass/edit.c
+++ b/usr.bin/chpass/edit.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: edit.c,v 1.3 1996/06/26 05:31:55 deraadt Exp $ */
/* $NetBSD: edit.c,v 1.6 1996/05/15 21:50:45 jtc Exp $ */
/*-
@@ -37,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)edit.c 8.3 (Berkeley) 4/2/94";
#else
-static char rcsid[] = "$NetBSD: edit.c,v 1.6 1996/05/15 21:50:45 jtc Exp $";
+static char rcsid[] = "$OpenBSD: edit.c,v 1.3 1996/06/26 05:31:55 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/chpass/field.c b/usr.bin/chpass/field.c
index 77bce0d4c8a..a205bf64853 100644
--- a/usr.bin/chpass/field.c
+++ b/usr.bin/chpass/field.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: field.c,v 1.2 1996/06/26 05:31:56 deraadt Exp $ */
/* $NetBSD: field.c,v 1.3 1995/03/26 04:55:28 glass Exp $ */
/*
@@ -37,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)field.c 8.4 (Berkeley) 4/2/94";
#else
-static char rcsid[] = "$NetBSD: field.c,v 1.3 1995/03/26 04:55:28 glass Exp $";
+static char rcsid[] = "$OpenBSD: field.c,v 1.2 1996/06/26 05:31:56 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/chpass/pathnames.h b/usr.bin/chpass/pathnames.h
index 9645040507c..2e05e083960 100644
--- a/usr.bin/chpass/pathnames.h
+++ b/usr.bin/chpass/pathnames.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: pathnames.h,v 1.2 1996/06/26 05:31:57 deraadt Exp $ */
/* $NetBSD: pathnames.h,v 1.3 1995/03/26 04:55:29 glass Exp $ */
/*
diff --git a/usr.bin/chpass/pw_copy.c b/usr.bin/chpass/pw_copy.c
index e69de29bb2d..4887cffbfb3 100644
--- a/usr.bin/chpass/pw_copy.c
+++ b/usr.bin/chpass/pw_copy.c
@@ -0,0 +1,2 @@
+/* $OpenBSD: pw_copy.c,v 1.3 1996/06/26 05:31:57 deraadt Exp $ */
+
diff --git a/usr.bin/chpass/pw_copy.h b/usr.bin/chpass/pw_copy.h
index e69de29bb2d..969dd36ec61 100644
--- a/usr.bin/chpass/pw_copy.h
+++ b/usr.bin/chpass/pw_copy.h
@@ -0,0 +1,2 @@
+/* $OpenBSD: pw_copy.h,v 1.3 1996/06/26 05:31:58 deraadt Exp $ */
+
diff --git a/usr.bin/chpass/pw_yp.c b/usr.bin/chpass/pw_yp.c
index add1d4fafa9..c032629f890 100644
--- a/usr.bin/chpass/pw_yp.c
+++ b/usr.bin/chpass/pw_yp.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: pw_yp.c,v 1.2 1996/06/26 05:31:58 deraadt Exp $ */
/* $NetBSD: pw_yp.c,v 1.5 1995/03/26 04:55:33 glass Exp $ */
/*
@@ -36,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)pw_yp.c 1.0 2/2/93";
#else
-static char rcsid[] = "$NetBSD: pw_yp.c,v 1.5 1995/03/26 04:55:33 glass Exp $";
+static char rcsid[] = "$OpenBSD: pw_yp.c,v 1.2 1996/06/26 05:31:58 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/chpass/table.c b/usr.bin/chpass/table.c
index 7ec959eaeb6..bb63e886be5 100644
--- a/usr.bin/chpass/table.c
+++ b/usr.bin/chpass/table.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: table.c,v 1.2 1996/06/26 05:31:59 deraadt Exp $ */
/* $NetBSD: table.c,v 1.3 1995/03/26 04:55:34 glass Exp $ */
/*-
@@ -37,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)table.c 8.3 (Berkeley) 4/2/94";
#else
-static char rcsid[] = "$NetBSD: table.c,v 1.3 1995/03/26 04:55:34 glass Exp $";
+static char rcsid[] = "$OpenBSD: table.c,v 1.2 1996/06/26 05:31:59 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/chpass/util.c b/usr.bin/chpass/util.c
index eec12e7f69f..1bf5f6e483b 100644
--- a/usr.bin/chpass/util.c
+++ b/usr.bin/chpass/util.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: util.c,v 1.2 1996/06/26 05:31:59 deraadt Exp $ */
/* $NetBSD: util.c,v 1.4 1995/03/26 04:55:35 glass Exp $ */
/*-
@@ -37,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)util.c 8.4 (Berkeley) 4/2/94";
#else
-static char rcsid[] = "$NetBSD: util.c,v 1.4 1995/03/26 04:55:35 glass Exp $";
+static char rcsid[] = "$OpenBSD: util.c,v 1.2 1996/06/26 05:31:59 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/cksum/Makefile b/usr.bin/cksum/Makefile
index 55ef0fd085b..9e74093fd5e 100644
--- a/usr.bin/cksum/Makefile
+++ b/usr.bin/cksum/Makefile
@@ -1,5 +1,5 @@
+# $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 $
-# @(#)Makefile 8.2 (Berkeley) 4/28/95
PROG= cksum
SRCS= cksum.c crc.c print.c sum1.c sum2.c
diff --git a/usr.bin/cksum/cksum.1 b/usr.bin/cksum/cksum.1
index 17493e23fb4..1a1dbed2006 100644
--- a/usr.bin/cksum/cksum.1
+++ b/usr.bin/cksum/cksum.1
@@ -1,3 +1,4 @@
+.\" $OpenBSD: cksum.1,v 1.2 1996/06/26 05:32:01 deraadt Exp $
.\" $NetBSD: cksum.1,v 1.8 1995/09/02 05:45:15 jtc Exp $
.\"
.\" Copyright (c) 1991, 1993
diff --git a/usr.bin/cksum/cksum.c b/usr.bin/cksum/cksum.c
index 8929181b729..6f0eadae1ed 100644
--- a/usr.bin/cksum/cksum.c
+++ b/usr.bin/cksum/cksum.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: cksum.c,v 1.2 1996/06/26 05:32:01 deraadt Exp $ */
/* $NetBSD: cksum.c,v 1.7 1995/09/02 05:45:18 jtc Exp $ */
/*-
@@ -46,7 +47,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)cksum.c 8.2 (Berkeley) 4/28/95";
#endif
-static char rcsid[] = "$NetBSD: cksum.c,v 1.7 1995/09/02 05:45:18 jtc Exp $";
+static char rcsid[] = "$OpenBSD: cksum.c,v 1.2 1996/06/26 05:32:01 deraadt Exp $";
#endif /* not lint */
#include <sys/cdefs.h>
diff --git a/usr.bin/cksum/extern.h b/usr.bin/cksum/extern.h
index eb54f1b1e76..5c821aabe58 100644
--- a/usr.bin/cksum/extern.h
+++ b/usr.bin/cksum/extern.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: extern.h,v 1.2 1996/06/26 05:32:02 deraadt Exp $ */
/* $NetBSD: extern.h,v 1.5 1995/03/26 05:15:19 glass Exp $ */
/*-
diff --git a/usr.bin/cksum/print.c b/usr.bin/cksum/print.c
index 1e672551622..fbfa797988b 100644
--- a/usr.bin/cksum/print.c
+++ b/usr.bin/cksum/print.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: print.c,v 1.2 1996/06/26 05:32:03 deraadt Exp $ */
/* $NetBSD: print.c,v 1.5 1995/03/26 05:15:21 glass Exp $ */
/*-
@@ -37,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)print.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$NetBSD: print.c,v 1.5 1995/03/26 05:15:21 glass Exp $";
+static char rcsid[] = "$OpenBSD: print.c,v 1.2 1996/06/26 05:32:03 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/cmp/Makefile b/usr.bin/cmp/Makefile
index 32bdfb03727..3dc0242e9be 100644
--- a/usr.bin/cmp/Makefile
+++ b/usr.bin/cmp/Makefile
@@ -1,4 +1,4 @@
-# @(#)Makefile 8.1 (Berkeley) 6/6/93
+# $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 $
PROG= cmp
diff --git a/usr.bin/cmp/cmp.1 b/usr.bin/cmp/cmp.1
index 4d3fd05ac40..8c3cd3b4e75 100644
--- a/usr.bin/cmp/cmp.1
+++ b/usr.bin/cmp/cmp.1
@@ -1,3 +1,4 @@
+.\" $OpenBSD: cmp.1,v 1.2 1996/06/26 05:32:04 deraadt Exp $
.\" $NetBSD: cmp.1,v 1.4 1995/09/08 03:22:55 tls Exp $
.\"
.\" Copyright (c) 1987, 1990, 1993
diff --git a/usr.bin/cmp/cmp.c b/usr.bin/cmp/cmp.c
index 51d17f8186c..dd1aa7c402d 100644
--- a/usr.bin/cmp/cmp.c
+++ b/usr.bin/cmp/cmp.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: cmp.c,v 1.2 1996/06/26 05:32:05 deraadt Exp $ */
/* $NetBSD: cmp.c,v 1.7 1995/09/08 03:22:56 tls Exp $ */
/*
@@ -43,7 +44,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)cmp.c 8.3 (Berkeley) 4/2/94";
#else
-static char rcsid[] = "$NetBSD: cmp.c,v 1.7 1995/09/08 03:22:56 tls Exp $";
+static char rcsid[] = "$OpenBSD: cmp.c,v 1.2 1996/06/26 05:32:05 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/cmp/extern.h b/usr.bin/cmp/extern.h
index ca02c60020d..58dbadfd3c1 100644
--- a/usr.bin/cmp/extern.h
+++ b/usr.bin/cmp/extern.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: extern.h,v 1.2 1996/06/26 05:32:05 deraadt Exp $ */
/* $NetBSD: extern.h,v 1.2 1995/09/08 03:22:57 tls Exp $ */
/*-
diff --git a/usr.bin/cmp/misc.c b/usr.bin/cmp/misc.c
index a6c83495c7e..4614a249518 100644
--- a/usr.bin/cmp/misc.c
+++ b/usr.bin/cmp/misc.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: misc.c,v 1.2 1996/06/26 05:32:06 deraadt Exp $ */
/* $NetBSD: misc.c,v 1.2 1995/09/08 03:22:58 tls Exp $ */
/*-
@@ -37,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)misc.c 8.3 (Berkeley) 4/2/94";
#else
-static char rcsid[] = "$NetBSD: misc.c,v 1.2 1995/09/08 03:22:58 tls Exp $";
+static char rcsid[] = "$OpenBSD: misc.c,v 1.2 1996/06/26 05:32:06 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/cmp/regular.c b/usr.bin/cmp/regular.c
index d1e8ceae8b4..68dd087dcf5 100644
--- a/usr.bin/cmp/regular.c
+++ b/usr.bin/cmp/regular.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: regular.c,v 1.2 1996/06/26 05:32:06 deraadt Exp $ */
/* $NetBSD: regular.c,v 1.2 1995/09/08 03:22:59 tls Exp $ */
/*-
@@ -37,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)regular.c 8.3 (Berkeley) 4/2/94";
#else
-static char rcsid[] = "$NetBSD: regular.c,v 1.2 1995/09/08 03:22:59 tls Exp $";
+static char rcsid[] = "$OpenBSD: regular.c,v 1.2 1996/06/26 05:32:06 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/cmp/special.c b/usr.bin/cmp/special.c
index 4a25bb246e0..399072daa74 100644
--- a/usr.bin/cmp/special.c
+++ b/usr.bin/cmp/special.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: special.c,v 1.2 1996/06/26 05:32:07 deraadt Exp $ */
/* $NetBSD: special.c,v 1.2 1995/09/08 03:23:00 tls Exp $ */
/*-
@@ -37,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)special.c 8.3 (Berkeley) 4/2/94";
#else
-static char rcsid[] = "$NetBSD: special.c,v 1.2 1995/09/08 03:23:00 tls Exp $";
+static char rcsid[] = "$OpenBSD: special.c,v 1.2 1996/06/26 05:32:07 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/col/Makefile b/usr.bin/col/Makefile
index 3d06bdcf089..41e90c6d742 100644
--- a/usr.bin/col/Makefile
+++ b/usr.bin/col/Makefile
@@ -1,5 +1,5 @@
+# $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 $
-# @(#)Makefile 8.1 (Berkeley) 6/6/93
PROG= col
diff --git a/usr.bin/col/README b/usr.bin/col/README
index f673f3ac057..30436f1aec6 100644
--- a/usr.bin/col/README
+++ b/usr.bin/col/README
@@ -1,3 +1,5 @@
+# $OpenBSD: README,v 1.2 1996/06/26 05:32:08 deraadt Exp $
+
# @(#)README 8.1 (Berkeley) 6/6/93
col - filter out reverse line feeds.
diff --git a/usr.bin/col/col.1 b/usr.bin/col/col.1
index fed88e4f4cd..f891c96ebb1 100644
--- a/usr.bin/col/col.1
+++ b/usr.bin/col/col.1
@@ -1,3 +1,4 @@
+.\" $OpenBSD: col.1,v 1.2 1996/06/26 05:32:09 deraadt Exp $
.\" $NetBSD: col.1,v 1.4 1995/03/26 05:25:52 glass Exp $
.\"
.\" Copyright (c) 1990, 1993
diff --git a/usr.bin/col/col.c b/usr.bin/col/col.c
index 81ec17ea209..fe4067d7687 100644
--- a/usr.bin/col/col.c
+++ b/usr.bin/col/col.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: col.c,v 1.2 1996/06/26 05:32:10 deraadt Exp $ */
/* $NetBSD: col.c,v 1.7 1995/09/02 05:48:50 jtc Exp $ */
/*-
@@ -46,7 +47,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)col.c 8.5 (Berkeley) 5/4/95";
#endif
-static char rcsid[] = "$NetBSD: col.c,v 1.7 1995/09/02 05:48:50 jtc Exp $";
+static char rcsid[] = "$OpenBSD: col.c,v 1.2 1996/06/26 05:32:10 deraadt Exp $";
#endif /* not lint */
#include <ctype.h>
diff --git a/usr.bin/colcrt/Makefile b/usr.bin/colcrt/Makefile
index 8fdd4638d3e..faa24b5946a 100644
--- a/usr.bin/colcrt/Makefile
+++ b/usr.bin/colcrt/Makefile
@@ -1,5 +1,5 @@
+# $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 $
-# @(#)Makefile 8.1 (Berkeley) 6/6/93
PROG= colcrt
diff --git a/usr.bin/colcrt/colcrt.1 b/usr.bin/colcrt/colcrt.1
index 3576371493e..36c86606f96 100644
--- a/usr.bin/colcrt/colcrt.1
+++ b/usr.bin/colcrt/colcrt.1
@@ -1,3 +1,4 @@
+.\" $OpenBSD: colcrt.1,v 1.2 1996/06/26 05:32:11 deraadt Exp $
.\" $NetBSD: colcrt.1,v 1.3 1995/03/26 05:30:59 glass Exp $
.\"
.\" Copyright (c) 1980, 1990, 1993
diff --git a/usr.bin/colcrt/colcrt.c b/usr.bin/colcrt/colcrt.c
index 7a4585da237..5d5a8aef283 100644
--- a/usr.bin/colcrt/colcrt.c
+++ b/usr.bin/colcrt/colcrt.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: colcrt.c,v 1.2 1996/06/26 05:32:12 deraadt Exp $ */
/* $NetBSD: colcrt.c,v 1.3 1995/03/26 05:31:00 glass Exp $ */
/*
@@ -43,7 +44,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)colcrt.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$NetBSD: colcrt.c,v 1.3 1995/03/26 05:31:00 glass Exp $";
+static char rcsid[] = "$OpenBSD: colcrt.c,v 1.2 1996/06/26 05:32:12 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/colrm/Makefile b/usr.bin/colrm/Makefile
index 141c19996ce..9e4c497bc07 100644
--- a/usr.bin/colrm/Makefile
+++ b/usr.bin/colrm/Makefile
@@ -1,5 +1,5 @@
+# $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 $
-# @(#)Makefile 8.1 (Berkeley) 6/6/93
PROG= colrm
diff --git a/usr.bin/colrm/colrm.1 b/usr.bin/colrm/colrm.1
index ba96d7c0359..7735cb76799 100644
--- a/usr.bin/colrm/colrm.1
+++ b/usr.bin/colrm/colrm.1
@@ -1,3 +1,4 @@
+.\" $OpenBSD: colrm.1,v 1.2 1996/06/26 05:32:13 deraadt Exp $
.\" $NetBSD: colrm.1,v 1.3 1995/03/26 09:04:01 glass Exp $
.\"
.\" Copyright (c) 1980, 1990, 1993
diff --git a/usr.bin/colrm/colrm.c b/usr.bin/colrm/colrm.c
index a9cdac59144..540eda01408 100644
--- a/usr.bin/colrm/colrm.c
+++ b/usr.bin/colrm/colrm.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: colrm.c,v 1.2 1996/06/26 05:32:14 deraadt Exp $ */
/* $NetBSD: colrm.c,v 1.4 1995/09/02 05:51:37 jtc Exp $ */
/*-
@@ -43,7 +44,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)colrm.c 8.2 (Berkeley) 5/4/95";
#endif
-static char rcsid[] = "$NetBSD: colrm.c,v 1.4 1995/09/02 05:51:37 jtc Exp $";
+static char rcsid[] = "$OpenBSD: colrm.c,v 1.2 1996/06/26 05:32:14 deraadt Exp $";
#endif /* not lint */
#include <sys/types.h>
diff --git a/usr.bin/column/Makefile b/usr.bin/column/Makefile
index 3bfa2070c6b..7ce65c0e533 100644
--- a/usr.bin/column/Makefile
+++ b/usr.bin/column/Makefile
@@ -1,5 +1,5 @@
+# $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 $
-# @(#)Makefile 8.1 (Berkeley) 6/6/93
PROG= column
diff --git a/usr.bin/column/column.1 b/usr.bin/column/column.1
index e5b8767ed98..c86af094ab4 100644
--- a/usr.bin/column/column.1
+++ b/usr.bin/column/column.1
@@ -1,3 +1,4 @@
+.\" $OpenBSD: column.1,v 1.2 1996/06/26 05:32:15 deraadt Exp $
.\" $NetBSD: column.1,v 1.3 1995/03/26 09:08:28 glass Exp $
.\"
.\" Copyright (c) 1989, 1990, 1993
diff --git a/usr.bin/column/column.c b/usr.bin/column/column.c
index 17e4f934537..6faa84b0c0c 100644
--- a/usr.bin/column/column.c
+++ b/usr.bin/column/column.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: column.c,v 1.2 1996/06/26 05:32:16 deraadt Exp $ */
/* $NetBSD: column.c,v 1.4 1995/09/02 05:53:03 jtc Exp $ */
/*
@@ -43,7 +44,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)column.c 8.4 (Berkeley) 5/4/95";
#endif
-static char rcsid[] = "$NetBSD: column.c,v 1.4 1995/09/02 05:53:03 jtc Exp $";
+static char rcsid[] = "$OpenBSD: column.c,v 1.2 1996/06/26 05:32:16 deraadt Exp $";
#endif /* not lint */
#include <sys/types.h>
diff --git a/usr.bin/comm/Makefile b/usr.bin/comm/Makefile
index 5f3841c594c..35441331e97 100644
--- a/usr.bin/comm/Makefile
+++ b/usr.bin/comm/Makefile
@@ -1,5 +1,5 @@
+# $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 $
-# @(#)Makefile 8.1 (Berkeley) 6/6/93
PROG= comm
diff --git a/usr.bin/comm/comm.1 b/usr.bin/comm/comm.1
index ef39aad92d9..8d55d78b0b1 100644
--- a/usr.bin/comm/comm.1
+++ b/usr.bin/comm/comm.1
@@ -1,3 +1,4 @@
+.\" $OpenBSD: comm.1,v 1.2 1996/06/26 05:32:17 deraadt Exp $
.\" $NetBSD: comm.1,v 1.4 1995/03/26 09:25:50 glass Exp $
.\"
.\" Copyright (c) 1989, 1990, 1993
diff --git a/usr.bin/comm/comm.c b/usr.bin/comm/comm.c
index 8d7709ba9f4..f83ccfaea1b 100644
--- a/usr.bin/comm/comm.c
+++ b/usr.bin/comm/comm.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: comm.c,v 1.2 1996/06/26 05:32:18 deraadt Exp $ */
/* $NetBSD: comm.c,v 1.10 1995/09/05 19:57:43 jtc Exp $ */
/*
@@ -46,7 +47,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)comm.c 8.4 (Berkeley) 5/4/95";
#endif
-static char rcsid[] = "$NetBSD: comm.c,v 1.10 1995/09/05 19:57:43 jtc Exp $";
+static char rcsid[] = "$OpenBSD: comm.c,v 1.2 1996/06/26 05:32:18 deraadt Exp $";
#endif /* not lint */
#include <err.h>
diff --git a/usr.bin/compress/Makefile b/usr.bin/compress/Makefile
index 414af5e7e68..32c22989017 100644
--- a/usr.bin/compress/Makefile
+++ b/usr.bin/compress/Makefile
@@ -1,5 +1,5 @@
+# $OpenBSD: Makefile,v 1.2 1996/06/26 05:32:19 deraadt Exp $
# $NetBSD: Makefile,v 1.6 1995/03/26 09:44:29 glass Exp $
-# @(#)Makefile 8.2 (Berkeley) 4/17/94
PROG= compress
SRCS= compress.c zopen.c
diff --git a/usr.bin/compress/compress.1 b/usr.bin/compress/compress.1
index b47c214de70..78b726a89ca 100644
--- a/usr.bin/compress/compress.1
+++ b/usr.bin/compress/compress.1
@@ -1,3 +1,4 @@
+.\" $OpenBSD: compress.1,v 1.2 1996/06/26 05:32:19 deraadt Exp $
.\" $NetBSD: compress.1,v 1.5 1995/03/26 09:44:34 glass Exp $
.\"
.\" Copyright (c) 1986, 1990, 1993
diff --git a/usr.bin/compress/compress.c b/usr.bin/compress/compress.c
index c73152e3b8a..cb1fb339ea9 100644
--- a/usr.bin/compress/compress.c
+++ b/usr.bin/compress/compress.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: compress.c,v 1.2 1996/06/26 05:32:20 deraadt Exp $ */
/* $NetBSD: compress.c,v 1.9 1995/03/26 09:44:38 glass Exp $ */
/*-
@@ -43,7 +44,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)compress.c 8.2 (Berkeley) 1/7/94";
#else
-static char rcsid[] = "$NetBSD: compress.c,v 1.9 1995/03/26 09:44:38 glass Exp $";
+static char rcsid[] = "$OpenBSD: compress.c,v 1.2 1996/06/26 05:32:20 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/compress/doc/revision.log b/usr.bin/compress/doc/revision.log
index 16ca49d57fe..c5f89c890e1 100644
--- a/usr.bin/compress/doc/revision.log
+++ b/usr.bin/compress/doc/revision.log
@@ -1,3 +1,5 @@
+/* $OpenBSD: revision.log,v 1.2 1996/06/26 05:32:23 deraadt Exp $ */
+
/*
* $Hdr: compress.c,v 4.0 85/07/30 12:50:00 joe Release $
* $Lg: compress.c,v $
diff --git a/usr.bin/compress/zcat.sh b/usr.bin/compress/zcat.sh
index 6799f461af9..16f60283fba 100644
--- a/usr.bin/compress/zcat.sh
+++ b/usr.bin/compress/zcat.sh
@@ -1,4 +1,5 @@
#!/bin/sh -
+# $OpenBSD: zcat.sh,v 1.2 1996/06/26 05:32:21 deraadt Exp $
# $NetBSD: zcat.sh,v 1.4 1995/03/26 19:54:37 glass Exp $
#
# Copyright (c) 1992, 1993
diff --git a/usr.bin/compress/zopen.3 b/usr.bin/compress/zopen.3
index bb61ec1ab88..7feb5b367b3 100644
--- a/usr.bin/compress/zopen.3
+++ b/usr.bin/compress/zopen.3
@@ -1,3 +1,4 @@
+.\" $OpenBSD: zopen.3,v 1.2 1996/06/26 05:32:21 deraadt Exp $
.\" $NetBSD: zopen.3,v 1.3 1995/03/26 09:44:49 glass Exp $
.\"
.\" Copyright (c) 1992, 1993
diff --git a/usr.bin/compress/zopen.c b/usr.bin/compress/zopen.c
index 8f97aa4038c..14090d44ec4 100644
--- a/usr.bin/compress/zopen.c
+++ b/usr.bin/compress/zopen.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: zopen.c,v 1.2 1996/06/26 05:32:22 deraadt Exp $ */
/* $NetBSD: zopen.c,v 1.5 1995/03/26 09:44:53 glass Exp $ */
/*-
@@ -41,7 +42,7 @@
#if 0
static char sccsid[] = "@(#)zopen.c 8.1 (Berkeley) 6/27/93";
#else
-static char rcsid[] = "$NetBSD: zopen.c,v 1.5 1995/03/26 09:44:53 glass Exp $";
+static char rcsid[] = "$OpenBSD: zopen.c,v 1.2 1996/06/26 05:32:22 deraadt Exp $";
#endif
#endif /* LIBC_SCCS and not lint */
diff --git a/usr.bin/cpp/Makefile b/usr.bin/cpp/Makefile
index 91df434cc80..36426247def 100644
--- a/usr.bin/cpp/Makefile
+++ b/usr.bin/cpp/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.2 1996/01/04 01:50:33 deraadt Exp $
+# $OpenBSD: Makefile,v 1.3 1996/06/26 05:32:24 deraadt Exp $
NOMAN=
diff --git a/usr.bin/cpp/cpp.sh b/usr.bin/cpp/cpp.sh
index 103e7ecc0d5..c00958801c8 100644
--- a/usr.bin/cpp/cpp.sh
+++ b/usr.bin/cpp/cpp.sh
@@ -1,4 +1,6 @@
#!/bin/sh
+# $OpenBSD: cpp.sh,v 1.2 1996/06/26 05:32:24 deraadt Exp $
+
#
# Copyright (c) 1990 The Regents of the University of California.
# All rights reserved.
diff --git a/usr.bin/crontab/Makefile b/usr.bin/crontab/Makefile
index d050562d2c5..5dbf742c255 100644
--- a/usr.bin/crontab/Makefile
+++ b/usr.bin/crontab/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.1 1995/10/18 08:45:03 deraadt Exp $
+# $OpenBSD: Makefile,v 1.2 1996/06/26 05:32:25 deraadt Exp $
PROG= crontab
SRCS= crontab.c misc.c entry.c env.c
diff --git a/usr.bin/ctags/C.c b/usr.bin/ctags/C.c
index 3391eeddcd6..c2a9c8fac95 100644
--- a/usr.bin/ctags/C.c
+++ b/usr.bin/ctags/C.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: C.c,v 1.2 1996/06/26 05:32:26 deraadt Exp $ */
/* $NetBSD: C.c,v 1.3 1995/03/26 20:14:02 glass Exp $ */
/*
@@ -37,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)C.c 8.4 (Berkeley) 4/2/94";
#else
-static char rcsid[] = "$NetBSD: C.c,v 1.3 1995/03/26 20:14:02 glass Exp $";
+static char rcsid[] = "$OpenBSD: C.c,v 1.2 1996/06/26 05:32:26 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/ctags/Makefile b/usr.bin/ctags/Makefile
index 11b0827ca77..ee1d437d0c7 100644
--- a/usr.bin/ctags/Makefile
+++ b/usr.bin/ctags/Makefile
@@ -1,5 +1,5 @@
+# $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 $
-# @(#)Makefile 8.1 (Berkeley) 6/6/93
PROG= ctags
CFLAGS+=-I${.CURDIR}
diff --git a/usr.bin/ctags/ctags.1 b/usr.bin/ctags/ctags.1
index 82fea22b10f..41f30dc5400 100644
--- a/usr.bin/ctags/ctags.1
+++ b/usr.bin/ctags/ctags.1
@@ -1,3 +1,4 @@
+.\" $OpenBSD: ctags.1,v 1.2 1996/06/26 05:32:27 deraadt Exp $
.\" $NetBSD: ctags.1,v 1.4 1995/03/26 20:14:04 glass Exp $
.\"
.\" Copyright (c) 1987, 1990, 1993
diff --git a/usr.bin/ctags/ctags.c b/usr.bin/ctags/ctags.c
index 480760b15f3..c352bdb8aaf 100644
--- a/usr.bin/ctags/ctags.c
+++ b/usr.bin/ctags/ctags.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: ctags.c,v 1.2 1996/06/26 05:32:28 deraadt Exp $ */
/* $NetBSD: ctags.c,v 1.4 1995/09/02 05:57:23 jtc Exp $ */
/*
@@ -43,7 +44,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)ctags.c 8.4 (Berkeley) 2/7/95";
#endif
-static char rcsid[] = "$NetBSD: ctags.c,v 1.4 1995/09/02 05:57:23 jtc Exp $";
+static char rcsid[] = "$OpenBSD: ctags.c,v 1.2 1996/06/26 05:32:28 deraadt Exp $";
#endif /* not lint */
#include <err.h>
diff --git a/usr.bin/ctags/ctags.h b/usr.bin/ctags/ctags.h
index e6fb6247faf..9dd9412d0ad 100644
--- a/usr.bin/ctags/ctags.h
+++ b/usr.bin/ctags/ctags.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: ctags.h,v 1.2 1996/06/26 05:32:28 deraadt Exp $ */
/* $NetBSD: ctags.h,v 1.3 1995/03/26 20:14:07 glass Exp $ */
/*
diff --git a/usr.bin/ctags/fortran.c b/usr.bin/ctags/fortran.c
index c4d87fea102..0da0dd6460e 100644
--- a/usr.bin/ctags/fortran.c
+++ b/usr.bin/ctags/fortran.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: fortran.c,v 1.2 1996/06/26 05:32:29 deraadt Exp $ */
/* $NetBSD: fortran.c,v 1.3 1995/03/26 20:14:08 glass Exp $ */
/*
@@ -37,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)fortran.c 8.3 (Berkeley) 4/2/94";
#else
-static char rcsid[] = "$NetBSD: fortran.c,v 1.3 1995/03/26 20:14:08 glass Exp $";
+static char rcsid[] = "$OpenBSD: fortran.c,v 1.2 1996/06/26 05:32:29 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/ctags/lisp.c b/usr.bin/ctags/lisp.c
index 0914e5d330d..99d97f907aa 100644
--- a/usr.bin/ctags/lisp.c
+++ b/usr.bin/ctags/lisp.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: lisp.c,v 1.2 1996/06/26 05:32:29 deraadt Exp $ */
/* $NetBSD: lisp.c,v 1.3 1995/03/26 20:14:09 glass Exp $ */
/*
@@ -37,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)lisp.c 8.3 (Berkeley) 4/2/94";
#else
-static char rcsid[] = "$NetBSD: lisp.c,v 1.3 1995/03/26 20:14:09 glass Exp $";
+static char rcsid[] = "$OpenBSD: lisp.c,v 1.2 1996/06/26 05:32:29 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/ctags/print.c b/usr.bin/ctags/print.c
index f08c0b60c45..2a35bd58927 100644
--- a/usr.bin/ctags/print.c
+++ b/usr.bin/ctags/print.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: print.c,v 1.2 1996/06/26 05:32:30 deraadt Exp $ */
/* $NetBSD: print.c,v 1.4 1995/09/27 01:06:58 jtc Exp $ */
/*
@@ -37,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)print.c 8.3 (Berkeley) 4/2/94";
#else
-static char rcsid[] = "$NetBSD: print.c,v 1.4 1995/09/27 01:06:58 jtc Exp $";
+static char rcsid[] = "$OpenBSD: print.c,v 1.2 1996/06/26 05:32:30 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/ctags/test/ctags.test b/usr.bin/ctags/test/ctags.test
index 658a073bf6d..a8205099f61 100644
--- a/usr.bin/ctags/test/ctags.test
+++ b/usr.bin/ctags/test/ctags.test
@@ -1,3 +1,4 @@
+/* $OpenBSD: ctags.test,v 1.2 1996/06/26 05:32:32 deraadt Exp $ */
/* $NetBSD: ctags.test,v 1.2 1995/03/26 20:14:14 glass Exp $ */
int bar = (1 + 5);
diff --git a/usr.bin/ctags/tree.c b/usr.bin/ctags/tree.c
index 87a683e5ae4..29f19586d1e 100644
--- a/usr.bin/ctags/tree.c
+++ b/usr.bin/ctags/tree.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: tree.c,v 1.2 1996/06/26 05:32:31 deraadt Exp $ */
/* $NetBSD: tree.c,v 1.4 1995/03/26 20:14:11 glass Exp $ */
/*
@@ -37,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)tree.c 8.3 (Berkeley) 4/2/94";
#else
-static char rcsid[] = "$NetBSD: tree.c,v 1.4 1995/03/26 20:14:11 glass Exp $";
+static char rcsid[] = "$OpenBSD: tree.c,v 1.2 1996/06/26 05:32:31 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/ctags/yacc.c b/usr.bin/ctags/yacc.c
index 1c6c739eeb4..e2cb49d1b9c 100644
--- a/usr.bin/ctags/yacc.c
+++ b/usr.bin/ctags/yacc.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: yacc.c,v 1.2 1996/06/26 05:32:31 deraadt Exp $ */
/* $NetBSD: yacc.c,v 1.3 1995/03/26 20:14:12 glass Exp $ */
/*
@@ -37,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)yacc.c 8.3 (Berkeley) 4/2/94";
#else
-static char rcsid[] = "$NetBSD: yacc.c,v 1.3 1995/03/26 20:14:12 glass Exp $";
+static char rcsid[] = "$OpenBSD: yacc.c,v 1.2 1996/06/26 05:32:31 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/cut/Makefile b/usr.bin/cut/Makefile
index abea02683d0..81f527534dc 100644
--- a/usr.bin/cut/Makefile
+++ b/usr.bin/cut/Makefile
@@ -1,5 +1,5 @@
+# $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 $
-# @(#)Makefile 8.1 (Berkeley) 6/6/93
PROG= cut
diff --git a/usr.bin/cut/cut.1 b/usr.bin/cut/cut.1
index 4ea43e4300d..effb38702ee 100644
--- a/usr.bin/cut/cut.1
+++ b/usr.bin/cut/cut.1
@@ -1,3 +1,4 @@
+.\" $OpenBSD: cut.1,v 1.2 1996/06/26 05:32:33 deraadt Exp $
.\" $NetBSD: cut.1,v 1.6 1995/10/02 20:19:26 jtc Exp $
.\"
.\" Copyright (c) 1989, 1990, 1993
diff --git a/usr.bin/cut/cut.c b/usr.bin/cut/cut.c
index 7d820b182d8..052e2efc477 100644
--- a/usr.bin/cut/cut.c
+++ b/usr.bin/cut/cut.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: cut.c,v 1.2 1996/06/26 05:32:34 deraadt Exp $ */
/* $NetBSD: cut.c,v 1.9 1995/09/02 05:59:23 jtc Exp $ */
/*
@@ -46,7 +47,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)cut.c 8.3 (Berkeley) 5/4/95";
#endif
-static char rcsid[] = "$NetBSD: cut.c,v 1.9 1995/09/02 05:59:23 jtc Exp $";
+static char rcsid[] = "$OpenBSD: cut.c,v 1.2 1996/06/26 05:32:34 deraadt Exp $";
#endif /* not lint */
#include <ctype.h>
diff --git a/usr.bin/dirname/Makefile b/usr.bin/dirname/Makefile
index 0f3c1e3bc53..f7f015567f9 100644
--- a/usr.bin/dirname/Makefile
+++ b/usr.bin/dirname/Makefile
@@ -1,5 +1,5 @@
+# $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 $
-# @(#)Makefile 8.1 (Berkeley) 6/6/93
PROG= dirname
NOMAN= noman
diff --git a/usr.bin/dirname/dirname.c b/usr.bin/dirname/dirname.c
index 09c5c258b46..7ef52fdd55d 100644
--- a/usr.bin/dirname/dirname.c
+++ b/usr.bin/dirname/dirname.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: dirname.c,v 1.2 1996/06/26 05:32:36 deraadt Exp $ */
/* $NetBSD: dirname.c,v 1.6 1995/09/02 06:02:25 jtc Exp $ */
/*-
@@ -43,7 +44,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)dirname.c 8.4 (Berkeley) 5/4/95";
#endif
-static char rcsid[] = "$NetBSD: dirname.c,v 1.6 1995/09/02 06:02:25 jtc Exp $";
+static char rcsid[] = "$OpenBSD: dirname.c,v 1.2 1996/06/26 05:32:36 deraadt Exp $";
#endif /* not lint */
#include <stdio.h>
diff --git a/usr.bin/du/Makefile b/usr.bin/du/Makefile
index 3a6fea94ae8..faa9b3e1cb3 100644
--- a/usr.bin/du/Makefile
+++ b/usr.bin/du/Makefile
@@ -1,5 +1,5 @@
+# $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 $
-# @(#)Makefile 8.1 (Berkeley) 6/6/93
PROG= du
diff --git a/usr.bin/du/du.1 b/usr.bin/du/du.1
index 3c7bfa0ec6a..64445bc7d43 100644
--- a/usr.bin/du/du.1
+++ b/usr.bin/du/du.1
@@ -1,3 +1,4 @@
+.\" $OpenBSD: du.1,v 1.3 1996/06/26 05:32:37 deraadt Exp $
.\" $NetBSD: du.1,v 1.4.2.1 1995/12/05 02:45:41 jtc Exp $
.\"
.\" Copyright (c) 1990, 1993
diff --git a/usr.bin/du/du.c b/usr.bin/du/du.c
index 5451e1a76db..559cb409a6c 100644
--- a/usr.bin/du/du.c
+++ b/usr.bin/du/du.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: du.c,v 1.2 1996/06/26 05:32:38 deraadt Exp $ */
/* $NetBSD: du.c,v 1.10 1995/09/28 06:19:56 perry Exp $ */
/*
@@ -46,7 +47,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)du.c 8.5 (Berkeley) 5/4/95";
#else
-static char rcsid[] = "$NetBSD: du.c,v 1.10 1995/09/28 06:19:56 perry Exp $";
+static char rcsid[] = "$OpenBSD: du.c,v 1.2 1996/06/26 05:32:38 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/env/Makefile b/usr.bin/env/Makefile
index aef90b0f3f3..21d1cf1fb89 100644
--- a/usr.bin/env/Makefile
+++ b/usr.bin/env/Makefile
@@ -1,5 +1,5 @@
+# $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 $
-# @(#)Makefile 8.1 (Berkeley) 6/6/93
PROG= env
diff --git a/usr.bin/env/env.1 b/usr.bin/env/env.1
index b37a8f27f20..a4e86efecba 100644
--- a/usr.bin/env/env.1
+++ b/usr.bin/env/env.1
@@ -1,3 +1,4 @@
+.\" $OpenBSD: env.1,v 1.3 1996/06/26 05:32:39 deraadt Exp $
.\" Copyright (c) 1980, 1990 The Regents of the University of California.
.\" All rights reserved.
.\"
@@ -32,7 +33,6 @@
.\" SUCH DAMAGE.
.\"
.\" from: @(#)printenv.1 6.7 (Berkeley) 7/28/91
-.\" $Id: env.1,v 1.2 1995/12/08 19:48:00 deraadt Exp $
.\"
.Dd August 27, 1993
.Dt ENV 1
diff --git a/usr.bin/env/env.c b/usr.bin/env/env.c
index 134a226f5a5..b6003f42ddf 100644
--- a/usr.bin/env/env.c
+++ b/usr.bin/env/env.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: env.c,v 1.3 1996/06/26 05:32:40 deraadt Exp $ */
+
/*
* Copyright (c) 1988, 1993, 1994
* The Regents of the University of California. All rights reserved.
@@ -39,7 +41,7 @@ static char copyright[] =
#ifndef lint
/*static char sccsid[] = "@(#)env.c 8.3 (Berkeley) 4/2/94";*/
-static char rcsid[] = "$NetBSD: env.c,v 1.9 1996/05/07 18:32:22 jtc Exp $";
+static char rcsid[] = "$OpenBSD: env.c,v 1.3 1996/06/26 05:32:40 deraadt Exp $";
#endif /* not lint */
#include <err.h>
diff --git a/usr.bin/error/Makefile b/usr.bin/error/Makefile
index 2728ff58625..008752f14a5 100644
--- a/usr.bin/error/Makefile
+++ b/usr.bin/error/Makefile
@@ -1,4 +1,4 @@
-# @(#)Makefile 8.1 (Berkeley) 6/6/93
+# $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 $
PROG= error
diff --git a/usr.bin/error/error.1 b/usr.bin/error/error.1
index b254f65c3a4..b856c19efa7 100644
--- a/usr.bin/error/error.1
+++ b/usr.bin/error/error.1
@@ -1,3 +1,4 @@
+.\" $OpenBSD: error.1,v 1.2 1996/06/26 05:32:41 deraadt Exp $
.\" $NetBSD: error.1,v 1.3 1995/09/02 06:15:20 jtc Exp $
.\"
.\" Copyright (c) 1980, 1990, 1993
diff --git a/usr.bin/error/error.h b/usr.bin/error/error.h
index 37af8e0fd12..7b8d918accf 100644
--- a/usr.bin/error/error.h
+++ b/usr.bin/error/error.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: error.h,v 1.2 1996/06/26 05:32:42 deraadt Exp $ */
/* $NetBSD: error.h,v 1.3 1995/09/02 06:15:25 jtc Exp $ */
/*
diff --git a/usr.bin/error/filter.c b/usr.bin/error/filter.c
index 47181cfb2f2..0bddb07f2ce 100644
--- a/usr.bin/error/filter.c
+++ b/usr.bin/error/filter.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: filter.c,v 1.2 1996/06/26 05:32:42 deraadt Exp $ */
/* $NetBSD: filter.c,v 1.3 1995/09/02 06:15:28 jtc Exp $ */
/*
@@ -37,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)filter.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$NetBSD: filter.c,v 1.3 1995/09/02 06:15:28 jtc Exp $";
+static char rcsid[] = "$OpenBSD: filter.c,v 1.2 1996/06/26 05:32:42 deraadt Exp $";
#endif /* not lint */
#include <sys/types.h>
diff --git a/usr.bin/error/input.c b/usr.bin/error/input.c
index 37a7d3b2d8d..da92c7e2a0a 100644
--- a/usr.bin/error/input.c
+++ b/usr.bin/error/input.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: input.c,v 1.2 1996/06/26 05:32:43 deraadt Exp $ */
/* $NetBSD: input.c,v 1.4 1995/09/10 15:55:13 christos Exp $ */
/*
@@ -37,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)input.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$NetBSD: input.c,v 1.4 1995/09/10 15:55:13 christos Exp $";
+static char rcsid[] = "$OpenBSD: input.c,v 1.2 1996/06/26 05:32:43 deraadt Exp $";
#endif /* not lint */
#include <stdio.h>
diff --git a/usr.bin/error/main.c b/usr.bin/error/main.c
index 995efade9d4..4f03beaad81 100644
--- a/usr.bin/error/main.c
+++ b/usr.bin/error/main.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: main.c,v 1.2 1996/06/26 05:32:44 deraadt Exp $ */
/* $NetBSD: main.c,v 1.3 1995/09/02 06:15:37 jtc Exp $ */
/*
@@ -43,7 +44,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)main.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$NetBSD: main.c,v 1.3 1995/09/02 06:15:37 jtc Exp $";
+static char rcsid[] = "$OpenBSD: main.c,v 1.2 1996/06/26 05:32:44 deraadt Exp $";
#endif /* not lint */
#include <signal.h>
diff --git a/usr.bin/error/pathnames.h b/usr.bin/error/pathnames.h
index 42ca04ebb33..f7e581e28ff 100644
--- a/usr.bin/error/pathnames.h
+++ b/usr.bin/error/pathnames.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: pathnames.h,v 1.2 1996/06/26 05:32:44 deraadt Exp $ */
/* $NetBSD: pathnames.h,v 1.3 1995/09/02 06:15:40 jtc Exp $ */
/*
diff --git a/usr.bin/error/pi.c b/usr.bin/error/pi.c
index ca7eae71aa8..be51abd296a 100644
--- a/usr.bin/error/pi.c
+++ b/usr.bin/error/pi.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: pi.c,v 1.2 1996/06/26 05:32:45 deraadt Exp $ */
/* $NetBSD: pi.c,v 1.3 1995/09/02 06:15:44 jtc Exp $ */
/*
@@ -37,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)pi.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$NetBSD: pi.c,v 1.3 1995/09/02 06:15:44 jtc Exp $";
+static char rcsid[] = "$OpenBSD: pi.c,v 1.2 1996/06/26 05:32:45 deraadt Exp $";
#endif /* not lint */
#include <stdio.h>
diff --git a/usr.bin/error/subr.c b/usr.bin/error/subr.c
index 33e0b0734eb..0b58faa3fd4 100644
--- a/usr.bin/error/subr.c
+++ b/usr.bin/error/subr.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: subr.c,v 1.2 1996/06/26 05:32:45 deraadt Exp $ */
/* $NetBSD: subr.c,v 1.4 1995/09/10 15:55:15 christos Exp $ */
/*
@@ -37,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)subr.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$NetBSD: subr.c,v 1.4 1995/09/10 15:55:15 christos Exp $";
+static char rcsid[] = "$OpenBSD: subr.c,v 1.2 1996/06/26 05:32:45 deraadt Exp $";
#endif /* not lint */
#include <stdio.h>
diff --git a/usr.bin/error/touch.c b/usr.bin/error/touch.c
index 661a808f439..d64a2bff770 100644
--- a/usr.bin/error/touch.c
+++ b/usr.bin/error/touch.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: touch.c,v 1.3 1996/06/26 05:32:46 deraadt Exp $ */
/* $NetBSD: touch.c,v 1.3 1995/09/02 06:15:54 jtc Exp $ */
/*
@@ -37,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)touch.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$NetBSD: touch.c,v 1.3 1995/09/02 06:15:54 jtc Exp $";
+static char rcsid[] = "$OpenBSD: touch.c,v 1.3 1996/06/26 05:32:46 deraadt Exp $";
#endif /* not lint */
#include <sys/types.h>
diff --git a/usr.bin/expand/Makefile b/usr.bin/expand/Makefile
index 3ba1372d468..3836fd99734 100644
--- a/usr.bin/expand/Makefile
+++ b/usr.bin/expand/Makefile
@@ -1,4 +1,4 @@
-# @(#)Makefile 8.1 (Berkeley) 6/9/93
+# $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 $
PROG= expand
diff --git a/usr.bin/expand/expand.1 b/usr.bin/expand/expand.1
index 17213649bfe..43a83d56773 100644
--- a/usr.bin/expand/expand.1
+++ b/usr.bin/expand/expand.1
@@ -1,3 +1,4 @@
+.\" $OpenBSD: expand.1,v 1.2 1996/06/26 05:32:47 deraadt Exp $
.\" $NetBSD: expand.1,v 1.3 1995/09/02 06:19:45 jtc Exp $
.\"
.\" Copyright (c) 1980, 1990, 1993
diff --git a/usr.bin/expand/expand.c b/usr.bin/expand/expand.c
index 2c61fc20c26..52b207c063d 100644
--- a/usr.bin/expand/expand.c
+++ b/usr.bin/expand/expand.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: expand.c,v 1.2 1996/06/26 05:32:48 deraadt Exp $ */
/* $NetBSD: expand.c,v 1.5 1995/09/02 06:19:46 jtc Exp $ */
/*
@@ -43,7 +44,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)expand.c 8.1 (Berkeley) 6/9/93";
#endif
-static char rcsid[] = "$NetBSD: expand.c,v 1.5 1995/09/02 06:19:46 jtc Exp $";
+static char rcsid[] = "$OpenBSD: expand.c,v 1.2 1996/06/26 05:32:48 deraadt Exp $";
#endif /* not lint */
#include <stdio.h>
diff --git a/usr.bin/false/Makefile b/usr.bin/false/Makefile
index 892645b0721..02787b71ed8 100644
--- a/usr.bin/false/Makefile
+++ b/usr.bin/false/Makefile
@@ -1,5 +1,4 @@
-# from: @(#)Makefile 5.3 (Berkeley) 5/11/90
-# $Id: Makefile,v 1.1 1995/10/18 08:45:07 deraadt Exp $
+# $OpenBSD: Makefile,v 1.2 1996/06/26 05:32:49 deraadt Exp $
MAN= false.1
diff --git a/usr.bin/false/false.1 b/usr.bin/false/false.1
index 86a6ef2a2bf..819478534e3 100644
--- a/usr.bin/false/false.1
+++ b/usr.bin/false/false.1
@@ -1,3 +1,4 @@
+.\" $OpenBSD: false.1,v 1.2 1996/06/26 05:32:50 deraadt Exp $
.\" Copyright (c) 1983, 1990 The Regents of the University of California.
.\" All rights reserved.
.\"
@@ -33,7 +34,6 @@
.\" SUCH DAMAGE.
.\"
.\" from: @(#)false.1 6.6 (Berkeley) 7/24/91
-.\" $Id: false.1,v 1.1 1995/10/18 08:45:07 deraadt Exp $
.\"
.Dd July 24, 1991
.Dt FALSE 1
diff --git a/usr.bin/false/false.sh b/usr.bin/false/false.sh
index 2526efb6581..ddd775bdb8d 100644
--- a/usr.bin/false/false.sh
+++ b/usr.bin/false/false.sh
@@ -1,2 +1,4 @@
#! /bin/sh
+# $OpenBSD: false.sh,v 1.2 1996/06/26 05:32:50 deraadt Exp $
+
exit 1
diff --git a/usr.bin/file/LEGAL.NOTICE b/usr.bin/file/LEGAL.NOTICE
index c028f510661..8596a3eccc0 100644
--- a/usr.bin/file/LEGAL.NOTICE
+++ b/usr.bin/file/LEGAL.NOTICE
@@ -1,6 +1,6 @@
+$OpenBSD: LEGAL.NOTICE,v 1.3 1996/06/26 05:32:51 deraadt Exp $
Copyright (c) Ian F. Darwin 1986, 1987, 1989, 1990, 1991, 1992, 1994, 1995.
Software written by Ian F. Darwin and others; maintained by Christos Zoulas.
-$Id: LEGAL.NOTICE,v 1.2 1995/12/14 03:30:00 deraadt Exp $
This software (or derivative software) may not be made subject to any
license which denies anyone permission to alter it and redistribute it
diff --git a/usr.bin/file/MAINT b/usr.bin/file/MAINT
index 023f33dfda5..62776212b13 100644
--- a/usr.bin/file/MAINT
+++ b/usr.bin/file/MAINT
@@ -1,4 +1,4 @@
-$Id: MAINT,v 1.1 1995/10/18 08:45:08 deraadt Exp $
+$OpenBSD: MAINT,v 1.2 1996/06/26 05:32:52 deraadt Exp $
Maintenance notes:
diff --git a/usr.bin/file/Makefile b/usr.bin/file/Makefile
index b22771c6070..b93988dded4 100644
--- a/usr.bin/file/Makefile
+++ b/usr.bin/file/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.2 1996/01/02 11:50:57 deraadt Exp $
+# $OpenBSD: Makefile,v 1.3 1996/06/26 05:32:52 deraadt Exp $
MAGIC= /etc/magic
MAGICOWN= bin
diff --git a/usr.bin/file/PORTING b/usr.bin/file/PORTING
index 165fdaeb9dc..aaa4754f276 100644
--- a/usr.bin/file/PORTING
+++ b/usr.bin/file/PORTING
@@ -1,5 +1,5 @@
+@(#) $OpenBSD: PORTING,v 1.2 1996/06/26 05:32:53 deraadt Exp $
Portability of the new file(1) command.
-@(#) $Id: PORTING,v 1.1 1995/10/18 08:45:08 deraadt Exp $
Read this file only if the program doesn't compile on your system.
diff --git a/usr.bin/file/README b/usr.bin/file/README
index 2bd77111e41..b8f0ebba34b 100644
--- a/usr.bin/file/README
+++ b/usr.bin/file/README
@@ -1,5 +1,5 @@
+@(#) $OpenBSD: README,v 1.2 1996/06/26 05:32:53 deraadt Exp $
** README for file(1) Command **
-@(#) $Id: README,v 1.1 1995/10/18 08:45:08 deraadt Exp $
This is Release 3.x of Ian Darwin's (copyright but distributable)
file(1) command. Release 3.x is scheduled for inclusion in the
diff --git a/usr.bin/file/apprentice.c b/usr.bin/file/apprentice.c
index 3a900b33879..c6311b8885c 100644
--- a/usr.bin/file/apprentice.c
+++ b/usr.bin/file/apprentice.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: apprentice.c,v 1.3 1996/06/26 05:32:54 deraadt Exp $ */
/*
* apprentice - make one pass through /etc/magic, learning its secrets.
*
@@ -33,8 +34,7 @@
#include "file.h"
#ifndef lint
-static char *moduleid =
- "@(#)$Id: apprentice.c,v 1.2 1995/12/14 03:30:01 deraadt Exp $";
+static char *moduleid = "$OpenBSD: apprentice.c,v 1.3 1996/06/26 05:32:54 deraadt Exp $";
#endif /* lint */
#define EATAB {while (isascii((unsigned char) *l) && \
diff --git a/usr.bin/file/ascmagic.c b/usr.bin/file/ascmagic.c
index b065bd3288b..455f3043b9b 100644
--- a/usr.bin/file/ascmagic.c
+++ b/usr.bin/file/ascmagic.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: ascmagic.c,v 1.2 1996/06/26 05:32:54 deraadt Exp $ */
/*
* ASCII magic -- file types that we know based on keywords
* that can appear anywhere in the file.
@@ -35,8 +36,7 @@
#include "names.h"
#ifndef lint
-static char *moduleid =
- "@(#)$Id: ascmagic.c,v 1.1 1995/10/18 08:45:08 deraadt Exp $";
+static char *moduleid = "$OpenBSD: ascmagic.c,v 1.2 1996/06/26 05:32:54 deraadt Exp $";
#endif /* lint */
/* an optimisation over plain strcmp() */
diff --git a/usr.bin/file/compress.c b/usr.bin/file/compress.c
index 6e2c336cd10..c6fe63cf78b 100644
--- a/usr.bin/file/compress.c
+++ b/usr.bin/file/compress.c
@@ -1,10 +1,10 @@
+/* $OpenBSD: compress.c,v 1.2 1996/06/26 05:32:55 deraadt Exp $ */
/*
* compress routines:
* zmagic() - returns 0 if not recognized, uncompresses and prints
* information if recognized
* uncompress(method, old, n, newch) - uncompress old into new,
* using method, return sizeof new
- * $Id: compress.c,v 1.1 1995/10/18 08:45:08 deraadt Exp $
*/
#include <stdio.h>
#include <stdlib.h>
diff --git a/usr.bin/file/file.1 b/usr.bin/file/file.1
index a47f15ec374..706f08e82bc 100644
--- a/usr.bin/file/file.1
+++ b/usr.bin/file/file.1
@@ -1,5 +1,5 @@
+.\" $OpenBSD: file.1,v 1.3 1996/06/26 05:32:56 deraadt Exp $
.TH FILE 1 "Copyright but distributable"
-.\" $Id: file.1,v 1.2 1995/12/14 03:30:02 deraadt Exp $
.SH NAME
file
\- determine file type
diff --git a/usr.bin/file/file.c b/usr.bin/file/file.c
index ddf4bce9f02..a0497c409a6 100644
--- a/usr.bin/file/file.c
+++ b/usr.bin/file/file.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: file.c,v 1.3 1996/06/26 05:32:56 deraadt Exp $ */
/*
* file - find type of a file or files - main program.
*
@@ -25,8 +26,7 @@
* 4. This notice may not be removed or altered.
*/
#ifndef lint
-static char *moduleid =
- "@(#)$Id: file.c,v 1.2 1995/12/14 03:30:03 deraadt Exp $";
+static char *moduleid = "$OpenBSD: file.c,v 1.3 1996/06/26 05:32:56 deraadt Exp $";
#endif /* lint */
#include <stdio.h>
diff --git a/usr.bin/file/file.h b/usr.bin/file/file.h
index 42b1cbdb2e0..0fa7a831061 100644
--- a/usr.bin/file/file.h
+++ b/usr.bin/file/file.h
@@ -1,6 +1,6 @@
+/* * @(#)$OpenBSD: file.h,v 1.2 1996/06/26 05:32:57 deraadt Exp $*/
/*
* file.h - definitions for file(1) program
- * @(#)$Id: file.h,v 1.1 1995/10/18 08:45:09 deraadt Exp $
*
* Copyright (c) Ian F. Darwin, 1987.
* Written by Ian F. Darwin.
diff --git a/usr.bin/file/fsmagic.c b/usr.bin/file/fsmagic.c
index 0b1d3aba301..33cd2dbfcb5 100644
--- a/usr.bin/file/fsmagic.c
+++ b/usr.bin/file/fsmagic.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: fsmagic.c,v 1.2 1996/06/26 05:32:57 deraadt Exp $ */
/*
* fsmagic - magic based on filesystem info - directory, special files, etc.
*
@@ -45,8 +46,7 @@
#include "file.h"
#ifndef lint
-static char *moduleid =
- "@(#)$Id: fsmagic.c,v 1.1 1995/10/18 08:45:09 deraadt Exp $";
+static char *moduleid = "$OpenBSD: fsmagic.c,v 1.2 1996/06/26 05:32:57 deraadt Exp $";
#endif /* lint */
int
diff --git a/usr.bin/file/is_tar.c b/usr.bin/file/is_tar.c
index 4ab6dcc60f3..c6ebe06e2a4 100644
--- a/usr.bin/file/is_tar.c
+++ b/usr.bin/file/is_tar.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: is_tar.c,v 1.2 1996/06/26 05:32:58 deraadt Exp $ */
/*
* is_tar() -- figure out whether file is a tar archive.
*
@@ -5,7 +6,6 @@
* Pubic Domain version written 26 Aug 1985 John Gilmore (ihnp4!hoptoad!gnu).
*
* @(#)list.c 1.18 9/23/86 Public Domain - gnu
- * $Id: is_tar.c,v 1.1 1995/10/18 08:45:09 deraadt Exp $
*
* Comments changed and some code/comments reformatted
* for file command by Ian Darwin.
diff --git a/usr.bin/file/magdir/Header b/usr.bin/file/magdir/Header
index 0c97baede0c..5a4f3cef427 100644
--- a/usr.bin/file/magdir/Header
+++ b/usr.bin/file/magdir/Header
@@ -1,4 +1,6 @@
#! file
+# $OpenBSD: Header,v 1.2 1996/06/26 05:33:03 deraadt Exp $
+
# Magic data for file(1) command.
# Machine-genererated from src/cmd/file/magdir/*; edit there only!
# Format is described in magic(files), where:
diff --git a/usr.bin/file/magdir/Localstuff b/usr.bin/file/magdir/Localstuff
index 58df62f8b5e..9c4d992483c 100644
--- a/usr.bin/file/magdir/Localstuff
+++ b/usr.bin/file/magdir/Localstuff
@@ -1,7 +1,7 @@
+# $OpenBSD: Localstuff,v 1.2 1996/06/26 05:33:03 deraadt Exp $
#------------------------------------------------------------------------------
# Localstuff: file(1) magic for locally observed files
#
-# $Id: Localstuff,v 1.1 1995/10/18 08:45:09 deraadt Exp $
# Add any locally observed files here. Remember:
# text if readable, executable if runnable binary, data if unreadable.
diff --git a/usr.bin/file/magdir/os9 b/usr.bin/file/magdir/os9
index 83fdbbc024f..b92a1cbb25b 100644
--- a/usr.bin/file/magdir/os9
+++ b/usr.bin/file/magdir/os9
@@ -1,4 +1,5 @@
#
+# $OpenBSD: os9,v 1.2 1996/06/26 05:33:04 deraadt Exp $
# $NetBSD: os9,v 1.1 1996/05/06 18:24:01 is Exp $
#
# Copyright (c) 1996 Ignatios Souvatzis. All rights reserved.
diff --git a/usr.bin/file/magdir/rpm b/usr.bin/file/magdir/rpm
index 7b89c682cf4..d11ca717e2f 100644
--- a/usr.bin/file/magdir/rpm
+++ b/usr.bin/file/magdir/rpm
@@ -1,3 +1,5 @@
+# $OpenBSD: rpm,v 1.2 1996/06/26 05:33:04 deraadt Exp $
+
#------------------------------------------------------------------------------
#
# RPM: file(1) magic for Red Hat Packages Erik Troan (ewt@redhat.com)
diff --git a/usr.bin/file/magdir/softquad b/usr.bin/file/magdir/softquad
index 79ab9151015..bbb6661e6b5 100644
--- a/usr.bin/file/magdir/softquad
+++ b/usr.bin/file/magdir/softquad
@@ -1,8 +1,8 @@
+# $OpenBSD: softquad,v 1.3 1996/06/26 05:33:05 deraadt Exp $
#------------------------------------------------------------------------------
# softquad: file(1) magic for SoftQuad Publishing Software
#
-# $Id: softquad,v 1.2 1995/12/14 03:30:25 deraadt Exp $
# Author/Editor and RulesBuilder
#
# XXX - byte order?
diff --git a/usr.bin/file/magic.5 b/usr.bin/file/magic.5
index 4d9fe1c6a50..bd93f5e75d7 100644
--- a/usr.bin/file/magic.5
+++ b/usr.bin/file/magic.5
@@ -1,3 +1,4 @@
+.\" @(#)$OpenBSD: magic.5,v 1.2 1996/06/26 05:32:59 deraadt Exp $
.TH MAGIC 5 "Public Domain"
.\" install as magic.5 on USG, magic.5 on V7 or Berkeley systems.
.SH NAME
@@ -191,4 +192,3 @@ indirect offsets.
.\" the changes I posted to the S5R2 version.
.\"
.\" Modified for Ian Darwin's version of the file command.
-.\" @(#)$Id: magic.5,v 1.1 1995/10/18 08:45:09 deraadt Exp $
diff --git a/usr.bin/file/names.h b/usr.bin/file/names.h
index 2fb53feabdf..7d0f2dae9ff 100644
--- a/usr.bin/file/names.h
+++ b/usr.bin/file/names.h
@@ -1,3 +1,4 @@
+/* * $OpenBSD: names.h,v 1.2 1996/06/26 05:32:59 deraadt Exp $*/
/*
* Names.h - names and types used by ascmagic in file(1).
* These tokens are here because they can appear anywhere in
@@ -10,7 +11,6 @@
*
* See LEGAL.NOTICE
*
- * $Id: names.h,v 1.1 1995/10/18 08:45:09 deraadt Exp $
*/
/* these types are used to index the table 'types': keep em in sync! */
diff --git a/usr.bin/file/patchlevel.h b/usr.bin/file/patchlevel.h
index 7706ea4a04e..0109d131cd1 100644
--- a/usr.bin/file/patchlevel.h
+++ b/usr.bin/file/patchlevel.h
@@ -1,11 +1,14 @@
+/* * $OpenBSD: patchlevel.h,v 1.3 1996/06/26 05:33:00 deraadt Exp $*/
#define FILE_VERSION_MAJOR 3
#define patchlevel 19
/*
* Patchlevel file for Ian Darwin's MAGIC command.
- * $Id: patchlevel.h,v 1.2 1995/12/14 03:30:04 deraadt Exp $
*
* $Log: patchlevel.h,v $
+ * Revision 1.3 1996/06/26 05:33:00 deraadt
+ * rcsid
+ *
* Revision 1.2 1995/12/14 03:30:04 deraadt
* update from netbsd
*
diff --git a/usr.bin/file/print.c b/usr.bin/file/print.c
index ec773cbd9eb..839bf0447c4 100644
--- a/usr.bin/file/print.c
+++ b/usr.bin/file/print.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: print.c,v 1.2 1996/06/26 05:33:00 deraadt Exp $ */
/*
* print.c - debugging printout routines
*
@@ -39,8 +40,7 @@
#include "file.h"
#ifndef lint
-static char *moduleid =
- "@(#)$Id: print.c,v 1.1 1995/10/18 08:45:09 deraadt Exp $";
+static char *moduleid = "$OpenBSD: print.c,v 1.2 1996/06/26 05:33:00 deraadt Exp $";
#endif /* lint */
#define SZOF(a) (sizeof(a) / sizeof(a[0]))
diff --git a/usr.bin/file/softmagic.c b/usr.bin/file/softmagic.c
index 957f37cbb2d..bdcde972f1a 100644
--- a/usr.bin/file/softmagic.c
+++ b/usr.bin/file/softmagic.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: softmagic.c,v 1.2 1996/06/26 05:33:01 deraadt Exp $ */
/*
* softmagic - interpret variable magic from /etc/magic
*
@@ -33,8 +34,7 @@
#include "file.h"
#ifndef lint
-static char *moduleid =
- "@(#)$Id: softmagic.c,v 1.1 1995/10/18 08:45:09 deraadt Exp $";
+static char *moduleid = "$OpenBSD: softmagic.c,v 1.2 1996/06/26 05:33:01 deraadt Exp $";
#endif /* lint */
static int match __P((unsigned char *, int));
diff --git a/usr.bin/file/tar.h b/usr.bin/file/tar.h
index f6009ee9fb7..346831bde5d 100644
--- a/usr.bin/file/tar.h
+++ b/usr.bin/file/tar.h
@@ -1,3 +1,4 @@
+/* * $OpenBSD: tar.h,v 1.2 1996/06/26 05:33:02 deraadt Exp $ # checkin only*/
/*
* Header file for public domain tar (tape archive) program.
*
@@ -5,7 +6,6 @@
*
* Created 25 August 1985 by John Gilmore, ihnp4!hoptoad!gnu.
*
- * $Id: tar.h,v 1.1 1995/10/18 08:45:09 deraadt Exp $ # checkin only
*/
/*
diff --git a/usr.bin/file/tst/Makefile b/usr.bin/file/tst/Makefile
index ab6a2966a9a..7947b5763af 100644
--- a/usr.bin/file/tst/Makefile
+++ b/usr.bin/file/tst/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.1 1995/10/18 08:45:13 deraadt Exp $
+# $OpenBSD: Makefile,v 1.2 1996/06/26 05:33:06 deraadt Exp $
# Make up some fake test files that are easily produced.
# By no means an exhaustive test!
diff --git a/usr.bin/find/Makefile b/usr.bin/find/Makefile
index 891acdbdcc6..6bc22ee35c7 100644
--- a/usr.bin/find/Makefile
+++ b/usr.bin/find/Makefile
@@ -1,5 +1,4 @@
-# from: @(#)Makefile 5.2 (Berkeley) 5/24/91
-# $Id: Makefile,v 1.1 1995/10/18 08:45:13 deraadt Exp $
+# $OpenBSD: Makefile,v 1.2 1996/06/26 05:33:07 deraadt Exp $
PROG= find
SRCS= find.c function.c ls.c main.c misc.c operator.c option.c
diff --git a/usr.bin/find/extern.h b/usr.bin/find/extern.h
index b664fa7aa48..9e5b9195ad6 100644
--- a/usr.bin/find/extern.h
+++ b/usr.bin/find/extern.h
@@ -1,3 +1,4 @@
+/* * $OpenBSD: extern.h,v 1.2 1996/06/26 05:33:07 deraadt Exp $*/
/*-
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
@@ -31,7 +32,6 @@
* SUCH DAMAGE.
*
* from: @(#)extern.h 8.1 (Berkeley) 6/6/93
- * $Id: extern.h,v 1.1 1995/10/18 08:45:13 deraadt Exp $
*/
#include <sys/cdefs.h>
diff --git a/usr.bin/find/find.1 b/usr.bin/find/find.1
index d4311c5f655..fee98965338 100644
--- a/usr.bin/find/find.1
+++ b/usr.bin/find/find.1
@@ -1,3 +1,4 @@
+.\" $OpenBSD: find.1,v 1.5 1996/06/26 05:33:08 deraadt Exp $
.\" Copyright (c) 1990, 1993
.\" The Regents of the University of California. All rights reserved.
.\"
@@ -33,7 +34,6 @@
.\" SUCH DAMAGE.
.\"
.\" from: @(#)find.1 8.1 (Berkeley) 6/6/93
-.\" $Id: find.1,v 1.4 1996/06/11 11:33:31 deraadt Exp $
.\"
.Dd June 6, 1993
.Dt FIND 1
diff --git a/usr.bin/find/find.c b/usr.bin/find/find.c
index ed34e35d726..f14b03cd875 100644
--- a/usr.bin/find/find.c
+++ b/usr.bin/find/find.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: find.c,v 1.2 1996/06/26 05:33:09 deraadt Exp $ */
+
/*-
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
@@ -36,7 +38,7 @@
#ifndef lint
/*static char sccsid[] = "from: @(#)find.c 8.1 (Berkeley) 6/6/93";*/
-static char rcsid[] = "$Id: find.c,v 1.1 1995/10/18 08:45:13 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: find.c,v 1.2 1996/06/26 05:33:09 deraadt Exp $";
#endif /* not lint */
#include <sys/types.h>
diff --git a/usr.bin/find/find.h b/usr.bin/find/find.h
index 147be96dcd3..1a51ebaf898 100644
--- a/usr.bin/find/find.h
+++ b/usr.bin/find/find.h
@@ -1,3 +1,4 @@
+/* * $OpenBSD: find.h,v 1.2 1996/06/26 05:33:09 deraadt Exp $*/
/*-
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
@@ -34,7 +35,6 @@
* SUCH DAMAGE.
*
* from: @(#)find.h 8.1 (Berkeley) 6/6/93
- * $Id: find.h,v 1.1 1995/10/18 08:45:13 deraadt Exp $
*/
/* node type */
diff --git a/usr.bin/find/function.c b/usr.bin/find/function.c
index 6b5f24cdfb3..7b7447edf04 100644
--- a/usr.bin/find/function.c
+++ b/usr.bin/find/function.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: function.c,v 1.4 1996/06/26 05:33:10 deraadt Exp $ */
+
/*-
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
@@ -36,7 +38,7 @@
#ifndef lint
/*static char sccsid[] = "from: @(#)function.c 8.1 (Berkeley) 6/6/93";*/
-static char rcsid[] = "$Id: function.c,v 1.3 1996/06/25 20:48:31 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: function.c,v 1.4 1996/06/26 05:33:10 deraadt Exp $";
#endif /* not lint */
#include <sys/param.h>
diff --git a/usr.bin/find/ls.c b/usr.bin/find/ls.c
index 6681d64b7bc..adf7de06d5d 100644
--- a/usr.bin/find/ls.c
+++ b/usr.bin/find/ls.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: ls.c,v 1.2 1996/06/26 05:33:11 deraadt Exp $ */
+
/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
@@ -33,7 +35,7 @@
#ifndef lint
/*static char sccsid[] = "from: @(#)ls.c 8.1 (Berkeley) 6/6/93";*/
-static char rcsid[] = "$Id: ls.c,v 1.1 1995/10/18 08:45:13 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: ls.c,v 1.2 1996/06/26 05:33:11 deraadt Exp $";
#endif /* not lint */
#include <sys/param.h>
diff --git a/usr.bin/find/main.c b/usr.bin/find/main.c
index 4a407266408..19fa3afe157 100644
--- a/usr.bin/find/main.c
+++ b/usr.bin/find/main.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: main.c,v 1.2 1996/06/26 05:33:11 deraadt Exp $ */
+
/*-
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
@@ -33,7 +35,7 @@
#ifndef lint
/*static char sccsid[] = "@(#)main.c 8.1 (Berkeley) 6/6/93";*/
-static char rcsid[] = "$Id: main.c,v 1.1 1995/10/18 08:45:13 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: main.c,v 1.2 1996/06/26 05:33:11 deraadt Exp $";
#endif /* not lint */
#include <sys/types.h>
diff --git a/usr.bin/find/misc.c b/usr.bin/find/misc.c
index a5218864ce0..edfbff64fc5 100644
--- a/usr.bin/find/misc.c
+++ b/usr.bin/find/misc.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: misc.c,v 1.2 1996/06/26 05:33:12 deraadt Exp $ */
+
/*-
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
@@ -36,7 +38,7 @@
#ifndef lint
/*static char sccsid[] = "from: @(#)misc.c 8.1 (Berkeley) 6/6/93";*/
-static char rcsid[] = "$Id: misc.c,v 1.1 1995/10/18 08:45:14 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: misc.c,v 1.2 1996/06/26 05:33:12 deraadt Exp $";
#endif /* not lint */
#include <sys/types.h>
diff --git a/usr.bin/find/operator.c b/usr.bin/find/operator.c
index 6d700acd754..50339b23253 100644
--- a/usr.bin/find/operator.c
+++ b/usr.bin/find/operator.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: operator.c,v 1.2 1996/06/26 05:33:12 deraadt Exp $ */
+
/*-
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
@@ -36,7 +38,7 @@
#ifndef lint
/*static char sccsid[] = "from: @(#)operator.c 8.1 (Berkeley) 6/6/93";*/
-static char rcsid[] = "$Id: operator.c,v 1.1 1995/10/18 08:45:14 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: operator.c,v 1.2 1996/06/26 05:33:12 deraadt Exp $";
#endif /* not lint */
#include <sys/types.h>
diff --git a/usr.bin/find/option.c b/usr.bin/find/option.c
index 4e680f7b9bb..cab351e7738 100644
--- a/usr.bin/find/option.c
+++ b/usr.bin/find/option.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: option.c,v 1.2 1996/06/26 05:33:13 deraadt Exp $ */
+
/*-
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
@@ -36,7 +38,7 @@
#ifndef lint
/*static char sccsid[] = "from: @(#)option.c 8.1 (Berkeley) 6/6/93";*/
-static char rcsid[] = "$Id: option.c,v 1.1 1995/10/18 08:45:14 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: option.c,v 1.2 1996/06/26 05:33:13 deraadt Exp $";
#endif /* not lint */
#include <sys/types.h>
diff --git a/usr.bin/finger/Makefile b/usr.bin/finger/Makefile
index 91a113c8aac..cbcb5dadbc9 100644
--- a/usr.bin/finger/Makefile
+++ b/usr.bin/finger/Makefile
@@ -1,5 +1,4 @@
-# from: @(#)Makefile 5.3 (Berkeley) 5/11/90
-# $Id: Makefile,v 1.1 1995/10/18 08:45:14 deraadt Exp $
+# $OpenBSD: Makefile,v 1.2 1996/06/26 05:33:14 deraadt Exp $
PROG= finger
SRCS= finger.c lprint.c net.c sprint.c util.c
diff --git a/usr.bin/finger/extern.h b/usr.bin/finger/extern.h
index b213fe4a7f1..d5897be0594 100644
--- a/usr.bin/finger/extern.h
+++ b/usr.bin/finger/extern.h
@@ -1,3 +1,5 @@
+/* $OpenBSD: extern.h,v 1.2 1996/06/26 05:33:14 deraadt Exp $ */
+
/*-
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/usr.bin/finger/finger.1 b/usr.bin/finger/finger.1
index 900ef2ee860..e4ce23a2a92 100644
--- a/usr.bin/finger/finger.1
+++ b/usr.bin/finger/finger.1
@@ -1,3 +1,4 @@
+.\" $OpenBSD: finger.1,v 1.2 1996/06/26 05:33:15 deraadt Exp $
.\" Copyright (c) 1989, 1990 The Regents of the University of California.
.\" All rights reserved.
.\"
@@ -30,7 +31,6 @@
.\" SUCH DAMAGE.
.\"
.\" from: @(#)finger.1 6.14 (Berkeley) 7/27/91
-.\" $Id: finger.1,v 1.1 1995/10/18 08:45:14 deraadt Exp $
.\"
.Dd July 27, 1991
.Dt FINGER 1
diff --git a/usr.bin/finger/finger.c b/usr.bin/finger/finger.c
index 403ec1c0543..e18dca2e4ab 100644
--- a/usr.bin/finger/finger.c
+++ b/usr.bin/finger/finger.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: finger.c,v 1.2 1996/06/26 05:33:16 deraadt Exp $ */
+
/*
* Copyright (c) 1989 The Regents of the University of California.
* All rights reserved.
@@ -46,7 +48,7 @@ char copyright[] =
#ifndef lint
/*static char sccsid[] = "from: @(#)finger.c 5.22 (Berkeley) 6/29/90";*/
-static char rcsid[] = "$Id: finger.c,v 1.1 1995/10/18 08:45:14 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: finger.c,v 1.2 1996/06/26 05:33:16 deraadt Exp $";
#endif /* not lint */
/*
diff --git a/usr.bin/finger/finger.h b/usr.bin/finger/finger.h
index cec665fbe6f..3e56988a301 100644
--- a/usr.bin/finger/finger.h
+++ b/usr.bin/finger/finger.h
@@ -1,3 +1,4 @@
+/* * $OpenBSD: finger.h,v 1.2 1996/06/26 05:33:16 deraadt Exp $*/
/*
* Copyright (c) 1989 The Regents of the University of California.
* All rights reserved.
@@ -34,7 +35,6 @@
* SUCH DAMAGE.
*
* from: @(#)finger.h 5.5 (Berkeley) 6/1/90
- * $Id: finger.h,v 1.1 1995/10/18 08:45:14 deraadt Exp $
*/
#include <pwd.h>
diff --git a/usr.bin/finger/lprint.c b/usr.bin/finger/lprint.c
index d2cc00acff7..8890fda62ce 100644
--- a/usr.bin/finger/lprint.c
+++ b/usr.bin/finger/lprint.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: lprint.c,v 1.2 1996/06/26 05:33:17 deraadt Exp $ */
+
/*
* Copyright (c) 1989 The Regents of the University of California.
* All rights reserved.
@@ -36,7 +38,7 @@
#ifndef lint
/*static char sccsid[] = "from: @(#)lprint.c 5.13 (Berkeley) 10/31/90";*/
-static char rcsid[] = "$Id: lprint.c,v 1.1 1995/10/18 08:45:14 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: lprint.c,v 1.2 1996/06/26 05:33:17 deraadt Exp $";
#endif /* not lint */
#include <sys/types.h>
diff --git a/usr.bin/finger/net.c b/usr.bin/finger/net.c
index 942cb4c7485..4064dc86711 100644
--- a/usr.bin/finger/net.c
+++ b/usr.bin/finger/net.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: net.c,v 1.2 1996/06/26 05:33:18 deraadt Exp $ */
+
/*
* Copyright (c) 1989 The Regents of the University of California.
* All rights reserved.
@@ -36,7 +38,7 @@
#ifndef lint
/*static char sccsid[] = "from: @(#)net.c 5.5 (Berkeley) 6/1/90";*/
-static char rcsid[] = "$Id: net.c,v 1.1 1995/10/18 08:45:14 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: net.c,v 1.2 1996/06/26 05:33:18 deraadt Exp $";
#endif /* not lint */
#include <sys/types.h>
diff --git a/usr.bin/finger/sprint.c b/usr.bin/finger/sprint.c
index 279d915aa6a..fea9df9a622 100644
--- a/usr.bin/finger/sprint.c
+++ b/usr.bin/finger/sprint.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: sprint.c,v 1.2 1996/06/26 05:33:18 deraadt Exp $ */
+
/*
* Copyright (c) 1989 The Regents of the University of California.
* All rights reserved.
@@ -36,7 +38,7 @@
#ifndef lint
/*static char sccsid[] = "from: @(#)sprint.c 5.8 (Berkeley) 12/4/90";*/
-static char rcsid[] = "$Id: sprint.c,v 1.1 1995/10/18 08:45:14 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: sprint.c,v 1.2 1996/06/26 05:33:18 deraadt Exp $";
#endif /* not lint */
#include <sys/types.h>
diff --git a/usr.bin/finger/util.c b/usr.bin/finger/util.c
index d89c60fcaf9..b75fcd5045d 100644
--- a/usr.bin/finger/util.c
+++ b/usr.bin/finger/util.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: util.c,v 1.2 1996/06/26 05:33:19 deraadt Exp $ */
+
/*
* Copyright (c) 1989 The Regents of the University of California.
* All rights reserved.
@@ -36,7 +38,7 @@
#ifndef lint
/*static char sccsid[] = "from: @(#)util.c 5.14 (Berkeley) 1/17/91";*/
-static char rcsid[] = "$Id: util.c,v 1.1 1995/10/18 08:45:14 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: util.c,v 1.2 1996/06/26 05:33:19 deraadt Exp $";
#endif /* not lint */
#include <sys/param.h>
diff --git a/usr.bin/fmt/Makefile b/usr.bin/fmt/Makefile
index ced09170234..fde222e206c 100644
--- a/usr.bin/fmt/Makefile
+++ b/usr.bin/fmt/Makefile
@@ -1,4 +1,4 @@
-# @(#)Makefile 8.1 (Berkeley) 6/6/93
+# $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 $
PROG= fmt
diff --git a/usr.bin/fmt/fmt.1 b/usr.bin/fmt/fmt.1
index cf847415b62..aacc8f4eb79 100644
--- a/usr.bin/fmt/fmt.1
+++ b/usr.bin/fmt/fmt.1
@@ -1,3 +1,4 @@
+.\" $OpenBSD: fmt.1,v 1.2 1996/06/26 05:33:20 deraadt Exp $
.\" $NetBSD: fmt.1,v 1.3 1995/09/01 01:29:40 jtc Exp $
.\"
.\" Copyright (c) 1980, 1990, 1993
diff --git a/usr.bin/fmt/fmt.c b/usr.bin/fmt/fmt.c
index 3a8b3cac2cc..599dffc652f 100644
--- a/usr.bin/fmt/fmt.c
+++ b/usr.bin/fmt/fmt.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: fmt.c,v 1.2 1996/06/26 05:33:21 deraadt Exp $ */
/* $NetBSD: fmt.c,v 1.4 1995/09/01 01:29:41 jtc Exp $ */
/*
@@ -43,7 +44,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)fmt.c 8.1 (Berkeley) 7/20/93";
#endif
-static char rcsid[] = "$NetBSD: fmt.c,v 1.4 1995/09/01 01:29:41 jtc Exp $";
+static char rcsid[] = "$OpenBSD: fmt.c,v 1.2 1996/06/26 05:33:21 deraadt Exp $";
#endif /* not lint */
#include <stdio.h>
diff --git a/usr.bin/fold/Makefile b/usr.bin/fold/Makefile
index 6ccdd66380d..50e52602510 100644
--- a/usr.bin/fold/Makefile
+++ b/usr.bin/fold/Makefile
@@ -1,4 +1,4 @@
-# @(#)Makefile 8.1 (Berkeley) 6/6/93
+# $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 $
PROG= fold
diff --git a/usr.bin/fold/fold.1 b/usr.bin/fold/fold.1
index a08436e4cc3..ad057315048 100644
--- a/usr.bin/fold/fold.1
+++ b/usr.bin/fold/fold.1
@@ -1,3 +1,4 @@
+.\" $OpenBSD: fold.1,v 1.2 1996/06/26 05:33:22 deraadt Exp $
.\" $NetBSD: fold.1,v 1.5 1995/09/01 01:42:42 jtc Exp $
.\"
.\" Copyright (c) 1980, 1993
diff --git a/usr.bin/fold/fold.c b/usr.bin/fold/fold.c
index 1310c6e5133..5f3c47c8bf9 100644
--- a/usr.bin/fold/fold.c
+++ b/usr.bin/fold/fold.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: fold.c,v 1.2 1996/06/26 05:33:23 deraadt Exp $ */
/* $NetBSD: fold.c,v 1.6 1995/09/01 01:42:44 jtc Exp $ */
/*-
@@ -46,7 +47,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)fold.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$NetBSD: fold.c,v 1.6 1995/09/01 01:42:44 jtc Exp $";
+static char rcsid[] = "$OpenBSD: fold.c,v 1.2 1996/06/26 05:33:23 deraadt Exp $";
#endif /* not lint */
#include <stdio.h>
diff --git a/usr.bin/fpr/Makefile b/usr.bin/fpr/Makefile
index 6bef8922fae..ac671ee4d03 100644
--- a/usr.bin/fpr/Makefile
+++ b/usr.bin/fpr/Makefile
@@ -1,4 +1,4 @@
-# @(#)Makefile 8.1 (Berkeley) 6/6/93
+# $OpenBSD: Makefile,v 1.2 1996/06/26 05:33:24 deraadt Exp $
# $NetBSD: Makefile,v 1.3 1995/09/01 01:34:13 jtc Exp $
PROG= fpr
diff --git a/usr.bin/fpr/fpr.1 b/usr.bin/fpr/fpr.1
index a53ae0d6dae..5796ff1f072 100644
--- a/usr.bin/fpr/fpr.1
+++ b/usr.bin/fpr/fpr.1
@@ -1,3 +1,4 @@
+.\" $OpenBSD: fpr.1,v 1.2 1996/06/26 05:33:25 deraadt Exp $
.\" $NetBSD: fpr.1,v 1.3 1995/09/01 01:34:15 jtc Exp $
.\"
.\" Copyright (c) 1989, 1990, 1993
diff --git a/usr.bin/fpr/fpr.c b/usr.bin/fpr/fpr.c
index 14e66ed3592..a76a4989015 100644
--- a/usr.bin/fpr/fpr.c
+++ b/usr.bin/fpr/fpr.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: fpr.c,v 1.2 1996/06/26 05:33:25 deraadt Exp $ */
/* $NetBSD: fpr.c,v 1.3 1995/09/01 01:34:16 jtc Exp $ */
/*
@@ -46,7 +47,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)fpr.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$NetBSD: fpr.c,v 1.3 1995/09/01 01:34:16 jtc Exp $";
+static char rcsid[] = "$OpenBSD: fpr.c,v 1.2 1996/06/26 05:33:25 deraadt Exp $";
#endif /* not lint */
#include <stdio.h>
diff --git a/usr.bin/from/Makefile b/usr.bin/from/Makefile
index b6be95e3146..9ac69f20b47 100644
--- a/usr.bin/from/Makefile
+++ b/usr.bin/from/Makefile
@@ -1,4 +1,4 @@
-# @(#)Makefile 8.1 (Berkeley) 6/6/93
+# $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 $
PROG= from
diff --git a/usr.bin/from/from.1 b/usr.bin/from/from.1
index 8b7cce02b85..3863866016c 100644
--- a/usr.bin/from/from.1
+++ b/usr.bin/from/from.1
@@ -1,3 +1,4 @@
+.\" $OpenBSD: from.1,v 1.2 1996/06/26 05:33:27 deraadt Exp $
.\" $NetBSD: from.1,v 1.4 1995/09/01 01:39:09 jtc Exp $
.\"
.\" Copyright (c) 1980, 1990, 1993
diff --git a/usr.bin/from/from.c b/usr.bin/from/from.c
index e4e6c10f9a5..ba42ae9773f 100644
--- a/usr.bin/from/from.c
+++ b/usr.bin/from/from.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: from.c,v 1.2 1996/06/26 05:33:27 deraadt Exp $ */
/* $NetBSD: from.c,v 1.6 1995/09/01 01:39:10 jtc Exp $ */
/*
@@ -43,7 +44,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)from.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$NetBSD: from.c,v 1.6 1995/09/01 01:39:10 jtc Exp $";
+static char rcsid[] = "$OpenBSD: from.c,v 1.2 1996/06/26 05:33:27 deraadt Exp $";
#endif /* not lint */
#include <sys/types.h>
diff --git a/usr.bin/fsplit/Makefile b/usr.bin/fsplit/Makefile
index a4a41cd5bc2..088ff0338eb 100644
--- a/usr.bin/fsplit/Makefile
+++ b/usr.bin/fsplit/Makefile
@@ -1,5 +1,4 @@
-# from: @(#)Makefile 8.1 (Berkeley) 6/6/93
-# $Id: Makefile,v 1.1 1995/10/18 08:45:16 deraadt Exp $
+# $OpenBSD: Makefile,v 1.2 1996/06/26 05:33:28 deraadt Exp $
PROG= fsplit
diff --git a/usr.bin/fsplit/fsplit.1 b/usr.bin/fsplit/fsplit.1
index 96097b95dca..053627bf4cc 100644
--- a/usr.bin/fsplit/fsplit.1
+++ b/usr.bin/fsplit/fsplit.1
@@ -1,3 +1,4 @@
+.\" $OpenBSD: fsplit.1,v 1.2 1996/06/26 05:33:29 deraadt Exp $
.\" $NetBSD: fsplit.1,v 1.3 1995/09/28 05:15:06 perry Exp $
.\"
.\" Copyright (c) 1983, 1990, 1993
diff --git a/usr.bin/fsplit/fsplit.c b/usr.bin/fsplit/fsplit.c
index 174cb231bd2..cfef902c0f4 100644
--- a/usr.bin/fsplit/fsplit.c
+++ b/usr.bin/fsplit/fsplit.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: fsplit.c,v 1.2 1996/06/26 05:33:30 deraadt Exp $ */
+
/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
@@ -42,7 +44,7 @@ static char copyright[] =
#ifndef lint
/*static char sccsid[] = "from: @(#)fsplit.c 8.1 (Berkeley) 6/6/93";*/
-static char rcsid[] = "$NetBSD: fsplit.c,v 1.4 1995/09/28 05:15:07 perry Exp $";
+static char rcsid[] = "$OpenBSD: fsplit.c,v 1.2 1996/06/26 05:33:30 deraadt Exp $";
#endif /* not lint */
#include <ctype.h>
diff --git a/usr.bin/fstat/Makefile b/usr.bin/fstat/Makefile
index c804cb5a4c2..2b618acd930 100644
--- a/usr.bin/fstat/Makefile
+++ b/usr.bin/fstat/Makefile
@@ -1,5 +1,4 @@
-# from: @(#)Makefile 8.1 (Berkeley) 6/6/93
-# $Id: Makefile,v 1.1 1995/10/18 08:45:16 deraadt Exp $
+# $OpenBSD: Makefile,v 1.2 1996/06/26 05:33:31 deraadt Exp $
PROG= fstat
DPADD= ${LIBKVM}
diff --git a/usr.bin/fstat/fstat.1 b/usr.bin/fstat/fstat.1
index 53d38582a1b..c61cf206de9 100644
--- a/usr.bin/fstat/fstat.1
+++ b/usr.bin/fstat/fstat.1
@@ -1,3 +1,4 @@
+.\" $OpenBSD: fstat.1,v 1.2 1996/06/26 05:33:31 deraadt Exp $
.\" Copyright (c) 1987, 1991, 1993
.\" The Regents of the University of California. All rights reserved.
.\"
@@ -30,7 +31,6 @@
.\" SUCH DAMAGE.
.\"
.\" from: @(#)fstat.1 8.3 (Berkeley) 2/25/94
-.\" $Id: fstat.1,v 1.1 1995/10/18 08:45:16 deraadt Exp $
.\"
.Dd February 25, 1994
.Dt FSTAT 1
diff --git a/usr.bin/ftp/Makefile b/usr.bin/ftp/Makefile
index 628549840b7..02e84d7da1e 100644
--- a/usr.bin/ftp/Makefile
+++ b/usr.bin/ftp/Makefile
@@ -1,4 +1,4 @@
-# @(#)Makefile 8.2 (Berkeley) 4/3/94
+# $OpenBSD: Makefile,v 1.3 1996/06/26 05:33:32 deraadt Exp $
# $NetBSD: Makefile,v 1.6 1995/11/22 21:52:48 cgd Exp $
PROG= ftp
diff --git a/usr.bin/ftp/cmds.c b/usr.bin/ftp/cmds.c
index 902135a5673..cc850ad60c0 100644
--- a/usr.bin/ftp/cmds.c
+++ b/usr.bin/ftp/cmds.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: cmds.c,v 1.2 1996/06/26 05:33:33 deraadt Exp $ */
/* $NetBSD: cmds.c,v 1.8 1995/09/08 01:06:05 tls Exp $ */
/*
@@ -37,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)cmds.c 8.6 (Berkeley) 10/9/94";
#else
-static char rcsid[] = "$NetBSD: cmds.c,v 1.8 1995/09/08 01:06:05 tls Exp $";
+static char rcsid[] = "$OpenBSD: cmds.c,v 1.2 1996/06/26 05:33:33 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/ftp/cmdtab.c b/usr.bin/ftp/cmdtab.c
index a720f516754..902983f3a4e 100644
--- a/usr.bin/ftp/cmdtab.c
+++ b/usr.bin/ftp/cmdtab.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: cmdtab.c,v 1.2 1996/06/26 05:33:34 deraadt Exp $ */
/* $NetBSD: cmdtab.c,v 1.6 1995/09/08 01:06:10 tls Exp $ */
/*
@@ -37,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)cmdtab.c 8.4 (Berkeley) 10/9/94";
#else
-static char rcsid[] = "$NetBSD: cmdtab.c,v 1.6 1995/09/08 01:06:10 tls Exp $";
+static char rcsid[] = "$OpenBSD: cmdtab.c,v 1.2 1996/06/26 05:33:34 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/ftp/domacro.c b/usr.bin/ftp/domacro.c
index eaa4b0e63b6..abd717ddd02 100644
--- a/usr.bin/ftp/domacro.c
+++ b/usr.bin/ftp/domacro.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: domacro.c,v 1.2 1996/06/26 05:33:34 deraadt Exp $ */
/* $NetBSD: domacro.c,v 1.5 1995/09/08 01:06:14 tls Exp $ */
/*
@@ -37,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)domacro.c 8.3 (Berkeley) 4/2/94";
#else
-static char rcsid[] = "$NetBSD: domacro.c,v 1.5 1995/09/08 01:06:14 tls Exp $";
+static char rcsid[] = "$OpenBSD: domacro.c,v 1.2 1996/06/26 05:33:34 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/ftp/extern.h b/usr.bin/ftp/extern.h
index d835202e79b..e24b4458d61 100644
--- a/usr.bin/ftp/extern.h
+++ b/usr.bin/ftp/extern.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: extern.h,v 1.2 1996/06/26 05:33:35 deraadt Exp $ */
/* $NetBSD: extern.h,v 1.4 1995/09/08 01:06:19 tls Exp $ */
/*-
diff --git a/usr.bin/ftp/ftp.1 b/usr.bin/ftp/ftp.1
index fc91dd20d10..d01ecb2af10 100644
--- a/usr.bin/ftp/ftp.1
+++ b/usr.bin/ftp/ftp.1
@@ -1,3 +1,4 @@
+.\" $OpenBSD: ftp.1,v 1.2 1996/06/26 05:33:36 deraadt Exp $
.\" $NetBSD: ftp.1,v 1.11 1995/09/08 01:06:24 tls Exp $
.\"
.\" Copyright (c) 1985, 1989, 1990, 1993
diff --git a/usr.bin/ftp/ftp.c b/usr.bin/ftp/ftp.c
index da041dd1164..591f1cfa751 100644
--- a/usr.bin/ftp/ftp.c
+++ b/usr.bin/ftp/ftp.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: ftp.c,v 1.4 1996/06/26 05:33:36 deraadt Exp $ */
/* $NetBSD: ftp.c,v 1.13 1995/09/16 22:32:59 pk Exp $ */
/*
@@ -37,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)ftp.c 8.6 (Berkeley) 10/27/94";
#else
-static char rcsid[] = "$NetBSD: ftp.c,v 1.13 1995/09/16 22:32:59 pk Exp $";
+static char rcsid[] = "$OpenBSD: ftp.c,v 1.4 1996/06/26 05:33:36 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/ftp/ftp_var.h b/usr.bin/ftp/ftp_var.h
index 333bd3c160c..c840bf705f2 100644
--- a/usr.bin/ftp/ftp_var.h
+++ b/usr.bin/ftp/ftp_var.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: ftp_var.h,v 1.3 1996/06/26 05:33:37 deraadt Exp $ */
/* $NetBSD: ftp_var.h,v 1.7 1995/09/15 00:32:35 pk Exp $ */
/*
diff --git a/usr.bin/ftp/main.c b/usr.bin/ftp/main.c
index 06fea893155..e0c8b51925e 100644
--- a/usr.bin/ftp/main.c
+++ b/usr.bin/ftp/main.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: main.c,v 1.5 1996/06/26 05:33:38 deraadt Exp $ */
+
/*
* Copyright (c) 1985, 1989, 1993, 1994
* The Regents of the University of California. All rights reserved.
@@ -41,7 +43,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)main.c 8.6 (Berkeley) 10/9/94";
#else
-static char rcsid[] = "$NetBSD: main.c,v 1.11 1996/05/07 00:16:55 pk Exp $";
+static char rcsid[] = "$OpenBSD: main.c,v 1.5 1996/06/26 05:33:38 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/ftp/pathnames.h b/usr.bin/ftp/pathnames.h
index 7f17578e388..c3f18a19095 100644
--- a/usr.bin/ftp/pathnames.h
+++ b/usr.bin/ftp/pathnames.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: pathnames.h,v 1.2 1996/06/26 05:33:38 deraadt Exp $ */
/* $NetBSD: pathnames.h,v 1.5 1995/09/08 01:06:40 tls Exp $ */
/*
diff --git a/usr.bin/ftp/ruserpass.c b/usr.bin/ftp/ruserpass.c
index 407db4116c1..430c386df62 100644
--- a/usr.bin/ftp/ruserpass.c
+++ b/usr.bin/ftp/ruserpass.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: ruserpass.c,v 1.2 1996/06/26 05:33:39 deraadt Exp $ */
/* $NetBSD: ruserpass.c,v 1.6 1995/09/08 01:06:43 tls Exp $ */
/*
diff --git a/usr.bin/gencat/Makefile b/usr.bin/gencat/Makefile
index af94c1a9f17..d31c80ccdb6 100644
--- a/usr.bin/gencat/Makefile
+++ b/usr.bin/gencat/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.2 1996/05/22 11:38:52 deraadt Exp $
+# $OpenBSD: Makefile,v 1.3 1996/06/26 05:33:40 deraadt Exp $
PROG= gencat
NOMAN=
diff --git a/usr.bin/gencat/gencat.c b/usr.bin/gencat/gencat.c
index b023c6e3181..bc5faa416b5 100644
--- a/usr.bin/gencat/gencat.c
+++ b/usr.bin/gencat/gencat.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: gencat.c,v 1.4 1996/06/26 05:33:40 deraadt Exp $ */
+
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
* All rights reserved.
diff --git a/usr.bin/getconf/Makefile b/usr.bin/getconf/Makefile
index b7971a5d1ea..9543f2d341a 100644
--- a/usr.bin/getconf/Makefile
+++ b/usr.bin/getconf/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.1 1995/10/18 08:45:19 deraadt Exp $
+# $OpenBSD: Makefile,v 1.2 1996/06/26 05:33:41 deraadt Exp $
PROG=getconf
diff --git a/usr.bin/getconf/getconf.1 b/usr.bin/getconf/getconf.1
index 1704edc17a6..987ba97cdcf 100644
--- a/usr.bin/getconf/getconf.1
+++ b/usr.bin/getconf/getconf.1
@@ -1,3 +1,4 @@
+.\" $OpenBSD: getconf.1,v 1.3 1996/06/26 05:33:42 deraadt Exp $
.\" $NetBSD: getconf.1,v 1.2 1996/04/20 01:15:12 jtc Exp $
.\"
.\" Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -31,7 +32,6 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" $Id: getconf.1,v 1.2 1996/05/04 09:15:04 deraadt Exp $
.\"
.Dd June 24, 1994
.Dt GETCONF 1
diff --git a/usr.bin/getconf/getconf.c b/usr.bin/getconf/getconf.c
index 40170cc9764..d488c4f3f75 100644
--- a/usr.bin/getconf/getconf.c
+++ b/usr.bin/getconf/getconf.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: getconf.c,v 1.3 1996/06/26 05:33:43 deraadt Exp $ */
+
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -39,7 +41,7 @@
*/
#ifndef lint
-static char rcsid[] = "$Id: getconf.c,v 1.2 1996/05/04 09:15:06 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: getconf.c,v 1.3 1996/06/26 05:33:43 deraadt Exp $";
#endif /* not lint */
#include <stdio.h>
diff --git a/usr.bin/getopt/Makefile b/usr.bin/getopt/Makefile
index c56a9edc43f..ab6a3727c16 100644
--- a/usr.bin/getopt/Makefile
+++ b/usr.bin/getopt/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.1 1995/10/18 08:45:19 deraadt Exp $
+# $OpenBSD: Makefile,v 1.2 1996/06/26 05:33:44 deraadt Exp $
PROG = getopt
diff --git a/usr.bin/getopt/getopt.1 b/usr.bin/getopt/getopt.1
index 057b7cc106e..068c1f1de58 100644
--- a/usr.bin/getopt/getopt.1
+++ b/usr.bin/getopt/getopt.1
@@ -1,4 +1,4 @@
-.\" $Id: getopt.1,v 1.1 1995/10/18 08:45:19 deraadt Exp $ -*- nroff -*-
+.\" $OpenBSD: getopt.1,v 1.2 1996/06/26 05:33:44 deraadt Exp $ -*- nroff -*-
.Dd June 21, 1993
.Dt GETOPT 1
.Os
diff --git a/usr.bin/getopt/getopt.c b/usr.bin/getopt/getopt.c
index b4530930600..8576ff96122 100644
--- a/usr.bin/getopt/getopt.c
+++ b/usr.bin/getopt/getopt.c
@@ -1,5 +1,7 @@
+/* $OpenBSD: getopt.c,v 1.2 1996/06/26 05:33:45 deraadt Exp $ */
+
#ifndef lint
-static char rcsid[] = "$Id: getopt.c,v 1.1 1995/10/18 08:45:19 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: getopt.c,v 1.2 1996/06/26 05:33:45 deraadt Exp $";
#endif /* not lint */
#include <stdio.h>
diff --git a/usr.bin/gprof/Makefile b/usr.bin/gprof/Makefile
index 3a2e9b3a517..6d83d9d6dba 100644
--- a/usr.bin/gprof/Makefile
+++ b/usr.bin/gprof/Makefile
@@ -1,5 +1,5 @@
+# $OpenBSD: Makefile,v 1.2 1996/06/26 05:33:46 deraadt Exp $
# $NetBSD: Makefile,v 1.14 1995/04/19 07:24:08 cgd Exp $
-# @(#)Makefile 8.1 (Berkeley) 6/29/93
PROG= gprof
SRCS= gprof.c arcs.c dfn.c lookup.c ${MACHINE_ARCH}.c hertz.c \
diff --git a/usr.bin/gprof/PSD.doc/Makefile b/usr.bin/gprof/PSD.doc/Makefile
index db317092eac..69b3b1ce635 100644
--- a/usr.bin/gprof/PSD.doc/Makefile
+++ b/usr.bin/gprof/PSD.doc/Makefile
@@ -1,5 +1,5 @@
+# $OpenBSD: Makefile,v 1.2 1996/06/26 05:34:06 deraadt Exp $
# $NetBSD: Makefile,v 1.3 1995/04/19 07:16:35 cgd Exp $
-# @(#)Makefile 8.1 (Berkeley) 8/14/93
DIR= psd/18.gprof
SRCS= header.me abstract.me intro.me profiling.me gathering.me \
diff --git a/usr.bin/gprof/PSD.doc/abstract.me b/usr.bin/gprof/PSD.doc/abstract.me
index 7eebfe62d41..5a1d04af034 100644
--- a/usr.bin/gprof/PSD.doc/abstract.me
+++ b/usr.bin/gprof/PSD.doc/abstract.me
@@ -1,3 +1,4 @@
+.\" $OpenBSD: abstract.me,v 1.2 1996/06/26 05:34:06 deraadt Exp $
.\" $NetBSD: abstract.me,v 1.2 1995/04/19 07:16:37 cgd Exp $
.\"
.\" Copyright (c) 1982, 1993
diff --git a/usr.bin/gprof/PSD.doc/gathering.me b/usr.bin/gprof/PSD.doc/gathering.me
index 835d8a9ef39..de0317a739e 100644
--- a/usr.bin/gprof/PSD.doc/gathering.me
+++ b/usr.bin/gprof/PSD.doc/gathering.me
@@ -1,3 +1,4 @@
+.\" $OpenBSD: gathering.me,v 1.2 1996/06/26 05:34:07 deraadt Exp $
.\" $NetBSD: gathering.me,v 1.2 1995/04/19 07:16:39 cgd Exp $
.\"
.\" Copyright (c) 1982, 1993
diff --git a/usr.bin/gprof/PSD.doc/header.me b/usr.bin/gprof/PSD.doc/header.me
index 4b4772e6fd6..8937c6dde7a 100644
--- a/usr.bin/gprof/PSD.doc/header.me
+++ b/usr.bin/gprof/PSD.doc/header.me
@@ -1,3 +1,4 @@
+.\" $OpenBSD: header.me,v 1.2 1996/06/26 05:34:07 deraadt Exp $
.\" $NetBSD: header.me,v 1.2 1995/04/19 07:16:41 cgd Exp $
.\"
.\" Copyright (c) 1982, 1993
diff --git a/usr.bin/gprof/PSD.doc/intro.me b/usr.bin/gprof/PSD.doc/intro.me
index 9428568debe..ebb7e55b2fd 100644
--- a/usr.bin/gprof/PSD.doc/intro.me
+++ b/usr.bin/gprof/PSD.doc/intro.me
@@ -1,3 +1,4 @@
+.\" $OpenBSD: intro.me,v 1.2 1996/06/26 05:34:08 deraadt Exp $
.\" $NetBSD: intro.me,v 1.2 1995/04/19 07:16:42 cgd Exp $
.\"
.\" Copyright (c) 1982, 1993
diff --git a/usr.bin/gprof/PSD.doc/postp.me b/usr.bin/gprof/PSD.doc/postp.me
index 8587882da21..f810dd266f0 100644
--- a/usr.bin/gprof/PSD.doc/postp.me
+++ b/usr.bin/gprof/PSD.doc/postp.me
@@ -1,3 +1,4 @@
+.\" $OpenBSD: postp.me,v 1.2 1996/06/26 05:34:09 deraadt Exp $
.\" $NetBSD: postp.me,v 1.2 1995/04/19 07:16:44 cgd Exp $
.\"
.\" Copyright (c) 1982, 1993
diff --git a/usr.bin/gprof/PSD.doc/postp1.pic b/usr.bin/gprof/PSD.doc/postp1.pic
index 7a776a725db..a32a15c0713 100644
--- a/usr.bin/gprof/PSD.doc/postp1.pic
+++ b/usr.bin/gprof/PSD.doc/postp1.pic
@@ -1,3 +1,4 @@
+.\" $OpenBSD: postp1.pic,v 1.2 1996/06/26 05:34:09 deraadt Exp $
.\" $NetBSD: postp1.pic,v 1.2 1995/04/19 07:16:46 cgd Exp $
.\"
.\" Copyright (c) 1986, 1993
diff --git a/usr.bin/gprof/PSD.doc/postp2.pic b/usr.bin/gprof/PSD.doc/postp2.pic
index 5d90291f357..fda6658c4da 100644
--- a/usr.bin/gprof/PSD.doc/postp2.pic
+++ b/usr.bin/gprof/PSD.doc/postp2.pic
@@ -1,3 +1,4 @@
+.\" $OpenBSD: postp2.pic,v 1.2 1996/06/26 05:34:10 deraadt Exp $
.\" $NetBSD: postp2.pic,v 1.2 1995/04/19 07:16:48 cgd Exp $
.\"
.\" Copyright (c) 1986, 1993
diff --git a/usr.bin/gprof/PSD.doc/postp3.pic b/usr.bin/gprof/PSD.doc/postp3.pic
index 4a3ce97a62e..2338156c658 100644
--- a/usr.bin/gprof/PSD.doc/postp3.pic
+++ b/usr.bin/gprof/PSD.doc/postp3.pic
@@ -1,3 +1,4 @@
+.\" $OpenBSD: postp3.pic,v 1.2 1996/06/26 05:34:10 deraadt Exp $
.\" $NetBSD: postp3.pic,v 1.2 1995/04/19 07:16:50 cgd Exp $
.\"
.\" Copyright (c) 1986, 1993
diff --git a/usr.bin/gprof/PSD.doc/pres1.pic b/usr.bin/gprof/PSD.doc/pres1.pic
index 50f33f9a5a6..1f6c33bafdb 100644
--- a/usr.bin/gprof/PSD.doc/pres1.pic
+++ b/usr.bin/gprof/PSD.doc/pres1.pic
@@ -1,3 +1,4 @@
+.\" $OpenBSD: pres1.pic,v 1.2 1996/06/26 05:34:11 deraadt Exp $
.\" $NetBSD: pres1.pic,v 1.2 1995/04/19 07:16:52 cgd Exp $
.\"
.\" Copyright (c) 1986, 1993
diff --git a/usr.bin/gprof/PSD.doc/pres2.pic b/usr.bin/gprof/PSD.doc/pres2.pic
index acb32c1e61e..9f5ec115382 100644
--- a/usr.bin/gprof/PSD.doc/pres2.pic
+++ b/usr.bin/gprof/PSD.doc/pres2.pic
@@ -1,3 +1,4 @@
+.\" $OpenBSD: pres2.pic,v 1.2 1996/06/26 05:34:11 deraadt Exp $
.\" $NetBSD: pres2.pic,v 1.2 1995/04/19 07:16:53 cgd Exp $
.\"
.\" Copyright (c) 1986, 1993
diff --git a/usr.bin/gprof/PSD.doc/present.me b/usr.bin/gprof/PSD.doc/present.me
index 04b6ab314f1..0a34d1e252d 100644
--- a/usr.bin/gprof/PSD.doc/present.me
+++ b/usr.bin/gprof/PSD.doc/present.me
@@ -1,3 +1,4 @@
+.\" $OpenBSD: present.me,v 1.2 1996/06/26 05:34:12 deraadt Exp $
.\" $NetBSD: present.me,v 1.2 1995/04/19 07:16:54 cgd Exp $
.\"
.\" Copyright (c) 1982, 1993
diff --git a/usr.bin/gprof/PSD.doc/profiling.me b/usr.bin/gprof/PSD.doc/profiling.me
index 13c375c602e..72ce6dee66a 100644
--- a/usr.bin/gprof/PSD.doc/profiling.me
+++ b/usr.bin/gprof/PSD.doc/profiling.me
@@ -1,3 +1,4 @@
+.\" $OpenBSD: profiling.me,v 1.2 1996/06/26 05:34:13 deraadt Exp $
.\" $NetBSD: profiling.me,v 1.2 1995/04/19 07:16:56 cgd Exp $
.\"
.\" Copyright (c) 1982, 1993
diff --git a/usr.bin/gprof/PSD.doc/refs.me b/usr.bin/gprof/PSD.doc/refs.me
index a027b01e559..1c6d9c83932 100644
--- a/usr.bin/gprof/PSD.doc/refs.me
+++ b/usr.bin/gprof/PSD.doc/refs.me
@@ -1,3 +1,4 @@
+.\" $OpenBSD: refs.me,v 1.2 1996/06/26 05:34:13 deraadt Exp $
.\" $NetBSD: refs.me,v 1.2 1995/04/19 07:16:58 cgd Exp $
.\"
.\" Copyright (c) 1982, 1993
diff --git a/usr.bin/gprof/alpha.c b/usr.bin/gprof/alpha.c
index 3976556288b..7c324ba7883 100644
--- a/usr.bin/gprof/alpha.c
+++ b/usr.bin/gprof/alpha.c
@@ -1,7 +1,8 @@
+/* $OpenBSD: alpha.c,v 1.2 1996/06/26 05:33:46 deraadt Exp $ */
/* $NetBSD: alpha.c,v 1.1 1995/04/19 07:24:19 cgd Exp $ */
#ifndef lint
-static char rcsid[] = "$NetBSD: alpha.c,v 1.1 1995/04/19 07:24:19 cgd Exp $";
+static char rcsid[] = "$OpenBSD: alpha.c,v 1.2 1996/06/26 05:33:46 deraadt Exp $";
#endif /* not lint */
#include "gprof.h"
diff --git a/usr.bin/gprof/alpha.h b/usr.bin/gprof/alpha.h
index 3d7eb5a2efa..f1f8c57ca63 100644
--- a/usr.bin/gprof/alpha.h
+++ b/usr.bin/gprof/alpha.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: alpha.h,v 1.2 1996/06/26 05:33:47 deraadt Exp $ */
/* $NetBSD: alpha.h,v 1.1 1995/04/19 07:24:21 cgd Exp $ */
/*-
diff --git a/usr.bin/gprof/arcs.c b/usr.bin/gprof/arcs.c
index a6a771c10ea..d083928f9b9 100644
--- a/usr.bin/gprof/arcs.c
+++ b/usr.bin/gprof/arcs.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: arcs.c,v 1.2 1996/06/26 05:33:47 deraadt Exp $ */
/* $NetBSD: arcs.c,v 1.6 1995/04/19 07:15:52 cgd Exp $ */
/*
@@ -37,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)arcs.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$NetBSD: arcs.c,v 1.6 1995/04/19 07:15:52 cgd Exp $";
+static char rcsid[] = "$OpenBSD: arcs.c,v 1.2 1996/06/26 05:33:47 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/gprof/arm32.c b/usr.bin/gprof/arm32.c
index 2b0bfdfa19c..89099decc8d 100644
--- a/usr.bin/gprof/arm32.c
+++ b/usr.bin/gprof/arm32.c
@@ -1,7 +1,8 @@
+/* $OpenBSD: arm32.c,v 1.2 1996/06/26 05:33:48 deraadt Exp $ */
/* $NetBSD: arm32.c,v 1.1 1996/04/01 21:51:22 mark Exp $ */
#ifndef lint
-static char rcsid[] = "$NetBSD: arm32.c,v 1.1 1996/04/01 21:51:22 mark Exp $";
+static char rcsid[] = "$OpenBSD: arm32.c,v 1.2 1996/06/26 05:33:48 deraadt Exp $";
#endif /* not lint */
#include "gprof.h"
diff --git a/usr.bin/gprof/arm32.h b/usr.bin/gprof/arm32.h
index fd4c0f4e4ef..d4f78d6b7bd 100644
--- a/usr.bin/gprof/arm32.h
+++ b/usr.bin/gprof/arm32.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: arm32.h,v 1.2 1996/06/26 05:33:49 deraadt Exp $ */
/* $NetBSD: arm32.h,v 1.1 1996/04/01 21:51:26 mark Exp $ */
/*-
diff --git a/usr.bin/gprof/dfn.c b/usr.bin/gprof/dfn.c
index cae8c1bc80e..601c674a1c7 100644
--- a/usr.bin/gprof/dfn.c
+++ b/usr.bin/gprof/dfn.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: dfn.c,v 1.2 1996/06/26 05:33:49 deraadt Exp $ */
/* $NetBSD: dfn.c,v 1.5 1995/04/19 07:15:56 cgd Exp $ */
/*
@@ -37,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)dfn.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$NetBSD: dfn.c,v 1.5 1995/04/19 07:15:56 cgd Exp $";
+static char rcsid[] = "$OpenBSD: dfn.c,v 1.2 1996/06/26 05:33:49 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/gprof/gprof.1 b/usr.bin/gprof/gprof.1
index c991c790b98..bc7edd0f3b3 100644
--- a/usr.bin/gprof/gprof.1
+++ b/usr.bin/gprof/gprof.1
@@ -1,3 +1,4 @@
+.\" $OpenBSD: gprof.1,v 1.3 1996/06/26 05:33:50 deraadt Exp $
.\" $NetBSD: gprof.1,v 1.6 1995/11/21 22:24:55 jtc Exp $
.\"
.\" Copyright (c) 1983, 1990, 1993
diff --git a/usr.bin/gprof/gprof.c b/usr.bin/gprof/gprof.c
index 4cc32581cde..0530adf7402 100644
--- a/usr.bin/gprof/gprof.c
+++ b/usr.bin/gprof/gprof.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: gprof.c,v 1.2 1996/06/26 05:33:51 deraadt Exp $ */
/* $NetBSD: gprof.c,v 1.8 1995/04/19 07:15:59 cgd Exp $ */
/*
@@ -43,7 +44,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)gprof.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$NetBSD: gprof.c,v 1.8 1995/04/19 07:15:59 cgd Exp $";
+static char rcsid[] = "$OpenBSD: gprof.c,v 1.2 1996/06/26 05:33:51 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/gprof/gprof.h b/usr.bin/gprof/gprof.h
index 681d9e92477..aeb63928e85 100644
--- a/usr.bin/gprof/gprof.h
+++ b/usr.bin/gprof/gprof.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: gprof.h,v 1.3 1996/06/26 05:33:51 deraadt Exp $ */
/* $NetBSD: gprof.h,v 1.13 1996/04/01 21:54:06 mark Exp $ */
/*
diff --git a/usr.bin/gprof/hertz.c b/usr.bin/gprof/hertz.c
index ab49481bc99..9121e697569 100644
--- a/usr.bin/gprof/hertz.c
+++ b/usr.bin/gprof/hertz.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: hertz.c,v 1.2 1996/06/26 05:33:52 deraadt Exp $ */
/* $NetBSD: hertz.c,v 1.5 1995/04/19 07:16:03 cgd Exp $ */
/*
@@ -37,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)hertz.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$NetBSD: hertz.c,v 1.5 1995/04/19 07:16:03 cgd Exp $";
+static char rcsid[] = "$OpenBSD: hertz.c,v 1.2 1996/06/26 05:33:52 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/gprof/i386.c b/usr.bin/gprof/i386.c
index 285766adff4..ab3f51d0c2c 100644
--- a/usr.bin/gprof/i386.c
+++ b/usr.bin/gprof/i386.c
@@ -1,7 +1,8 @@
+/* $OpenBSD: i386.c,v 1.2 1996/06/26 05:33:52 deraadt Exp $ */
/* $NetBSD: i386.c,v 1.5 1995/04/19 07:16:04 cgd Exp $ */
#ifndef lint
-static char rcsid[] = "$NetBSD: i386.c,v 1.5 1995/04/19 07:16:04 cgd Exp $";
+static char rcsid[] = "$OpenBSD: i386.c,v 1.2 1996/06/26 05:33:52 deraadt Exp $";
#endif /* not lint */
#include "gprof.h"
diff --git a/usr.bin/gprof/i386.h b/usr.bin/gprof/i386.h
index cd4395610fc..da43ae51f81 100644
--- a/usr.bin/gprof/i386.h
+++ b/usr.bin/gprof/i386.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: i386.h,v 1.2 1996/06/26 05:33:53 deraadt Exp $ */
/* $NetBSD: i386.h,v 1.4 1995/04/19 07:16:05 cgd Exp $ */
/*-
diff --git a/usr.bin/gprof/lookup.c b/usr.bin/gprof/lookup.c
index 073a2df5164..e837075a127 100644
--- a/usr.bin/gprof/lookup.c
+++ b/usr.bin/gprof/lookup.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: lookup.c,v 1.2 1996/06/26 05:33:53 deraadt Exp $ */
/* $NetBSD: lookup.c,v 1.5 1995/04/19 07:16:06 cgd Exp $ */
/*
@@ -37,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)lookup.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$NetBSD: lookup.c,v 1.5 1995/04/19 07:16:06 cgd Exp $";
+static char rcsid[] = "$OpenBSD: lookup.c,v 1.2 1996/06/26 05:33:53 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/gprof/m68k.c b/usr.bin/gprof/m68k.c
index 9f6ef68070b..ccbb6c7dd91 100644
--- a/usr.bin/gprof/m68k.c
+++ b/usr.bin/gprof/m68k.c
@@ -1,7 +1,8 @@
+/* $OpenBSD: m68k.c,v 1.2 1996/06/26 05:33:54 deraadt Exp $ */
/* $NetBSD: m68k.c,v 1.4 1995/04/19 07:16:07 cgd Exp $ */
#ifndef lint
-static char rcsid[] = "$NetBSD: m68k.c,v 1.4 1995/04/19 07:16:07 cgd Exp $";
+static char rcsid[] = "$OpenBSD: m68k.c,v 1.2 1996/06/26 05:33:54 deraadt Exp $";
#endif /* not lint */
#include "gprof.h"
diff --git a/usr.bin/gprof/m68k.h b/usr.bin/gprof/m68k.h
index 87c8fd4f889..e142b278184 100644
--- a/usr.bin/gprof/m68k.h
+++ b/usr.bin/gprof/m68k.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: m68k.h,v 1.2 1996/06/26 05:33:54 deraadt Exp $ */
/* $NetBSD: m68k.h,v 1.3 1995/04/19 07:16:09 cgd Exp $ */
/*-
diff --git a/usr.bin/gprof/mips.c b/usr.bin/gprof/mips.c
index cecd2513b4c..e53f19363e7 100644
--- a/usr.bin/gprof/mips.c
+++ b/usr.bin/gprof/mips.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: mips.c,v 1.2 1996/06/26 05:33:55 deraadt Exp $ */
/* $NetBSD: mips.c,v 1.4 1995/04/19 07:16:11 cgd Exp $ */
/*
@@ -43,7 +44,7 @@
#if 0
static char sccsid[] = "@(#)mips.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$NetBSD: mips.c,v 1.4 1995/04/19 07:16:11 cgd Exp $";
+static char rcsid[] = "$OpenBSD: mips.c,v 1.2 1996/06/26 05:33:55 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/gprof/mips.h b/usr.bin/gprof/mips.h
index 06f4f66266c..e66ab8d40d1 100644
--- a/usr.bin/gprof/mips.h
+++ b/usr.bin/gprof/mips.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: mips.h,v 1.2 1996/06/26 05:33:55 deraadt Exp $ */
/* $NetBSD: mips.h,v 1.3 1995/04/19 07:16:12 cgd Exp $ */
/*-
diff --git a/usr.bin/gprof/ns32k.c b/usr.bin/gprof/ns32k.c
index b2f4c0ea1cd..50a9614754b 100644
--- a/usr.bin/gprof/ns32k.c
+++ b/usr.bin/gprof/ns32k.c
@@ -1,7 +1,8 @@
+/* $OpenBSD: ns32k.c,v 1.2 1996/06/26 05:33:56 deraadt Exp $ */
/* $NetBSD: ns32k.c,v 1.3 1995/04/19 07:16:13 cgd Exp $ */
#ifndef lint
-static char rcsid[] = "$NetBSD: ns32k.c,v 1.3 1995/04/19 07:16:13 cgd Exp $";
+static char rcsid[] = "$OpenBSD: ns32k.c,v 1.2 1996/06/26 05:33:56 deraadt Exp $";
#endif /* not lint */
#include "gprof.h"
diff --git a/usr.bin/gprof/ns32k.h b/usr.bin/gprof/ns32k.h
index 994110fe2d3..60c6a5a04e3 100644
--- a/usr.bin/gprof/ns32k.h
+++ b/usr.bin/gprof/ns32k.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: ns32k.h,v 1.2 1996/06/26 05:33:56 deraadt Exp $ */
/* $NetBSD: ns32k.h,v 1.2 1995/04/19 07:16:14 cgd Exp $ */
/*-
diff --git a/usr.bin/gprof/pathnames.h b/usr.bin/gprof/pathnames.h
index c745c4eee0a..0a390b2fd5f 100644
--- a/usr.bin/gprof/pathnames.h
+++ b/usr.bin/gprof/pathnames.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: pathnames.h,v 1.2 1996/06/26 05:33:57 deraadt Exp $ */
/* $NetBSD: pathnames.h,v 1.4 1995/04/19 07:16:16 cgd Exp $ */
/*
diff --git a/usr.bin/gprof/pmax.c b/usr.bin/gprof/pmax.c
index 644460d0383..1e81756bd8e 100644
--- a/usr.bin/gprof/pmax.c
+++ b/usr.bin/gprof/pmax.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: pmax.c,v 1.2 1996/06/26 05:33:58 deraadt Exp $ */
/* $NetBSD: pmax.c,v 1.3 1995/04/19 07:16:18 cgd Exp $ */
/*
@@ -43,7 +44,7 @@
#if 0
static char sccsid[] = "@(#)mips.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$NetBSD: pmax.c,v 1.3 1995/04/19 07:16:18 cgd Exp $";
+static char rcsid[] = "$OpenBSD: pmax.c,v 1.2 1996/06/26 05:33:58 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/gprof/pmax.h b/usr.bin/gprof/pmax.h
index 9ff09a36100..5aac6bf7501 100644
--- a/usr.bin/gprof/pmax.h
+++ b/usr.bin/gprof/pmax.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: pmax.h,v 1.2 1996/06/26 05:33:58 deraadt Exp $ */
/* $NetBSD: pmax.h,v 1.2 1995/04/19 07:16:20 cgd Exp $ */
/*-
diff --git a/usr.bin/gprof/printgprof.c b/usr.bin/gprof/printgprof.c
index 8757175dded..0ef4a307317 100644
--- a/usr.bin/gprof/printgprof.c
+++ b/usr.bin/gprof/printgprof.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: printgprof.c,v 1.2 1996/06/26 05:33:59 deraadt Exp $ */
/* $NetBSD: printgprof.c,v 1.5 1995/04/19 07:16:21 cgd Exp $ */
/*
@@ -37,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)printgprof.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$NetBSD: printgprof.c,v 1.5 1995/04/19 07:16:21 cgd Exp $";
+static char rcsid[] = "$OpenBSD: printgprof.c,v 1.2 1996/06/26 05:33:59 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/gprof/printlist.c b/usr.bin/gprof/printlist.c
index a6f2e7e2561..18ac1da0563 100644
--- a/usr.bin/gprof/printlist.c
+++ b/usr.bin/gprof/printlist.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: printlist.c,v 1.2 1996/06/26 05:33:59 deraadt Exp $ */
/* $NetBSD: printlist.c,v 1.5 1995/04/19 07:16:23 cgd Exp $ */
/*
@@ -37,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)printlist.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$NetBSD: printlist.c,v 1.5 1995/04/19 07:16:23 cgd Exp $";
+static char rcsid[] = "$OpenBSD: printlist.c,v 1.2 1996/06/26 05:33:59 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/gprof/sparc.c b/usr.bin/gprof/sparc.c
index 4b792c003e4..4959f3180e2 100644
--- a/usr.bin/gprof/sparc.c
+++ b/usr.bin/gprof/sparc.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: sparc.c,v 1.2 1996/06/26 05:34:00 deraadt Exp $ */
/* $NetBSD: sparc.c,v 1.4 1995/04/19 07:16:24 cgd Exp $ */
/*
@@ -41,7 +42,7 @@
#if 0
static char sccsid[] = "@(#)sparc.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$NetBSD: sparc.c,v 1.4 1995/04/19 07:16:24 cgd Exp $";
+static char rcsid[] = "$OpenBSD: sparc.c,v 1.2 1996/06/26 05:34:00 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/gprof/sparc.h b/usr.bin/gprof/sparc.h
index 2703b926ce3..967ca1bd6b0 100644
--- a/usr.bin/gprof/sparc.h
+++ b/usr.bin/gprof/sparc.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: sparc.h,v 1.2 1996/06/26 05:34:00 deraadt Exp $ */
/* $NetBSD: sparc.h,v 1.3 1995/04/19 07:16:25 cgd Exp $ */
/*-
diff --git a/usr.bin/gprof/tahoe.c b/usr.bin/gprof/tahoe.c
index f2c5e97d193..505aa3eefd2 100644
--- a/usr.bin/gprof/tahoe.c
+++ b/usr.bin/gprof/tahoe.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: tahoe.c,v 1.2 1996/06/26 05:34:01 deraadt Exp $ */
/* $NetBSD: tahoe.c,v 1.5 1995/04/19 07:16:27 cgd Exp $ */
/*
@@ -37,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)tahoe.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$NetBSD: tahoe.c,v 1.5 1995/04/19 07:16:27 cgd Exp $";
+static char rcsid[] = "$OpenBSD: tahoe.c,v 1.2 1996/06/26 05:34:01 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/gprof/tahoe.h b/usr.bin/gprof/tahoe.h
index 4afda02be07..a600af81214 100644
--- a/usr.bin/gprof/tahoe.h
+++ b/usr.bin/gprof/tahoe.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: tahoe.h,v 1.2 1996/06/26 05:34:02 deraadt Exp $ */
/* $NetBSD: tahoe.h,v 1.4 1995/04/19 07:16:29 cgd Exp $ */
/*
diff --git a/usr.bin/gprof/vax.c b/usr.bin/gprof/vax.c
index eb8ee9ce9bf..5c1a6238791 100644
--- a/usr.bin/gprof/vax.c
+++ b/usr.bin/gprof/vax.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: vax.c,v 1.3 1996/06/26 05:34:02 deraadt Exp $ */
/* $NetBSD: vax.c,v 1.6 1996/04/20 14:56:37 ragge Exp $ */
/*
@@ -37,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)vax.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$NetBSD: vax.c,v 1.6 1996/04/20 14:56:37 ragge Exp $";
+static char rcsid[] = "$OpenBSD: vax.c,v 1.3 1996/06/26 05:34:02 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/gprof/vax.h b/usr.bin/gprof/vax.h
index e84b104c493..dd107fb6a06 100644
--- a/usr.bin/gprof/vax.h
+++ b/usr.bin/gprof/vax.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: vax.h,v 1.2 1996/06/26 05:34:03 deraadt Exp $ */
/* $NetBSD: vax.h,v 1.4 1995/04/19 07:16:31 cgd Exp $ */
/*
diff --git a/usr.bin/head/Makefile b/usr.bin/head/Makefile
index ee67a6867dc..9a469bbc2e5 100644
--- a/usr.bin/head/Makefile
+++ b/usr.bin/head/Makefile
@@ -1,5 +1,4 @@
-# from: @(#)Makefile 5.3 (Berkeley) 5/11/90
-# $Id: Makefile,v 1.1 1995/10/18 08:45:23 deraadt Exp $
+# $OpenBSD: Makefile,v 1.2 1996/06/26 05:34:14 deraadt Exp $
PROG= head
diff --git a/usr.bin/head/head.1 b/usr.bin/head/head.1
index 01768492bf0..49b00844837 100644
--- a/usr.bin/head/head.1
+++ b/usr.bin/head/head.1
@@ -1,3 +1,4 @@
+.\" $OpenBSD: head.1,v 1.2 1996/06/26 05:34:15 deraadt Exp $
.\" Copyright (c) 1980, 1990 The Regents of the University of California.
.\" All rights reserved.
.\"
@@ -30,7 +31,6 @@
.\" SUCH DAMAGE.
.\"
.\" from: @(#)head.1 6.6 (Berkeley) 7/24/91
-.\" $Id: head.1,v 1.1 1995/10/18 08:45:23 deraadt Exp $
.\"
.Dd July 14, 1993
.Dt HEAD 1
diff --git a/usr.bin/head/head.c b/usr.bin/head/head.c
index a870e569c46..551d4e332f1 100644
--- a/usr.bin/head/head.c
+++ b/usr.bin/head/head.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: head.c,v 1.2 1996/06/26 05:34:15 deraadt Exp $ */
+
/*
* Copyright (c) 1980, 1987 Regents of the University of California.
* All rights reserved.
@@ -39,7 +41,7 @@ char copyright[] =
#ifndef lint
/*static char sccsid[] = "from: @(#)head.c 5.5 (Berkeley) 6/1/90";*/
-static char rcsid[] = "$Id: head.c,v 1.1 1995/10/18 08:45:23 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: head.c,v 1.2 1996/06/26 05:34:15 deraadt Exp $";
#endif /* not lint */
#include <stdio.h>
diff --git a/usr.bin/hexdump/Makefile b/usr.bin/hexdump/Makefile
index 588a1d83711..94fde5a54c6 100644
--- a/usr.bin/hexdump/Makefile
+++ b/usr.bin/hexdump/Makefile
@@ -1,5 +1,4 @@
-# from: @(#)Makefile 5.5 (Berkeley) 3/7/91
-# $Id: Makefile,v 1.1 1995/10/18 08:45:23 deraadt Exp $
+# $OpenBSD: Makefile,v 1.2 1996/06/26 05:34:16 deraadt Exp $
PROG= hexdump
SRCS= conv.c display.c hexdump.c hexsyntax.c odsyntax.c parse.c
diff --git a/usr.bin/hexdump/conv.c b/usr.bin/hexdump/conv.c
index 8b2a9913687..58b067206d0 100644
--- a/usr.bin/hexdump/conv.c
+++ b/usr.bin/hexdump/conv.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: conv.c,v 1.2 1996/06/26 05:34:17 deraadt Exp $ */
+
/*
* Copyright (c) 1989 The Regents of the University of California.
* All rights reserved.
@@ -33,7 +35,7 @@
#ifndef lint
/*static char sccsid[] = "from: @(#)conv.c 5.4 (Berkeley) 6/1/90";*/
-static char rcsid[] = "$Id: conv.c,v 1.1 1995/10/18 08:45:23 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: conv.c,v 1.2 1996/06/26 05:34:17 deraadt Exp $";
#endif /* not lint */
#include <sys/types.h>
diff --git a/usr.bin/hexdump/display.c b/usr.bin/hexdump/display.c
index aa9568b9e7d..b8b0bf996ac 100644
--- a/usr.bin/hexdump/display.c
+++ b/usr.bin/hexdump/display.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: display.c,v 1.3 1996/06/26 05:34:17 deraadt Exp $ */
+
/*
* Copyright (c) 1989 The Regents of the University of California.
* All rights reserved.
@@ -33,7 +35,7 @@
#ifndef lint
/*static char sccsid[] = "from: @(#)display.c 5.11 (Berkeley) 3/9/91";*/
-static char rcsid[] = "$Id: display.c,v 1.2 1996/05/21 21:51:51 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: display.c,v 1.3 1996/06/26 05:34:17 deraadt Exp $";
#endif /* not lint */
#include <sys/param.h>
diff --git a/usr.bin/hexdump/hexdump.1 b/usr.bin/hexdump/hexdump.1
index 06417ee067e..f6a386638de 100644
--- a/usr.bin/hexdump/hexdump.1
+++ b/usr.bin/hexdump/hexdump.1
@@ -1,3 +1,4 @@
+.\" $OpenBSD: hexdump.1,v 1.2 1996/06/26 05:34:18 deraadt Exp $
.\" Copyright (c) 1989, 1990 The Regents of the University of California.
.\" All rights reserved.
.\"
@@ -30,7 +31,6 @@
.\" SUCH DAMAGE.
.\"
.\" from: @(#)hexdump.1 5.12 (Berkeley) 7/27/91
-.\" $Id: hexdump.1,v 1.1 1995/10/18 08:45:23 deraadt Exp $
.\"
.Dd July 27, 1991
.Dt HEXDUMP 1
diff --git a/usr.bin/hexdump/hexdump.c b/usr.bin/hexdump/hexdump.c
index cd470c2585e..1530d5bc0b5 100644
--- a/usr.bin/hexdump/hexdump.c
+++ b/usr.bin/hexdump/hexdump.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: hexdump.c,v 1.4 1996/06/26 05:34:18 deraadt Exp $ */
+
/*
* Copyright (c) 1989 The Regents of the University of California.
* All rights reserved.
@@ -39,7 +41,7 @@ char copyright[] =
#ifndef lint
/*static char sccsid[] = "from: @(#)hexdump.c 5.5 (Berkeley) 6/1/90";*/
-static char rcsid[] = "$Id: hexdump.c,v 1.3 1996/05/24 09:19:06 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: hexdump.c,v 1.4 1996/06/26 05:34:18 deraadt Exp $";
#endif /* not lint */
#include <sys/types.h>
diff --git a/usr.bin/hexdump/hexdump.h b/usr.bin/hexdump/hexdump.h
index 51186b8125a..ffa71c41c29 100644
--- a/usr.bin/hexdump/hexdump.h
+++ b/usr.bin/hexdump/hexdump.h
@@ -1,3 +1,4 @@
+/* * $OpenBSD: hexdump.h,v 1.2 1996/06/26 05:34:19 deraadt Exp $*/
/*
* Copyright (c) 1989 The Regents of the University of California.
* All rights reserved.
@@ -31,7 +32,6 @@
* SUCH DAMAGE.
*
* from: @(#)hexdump.h 5.4 (Berkeley) 6/1/90
- * $Id: hexdump.h,v 1.1 1995/10/18 08:45:23 deraadt Exp $
*/
typedef struct _pr {
diff --git a/usr.bin/hexdump/hexsyntax.c b/usr.bin/hexdump/hexsyntax.c
index c7be3048ff4..bb13d56d463 100644
--- a/usr.bin/hexdump/hexsyntax.c
+++ b/usr.bin/hexdump/hexsyntax.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: hexsyntax.c,v 1.2 1996/06/26 05:34:20 deraadt Exp $ */
+
/*-
* Copyright (c) 1990 The Regents of the University of California.
* All rights reserved.
@@ -33,7 +35,7 @@
#ifndef lint
/*static char sccsid[] = "from: @(#)hexsyntax.c 5.2 (Berkeley) 5/8/90";*/
-static char rcsid[] = "$Id: hexsyntax.c,v 1.1 1995/10/18 08:45:23 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: hexsyntax.c,v 1.2 1996/06/26 05:34:20 deraadt Exp $";
#endif /* not lint */
#include <sys/types.h>
diff --git a/usr.bin/hexdump/od.1 b/usr.bin/hexdump/od.1
index d1f1b1d3cae..aa9cc923ad0 100644
--- a/usr.bin/hexdump/od.1
+++ b/usr.bin/hexdump/od.1
@@ -1,3 +1,4 @@
+.\" $OpenBSD: od.1,v 1.2 1996/06/26 05:34:20 deraadt Exp $
.\" Copyright (c) 1990 The Regents of the University of California.
.\" All rights reserved.
.\"
@@ -30,7 +31,6 @@
.\" SUCH DAMAGE.
.\"
.\" from: @(#)od.1 5.7 (Berkeley) 7/22/91
-.\" $Id: od.1,v 1.1 1995/10/18 08:45:23 deraadt Exp $
.\"
.Dd %Q
.Os
diff --git a/usr.bin/hexdump/odsyntax.c b/usr.bin/hexdump/odsyntax.c
index 93a25aa64b8..7946ded0f56 100644
--- a/usr.bin/hexdump/odsyntax.c
+++ b/usr.bin/hexdump/odsyntax.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: odsyntax.c,v 1.2 1996/06/26 05:34:21 deraadt Exp $ */
+
/*-
* Copyright (c) 1990 The Regents of the University of California.
* All rights reserved.
@@ -33,7 +35,7 @@
#ifndef lint
/*static char sccsid[] = "from: @(#)odsyntax.c 5.4 (Berkeley) 3/8/91";*/
-static char rcsid[] = "$Id: odsyntax.c,v 1.1 1995/10/18 08:45:23 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: odsyntax.c,v 1.2 1996/06/26 05:34:21 deraadt Exp $";
#endif /* not lint */
#include <sys/types.h>
diff --git a/usr.bin/hexdump/parse.c b/usr.bin/hexdump/parse.c
index 44c73b9b6c7..10281f47d65 100644
--- a/usr.bin/hexdump/parse.c
+++ b/usr.bin/hexdump/parse.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: parse.c,v 1.2 1996/06/26 05:34:21 deraadt Exp $ */
+
/*
* Copyright (c) 1989 The Regents of the University of California.
* All rights reserved.
@@ -33,7 +35,7 @@
#ifndef lint
/*static char sccsid[] = "from: @(#)parse.c 5.6 (Berkeley) 3/9/91";*/
-static char rcsid[] = "$Id: parse.c,v 1.1 1995/10/18 08:45:23 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: parse.c,v 1.2 1996/06/26 05:34:21 deraadt Exp $";
#endif /* not lint */
#include <sys/types.h>
diff --git a/usr.bin/id/Makefile b/usr.bin/id/Makefile
index a9be2ac3e32..626714b74f8 100644
--- a/usr.bin/id/Makefile
+++ b/usr.bin/id/Makefile
@@ -1,5 +1,4 @@
-# from: @(#)Makefile 8.1 (Berkeley) 6/6/93
-# $Id: Makefile,v 1.1 1995/10/18 08:45:24 deraadt Exp $
+# $OpenBSD: Makefile,v 1.2 1996/06/26 05:34:22 deraadt Exp $
PROG= id
MAN= id.1 groups.1 whoami.1
diff --git a/usr.bin/id/groups.1 b/usr.bin/id/groups.1
index 51c8c23af19..3a7f7de02bc 100644
--- a/usr.bin/id/groups.1
+++ b/usr.bin/id/groups.1
@@ -1,3 +1,4 @@
+.\" $OpenBSD: groups.1,v 1.2 1996/06/26 05:34:23 deraadt Exp $
.\" Copyright (c) 1991, 1993
.\" The Regents of the University of California. All rights reserved.
.\"
@@ -30,7 +31,6 @@
.\" SUCH DAMAGE.
.\"
.\" from: @(#)groups.1 8.1 (Berkeley) 6/6/93
-.\" $Id: groups.1,v 1.1 1995/10/18 08:45:24 deraadt Exp $
.\"
.Dd "June 6, 1993"
.Dt GROUPS 1
diff --git a/usr.bin/id/groups.sh b/usr.bin/id/groups.sh
index 98878b4ac10..74f631c8566 100644
--- a/usr.bin/id/groups.sh
+++ b/usr.bin/id/groups.sh
@@ -1,4 +1,5 @@
#!/bin/sh -
+# $OpenBSD: groups.sh,v 1.2 1996/06/26 05:34:23 deraadt Exp $
#
# Copyright (c) 1991, 1993
# The Regents of the University of California. All rights reserved.
@@ -32,7 +33,6 @@
# SUCH DAMAGE.
#
# from: @(#)groups.sh 8.1 (Berkeley) 6/6/93
-# $Id: groups.sh,v 1.1 1995/10/18 08:45:24 deraadt Exp $
#
id -Gn $*
diff --git a/usr.bin/id/id.1 b/usr.bin/id/id.1
index da106d56358..f6bea220e9f 100644
--- a/usr.bin/id/id.1
+++ b/usr.bin/id/id.1
@@ -1,3 +1,4 @@
+.\" $OpenBSD: id.1,v 1.2 1996/06/26 05:34:24 deraadt Exp $
.\" $NetBSD: id.1,v 1.5 1995/09/28 08:05:40 perry Exp $
.\"
.\" Copyright (c) 1991, 1993, 1994
diff --git a/usr.bin/id/id.c b/usr.bin/id/id.c
index 93b73b6c81e..4696ef799c7 100644
--- a/usr.bin/id/id.c
+++ b/usr.bin/id/id.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: id.c,v 1.2 1996/06/26 05:34:24 deraadt Exp $ */
+
/*-
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
@@ -39,7 +41,7 @@ static char copyright[] =
#ifndef lint
/*static char sccsid[] = "@(#)id.c 8.3 (Berkeley) 4/28/95";*/
-static char rcsid[] = "$NetBSD: id.c,v 1.7 1995/09/28 08:05:42 perry Exp $";
+static char rcsid[] = "$OpenBSD: id.c,v 1.2 1996/06/26 05:34:24 deraadt Exp $";
#endif /* not lint */
#include <sys/param.h>
diff --git a/usr.bin/id/whoami.1 b/usr.bin/id/whoami.1
index 7508ca5907a..502571eed52 100644
--- a/usr.bin/id/whoami.1
+++ b/usr.bin/id/whoami.1
@@ -1,3 +1,4 @@
+.\" $OpenBSD: whoami.1,v 1.2 1996/06/26 05:34:25 deraadt Exp $
.\" Copyright (c) 1991, 1993
.\" The Regents of the University of California. All rights reserved.
.\"
@@ -30,7 +31,6 @@
.\" SUCH DAMAGE.
.\"
.\" from: @(#)whoami.1 8.1 (Berkeley) 6/6/93
-.\" $Id: whoami.1,v 1.1 1995/10/18 08:45:24 deraadt Exp $
.\"
.Dd "June 6, 1993"
.Dt WHOAMI 1
diff --git a/usr.bin/id/whoami.sh b/usr.bin/id/whoami.sh
index 7f62f20f788..2eba21caac1 100644
--- a/usr.bin/id/whoami.sh
+++ b/usr.bin/id/whoami.sh
@@ -1,4 +1,5 @@
#!/bin/sh -
+# $OpenBSD: whoami.sh,v 1.2 1996/06/26 05:34:26 deraadt Exp $
#
# Copyright (c) 1991, 1993
# The Regents of the University of California. All rights reserved.
@@ -32,7 +33,6 @@
# SUCH DAMAGE.
#
# from: @(#)whoami.sh 8.1 (Berkeley) 6/6/93
-# $Id: whoami.sh,v 1.1 1995/10/18 08:45:24 deraadt Exp $
#
id -un
diff --git a/usr.bin/indent/Makefile b/usr.bin/indent/Makefile
index a8d24d7117a..08952c27893 100644
--- a/usr.bin/indent/Makefile
+++ b/usr.bin/indent/Makefile
@@ -1,5 +1,4 @@
-# from: @(#)Makefile 5.11 (Berkeley) 5/11/90
-# $Id: Makefile,v 1.1 1995/10/18 08:45:24 deraadt Exp $
+# $OpenBSD: Makefile,v 1.2 1996/06/26 05:34:27 deraadt Exp $
PROG= indent
SRCS= indent.c io.c lexi.c parse.c pr_comment.c args.c
diff --git a/usr.bin/indent/args.c b/usr.bin/indent/args.c
index abb0f7d10d8..b3fd08efe6c 100644
--- a/usr.bin/indent/args.c
+++ b/usr.bin/indent/args.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: args.c,v 1.2 1996/06/26 05:34:27 deraadt Exp $ */
+
/*
* Copyright (c) 1985 Sun Microsystems, Inc.
* Copyright (c) 1980 The Regents of the University of California.
@@ -35,7 +37,7 @@
#ifndef lint
/*static char sccsid[] = "from: @(#)args.c 5.10 (Berkeley) 2/26/91";*/
-static char rcsid[] = "$Id: args.c,v 1.1 1995/10/18 08:45:24 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: args.c,v 1.2 1996/06/26 05:34:27 deraadt Exp $";
#endif /* not lint */
/*
diff --git a/usr.bin/indent/indent.1 b/usr.bin/indent/indent.1
index 7a6be28e83c..1614206c9c8 100644
--- a/usr.bin/indent/indent.1
+++ b/usr.bin/indent/indent.1
@@ -1,3 +1,4 @@
+.\" $OpenBSD: indent.1,v 1.2 1996/06/26 05:34:28 deraadt Exp $
.\" Copyright (c) 1980, 1990 The Regents of the University of California.
.\" Copyright (c) 1985 Sun Microsystems, Inc.
.\" Copyright (c) 1976 Board of Trustees of the University of Illinois.
@@ -32,7 +33,6 @@
.\" SUCH DAMAGE.
.\"
.\" from: @(#)indent.1 6.11 (Berkeley) 7/24/91
-.\" $Id: indent.1,v 1.1 1995/10/18 08:45:24 deraadt Exp $
.\"
.Dd July 24, 1991
.Dt INDENT 1
diff --git a/usr.bin/indent/indent.c b/usr.bin/indent/indent.c
index c33398f0426..44fcf259b99 100644
--- a/usr.bin/indent/indent.c
+++ b/usr.bin/indent/indent.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: indent.c,v 1.3 1996/06/26 05:34:29 deraadt Exp $ */
+
/*
* Copyright (c) 1985 Sun Microsystems, Inc.
* Copyright (c) 1980 The Regents of the University of California.
@@ -43,7 +45,7 @@ char copyright[] =
#ifndef lint
/*static char sccsid[] = "from: @(#)indent.c 5.16 (Berkeley) 2/26/91";*/
-static char rcsid[] = "$Id: indent.c,v 1.2 1996/05/21 21:51:18 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: indent.c,v 1.3 1996/06/26 05:34:29 deraadt Exp $";
#endif /* not lint */
#include <sys/param.h>
diff --git a/usr.bin/indent/indent_codes.h b/usr.bin/indent/indent_codes.h
index 9c9df2a9c97..edc0c0f7363 100644
--- a/usr.bin/indent/indent_codes.h
+++ b/usr.bin/indent/indent_codes.h
@@ -1,3 +1,4 @@
+/* * $OpenBSD: indent_codes.h,v 1.2 1996/06/26 05:34:29 deraadt Exp $*/
/*
* Copyright (c) 1985 Sun Microsystems, Inc.
* Copyright (c) 1980 The Regents of the University of California.
@@ -33,7 +34,6 @@
* SUCH DAMAGE.
*
* from: @(#)indent_codes.h 5.7 (Berkeley) 6/1/90
- * $Id: indent_codes.h,v 1.1 1995/10/18 08:45:25 deraadt Exp $
*/
#define newline 1
diff --git a/usr.bin/indent/indent_globs.h b/usr.bin/indent/indent_globs.h
index 990bf6fb00b..2f2b38f0410 100644
--- a/usr.bin/indent/indent_globs.h
+++ b/usr.bin/indent/indent_globs.h
@@ -1,3 +1,4 @@
+/* * $OpenBSD: indent_globs.h,v 1.2 1996/06/26 05:34:30 deraadt Exp $*/
/*
* Copyright (c) 1985 Sun Microsystems, Inc.
* Copyright (c) 1980 The Regents of the University of California.
@@ -33,7 +34,6 @@
* SUCH DAMAGE.
*
* from: @(#)indent_globs.h 5.11 (Berkeley) 2/26/91
- * $Id: indent_globs.h,v 1.1 1995/10/18 08:45:25 deraadt Exp $
*/
#define BACKSLASH '\\'
diff --git a/usr.bin/indent/io.c b/usr.bin/indent/io.c
index 3269e612c3a..829ec832220 100644
--- a/usr.bin/indent/io.c
+++ b/usr.bin/indent/io.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: io.c,v 1.2 1996/06/26 05:34:31 deraadt Exp $ */
+
/*
* Copyright (c) 1985 Sun Microsystems, Inc.
* Copyright (c) 1980 The Regents of the University of California.
@@ -35,7 +37,7 @@
#ifndef lint
/*static char sccsid[] = "from: @(#)io.c 5.15 (Berkeley) 2/26/91";*/
-static char rcsid[] = "$Id: io.c,v 1.1 1995/10/18 08:45:25 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: io.c,v 1.2 1996/06/26 05:34:31 deraadt Exp $";
#endif /* not lint */
#include <stdio.h>
diff --git a/usr.bin/indent/lexi.c b/usr.bin/indent/lexi.c
index ec24015190d..2b5b96e19bb 100644
--- a/usr.bin/indent/lexi.c
+++ b/usr.bin/indent/lexi.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: lexi.c,v 1.2 1996/06/26 05:34:31 deraadt Exp $ */
+
/*
* Copyright (c) 1985 Sun Microsystems, Inc.
* Copyright (c) 1980 The Regents of the University of California.
@@ -35,7 +37,7 @@
#ifndef lint
/*static char sccsid[] = "from: @(#)lexi.c 5.16 (Berkeley) 2/26/91";*/
-static char rcsid[] = "$Id: lexi.c,v 1.1 1995/10/18 08:45:25 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: lexi.c,v 1.2 1996/06/26 05:34:31 deraadt Exp $";
#endif /* not lint */
/*
diff --git a/usr.bin/indent/parse.c b/usr.bin/indent/parse.c
index e5b8453a92e..6ce19ea84c8 100644
--- a/usr.bin/indent/parse.c
+++ b/usr.bin/indent/parse.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: parse.c,v 1.2 1996/06/26 05:34:32 deraadt Exp $ */
+
/*
* Copyright (c) 1985 Sun Microsystems, Inc.
* Copyright (c) 1980 The Regents of the University of California.
@@ -35,7 +37,7 @@
#ifndef lint
/*static char sccsid[] = "from: @(#)parse.c 5.12 (Berkeley) 2/26/91";*/
-static char rcsid[] = "$Id: parse.c,v 1.1 1995/10/18 08:45:25 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: parse.c,v 1.2 1996/06/26 05:34:32 deraadt Exp $";
#endif /* not lint */
#include <stdio.h>
diff --git a/usr.bin/indent/pr_comment.c b/usr.bin/indent/pr_comment.c
index 51d5e6ac3f8..dd17868a243 100644
--- a/usr.bin/indent/pr_comment.c
+++ b/usr.bin/indent/pr_comment.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: pr_comment.c,v 1.2 1996/06/26 05:34:33 deraadt Exp $ */
+
/*
* Copyright (c) 1985 Sun Microsystems, Inc.
* Copyright (c) 1980 The Regents of the University of California.
@@ -35,7 +37,7 @@
#ifndef lint
/*static char sccsid[] = "from: @(#)pr_comment.c 5.12 (Berkeley) 2/26/91";*/
-static char rcsid[] = "$Id: pr_comment.c,v 1.1 1995/10/18 08:45:25 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: pr_comment.c,v 1.2 1996/06/26 05:34:33 deraadt Exp $";
#endif /* not lint */
#include <stdio.h>
diff --git a/usr.bin/ipcrm/Makefile b/usr.bin/ipcrm/Makefile
index 6526e422208..363878befb6 100644
--- a/usr.bin/ipcrm/Makefile
+++ b/usr.bin/ipcrm/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.1 1995/10/18 08:45:25 deraadt Exp $
+# $OpenBSD: Makefile,v 1.2 1996/06/26 05:34:34 deraadt Exp $
PROG= ipcrm
diff --git a/usr.bin/ipcrm/ipcrm.1 b/usr.bin/ipcrm/ipcrm.1
index 02d42a3fe83..50192195d2e 100644
--- a/usr.bin/ipcrm/ipcrm.1
+++ b/usr.bin/ipcrm/ipcrm.1
@@ -1,3 +1,4 @@
+.\" $OpenBSD: ipcrm.1,v 1.2 1996/06/26 05:34:34 deraadt Exp $
.\" Copyright (c) 1994 Adam Glass
.\" All rights reserved.
.\"
@@ -21,7 +22,6 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $Id: ipcrm.1,v 1.1 1995/10/18 08:45:25 deraadt Exp $
.\""
.Dd August 8th, 1994
.Dt ipcrm 1
diff --git a/usr.bin/ipcrm/ipcrm.c b/usr.bin/ipcrm/ipcrm.c
index 4644dc530f5..80662e7d3b3 100644
--- a/usr.bin/ipcrm/ipcrm.c
+++ b/usr.bin/ipcrm/ipcrm.c
@@ -1,3 +1,4 @@
+/* * $OpenBSD: ipcrm.c,v 1.2 1996/06/26 05:34:35 deraadt Exp $*/
/*
* Copyright (c) 1994 Adam Glass
* All rights reserved.
@@ -28,7 +29,6 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: ipcrm.c,v 1.1 1995/10/18 08:45:25 deraadt Exp $
*/
#include <stdio.h>
diff --git a/usr.bin/ipcs/Makefile b/usr.bin/ipcs/Makefile
index a52afb39860..779b3408ace 100644
--- a/usr.bin/ipcs/Makefile
+++ b/usr.bin/ipcs/Makefile
@@ -1,3 +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 $
PROG= ipcs
diff --git a/usr.bin/ipcs/ipcs.1 b/usr.bin/ipcs/ipcs.1
index 2d7e8a2cc69..6f092aabf3d 100644
--- a/usr.bin/ipcs/ipcs.1
+++ b/usr.bin/ipcs/ipcs.1
@@ -1,3 +1,4 @@
+.\" $OpenBSD: ipcs.1,v 1.2 1996/06/26 05:34:36 deraadt Exp $
.\" $NetBSD: ipcs.1,v 1.4 1995/04/15 02:31:16 cgd Exp $
.\"
.\" Copyright (c) 1994 SigmaSoft, Th. Lockert
diff --git a/usr.bin/ipcs/ipcs.c b/usr.bin/ipcs/ipcs.c
index f1f484c2d82..3a4ac475e65 100644
--- a/usr.bin/ipcs/ipcs.c
+++ b/usr.bin/ipcs/ipcs.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: ipcs.c,v 1.4 1996/06/26 05:34:37 deraadt Exp $ */
/* $NetBSD: ipcs.c,v 1.10.6.1 1996/06/07 01:53:47 thorpej Exp $ */
/*
diff --git a/usr.bin/join/Makefile b/usr.bin/join/Makefile
index 6732593e4b5..0b741bd08c0 100644
--- a/usr.bin/join/Makefile
+++ b/usr.bin/join/Makefile
@@ -1,5 +1,4 @@
-# from: @(#)Makefile 5.2 (Berkeley) 5/11/90
-# $Id: Makefile,v 1.1 1995/10/18 08:45:26 deraadt Exp $
+# $OpenBSD: Makefile,v 1.2 1996/06/26 05:34:38 deraadt Exp $
PROG= join
diff --git a/usr.bin/join/join.1 b/usr.bin/join/join.1
index 22b59f4e738..52ab0b03096 100644
--- a/usr.bin/join/join.1
+++ b/usr.bin/join/join.1
@@ -1,3 +1,4 @@
+.\" $OpenBSD: join.1,v 1.2 1996/06/26 05:34:39 deraadt Exp $
.\" Copyright (c) 1990 The Regents of the University of California.
.\" All rights reserved.
.\"
@@ -33,7 +34,6 @@
.\" SUCH DAMAGE.
.\"
.\" from: @(#)join.1 6.8 (Berkeley) 11/18/91
-.\" $Id: join.1,v 1.1 1995/10/18 08:45:26 deraadt Exp $
.\"
.Dd November 18, 1991
.Dt JOIN 1
diff --git a/usr.bin/join/join.c b/usr.bin/join/join.c
index 01fe89580c6..6d1297f3da8 100644
--- a/usr.bin/join/join.c
+++ b/usr.bin/join/join.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: join.c,v 1.3 1996/06/26 05:34:39 deraadt Exp $ */
+
/*-
* Copyright (c) 1991 The Regents of the University of California.
* All rights reserved.
@@ -43,7 +45,7 @@ char copyright[] =
#ifndef lint
/*static char sccsid[] = "from: @(#)join.c 5.1 (Berkeley) 11/18/91";*/
-static char rcsid[] = "$Id: join.c,v 1.2 1995/12/22 19:02:55 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: join.c,v 1.3 1996/06/26 05:34:39 deraadt Exp $";
#endif /* not lint */
#include <sys/types.h>
diff --git a/usr.bin/jot/Makefile b/usr.bin/jot/Makefile
index 8fef9215389..11ace4a77ea 100644
--- a/usr.bin/jot/Makefile
+++ b/usr.bin/jot/Makefile
@@ -1,5 +1,5 @@
+# $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 $
-# @(#)Makefile 8.1 (Berkeley) 6/6/93
PROG= jot
diff --git a/usr.bin/jot/jot.1 b/usr.bin/jot/jot.1
index 2544fa3003d..4b992bac0cf 100644
--- a/usr.bin/jot/jot.1
+++ b/usr.bin/jot/jot.1
@@ -1,3 +1,4 @@
+.\" $OpenBSD: jot.1,v 1.2 1996/06/26 05:34:41 deraadt Exp $
.\" $NetBSD: jot.1,v 1.2 1994/11/14 20:27:36 jtc Exp $
.\"
.\" Copyright (c) 1993
diff --git a/usr.bin/jot/jot.c b/usr.bin/jot/jot.c
index 42fc240b14c..525c5cd7181 100644
--- a/usr.bin/jot/jot.c
+++ b/usr.bin/jot/jot.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: jot.c,v 1.2 1996/06/26 05:34:41 deraadt Exp $ */
/* $NetBSD: jot.c,v 1.3 1994/12/02 20:29:43 pk Exp $ */
/*-
@@ -43,7 +44,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)jot.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$NetBSD: jot.c,v 1.3 1994/12/02 20:29:43 pk Exp $";
+static char rcsid[] = "$OpenBSD: jot.c,v 1.2 1996/06/26 05:34:41 deraadt Exp $";
#endif /* not lint */
/*
diff --git a/usr.bin/kdump/Makefile b/usr.bin/kdump/Makefile
index 4f3ea86ccbe..d299dcb09b8 100644
--- a/usr.bin/kdump/Makefile
+++ b/usr.bin/kdump/Makefile
@@ -1,5 +1,4 @@
-# from: @(#)Makefile 8.1 (Berkeley) 6/6/93
-# $Id: Makefile,v 1.1 1995/10/18 08:45:27 deraadt Exp $
+# $OpenBSD: Makefile,v 1.2 1996/06/26 05:34:42 deraadt Exp $
LDSTATIC=-static
PROG= kdump
diff --git a/usr.bin/kdump/kdump.1 b/usr.bin/kdump/kdump.1
index 11544fa6d76..7626eb7388a 100644
--- a/usr.bin/kdump/kdump.1
+++ b/usr.bin/kdump/kdump.1
@@ -1,3 +1,4 @@
+.\" $OpenBSD: kdump.1,v 1.2 1996/06/26 05:34:43 deraadt Exp $
.\" Copyright (c) 1990, 1993
.\" The Regents of the University of California. All rights reserved.
.\"
@@ -30,7 +31,6 @@
.\" SUCH DAMAGE.
.\"
.\" from: @(#)kdump.1 8.1 (Berkeley) 6/6/93
-.\" $Id: kdump.1,v 1.1 1995/10/18 08:45:27 deraadt Exp $
.\"
.Dd June 6, 1993
.Dt KDUMP 1
diff --git a/usr.bin/kdump/kdump.c b/usr.bin/kdump/kdump.c
index 9aa862cec26..fcab56840ed 100644
--- a/usr.bin/kdump/kdump.c
+++ b/usr.bin/kdump/kdump.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: kdump.c,v 1.4 1996/06/26 05:34:43 deraadt Exp $ */
+
/*-
* Copyright (c) 1988, 1993
* The Regents of the University of California. All rights reserved.
@@ -41,7 +43,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)kdump.c 8.4 (Berkeley) 4/28/95";
#endif
-static char *rcsid = "$NetBSD: kdump.c,v 1.13 1996/05/13 21:12:25 christos Exp $";
+static char *rcsid = "$OpenBSD: kdump.c,v 1.4 1996/06/26 05:34:43 deraadt Exp $";
#endif /* not lint */
#include <sys/param.h>
diff --git a/usr.bin/kdump/mkioctls b/usr.bin/kdump/mkioctls
index 74b12f40191..44fb0330510 100644
--- a/usr.bin/kdump/mkioctls
+++ b/usr.bin/kdump/mkioctls
@@ -1,4 +1,6 @@
#!/bin/sh -
+# $OpenBSD: mkioctls,v 1.2 1996/06/26 05:34:44 deraadt Exp $
+
#
# Copyright (c) 1994
# The Regents of the University of California. All rights reserved.
diff --git a/usr.bin/ktrace/Makefile b/usr.bin/ktrace/Makefile
index 8500316a0f4..1c6d0c23f54 100644
--- a/usr.bin/ktrace/Makefile
+++ b/usr.bin/ktrace/Makefile
@@ -1,5 +1,4 @@
-# from: @(#)Makefile 8.1 (Berkeley) 6/6/93
-# $Id: Makefile,v 1.1 1995/10/18 08:45:27 deraadt Exp $
+# $OpenBSD: Makefile,v 1.2 1996/06/26 05:34:45 deraadt Exp $
LDSTATIC=-static
PROG= ktrace
diff --git a/usr.bin/ktrace/ktrace.1 b/usr.bin/ktrace/ktrace.1
index d0257c28382..a004be7bfa1 100644
--- a/usr.bin/ktrace/ktrace.1
+++ b/usr.bin/ktrace/ktrace.1
@@ -1,3 +1,4 @@
+.\" $OpenBSD: ktrace.1,v 1.2 1996/06/26 05:34:46 deraadt Exp $
.\" Copyright (c) 1990, 1993
.\" The Regents of the University of California. All rights reserved.
.\"
@@ -30,7 +31,6 @@
.\" SUCH DAMAGE.
.\"
.\" from: @(#)ktrace.1 8.1 (Berkeley) 6/6/93
-.\" $Id: ktrace.1,v 1.1 1995/10/18 08:45:27 deraadt Exp $
.\"
.Dd June 6, 1993
.Dt KTRACE 1
diff --git a/usr.bin/ktrace/ktrace.c b/usr.bin/ktrace/ktrace.c
index f0de4fbe216..6ed793f4e58 100644
--- a/usr.bin/ktrace/ktrace.c
+++ b/usr.bin/ktrace/ktrace.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: ktrace.c,v 1.2 1996/06/26 05:34:46 deraadt Exp $ */
/* $NetBSD: ktrace.c,v 1.4 1995/08/31 23:01:44 jtc Exp $ */
/*-
@@ -43,7 +44,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)ktrace.c 8.2 (Berkeley) 4/28/95";
#endif
-static char *rcsid = "$NetBSD: ktrace.c,v 1.4 1995/08/31 23:01:44 jtc Exp $";
+static char *rcsid = "$OpenBSD: ktrace.c,v 1.2 1996/06/26 05:34:46 deraadt Exp $";
#endif /* not lint */
#include <sys/param.h>
diff --git a/usr.bin/ktrace/ktrace.h b/usr.bin/ktrace/ktrace.h
index a5fb9e3afa4..417dd3972f2 100644
--- a/usr.bin/ktrace/ktrace.h
+++ b/usr.bin/ktrace/ktrace.h
@@ -1,3 +1,4 @@
+/* * $OpenBSD: ktrace.h,v 1.2 1996/06/26 05:34:47 deraadt Exp $*/
/*-
* Copyright (c) 1988, 1993
* The Regents of the University of California. All rights reserved.
@@ -31,7 +32,6 @@
* SUCH DAMAGE.
*
* from: @(#)ktrace.h 8.1 (Berkeley) 6/6/93
- * $Id: ktrace.h,v 1.1 1995/10/18 08:45:27 deraadt Exp $
*/
#define DEF_POINTS (KTRFAC_SYSCALL | KTRFAC_SYSRET | KTRFAC_NAMEI | \
diff --git a/usr.bin/ktrace/subr.c b/usr.bin/ktrace/subr.c
index 5f0ded7d7da..6351577b5b0 100644
--- a/usr.bin/ktrace/subr.c
+++ b/usr.bin/ktrace/subr.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: subr.c,v 1.2 1996/06/26 05:34:47 deraadt Exp $ */
/* $NetBSD: subr.c,v 1.6 1995/08/31 23:01:45 jtc Exp $ */
/*-
@@ -37,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)subr.c 8.2 (Berkeley) 4/28/95";
#endif
-static char *rcsid = "$NetBSD: subr.c,v 1.6 1995/08/31 23:01:45 jtc Exp $";
+static char *rcsid = "$OpenBSD: subr.c,v 1.2 1996/06/26 05:34:47 deraadt Exp $";
#endif /* not lint */
#include <sys/param.h>
diff --git a/usr.bin/lam/Makefile b/usr.bin/lam/Makefile
index 7de33c17ac7..c0e44139b2d 100644
--- a/usr.bin/lam/Makefile
+++ b/usr.bin/lam/Makefile
@@ -1,5 +1,5 @@
+# $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 $
-# @(#)Makefile 8.1 (Berkeley) 6/6/93
PROG= lam
diff --git a/usr.bin/lam/lam.1 b/usr.bin/lam/lam.1
index ddcb263cffc..296b167c773 100644
--- a/usr.bin/lam/lam.1
+++ b/usr.bin/lam/lam.1
@@ -1,3 +1,4 @@
+.\" $OpenBSD: lam.1,v 1.2 1996/06/26 05:34:49 deraadt Exp $
.\" $NetBSD: lam.1,v 1.2 1994/11/14 20:27:40 jtc Exp $
.\"
.\" Copyright (c) 1993
diff --git a/usr.bin/lam/lam.c b/usr.bin/lam/lam.c
index f2024293d4c..3337e485668 100644
--- a/usr.bin/lam/lam.c
+++ b/usr.bin/lam/lam.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: lam.c,v 1.2 1996/06/26 05:34:49 deraadt Exp $ */
/* $NetBSD: lam.c,v 1.2 1994/11/14 20:27:42 jtc Exp $ */
/*-
@@ -43,7 +44,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)lam.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$NetBSD: lam.c,v 1.2 1994/11/14 20:27:42 jtc Exp $";
+static char rcsid[] = "$OpenBSD: lam.c,v 1.2 1996/06/26 05:34:49 deraadt Exp $";
#endif /* not lint */
/*
diff --git a/usr.bin/last/Makefile b/usr.bin/last/Makefile
index 4268e2549d3..b5d05da24d4 100644
--- a/usr.bin/last/Makefile
+++ b/usr.bin/last/Makefile
@@ -1,5 +1,5 @@
+# $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 $
-# @(#)Makefile 8.1 (Berkeley) 6/6/93
PROG= last
diff --git a/usr.bin/last/last.1 b/usr.bin/last/last.1
index 5cbfd92cd07..eff134f1885 100644
--- a/usr.bin/last/last.1
+++ b/usr.bin/last/last.1
@@ -1,3 +1,4 @@
+.\" $OpenBSD: last.1,v 1.2 1996/06/26 05:34:51 deraadt Exp $
.\" $NetBSD: last.1,v 1.3 1994/12/21 22:41:23 jtc Exp $
.\"
.\" Copyright (c) 1980, 1990, 1993
diff --git a/usr.bin/last/last.c b/usr.bin/last/last.c
index e517323d673..db527951a49 100644
--- a/usr.bin/last/last.c
+++ b/usr.bin/last/last.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: last.c,v 1.2 1996/06/26 05:34:51 deraadt Exp $ */
/* $NetBSD: last.c,v 1.6 1994/12/24 16:49:02 cgd Exp $ */
/*
@@ -43,7 +44,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)last.c 8.2 (Berkeley) 4/2/94";
#endif
-static char rcsid[] = "$NetBSD: last.c,v 1.6 1994/12/24 16:49:02 cgd Exp $";
+static char rcsid[] = "$OpenBSD: last.c,v 1.2 1996/06/26 05:34:51 deraadt Exp $";
#endif /* not lint */
#include <sys/param.h>
diff --git a/usr.bin/lastcomm/Makefile b/usr.bin/lastcomm/Makefile
index 1d6120284b8..1431f37010a 100644
--- a/usr.bin/lastcomm/Makefile
+++ b/usr.bin/lastcomm/Makefile
@@ -1,5 +1,5 @@
+# $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 $
-# @(#)Makefile 8.1 (Berkeley) 6/6/93
PROG= lastcomm
DPADD= ${LIBMATH}
diff --git a/usr.bin/lastcomm/lastcomm.1 b/usr.bin/lastcomm/lastcomm.1
index f4e72077952..de54523303d 100644
--- a/usr.bin/lastcomm/lastcomm.1
+++ b/usr.bin/lastcomm/lastcomm.1
@@ -1,3 +1,4 @@
+.\" $OpenBSD: lastcomm.1,v 1.4 1996/06/26 05:34:53 deraadt Exp $
.\" $NetBSD: lastcomm.1,v 1.5 1995/10/22 01:43:41 ghudson Exp $
.\"
.\" Copyright (c) 1980, 1990, 1993
diff --git a/usr.bin/lastcomm/lastcomm.c b/usr.bin/lastcomm/lastcomm.c
index 5069d0618a2..f002369fdc9 100644
--- a/usr.bin/lastcomm/lastcomm.c
+++ b/usr.bin/lastcomm/lastcomm.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: lastcomm.c,v 1.3 1996/06/26 05:34:54 deraadt Exp $ */
/* $NetBSD: lastcomm.c,v 1.9 1995/10/22 01:43:42 ghudson Exp $ */
/*
@@ -43,7 +44,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)lastcomm.c 8.2 (Berkeley) 4/29/95";
#endif
-static char rcsid[] = "$NetBSD: lastcomm.c,v 1.9 1995/10/22 01:43:42 ghudson Exp $";
+static char rcsid[] = "$OpenBSD: lastcomm.c,v 1.3 1996/06/26 05:34:54 deraadt Exp $";
#endif /* not lint */
#include <sys/param.h>
diff --git a/usr.bin/lastcomm/pathnames.h b/usr.bin/lastcomm/pathnames.h
index 963d27942a7..33caa9c9750 100644
--- a/usr.bin/lastcomm/pathnames.h
+++ b/usr.bin/lastcomm/pathnames.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: pathnames.h,v 1.2 1996/06/26 05:34:54 deraadt Exp $ */
/* $NetBSD: pathnames.h,v 1.3 1994/12/22 01:07:05 jtc Exp $ */
/*
diff --git a/usr.bin/leave/Makefile b/usr.bin/leave/Makefile
index 599595f5ac3..f8ac54de4d2 100644
--- a/usr.bin/leave/Makefile
+++ b/usr.bin/leave/Makefile
@@ -1,5 +1,5 @@
+# $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 $
-# @(#)Makefile 8.1 (Berkeley) 6/6/93
PROG= leave
diff --git a/usr.bin/leave/leave.1 b/usr.bin/leave/leave.1
index 4b014b1b518..8c72c581803 100644
--- a/usr.bin/leave/leave.1
+++ b/usr.bin/leave/leave.1
@@ -1,3 +1,4 @@
+.\" $OpenBSD: leave.1,v 1.2 1996/06/26 05:34:56 deraadt Exp $
.\" $NetBSD: leave.1,v 1.5 1995/08/31 22:32:10 jtc Exp $
.\"
.\" Copyright (c) 1980, 1990, 1993
diff --git a/usr.bin/leave/leave.c b/usr.bin/leave/leave.c
index cbb065414c6..082ff2c8785 100644
--- a/usr.bin/leave/leave.c
+++ b/usr.bin/leave/leave.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: leave.c,v 1.2 1996/06/26 05:34:57 deraadt Exp $ */
/* $NetBSD: leave.c,v 1.4 1995/07/03 16:50:13 phil Exp $ */
/*
@@ -43,7 +44,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)leave.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$NetBSD: leave.c,v 1.4 1995/07/03 16:50:13 phil Exp $";
+static char rcsid[] = "$OpenBSD: leave.c,v 1.2 1996/06/26 05:34:57 deraadt Exp $";
#endif /* not lint */
#include <sys/param.h>
diff --git a/usr.bin/lex/FlexLexer.h b/usr.bin/lex/FlexLexer.h
index dffe15bacac..a47a45ab55c 100644
--- a/usr.bin/lex/FlexLexer.h
+++ b/usr.bin/lex/FlexLexer.h
@@ -1,4 +1,6 @@
-// $Header: /cvs/OpenBSD/src/usr.bin/lex/FlexLexer.h,v 1.1 1995/10/18 08:45:29 deraadt Exp $
+/* $OpenBSD: FlexLexer.h,v 1.2 1996/06/26 05:35:27 deraadt Exp $ */
+
+// $Header: /cvs/OpenBSD/src/usr.bin/lex/FlexLexer.h,v 1.2 1996/06/26 05:35:27 deraadt Exp $
// FlexLexer.h -- define interfaces for lexical analyzer classes generated
// by flex
diff --git a/usr.bin/lex/Makefile b/usr.bin/lex/Makefile
index 6a33b39d544..a71748b9785 100644
--- a/usr.bin/lex/Makefile
+++ b/usr.bin/lex/Makefile
@@ -1,5 +1,4 @@
-# from: @(#)Makefile 5.4 (Berkeley) 6/24/90
-# $Id: Makefile,v 1.1 1995/10/18 08:45:29 deraadt Exp $
+# $OpenBSD: Makefile,v 1.2 1996/06/26 05:35:27 deraadt Exp $
#
# By default, flex will be configured to generate 8-bit scanners only if the
# -8 flag is given. If you want it to always generate 8-bit scanners, add
diff --git a/usr.bin/lex/ccl.c b/usr.bin/lex/ccl.c
index 1622abe6d46..222ee718c15 100644
--- a/usr.bin/lex/ccl.c
+++ b/usr.bin/lex/ccl.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: ccl.c,v 1.2 1996/06/26 05:35:28 deraadt Exp $ */
+
/* ccl - routines for character classes */
/*-
@@ -26,7 +28,7 @@
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
-/* $Header: /cvs/OpenBSD/src/usr.bin/lex/ccl.c,v 1.1 1995/10/18 08:45:29 deraadt Exp $ */
+/* $Header: /cvs/OpenBSD/src/usr.bin/lex/ccl.c,v 1.2 1996/06/26 05:35:28 deraadt Exp $ */
#include "flexdef.h"
diff --git a/usr.bin/lex/config.h b/usr.bin/lex/config.h
index da27edddc62..d8c32e3c866 100644
--- a/usr.bin/lex/config.h
+++ b/usr.bin/lex/config.h
@@ -1,5 +1,7 @@
+/* $OpenBSD: config.h,v 1.2 1996/06/26 05:35:29 deraadt Exp $ */
+
/* config.h. Generated automatically by configure. */
-/* $Header: /cvs/OpenBSD/src/usr.bin/lex/config.h,v 1.1 1995/10/18 08:45:29 deraadt Exp $ */
+/* $Header: /cvs/OpenBSD/src/usr.bin/lex/config.h,v 1.2 1996/06/26 05:35:29 deraadt Exp $ */
/* Define to empty if the keyword does not work. */
/* #undef const */
diff --git a/usr.bin/lex/dfa.c b/usr.bin/lex/dfa.c
index 945edc7062c..898d20b6a63 100644
--- a/usr.bin/lex/dfa.c
+++ b/usr.bin/lex/dfa.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: dfa.c,v 1.2 1996/06/26 05:35:29 deraadt Exp $ */
+
/* dfa - DFA construction routines */
/*-
@@ -26,7 +28,7 @@
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
-/* $Header: /cvs/OpenBSD/src/usr.bin/lex/dfa.c,v 1.1 1995/10/18 08:45:29 deraadt Exp $ */
+/* $Header: /cvs/OpenBSD/src/usr.bin/lex/dfa.c,v 1.2 1996/06/26 05:35:29 deraadt Exp $ */
#include "flexdef.h"
diff --git a/usr.bin/lex/ecs.c b/usr.bin/lex/ecs.c
index 5379c6272b7..53fe8e8acec 100644
--- a/usr.bin/lex/ecs.c
+++ b/usr.bin/lex/ecs.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: ecs.c,v 1.2 1996/06/26 05:35:30 deraadt Exp $ */
+
/* ecs - equivalence class routines */
/*-
@@ -26,7 +28,7 @@
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
-/* $Header: /cvs/OpenBSD/src/usr.bin/lex/ecs.c,v 1.1 1995/10/18 08:45:29 deraadt Exp $ */
+/* $Header: /cvs/OpenBSD/src/usr.bin/lex/ecs.c,v 1.2 1996/06/26 05:35:30 deraadt Exp $ */
#include "flexdef.h"
diff --git a/usr.bin/lex/flex.1 b/usr.bin/lex/flex.1
index f79a3ef409e..958c4d1f570 100644
--- a/usr.bin/lex/flex.1
+++ b/usr.bin/lex/flex.1
@@ -1,3 +1,5 @@
+.\" $OpenBSD: flex.1,v 1.2 1996/06/26 05:35:31 deraadt Exp $
+.\"
.TH FLEX 1 "April 1995" "Version 2.5"
.SH NAME
flex \- fast lexical analyzer generator
diff --git a/usr.bin/lex/flex.skl b/usr.bin/lex/flex.skl
index 1ee8c7a1121..527c70df21b 100644
--- a/usr.bin/lex/flex.skl
+++ b/usr.bin/lex/flex.skl
@@ -1,7 +1,9 @@
+/* $OpenBSD: flex.skl,v 1.2 1996/06/26 05:35:32 deraadt Exp $ */
+
/* A lexical scanner generated by flex */
/* Scanner skeleton version:
- * $Header: /cvs/OpenBSD/src/usr.bin/lex/flex.skl,v 1.1 1995/10/18 08:45:30 deraadt Exp $
+ * $Header: /cvs/OpenBSD/src/usr.bin/lex/flex.skl,v 1.2 1996/06/26 05:35:32 deraadt Exp $
*/
#define FLEX_SCANNER
diff --git a/usr.bin/lex/flexdef.h b/usr.bin/lex/flexdef.h
index ab002d0139a..cfc5d584e48 100644
--- a/usr.bin/lex/flexdef.h
+++ b/usr.bin/lex/flexdef.h
@@ -1,3 +1,5 @@
+/* $OpenBSD: flexdef.h,v 1.2 1996/06/26 05:35:33 deraadt Exp $ */
+
/* flexdef - definitions file for flex */
/*-
@@ -26,7 +28,7 @@
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
-/* @(#) $Header: /cvs/OpenBSD/src/usr.bin/lex/flexdef.h,v 1.1 1995/10/18 08:45:30 deraadt Exp $ (LBL) */
+/* @(#) $Header: /cvs/OpenBSD/src/usr.bin/lex/flexdef.h,v 1.2 1996/06/26 05:35:33 deraadt Exp $ (LBL) */
#include <stdio.h>
#include <ctype.h>
diff --git a/usr.bin/lex/gen.c b/usr.bin/lex/gen.c
index 1813027ee2c..9d4aa8870c4 100644
--- a/usr.bin/lex/gen.c
+++ b/usr.bin/lex/gen.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: gen.c,v 1.2 1996/06/26 05:35:34 deraadt Exp $ */
+
/* gen - actual generation (writing) of flex scanners */
/*-
@@ -26,7 +28,7 @@
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
-/* $Header: /cvs/OpenBSD/src/usr.bin/lex/gen.c,v 1.1 1995/10/18 08:45:30 deraadt Exp $ */
+/* $Header: /cvs/OpenBSD/src/usr.bin/lex/gen.c,v 1.2 1996/06/26 05:35:34 deraadt Exp $ */
#include "flexdef.h"
diff --git a/usr.bin/lex/initscan.c b/usr.bin/lex/initscan.c
index 9dc39aec367..80ed3f1684c 100644
--- a/usr.bin/lex/initscan.c
+++ b/usr.bin/lex/initscan.c
@@ -1,8 +1,10 @@
+/* $OpenBSD: initscan.c,v 1.2 1996/06/26 05:35:36 deraadt Exp $ */
+
#line 2 "scan.c"
/* A lexical scanner generated by flex */
/* Scanner skeleton version:
- * $Header: /cvs/OpenBSD/src/usr.bin/lex/initscan.c,v 1.1 1995/10/18 08:45:30 deraadt Exp $
+ * $Header: /cvs/OpenBSD/src/usr.bin/lex/initscan.c,v 1.2 1996/06/26 05:35:36 deraadt Exp $
*/
#define FLEX_SCANNER
@@ -1268,7 +1270,7 @@ char *yytext;
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
-/* $Header: /cvs/OpenBSD/src/usr.bin/lex/initscan.c,v 1.1 1995/10/18 08:45:30 deraadt Exp $ */
+/* $Header: /cvs/OpenBSD/src/usr.bin/lex/initscan.c,v 1.2 1996/06/26 05:35:36 deraadt Exp $ */
#include "flexdef.h"
#include "parse.h"
diff --git a/usr.bin/lex/libmain.c b/usr.bin/lex/libmain.c
index eae814a1036..8d58cb686a6 100644
--- a/usr.bin/lex/libmain.c
+++ b/usr.bin/lex/libmain.c
@@ -1,6 +1,8 @@
+/* $OpenBSD: libmain.c,v 1.2 1996/06/26 05:35:36 deraadt Exp $ */
+
/* libmain - flex run-time support library "main" function */
-/* $Header: /cvs/OpenBSD/src/usr.bin/lex/libmain.c,v 1.1 1995/10/18 08:45:31 deraadt Exp $ */
+/* $Header: /cvs/OpenBSD/src/usr.bin/lex/libmain.c,v 1.2 1996/06/26 05:35:36 deraadt Exp $ */
#include <sys/cdefs.h>
diff --git a/usr.bin/lex/libyywrap.c b/usr.bin/lex/libyywrap.c
index b5e1a15464b..c8bfed85d95 100644
--- a/usr.bin/lex/libyywrap.c
+++ b/usr.bin/lex/libyywrap.c
@@ -1,6 +1,8 @@
+/* $OpenBSD: libyywrap.c,v 1.2 1996/06/26 05:35:37 deraadt Exp $ */
+
/* libyywrap - flex run-time support library "yywrap" function */
-/* $Header: /cvs/OpenBSD/src/usr.bin/lex/libyywrap.c,v 1.1 1995/10/18 08:45:31 deraadt Exp $ */
+/* $Header: /cvs/OpenBSD/src/usr.bin/lex/libyywrap.c,v 1.2 1996/06/26 05:35:37 deraadt Exp $ */
#include <sys/cdefs.h>
diff --git a/usr.bin/lex/main.c b/usr.bin/lex/main.c
index 02635e641cf..fc242a4af77 100644
--- a/usr.bin/lex/main.c
+++ b/usr.bin/lex/main.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: main.c,v 1.2 1996/06/26 05:35:38 deraadt Exp $ */
+
/* flex - tool to generate fast lexical analyzers */
/*-
@@ -32,7 +34,7 @@ char copyright[] =
All rights reserved.\n";
#endif /* not lint */
-/* $Header: /cvs/OpenBSD/src/usr.bin/lex/main.c,v 1.1 1995/10/18 08:45:31 deraadt Exp $ */
+/* $Header: /cvs/OpenBSD/src/usr.bin/lex/main.c,v 1.2 1996/06/26 05:35:38 deraadt Exp $ */
#include "flexdef.h"
diff --git a/usr.bin/lex/misc.c b/usr.bin/lex/misc.c
index fe154349eee..6ba0d0bf805 100644
--- a/usr.bin/lex/misc.c
+++ b/usr.bin/lex/misc.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: misc.c,v 1.2 1996/06/26 05:35:38 deraadt Exp $ */
+
/* misc - miscellaneous flex routines */
/*-
@@ -26,7 +28,7 @@
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
-/* $Header: /cvs/OpenBSD/src/usr.bin/lex/misc.c,v 1.1 1995/10/18 08:45:31 deraadt Exp $ */
+/* $Header: /cvs/OpenBSD/src/usr.bin/lex/misc.c,v 1.2 1996/06/26 05:35:38 deraadt Exp $ */
#include "flexdef.h"
diff --git a/usr.bin/lex/mkskel.sh b/usr.bin/lex/mkskel.sh
index a03a11aba06..59f1a53808a 100644
--- a/usr.bin/lex/mkskel.sh
+++ b/usr.bin/lex/mkskel.sh
@@ -1,4 +1,6 @@
#! /bin/sh
+# $OpenBSD: mkskel.sh,v 1.2 1996/06/26 05:35:39 deraadt Exp $
+
cat <<!
/* File created from flex.skl via mkskel.sh */
diff --git a/usr.bin/lex/nfa.c b/usr.bin/lex/nfa.c
index 3a205ba26d9..8e1c79383a3 100644
--- a/usr.bin/lex/nfa.c
+++ b/usr.bin/lex/nfa.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: nfa.c,v 1.2 1996/06/26 05:35:40 deraadt Exp $ */
+
/* nfa - NFA construction routines */
/*-
@@ -26,7 +28,7 @@
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
-/* $Header: /cvs/OpenBSD/src/usr.bin/lex/nfa.c,v 1.1 1995/10/18 08:45:31 deraadt Exp $ */
+/* $Header: /cvs/OpenBSD/src/usr.bin/lex/nfa.c,v 1.2 1996/06/26 05:35:40 deraadt Exp $ */
#include "flexdef.h"
diff --git a/usr.bin/lex/parse.y b/usr.bin/lex/parse.y
index 04e8d806d9d..3321b97830d 100644
--- a/usr.bin/lex/parse.y
+++ b/usr.bin/lex/parse.y
@@ -1,3 +1,5 @@
+/* $OpenBSD: parse.y,v 1.2 1996/06/26 05:35:40 deraadt Exp $ */
+
/* parse.y - parser for flex input */
%token CHAR NUMBER SECTEND SCDECL XSCDECL NAME PREVCCL EOF_OP
@@ -33,7 +35,7 @@
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
-/* $Header: /cvs/OpenBSD/src/usr.bin/lex/parse.y,v 1.1 1995/10/18 08:45:31 deraadt Exp $ */
+/* $Header: /cvs/OpenBSD/src/usr.bin/lex/parse.y,v 1.2 1996/06/26 05:35:40 deraadt Exp $ */
/* Some versions of bison are broken in that they use alloca() but don't
diff --git a/usr.bin/lex/pathnames.h b/usr.bin/lex/pathnames.h
index 659a8108abb..4be35cb08c5 100644
--- a/usr.bin/lex/pathnames.h
+++ b/usr.bin/lex/pathnames.h
@@ -1,3 +1,5 @@
+/* $OpenBSD: pathnames.h,v 1.2 1996/06/26 05:35:41 deraadt Exp $ */
+
/*-
* Copyright (c) 1990 The Regents of the University of California.
* All rights reserved.
diff --git a/usr.bin/lex/scan.l b/usr.bin/lex/scan.l
index 2aada16b478..e3bbd2fdbb3 100644
--- a/usr.bin/lex/scan.l
+++ b/usr.bin/lex/scan.l
@@ -1,3 +1,5 @@
+/* $OpenBSD: scan.l,v 1.2 1996/06/26 05:35:42 deraadt Exp $ */
+
/* scan.l - scanner for flex input */
%{
@@ -27,7 +29,7 @@
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
-/* $Header: /cvs/OpenBSD/src/usr.bin/lex/scan.l,v 1.1 1995/10/18 08:45:32 deraadt Exp $ */
+/* $Header: /cvs/OpenBSD/src/usr.bin/lex/scan.l,v 1.2 1996/06/26 05:35:42 deraadt Exp $ */
#include "flexdef.h"
#include "parse.h"
diff --git a/usr.bin/lex/sym.c b/usr.bin/lex/sym.c
index 7eea7dfa4dc..2cf7f1567ed 100644
--- a/usr.bin/lex/sym.c
+++ b/usr.bin/lex/sym.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: sym.c,v 1.2 1996/06/26 05:35:42 deraadt Exp $ */
+
/* sym - symbol table routines */
/*-
@@ -26,7 +28,7 @@
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
-/* $Header: /cvs/OpenBSD/src/usr.bin/lex/sym.c,v 1.1 1995/10/18 08:45:32 deraadt Exp $ */
+/* $Header: /cvs/OpenBSD/src/usr.bin/lex/sym.c,v 1.2 1996/06/26 05:35:42 deraadt Exp $ */
#include "flexdef.h"
diff --git a/usr.bin/lex/tblcmp.c b/usr.bin/lex/tblcmp.c
index a02527d0f47..1a9e18dd3ec 100644
--- a/usr.bin/lex/tblcmp.c
+++ b/usr.bin/lex/tblcmp.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: tblcmp.c,v 1.2 1996/06/26 05:35:43 deraadt Exp $ */
+
/* tblcmp - table compression routines */
/*-
@@ -26,7 +28,7 @@
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
-/* $Header: /cvs/OpenBSD/src/usr.bin/lex/tblcmp.c,v 1.1 1995/10/18 08:45:32 deraadt Exp $ */
+/* $Header: /cvs/OpenBSD/src/usr.bin/lex/tblcmp.c,v 1.2 1996/06/26 05:35:43 deraadt Exp $ */
#include "flexdef.h"
diff --git a/usr.bin/lex/version.h b/usr.bin/lex/version.h
index 7f709449257..89c2975e95a 100644
--- a/usr.bin/lex/version.h
+++ b/usr.bin/lex/version.h
@@ -1 +1,3 @@
+/* $OpenBSD: version.h,v 1.2 1996/06/26 05:35:44 deraadt Exp $ */
+
#define FLEX_VERSION "2.5.2"
diff --git a/usr.bin/lex/yylex.c b/usr.bin/lex/yylex.c
index fdef60c3a7f..1e6947e98c7 100644
--- a/usr.bin/lex/yylex.c
+++ b/usr.bin/lex/yylex.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: yylex.c,v 1.2 1996/06/26 05:35:44 deraadt Exp $ */
+
/* yylex - scanner front-end for flex */
/*-
@@ -26,7 +28,7 @@
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
-/* $Header: /cvs/OpenBSD/src/usr.bin/lex/yylex.c,v 1.1 1995/10/18 08:45:32 deraadt Exp $ */
+/* $Header: /cvs/OpenBSD/src/usr.bin/lex/yylex.c,v 1.2 1996/06/26 05:35:44 deraadt Exp $ */
#include <ctype.h>
#include "flexdef.h"
diff --git a/usr.bin/locate/Makefile b/usr.bin/locate/Makefile
index a03321c4437..3ac42aadb5d 100644
--- a/usr.bin/locate/Makefile
+++ b/usr.bin/locate/Makefile
@@ -1,5 +1,5 @@
+# $OpenBSD: Makefile,v 1.2 1996/06/26 05:35:47 deraadt Exp $
# $NetBSD: Makefile,v 1.3 1994/12/22 06:17:28 jtc Exp $
-# @(#)Makefile 8.1 (Berkeley) 6/6/93
SUBDIR= bigram code locate
diff --git a/usr.bin/locate/bigram/Makefile b/usr.bin/locate/bigram/Makefile
index 738a0fe938c..20ebbec614d 100644
--- a/usr.bin/locate/bigram/Makefile
+++ b/usr.bin/locate/bigram/Makefile
@@ -1,5 +1,5 @@
+# $OpenBSD: Makefile,v 1.2 1996/06/26 05:35:48 deraadt Exp $
# $NetBSD: Makefile,v 1.3 1994/12/22 06:17:39 jtc Exp $
-# @(#)Makefile 8.1 (Berkeley) 6/6/93
PROG= locate.bigram
NOMAN= noman
diff --git a/usr.bin/locate/bigram/locate.bigram.c b/usr.bin/locate/bigram/locate.bigram.c
index ea95c7bd77a..d8c0f0e0204 100644
--- a/usr.bin/locate/bigram/locate.bigram.c
+++ b/usr.bin/locate/bigram/locate.bigram.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: locate.bigram.c,v 1.2 1996/06/26 05:35:49 deraadt Exp $ */
/* $NetBSD: locate.bigram.c,v 1.5 1995/09/01 23:48:13 thorpej Exp $ */
/*
@@ -46,7 +47,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)locate.bigram.c 8.2 (Berkeley) 4/28/95";
#endif
-static char rcsid[] = "$NetBSD: locate.bigram.c,v 1.5 1995/09/01 23:48:13 thorpej Exp $";
+static char rcsid[] = "$OpenBSD: locate.bigram.c,v 1.2 1996/06/26 05:35:49 deraadt Exp $";
#endif /* not lint */
/*
diff --git a/usr.bin/locate/code/Makefile b/usr.bin/locate/code/Makefile
index 088d0bf7c60..eec7f4be81c 100644
--- a/usr.bin/locate/code/Makefile
+++ b/usr.bin/locate/code/Makefile
@@ -1,5 +1,5 @@
+# $OpenBSD: Makefile,v 1.2 1996/06/26 05:35:50 deraadt Exp $
# $NetBSD: Makefile,v 1.3 1994/12/22 06:17:41 jtc Exp $
-# @(#)Makefile 8.1 (Berkeley) 6/6/93
PROG= locate.code
CFLAGS+=-I${.CURDIR}/../locate
diff --git a/usr.bin/locate/code/locate.code.c b/usr.bin/locate/code/locate.code.c
index cbeeecd1bb0..8bdcce9a7e2 100644
--- a/usr.bin/locate/code/locate.code.c
+++ b/usr.bin/locate/code/locate.code.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: locate.code.c,v 1.2 1996/06/26 05:35:50 deraadt Exp $ */
/* $NetBSD: locate.code.c,v 1.5 1995/08/31 22:36:33 jtc Exp $ */
/*
@@ -46,7 +47,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)locate.code.c 8.4 (Berkeley) 5/4/95";
#endif
-static char rcsid[] = "$NetBSD: locate.code.c,v 1.5 1995/08/31 22:36:33 jtc Exp $";
+static char rcsid[] = "$OpenBSD: locate.code.c,v 1.2 1996/06/26 05:35:50 deraadt Exp $";
#endif /* not lint */
/*
diff --git a/usr.bin/locate/locate/Makefile b/usr.bin/locate/locate/Makefile
index 5e19415489a..efac911058d 100644
--- a/usr.bin/locate/locate/Makefile
+++ b/usr.bin/locate/locate/Makefile
@@ -1,5 +1,5 @@
+# $OpenBSD: Makefile,v 1.2 1996/06/26 05:35:51 deraadt Exp $
# $NetBSD: Makefile,v 1.3 1994/12/22 06:17:44 jtc Exp $
-# @(#)Makefile 8.1 (Berkeley) 6/6/93
PROG= locate
diff --git a/usr.bin/locate/locate/locate.1 b/usr.bin/locate/locate/locate.1
index 8142f2ebb1b..4c6001e14b3 100644
--- a/usr.bin/locate/locate/locate.1
+++ b/usr.bin/locate/locate/locate.1
@@ -1,3 +1,4 @@
+.\" $OpenBSD: locate.1,v 1.2 1996/06/26 05:35:52 deraadt Exp $
.\" $NetBSD: locate.1,v 1.4 1995/07/25 18:20:25 jtc Exp $
.\"
.\" Copyright (c) 1990, 1993
diff --git a/usr.bin/locate/locate/locate.c b/usr.bin/locate/locate/locate.c
index a4d8ecd47b6..b51abf5738c 100644
--- a/usr.bin/locate/locate/locate.c
+++ b/usr.bin/locate/locate/locate.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: locate.c,v 1.2 1996/06/26 05:35:52 deraadt Exp $ */
/* $NetBSD: locate.c,v 1.6 1994/12/22 06:17:47 jtc Exp $ */
/*
@@ -46,7 +47,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)locate.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$NetBSD: locate.c,v 1.6 1994/12/22 06:17:47 jtc Exp $";
+static char rcsid[] = "$OpenBSD: locate.c,v 1.2 1996/06/26 05:35:52 deraadt Exp $";
#endif /* not lint */
/*
diff --git a/usr.bin/locate/locate/locate.h b/usr.bin/locate/locate/locate.h
index 467c2cbcdea..05febeadccc 100644
--- a/usr.bin/locate/locate/locate.h
+++ b/usr.bin/locate/locate/locate.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: locate.h,v 1.2 1996/06/26 05:35:53 deraadt Exp $ */
/* $NetBSD: locate.h,v 1.3 1994/12/22 06:17:48 jtc Exp $ */
/*
diff --git a/usr.bin/locate/locate/pathnames.h b/usr.bin/locate/locate/pathnames.h
index 8021ffecb3b..ce83deea2f4 100644
--- a/usr.bin/locate/locate/pathnames.h
+++ b/usr.bin/locate/locate/pathnames.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: pathnames.h,v 1.2 1996/06/26 05:35:54 deraadt Exp $ */
/* $NetBSD: pathnames.h,v 1.3 1994/12/22 06:17:49 jtc Exp $ */
/*
diff --git a/usr.bin/locate/locate/updatedb.csh b/usr.bin/locate/locate/updatedb.csh
index 394e828188e..a8a71d22310 100644
--- a/usr.bin/locate/locate/updatedb.csh
+++ b/usr.bin/locate/locate/updatedb.csh
@@ -1,5 +1,6 @@
#!/bin/csh -f
#
+# $OpenBSD: updatedb.csh,v 1.2 1996/06/26 05:35:54 deraadt Exp $
# $NetBSD: updatedb.csh,v 1.7 1995/08/31 22:36:35 jtc Exp $
#
# Copyright (c) 1989, 1993
diff --git a/usr.bin/lock/Makefile b/usr.bin/lock/Makefile
index 790c41c5ca0..ed29ac966eb 100644
--- a/usr.bin/lock/Makefile
+++ b/usr.bin/lock/Makefile
@@ -1,5 +1,4 @@
-# from: @(#)Makefile 8.1 (Berkeley) 6/6/93
-# $Id: Makefile,v 1.3 1996/02/15 05:02:23 etheisen Exp $
+# $OpenBSD: Makefile,v 1.4 1996/06/26 05:35:55 deraadt Exp $
PROG= lock
BINOWN= root
diff --git a/usr.bin/lock/lock.1 b/usr.bin/lock/lock.1
index 0da4d03c70a..fc422c87f20 100644
--- a/usr.bin/lock/lock.1
+++ b/usr.bin/lock/lock.1
@@ -1,3 +1,4 @@
+.\" $OpenBSD: lock.1,v 1.2 1996/06/26 05:35:55 deraadt Exp $
.\" $NetBSD: lock.1,v 1.4 1994/12/22 01:16:21 jtc Exp $
.\"
.\" Copyright (c) 1987, 1990, 1993
diff --git a/usr.bin/lock/lock.c b/usr.bin/lock/lock.c
index 6ade3de8014..24a64343fc1 100644
--- a/usr.bin/lock/lock.c
+++ b/usr.bin/lock/lock.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: lock.c,v 1.3 1996/06/26 05:35:56 deraadt Exp $ */
/* $NetBSD: lock.c,v 1.8 1996/05/07 18:32:31 jtc Exp $ */
/*
@@ -46,7 +47,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)lock.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$NetBSD: lock.c,v 1.8 1996/05/07 18:32:31 jtc Exp $";
+static char rcsid[] = "$OpenBSD: lock.c,v 1.3 1996/06/26 05:35:56 deraadt Exp $";
#endif /* not lint */
/*
diff --git a/usr.bin/logger/Makefile b/usr.bin/logger/Makefile
index eb7388b1b5b..43e1667befe 100644
--- a/usr.bin/logger/Makefile
+++ b/usr.bin/logger/Makefile
@@ -1,5 +1,5 @@
+# $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 $
-# @(#)Makefile 8.1 (Berkeley) 6/6/93
PROG= logger
diff --git a/usr.bin/logger/logger.1 b/usr.bin/logger/logger.1
index 21e5f478dba..3a942e88b12 100644
--- a/usr.bin/logger/logger.1
+++ b/usr.bin/logger/logger.1
@@ -1,3 +1,4 @@
+.\" $OpenBSD: logger.1,v 1.2 1996/06/26 05:35:58 deraadt Exp $
.\" $NetBSD: logger.1,v 1.4 1994/12/22 06:26:59 jtc Exp $
.\"
.\" Copyright (c) 1983, 1990, 1993
diff --git a/usr.bin/logger/logger.c b/usr.bin/logger/logger.c
index 967d49506fe..53c9860af4d 100644
--- a/usr.bin/logger/logger.c
+++ b/usr.bin/logger/logger.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: logger.c,v 1.2 1996/06/26 05:35:58 deraadt Exp $ */
/* $NetBSD: logger.c,v 1.4 1994/12/22 06:27:00 jtc Exp $ */
/*
@@ -43,7 +44,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)logger.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$NetBSD: logger.c,v 1.4 1994/12/22 06:27:00 jtc Exp $";
+static char rcsid[] = "$OpenBSD: logger.c,v 1.2 1996/06/26 05:35:58 deraadt Exp $";
#endif /* not lint */
#include <errno.h>
diff --git a/usr.bin/login/Makefile b/usr.bin/login/Makefile
index 32ebb681727..f61b5e79501 100644
--- a/usr.bin/login/Makefile
+++ b/usr.bin/login/Makefile
@@ -1,6 +1,5 @@
+# $OpenBSD: Makefile,v 1.4 1996/06/26 05:35:59 deraadt Exp $
# $NetBSD: Makefile,v 1.10 1994/12/23 06:52:56 jtc Exp $
-# from: @(#)Makefile 8.1 (Berkeley) 7/19/93
-# $Id: Makefile,v 1.3 1996/02/15 05:02:24 etheisen Exp $
PROG= login
SRCS= login.c
diff --git a/usr.bin/login/k5login.c b/usr.bin/login/k5login.c
index 33a10950f46..707d13b796d 100644
--- a/usr.bin/login/k5login.c
+++ b/usr.bin/login/k5login.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: k5login.c,v 1.2 1996/06/26 05:36:00 deraadt Exp $ */
/* $NetBSD: k5login.c,v 1.2 1994/12/23 06:52:58 jtc Exp $ */
/*-
@@ -37,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)klogin.c 5.11 (Berkeley) 7/12/92";
#endif
-static char rcsid[] = "$NetBSD: k5login.c,v 1.2 1994/12/23 06:52:58 jtc Exp $";
+static char rcsid[] = "$OpenBSD: k5login.c,v 1.2 1996/06/26 05:36:00 deraadt Exp $";
#endif /* not lint */
#ifdef KERBEROS5
diff --git a/usr.bin/login/klogin.c b/usr.bin/login/klogin.c
index 62f407653a8..893e745e007 100644
--- a/usr.bin/login/klogin.c
+++ b/usr.bin/login/klogin.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: klogin.c,v 1.3 1996/06/26 05:36:00 deraadt Exp $ */
/* $NetBSD: klogin.c,v 1.7 1996/05/21 22:07:04 mrg Exp $ */
/*-
@@ -37,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)klogin.c 8.3 (Berkeley) 4/2/94";
#endif
-static char rcsid[] = "$NetBSD: klogin.c,v 1.7 1996/05/21 22:07:04 mrg Exp $";
+static char rcsid[] = "$OpenBSD: klogin.c,v 1.3 1996/06/26 05:36:00 deraadt Exp $";
#endif /* not lint */
#ifdef KERBEROS
diff --git a/usr.bin/login/login.1 b/usr.bin/login/login.1
index 30c250a761c..ab9f60eeeed 100644
--- a/usr.bin/login/login.1
+++ b/usr.bin/login/login.1
@@ -1,3 +1,4 @@
+.\" $OpenBSD: login.1,v 1.2 1996/06/26 05:36:01 deraadt Exp $
.\" $NetBSD: login.1,v 1.7 1995/08/31 22:52:33 jtc Exp $
.\"
.\" Copyright (c) 1980, 1990, 1993
diff --git a/usr.bin/login/login.c b/usr.bin/login/login.c
index 7f979e242b2..6577455c3d2 100644
--- a/usr.bin/login/login.c
+++ b/usr.bin/login/login.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: login.c,v 1.4 1996/06/26 05:36:01 deraadt Exp $ */
/* $NetBSD: login.c,v 1.13 1996/05/15 23:50:16 jtc Exp $ */
/*-
@@ -43,7 +44,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)login.c 8.4 (Berkeley) 4/2/94";
#endif
-static char rcsid[] = "$NetBSD: login.c,v 1.13 1996/05/15 23:50:16 jtc Exp $";
+static char rcsid[] = "$OpenBSD: login.c,v 1.4 1996/06/26 05:36:01 deraadt Exp $";
#endif /* not lint */
/*
diff --git a/usr.bin/login/pathnames.h b/usr.bin/login/pathnames.h
index f1e52b1ad7e..1efc8ba67e7 100644
--- a/usr.bin/login/pathnames.h
+++ b/usr.bin/login/pathnames.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: pathnames.h,v 1.2 1996/06/26 05:36:02 deraadt Exp $ */
/* $NetBSD: pathnames.h,v 1.4 1994/12/23 06:53:03 jtc Exp $ */
/*-
diff --git a/usr.bin/logname/Makefile b/usr.bin/logname/Makefile
index ff6a8e1b727..66dca41fbde 100644
--- a/usr.bin/logname/Makefile
+++ b/usr.bin/logname/Makefile
@@ -1,5 +1,5 @@
+# $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 $
-# @(#)Makefile 8.1 (Berkeley) 6/9/93
PROG= logname
diff --git a/usr.bin/logname/logname.1 b/usr.bin/logname/logname.1
index 59856eb5e11..687d0816d82 100644
--- a/usr.bin/logname/logname.1
+++ b/usr.bin/logname/logname.1
@@ -1,3 +1,4 @@
+.\" $OpenBSD: logname.1,v 1.2 1996/06/26 05:36:03 deraadt Exp $
.\" $NetBSD: logname.1,v 1.5 1995/07/25 18:31:12 jtc Exp $
.\"
.\" Copyright (c) 1991, 1993
diff --git a/usr.bin/logname/logname.c b/usr.bin/logname/logname.c
index 6044c34b936..d023fca063d 100644
--- a/usr.bin/logname/logname.c
+++ b/usr.bin/logname/logname.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: logname.c,v 1.2 1996/06/26 05:36:04 deraadt Exp $ */
/* $NetBSD: logname.c,v 1.6 1994/12/22 06:39:32 jtc Exp $ */
/*-
@@ -43,7 +44,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)logname.c 8.2 (Berkeley) 4/3/94";
#endif
-static char rcsid[] = "$NetBSD: logname.c,v 1.6 1994/12/22 06:39:32 jtc Exp $";
+static char rcsid[] = "$OpenBSD: logname.c,v 1.2 1996/06/26 05:36:04 deraadt Exp $";
#endif /* not lint */
#include <stdio.h>
diff --git a/usr.bin/look/Makefile b/usr.bin/look/Makefile
index f0fc7ed8280..a1da7f67e99 100644
--- a/usr.bin/look/Makefile
+++ b/usr.bin/look/Makefile
@@ -1,5 +1,5 @@
+# $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 $
-# @(#)Makefile 8.1 (Berkeley) 6/9/93
PROG= look
diff --git a/usr.bin/look/look.1 b/usr.bin/look/look.1
index bb955fdb5f9..f0f8ea898b2 100644
--- a/usr.bin/look/look.1
+++ b/usr.bin/look/look.1
@@ -1,3 +1,4 @@
+.\" $OpenBSD: look.1,v 1.2 1996/06/26 05:36:06 deraadt Exp $
.\" $NetBSD: look.1,v 1.3 1994/12/23 01:10:59 jtc Exp $
.\"
.\" Copyright (c) 1990, 1993
diff --git a/usr.bin/look/look.c b/usr.bin/look/look.c
index 6e95ffac390..2f7fccff11e 100644
--- a/usr.bin/look/look.c
+++ b/usr.bin/look/look.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: look.c,v 1.2 1996/06/26 05:36:06 deraadt Exp $ */
/* $NetBSD: look.c,v 1.7 1995/08/31 22:41:02 jtc Exp $ */
/*-
@@ -46,7 +47,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)look.c 8.2 (Berkeley) 5/4/95";
#endif
-static char rcsid[] = "$NetBSD: look.c,v 1.7 1995/08/31 22:41:02 jtc Exp $";
+static char rcsid[] = "$OpenBSD: look.c,v 1.2 1996/06/26 05:36:06 deraadt Exp $";
#endif /* not lint */
/*
diff --git a/usr.bin/look/pathnames.h b/usr.bin/look/pathnames.h
index 25ec1a56ca7..85b8d891c95 100644
--- a/usr.bin/look/pathnames.h
+++ b/usr.bin/look/pathnames.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: pathnames.h,v 1.2 1996/06/26 05:36:07 deraadt Exp $ */
/* $NetBSD: pathnames.h,v 1.3 1994/12/23 01:11:03 jtc Exp $ */
/*
diff --git a/usr.bin/lorder/Makefile b/usr.bin/lorder/Makefile
index 388e749d159..f671e4e5389 100644
--- a/usr.bin/lorder/Makefile
+++ b/usr.bin/lorder/Makefile
@@ -1,5 +1,5 @@
+# $OpenBSD: Makefile,v 1.3 1996/06/26 05:36:08 deraadt Exp $
# $NetBSD: Makefile,v 1.9 1995/12/18 07:59:12 jonathan Exp $
-# @(#)Makefile 8.1 (Berkeley) 6/6/93
MAN= lorder.1
diff --git a/usr.bin/lorder/lorder.1 b/usr.bin/lorder/lorder.1
index cad3571aa43..a38ba24010c 100644
--- a/usr.bin/lorder/lorder.1
+++ b/usr.bin/lorder/lorder.1
@@ -1,3 +1,4 @@
+.\" $OpenBSD: lorder.1,v 1.2 1996/06/26 05:36:08 deraadt Exp $
.\" $NetBSD: lorder.1,v 1.5 1995/08/31 22:42:44 jtc Exp $
.\"
.\" Copyright (c) 1990, 1993
diff --git a/usr.bin/lorder/lorder.sh b/usr.bin/lorder/lorder.sh
index 621a09d7b33..c52a90ca12e 100644
--- a/usr.bin/lorder/lorder.sh
+++ b/usr.bin/lorder/lorder.sh
@@ -1,4 +1,5 @@
#!/bin/sh -
+# $OpenBSD: lorder.sh,v 1.2 1996/06/26 05:36:09 deraadt Exp $
# $NetBSD: lorder.sh,v 1.3 1995/04/24 07:38:52 cgd Exp $
#
# Copyright (c) 1990, 1993
diff --git a/usr.bin/lorder/lorder.sh.gnm b/usr.bin/lorder/lorder.sh.gnm
index 49bdf15df1e..2973fe2a017 100644
--- a/usr.bin/lorder/lorder.sh.gnm
+++ b/usr.bin/lorder/lorder.sh.gnm
@@ -1,4 +1,5 @@
#!/bin/sh -
+# $OpenBSD: lorder.sh.gnm,v 1.4 1996/06/26 05:36:09 deraadt Exp $
# $NetBSD: lorder.sh.gnm,v 1.3 1995/12/20 04:45:11 cgd Exp $
#
# Copyright (c) 1990, 1993
diff --git a/usr.bin/m4/Makefile b/usr.bin/m4/Makefile
index 70f12d0976b..7f7df268cae 100644
--- a/usr.bin/m4/Makefile
+++ b/usr.bin/m4/Makefile
@@ -1,4 +1,5 @@
-# @(#)Makefile 8.1 (Berkeley) 6/6/93
+# $OpenBSD: Makefile,v 1.2 1996/06/26 05:36:10 deraadt Exp $
+
# -DEXTENDED
# if you want the paste & spaste macros.
diff --git a/usr.bin/m4/PSD.doc/Makefile b/usr.bin/m4/PSD.doc/Makefile
index 0613e08237f..c60c912e15c 100644
--- a/usr.bin/m4/PSD.doc/Makefile
+++ b/usr.bin/m4/PSD.doc/Makefile
@@ -1,4 +1,5 @@
-# @(#)Makefile 8.1 (Berkeley) 6/8/93
+# $OpenBSD: Makefile,v 1.2 1996/06/26 05:36:17 deraadt Exp $
+
DIR= psd/17.m4
SRCS= m4.ms
diff --git a/usr.bin/m4/TEST/ack.m4 b/usr.bin/m4/TEST/ack.m4
index 2784c45b595..ef0b5ef5159 100644
--- a/usr.bin/m4/TEST/ack.m4
+++ b/usr.bin/m4/TEST/ack.m4
@@ -1,3 +1,4 @@
+# $OpenBSD: ack.m4,v 1.2 1996/06/26 05:36:18 deraadt Exp $
# $NetBSD: ack.m4,v 1.4 1995/09/28 05:37:54 tls Exp $
#
# Copyright (c) 1989, 1993
diff --git a/usr.bin/m4/TEST/hanoi.m4 b/usr.bin/m4/TEST/hanoi.m4
index 6f7343104fb..d16f922ad0d 100644
--- a/usr.bin/m4/TEST/hanoi.m4
+++ b/usr.bin/m4/TEST/hanoi.m4
@@ -1,3 +1,4 @@
+# $OpenBSD: hanoi.m4,v 1.2 1996/06/26 05:36:19 deraadt Exp $
# $NetBSD: hanoi.m4,v 1.4 1995/09/28 05:37:56 tls Exp $
#
# Copyright (c) 1989, 1993
diff --git a/usr.bin/m4/TEST/hash.m4 b/usr.bin/m4/TEST/hash.m4
index 5de2f79bbf6..21b40e140c2 100644
--- a/usr.bin/m4/TEST/hash.m4
+++ b/usr.bin/m4/TEST/hash.m4
@@ -1,3 +1,4 @@
+# $OpenBSD: hash.m4,v 1.2 1996/06/26 05:36:19 deraadt Exp $
# $NetBSD: hash.m4,v 1.4 1995/09/28 05:37:58 tls Exp $
#
# Copyright (c) 1989, 1993
diff --git a/usr.bin/m4/TEST/sqroot.m4 b/usr.bin/m4/TEST/sqroot.m4
index 6fc8d2c73c8..d01789bb4d0 100644
--- a/usr.bin/m4/TEST/sqroot.m4
+++ b/usr.bin/m4/TEST/sqroot.m4
@@ -1,3 +1,4 @@
+# $OpenBSD: sqroot.m4,v 1.2 1996/06/26 05:36:20 deraadt Exp $
# $NetBSD: sqroot.m4,v 1.4 1995/09/28 05:38:01 tls Exp $
#
# Copyright (c) 1989, 1993
diff --git a/usr.bin/m4/TEST/string.m4 b/usr.bin/m4/TEST/string.m4
index a14f14a2035..bb0bba4d1b6 100644
--- a/usr.bin/m4/TEST/string.m4
+++ b/usr.bin/m4/TEST/string.m4
@@ -1,3 +1,4 @@
+# $OpenBSD: string.m4,v 1.2 1996/06/26 05:36:20 deraadt Exp $
# $NetBSD: string.m4,v 1.4 1995/09/28 05:38:03 tls Exp $
#
# Copyright (c) 1989, 1993
diff --git a/usr.bin/m4/TEST/test.m4 b/usr.bin/m4/TEST/test.m4
index 5b198073aa8..1c77b9bdef9 100644
--- a/usr.bin/m4/TEST/test.m4
+++ b/usr.bin/m4/TEST/test.m4
@@ -1,3 +1,4 @@
+# $OpenBSD: test.m4,v 1.2 1996/06/26 05:36:21 deraadt Exp $
# $NetBSD: test.m4,v 1.4 1995/09/28 05:38:05 tls Exp $
#
# Copyright (c) 1989, 1993
diff --git a/usr.bin/m4/eval.c b/usr.bin/m4/eval.c
index 790c995a46c..2a5b8594941 100644
--- a/usr.bin/m4/eval.c
+++ b/usr.bin/m4/eval.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: eval.c,v 1.4 1996/06/26 05:36:11 deraadt Exp $ */
/* $NetBSD: eval.c,v 1.5 1996/01/13 23:25:23 pk Exp $ */
/*
@@ -40,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)eval.c 8.2 (Berkeley) 4/27/95";
#else
-static char rcsid[] = "$NetBSD: eval.c,v 1.5 1996/01/13 23:25:23 pk Exp $";
+static char rcsid[] = "$OpenBSD: eval.c,v 1.4 1996/06/26 05:36:11 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/m4/expr.c b/usr.bin/m4/expr.c
index 5383da1f695..30ab96d644a 100644
--- a/usr.bin/m4/expr.c
+++ b/usr.bin/m4/expr.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: expr.c,v 1.2 1996/06/26 05:36:11 deraadt Exp $ */
/* $NetBSD: expr.c,v 1.7 1995/09/28 05:37:31 tls Exp $ */
/*
@@ -40,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)expr.c 8.2 (Berkeley) 4/29/95";
#else
-static char rcsid[] = "$NetBSD: expr.c,v 1.7 1995/09/28 05:37:31 tls Exp $";
+static char rcsid[] = "$OpenBSD: expr.c,v 1.2 1996/06/26 05:36:11 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/m4/extern.h b/usr.bin/m4/extern.h
index 437ceff887a..e4f7e7de37e 100644
--- a/usr.bin/m4/extern.h
+++ b/usr.bin/m4/extern.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: extern.h,v 1.3 1996/06/26 05:36:12 deraadt Exp $ */
/* $NetBSD: extern.h,v 1.3 1996/01/13 23:25:24 pk Exp $ */
/*-
diff --git a/usr.bin/m4/look.c b/usr.bin/m4/look.c
index 7c750b0c0a1..4aef4823ebb 100644
--- a/usr.bin/m4/look.c
+++ b/usr.bin/m4/look.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: look.c,v 1.2 1996/06/26 05:36:12 deraadt Exp $ */
+
/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/usr.bin/m4/m4.1 b/usr.bin/m4/m4.1
index b82678ac8b7..8e3d553f246 100644
--- a/usr.bin/m4/m4.1
+++ b/usr.bin/m4/m4.1
@@ -1,5 +1,5 @@
+.\" @(#) $OpenBSD: m4.1,v 1.3 1996/06/26 05:36:13 deraadt Exp $
.\"
-.\" @(#) $Id: m4.1,v 1.2 1995/12/14 02:57:00 deraadt Exp $
.\"
.Dd January 26, 1993
.Dt m4 1
diff --git a/usr.bin/m4/main.c b/usr.bin/m4/main.c
index 25fe8fce55b..a226f50978e 100644
--- a/usr.bin/m4/main.c
+++ b/usr.bin/m4/main.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: main.c,v 1.3 1996/06/26 05:36:14 deraadt Exp $ */
/* $NetBSD: main.c,v 1.11 1996/01/13 23:25:26 pk Exp $ */
/*-
@@ -46,7 +47,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)main.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$NetBSD: main.c,v 1.11 1996/01/13 23:25:26 pk Exp $";
+static char rcsid[] = "$OpenBSD: main.c,v 1.3 1996/06/26 05:36:14 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/m4/mdef.h b/usr.bin/m4/mdef.h
index dacbf60d99d..0b231ff9c5f 100644
--- a/usr.bin/m4/mdef.h
+++ b/usr.bin/m4/mdef.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: mdef.h,v 1.3 1996/06/26 05:36:14 deraadt Exp $ */
/* $NetBSD: mdef.h,v 1.7 1996/01/13 23:25:27 pk Exp $ */
/*
diff --git a/usr.bin/m4/misc.c b/usr.bin/m4/misc.c
index 702e6980bfa..1b161f1c393 100644
--- a/usr.bin/m4/misc.c
+++ b/usr.bin/m4/misc.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: misc.c,v 1.3 1996/06/26 05:36:15 deraadt Exp $ */
/* $NetBSD: misc.c,v 1.6 1995/09/28 05:37:41 tls Exp $ */
/*
@@ -40,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)misc.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$NetBSD: misc.c,v 1.6 1995/09/28 05:37:41 tls Exp $";
+static char rcsid[] = "$OpenBSD: misc.c,v 1.3 1996/06/26 05:36:15 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/m4/pathnames.h b/usr.bin/m4/pathnames.h
index 8376c6c6d25..a6332c28aad 100644
--- a/usr.bin/m4/pathnames.h
+++ b/usr.bin/m4/pathnames.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: pathnames.h,v 1.2 1996/06/26 05:36:15 deraadt Exp $ */
/* $NetBSD: pathnames.h,v 1.6 1995/09/29 00:27:55 cgd Exp $ */
/*
diff --git a/usr.bin/m4/serv.c b/usr.bin/m4/serv.c
index d7ace57ae27..f264a550ef4 100644
--- a/usr.bin/m4/serv.c
+++ b/usr.bin/m4/serv.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: serv.c,v 1.3 1996/06/26 05:36:16 deraadt Exp $ */
/* $NetBSD: serv.c,v 1.7 1995/09/28 05:37:47 tls Exp $ */
/*
@@ -45,7 +46,7 @@
#if 0
static char sccsid[] = "@(#)serv.c 5.4 (Berkeley) 1/21/94";
#else
-static char rcsid[] = "$NetBSD: serv.c,v 1.7 1995/09/28 05:37:47 tls Exp $";
+static char rcsid[] = "$OpenBSD: serv.c,v 1.3 1996/06/26 05:36:16 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/m4/stdd.h b/usr.bin/m4/stdd.h
index f27fa789adb..57993f703bb 100644
--- a/usr.bin/m4/stdd.h
+++ b/usr.bin/m4/stdd.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: stdd.h,v 1.2 1996/06/26 05:36:16 deraadt Exp $ */
/* $NetBSD: stdd.h,v 1.2 1995/09/28 05:37:50 tls Exp $ */
/*-
diff --git a/usr.bin/machine/Makefile b/usr.bin/machine/Makefile
index 6cb96c31803..905353f2dfe 100644
--- a/usr.bin/machine/Makefile
+++ b/usr.bin/machine/Makefile
@@ -1,5 +1,4 @@
-# from: @(#)Makefile 5.3 (Berkeley) 5/11/90
-# $Id: Makefile,v 1.1 1995/10/18 08:45:37 deraadt Exp $
+# $OpenBSD: Makefile,v 1.2 1996/06/26 05:36:22 deraadt Exp $
PROG= machine
diff --git a/usr.bin/machine/machine.1 b/usr.bin/machine/machine.1
index 9248c15e5ff..5c130aa0603 100644
--- a/usr.bin/machine/machine.1
+++ b/usr.bin/machine/machine.1
@@ -1,3 +1,4 @@
+.\" $OpenBSD: machine.1,v 1.2 1996/06/26 05:36:23 deraadt Exp $
.\" Copyright (c) 1980, 1990 The Regents of the University of California.
.\" All rights reserved.
.\"
@@ -30,7 +31,6 @@
.\" SUCH DAMAGE.
.\"
.\" from: @(#)machine.1 5.5 (Berkeley) 7/26/91
-.\" $Id: machine.1,v 1.1 1995/10/18 08:45:37 deraadt Exp $
.\"
.Dd July 26, 1991
.Dt MACHINE 1
diff --git a/usr.bin/machine/machine.c b/usr.bin/machine/machine.c
index 9201816b428..0f5aa2f1fc8 100644
--- a/usr.bin/machine/machine.c
+++ b/usr.bin/machine/machine.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: machine.c,v 1.2 1996/06/26 05:36:23 deraadt Exp $ */
+
/*
* Copyright (c) 1986 Regents of the University of California.
* All rights reserved.
@@ -39,7 +41,7 @@ char copyright[] =
#ifndef lint
/*static char sccsid[] = "from: @(#)machine.c 5.5 (Berkeley) 6/1/90";*/
-static char rcsid[] = "$Id: machine.c,v 1.1 1995/10/18 08:45:37 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: machine.c,v 1.2 1996/06/26 05:36:23 deraadt Exp $";
#endif /* not lint */
#include <sys/param.h>
diff --git a/usr.bin/make/Makefile.boot b/usr.bin/make/Makefile.boot
index e6913c7342e..66299345ee6 100644
--- a/usr.bin/make/Makefile.boot
+++ b/usr.bin/make/Makefile.boot
@@ -1,6 +1,6 @@
+# $OpenBSD: Makefile.boot,v 1.2 1996/06/26 05:36:24 deraadt Exp $
# $NetBSD: Makefile.boot,v 1.5 1995/06/14 15:18:43 christos Exp $
# a very simple makefile...
-# $Id: Makefile.boot,v 1.1 1995/10/18 08:45:41 deraadt Exp $
#
# You only want to use this if you aren't running NetBSD.
#
diff --git a/usr.bin/make/PSD.doc/Makefile b/usr.bin/make/PSD.doc/Makefile
index 8e1f1fa0705..03035172233 100644
--- a/usr.bin/make/PSD.doc/Makefile
+++ b/usr.bin/make/PSD.doc/Makefile
@@ -1,5 +1,5 @@
+# $OpenBSD: Makefile,v 1.2 1996/06/26 05:36:40 deraadt Exp $
# $NetBSD: Makefile,v 1.2 1995/06/14 15:20:23 christos Exp $
-# @(#)Makefile 8.1 (Berkeley) 8/14/93
DIR= psd/12.make
SRCS= tutorial.ms
diff --git a/usr.bin/make/bit.h b/usr.bin/make/bit.h
index d1b08a37011..0e5be5afd99 100644
--- a/usr.bin/make/bit.h
+++ b/usr.bin/make/bit.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: bit.h,v 1.3 1996/06/26 05:36:25 deraadt Exp $ */
/* $NetBSD: bit.h,v 1.5 1995/11/08 02:30:53 christos Exp $ */
/*
diff --git a/usr.bin/make/buf.c b/usr.bin/make/buf.c
index 52179007773..ed7ee422806 100644
--- a/usr.bin/make/buf.c
+++ b/usr.bin/make/buf.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: buf.c,v 1.3 1996/06/26 05:36:25 deraadt Exp $ */
/* $NetBSD: buf.c,v 1.7 1996/03/29 02:17:13 jtc Exp $ */
/*
@@ -42,7 +43,7 @@
#if 0
static char sccsid[] = "@(#)buf.c 5.5 (Berkeley) 12/28/90";
#else
-static char rcsid[] = "$NetBSD: buf.c,v 1.7 1996/03/29 02:17:13 jtc Exp $";
+static char rcsid[] = "$OpenBSD: buf.c,v 1.3 1996/06/26 05:36:25 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/make/buf.h b/usr.bin/make/buf.h
index bb80e92800c..e345eadf032 100644
--- a/usr.bin/make/buf.h
+++ b/usr.bin/make/buf.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: buf.h,v 1.2 1996/06/26 05:36:26 deraadt Exp $ */
/* $NetBSD: buf.h,v 1.5 1995/06/14 15:18:53 christos Exp $ */
/*
diff --git a/usr.bin/make/compat.c b/usr.bin/make/compat.c
index 394ed30b739..7534cbeea71 100644
--- a/usr.bin/make/compat.c
+++ b/usr.bin/make/compat.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: compat.c,v 1.3 1996/06/26 05:36:27 deraadt Exp $ */
/* $NetBSD: compat.c,v 1.13 1995/11/22 17:40:00 christos Exp $ */
/*
@@ -42,7 +43,7 @@
#if 0
static char sccsid[] = "@(#)compat.c 5.7 (Berkeley) 3/1/91";
#else
-static char rcsid[] = "$NetBSD: compat.c,v 1.13 1995/11/22 17:40:00 christos Exp $";
+static char rcsid[] = "$OpenBSD: compat.c,v 1.3 1996/06/26 05:36:27 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/make/cond.c b/usr.bin/make/cond.c
index 4be0a899e86..a9ecacd441d 100644
--- a/usr.bin/make/cond.c
+++ b/usr.bin/make/cond.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: cond.c,v 1.2 1996/06/26 05:36:28 deraadt Exp $ */
/* $NetBSD: cond.c,v 1.6 1995/06/14 15:18:58 christos Exp $ */
/*
@@ -42,7 +43,7 @@
#if 0
static char sccsid[] = "@(#)cond.c 5.6 (Berkeley) 6/1/90";
#else
-static char rcsid[] = "$NetBSD: cond.c,v 1.6 1995/06/14 15:18:58 christos Exp $";
+static char rcsid[] = "$OpenBSD: cond.c,v 1.2 1996/06/26 05:36:28 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/make/config.h b/usr.bin/make/config.h
index f49e7d62c31..f09a149ea0c 100644
--- a/usr.bin/make/config.h
+++ b/usr.bin/make/config.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: config.h,v 1.3 1996/06/26 05:36:28 deraadt Exp $ */
/* $NetBSD: config.h,v 1.5 1996/02/04 20:34:43 christos Exp $ */
/*
diff --git a/usr.bin/make/dir.c b/usr.bin/make/dir.c
index 75eb6e3bb2e..fa1f8fa7e60 100644
--- a/usr.bin/make/dir.c
+++ b/usr.bin/make/dir.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: dir.c,v 1.4 1996/06/26 05:36:29 deraadt Exp $ */
/* $NetBSD: dir.c,v 1.10 1996/02/04 22:20:38 christos Exp $ */
/*
@@ -42,7 +43,7 @@
#if 0
static char sccsid[] = "@(#)dir.c 5.6 (Berkeley) 12/28/90";
#else
-static char rcsid[] = "$NetBSD: dir.c,v 1.10 1996/02/04 22:20:38 christos Exp $";
+static char rcsid[] = "$OpenBSD: dir.c,v 1.4 1996/06/26 05:36:29 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/make/dir.h b/usr.bin/make/dir.h
index ea74418c032..e0bf9bf2767 100644
--- a/usr.bin/make/dir.h
+++ b/usr.bin/make/dir.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: dir.h,v 1.2 1996/06/26 05:36:30 deraadt Exp $ */
/* $NetBSD: dir.h,v 1.3 1995/06/14 15:19:11 christos Exp $ */
/*
diff --git a/usr.bin/make/extern.h b/usr.bin/make/extern.h
index d1b948ecf54..719f2fb00c7 100644
--- a/usr.bin/make/extern.h
+++ b/usr.bin/make/extern.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: extern.h,v 1.4 1996/06/26 05:36:35 deraadt Exp $ */
/* $NetBSD: nonints.h,v 1.9 1996/03/31 21:30:07 christos Exp $ */
/*-
diff --git a/usr.bin/make/for.c b/usr.bin/make/for.c
index 3ca1b8bd40a..5c16d2dedc7 100644
--- a/usr.bin/make/for.c
+++ b/usr.bin/make/for.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: for.c,v 1.2 1996/06/26 05:36:30 deraadt Exp $ */
/* $NetBSD: for.c,v 1.3 1995/06/14 15:19:13 christos Exp $ */
/*
@@ -37,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)for.c 5.6 (Berkeley) 6/1/90";
#else
-static char rcsid[] = "$NetBSD: for.c,v 1.3 1995/06/14 15:19:13 christos Exp $";
+static char rcsid[] = "$OpenBSD: for.c,v 1.2 1996/06/26 05:36:30 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/make/hash.c b/usr.bin/make/hash.c
index 38bfa41062c..f6b6c0dcfe9 100644
--- a/usr.bin/make/hash.c
+++ b/usr.bin/make/hash.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: hash.c,v 1.2 1996/06/26 05:36:31 deraadt Exp $ */
/* $NetBSD: hash.c,v 1.5 1995/06/14 15:19:15 christos Exp $ */
/*
@@ -42,7 +43,7 @@
#if 0
static char sccsid[] = "@(#)hash.c 5.5 (Berkeley) 12/28/90";
#else
-static char rcsid[] = "$NetBSD: hash.c,v 1.5 1995/06/14 15:19:15 christos Exp $";
+static char rcsid[] = "$OpenBSD: hash.c,v 1.2 1996/06/26 05:36:31 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/make/hash.h b/usr.bin/make/hash.h
index 107e7bae976..b3fd39ebfc7 100644
--- a/usr.bin/make/hash.h
+++ b/usr.bin/make/hash.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: hash.h,v 1.2 1996/06/26 05:36:31 deraadt Exp $ */
/* $NetBSD: hash.h,v 1.4 1995/06/14 15:19:18 christos Exp $ */
/*
diff --git a/usr.bin/make/job.c b/usr.bin/make/job.c
index 112bad95ce5..0474a423106 100644
--- a/usr.bin/make/job.c
+++ b/usr.bin/make/job.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: job.c,v 1.4 1996/06/26 05:36:32 deraadt Exp $ */
/* $NetBSD: job.c,v 1.14 1996/02/04 22:20:42 christos Exp $ */
/*
@@ -42,7 +43,7 @@
#if 0
static char sccsid[] = "@(#)job.c 5.15 (Berkeley) 3/1/91";
#else
-static char rcsid[] = "$NetBSD: job.c,v 1.14 1996/02/04 22:20:42 christos Exp $";
+static char rcsid[] = "$OpenBSD: job.c,v 1.4 1996/06/26 05:36:32 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/make/job.h b/usr.bin/make/job.h
index edace0898d0..bf6ac28e953 100644
--- a/usr.bin/make/job.h
+++ b/usr.bin/make/job.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: job.h,v 1.2 1996/06/26 05:36:34 deraadt Exp $ */
/* $NetBSD: job.h,v 1.4 1995/06/14 15:19:26 christos Exp $ */
/*
diff --git a/usr.bin/make/list.h b/usr.bin/make/list.h
index 9752035e321..e00496aaf08 100644
--- a/usr.bin/make/list.h
+++ b/usr.bin/make/list.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: list.h,v 1.2 1996/06/26 05:36:34 deraadt Exp $ */
/* $NetBSD: list.h,v 1.4 1995/06/14 15:19:28 christos Exp $ */
/*
diff --git a/usr.bin/make/lst.h b/usr.bin/make/lst.h
index e48945bcb69..1c5e48b2972 100644
--- a/usr.bin/make/lst.h
+++ b/usr.bin/make/lst.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: lst.h,v 1.3 1996/06/26 05:36:35 deraadt Exp $ */
/* $NetBSD: lst.h,v 1.6 1996/02/04 22:20:46 christos Exp $ */
/*
diff --git a/usr.bin/make/lst.lib/Makefile b/usr.bin/make/lst.lib/Makefile
index 1079931cad6..ce6ae605150 100644
--- a/usr.bin/make/lst.lib/Makefile
+++ b/usr.bin/make/lst.lib/Makefile
@@ -1,3 +1,4 @@
+# $OpenBSD: Makefile,v 1.2 1996/06/26 05:36:41 deraadt Exp $
# $NetBSD: Makefile,v 1.3 1995/06/14 15:20:42 christos Exp $
OBJ=lstAppend.o lstDupl.o lstInit.o lstOpen.o lstAtEnd.o lstEnQueue.o \
diff --git a/usr.bin/make/lst.lib/lstAppend.c b/usr.bin/make/lst.lib/lstAppend.c
index 927e595555c..7ea02024a8a 100644
--- a/usr.bin/make/lst.lib/lstAppend.c
+++ b/usr.bin/make/lst.lib/lstAppend.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: lstAppend.c,v 1.2 1996/06/26 05:36:42 deraadt Exp $ */
/* $NetBSD: lstAppend.c,v 1.4 1995/06/14 15:20:44 christos Exp $ */
/*
@@ -40,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)lstAppend.c 5.3 (Berkeley) 6/1/90";
#else
-static char rcsid[] = "$NetBSD: lstAppend.c,v 1.4 1995/06/14 15:20:44 christos Exp $";
+static char rcsid[] = "$OpenBSD: lstAppend.c,v 1.2 1996/06/26 05:36:42 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/make/lst.lib/lstAtEnd.c b/usr.bin/make/lst.lib/lstAtEnd.c
index 7d95d77b106..182d563e801 100644
--- a/usr.bin/make/lst.lib/lstAtEnd.c
+++ b/usr.bin/make/lst.lib/lstAtEnd.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: lstAtEnd.c,v 1.2 1996/06/26 05:36:42 deraadt Exp $ */
/* $NetBSD: lstAtEnd.c,v 1.4 1995/06/14 15:20:46 christos Exp $ */
/*
@@ -40,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)lstAtEnd.c 5.3 (Berkeley) 6/1/90";
#else
-static char rcsid[] = "$NetBSD: lstAtEnd.c,v 1.4 1995/06/14 15:20:46 christos Exp $";
+static char rcsid[] = "$OpenBSD: lstAtEnd.c,v 1.2 1996/06/26 05:36:42 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/make/lst.lib/lstAtFront.c b/usr.bin/make/lst.lib/lstAtFront.c
index 3a95a2738d0..0f9d84d1b3c 100644
--- a/usr.bin/make/lst.lib/lstAtFront.c
+++ b/usr.bin/make/lst.lib/lstAtFront.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: lstAtFront.c,v 1.2 1996/06/26 05:36:43 deraadt Exp $ */
/* $NetBSD: lstAtFront.c,v 1.4 1995/06/14 15:20:48 christos Exp $ */
/*
@@ -40,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)lstAtFront.c 5.3 (Berkeley) 6/1/90";
#else
-static char rcsid[] = "$NetBSD: lstAtFront.c,v 1.4 1995/06/14 15:20:48 christos Exp $";
+static char rcsid[] = "$OpenBSD: lstAtFront.c,v 1.2 1996/06/26 05:36:43 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/make/lst.lib/lstClose.c b/usr.bin/make/lst.lib/lstClose.c
index 436f407b99b..5e60381a63b 100644
--- a/usr.bin/make/lst.lib/lstClose.c
+++ b/usr.bin/make/lst.lib/lstClose.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: lstClose.c,v 1.2 1996/06/26 05:36:43 deraadt Exp $ */
/* $NetBSD: lstClose.c,v 1.4 1995/06/14 15:20:50 christos Exp $ */
/*
@@ -40,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)lstClose.c 5.3 (Berkeley) 6/1/90";
#else
-static char rcsid[] = "$NetBSD: lstClose.c,v 1.4 1995/06/14 15:20:50 christos Exp $";
+static char rcsid[] = "$OpenBSD: lstClose.c,v 1.2 1996/06/26 05:36:43 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/make/lst.lib/lstConcat.c b/usr.bin/make/lst.lib/lstConcat.c
index 8fee761f795..b2a74476308 100644
--- a/usr.bin/make/lst.lib/lstConcat.c
+++ b/usr.bin/make/lst.lib/lstConcat.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: lstConcat.c,v 1.2 1996/06/26 05:36:44 deraadt Exp $ */
/* $NetBSD: lstConcat.c,v 1.5 1995/06/14 15:20:53 christos Exp $ */
/*
@@ -40,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)lstConcat.c 5.3 (Berkeley) 6/1/90";
#else
-static char rcsid[] = "$NetBSD: lstConcat.c,v 1.5 1995/06/14 15:20:53 christos Exp $";
+static char rcsid[] = "$OpenBSD: lstConcat.c,v 1.2 1996/06/26 05:36:44 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/make/lst.lib/lstDatum.c b/usr.bin/make/lst.lib/lstDatum.c
index 64e93a52649..93df0beee50 100644
--- a/usr.bin/make/lst.lib/lstDatum.c
+++ b/usr.bin/make/lst.lib/lstDatum.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: lstDatum.c,v 1.2 1996/06/26 05:36:45 deraadt Exp $ */
/* $NetBSD: lstDatum.c,v 1.4 1995/06/14 15:20:54 christos Exp $ */
/*
@@ -40,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)lstDatum.c 5.3 (Berkeley) 6/1/90";
#else
-static char rcsid[] = "$NetBSD: lstDatum.c,v 1.4 1995/06/14 15:20:54 christos Exp $";
+static char rcsid[] = "$OpenBSD: lstDatum.c,v 1.2 1996/06/26 05:36:45 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/make/lst.lib/lstDeQueue.c b/usr.bin/make/lst.lib/lstDeQueue.c
index a7ac8d9f314..21e0f6f2591 100644
--- a/usr.bin/make/lst.lib/lstDeQueue.c
+++ b/usr.bin/make/lst.lib/lstDeQueue.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: lstDeQueue.c,v 1.2 1996/06/26 05:36:45 deraadt Exp $ */
/* $NetBSD: lstDeQueue.c,v 1.4 1995/06/14 15:20:56 christos Exp $ */
/*
@@ -40,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)lstDeQueue.c 5.3 (Berkeley) 6/1/90";
#else
-static char rcsid[] = "$NetBSD: lstDeQueue.c,v 1.4 1995/06/14 15:20:56 christos Exp $";
+static char rcsid[] = "$OpenBSD: lstDeQueue.c,v 1.2 1996/06/26 05:36:45 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/make/lst.lib/lstDestroy.c b/usr.bin/make/lst.lib/lstDestroy.c
index ed772b6aa05..3f23577f5a5 100644
--- a/usr.bin/make/lst.lib/lstDestroy.c
+++ b/usr.bin/make/lst.lib/lstDestroy.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: lstDestroy.c,v 1.2 1996/06/26 05:36:46 deraadt Exp $ */
/* $NetBSD: lstDestroy.c,v 1.5 1995/06/14 15:20:58 christos Exp $ */
/*
@@ -40,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)lstDestroy.c 5.3 (Berkeley) 6/1/90";
#else
-static char rcsid[] = "$NetBSD: lstDestroy.c,v 1.5 1995/06/14 15:20:58 christos Exp $";
+static char rcsid[] = "$OpenBSD: lstDestroy.c,v 1.2 1996/06/26 05:36:46 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/make/lst.lib/lstDupl.c b/usr.bin/make/lst.lib/lstDupl.c
index a0bf09e0c8d..d509f7e8421 100644
--- a/usr.bin/make/lst.lib/lstDupl.c
+++ b/usr.bin/make/lst.lib/lstDupl.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: lstDupl.c,v 1.2 1996/06/26 05:36:46 deraadt Exp $ */
/* $NetBSD: lstDupl.c,v 1.5 1995/06/14 15:21:02 christos Exp $ */
/*
@@ -40,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)lstDupl.c 5.3 (Berkeley) 6/1/90";
#else
-static char rcsid[] = "$NetBSD: lstDupl.c,v 1.5 1995/06/14 15:21:02 christos Exp $";
+static char rcsid[] = "$OpenBSD: lstDupl.c,v 1.2 1996/06/26 05:36:46 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/make/lst.lib/lstEnQueue.c b/usr.bin/make/lst.lib/lstEnQueue.c
index da344d8560b..657dfb66c3e 100644
--- a/usr.bin/make/lst.lib/lstEnQueue.c
+++ b/usr.bin/make/lst.lib/lstEnQueue.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: lstEnQueue.c,v 1.2 1996/06/26 05:36:47 deraadt Exp $ */
/* $NetBSD: lstEnQueue.c,v 1.4 1995/06/14 15:21:04 christos Exp $ */
/*
@@ -40,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)lstEnQueue.c 5.3 (Berkeley) 6/1/90";
#else
-static char rcsid[] = "$NetBSD: lstEnQueue.c,v 1.4 1995/06/14 15:21:04 christos Exp $";
+static char rcsid[] = "$OpenBSD: lstEnQueue.c,v 1.2 1996/06/26 05:36:47 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/make/lst.lib/lstFind.c b/usr.bin/make/lst.lib/lstFind.c
index f226a1a551b..76e7ea8e36d 100644
--- a/usr.bin/make/lst.lib/lstFind.c
+++ b/usr.bin/make/lst.lib/lstFind.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: lstFind.c,v 1.2 1996/06/26 05:36:47 deraadt Exp $ */
/* $NetBSD: lstFind.c,v 1.5 1995/06/14 15:21:07 christos Exp $ */
/*
@@ -40,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)lstFind.c 5.3 (Berkeley) 6/1/90";
#else
-static char rcsid[] = "$NetBSD: lstFind.c,v 1.5 1995/06/14 15:21:07 christos Exp $";
+static char rcsid[] = "$OpenBSD: lstFind.c,v 1.2 1996/06/26 05:36:47 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/make/lst.lib/lstFindFrom.c b/usr.bin/make/lst.lib/lstFindFrom.c
index 1e619d3b45a..6a2dcc3bd1f 100644
--- a/usr.bin/make/lst.lib/lstFindFrom.c
+++ b/usr.bin/make/lst.lib/lstFindFrom.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: lstFindFrom.c,v 1.2 1996/06/26 05:36:48 deraadt Exp $ */
/* $NetBSD: lstFindFrom.c,v 1.5 1995/06/14 15:21:09 christos Exp $ */
/*
@@ -38,7 +39,7 @@
#ifndef lint
/* from: static char sccsid[] = "@(#)lstFindFrom.c 5.3 (Berkeley) 6/1/90"; */
-static char *rcsid = "$Id: lstFindFrom.c,v 1.1 1995/10/18 08:45:45 deraadt Exp $";
+static char *rcsid = "$OpenBSD: lstFindFrom.c,v 1.2 1996/06/26 05:36:48 deraadt Exp $";
#endif /* not lint */
/*-
diff --git a/usr.bin/make/lst.lib/lstFirst.c b/usr.bin/make/lst.lib/lstFirst.c
index ba988eed083..3e50796cfaf 100644
--- a/usr.bin/make/lst.lib/lstFirst.c
+++ b/usr.bin/make/lst.lib/lstFirst.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: lstFirst.c,v 1.2 1996/06/26 05:36:48 deraadt Exp $ */
/* $NetBSD: lstFirst.c,v 1.4 1995/06/14 15:21:12 christos Exp $ */
/*
@@ -40,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)lstFirst.c 5.3 (Berkeley) 6/1/90";
#else
-static char rcsid[] = "$NetBSD: lstFirst.c,v 1.4 1995/06/14 15:21:12 christos Exp $";
+static char rcsid[] = "$OpenBSD: lstFirst.c,v 1.2 1996/06/26 05:36:48 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/make/lst.lib/lstForEach.c b/usr.bin/make/lst.lib/lstForEach.c
index 93628676253..05c1b0872c3 100644
--- a/usr.bin/make/lst.lib/lstForEach.c
+++ b/usr.bin/make/lst.lib/lstForEach.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: lstForEach.c,v 1.2 1996/06/26 05:36:49 deraadt Exp $ */
/* $NetBSD: lstForEach.c,v 1.5 1995/06/14 15:21:14 christos Exp $ */
/*
@@ -40,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)lstForEach.c 5.3 (Berkeley) 6/1/90";
#else
-static char rcsid[] = "$NetBSD: lstForEach.c,v 1.5 1995/06/14 15:21:14 christos Exp $";
+static char rcsid[] = "$OpenBSD: lstForEach.c,v 1.2 1996/06/26 05:36:49 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/make/lst.lib/lstForEachFrom.c b/usr.bin/make/lst.lib/lstForEachFrom.c
index 4451404c087..5b62fab89e1 100644
--- a/usr.bin/make/lst.lib/lstForEachFrom.c
+++ b/usr.bin/make/lst.lib/lstForEachFrom.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: lstForEachFrom.c,v 1.2 1996/06/26 05:36:50 deraadt Exp $ */
/* $NetBSD: lstForEachFrom.c,v 1.4 1995/06/14 15:21:16 christos Exp $ */
/*
@@ -40,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)lstForEachFrom.c 5.3 (Berkeley) 6/1/90";
#else
-static char rcsid[] = "$NetBSD: lstForEachFrom.c,v 1.4 1995/06/14 15:21:16 christos Exp $";
+static char rcsid[] = "$OpenBSD: lstForEachFrom.c,v 1.2 1996/06/26 05:36:50 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/make/lst.lib/lstInit.c b/usr.bin/make/lst.lib/lstInit.c
index a69bd2dd5c0..f1ea3687c29 100644
--- a/usr.bin/make/lst.lib/lstInit.c
+++ b/usr.bin/make/lst.lib/lstInit.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: lstInit.c,v 1.2 1996/06/26 05:36:50 deraadt Exp $ */
/* $NetBSD: lstInit.c,v 1.4 1995/06/14 15:21:18 christos Exp $ */
/*
@@ -40,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)lstInit.c 5.4 (Berkeley) 12/28/90";
#else
-static char rcsid[] = "$NetBSD: lstInit.c,v 1.4 1995/06/14 15:21:18 christos Exp $";
+static char rcsid[] = "$OpenBSD: lstInit.c,v 1.2 1996/06/26 05:36:50 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/make/lst.lib/lstInsert.c b/usr.bin/make/lst.lib/lstInsert.c
index 4abd1cf6125..95e9a0ddc35 100644
--- a/usr.bin/make/lst.lib/lstInsert.c
+++ b/usr.bin/make/lst.lib/lstInsert.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: lstInsert.c,v 1.2 1996/06/26 05:36:51 deraadt Exp $ */
/* $NetBSD: lstInsert.c,v 1.4 1995/06/14 15:21:21 christos Exp $ */
/*
@@ -40,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)lstInsert.c 5.3 (Berkeley) 6/1/90";
#else
-static char rcsid[] = "$NetBSD: lstInsert.c,v 1.4 1995/06/14 15:21:21 christos Exp $";
+static char rcsid[] = "$OpenBSD: lstInsert.c,v 1.2 1996/06/26 05:36:51 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/make/lst.lib/lstInt.h b/usr.bin/make/lst.lib/lstInt.h
index 72da78eb4df..d770d6f3711 100644
--- a/usr.bin/make/lst.lib/lstInt.h
+++ b/usr.bin/make/lst.lib/lstInt.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: lstInt.h,v 1.3 1996/06/26 05:36:51 deraadt Exp $ */
/* $NetBSD: lstInt.h,v 1.6 1995/11/10 21:27:27 cgd Exp $ */
/*
diff --git a/usr.bin/make/lst.lib/lstIsAtEnd.c b/usr.bin/make/lst.lib/lstIsAtEnd.c
index 5ae21b283d8..3505bac30c6 100644
--- a/usr.bin/make/lst.lib/lstIsAtEnd.c
+++ b/usr.bin/make/lst.lib/lstIsAtEnd.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: lstIsAtEnd.c,v 1.2 1996/06/26 05:36:52 deraadt Exp $ */
/* $NetBSD: lstIsAtEnd.c,v 1.4 1995/06/14 15:21:25 christos Exp $ */
/*
@@ -40,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)lstIsAtEnd.c 5.3 (Berkeley) 6/1/90";
#else
-static char rcsid[] = "$NetBSD: lstIsAtEnd.c,v 1.4 1995/06/14 15:21:25 christos Exp $";
+static char rcsid[] = "$OpenBSD: lstIsAtEnd.c,v 1.2 1996/06/26 05:36:52 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/make/lst.lib/lstIsEmpty.c b/usr.bin/make/lst.lib/lstIsEmpty.c
index 1280bd436bc..4d50401c191 100644
--- a/usr.bin/make/lst.lib/lstIsEmpty.c
+++ b/usr.bin/make/lst.lib/lstIsEmpty.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: lstIsEmpty.c,v 1.2 1996/06/26 05:36:52 deraadt Exp $ */
/* $NetBSD: lstIsEmpty.c,v 1.4 1995/06/14 15:21:27 christos Exp $ */
/*
@@ -40,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)lstIsEmpty.c 5.3 (Berkeley) 6/1/90";
#else
-static char rcsid[] = "$NetBSD: lstIsEmpty.c,v 1.4 1995/06/14 15:21:27 christos Exp $";
+static char rcsid[] = "$OpenBSD: lstIsEmpty.c,v 1.2 1996/06/26 05:36:52 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/make/lst.lib/lstLast.c b/usr.bin/make/lst.lib/lstLast.c
index f822d56fbc7..f9012cc14e9 100644
--- a/usr.bin/make/lst.lib/lstLast.c
+++ b/usr.bin/make/lst.lib/lstLast.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: lstLast.c,v 1.2 1996/06/26 05:36:53 deraadt Exp $ */
/* $NetBSD: lstLast.c,v 1.4 1995/06/14 15:21:29 christos Exp $ */
/*
@@ -40,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)lstLast.c 5.3 (Berkeley) 6/1/90";
#else
-static char rcsid[] = "$NetBSD: lstLast.c,v 1.4 1995/06/14 15:21:29 christos Exp $";
+static char rcsid[] = "$OpenBSD: lstLast.c,v 1.2 1996/06/26 05:36:53 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/make/lst.lib/lstMember.c b/usr.bin/make/lst.lib/lstMember.c
index fec34685660..9cf2a98831b 100644
--- a/usr.bin/make/lst.lib/lstMember.c
+++ b/usr.bin/make/lst.lib/lstMember.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: lstMember.c,v 1.2 1996/06/26 05:36:53 deraadt Exp $ */
/* $NetBSD: lstMember.c,v 1.4 1995/06/14 15:21:32 christos Exp $ */
/*
@@ -40,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)lstMember.c 5.3 (Berkeley) 6/1/90";
#else
-static char rcsid[] = "$NetBSD: lstMember.c,v 1.4 1995/06/14 15:21:32 christos Exp $";
+static char rcsid[] = "$OpenBSD: lstMember.c,v 1.2 1996/06/26 05:36:53 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/make/lst.lib/lstNext.c b/usr.bin/make/lst.lib/lstNext.c
index 1ddcc4b1d23..90e7e49d7c7 100644
--- a/usr.bin/make/lst.lib/lstNext.c
+++ b/usr.bin/make/lst.lib/lstNext.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: lstNext.c,v 1.2 1996/06/26 05:36:54 deraadt Exp $ */
/* $NetBSD: lstNext.c,v 1.4 1995/06/14 15:21:35 christos Exp $ */
/*
@@ -40,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)lstNext.c 5.3 (Berkeley) 6/1/90";
#else
-static char rcsid[] = "$NetBSD: lstNext.c,v 1.4 1995/06/14 15:21:35 christos Exp $";
+static char rcsid[] = "$OpenBSD: lstNext.c,v 1.2 1996/06/26 05:36:54 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/make/lst.lib/lstOpen.c b/usr.bin/make/lst.lib/lstOpen.c
index e2df9aba1dd..532c833d298 100644
--- a/usr.bin/make/lst.lib/lstOpen.c
+++ b/usr.bin/make/lst.lib/lstOpen.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: lstOpen.c,v 1.2 1996/06/26 05:36:54 deraadt Exp $ */
/* $NetBSD: lstOpen.c,v 1.4 1995/06/14 15:21:37 christos Exp $ */
/*
@@ -40,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)lstOpen.c 5.3 (Berkeley) 6/1/90";
#else
-static char rcsid[] = "$NetBSD: lstOpen.c,v 1.4 1995/06/14 15:21:37 christos Exp $";
+static char rcsid[] = "$OpenBSD: lstOpen.c,v 1.2 1996/06/26 05:36:54 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/make/lst.lib/lstRemove.c b/usr.bin/make/lst.lib/lstRemove.c
index 6c3f8fe9b53..4e8ffce1814 100644
--- a/usr.bin/make/lst.lib/lstRemove.c
+++ b/usr.bin/make/lst.lib/lstRemove.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: lstRemove.c,v 1.2 1996/06/26 05:36:55 deraadt Exp $ */
/* $NetBSD: lstRemove.c,v 1.4 1995/06/14 15:21:39 christos Exp $ */
/*
@@ -40,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)lstRemove.c 5.3 (Berkeley) 6/1/90";
#else
-static char rcsid[] = "$NetBSD: lstRemove.c,v 1.4 1995/06/14 15:21:39 christos Exp $";
+static char rcsid[] = "$OpenBSD: lstRemove.c,v 1.2 1996/06/26 05:36:55 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/make/lst.lib/lstReplace.c b/usr.bin/make/lst.lib/lstReplace.c
index 2476a42fd8f..8c8ce83741f 100644
--- a/usr.bin/make/lst.lib/lstReplace.c
+++ b/usr.bin/make/lst.lib/lstReplace.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: lstReplace.c,v 1.2 1996/06/26 05:36:56 deraadt Exp $ */
/* $NetBSD: lstReplace.c,v 1.4 1995/06/14 15:21:41 christos Exp $ */
/*
@@ -40,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)lstReplace.c 5.3 (Berkeley) 6/1/90";
#else
-static char rcsid[] = "$NetBSD: lstReplace.c,v 1.4 1995/06/14 15:21:41 christos Exp $";
+static char rcsid[] = "$OpenBSD: lstReplace.c,v 1.2 1996/06/26 05:36:56 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/make/lst.lib/lstSucc.c b/usr.bin/make/lst.lib/lstSucc.c
index 2258fd576d5..be0ceaaa4d7 100644
--- a/usr.bin/make/lst.lib/lstSucc.c
+++ b/usr.bin/make/lst.lib/lstSucc.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: lstSucc.c,v 1.2 1996/06/26 05:36:56 deraadt Exp $ */
/* $NetBSD: lstSucc.c,v 1.4 1995/06/14 15:21:42 christos Exp $ */
/*
@@ -40,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)lstSucc.c 5.3 (Berkeley) 6/1/90";
#else
-static char rcsid[] = "$NetBSD: lstSucc.c,v 1.4 1995/06/14 15:21:42 christos Exp $";
+static char rcsid[] = "$OpenBSD: lstSucc.c,v 1.2 1996/06/26 05:36:56 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/make/nonints.h b/usr.bin/make/nonints.h
index d1b948ecf54..87c9b328611 100644
--- a/usr.bin/make/nonints.h
+++ b/usr.bin/make/nonints.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: nonints.h,v 1.4 1996/06/26 05:36:35 deraadt Exp $ */
/* $NetBSD: nonints.h,v 1.9 1996/03/31 21:30:07 christos Exp $ */
/*-
diff --git a/usr.bin/make/sprite.h b/usr.bin/make/sprite.h
index 153804e01eb..b746de933c8 100644
--- a/usr.bin/make/sprite.h
+++ b/usr.bin/make/sprite.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: sprite.h,v 1.2 1996/06/26 05:36:36 deraadt Exp $ */
/* $NetBSD: sprite.h,v 1.5 1995/06/14 15:19:54 christos Exp $ */
/*
diff --git a/usr.bin/make/str.c b/usr.bin/make/str.c
index 94dacf99a89..a4e19c1a4e4 100644
--- a/usr.bin/make/str.c
+++ b/usr.bin/make/str.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: str.c,v 1.4 1996/06/26 05:36:37 deraadt Exp $ */
/* $NetBSD: str.c,v 1.12 1996/03/29 02:17:34 jtc Exp $ */
/*-
@@ -42,7 +43,7 @@
#if 0
static char sccsid[] = "@(#)str.c 5.8 (Berkeley) 6/1/90";
#else
-static char rcsid[] = "$NetBSD: str.c,v 1.12 1996/03/29 02:17:34 jtc Exp $";
+static char rcsid[] = "$OpenBSD: str.c,v 1.4 1996/06/26 05:36:37 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/make/suff.c b/usr.bin/make/suff.c
index 43b94d5247a..a2c045bbeba 100644
--- a/usr.bin/make/suff.c
+++ b/usr.bin/make/suff.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: suff.c,v 1.3 1996/06/26 05:36:38 deraadt Exp $ */
/* $NetBSD: suff.c,v 1.11 1995/11/02 23:55:08 christos Exp $ */
/*
@@ -42,7 +43,7 @@
#if 0
static char sccsid[] = "@(#)suff.c 5.6 (Berkeley) 6/1/90";
#else
-static char rcsid[] = "$NetBSD: suff.c,v 1.11 1995/11/02 23:55:08 christos Exp $";
+static char rcsid[] = "$OpenBSD: suff.c,v 1.3 1996/06/26 05:36:38 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/make/util.c b/usr.bin/make/util.c
index b3ddf6a9faf..767551e9434 100644
--- a/usr.bin/make/util.c
+++ b/usr.bin/make/util.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: util.c,v 1.3 1996/06/26 05:36:38 deraadt Exp $ */
/* $NetBSD: util.c,v 1.5 1995/11/22 17:40:17 christos Exp $ */
/*
@@ -6,7 +7,7 @@
*/
#ifndef lint
-static char rcsid[] = "$Id: util.c,v 1.2 1995/12/14 03:23:39 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: util.c,v 1.3 1996/06/26 05:36:38 deraadt Exp $";
#endif
#include <stdio.h>
diff --git a/usr.bin/make/var.c b/usr.bin/make/var.c
index 28ae8b7304a..15ee8d72598 100644
--- a/usr.bin/make/var.c
+++ b/usr.bin/make/var.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: var.c,v 1.3 1996/06/26 05:36:39 deraadt Exp $ */
/* $NetBSD: var.c,v 1.12 1995/11/02 23:55:12 christos Exp $ */
/*
@@ -42,7 +43,7 @@
#if 0
static char sccsid[] = "@(#)var.c 5.7 (Berkeley) 6/1/90";
#else
-static char rcsid[] = "$NetBSD: var.c,v 1.12 1995/11/02 23:55:12 christos Exp $";
+static char rcsid[] = "$OpenBSD: var.c,v 1.3 1996/06/26 05:36:39 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/man/Makefile b/usr.bin/man/Makefile
index 0849681c1bc..63dc8ee148b 100644
--- a/usr.bin/man/Makefile
+++ b/usr.bin/man/Makefile
@@ -1,5 +1,5 @@
+# $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 $
-# @(#)Makefile 8.1 (Berkeley) 6/6/93
PROG= man
SRCS= config.c man.c
diff --git a/usr.bin/man/config.c b/usr.bin/man/config.c
index 93e195fea6b..3e7c662a513 100644
--- a/usr.bin/man/config.c
+++ b/usr.bin/man/config.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: config.c,v 1.2 1996/06/26 05:36:59 deraadt Exp $ */
/* $NetBSD: config.c,v 1.7 1995/09/28 06:05:21 tls Exp $ */
/*
@@ -37,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)config.c 8.8 (Berkeley) 1/31/95";
#else
-static char rcsid[] = "$NetBSD: config.c,v 1.7 1995/09/28 06:05:21 tls Exp $";
+static char rcsid[] = "$OpenBSD: config.c,v 1.2 1996/06/26 05:36:59 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/man/config.h b/usr.bin/man/config.h
index ccf9f62286e..6c64c037148 100644
--- a/usr.bin/man/config.h
+++ b/usr.bin/man/config.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: config.h,v 1.2 1996/06/26 05:37:00 deraadt Exp $ */
/* $NetBSD: config.h,v 1.2 1995/09/28 06:05:28 tls Exp $ */
/*-
diff --git a/usr.bin/man/man.1 b/usr.bin/man/man.1
index 6bb4ad79e42..632229bfa3b 100644
--- a/usr.bin/man/man.1
+++ b/usr.bin/man/man.1
@@ -1,3 +1,5 @@
+.\" $OpenBSD: man.1,v 1.3 1996/06/26 05:37:00 deraadt Exp $
+.\"
.\" Copyright (c) 1989, 1990, 1993
.\" The Regents of the University of California. All rights reserved.
.\"
diff --git a/usr.bin/man/man.c b/usr.bin/man/man.c
index ee693ced288..4006606985d 100644
--- a/usr.bin/man/man.c
+++ b/usr.bin/man/man.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: man.c,v 1.2 1996/06/26 05:37:01 deraadt Exp $ */
/* $NetBSD: man.c,v 1.7 1995/09/28 06:05:34 tls Exp $ */
/*
@@ -43,7 +44,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)man.c 8.17 (Berkeley) 1/31/95";
#else
-static char rcsid[] = "$NetBSD: man.c,v 1.7 1995/09/28 06:05:34 tls Exp $";
+static char rcsid[] = "$OpenBSD: man.c,v 1.2 1996/06/26 05:37:01 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/man/man.conf b/usr.bin/man/man.conf
index 9faad52546e..a6534097f17 100644
--- a/usr.bin/man/man.conf
+++ b/usr.bin/man/man.conf
@@ -1,3 +1,5 @@
+# $OpenBSD: man.conf,v 1.2 1996/06/26 05:37:02 deraadt Exp $
+
# Sheer, raging paranoia...
_version BSD.2
diff --git a/usr.bin/man/man.conf.5 b/usr.bin/man/man.conf.5
index 353a30236fb..e53ca5ace4b 100644
--- a/usr.bin/man/man.conf.5
+++ b/usr.bin/man/man.conf.5
@@ -1,3 +1,5 @@
+.\" $OpenBSD: man.conf.5,v 1.2 1996/06/26 05:37:02 deraadt Exp $
+.\"
.\" Copyright (c) 1989, 1991, 1993
.\" The Regents of the University of California. All rights reserved.
.\"
diff --git a/usr.bin/man/pathnames.h b/usr.bin/man/pathnames.h
index 03282996713..7c5799944e7 100644
--- a/usr.bin/man/pathnames.h
+++ b/usr.bin/man/pathnames.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: pathnames.h,v 1.2 1996/06/26 05:37:03 deraadt Exp $ */
/* $NetBSD: pathnames.h,v 1.3 1995/09/28 06:05:40 tls Exp $ */
/*
diff --git a/usr.bin/mesg/Makefile b/usr.bin/mesg/Makefile
index 2a673985f66..bc47279900b 100644
--- a/usr.bin/mesg/Makefile
+++ b/usr.bin/mesg/Makefile
@@ -1,5 +1,5 @@
+# $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 $
-# @(#)Makefile 8.1 (Berkeley) 6/6/93
PROG= mesg
diff --git a/usr.bin/mesg/mesg.1 b/usr.bin/mesg/mesg.1
index 24eb70202dc..9127399e715 100644
--- a/usr.bin/mesg/mesg.1
+++ b/usr.bin/mesg/mesg.1
@@ -1,3 +1,4 @@
+.\" $OpenBSD: mesg.1,v 1.2 1996/06/26 05:37:04 deraadt Exp $
.\" $NetBSD: mesg.1,v 1.3 1994/12/23 07:16:31 jtc Exp $
.\"
.\" Copyright (c) 1987, 1990, 1993
diff --git a/usr.bin/mesg/mesg.c b/usr.bin/mesg/mesg.c
index 1abcc0dc366..8f7ac36553c 100644
--- a/usr.bin/mesg/mesg.c
+++ b/usr.bin/mesg/mesg.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: mesg.c,v 1.2 1996/06/26 05:37:05 deraadt Exp $ */
/* $NetBSD: mesg.c,v 1.4 1994/12/23 07:16:32 jtc Exp $ */
/*
@@ -48,7 +49,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)mesg.c 8.2 (Berkeley) 1/21/94";
#endif
-static char rcsid[] = "$NetBSD: mesg.c,v 1.4 1994/12/23 07:16:32 jtc Exp $";
+static char rcsid[] = "$OpenBSD: mesg.c,v 1.2 1996/06/26 05:37:05 deraadt Exp $";
#endif /* not lint */
#include <sys/types.h>
diff --git a/usr.bin/mkdep/Makefile b/usr.bin/mkdep/Makefile
index 51b35f6df2b..1222ebf8481 100644
--- a/usr.bin/mkdep/Makefile
+++ b/usr.bin/mkdep/Makefile
@@ -1,5 +1,5 @@
+# $OpenBSD: Makefile,v 1.2 1996/06/26 05:37:06 deraadt Exp $
# $NetBSD: Makefile,v 1.6 1994/12/23 07:34:55 jtc Exp $
-# @(#)Makefile 8.1 (Berkeley) 6/6/93
MAN= mkdep.1
diff --git a/usr.bin/mkdep/mkdep.1 b/usr.bin/mkdep/mkdep.1
index c1028cfa868..97061d115fd 100644
--- a/usr.bin/mkdep/mkdep.1
+++ b/usr.bin/mkdep/mkdep.1
@@ -1,3 +1,4 @@
+.\" $OpenBSD: mkdep.1,v 1.2 1996/06/26 05:37:06 deraadt Exp $
.\" $NetBSD: mkdep.1,v 1.3 1994/12/23 07:34:56 jtc Exp $
.\"
.\" Copyright (c) 1987, 1990, 1993
diff --git a/usr.bin/mkdep/mkdep.append b/usr.bin/mkdep/mkdep.append
index 9fcde8353d3..e541fa30941 100644
--- a/usr.bin/mkdep/mkdep.append
+++ b/usr.bin/mkdep/mkdep.append
@@ -1,5 +1,6 @@
#!/bin/sh -
#
+# $OpenBSD: mkdep.append,v 1.2 1996/06/26 05:37:07 deraadt Exp $
# $NetBSD: mkdep.append,v 1.2 1994/12/23 07:34:57 jtc Exp $
#
# Copyright (c) 1991, 1993
diff --git a/usr.bin/mkdep/mkdep.gcc.sh b/usr.bin/mkdep/mkdep.gcc.sh
index 8eb621bf6d2..64df4a00b0d 100644
--- a/usr.bin/mkdep/mkdep.gcc.sh
+++ b/usr.bin/mkdep/mkdep.gcc.sh
@@ -1,5 +1,6 @@
#!/bin/sh -
#
+# $OpenBSD: mkdep.gcc.sh,v 1.2 1996/06/26 05:37:07 deraadt Exp $
# $NetBSD: mkdep.gcc.sh,v 1.9 1994/12/23 07:34:59 jtc Exp $
#
# Copyright (c) 1991, 1993
diff --git a/usr.bin/mkdep/mkdep.old.compiler b/usr.bin/mkdep/mkdep.old.compiler
index a9c0978661c..285bd4adf6b 100644
--- a/usr.bin/mkdep/mkdep.old.compiler
+++ b/usr.bin/mkdep/mkdep.old.compiler
@@ -1,5 +1,6 @@
#!/bin/sh -
#
+# $OpenBSD: mkdep.old.compiler,v 1.2 1996/06/26 05:37:08 deraadt Exp $
# $NetBSD: mkdep.old.compiler,v 1.2 1994/12/23 07:35:00 jtc Exp $
#
# Copyright (c) 1991, 1993
diff --git a/usr.bin/mkdep/mkdep.sh b/usr.bin/mkdep/mkdep.sh
index 42a46188612..b9505e195e8 100644
--- a/usr.bin/mkdep/mkdep.sh
+++ b/usr.bin/mkdep/mkdep.sh
@@ -1,5 +1,6 @@
#!/bin/sh -
#
+# $OpenBSD: mkdep.sh,v 1.2 1996/06/26 05:37:08 deraadt Exp $
# $NetBSD: mkdep.sh,v 1.3 1994/12/23 07:35:02 jtc Exp $
#
# Copyright (c) 1991, 1993
diff --git a/usr.bin/mkdep/mkdep.ultrix b/usr.bin/mkdep/mkdep.ultrix
index cb4a6225ce7..c9e126867b0 100644
--- a/usr.bin/mkdep/mkdep.ultrix
+++ b/usr.bin/mkdep/mkdep.ultrix
@@ -1,5 +1,6 @@
#!/bin/sh -
#
+# $OpenBSD: mkdep.ultrix,v 1.2 1996/06/26 05:37:09 deraadt Exp $
# $NetBSD: mkdep.ultrix,v 1.2 1994/12/23 07:35:04 jtc Exp $
#
# Copyright (c) 1991, 1993
diff --git a/usr.bin/mkfifo/Makefile b/usr.bin/mkfifo/Makefile
index 463d91a3a7f..98c194f9bd8 100644
--- a/usr.bin/mkfifo/Makefile
+++ b/usr.bin/mkfifo/Makefile
@@ -1,5 +1,5 @@
+# $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 $
-# @(#)Makefile 8.1 (Berkeley) 6/6/93
PROG= mkfifo
diff --git a/usr.bin/mkfifo/mkfifo.1 b/usr.bin/mkfifo/mkfifo.1
index 56071b3ba32..63a1352deb9 100644
--- a/usr.bin/mkfifo/mkfifo.1
+++ b/usr.bin/mkfifo/mkfifo.1
@@ -1,3 +1,4 @@
+.\" $OpenBSD: mkfifo.1,v 1.2 1996/06/26 05:37:11 deraadt Exp $
.\" $NetBSD: mkfifo.1,v 1.4 1994/12/23 07:16:54 jtc Exp $
.\"
.\" Copyright (c) 1990, 1993
diff --git a/usr.bin/mkfifo/mkfifo.c b/usr.bin/mkfifo/mkfifo.c
index 8818ca8f460..38517d752b0 100644
--- a/usr.bin/mkfifo/mkfifo.c
+++ b/usr.bin/mkfifo/mkfifo.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: mkfifo.c,v 1.2 1996/06/26 05:37:11 deraadt Exp $ */
/* $NetBSD: mkfifo.c,v 1.7 1994/12/23 07:16:56 jtc Exp $ */
/*
@@ -43,7 +44,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)mkfifo.c 8.2 (Berkeley) 1/5/94";
#endif
-static char rcsid[] = "$NetBSD: mkfifo.c,v 1.7 1994/12/23 07:16:56 jtc Exp $";
+static char rcsid[] = "$OpenBSD: mkfifo.c,v 1.2 1996/06/26 05:37:11 deraadt Exp $";
#endif /* not lint */
#include <stdio.h>
diff --git a/usr.bin/mkstr/Makefile b/usr.bin/mkstr/Makefile
index 35fb6049ef2..e5edc293e5a 100644
--- a/usr.bin/mkstr/Makefile
+++ b/usr.bin/mkstr/Makefile
@@ -1,5 +1,5 @@
+# $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 $
-# @(#)Makefile 8.1 (Berkeley) 6/6/93
PROG= mkstr
diff --git a/usr.bin/mkstr/mkstr.1 b/usr.bin/mkstr/mkstr.1
index 1202cd2b521..68f5ad8556f 100644
--- a/usr.bin/mkstr/mkstr.1
+++ b/usr.bin/mkstr/mkstr.1
@@ -1,3 +1,4 @@
+.\" $OpenBSD: mkstr.1,v 1.2 1996/06/26 05:37:13 deraadt Exp $
.\" $NetBSD: mkstr.1,v 1.3 1995/09/28 06:22:19 tls Exp $
.\"
.\" Copyright (c) 1980, 1990, 1993
diff --git a/usr.bin/mkstr/mkstr.c b/usr.bin/mkstr/mkstr.c
index 44de631785e..213fa6f221c 100644
--- a/usr.bin/mkstr/mkstr.c
+++ b/usr.bin/mkstr/mkstr.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: mkstr.c,v 1.2 1996/06/26 05:37:13 deraadt Exp $ */
/* $NetBSD: mkstr.c,v 1.4 1995/09/28 06:22:20 tls Exp $ */
/*
@@ -43,7 +44,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)mkstr.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$NetBSD: mkstr.c,v 1.4 1995/09/28 06:22:20 tls Exp $";
+static char rcsid[] = "$OpenBSD: mkstr.c,v 1.2 1996/06/26 05:37:13 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/modstat/Makefile b/usr.bin/modstat/Makefile
index b3f715dcdfe..66f0118e0d0 100644
--- a/usr.bin/modstat/Makefile
+++ b/usr.bin/modstat/Makefile
@@ -1,3 +1,4 @@
+# $OpenBSD: Makefile,v 1.2 1996/06/26 05:37:14 deraadt Exp $
#
# Makefile for modstat
#
@@ -33,7 +34,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $Id: Makefile,v 1.1 1995/10/18 08:45:47 deraadt Exp $
#
PROG= modstat
diff --git a/usr.bin/modstat/modstat.8 b/usr.bin/modstat/modstat.8
index 629b9610f1e..aa1682c8787 100644
--- a/usr.bin/modstat/modstat.8
+++ b/usr.bin/modstat/modstat.8
@@ -1,3 +1,4 @@
+.\" $OpenBSD: modstat.8,v 1.2 1996/06/26 05:37:15 deraadt Exp $
.\" Copyright (c) 1993 Christopher G. Demetriou
.\" All rights reserved.
.\"
@@ -23,7 +24,6 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" $Id: modstat.8,v 1.1 1995/10/18 08:45:48 deraadt Exp $
.\"
.Dd June 7, 1993
.Dt MODSTAT 8
diff --git a/usr.bin/modstat/modstat.c b/usr.bin/modstat/modstat.c
index a5044db7cf5..743ad64ea3b 100644
--- a/usr.bin/modstat/modstat.c
+++ b/usr.bin/modstat/modstat.c
@@ -1,3 +1,4 @@
+/* * $OpenBSD: modstat.c,v 1.3 1996/06/26 05:37:15 deraadt Exp $*/
/*
* Copyright (c) 1993 Terrence R. Lambert.
* All rights reserved.
@@ -29,7 +30,6 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: modstat.c,v 1.2 1996/06/21 11:40:09 mickey Exp $
*/
#include <stdio.h>
diff --git a/usr.bin/modstat/pathnames.h b/usr.bin/modstat/pathnames.h
index 81f70f2d879..b0f720eaa23 100644
--- a/usr.bin/modstat/pathnames.h
+++ b/usr.bin/modstat/pathnames.h
@@ -1,3 +1,5 @@
+/* $OpenBSD: pathnames.h,v 1.2 1996/06/26 05:37:16 deraadt Exp $ */
+
#include <paths.h>
#define _PATH_LKM "/dev/lkm"
diff --git a/usr.bin/msgs/Makefile b/usr.bin/msgs/Makefile
index 17e2ded2b41..a1a6cb4e2cd 100644
--- a/usr.bin/msgs/Makefile
+++ b/usr.bin/msgs/Makefile
@@ -1,5 +1,5 @@
+# $OpenBSD: Makefile,v 1.3 1996/06/26 05:37:17 deraadt Exp $
# $NetBSD: Makefile,v 1.6 1995/09/28 06:57:37 tls Exp $
-# @(#)Makefile 8.2 (Berkeley) 4/28/95
PROG= msgs
DPADD= ${LIBTERMCAP}
diff --git a/usr.bin/msgs/msgs.1 b/usr.bin/msgs/msgs.1
index 508b2ca27ec..4aa9330658c 100644
--- a/usr.bin/msgs/msgs.1
+++ b/usr.bin/msgs/msgs.1
@@ -1,3 +1,4 @@
+.\" $OpenBSD: msgs.1,v 1.2 1996/06/26 05:37:17 deraadt Exp $
.\" $NetBSD: msgs.1,v 1.5 1995/09/28 06:57:39 tls Exp $
.\"
.\" Copyright (c) 1980, 1990, 1993
diff --git a/usr.bin/msgs/msgs.c b/usr.bin/msgs/msgs.c
index 0c1d73ef49f..c718be557a1 100644
--- a/usr.bin/msgs/msgs.c
+++ b/usr.bin/msgs/msgs.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: msgs.c,v 1.3 1996/06/26 05:37:18 deraadt Exp $ */
/* $NetBSD: msgs.c,v 1.7 1995/09/28 06:57:40 tls Exp $ */
/*-
@@ -43,7 +44,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)msgs.c 8.2 (Berkeley) 4/28/95";
#else
-static char rcsid[] = "$NetBSD: msgs.c,v 1.7 1995/09/28 06:57:40 tls Exp $";
+static char rcsid[] = "$OpenBSD: msgs.c,v 1.3 1996/06/26 05:37:18 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/msgs/pathnames.h b/usr.bin/msgs/pathnames.h
index 7d4ddb06bbf..74931bb7b7b 100644
--- a/usr.bin/msgs/pathnames.h
+++ b/usr.bin/msgs/pathnames.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: pathnames.h,v 1.2 1996/06/26 05:37:18 deraadt Exp $ */
/* $NetBSD: pathnames.h,v 1.3 1995/09/28 06:57:41 tls Exp $ */
/*
diff --git a/usr.bin/netstat/Makefile b/usr.bin/netstat/Makefile
index b5fc9c34add..18bd05cd87a 100644
--- a/usr.bin/netstat/Makefile
+++ b/usr.bin/netstat/Makefile
@@ -1,5 +1,5 @@
+# $OpenBSD: Makefile,v 1.2 1996/06/26 05:37:19 deraadt Exp $
# $NetBSD: Makefile,v 1.11 1995/10/03 21:42:34 thorpej Exp $
-# from: @(#)Makefile 8.1 (Berkeley) 6/12/93
PROG= netstat
SRCS= if.c inet.c iso.c main.c mbuf.c mroute.c ns.c route.c \
diff --git a/usr.bin/netstat/if.c b/usr.bin/netstat/if.c
index 88868675e6d..3bf1b1f0cdf 100644
--- a/usr.bin/netstat/if.c
+++ b/usr.bin/netstat/if.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: if.c,v 1.7 1996/06/26 05:37:20 deraadt Exp $ */
/* $NetBSD: if.c,v 1.16.4.2 1996/06/07 21:46:46 thorpej Exp $ */
/*
@@ -37,7 +38,7 @@
#if 0
static char sccsid[] = "from: @(#)if.c 8.2 (Berkeley) 2/21/94";
#else
-static char *rcsid = "$NetBSD: if.c,v 1.16.4.2 1996/06/07 21:46:46 thorpej Exp $";
+static char *rcsid = "$OpenBSD: if.c,v 1.7 1996/06/26 05:37:20 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/netstat/inet.c b/usr.bin/netstat/inet.c
index f1d4151ff88..bc33664379a 100644
--- a/usr.bin/netstat/inet.c
+++ b/usr.bin/netstat/inet.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: inet.c,v 1.3 1996/06/26 05:37:21 deraadt Exp $ */
/* $NetBSD: inet.c,v 1.14 1995/10/03 21:42:37 thorpej Exp $ */
/*
@@ -37,7 +38,7 @@
#if 0
static char sccsid[] = "from: @(#)inet.c 8.4 (Berkeley) 4/20/94";
#else
-static char *rcsid = "$NetBSD: inet.c,v 1.14 1995/10/03 21:42:37 thorpej Exp $";
+static char *rcsid = "$OpenBSD: inet.c,v 1.3 1996/06/26 05:37:21 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/netstat/iso.c b/usr.bin/netstat/iso.c
index 32fdce09fb3..7e0a76bd907 100644
--- a/usr.bin/netstat/iso.c
+++ b/usr.bin/netstat/iso.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: iso.c,v 1.2 1996/06/26 05:37:21 deraadt Exp $ */
/* $NetBSD: iso.c,v 1.12 1995/10/03 21:42:38 thorpej Exp $ */
/*
@@ -37,7 +38,7 @@
#if 0
static char sccsid[] = "from: @(#)iso.c 8.1 (Berkeley) 6/6/93";
#else
-static char *rcsid = "$NetBSD: iso.c,v 1.12 1995/10/03 21:42:38 thorpej Exp $";
+static char *rcsid = "$OpenBSD: iso.c,v 1.2 1996/06/26 05:37:21 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/netstat/main.c b/usr.bin/netstat/main.c
index 2798c932a94..1f27a1a2f9d 100644
--- a/usr.bin/netstat/main.c
+++ b/usr.bin/netstat/main.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: main.c,v 1.3 1996/06/26 05:37:22 deraadt Exp $ */
/* $NetBSD: main.c,v 1.9 1996/05/07 02:55:02 thorpej Exp $ */
/*
@@ -43,7 +44,7 @@ char copyright[] =
#if 0
static char sccsid[] = "from: @(#)main.c 8.4 (Berkeley) 3/1/94";
#else
-static char *rcsid = "$NetBSD: main.c,v 1.9 1996/05/07 02:55:02 thorpej Exp $";
+static char *rcsid = "$OpenBSD: main.c,v 1.3 1996/06/26 05:37:22 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/netstat/mbuf.c b/usr.bin/netstat/mbuf.c
index 0f0067031a9..d91437120be 100644
--- a/usr.bin/netstat/mbuf.c
+++ b/usr.bin/netstat/mbuf.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: mbuf.c,v 1.3 1996/06/26 05:37:23 deraadt Exp $ */
/* $NetBSD: mbuf.c,v 1.9 1996/05/07 02:55:03 thorpej Exp $ */
/*
@@ -37,7 +38,7 @@
#if 0
static char sccsid[] = "from: @(#)mbuf.c 8.1 (Berkeley) 6/6/93";
#else
-static char *rcsid = "$NetBSD: mbuf.c,v 1.9 1996/05/07 02:55:03 thorpej Exp $";
+static char *rcsid = "$OpenBSD: mbuf.c,v 1.3 1996/06/26 05:37:23 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/netstat/mroute.c b/usr.bin/netstat/mroute.c
index 1d00b3dc6db..676b5aef814 100644
--- a/usr.bin/netstat/mroute.c
+++ b/usr.bin/netstat/mroute.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: mroute.c,v 1.3 1996/06/26 05:37:23 deraadt Exp $ */
/* $NetBSD: mroute.c,v 1.10 1996/05/11 13:51:27 mycroft Exp $ */
/*
diff --git a/usr.bin/netstat/netstat.1 b/usr.bin/netstat/netstat.1
index 9fd19213077..8fe159b83a1 100644
--- a/usr.bin/netstat/netstat.1
+++ b/usr.bin/netstat/netstat.1
@@ -1,3 +1,4 @@
+.\" $OpenBSD: netstat.1,v 1.2 1996/06/26 05:37:24 deraadt Exp $
.\" $NetBSD: netstat.1,v 1.11 1995/10/03 21:42:43 thorpej Exp $
.\"
.\" Copyright (c) 1983, 1990, 1992, 1993
diff --git a/usr.bin/netstat/netstat.h b/usr.bin/netstat/netstat.h
index 085203893da..d3f8a8fa804 100644
--- a/usr.bin/netstat/netstat.h
+++ b/usr.bin/netstat/netstat.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: netstat.h,v 1.3 1996/06/26 05:37:24 deraadt Exp $ */
/* $NetBSD: netstat.h,v 1.6 1996/05/07 02:55:05 thorpej Exp $ */
/*
diff --git a/usr.bin/netstat/ns.c b/usr.bin/netstat/ns.c
index d9c8cf5a52d..c46cf16e404 100644
--- a/usr.bin/netstat/ns.c
+++ b/usr.bin/netstat/ns.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: ns.c,v 1.2 1996/06/26 05:37:25 deraadt Exp $ */
/* $NetBSD: ns.c,v 1.8 1995/10/03 21:42:46 thorpej Exp $ */
/*
@@ -37,7 +38,7 @@
#if 0
static char sccsid[] = "from: @(#)ns.c 8.1 (Berkeley) 6/6/93";
#else
-static char *rcsid = "$NetBSD: ns.c,v 1.8 1995/10/03 21:42:46 thorpej Exp $";
+static char *rcsid = "$OpenBSD: ns.c,v 1.2 1996/06/26 05:37:25 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/netstat/route.c b/usr.bin/netstat/route.c
index d7efc392f86..e65a15329c6 100644
--- a/usr.bin/netstat/route.c
+++ b/usr.bin/netstat/route.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: route.c,v 1.3 1996/06/26 05:37:26 deraadt Exp $ */
/* $NetBSD: route.c,v 1.15 1996/05/07 02:55:06 thorpej Exp $ */
/*
@@ -37,7 +38,7 @@
#if 0
static char sccsid[] = "from: @(#)route.c 8.3 (Berkeley) 3/9/94";
#else
-static char *rcsid = "$NetBSD: route.c,v 1.15 1996/05/07 02:55:06 thorpej Exp $";
+static char *rcsid = "$OpenBSD: route.c,v 1.3 1996/06/26 05:37:26 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/netstat/unix.c b/usr.bin/netstat/unix.c
index 6b6388b5b4e..9726aa6fe8c 100644
--- a/usr.bin/netstat/unix.c
+++ b/usr.bin/netstat/unix.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: unix.c,v 1.2 1996/06/26 05:37:26 deraadt Exp $ */
/* $NetBSD: unix.c,v 1.13 1995/10/03 21:42:48 thorpej Exp $ */
/*-
@@ -37,7 +38,7 @@
#if 0
static char sccsid[] = "from: @(#)unix.c 8.1 (Berkeley) 6/6/93";
#else
-static char *rcsid = "$NetBSD: unix.c,v 1.13 1995/10/03 21:42:48 thorpej Exp $";
+static char *rcsid = "$OpenBSD: unix.c,v 1.2 1996/06/26 05:37:26 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/newsyslog/Makefile b/usr.bin/newsyslog/Makefile
index 332016ea592..a88c2be6495 100644
--- a/usr.bin/newsyslog/Makefile
+++ b/usr.bin/newsyslog/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.1 1995/10/18 08:45:51 deraadt Exp $
+# $OpenBSD: Makefile,v 1.2 1996/06/26 05:37:27 deraadt Exp $
PROG= newsyslog
diff --git a/usr.bin/newsyslog/newsyslog.8 b/usr.bin/newsyslog/newsyslog.8
index c9dfecaae4c..272b12daaa0 100644
--- a/usr.bin/newsyslog/newsyslog.8
+++ b/usr.bin/newsyslog/newsyslog.8
@@ -1,9 +1,9 @@
+.\" $OpenBSD: newsyslog.8,v 1.2 1996/06/26 05:37:28 deraadt Exp $
.TH NEWSYSLOG 8 "January 12, 1989" "Project Athena"
.ns
.\" This file contains changes from the Open Software Foundation.
.\"
.\" from: @(#)newsyslog.8
-.\" $Id: newsyslog.8,v 1.1 1995/10/18 08:45:51 deraadt Exp $
.\"
.\" Copyright 1988, 1989 by the Massachusetts Institute of Technology
.\"
diff --git a/usr.bin/newsyslog/newsyslog.c b/usr.bin/newsyslog/newsyslog.c
index 64f80af7891..eb452f9e045 100644
--- a/usr.bin/newsyslog/newsyslog.c
+++ b/usr.bin/newsyslog/newsyslog.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: newsyslog.c,v 1.3 1996/06/26 05:37:29 deraadt Exp $ */
+
/*
* This file contains changes from the Open Software Foundation.
*/
@@ -29,7 +31,7 @@ provided "as is" without express or implied warranty.
*/
#ifndef lint
-static char rcsid[] = "$Id: newsyslog.c,v 1.2 1996/01/07 07:36:11 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: newsyslog.c,v 1.3 1996/06/26 05:37:29 deraadt Exp $";
#endif /* not lint */
#ifndef CONF
diff --git a/usr.bin/nice/Makefile b/usr.bin/nice/Makefile
index 0a9c4e7d4e3..0654ece68d6 100644
--- a/usr.bin/nice/Makefile
+++ b/usr.bin/nice/Makefile
@@ -1,4 +1,4 @@
-# @(#)Makefile 8.1 (Berkeley) 6/6/93
+# $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 $
PROG= nice
diff --git a/usr.bin/nice/nice.1 b/usr.bin/nice/nice.1
index e6812158429..fef105fc848 100644
--- a/usr.bin/nice/nice.1
+++ b/usr.bin/nice/nice.1
@@ -1,3 +1,4 @@
+.\" $OpenBSD: nice.1,v 1.2 1996/06/26 05:37:30 deraadt Exp $
.\" $NetBSD: nice.1,v 1.6 1995/08/31 23:30:57 jtc Exp $
.\"
.\" Copyright (c) 1980, 1990, 1993
diff --git a/usr.bin/nice/nice.c b/usr.bin/nice/nice.c
index dc32e08fbe6..a7da26b3745 100644
--- a/usr.bin/nice/nice.c
+++ b/usr.bin/nice/nice.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: nice.c,v 1.2 1996/06/26 05:37:31 deraadt Exp $ */
/* $NetBSD: nice.c,v 1.9 1995/08/31 23:30:58 jtc Exp $ */
/*
@@ -43,7 +44,7 @@ char copyright[] =
#if 0
static char sccsid[] = "@(#)nice.c 5.4 (Berkeley) 6/1/90";
#endif
-static char rcsid[] = "$NetBSD: nice.c,v 1.9 1995/08/31 23:30:58 jtc Exp $";
+static char rcsid[] = "$OpenBSD: nice.c,v 1.2 1996/06/26 05:37:31 deraadt Exp $";
#endif /* not lint */
#include <sys/types.h>
diff --git a/usr.bin/nm/Makefile b/usr.bin/nm/Makefile
index 3ebd83eb094..790e1ca83fe 100644
--- a/usr.bin/nm/Makefile
+++ b/usr.bin/nm/Makefile
@@ -1,4 +1,4 @@
-# @(#)Makefile 8.1 (Berkeley) 6/6/93
+# $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 $
PROG= nm
diff --git a/usr.bin/nm/nm.1 b/usr.bin/nm/nm.1
index 9ed94e02419..0ee783ebfb2 100644
--- a/usr.bin/nm/nm.1
+++ b/usr.bin/nm/nm.1
@@ -1,3 +1,4 @@
+.\" $OpenBSD: nm.1,v 1.2 1996/06/26 05:37:32 deraadt Exp $
.\" $NetBSD: nm.1,v 1.3 1995/08/31 23:41:58 jtc Exp $
.\"
.\" Copyright (c) 1980, 1990, 1993
diff --git a/usr.bin/nm/nm.c b/usr.bin/nm/nm.c
index 67fd0c62093..d97f1765e36 100644
--- a/usr.bin/nm/nm.c
+++ b/usr.bin/nm/nm.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: nm.c,v 1.3 1996/06/26 05:37:33 deraadt Exp $ */
/* $NetBSD: nm.c,v 1.7 1996/01/14 23:04:03 pk Exp $ */
/*
@@ -46,7 +47,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)nm.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$NetBSD: nm.c,v 1.7 1996/01/14 23:04:03 pk Exp $";
+static char rcsid[] = "$OpenBSD: nm.c,v 1.3 1996/06/26 05:37:33 deraadt Exp $";
#endif /* not lint */
#include <sys/types.h>
diff --git a/usr.bin/nohup/Makefile b/usr.bin/nohup/Makefile
index bc1a940e667..1aa4d750409 100644
--- a/usr.bin/nohup/Makefile
+++ b/usr.bin/nohup/Makefile
@@ -1,4 +1,4 @@
-# @(#)Makefile 8.1 (Berkeley) 6/6/93
+# $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 $
PROG= nohup
diff --git a/usr.bin/nohup/nohup.1 b/usr.bin/nohup/nohup.1
index f58eb03892e..5a9952159a1 100644
--- a/usr.bin/nohup/nohup.1
+++ b/usr.bin/nohup/nohup.1
@@ -1,3 +1,4 @@
+.\" $OpenBSD: nohup.1,v 1.2 1996/06/26 05:37:35 deraadt Exp $
.\" $NetBSD: nohup.1,v 1.5 1995/08/31 23:35:24 jtc Exp $
.\"
.\" Copyright (c) 1989, 1990, 1993
diff --git a/usr.bin/nohup/nohup.c b/usr.bin/nohup/nohup.c
index 7d593989fb5..73f5ed29453 100644
--- a/usr.bin/nohup/nohup.c
+++ b/usr.bin/nohup/nohup.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: nohup.c,v 1.2 1996/06/26 05:37:36 deraadt Exp $ */
/* $NetBSD: nohup.c,v 1.6 1995/08/31 23:35:25 jtc Exp $ */
/*
@@ -43,7 +44,7 @@ char copyright[] =
#if 0
static char sccsid[] = "@(#)nohup.c 5.4 (Berkeley) 6/1/90";
#endif
-static char rcsid[] = "$NetBSD: nohup.c,v 1.6 1995/08/31 23:35:25 jtc Exp $";
+static char rcsid[] = "$OpenBSD: nohup.c,v 1.2 1996/06/26 05:37:36 deraadt Exp $";
#endif /* not lint */
#include <sys/param.h>
diff --git a/usr.bin/oldrdist/Makefile b/usr.bin/oldrdist/Makefile
index 2d11b217d11..865e23f7159 100644
--- a/usr.bin/oldrdist/Makefile
+++ b/usr.bin/oldrdist/Makefile
@@ -1,5 +1,4 @@
-# from: @(#)Makefile 5.11 (Berkeley) 3/12/91
-# $Id: Makefile,v 1.1 1996/02/03 12:11:51 dm Exp $
+# $OpenBSD: Makefile,v 1.2 1996/06/26 05:37:36 deraadt Exp $
PROG= rdist
CFLAGS+=-I${.CURDIR}
diff --git a/usr.bin/oldrdist/defs.h b/usr.bin/oldrdist/defs.h
index ebfab36f2b6..60e34422b2c 100644
--- a/usr.bin/oldrdist/defs.h
+++ b/usr.bin/oldrdist/defs.h
@@ -1,3 +1,4 @@
+/* * $OpenBSD: defs.h,v 1.2 1996/06/26 05:37:37 deraadt Exp $*/
/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
@@ -31,7 +32,6 @@
* SUCH DAMAGE.
*
* from: @(#)defs.h 8.1 (Berkeley) 6/9/93
- * $Id: defs.h,v 1.1 1996/02/03 12:11:53 dm Exp $
*/
#include <sys/param.h>
diff --git a/usr.bin/oldrdist/docmd.c b/usr.bin/oldrdist/docmd.c
index bc05fcac0c8..f901d35ffe2 100644
--- a/usr.bin/oldrdist/docmd.c
+++ b/usr.bin/oldrdist/docmd.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: docmd.c,v 1.3 1996/06/26 05:37:38 deraadt Exp $ */
+
/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
@@ -33,7 +35,7 @@
#ifndef lint
/* from: static char sccsid[] = "@(#)docmd.c 8.1 (Berkeley) 6/9/93"; */
-static char *rcsid = "$Id: docmd.c,v 1.2 1996/06/26 03:42:13 deraadt Exp $";
+static char *rcsid = "$OpenBSD: docmd.c,v 1.3 1996/06/26 05:37:38 deraadt Exp $";
#endif /* not lint */
#include "defs.h"
diff --git a/usr.bin/oldrdist/expand.c b/usr.bin/oldrdist/expand.c
index 06e021b4859..48206e93de5 100644
--- a/usr.bin/oldrdist/expand.c
+++ b/usr.bin/oldrdist/expand.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: expand.c,v 1.2 1996/06/26 05:37:38 deraadt Exp $ */
+
/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
@@ -33,7 +35,7 @@
#ifndef lint
/* from: static char sccsid[] = "@(#)expand.c 8.1 (Berkeley) 6/9/93"; */
-static char *rcsid = "$Id: expand.c,v 1.1 1996/02/03 12:11:56 dm Exp $";
+static char *rcsid = "$OpenBSD: expand.c,v 1.2 1996/06/26 05:37:38 deraadt Exp $";
#endif /* not lint */
#include "defs.h"
diff --git a/usr.bin/oldrdist/lookup.c b/usr.bin/oldrdist/lookup.c
index 11e6c6aefc0..1fbc1b2b0e6 100644
--- a/usr.bin/oldrdist/lookup.c
+++ b/usr.bin/oldrdist/lookup.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: lookup.c,v 1.2 1996/06/26 05:37:39 deraadt Exp $ */
+
/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
@@ -33,7 +35,7 @@
#ifndef lint
/* from: static char sccsid[] = "@(#)lookup.c 8.1 (Berkeley) 6/9/93"; */
-static char *rcsid = "$Id: lookup.c,v 1.1 1996/02/03 12:11:59 dm Exp $";
+static char *rcsid = "$OpenBSD: lookup.c,v 1.2 1996/06/26 05:37:39 deraadt Exp $";
#endif /* not lint */
#include "defs.h"
diff --git a/usr.bin/oldrdist/main.c b/usr.bin/oldrdist/main.c
index fd487b0b484..60b6cc7cf9f 100644
--- a/usr.bin/oldrdist/main.c
+++ b/usr.bin/oldrdist/main.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: main.c,v 1.2 1996/06/26 05:37:39 deraadt Exp $ */
+
/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
@@ -39,7 +41,7 @@ static char copyright[] =
#ifndef lint
/* from: static char sccsid[] = "@(#)main.c 8.1 (Berkeley) 6/9/93"; */
-static char *rcsid = "$Id: main.c,v 1.1 1996/02/03 12:12:00 dm Exp $";
+static char *rcsid = "$OpenBSD: main.c,v 1.2 1996/06/26 05:37:39 deraadt Exp $";
#endif /* not lint */
#include "defs.h"
diff --git a/usr.bin/oldrdist/oldrdist.1 b/usr.bin/oldrdist/oldrdist.1
index 35ae3f82e54..a20ad1f4ffb 100644
--- a/usr.bin/oldrdist/oldrdist.1
+++ b/usr.bin/oldrdist/oldrdist.1
@@ -1,3 +1,4 @@
+.\" $OpenBSD: oldrdist.1,v 1.2 1996/06/26 05:37:40 deraadt Exp $
.\" Copyright (c) 1985, 1990, 1993
.\" The Regents of the University of California. All rights reserved.
.\"
@@ -30,7 +31,6 @@
.\" SUCH DAMAGE.
.\"
.\" from: @(#)rdist.1 8.2 (Berkeley) 12/30/93
-.\" $Id: oldrdist.1,v 1.1 1996/02/03 12:12:01 dm Exp $
.\"
.Dd December 30, 1993
.Dt RDIST 1
diff --git a/usr.bin/oldrdist/pathnames.h b/usr.bin/oldrdist/pathnames.h
index 85872f27f0d..aa6dc776000 100644
--- a/usr.bin/oldrdist/pathnames.h
+++ b/usr.bin/oldrdist/pathnames.h
@@ -1,3 +1,4 @@
+/* * $OpenBSD: pathnames.h,v 1.2 1996/06/26 05:37:41 deraadt Exp $*/
/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
@@ -31,7 +32,6 @@
* SUCH DAMAGE.
*
* from: @(#)pathnames.h 8.1 (Berkeley) 6/9/93
- * $Id: pathnames.h,v 1.1 1996/02/03 12:12:02 dm Exp $
*/
#include <paths.h>
diff --git a/usr.bin/oldrdist/server.c b/usr.bin/oldrdist/server.c
index 52caf4f272f..596deb6f36f 100644
--- a/usr.bin/oldrdist/server.c
+++ b/usr.bin/oldrdist/server.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: server.c,v 1.3 1996/06/26 05:37:41 deraadt Exp $ */
+
/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
@@ -33,7 +35,7 @@
#ifndef lint
/* from: static char sccsid[] = "@(#)server.c 8.1 (Berkeley) 6/9/93"; */
-static char *rcsid = "$Id: server.c,v 1.2 1996/05/28 12:31:57 deraadt Exp $";
+static char *rcsid = "$OpenBSD: server.c,v 1.3 1996/06/26 05:37:41 deraadt Exp $";
#endif /* not lint */
#include <sys/wait.h>
diff --git a/usr.bin/pagesize/Makefile b/usr.bin/pagesize/Makefile
index 89ef7efee14..598c503205b 100644
--- a/usr.bin/pagesize/Makefile
+++ b/usr.bin/pagesize/Makefile
@@ -1,4 +1,4 @@
-# @(#)Makefile 8.2 (Berkeley) 4/3/94
+# $OpenBSD: Makefile,v 1.2 1996/06/26 05:37:42 deraadt Exp $
# $NetBSD: Makefile,v 1.6 1995/09/05 01:11:10 cgd Exp $
MAN= pagesize.1
diff --git a/usr.bin/pagesize/pagesize.1 b/usr.bin/pagesize/pagesize.1
index 55066542562..40d93cd76f3 100644
--- a/usr.bin/pagesize/pagesize.1
+++ b/usr.bin/pagesize/pagesize.1
@@ -1,3 +1,4 @@
+.\" $OpenBSD: pagesize.1,v 1.2 1996/06/26 05:37:43 deraadt Exp $
.\" $NetBSD: pagesize.1,v 1.4 1995/08/31 23:38:50 jtc Exp $
.\"
.\" Copyright (c) 1983, 1990, 1993
diff --git a/usr.bin/pagesize/pagesize.sh b/usr.bin/pagesize/pagesize.sh
index da2217917e3..6682e044cb3 100644
--- a/usr.bin/pagesize/pagesize.sh
+++ b/usr.bin/pagesize/pagesize.sh
@@ -1,4 +1,6 @@
#!/bin/sh -
+# $OpenBSD: pagesize.sh,v 1.2 1996/06/26 05:37:43 deraadt Exp $
+
#
# Copyright (c) 1994
# The Regents of the University of California. All rights reserved.
diff --git a/usr.bin/passwd/kpasswd_proto.h b/usr.bin/passwd/kpasswd_proto.h
index c70aa9b6437..e6785a74123 100644
--- a/usr.bin/passwd/kpasswd_proto.h
+++ b/usr.bin/passwd/kpasswd_proto.h
@@ -1,3 +1,4 @@
+/* * $OpenBSD $*/
/*-
* Copyright (c) 1989 The Regents of the University of California.
* All rights reserved.
@@ -31,7 +32,6 @@
* SUCH DAMAGE.
*
* from: @(#)kpasswd_proto.h 5.1 (Berkeley) 2/3/91
- * $Id $
*/
/*
diff --git a/usr.bin/passwd/krb5_passwd.c b/usr.bin/passwd/krb5_passwd.c
index 3192cbb2de2..12304f02375 100644
--- a/usr.bin/passwd/krb5_passwd.c
+++ b/usr.bin/passwd/krb5_passwd.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: krb5_passwd.c,v 1.2 1996/06/26 05:37:45 deraadt Exp $ */
+
/*-
* Copyright (c) 1990 The Regents of the University of California.
* All rights reserved.
@@ -33,7 +35,7 @@
#ifndef lint
/*static char sccsid[] = "from: @(#)krb_passwd.c 5.4 (Berkeley) 3/1/91";*/
-static char rcsid[] = "$Id: krb5_passwd.c,v 1.1 1995/10/18 08:45:53 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: krb5_passwd.c,v 1.2 1996/06/26 05:37:45 deraadt Exp $";
#endif /* not lint */
#ifdef KERBEROS5
diff --git a/usr.bin/passwd/krb_passwd.c b/usr.bin/passwd/krb_passwd.c
index 84d2403e9b6..cd3e1811c3f 100644
--- a/usr.bin/passwd/krb_passwd.c
+++ b/usr.bin/passwd/krb_passwd.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: krb_passwd.c,v 1.4 1996/06/26 05:37:46 deraadt Exp $ */
+
/*-
* Copyright (c) 1990 The Regents of the University of California.
* All rights reserved.
@@ -33,7 +35,7 @@
#ifndef lint
/*static char sccsid[] = "from: @(#)krb_passwd.c 5.4 (Berkeley) 3/1/91";*/
-static char rcsid[] = "$Id: krb_passwd.c,v 1.3 1996/04/17 07:17:30 tholo Exp $";
+static char rcsid[] = "$OpenBSD: krb_passwd.c,v 1.4 1996/06/26 05:37:46 deraadt Exp $";
#endif /* not lint */
#ifdef KERBEROS
diff --git a/usr.bin/passwd/local_passwd.c b/usr.bin/passwd/local_passwd.c
index 910e911976a..562b4dc4a89 100644
--- a/usr.bin/passwd/local_passwd.c
+++ b/usr.bin/passwd/local_passwd.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: local_passwd.c,v 1.3 1996/06/26 05:37:46 deraadt Exp $ */
+
/*-
* Copyright (c) 1990 The Regents of the University of California.
* All rights reserved.
@@ -33,7 +35,7 @@
#ifndef lint
/*static char sccsid[] = "from: @(#)local_passwd.c 5.5 (Berkeley) 5/6/91";*/
-static char rcsid[] = "$Id: local_passwd.c,v 1.2 1996/05/22 11:35:27 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: local_passwd.c,v 1.3 1996/06/26 05:37:46 deraadt Exp $";
#endif /* not lint */
#include <sys/types.h>
diff --git a/usr.bin/passwd/passwd.1 b/usr.bin/passwd/passwd.1
index a8c1f768d76..4fb3966e6a4 100644
--- a/usr.bin/passwd/passwd.1
+++ b/usr.bin/passwd/passwd.1
@@ -1,3 +1,4 @@
+.\" $OpenBSD: passwd.1,v 1.3 1996/06/26 05:37:47 deraadt Exp $
.\" Copyright (c) 1990 The Regents of the University of California.
.\" All rights reserved.
.\"
@@ -30,7 +31,6 @@
.\" SUCH DAMAGE.
.\"
.\" from: @(#)passwd.1 6.11 (Berkeley) 7/24/91
-.\" $Id: passwd.1,v 1.2 1996/01/16 07:22:14 deraadt Exp $
.\"
.Dd July 24, 1991
.Dt PASSWD 1
diff --git a/usr.bin/passwd/passwd.c b/usr.bin/passwd/passwd.c
index 7494ec1e785..dfd0e4ae025 100644
--- a/usr.bin/passwd/passwd.c
+++ b/usr.bin/passwd/passwd.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: passwd.c,v 1.4 1996/06/26 05:37:47 deraadt Exp $ */
+
/*
* Copyright (c) 1988 The Regents of the University of California.
* All rights reserved.
@@ -39,7 +41,7 @@ char copyright[] =
#ifndef lint
/*static char sccsid[] = "from: @(#)passwd.c 5.5 (Berkeley) 7/6/91";*/
-static char rcsid[] = "$Id: passwd.c,v 1.3 1996/05/03 18:23:34 tholo Exp $";
+static char rcsid[] = "$OpenBSD: passwd.c,v 1.4 1996/06/26 05:37:47 deraadt Exp $";
#endif /* not lint */
#include <stdio.h>
diff --git a/usr.bin/passwd/yp_passwd.c b/usr.bin/passwd/yp_passwd.c
index 4bc88875b88..63ca3b0b055 100644
--- a/usr.bin/passwd/yp_passwd.c
+++ b/usr.bin/passwd/yp_passwd.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: yp_passwd.c,v 1.2 1996/06/26 05:37:48 deraadt Exp $ */
+
/*
* Copyright (c) 1988 The Regents of the University of California.
* All rights reserved.
@@ -32,7 +34,7 @@
*/
#ifndef lint
/*static char sccsid[] = "from: @(#)yp_passwd.c 1.0 2/2/93";*/
-static char rcsid[] = "$Id: yp_passwd.c,v 1.1 1995/10/18 08:45:54 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: yp_passwd.c,v 1.2 1996/06/26 05:37:48 deraadt Exp $";
#endif /* not lint */
#ifdef YP
diff --git a/usr.bin/paste/Makefile b/usr.bin/paste/Makefile
index 7029cef3ef0..39da83bfb2b 100644
--- a/usr.bin/paste/Makefile
+++ b/usr.bin/paste/Makefile
@@ -1,5 +1,4 @@
-# from: @(#)Makefile 5.1 (Berkeley) 5/11/90
-# $Id: Makefile,v 1.1 1995/10/18 08:45:54 deraadt Exp $
+# $OpenBSD: Makefile,v 1.2 1996/06/26 05:37:49 deraadt Exp $
PROG= paste
diff --git a/usr.bin/paste/paste.1 b/usr.bin/paste/paste.1
index bfb44aebf95..5b5600ed540 100644
--- a/usr.bin/paste/paste.1
+++ b/usr.bin/paste/paste.1
@@ -1,3 +1,4 @@
+.\" $OpenBSD: paste.1,v 1.2 1996/06/26 05:37:50 deraadt Exp $
.\" Copyright (c) 1989, 1990 The Regents of the University of California.
.\" All rights reserved.
.\"
@@ -34,7 +35,6 @@
.\" SUCH DAMAGE.
.\"
.\" from: @(#)paste.1 5.6 (Berkeley) 7/27/91
-.\" $Id: paste.1,v 1.1 1995/10/18 08:45:54 deraadt Exp $
.\"
.Dd July 27, 1991
.Dt PASTE 1
diff --git a/usr.bin/paste/paste.c b/usr.bin/paste/paste.c
index ce4182da8a2..cc5fce44c0f 100644
--- a/usr.bin/paste/paste.c
+++ b/usr.bin/paste/paste.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: paste.c,v 1.2 1996/06/26 05:37:50 deraadt Exp $ */
+
/*
* Copyright (c) 1989 The Regents of the University of California.
* All rights reserved.
@@ -42,7 +44,7 @@ char copyright[] =
#ifndef lint
/*static char sccsid[] = "from: @(#)paste.c 5.7 (Berkeley) 10/30/90";*/
-static char rcsid[] = "$Id: paste.c,v 1.1 1995/10/18 08:45:54 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: paste.c,v 1.2 1996/06/26 05:37:50 deraadt Exp $";
#endif /* not lint */
#include <sys/types.h>
diff --git a/usr.bin/pr/Makefile b/usr.bin/pr/Makefile
index 1e8e340a76e..9d2273dbb61 100644
--- a/usr.bin/pr/Makefile
+++ b/usr.bin/pr/Makefile
@@ -1,5 +1,4 @@
-# from: @(#)Makefile 8.1 (Berkeley) 6/6/93
-# $Id: Makefile,v 1.1 1995/10/18 08:45:56 deraadt Exp $
+# $OpenBSD: Makefile,v 1.2 1996/06/26 05:37:51 deraadt Exp $
PROG= pr
SRCS= pr.c egetopt.c
diff --git a/usr.bin/pr/egetopt.c b/usr.bin/pr/egetopt.c
index 9af6061a325..cbff00cbcae 100644
--- a/usr.bin/pr/egetopt.c
+++ b/usr.bin/pr/egetopt.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: egetopt.c,v 1.2 1996/06/26 05:37:52 deraadt Exp $ */
+
/*-
* Copyright (c) 1991 Keith Muller.
* Copyright (c) 1993
@@ -37,7 +39,7 @@
#ifndef lint
/* from: static char sccsid[] = "@(#)egetopt.c 8.1 (Berkeley) 6/6/93"; */
-static char *rcsid = "$Id: egetopt.c,v 1.1 1995/10/18 08:45:56 deraadt Exp $";
+static char *rcsid = "$OpenBSD: egetopt.c,v 1.2 1996/06/26 05:37:52 deraadt Exp $";
#endif /* not lint */
#include <ctype.h>
diff --git a/usr.bin/pr/extern.h b/usr.bin/pr/extern.h
index 22294440ada..71e3a743e45 100644
--- a/usr.bin/pr/extern.h
+++ b/usr.bin/pr/extern.h
@@ -1,3 +1,4 @@
+/* * $OpenBSD: extern.h,v 1.2 1996/06/26 05:37:52 deraadt Exp $*/
/*-
* Copyright (c) 1991 Keith Muller.
* Copyright (c) 1993
@@ -35,7 +36,6 @@
* SUCH DAMAGE.
*
* from: @(#)extern.h 8.1 (Berkeley) 6/6/93
- * $Id: extern.h,v 1.1 1995/10/18 08:45:56 deraadt Exp $
*/
extern int eoptind;
diff --git a/usr.bin/pr/pr.1 b/usr.bin/pr/pr.1
index f71d5a44025..62279b4a40b 100644
--- a/usr.bin/pr/pr.1
+++ b/usr.bin/pr/pr.1
@@ -1,3 +1,4 @@
+.\" $OpenBSD: pr.1,v 1.2 1996/06/26 05:37:53 deraadt Exp $
.\" Copyright (c) 1991 Keith Muller.
.\" Copyright (c) 1993
.\" The Regents of the University of California. All rights reserved.
@@ -34,7 +35,6 @@
.\" SUCH DAMAGE.
.\"
.\" from: @(#)pr.1 8.1 (Berkeley) 6/6/93
-.\" $Id: pr.1,v 1.1 1995/10/18 08:45:56 deraadt Exp $
.\"
.Dd June 6, 1993
.Dt PR 1
diff --git a/usr.bin/pr/pr.c b/usr.bin/pr/pr.c
index 7ec3537c96a..56d23cf7d03 100644
--- a/usr.bin/pr/pr.c
+++ b/usr.bin/pr/pr.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: pr.c,v 1.2 1996/06/26 05:37:54 deraadt Exp $ */
+
/*-
* Copyright (c) 1991 Keith Muller.
* Copyright (c) 1993
@@ -43,7 +45,7 @@ static char copyright[] =
#ifndef lint
/* from: static char sccsid[] = "@(#)pr.c 8.1 (Berkeley) 6/6/93"; */
-static char *rcsid = "$Id: pr.c,v 1.1 1995/10/18 08:45:56 deraadt Exp $";
+static char *rcsid = "$OpenBSD: pr.c,v 1.2 1996/06/26 05:37:54 deraadt Exp $";
#endif /* not lint */
#include <sys/types.h>
diff --git a/usr.bin/pr/pr.h b/usr.bin/pr/pr.h
index d57e2fb2374..2bc3e11a44c 100644
--- a/usr.bin/pr/pr.h
+++ b/usr.bin/pr/pr.h
@@ -1,3 +1,4 @@
+/* * $OpenBSD: pr.h,v 1.2 1996/06/26 05:37:55 deraadt Exp $*/
/*-
* Copyright (c) 1991 Keith Muller.
* Copyright (c) 1993
@@ -35,7 +36,6 @@
* SUCH DAMAGE.
*
* from: @(#)pr.h 8.1 (Berkeley) 6/6/93
- * $Id: pr.h,v 1.1 1995/10/18 08:45:57 deraadt Exp $
*/
/*
diff --git a/usr.bin/printenv/Makefile b/usr.bin/printenv/Makefile
index 030af7d1886..7ca51278394 100644
--- a/usr.bin/printenv/Makefile
+++ b/usr.bin/printenv/Makefile
@@ -1,5 +1,4 @@
-# from: @(#)Makefile 5.3 (Berkeley) 5/11/90
-# $Id: Makefile,v 1.1 1995/10/18 08:45:57 deraadt Exp $
+# $OpenBSD: Makefile,v 1.2 1996/06/26 05:37:56 deraadt Exp $
PROG= printenv
diff --git a/usr.bin/printenv/printenv.1 b/usr.bin/printenv/printenv.1
index f30b2248016..44bf82a0fec 100644
--- a/usr.bin/printenv/printenv.1
+++ b/usr.bin/printenv/printenv.1
@@ -1,3 +1,4 @@
+.\" $OpenBSD: printenv.1,v 1.2 1996/06/26 05:37:56 deraadt Exp $
.\" Copyright (c) 1980, 1990 The Regents of the University of California.
.\" All rights reserved.
.\"
@@ -32,7 +33,6 @@
.\" SUCH DAMAGE.
.\"
.\" from: @(#)printenv.1 6.7 (Berkeley) 7/28/91
-.\" $Id: printenv.1,v 1.1 1995/10/18 08:45:57 deraadt Exp $
.\"
.Dd July 28, 1991
.Dt PRINTENV 1
diff --git a/usr.bin/printenv/printenv.c b/usr.bin/printenv/printenv.c
index 139c83df166..cd9593af6f3 100644
--- a/usr.bin/printenv/printenv.c
+++ b/usr.bin/printenv/printenv.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: printenv.c,v 1.2 1996/06/26 05:37:57 deraadt Exp $ */
+
/*
* Copyright (c) 1987 Regents of the University of California.
* All rights reserved.
@@ -39,7 +41,7 @@ char copyright[] =
#ifndef lint
/*static char sccsid[] = "from: @(#)printenv.c 5.4 (Berkeley) 6/1/90";*/
-static char rcsid[] = "$Id: printenv.c,v 1.1 1995/10/18 08:45:57 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: printenv.c,v 1.2 1996/06/26 05:37:57 deraadt Exp $";
#endif /* not lint */
#include <stdio.h>
diff --git a/usr.bin/printf/Makefile b/usr.bin/printf/Makefile
index a6ca8cf0b10..d84fc4f4d06 100644
--- a/usr.bin/printf/Makefile
+++ b/usr.bin/printf/Makefile
@@ -1,5 +1,4 @@
-# from: @(#)Makefile 5.3 (Berkeley) 5/11/90
-# $Id: Makefile,v 1.1 1995/10/18 08:45:57 deraadt Exp $
+# $OpenBSD: Makefile,v 1.2 1996/06/26 05:37:58 deraadt Exp $
PROG= printf
diff --git a/usr.bin/printf/printf.1 b/usr.bin/printf/printf.1
index d33c410f8e3..62edb58a6e5 100644
--- a/usr.bin/printf/printf.1
+++ b/usr.bin/printf/printf.1
@@ -1,3 +1,4 @@
+.\" $OpenBSD: printf.1,v 1.2 1996/06/26 05:37:58 deraadt Exp $
.\" Copyright (c) 1989, 1990 The Regents of the University of California.
.\" All rights reserved.
.\"
@@ -33,7 +34,6 @@
.\" SUCH DAMAGE.
.\"
.\" from: @(#)printf.1 5.11 (Berkeley) 7/24/91
-.\" $Id: printf.1,v 1.1 1995/10/18 08:45:57 deraadt Exp $
.\"
.Dd November 5, 1993
.Dt PRINTF 1
diff --git a/usr.bin/printf/printf.c b/usr.bin/printf/printf.c
index e94fde766d0..027397207a9 100644
--- a/usr.bin/printf/printf.c
+++ b/usr.bin/printf/printf.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: printf.c,v 1.2 1996/06/26 05:37:59 deraadt Exp $ */
+
/*
* Copyright (c) 1989 The Regents of the University of California.
* All rights reserved.
@@ -41,7 +43,7 @@ char copyright[] =
#ifndef lint
/*static char sccsid[] = "from: @(#)printf.c 5.9 (Berkeley) 6/1/90";*/
-static char rcsid[] = "$Id: printf.c,v 1.1 1995/10/18 08:45:57 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: printf.c,v 1.2 1996/06/26 05:37:59 deraadt Exp $";
#endif /* not lint */
#include <ctype.h>
diff --git a/usr.bin/quota/Makefile b/usr.bin/quota/Makefile
index 6e7e1542948..902c602f8e2 100644
--- a/usr.bin/quota/Makefile
+++ b/usr.bin/quota/Makefile
@@ -1,5 +1,4 @@
-# from: @(#)Makefile 8.1 (Berkeley) 6/6/93
-# $Id: Makefile,v 1.1 1995/10/18 08:45:58 deraadt Exp $
+# $OpenBSD: Makefile,v 1.2 1996/06/26 05:38:00 deraadt Exp $
PROG= quota
BINOWN= root
diff --git a/usr.bin/quota/quota.1 b/usr.bin/quota/quota.1
index e5b17ea158a..37e3242ad0f 100644
--- a/usr.bin/quota/quota.1
+++ b/usr.bin/quota/quota.1
@@ -1,3 +1,4 @@
+.\" $OpenBSD: quota.1,v 1.3 1996/06/26 05:38:01 deraadt Exp $
.\" Copyright (c) 1983, 1990, 1993
.\" The Regents of the University of California. All rights reserved.
.\"
@@ -33,7 +34,6 @@
.\" SUCH DAMAGE.
.\"
.\" from: @(#)quota.1 8.1 (Berkeley) 6/6/93
-.\" $Id: quota.1,v 1.2 1995/11/25 16:46:23 deraadt Exp $
.\"
.Dd June 6, 1993
.Dt QUOTA 1
diff --git a/usr.bin/quota/quota.c b/usr.bin/quota/quota.c
index c278849c676..d538ea68d83 100644
--- a/usr.bin/quota/quota.c
+++ b/usr.bin/quota/quota.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: quota.c,v 1.5 1996/06/26 05:38:01 deraadt Exp $ */
+
/*
* Copyright (c) 1980, 1990, 1993
* The Regents of the University of California. All rights reserved.
@@ -42,7 +44,7 @@ static char copyright[] =
#ifndef lint
/*static char sccsid[] = "from: @(#)quota.c 8.1 (Berkeley) 6/6/93";*/
-static char rcsid[] = "$Id: quota.c,v 1.4 1996/04/25 11:04:06 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: quota.c,v 1.5 1996/06/26 05:38:01 deraadt Exp $";
#endif /* not lint */
/*
diff --git a/usr.bin/ranlib/Makefile b/usr.bin/ranlib/Makefile
index 0b018f89095..2ea6c6d0108 100644
--- a/usr.bin/ranlib/Makefile
+++ b/usr.bin/ranlib/Makefile
@@ -1,5 +1,4 @@
-# from: @(#)Makefile 5.4 (Berkeley) 3/12/91
-# $Id: Makefile,v 1.1 1995/10/18 08:45:58 deraadt Exp $
+# $OpenBSD: Makefile,v 1.2 1996/06/26 05:38:03 deraadt Exp $
PROG= ranlib
SRCS= archive.c build.c misc.c ranlib.c touch.c
diff --git a/usr.bin/ranlib/build.c b/usr.bin/ranlib/build.c
index 29c851e937e..3577f3fc792 100644
--- a/usr.bin/ranlib/build.c
+++ b/usr.bin/ranlib/build.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: build.c,v 1.2 1996/06/26 05:38:03 deraadt Exp $ */
+
/*-
* Copyright (c) 1990 The Regents of the University of California.
* All rights reserved.
@@ -36,7 +38,7 @@
#ifndef lint
/*static char sccsid[] = "from: @(#)build.c 5.3 (Berkeley) 3/12/91";*/
-static char rcsid[] = "$Id: build.c,v 1.1 1995/10/18 08:45:58 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: build.c,v 1.2 1996/06/26 05:38:03 deraadt Exp $";
#endif /* not lint */
#include <sys/types.h>
diff --git a/usr.bin/ranlib/misc.c b/usr.bin/ranlib/misc.c
index b2458362710..c688af4aaec 100644
--- a/usr.bin/ranlib/misc.c
+++ b/usr.bin/ranlib/misc.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: misc.c,v 1.2 1996/06/26 05:38:04 deraadt Exp $ */
+
/*-
* Copyright (c) 1990 The Regents of the University of California.
* All rights reserved.
@@ -36,7 +38,7 @@
#ifndef lint
/*static char sccsid[] = "from: @(#)misc.c 5.2 (Berkeley) 2/26/91";*/
-static char rcsid[] = "$Id: misc.c,v 1.1 1995/10/18 08:45:58 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: misc.c,v 1.2 1996/06/26 05:38:04 deraadt Exp $";
#endif /* not lint */
#include <sys/param.h>
diff --git a/usr.bin/ranlib/pathnames.h b/usr.bin/ranlib/pathnames.h
index 2a8913aa8c2..257a7d5c5e2 100644
--- a/usr.bin/ranlib/pathnames.h
+++ b/usr.bin/ranlib/pathnames.h
@@ -1,3 +1,4 @@
+/* * $OpenBSD: pathnames.h,v 1.2 1996/06/26 05:38:04 deraadt Exp $*/
/*-
* Copyright (c) 1990 The Regents of the University of California.
* All rights reserved.
@@ -31,7 +32,6 @@
* SUCH DAMAGE.
*
* from: @(#)pathnames.h 5.2 (Berkeley) 4/16/91
- * $Id: pathnames.h,v 1.1 1995/10/18 08:45:58 deraadt Exp $
*/
#define _NAME_RANTMP "ranlib.XXXXXX"
diff --git a/usr.bin/ranlib/ranlib.1 b/usr.bin/ranlib/ranlib.1
index fc178b7966d..8a27c4400b9 100644
--- a/usr.bin/ranlib/ranlib.1
+++ b/usr.bin/ranlib/ranlib.1
@@ -1,3 +1,4 @@
+.\" $OpenBSD: ranlib.1,v 1.2 1996/06/26 05:38:05 deraadt Exp $
.\" Copyright (c) 1990 Regents of the University of California.
.\" All rights reserved.
.\"
@@ -30,7 +31,6 @@
.\" SUCH DAMAGE.
.\"
.\" from: @(#)ranlib.1 6.7 (Berkeley) 5/9/91
-.\" $Id: ranlib.1,v 1.1 1995/10/18 08:45:58 deraadt Exp $
.\"
.Dd May 9, 1991
.Dt RANLIB 1
diff --git a/usr.bin/ranlib/ranlib.5 b/usr.bin/ranlib/ranlib.5
index 2e840a11a00..2a2d1365969 100644
--- a/usr.bin/ranlib/ranlib.5
+++ b/usr.bin/ranlib/ranlib.5
@@ -1,3 +1,4 @@
+.\" $OpenBSD: ranlib.5,v 1.2 1996/06/26 05:38:05 deraadt Exp $
.\" Copyright (c) 1990, 1991 The Regents of the University of California.
.\" All rights reserved.
.\"
@@ -30,7 +31,6 @@
.\" SUCH DAMAGE.
.\"
.\" from: @(#)ranlib.5.5 5.2 (Berkeley) 5/10/91
-.\" $Id: ranlib.5,v 1.1 1995/10/18 08:45:58 deraadt Exp $
.\"
.Dd May 10, 1991
.Dt RANLIB 5
diff --git a/usr.bin/ranlib/ranlib.c b/usr.bin/ranlib/ranlib.c
index bf0609fbd6e..138cf6ad02d 100644
--- a/usr.bin/ranlib/ranlib.c
+++ b/usr.bin/ranlib/ranlib.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: ranlib.c,v 1.2 1996/06/26 05:38:06 deraadt Exp $ */
+
/*-
* Copyright (c) 1990 The Regents of the University of California.
* All rights reserved.
@@ -42,7 +44,7 @@ char copyright[] =
#ifndef lint
/*static char sccsid[] = "from: @(#)ranlib.c 5.6 (Berkeley) 2/26/91";*/
-static char rcsid[] = "$Id: ranlib.c,v 1.1 1995/10/18 08:45:58 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: ranlib.c,v 1.2 1996/06/26 05:38:06 deraadt Exp $";
#endif /* not lint */
#include <sys/types.h>
diff --git a/usr.bin/ranlib/touch.c b/usr.bin/ranlib/touch.c
index 706fe5ac8fd..d3440fa6019 100644
--- a/usr.bin/ranlib/touch.c
+++ b/usr.bin/ranlib/touch.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: touch.c,v 1.2 1996/06/26 05:38:07 deraadt Exp $ */
+
/*-
* Copyright (c) 1990 The Regents of the University of California.
* All rights reserved.
@@ -36,7 +38,7 @@
#ifndef lint
/*static char sccsid[] = "from: @(#)touch.c 5.3 (Berkeley) 3/12/91";*/
-static char rcsid[] = "$Id: touch.c,v 1.1 1995/10/18 08:45:58 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: touch.c,v 1.2 1996/06/26 05:38:07 deraadt Exp $";
#endif /* not lint */
#include <sys/types.h>
diff --git a/usr.bin/rdist/child.c b/usr.bin/rdist/child.c
index cf4e65aa6ad..0e862779009 100644
--- a/usr.bin/rdist/child.c
+++ b/usr.bin/rdist/child.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: child.c,v 1.3 1996/06/26 05:38:07 deraadt Exp $ */
+
/*
* Copyright (c) 1983 Regents of the University of California.
* All rights reserved.
@@ -33,7 +35,7 @@
#ifndef lint
static char RCSid[] =
-"$Id: child.c,v 1.2 1996/03/05 03:15:56 dm Exp $";
+"$OpenBSD: child.c,v 1.3 1996/06/26 05:38:07 deraadt Exp $";
static char sccsid[] = "@(#)docmd.c 5.1 (Berkeley) 6/6/85";
diff --git a/usr.bin/rdist/client.c b/usr.bin/rdist/client.c
index bf0cd9ba980..8b2cc7226f9 100644
--- a/usr.bin/rdist/client.c
+++ b/usr.bin/rdist/client.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: client.c,v 1.3 1996/06/26 05:38:08 deraadt Exp $ */
+
/*
* Copyright (c) 1983 Regents of the University of California.
* All rights reserved.
@@ -33,7 +35,7 @@
#ifndef lint
static char RCSid[] =
-"$Id: client.c,v 1.2 1996/03/05 03:15:57 dm Exp $";
+"$OpenBSD: client.c,v 1.3 1996/06/26 05:38:08 deraadt Exp $";
static char sccsid[] = "@(#)client.c";
diff --git a/usr.bin/rdist/common.c b/usr.bin/rdist/common.c
index 76bfae3b839..96f57b7d51f 100644
--- a/usr.bin/rdist/common.c
+++ b/usr.bin/rdist/common.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: common.c,v 1.3 1996/06/26 05:38:09 deraadt Exp $ */
+
/*
* Copyright (c) 1983 Regents of the University of California.
* All rights reserved.
@@ -33,7 +35,7 @@
#ifndef lint
static char RCSid[] =
-"$Id: common.c,v 1.2 1996/03/05 03:15:58 dm Exp $";
+"$OpenBSD: common.c,v 1.3 1996/06/26 05:38:09 deraadt Exp $";
static char sccsid[] = "@(#)common.c";
diff --git a/usr.bin/rdist/config-data.h b/usr.bin/rdist/config-data.h
index 71304bede1d..b9d18ad7d83 100644
--- a/usr.bin/rdist/config-data.h
+++ b/usr.bin/rdist/config-data.h
@@ -1,3 +1,4 @@
+/* * $OpenBSD: config-data.h,v 1.3 1996/06/26 05:38:09 deraadt Exp $*/
/*
* Copyright (c) 1993 Michael A. Cooper
* Copyright (c) 1993 Regents of the University of California.
@@ -33,7 +34,6 @@
*/
/*
- * $Id: config-data.h,v 1.2 1996/03/05 03:15:59 dm Exp $
* @(#)configdata.h
*/
diff --git a/usr.bin/rdist/config-def.h b/usr.bin/rdist/config-def.h
index 15ec973c1ab..34e99f47210 100644
--- a/usr.bin/rdist/config-def.h
+++ b/usr.bin/rdist/config-def.h
@@ -1,3 +1,4 @@
+/* * $OpenBSD: config-def.h,v 1.3 1996/06/26 05:38:10 deraadt Exp $*/
/*
* Copyright (c) 1993 Michael A. Cooper
* Copyright (c) 1993 Regents of the University of California.
@@ -33,7 +34,6 @@
*/
/*
- * $Id: config-def.h,v 1.2 1996/03/05 03:16:00 dm Exp $
* @(#)configdef.h
*/
diff --git a/usr.bin/rdist/config.h b/usr.bin/rdist/config.h
index af5e3bc54d8..76ea817fafc 100644
--- a/usr.bin/rdist/config.h
+++ b/usr.bin/rdist/config.h
@@ -1,3 +1,4 @@
+/* * $OpenBSD: config.h,v 1.4 1996/06/26 05:38:10 deraadt Exp $*/
/*
* Copyright (c) 1993 Michael A. Cooper
* Copyright (c) 1993 Regents of the University of California.
@@ -33,7 +34,6 @@
*/
/*
- * $Id: config.h,v 1.3 1996/03/05 05:03:47 dm Exp $
* @(#)config.h
*/
diff --git a/usr.bin/rdist/distopt.c b/usr.bin/rdist/distopt.c
index 465f1cf7c1c..016bc4777a4 100644
--- a/usr.bin/rdist/distopt.c
+++ b/usr.bin/rdist/distopt.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: distopt.c,v 1.3 1996/06/26 05:38:11 deraadt Exp $ */
+
/*
* Copyright (c) 1983 Regents of the University of California.
* All rights reserved.
@@ -33,7 +35,7 @@
#ifndef lint
static char RCSid[] =
-"$Id: distopt.c,v 1.2 1996/03/05 03:16:02 dm Exp $";
+"$OpenBSD: distopt.c,v 1.3 1996/06/26 05:38:11 deraadt Exp $";
static char sccsid[] = "@(#)distopt.c";
diff --git a/usr.bin/rdist/docmd.c b/usr.bin/rdist/docmd.c
index 85ac25d3a2b..95cbf603b79 100644
--- a/usr.bin/rdist/docmd.c
+++ b/usr.bin/rdist/docmd.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: docmd.c,v 1.4 1996/06/26 05:38:12 deraadt Exp $ */
+
/*
* Copyright (c) 1983 Regents of the University of California.
* All rights reserved.
@@ -33,7 +35,7 @@
#ifndef lint
static char RCSid[] =
-"$Id: docmd.c,v 1.3 1996/03/05 03:16:03 dm Exp $";
+"$OpenBSD: docmd.c,v 1.4 1996/06/26 05:38:12 deraadt Exp $";
static char sccsid[] = "@(#)docmd.c 5.1 (Berkeley) 6/6/85";
diff --git a/usr.bin/rdist/expand.c b/usr.bin/rdist/expand.c
index 756d9b88e65..7415a9085f5 100644
--- a/usr.bin/rdist/expand.c
+++ b/usr.bin/rdist/expand.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: expand.c,v 1.4 1996/06/26 05:38:12 deraadt Exp $ */
+
/*
* Copyright (c) 1983 Regents of the University of California.
* All rights reserved.
@@ -33,7 +35,7 @@
#ifndef lint
static char RCSid[] =
-"$Id: expand.c,v 1.3 1996/03/05 03:16:04 dm Exp $";
+"$OpenBSD: expand.c,v 1.4 1996/06/26 05:38:12 deraadt Exp $";
static char sccsid[] = "@(#)expand.c 5.2 (Berkeley) 3/28/86";
diff --git a/usr.bin/rdist/isexec.c b/usr.bin/rdist/isexec.c
index 571f9d7d4c6..795a2e27a12 100644
--- a/usr.bin/rdist/isexec.c
+++ b/usr.bin/rdist/isexec.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: isexec.c,v 1.3 1996/06/26 05:38:13 deraadt Exp $ */
+
/*
* Copyright (c) 1983 Regents of the University of California.
* All rights reserved.
@@ -32,7 +34,7 @@
*/
#ifndef lint
static char RCSid[] =
-"$Id: isexec.c,v 1.2 1996/03/05 03:16:06 dm Exp $";
+"$OpenBSD: isexec.c,v 1.3 1996/06/26 05:38:13 deraadt Exp $";
static char sccsid[] = "@(#)client.c";
diff --git a/usr.bin/rdist/lookup.c b/usr.bin/rdist/lookup.c
index 327c16c3d44..877095a8b0f 100644
--- a/usr.bin/rdist/lookup.c
+++ b/usr.bin/rdist/lookup.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: lookup.c,v 1.4 1996/06/26 05:38:13 deraadt Exp $ */
+
/*
* Copyright (c) 1983 Regents of the University of California.
* All rights reserved.
@@ -33,7 +35,7 @@
#ifndef lint
static char RCSid[] =
-"$Id: lookup.c,v 1.3 1996/03/05 03:16:07 dm Exp $";
+"$OpenBSD: lookup.c,v 1.4 1996/06/26 05:38:13 deraadt Exp $";
static char sccsid[] = "@(#)lookup.c 5.1 (Berkeley) 6/6/85";
diff --git a/usr.bin/rdist/message.c b/usr.bin/rdist/message.c
index b94be4c14c6..a54c4ebfb86 100644
--- a/usr.bin/rdist/message.c
+++ b/usr.bin/rdist/message.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: message.c,v 1.4 1996/06/26 05:38:14 deraadt Exp $ */
+
/*
* Copyright (c) 1983 Regents of the University of California.
* All rights reserved.
@@ -33,7 +35,7 @@
#ifndef lint
static char RCSid[] =
-"$Id: message.c,v 1.3 1996/06/25 22:23:18 deraadt Exp $";
+"$OpenBSD: message.c,v 1.4 1996/06/26 05:38:14 deraadt Exp $";
static char sccsid[] = "@(#)common.c";
diff --git a/usr.bin/rdist/os-openbsd.h b/usr.bin/rdist/os-openbsd.h
index 14e81099cdc..e4023520b56 100644
--- a/usr.bin/rdist/os-openbsd.h
+++ b/usr.bin/rdist/os-openbsd.h
@@ -1,3 +1,4 @@
+/* * $OpenBSD: os-openbsd.h,v 1.3 1996/06/26 05:38:15 deraadt Exp $*/
/*
* Copyright (c) 1993 Michael A. Cooper
* Copyright (c) 1993 Regents of the University of California.
@@ -33,7 +34,6 @@
*/
/*
- * $Id: os-openbsd.h,v 1.2 1996/03/05 03:16:09 dm Exp $
*/
/*
diff --git a/usr.bin/rdist/pathnames.h b/usr.bin/rdist/pathnames.h
index 3a2475d47e8..656a01af4aa 100644
--- a/usr.bin/rdist/pathnames.h
+++ b/usr.bin/rdist/pathnames.h
@@ -1,3 +1,4 @@
+/* * $OpenBSD: pathnames.h,v 1.4 1996/06/26 05:38:15 deraadt Exp $*/
/*
* Copyright (c) 1989 The Regents of the University of California.
* All rights reserved.
@@ -32,7 +33,6 @@
*/
/*
- * $Id: pathnames.h,v 1.3 1996/03/05 03:16:09 dm Exp $
* @(#)pathnames.h 5.4 (Berkeley) 8/27/90
*/
diff --git a/usr.bin/rdist/paths.h b/usr.bin/rdist/paths.h
index ba99f790872..1e5b6a292ac 100644
--- a/usr.bin/rdist/paths.h
+++ b/usr.bin/rdist/paths.h
@@ -1,3 +1,4 @@
+/* * $OpenBSD: paths.h,v 1.2 1996/06/26 05:38:16 deraadt Exp $*/
/*
* Copyright (c) 1983 Regents of the University of California.
* All rights reserved.
@@ -32,7 +33,6 @@
*/
/*
- * $Id: paths.h,v 1.1 1996/03/05 03:20:21 dm Exp $
* @(#)paths.h
*/
diff --git a/usr.bin/rdist/rdist.1 b/usr.bin/rdist/rdist.1
index b6e8e6fd708..0a0bea56b9b 100644
--- a/usr.bin/rdist/rdist.1
+++ b/usr.bin/rdist/rdist.1
@@ -1,3 +1,4 @@
+.\" $OpenBSD: rdist.1,v 1.4 1996/06/26 05:38:16 deraadt Exp $
.\"
.\" Copyright (c) 1983 Regents of the University of California.
.\" All rights reserved.
@@ -30,7 +31,6 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $Id: rdist.1,v 1.3 1996/03/05 03:16:10 dm Exp $
.\" @(#)rdist.1 6.6 (Berkeley) 5/13/86
.\"
.TH RDIST 1 "January 29, 1996"
diff --git a/usr.bin/rdist/rdist.c b/usr.bin/rdist/rdist.c
index 96fb780f81a..2fd211cc276 100644
--- a/usr.bin/rdist/rdist.c
+++ b/usr.bin/rdist/rdist.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: rdist.c,v 1.3 1996/06/26 05:38:17 deraadt Exp $ */
+
/*
* Copyright (c) 1983 Regents of the University of California.
* All rights reserved.
@@ -33,7 +35,7 @@
#ifndef lint
static char RCSid[] =
-"$Id: rdist.c,v 1.2 1996/03/05 03:16:11 dm Exp $";
+"$OpenBSD: rdist.c,v 1.3 1996/06/26 05:38:17 deraadt Exp $";
static char sccsid[] = "@(#)main.c 5.1 (Berkeley) 6/6/85";
diff --git a/usr.bin/rdist/rshrcmd.c b/usr.bin/rdist/rshrcmd.c
index 24e4a9dcd38..9ba84cb4367 100644
--- a/usr.bin/rdist/rshrcmd.c
+++ b/usr.bin/rdist/rshrcmd.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: rshrcmd.c,v 1.3 1996/06/26 05:38:17 deraadt Exp $ */
+
/*
* This is an rcmd() replacement originally by
@@ -6,7 +8,7 @@
#ifndef lint
static char RCSid[] =
-"$Id: rshrcmd.c,v 1.2 1996/03/05 03:16:12 dm Exp $";
+"$OpenBSD: rshrcmd.c,v 1.3 1996/06/26 05:38:17 deraadt Exp $";
#endif
#include "defs.h"
diff --git a/usr.bin/rdist/setargs.c b/usr.bin/rdist/setargs.c
index 2b54bd6efe8..c22067649af 100644
--- a/usr.bin/rdist/setargs.c
+++ b/usr.bin/rdist/setargs.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: setargs.c,v 1.3 1996/06/26 05:38:18 deraadt Exp $ */
+
/*
* Copyright (c) 1983 Regents of the University of California.
* All rights reserved.
@@ -33,7 +35,7 @@
#ifndef lint
static char RCSid[] =
-"$Id: setargs.c,v 1.2 1996/03/05 03:16:13 dm Exp $";
+"$OpenBSD: setargs.c,v 1.3 1996/06/26 05:38:18 deraadt Exp $";
static char sccsid[] = "@(#)setargs.c";
diff --git a/usr.bin/rdist/signal.c b/usr.bin/rdist/signal.c
index 9b45814183a..fccec9952b1 100644
--- a/usr.bin/rdist/signal.c
+++ b/usr.bin/rdist/signal.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: signal.c,v 1.3 1996/06/26 05:38:18 deraadt Exp $ */
+
/*
* Copyright (c) 1993 Regents of the University of California.
* All rights reserved.
@@ -33,7 +35,7 @@
#ifndef lint
static char RCSid[] =
-"$Id: signal.c,v 1.2 1996/03/05 03:16:13 dm Exp $";
+"$OpenBSD: signal.c,v 1.3 1996/06/26 05:38:18 deraadt Exp $";
static char sccsid[] = "@(#)signal.c";
diff --git a/usr.bin/rdist/types.h b/usr.bin/rdist/types.h
index 5c7510c3505..518a57f7c75 100644
--- a/usr.bin/rdist/types.h
+++ b/usr.bin/rdist/types.h
@@ -1,8 +1,8 @@
+/* * $OpenBSD: types.h,v 1.3 1996/06/26 05:38:19 deraadt Exp $*/
#ifndef __myTYPES_H__
#define __myTYPES_H__
/*
- * $Id: types.h,v 1.2 1996/03/05 03:16:15 dm Exp $
*/
/*
diff --git a/usr.bin/rdist/version.h b/usr.bin/rdist/version.h
index 1bbe11b804c..f6d944ccd47 100644
--- a/usr.bin/rdist/version.h
+++ b/usr.bin/rdist/version.h
@@ -1,3 +1,4 @@
+/* * $OpenBSD: version.h,v 1.3 1996/06/26 05:38:19 deraadt Exp $*/
/*
* Copyright (c) 1983 Regents of the University of California.
* All rights reserved.
@@ -32,7 +33,6 @@
*/
/*
- * $Id: version.h,v 1.2 1996/03/05 03:16:15 dm Exp $
*/
/*
diff --git a/usr.bin/rdistd/Makefile b/usr.bin/rdistd/Makefile
index 5f57de49e78..610dfa12cc7 100644
--- a/usr.bin/rdistd/Makefile
+++ b/usr.bin/rdistd/Makefile
@@ -1,3 +1,5 @@
+# $OpenBSD: Makefile,v 1.2 1996/06/26 05:38:20 deraadt Exp $
+
PROG= rdistd
SRCS= common.c filesys-os.c filesys.c message.c rdistd.c server.c setargs.c
.PATH: ${.CURDIR}/../rdist
diff --git a/usr.bin/rdistd/filesys-os.c b/usr.bin/rdistd/filesys-os.c
index a08fb750c36..fbf3fa6a723 100644
--- a/usr.bin/rdistd/filesys-os.c
+++ b/usr.bin/rdistd/filesys-os.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: filesys-os.c,v 1.3 1996/06/26 05:38:21 deraadt Exp $ */
+
/*
* Copyright (c) 1983 Regents of the University of California.
* All rights reserved.
@@ -33,7 +35,7 @@
#ifndef lint
static char RCSid[] =
-"$Id: filesys-os.c,v 1.2 1996/06/13 22:23:06 deraadt Exp $";
+"$OpenBSD: filesys-os.c,v 1.3 1996/06/26 05:38:21 deraadt Exp $";
static char sccsid[] = "@(#)filesys-os.c";
diff --git a/usr.bin/rdistd/filesys.c b/usr.bin/rdistd/filesys.c
index 135eb790427..34df4bf98ed 100644
--- a/usr.bin/rdistd/filesys.c
+++ b/usr.bin/rdistd/filesys.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: filesys.c,v 1.3 1996/06/26 05:38:21 deraadt Exp $ */
+
/*
* Copyright (c) 1983 Regents of the University of California.
* All rights reserved.
@@ -33,7 +35,7 @@
#ifndef lint
static char RCSid[] =
-"$Id: filesys.c,v 1.2 1996/03/05 03:16:17 dm Exp $";
+"$OpenBSD: filesys.c,v 1.3 1996/06/26 05:38:21 deraadt Exp $";
static char sccsid[] = "@(#)filesys.c";
diff --git a/usr.bin/rdistd/filesys.h b/usr.bin/rdistd/filesys.h
index 130df976551..57453f0d712 100644
--- a/usr.bin/rdistd/filesys.h
+++ b/usr.bin/rdistd/filesys.h
@@ -1,3 +1,4 @@
+/* * $OpenBSD: filesys.h,v 1.3 1996/06/26 05:38:22 deraadt Exp $*/
/*
* Copyright (c) 1983 Regents of the University of California.
* All rights reserved.
@@ -32,7 +33,6 @@
*/
/*
- * $Id: filesys.h,v 1.2 1996/03/05 03:16:18 dm Exp $
* @(#)filesys.h
*/
diff --git a/usr.bin/rdistd/message.c b/usr.bin/rdistd/message.c
index 284eb8e79e0..cc8a043760c 100644
--- a/usr.bin/rdistd/message.c
+++ b/usr.bin/rdistd/message.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: message.c,v 1.4 1996/06/26 05:38:23 deraadt Exp $ */
+
/*
* Copyright (c) 1983 Regents of the University of California.
* All rights reserved.
@@ -33,7 +35,7 @@
#ifndef lint
static char RCSid[] =
-"$Id: message.c,v 1.3 1996/06/25 22:43:25 deraadt Exp $";
+"$OpenBSD: message.c,v 1.4 1996/06/26 05:38:23 deraadt Exp $";
static char sccsid[] = "@(#)common.c";
diff --git a/usr.bin/rdistd/rdistd.1 b/usr.bin/rdistd/rdistd.1
index eaa17abd566..f317fbff2b4 100644
--- a/usr.bin/rdistd/rdistd.1
+++ b/usr.bin/rdistd/rdistd.1
@@ -1,3 +1,4 @@
+.\" $OpenBSD: rdistd.1,v 1.3 1996/06/26 05:38:23 deraadt Exp $
.\"
.\" Copyright (c) 1983 Regents of the University of California.
.\" All rights reserved.
@@ -30,7 +31,6 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $Id: rdistd.1,v 1.2 1996/03/05 03:16:19 dm Exp $
.\" @(#)rdistd.8 6.6 (Berkeley) 5/13/86
.\"
.TH RDISTD 8 "June 21, 1992"
diff --git a/usr.bin/rdistd/rdistd.c b/usr.bin/rdistd/rdistd.c
index 09e4d654518..136ada11489 100644
--- a/usr.bin/rdistd/rdistd.c
+++ b/usr.bin/rdistd/rdistd.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: rdistd.c,v 1.3 1996/06/26 05:38:24 deraadt Exp $ */
+
/*
* Copyright (c) 1983 Regents of the University of California.
* All rights reserved.
@@ -33,7 +35,7 @@
#ifndef lint
static char RCSid[] =
-"$Id: rdistd.c,v 1.2 1996/03/05 03:16:20 dm Exp $";
+"$OpenBSD: rdistd.c,v 1.3 1996/06/26 05:38:24 deraadt Exp $";
static char sccsid[] = "@(#)rdistd.c";
diff --git a/usr.bin/rdistd/server.c b/usr.bin/rdistd/server.c
index 42a9f85cb39..da6472128a3 100644
--- a/usr.bin/rdistd/server.c
+++ b/usr.bin/rdistd/server.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: server.c,v 1.4 1996/06/26 05:38:24 deraadt Exp $ */
+
/*
* Copyright (c) 1983 Regents of the University of California.
* All rights reserved.
@@ -32,7 +34,7 @@
*/
#ifndef lint
static char RCSid[] =
-"$Id: server.c,v 1.3 1996/06/25 22:43:26 deraadt Exp $";
+"$OpenBSD: server.c,v 1.4 1996/06/26 05:38:24 deraadt Exp $";
static char sccsid[] = "@(#)server.c 5.3 (Berkeley) 6/7/86";
diff --git a/usr.bin/renice/Makefile b/usr.bin/renice/Makefile
index 33b999e6533..acf707e6441 100644
--- a/usr.bin/renice/Makefile
+++ b/usr.bin/renice/Makefile
@@ -1,5 +1,4 @@
-# from: @(#)Makefile 5.3 (Berkeley) 5/11/90
-# $Id: Makefile,v 1.1 1995/10/18 08:45:59 deraadt Exp $
+# $OpenBSD: Makefile,v 1.2 1996/06/26 05:38:26 deraadt Exp $
PROG= renice
MAN= renice.8
diff --git a/usr.bin/renice/renice.8 b/usr.bin/renice/renice.8
index 9d5d1b440fc..918e1aab600 100644
--- a/usr.bin/renice/renice.8
+++ b/usr.bin/renice/renice.8
@@ -1,3 +1,4 @@
+.\" $OpenBSD: renice.8,v 1.2 1996/06/26 05:38:26 deraadt Exp $
.\" Copyright (c) 1983, 1991 The Regents of the University of California.
.\" All rights reserved.
.\"
@@ -30,7 +31,6 @@
.\" SUCH DAMAGE.
.\"
.\" from: @(#)renice.8 6.5 (Berkeley) 3/16/91
-.\" $Id: renice.8,v 1.1 1995/10/18 08:45:59 deraadt Exp $
.\"
.Dd March 16, 1991
.Dt RENICE 8
diff --git a/usr.bin/renice/renice.c b/usr.bin/renice/renice.c
index aba3c843692..1bf825af4f5 100644
--- a/usr.bin/renice/renice.c
+++ b/usr.bin/renice/renice.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: renice.c,v 1.2 1996/06/26 05:38:27 deraadt Exp $ */
+
/*
* Copyright (c) 1983 The Regents of the University of California.
* All rights reserved.
@@ -39,7 +41,7 @@ char copyright[] =
#ifndef lint
/*static char sccsid[] = "from: @(#)renice.c 5.3 (Berkeley) 6/1/90";*/
-static char rcsid[] = "$Id: renice.c,v 1.1 1995/10/18 08:45:59 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: renice.c,v 1.2 1996/06/26 05:38:27 deraadt Exp $";
#endif /* not lint */
#include <sys/types.h>
diff --git a/usr.bin/rev/Makefile b/usr.bin/rev/Makefile
index ae280802ab8..4e08e07d686 100644
--- a/usr.bin/rev/Makefile
+++ b/usr.bin/rev/Makefile
@@ -1,5 +1,5 @@
+# $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 $
-# @(#)Makefile 8.1 (Berkeley) 6/9/93
PROG= rev
diff --git a/usr.bin/rev/rev.1 b/usr.bin/rev/rev.1
index 6e41c79d54e..5450c48cde6 100644
--- a/usr.bin/rev/rev.1
+++ b/usr.bin/rev/rev.1
@@ -1,3 +1,4 @@
+.\" $OpenBSD: rev.1,v 1.2 1996/06/26 05:38:28 deraadt Exp $
.\" $NetBSD: rev.1,v 1.3 1995/09/28 08:49:39 tls Exp $
.\"
.\" Copyright (c) 1985, 1992, 1993
diff --git a/usr.bin/rev/rev.c b/usr.bin/rev/rev.c
index e99dc543fd9..abf696301dc 100644
--- a/usr.bin/rev/rev.c
+++ b/usr.bin/rev/rev.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: rev.c,v 1.2 1996/06/26 05:38:29 deraadt Exp $ */
/* $NetBSD: rev.c,v 1.5 1995/09/28 08:49:40 tls Exp $ */
/*-
@@ -43,7 +44,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)rev.c 8.3 (Berkeley) 5/4/95";
#else
-static char rcsid[] = "$NetBSD: rev.c,v 1.5 1995/09/28 08:49:40 tls Exp $";
+static char rcsid[] = "$OpenBSD: rev.c,v 1.2 1996/06/26 05:38:29 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/rlogin/Makefile b/usr.bin/rlogin/Makefile
index 898c81b0a13..e57bf868281 100644
--- a/usr.bin/rlogin/Makefile
+++ b/usr.bin/rlogin/Makefile
@@ -1,5 +1,5 @@
+# $OpenBSD: Makefile,v 1.3 1996/06/26 05:38:30 deraadt Exp $
# $NetBSD: Makefile,v 1.5 1995/03/21 07:58:28 cgd Exp $
-# @(#)Makefile 8.1 (Berkeley) 7/19/93
PROG= rlogin
SRCS= rlogin.c
diff --git a/usr.bin/rlogin/des_rw.c b/usr.bin/rlogin/des_rw.c
index bf928f85551..3e635967d76 100644
--- a/usr.bin/rlogin/des_rw.c
+++ b/usr.bin/rlogin/des_rw.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: des_rw.c,v 1.4 1996/06/26 05:38:30 deraadt Exp $ */
/* $NetBSD: des_rw.c,v 1.2 1995/03/21 07:58:30 cgd Exp $ */
/*-
@@ -37,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)des_rw.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$NetBSD: des_rw.c,v 1.2 1995/03/21 07:58:30 cgd Exp $";
+static char rcsid[] = "$OpenBSD: des_rw.c,v 1.4 1996/06/26 05:38:30 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/rlogin/kcmd.c b/usr.bin/rlogin/kcmd.c
index 0863bafd2ac..686858b696e 100644
--- a/usr.bin/rlogin/kcmd.c
+++ b/usr.bin/rlogin/kcmd.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: kcmd.c,v 1.3 1996/06/26 05:38:31 deraadt Exp $ */
/* $NetBSD: kcmd.c,v 1.2 1995/03/21 07:58:32 cgd Exp $ */
/*
@@ -38,7 +39,7 @@
static char Xsccsid[] = "derived from @(#)rcmd.c 5.17 (Berkeley) 6/27/88";
static char sccsid[] = "@(#)kcmd.c 8.2 (Berkeley) 8/19/93";
#else
-static char rcsid[] = "$NetBSD: kcmd.c,v 1.2 1995/03/21 07:58:32 cgd Exp $";
+static char rcsid[] = "$OpenBSD: kcmd.c,v 1.3 1996/06/26 05:38:31 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/rlogin/krcmd.c b/usr.bin/rlogin/krcmd.c
index f40e9e3145b..21853bb4d1d 100644
--- a/usr.bin/rlogin/krcmd.c
+++ b/usr.bin/rlogin/krcmd.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: krcmd.c,v 1.3 1996/06/26 05:38:32 deraadt Exp $ */
/* $NetBSD: krcmd.c,v 1.2 1995/03/21 07:58:36 cgd Exp $ */
/*
@@ -37,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)krcmd.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$NetBSD: krcmd.c,v 1.2 1995/03/21 07:58:36 cgd Exp $";
+static char rcsid[] = "$OpenBSD: krcmd.c,v 1.3 1996/06/26 05:38:32 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/rlogin/rlogin.1 b/usr.bin/rlogin/rlogin.1
index 5a73e933f5d..1ece905891e 100644
--- a/usr.bin/rlogin/rlogin.1
+++ b/usr.bin/rlogin/rlogin.1
@@ -1,3 +1,4 @@
+.\" $OpenBSD: rlogin.1,v 1.2 1996/06/26 05:38:32 deraadt Exp $
.\" $NetBSD: rlogin.1,v 1.4 1995/08/18 15:07:35 pk Exp $
.\"
.\" Copyright (c) 1983, 1990, 1993
diff --git a/usr.bin/rlogin/rlogin.c b/usr.bin/rlogin/rlogin.c
index de788cfb897..7b5a1c80476 100644
--- a/usr.bin/rlogin/rlogin.c
+++ b/usr.bin/rlogin/rlogin.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: rlogin.c,v 1.6 1996/06/26 05:38:33 deraadt Exp $ */
/* $NetBSD: rlogin.c,v 1.8 1995/10/05 09:07:22 mycroft Exp $ */
/*
@@ -43,7 +44,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)rlogin.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$NetBSD: rlogin.c,v 1.8 1995/10/05 09:07:22 mycroft Exp $";
+static char rcsid[] = "$OpenBSD: rlogin.c,v 1.6 1996/06/26 05:38:33 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/rpcgen/Makefile b/usr.bin/rpcgen/Makefile
index 948fb3717f4..c9210fd9904 100644
--- a/usr.bin/rpcgen/Makefile
+++ b/usr.bin/rpcgen/Makefile
@@ -1,3 +1,4 @@
+# $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 $
#
PROG= rpcgen
diff --git a/usr.bin/rpcgen/rpc_clntout.c b/usr.bin/rpcgen/rpc_clntout.c
index 82db704c0fa..edcfde7c68b 100644
--- a/usr.bin/rpcgen/rpc_clntout.c
+++ b/usr.bin/rpcgen/rpc_clntout.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: rpc_clntout.c,v 1.2 1996/06/26 05:38:35 deraadt Exp $ */
/* $NetBSD: rpc_clntout.c,v 1.4 1995/06/11 21:49:52 pk Exp $ */
/*
* Sun RPC is a product of Sun Microsystems, Inc. and is provided for
diff --git a/usr.bin/rpcgen/rpc_cout.c b/usr.bin/rpcgen/rpc_cout.c
index b242b42f545..cdbf2819a45 100644
--- a/usr.bin/rpcgen/rpc_cout.c
+++ b/usr.bin/rpcgen/rpc_cout.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: rpc_cout.c,v 1.2 1996/06/26 05:38:35 deraadt Exp $ */
/* $NetBSD: rpc_cout.c,v 1.5 1995/08/29 23:05:49 cgd Exp $ */
/*
* Sun RPC is a product of Sun Microsystems, Inc. and is provided for
diff --git a/usr.bin/rpcgen/rpc_hout.c b/usr.bin/rpcgen/rpc_hout.c
index 4b378404864..7750796f736 100644
--- a/usr.bin/rpcgen/rpc_hout.c
+++ b/usr.bin/rpcgen/rpc_hout.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: rpc_hout.c,v 1.2 1996/06/26 05:38:36 deraadt Exp $ */
/* $NetBSD: rpc_hout.c,v 1.4 1995/06/11 21:49:55 pk Exp $ */
/*
* Sun RPC is a product of Sun Microsystems, Inc. and is provided for
diff --git a/usr.bin/rpcgen/rpc_parse.c b/usr.bin/rpcgen/rpc_parse.c
index 0916b0d7686..809d3b16bca 100644
--- a/usr.bin/rpcgen/rpc_parse.c
+++ b/usr.bin/rpcgen/rpc_parse.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: rpc_parse.c,v 1.2 1996/06/26 05:38:37 deraadt Exp $ */
/* $NetBSD: rpc_parse.c,v 1.5 1995/08/29 23:05:55 cgd Exp $ */
/*
* Sun RPC is a product of Sun Microsystems, Inc. and is provided for
diff --git a/usr.bin/rpcgen/rpc_parse.h b/usr.bin/rpcgen/rpc_parse.h
index faa651b78c8..4946c2bcb56 100644
--- a/usr.bin/rpcgen/rpc_parse.h
+++ b/usr.bin/rpcgen/rpc_parse.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: rpc_parse.h,v 1.2 1996/06/26 05:38:37 deraadt Exp $ */
/* $NetBSD: rpc_parse.h,v 1.3 1995/06/11 21:50:00 pk Exp $ */
/*
* Sun RPC is a product of Sun Microsystems, Inc. and is provided for
diff --git a/usr.bin/rpcgen/rpc_sample.c b/usr.bin/rpcgen/rpc_sample.c
index 4100fcb68ec..1d4d3ffe8d6 100644
--- a/usr.bin/rpcgen/rpc_sample.c
+++ b/usr.bin/rpcgen/rpc_sample.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: rpc_sample.c,v 1.2 1996/06/26 05:38:38 deraadt Exp $ */
/* $NetBSD: rpc_sample.c,v 1.2 1995/06/11 21:50:01 pk Exp $ */
/*
* Sun RPC is a product of Sun Microsystems, Inc. and is provided for
diff --git a/usr.bin/rpcgen/rpc_scan.c b/usr.bin/rpcgen/rpc_scan.c
index b46327c5afe..e6082295386 100644
--- a/usr.bin/rpcgen/rpc_scan.c
+++ b/usr.bin/rpcgen/rpc_scan.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: rpc_scan.c,v 1.2 1996/06/26 05:38:39 deraadt Exp $ */
/* $NetBSD: rpc_scan.c,v 1.4 1995/06/11 21:50:02 pk Exp $ */
/*
* Sun RPC is a product of Sun Microsystems, Inc. and is provided for
diff --git a/usr.bin/rpcgen/rpc_scan.h b/usr.bin/rpcgen/rpc_scan.h
index 4024090990d..7bdc7c22a13 100644
--- a/usr.bin/rpcgen/rpc_scan.h
+++ b/usr.bin/rpcgen/rpc_scan.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: rpc_scan.h,v 1.2 1996/06/26 05:38:39 deraadt Exp $ */
/* $NetBSD: rpc_scan.h,v 1.3 1995/06/11 21:50:04 pk Exp $ */
/*
* Sun RPC is a product of Sun Microsystems, Inc. and is provided for
diff --git a/usr.bin/rpcgen/rpc_svcout.c b/usr.bin/rpcgen/rpc_svcout.c
index 32ef9dbc47a..334135eb56c 100644
--- a/usr.bin/rpcgen/rpc_svcout.c
+++ b/usr.bin/rpcgen/rpc_svcout.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: rpc_svcout.c,v 1.2 1996/06/26 05:38:40 deraadt Exp $ */
/* $NetBSD: rpc_svcout.c,v 1.7 1995/06/24 14:59:59 pk Exp $ */
/*
* Sun RPC is a product of Sun Microsystems, Inc. and is provided for
diff --git a/usr.bin/rpcgen/rpc_tblout.c b/usr.bin/rpcgen/rpc_tblout.c
index 8fcbbc0f526..6218104a570 100644
--- a/usr.bin/rpcgen/rpc_tblout.c
+++ b/usr.bin/rpcgen/rpc_tblout.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: rpc_tblout.c,v 1.2 1996/06/26 05:38:41 deraadt Exp $ */
/* $NetBSD: rpc_tblout.c,v 1.3 1995/06/24 15:00:15 pk Exp $ */
/*
* Sun RPC is a product of Sun Microsystems, Inc. and is provided for
diff --git a/usr.bin/rpcgen/rpc_util.c b/usr.bin/rpcgen/rpc_util.c
index 07297675eea..e71ac973466 100644
--- a/usr.bin/rpcgen/rpc_util.c
+++ b/usr.bin/rpcgen/rpc_util.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: rpc_util.c,v 1.2 1996/06/26 05:38:41 deraadt Exp $ */
/* $NetBSD: rpc_util.c,v 1.6 1995/08/29 23:05:57 cgd Exp $ */
/*
* Sun RPC is a product of Sun Microsystems, Inc. and is provided for
diff --git a/usr.bin/rpcgen/rpc_util.h b/usr.bin/rpcgen/rpc_util.h
index 4c1de4e1ee4..9eaa5a917e7 100644
--- a/usr.bin/rpcgen/rpc_util.h
+++ b/usr.bin/rpcgen/rpc_util.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: rpc_util.h,v 1.2 1996/06/26 05:38:42 deraadt Exp $ */
/* $NetBSD: rpc_util.h,v 1.3 1995/06/11 21:50:10 pk Exp $ */
/*
* Sun RPC is a product of Sun Microsystems, Inc. and is provided for
diff --git a/usr.bin/rpcgen/rpcgen.1 b/usr.bin/rpcgen/rpcgen.1
index e17efab0ee7..25321165d58 100644
--- a/usr.bin/rpcgen/rpcgen.1
+++ b/usr.bin/rpcgen/rpcgen.1
@@ -1,3 +1,4 @@
+.\" $OpenBSD: rpcgen.1,v 1.3 1996/06/26 05:38:42 deraadt Exp $
.\" $NetBSD: rpcgen.1,v 1.5.2.1 1995/12/05 02:51:02 jtc Exp $
.\" from: @(#)rpcgen.new.1 1.1 90/11/09 TIRPC 1.0; from 40.10 of 10/10/89
.\" Copyright (c) 1988,1990 Sun Microsystems, Inc. - All Rights Reserved.
diff --git a/usr.bin/rpcinfo/Makefile b/usr.bin/rpcinfo/Makefile
index 0691893c86a..dd3d941ee46 100644
--- a/usr.bin/rpcinfo/Makefile
+++ b/usr.bin/rpcinfo/Makefile
@@ -1,5 +1,4 @@
-# from: @(#)Makefile 5.2 (Berkeley) 5/11/90
-# $Id: Makefile,v 1.1 1995/10/18 08:46:02 deraadt Exp $
+# $OpenBSD: Makefile,v 1.2 1996/06/26 05:38:43 deraadt Exp $
PROG= rpcinfo
MAN= rpcinfo.8
diff --git a/usr.bin/rpcinfo/rpcinfo.8 b/usr.bin/rpcinfo/rpcinfo.8
index 7fa0ae37a99..14fcb5130d3 100644
--- a/usr.bin/rpcinfo/rpcinfo.8
+++ b/usr.bin/rpcinfo/rpcinfo.8
@@ -1,5 +1,5 @@
+.\" $OpenBSD: rpcinfo.8,v 1.2 1996/06/26 05:38:44 deraadt Exp $
.\" from: @(#)rpcinfo.8c 2.2 88/08/03 4.0 RPCSRC; from 1.24 88/02/25 SMI
-.\" $Id: rpcinfo.8,v 1.1 1995/10/18 08:46:02 deraadt Exp $
.\"
.Dd December 17, 1987
.Dt RPCINFO 8
diff --git a/usr.bin/rpcinfo/rpcinfo.c b/usr.bin/rpcinfo/rpcinfo.c
index 1f30074ba41..6302eaed8ab 100644
--- a/usr.bin/rpcinfo/rpcinfo.c
+++ b/usr.bin/rpcinfo/rpcinfo.c
@@ -1,7 +1,9 @@
+/* $OpenBSD: rpcinfo.c,v 1.2 1996/06/26 05:38:45 deraadt Exp $ */
+
#ifndef lint
/*static char sccsid[] = "from: @(#)rpcinfo.c 1.22 87/08/12 SMI";*/
/*static char sccsid[] = "from: @(#)rpcinfo.c 2.2 88/08/11 4.0 RPCSRC";*/
-static char rcsid[] = "$Id: rpcinfo.c,v 1.1 1995/10/18 08:46:02 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: rpcinfo.c,v 1.2 1996/06/26 05:38:45 deraadt Exp $";
#endif
/*
diff --git a/usr.bin/rs/Makefile b/usr.bin/rs/Makefile
index 21da34d0a01..6c658e84a99 100644
--- a/usr.bin/rs/Makefile
+++ b/usr.bin/rs/Makefile
@@ -1,4 +1,5 @@
-# @(#)Makefile 8.1 (Berkeley) 6/6/93
+# $OpenBSD: Makefile,v 1.2 1996/06/26 05:38:46 deraadt Exp $
+
PROG= rs
diff --git a/usr.bin/rs/rs.1 b/usr.bin/rs/rs.1
index 9916b667247..fda424222f9 100644
--- a/usr.bin/rs/rs.1
+++ b/usr.bin/rs/rs.1
@@ -1,3 +1,5 @@
+.\" $OpenBSD: rs.1,v 1.3 1996/06/26 05:38:46 deraadt Exp $
+.\"
.\" Copyright (c) 1993
.\" The Regents of the University of California. All rights reserved.
.\"
diff --git a/usr.bin/rs/rs.c b/usr.bin/rs/rs.c
index 9e55e126d34..c0f760e51e9 100644
--- a/usr.bin/rs/rs.c
+++ b/usr.bin/rs/rs.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: rs.c,v 1.3 1996/06/26 05:38:47 deraadt Exp $ */
+
/*-
* Copyright (c) 1993
* The Regents of the University of California. All rights reserved.
diff --git a/usr.bin/rsh/Makefile b/usr.bin/rsh/Makefile
index 1938ebdd89b..c9958fe03ab 100644
--- a/usr.bin/rsh/Makefile
+++ b/usr.bin/rsh/Makefile
@@ -1,5 +1,4 @@
-# from: @(#)Makefile 5.6 (Berkeley) 9/27/90
-# $Id: Makefile,v 1.2 1995/12/16 22:20:35 tholo Exp $
+# $OpenBSD: Makefile,v 1.3 1996/06/26 05:38:48 deraadt Exp $
PROG= rsh
SRCS= rsh.c
diff --git a/usr.bin/rsh/pathnames.h b/usr.bin/rsh/pathnames.h
index 0e2d92d36ce..2c6550ce4a4 100644
--- a/usr.bin/rsh/pathnames.h
+++ b/usr.bin/rsh/pathnames.h
@@ -1,3 +1,4 @@
+/* * $OpenBSD: pathnames.h,v 1.2 1996/06/26 05:38:48 deraadt Exp $*/
/*
* Copyright (c) 1989 The Regents of the University of California.
* All rights reserved.
@@ -31,7 +32,6 @@
* SUCH DAMAGE.
*
* from: @(#)pathnames.h 5.2 (Berkeley) 4/9/90
- * $Id: pathnames.h,v 1.1 1995/10/18 08:46:03 deraadt Exp $
*/
#define _PATH_RLOGIN "/usr/bin/rlogin"
diff --git a/usr.bin/rsh/rsh.1 b/usr.bin/rsh/rsh.1
index 4e9adce263c..3d55b47e491 100644
--- a/usr.bin/rsh/rsh.1
+++ b/usr.bin/rsh/rsh.1
@@ -1,3 +1,4 @@
+.\" $OpenBSD: rsh.1,v 1.2 1996/06/26 05:38:49 deraadt Exp $
.\" Copyright (c) 1983, 1990 The Regents of the University of California.
.\" All rights reserved.
.\"
@@ -30,7 +31,6 @@
.\" SUCH DAMAGE.
.\"
.\" from: @(#)rsh.1 6.10 (Berkeley) 7/24/91
-.\" $Id: rsh.1,v 1.1 1995/10/18 08:46:03 deraadt Exp $
.\"
.Dd July 24, 1991
.Dt RSH 1
diff --git a/usr.bin/rsh/rsh.c b/usr.bin/rsh/rsh.c
index f80af10fa7a..4f490298e22 100644
--- a/usr.bin/rsh/rsh.c
+++ b/usr.bin/rsh/rsh.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: rsh.c,v 1.4 1996/06/26 05:38:49 deraadt Exp $ */
+
/*-
* Copyright (c) 1983, 1990 The Regents of the University of California.
* All rights reserved.
@@ -39,12 +41,12 @@ char copyright[] =
#ifndef lint
/*static char sccsid[] = "from: @(#)rsh.c 5.24 (Berkeley) 7/1/91";*/
-static char rcsid[] = "$Id: rsh.c,v 1.3 1996/04/17 07:16:43 tholo Exp $";
+static char rcsid[] = "$OpenBSD: rsh.c,v 1.4 1996/06/26 05:38:49 deraadt Exp $";
#endif /* not lint */
/*
* $Source: /cvs/OpenBSD/src/usr.bin/rsh/rsh.c,v $
- * $Header: /cvs/OpenBSD/src/usr.bin/rsh/rsh.c,v 1.3 1996/04/17 07:16:43 tholo Exp $
+ * $Header: /cvs/OpenBSD/src/usr.bin/rsh/rsh.c,v 1.4 1996/06/26 05:38:49 deraadt Exp $
*/
#include <sys/types.h>
diff --git a/usr.bin/rup/Makefile b/usr.bin/rup/Makefile
index 86c3e552508..24c5192a555 100644
--- a/usr.bin/rup/Makefile
+++ b/usr.bin/rup/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.1 1995/10/18 08:46:03 deraadt Exp $
+# $OpenBSD: Makefile,v 1.2 1996/06/26 05:38:50 deraadt Exp $
PROG= rup
diff --git a/usr.bin/rup/rup.1 b/usr.bin/rup/rup.1
index 8c72de404b8..1734446ff31 100644
--- a/usr.bin/rup/rup.1
+++ b/usr.bin/rup/rup.1
@@ -1,3 +1,4 @@
+.\" $OpenBSD: rup.1,v 1.2 1996/06/26 05:38:51 deraadt Exp $
.\" -*- nroff -*-
.\"
.\" Copyright (c) 1985, 1991 The Regents of the University of California.
@@ -31,7 +32,6 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $Id: rup.1,v 1.1 1995/10/18 08:46:03 deraadt Exp $
.\"
.Dd June 7, 1993
.Dt RUP 1
diff --git a/usr.bin/rup/rup.c b/usr.bin/rup/rup.c
index 7ec41913deb..72181eafc19 100644
--- a/usr.bin/rup/rup.c
+++ b/usr.bin/rup/rup.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: rup.c,v 1.2 1996/06/26 05:38:52 deraadt Exp $ */
+
/*-
* Copyright (c) 1993, John Brezak
* All rights reserved.
@@ -32,7 +34,7 @@
*/
#ifndef lint
-static char rcsid[] = "$Id: rup.c,v 1.1 1995/10/18 08:46:03 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: rup.c,v 1.2 1996/06/26 05:38:52 deraadt Exp $";
#endif /* not lint */
#include <stdio.h>
diff --git a/usr.bin/ruptime/Makefile b/usr.bin/ruptime/Makefile
index d86e9d53d98..42c45a8a70a 100644
--- a/usr.bin/ruptime/Makefile
+++ b/usr.bin/ruptime/Makefile
@@ -1,5 +1,4 @@
-# from: @(#)Makefile 5.3 (Berkeley) 5/11/90
-# $Id: Makefile,v 1.1 1995/10/18 08:46:03 deraadt Exp $
+# $OpenBSD: Makefile,v 1.2 1996/06/26 05:38:53 deraadt Exp $
PROG= ruptime
diff --git a/usr.bin/ruptime/ruptime.1 b/usr.bin/ruptime/ruptime.1
index d0d55057104..890b0ffc27d 100644
--- a/usr.bin/ruptime/ruptime.1
+++ b/usr.bin/ruptime/ruptime.1
@@ -1,3 +1,4 @@
+.\" $OpenBSD: ruptime.1,v 1.2 1996/06/26 05:38:53 deraadt Exp $
.\" Copyright (c) 1983, 1990 The Regents of the University of California.
.\" All rights reserved.
.\"
@@ -30,7 +31,6 @@
.\" SUCH DAMAGE.
.\"
.\" from: @(#)ruptime.1 6.9 (Berkeley) 4/23/91
-.\" $Id: ruptime.1,v 1.1 1995/10/18 08:46:03 deraadt Exp $
.\"
.Dd April 23, 1991
.Dt RUPTIME 1
diff --git a/usr.bin/ruptime/ruptime.c b/usr.bin/ruptime/ruptime.c
index d1a98ddad47..992d8fb060f 100644
--- a/usr.bin/ruptime/ruptime.c
+++ b/usr.bin/ruptime/ruptime.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: ruptime.c,v 1.2 1996/06/26 05:38:54 deraadt Exp $ */
+
/*
* Copyright (c) 1983 The Regents of the University of California.
* All rights reserved.
@@ -39,7 +41,7 @@ char copyright[] =
#ifndef lint
/*static char sccsid[] = "from: @(#)ruptime.c 5.8 (Berkeley) 7/21/90";*/
-static char rcsid[] = "$Id: ruptime.c,v 1.1 1995/10/18 08:46:04 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: ruptime.c,v 1.2 1996/06/26 05:38:54 deraadt Exp $";
#endif /* not lint */
#include <sys/param.h>
diff --git a/usr.bin/rusers/Makefile b/usr.bin/rusers/Makefile
index 089b3c48e47..0d0f032ef58 100644
--- a/usr.bin/rusers/Makefile
+++ b/usr.bin/rusers/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.1 1995/10/18 08:46:04 deraadt Exp $
+# $OpenBSD: Makefile,v 1.2 1996/06/26 05:38:55 deraadt Exp $
PROG = rusers
diff --git a/usr.bin/rusers/rusers.1 b/usr.bin/rusers/rusers.1
index 63ef7069029..cfc561ece32 100644
--- a/usr.bin/rusers/rusers.1
+++ b/usr.bin/rusers/rusers.1
@@ -1,3 +1,4 @@
+.\" $OpenBSD: rusers.1,v 1.2 1996/06/26 05:38:56 deraadt Exp $
.\" Copyright (c) 1983, 1990 The Regents of the University of California.
.\" All rights reserved.
.\"
@@ -30,7 +31,6 @@
.\" SUCH DAMAGE.
.\"
.\" from: @(#)rusers.1 6.7 (Berkeley) 4/23/91
-.\" $Id: rusers.1,v 1.1 1995/10/18 08:46:04 deraadt Exp $
.\"
.Dd April 23, 1991
.Dt RUSERS 1
diff --git a/usr.bin/rusers/rusers.c b/usr.bin/rusers/rusers.c
index 4fb7222e740..5815a1cadde 100644
--- a/usr.bin/rusers/rusers.c
+++ b/usr.bin/rusers/rusers.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: rusers.c,v 1.3 1996/06/26 05:38:56 deraadt Exp $ */
+
/*-
* Copyright (c) 1993 John Brezak
* All rights reserved.
@@ -27,7 +29,7 @@
*/
#ifndef lint
-static char rcsid[] = "$Id: rusers.c,v 1.2 1996/04/21 23:43:46 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: rusers.c,v 1.3 1996/06/26 05:38:56 deraadt Exp $";
#endif /* not lint */
#include <sys/types.h>
diff --git a/usr.bin/rwall/Makefile b/usr.bin/rwall/Makefile
index 7e4ce6d95e7..e613c1959bb 100644
--- a/usr.bin/rwall/Makefile
+++ b/usr.bin/rwall/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.1 1995/10/18 08:46:04 deraadt Exp $
+# $OpenBSD: Makefile,v 1.2 1996/06/26 05:38:57 deraadt Exp $
PROG = rwall
diff --git a/usr.bin/rwall/rwall.1 b/usr.bin/rwall/rwall.1
index 286a31a3e5b..ac0ca58eec7 100644
--- a/usr.bin/rwall/rwall.1
+++ b/usr.bin/rwall/rwall.1
@@ -1,3 +1,4 @@
+.\" $OpenBSD: rwall.1,v 1.2 1996/06/26 05:38:58 deraadt Exp $
.\" Copyright (c) 1983, 1990 The Regents of the University of California.
.\" All rights reserved.
.\"
@@ -30,7 +31,6 @@
.\" SUCH DAMAGE.
.\"
.\" from: @(#)rwall.1 6.7 (Berkeley) 4/23/91
-.\" $Id: rwall.1,v 1.1 1995/10/18 08:46:04 deraadt Exp $
.\"
.Dd April 23, 1991
.Dt RWALL 1
diff --git a/usr.bin/rwall/rwall.c b/usr.bin/rwall/rwall.c
index 715ed8e338d..cf920021e62 100644
--- a/usr.bin/rwall/rwall.c
+++ b/usr.bin/rwall/rwall.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: rwall.c,v 1.2 1996/06/26 05:38:58 deraadt Exp $ */
+
/*
* Copyright (c) 1993 Christopher G. Demetriou
* Copyright (c) 1988, 1990 Regents of the University of California.
@@ -40,7 +42,7 @@ char copyright[] =
#ifndef lint
/*static char sccsid[] = "from: @(#)wall.c 5.14 (Berkeley) 3/2/91";*/
-static char rcsid[] = "$Id: rwall.c,v 1.1 1995/10/18 08:46:04 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: rwall.c,v 1.2 1996/06/26 05:38:58 deraadt Exp $";
#endif /* not lint */
/*
diff --git a/usr.bin/rwho/Makefile b/usr.bin/rwho/Makefile
index 555ff754f08..e891bc5c02a 100644
--- a/usr.bin/rwho/Makefile
+++ b/usr.bin/rwho/Makefile
@@ -1,5 +1,4 @@
-# from: @(#)Makefile 5.3 (Berkeley) 5/11/90
-# $Id: Makefile,v 1.1 1995/10/18 08:46:04 deraadt Exp $
+# $OpenBSD: Makefile,v 1.2 1996/06/26 05:38:59 deraadt Exp $
PROG= rwho
diff --git a/usr.bin/rwho/rwho.1 b/usr.bin/rwho/rwho.1
index e1d09b52cd8..096ea453a0c 100644
--- a/usr.bin/rwho/rwho.1
+++ b/usr.bin/rwho/rwho.1
@@ -1,3 +1,4 @@
+.\" $OpenBSD: rwho.1,v 1.2 1996/06/26 05:39:00 deraadt Exp $
.\" Copyright (c) 1983, 1990 The Regents of the University of California.
.\" All rights reserved.
.\"
@@ -30,7 +31,6 @@
.\" SUCH DAMAGE.
.\"
.\" from: @(#)rwho.1 6.7 (Berkeley) 4/23/91
-.\" $Id: rwho.1,v 1.1 1995/10/18 08:46:04 deraadt Exp $
.\"
.Dd April 23, 1991
.Dt RWHO 1
diff --git a/usr.bin/rwho/rwho.c b/usr.bin/rwho/rwho.c
index 89fbd3414ba..353e280be63 100644
--- a/usr.bin/rwho/rwho.c
+++ b/usr.bin/rwho/rwho.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: rwho.c,v 1.2 1996/06/26 05:39:00 deraadt Exp $ */
+
/*
* Copyright (c) 1983 The Regents of the University of California.
* All rights reserved.
@@ -39,7 +41,7 @@ char copyright[] =
#ifndef lint
/*static char sccsid[] = "from: @(#)rwho.c 5.5 (Berkeley) 6/1/90";*/
-static char rcsid[] = "$Id: rwho.c,v 1.1 1995/10/18 08:46:04 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: rwho.c,v 1.2 1996/06/26 05:39:00 deraadt Exp $";
#endif /* not lint */
#include <sys/param.h>
diff --git a/usr.bin/script/Makefile b/usr.bin/script/Makefile
index cd7841793f9..53cf0910033 100644
--- a/usr.bin/script/Makefile
+++ b/usr.bin/script/Makefile
@@ -1,5 +1,5 @@
+# $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 $
-# @(#)Makefile 8.1 (Berkeley) 6/6/93
PROG= script
LDADD= -lutil
diff --git a/usr.bin/script/script.1 b/usr.bin/script/script.1
index e237e710199..791a210bf29 100644
--- a/usr.bin/script/script.1
+++ b/usr.bin/script/script.1
@@ -1,3 +1,4 @@
+.\" $OpenBSD: script.1,v 1.2 1996/06/26 05:39:02 deraadt Exp $
.\" $NetBSD: script.1,v 1.3 1994/12/21 08:55:41 jtc Exp $
.\"
.\" Copyright (c) 1980, 1990, 1993
diff --git a/usr.bin/script/script.c b/usr.bin/script/script.c
index ac9e52f767a..1496907fe23 100644
--- a/usr.bin/script/script.c
+++ b/usr.bin/script/script.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: script.c,v 1.2 1996/06/26 05:39:02 deraadt Exp $ */
/* $NetBSD: script.c,v 1.3 1994/12/21 08:55:43 jtc Exp $ */
/*
@@ -43,7 +44,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)script.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$NetBSD: script.c,v 1.3 1994/12/21 08:55:43 jtc Exp $";
+static char rcsid[] = "$OpenBSD: script.c,v 1.2 1996/06/26 05:39:02 deraadt Exp $";
#endif /* not lint */
#include <sys/types.h>
diff --git a/usr.bin/sed/Makefile b/usr.bin/sed/Makefile
index 2ba21259bb9..5dc19a5edc4 100644
--- a/usr.bin/sed/Makefile
+++ b/usr.bin/sed/Makefile
@@ -1,5 +1,4 @@
-# from: @(#)Makefile 8.1 (Berkeley) 6/6/93
-# $Id: Makefile,v 1.1 1995/10/18 08:46:05 deraadt Exp $
+# $OpenBSD: Makefile,v 1.2 1996/06/26 05:39:03 deraadt Exp $
PROG= sed
SRCS= compile.c main.c misc.c process.c
diff --git a/usr.bin/sed/POSIX b/usr.bin/sed/POSIX
index ae1f6222176..e91bca6bd98 100644
--- a/usr.bin/sed/POSIX
+++ b/usr.bin/sed/POSIX
@@ -1,5 +1,5 @@
+# $OpenBSD: POSIX,v 1.2 1996/06/26 05:39:04 deraadt Exp $
# from: @(#)POSIX 8.1 (Berkeley) 6/6/93
-# $Id: POSIX,v 1.1 1995/10/18 08:46:05 deraadt Exp $
Comments on the IEEE P1003.2 Draft 12
Part 2: Shell and Utilities
diff --git a/usr.bin/sed/TEST/hanoi.sed b/usr.bin/sed/TEST/hanoi.sed
index 2d108dc9a1d..09f854ede5d 100644
--- a/usr.bin/sed/TEST/hanoi.sed
+++ b/usr.bin/sed/TEST/hanoi.sed
@@ -1,7 +1,7 @@
+# $OpenBSD: hanoi.sed,v 1.2 1996/06/26 05:39:09 deraadt Exp $
# Towers of Hanoi in sed.
#
# from: @(#)hanoi.sed 8.1 (Berkeley) 6/6/93
-# $Id: hanoi.sed,v 1.1 1995/10/18 08:46:06 deraadt Exp $
#
#
# Ex:
diff --git a/usr.bin/sed/TEST/math.sed b/usr.bin/sed/TEST/math.sed
index 7e949163276..cff1588be3f 100644
--- a/usr.bin/sed/TEST/math.sed
+++ b/usr.bin/sed/TEST/math.sed
@@ -1,6 +1,6 @@
+# $OpenBSD: math.sed,v 1.2 1996/06/26 05:39:10 deraadt Exp $
#
# from: @(#)math.sed 8.1 (Berkeley) 6/6/93
-# $Id: math.sed,v 1.1 1995/10/18 08:46:06 deraadt Exp $
#
# Addition and multiplication in sed.
# ++ for a limited time only do (expr) too!!!
diff --git a/usr.bin/sed/TEST/sed.test b/usr.bin/sed/TEST/sed.test
index 264fd69d26a..d1c12392c66 100644
--- a/usr.bin/sed/TEST/sed.test
+++ b/usr.bin/sed/TEST/sed.test
@@ -1,4 +1,5 @@
#!/bin/sh -
+# $OpenBSD: sed.test,v 1.2 1996/06/26 05:39:11 deraadt Exp $
#
# Copyright (c) 1992 Diomidis Spinellis.
# Copyright (c) 1992, 1993
@@ -33,7 +34,6 @@
# SUCH DAMAGE.
#
# from: @(#)sed.test 8.1 (Berkeley) 6/6/93
-# $Id: sed.test,v 1.1 1995/10/18 08:46:06 deraadt Exp $
#
# sed Regression Tests
diff --git a/usr.bin/sed/compile.c b/usr.bin/sed/compile.c
index 79d40173266..b75bef86cbf 100644
--- a/usr.bin/sed/compile.c
+++ b/usr.bin/sed/compile.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: compile.c,v 1.2 1996/06/26 05:39:05 deraadt Exp $ */
+
/*-
* Copyright (c) 1992 Diomidis Spinellis.
* Copyright (c) 1992, 1993
@@ -37,7 +39,7 @@
#ifndef lint
/* from: static char sccsid[] = "@(#)compile.c 8.1 (Berkeley) 6/6/93"; */
-static char *rcsid = "$Id: compile.c,v 1.1 1995/10/18 08:46:05 deraadt Exp $";
+static char *rcsid = "$OpenBSD: compile.c,v 1.2 1996/06/26 05:39:05 deraadt Exp $";
#endif /* not lint */
#include <sys/types.h>
diff --git a/usr.bin/sed/defs.h b/usr.bin/sed/defs.h
index b9e3464fd0c..1bb67b30694 100644
--- a/usr.bin/sed/defs.h
+++ b/usr.bin/sed/defs.h
@@ -1,3 +1,4 @@
+/* * $OpenBSD: defs.h,v 1.2 1996/06/26 05:39:05 deraadt Exp $*/
/*-
* Copyright (c) 1992 Diomidis Spinellis.
* Copyright (c) 1992, 1993
@@ -35,7 +36,6 @@
* SUCH DAMAGE.
*
* from: @(#)defs.h 8.1 (Berkeley) 6/6/93
- * $Id: defs.h,v 1.1 1995/10/18 08:46:05 deraadt Exp $
*/
/*
diff --git a/usr.bin/sed/extern.h b/usr.bin/sed/extern.h
index 488e88f9086..259a3a9568e 100644
--- a/usr.bin/sed/extern.h
+++ b/usr.bin/sed/extern.h
@@ -1,3 +1,4 @@
+/* * $OpenBSD: extern.h,v 1.2 1996/06/26 05:39:06 deraadt Exp $*/
/*-
* Copyright (c) 1992 Diomidis Spinellis.
* Copyright (c) 1992, 1993
@@ -35,7 +36,6 @@
* SUCH DAMAGE.
*
* from: @(#)extern.h 8.1 (Berkeley) 6/6/93
- * $Id: extern.h,v 1.1 1995/10/18 08:46:05 deraadt Exp $
*/
extern struct s_command *prog;
diff --git a/usr.bin/sed/main.c b/usr.bin/sed/main.c
index 89241f8a7f3..3bb83daf76a 100644
--- a/usr.bin/sed/main.c
+++ b/usr.bin/sed/main.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: main.c,v 1.3 1996/06/26 05:39:07 deraadt Exp $ */
+
/*-
* Copyright (c) 1992 Diomidis Spinellis.
* Copyright (c) 1992, 1993
@@ -43,7 +45,7 @@ static char copyright[] =
#ifndef lint
/* from: static char sccsid[] = "@(#)main.c 8.2 (Berkeley) 1/3/94"; */
-static char *rcsid = "$Id: main.c,v 1.2 1996/05/21 21:50:46 deraadt Exp $";
+static char *rcsid = "$OpenBSD: main.c,v 1.3 1996/06/26 05:39:07 deraadt Exp $";
#endif /* not lint */
#include <sys/types.h>
diff --git a/usr.bin/sed/misc.c b/usr.bin/sed/misc.c
index c420973fc57..0e9f44eee73 100644
--- a/usr.bin/sed/misc.c
+++ b/usr.bin/sed/misc.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: misc.c,v 1.2 1996/06/26 05:39:07 deraadt Exp $ */
+
/*-
* Copyright (c) 1992 Diomidis Spinellis.
* Copyright (c) 1992, 1993
@@ -37,7 +39,7 @@
#ifndef lint
/* from: static char sccsid[] = "@(#)misc.c 8.1 (Berkeley) 6/6/93"; */
-static char *rcsid = "$Id: misc.c,v 1.1 1995/10/18 08:46:05 deraadt Exp $";
+static char *rcsid = "$OpenBSD: misc.c,v 1.2 1996/06/26 05:39:07 deraadt Exp $";
#endif /* not lint */
#include <sys/types.h>
diff --git a/usr.bin/sed/process.c b/usr.bin/sed/process.c
index 526e1d74f69..9d5aacf3f21 100644
--- a/usr.bin/sed/process.c
+++ b/usr.bin/sed/process.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: process.c,v 1.2 1996/06/26 05:39:08 deraadt Exp $ */
+
/*-
* Copyright (c) 1992 Diomidis Spinellis.
* Copyright (c) 1992, 1993
@@ -37,7 +39,7 @@
#ifndef lint
/* from: static char sccsid[] = "@(#)process.c 8.1 (Berkeley) 6/6/93"; */
-static char *rcsid = "$Id: process.c,v 1.1 1995/10/18 08:46:05 deraadt Exp $";
+static char *rcsid = "$OpenBSD: process.c,v 1.2 1996/06/26 05:39:08 deraadt Exp $";
#endif /* not lint */
#include <sys/types.h>
diff --git a/usr.bin/sed/sed.1 b/usr.bin/sed/sed.1
index 4cecf637ab7..2bc76a969ad 100644
--- a/usr.bin/sed/sed.1
+++ b/usr.bin/sed/sed.1
@@ -1,3 +1,4 @@
+.\" $OpenBSD: sed.1,v 1.2 1996/06/26 05:39:08 deraadt Exp $
.\" Copyright (c) 1992, 1993
.\" The Regents of the University of California. All rights reserved.
.\"
@@ -33,7 +34,6 @@
.\" SUCH DAMAGE.
.\"
.\" from: @(#)sed.1 8.2 (Berkeley) 12/30/93
-.\" $Id: sed.1,v 1.1 1995/10/18 08:46:05 deraadt Exp $
.\"
.Dd "December 30, 1993"
.Dt SED 1
diff --git a/usr.bin/shar/Makefile b/usr.bin/shar/Makefile
index 613ef7a9074..75cd1a951b4 100644
--- a/usr.bin/shar/Makefile
+++ b/usr.bin/shar/Makefile
@@ -1,5 +1,5 @@
+# $OpenBSD: Makefile,v 1.2 1996/06/26 05:39:12 deraadt Exp $
# $NetBSD: Makefile,v 1.6 1994/12/22 12:30:52 cgd Exp $
-# @(#)Makefile 8.1 (Berkeley) 6/6/93
MAN= shar.1
diff --git a/usr.bin/shar/shar.1 b/usr.bin/shar/shar.1
index a034642655e..edcec27b5c8 100644
--- a/usr.bin/shar/shar.1
+++ b/usr.bin/shar/shar.1
@@ -1,3 +1,4 @@
+.\" $OpenBSD: shar.1,v 1.2 1996/06/26 05:39:13 deraadt Exp $
.\" $NetBSD: shar.1,v 1.4 1995/08/18 14:55:40 pk Exp $
.\"
.\" Copyright (c) 1990, 1993
diff --git a/usr.bin/shar/shar.sh b/usr.bin/shar/shar.sh
index 7048b4465b4..759ac2973ae 100644
--- a/usr.bin/shar/shar.sh
+++ b/usr.bin/shar/shar.sh
@@ -1,5 +1,6 @@
#!/bin/sh -
#
+# $OpenBSD: shar.sh,v 1.2 1996/06/26 05:39:14 deraadt Exp $
# $NetBSD: shar.sh,v 1.2 1994/12/21 08:42:04 jtc Exp $
#
# Copyright (c) 1990, 1993
diff --git a/usr.bin/showmount/Makefile b/usr.bin/showmount/Makefile
index cd2bf9c199c..bbb2deabc42 100644
--- a/usr.bin/showmount/Makefile
+++ b/usr.bin/showmount/Makefile
@@ -1,5 +1,5 @@
+# $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 $
-# @(#)Makefile 8.1 (Berkeley) 6/6/93
PROG= showmount
MAN= showmount.8
diff --git a/usr.bin/showmount/showmount.8 b/usr.bin/showmount/showmount.8
index ba6d462d2e8..9c87126dbc9 100644
--- a/usr.bin/showmount/showmount.8
+++ b/usr.bin/showmount/showmount.8
@@ -1,3 +1,4 @@
+.\" $OpenBSD: showmount.8,v 1.2 1996/06/26 05:39:15 deraadt Exp $
.\" $NetBSD: showmount.8,v 1.5 1995/08/31 22:26:07 jtc Exp $
.\"
.\" Copyright (c) 1989, 1991, 1993
diff --git a/usr.bin/showmount/showmount.c b/usr.bin/showmount/showmount.c
index a43a662dce6..df77426b8e4 100644
--- a/usr.bin/showmount/showmount.c
+++ b/usr.bin/showmount/showmount.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: showmount.c,v 1.4 1996/06/26 05:39:16 deraadt Exp $ */
/* $NetBSD: showmount.c,v 1.7 1996/05/01 18:14:10 cgd Exp $ */
/*
@@ -46,7 +47,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)showmount.c 8.3 (Berkeley) 3/29/95";
#endif
-static char rcsid[] = "$NetBSD: showmount.c,v 1.7 1996/05/01 18:14:10 cgd Exp $";
+static char rcsid[] = "$OpenBSD: showmount.c,v 1.4 1996/06/26 05:39:16 deraadt Exp $";
#endif not lint
#include <sys/types.h>
diff --git a/usr.bin/size/Makefile b/usr.bin/size/Makefile
index faed5708ad6..322c709d35b 100644
--- a/usr.bin/size/Makefile
+++ b/usr.bin/size/Makefile
@@ -1,5 +1,5 @@
+# $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 $
-# @(#)Makefile 8.1 (Berkeley) 6/6/93
PROG= size
diff --git a/usr.bin/size/size.1 b/usr.bin/size/size.1
index cad9d12a5fa..1086a0447f7 100644
--- a/usr.bin/size/size.1
+++ b/usr.bin/size/size.1
@@ -1,3 +1,4 @@
+.\" $OpenBSD: size.1,v 1.3 1996/06/26 05:39:17 deraadt Exp $
.\" $NetBSD: size.1,v 1.6 1996/01/14 23:07:11 pk Exp $
.\"
.\" Copyright (c) 1990, 1993, 1994
diff --git a/usr.bin/size/size.c b/usr.bin/size/size.c
index 676e70555df..bd47d1f72f8 100644
--- a/usr.bin/size/size.c
+++ b/usr.bin/size/size.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: size.c,v 1.3 1996/06/26 05:39:18 deraadt Exp $ */
/* $NetBSD: size.c,v 1.7 1996/01/14 23:07:12 pk Exp $ */
/*
@@ -43,7 +44,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)size.c 8.2 (Berkeley) 12/9/93";
#endif
-static char rcsid[] = "$NetBSD: size.c,v 1.7 1996/01/14 23:07:12 pk Exp $";
+static char rcsid[] = "$OpenBSD: size.c,v 1.3 1996/06/26 05:39:18 deraadt Exp $";
#endif /* not lint */
#include <sys/param.h>
diff --git a/usr.bin/skey/Makefile b/usr.bin/skey/Makefile
index f3953ad5f7a..b7c527d1fe5 100644
--- a/usr.bin/skey/Makefile
+++ b/usr.bin/skey/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.1 1995/10/18 08:46:07 deraadt Exp $
+# $OpenBSD: Makefile,v 1.2 1996/06/26 05:39:19 deraadt Exp $
PROG= skey
CFLAGS+= -I${.CURDIR}/../../lib/libskey
diff --git a/usr.bin/skey/skey.1 b/usr.bin/skey/skey.1
index c3383a28f73..db35d1682ec 100644
--- a/usr.bin/skey/skey.1
+++ b/usr.bin/skey/skey.1
@@ -1,5 +1,5 @@
+.\" $OpenBSD: skey.1,v 1.2 1996/06/26 05:39:19 deraadt Exp $
.\" @(#)skey.1 1.1 10/28/93
-.\" $Id: skey.1,v 1.1 1995/10/18 08:46:07 deraadt Exp $
.\"
.Dd 28 October 1993
.Dt SKEY 1
diff --git a/usr.bin/skey/skey.c b/usr.bin/skey/skey.c
index a3cbf078d36..cd2975b73ec 100644
--- a/usr.bin/skey/skey.c
+++ b/usr.bin/skey/skey.c
@@ -1,3 +1,4 @@
+/* * $OpenBSD: skey.c,v 1.2 1996/06/26 05:39:20 deraadt Exp $*/
/*
* S/KEY v1.1b (skey.c)
*
@@ -18,7 +19,6 @@
* OMEN US HORN OMIT BACK AHOY
* >
*
- * $Id: skey.c,v 1.1 1995/10/18 08:46:07 deraadt Exp $
*/
#include <sys/cdefs.h>
diff --git a/usr.bin/skey/skeyaudit.1 b/usr.bin/skey/skeyaudit.1
index ab8e5e6acc0..99b7dbf1f6d 100644
--- a/usr.bin/skey/skeyaudit.1
+++ b/usr.bin/skey/skeyaudit.1
@@ -1,5 +1,5 @@
+.\" $OpenBSD: skeyaudit.1,v 1.2 1996/06/26 05:39:20 deraadt Exp $
.\"
-.\" $Id: skeyaudit.1,v 1.1 1995/10/18 08:46:08 deraadt Exp $
.\"
.Dd 9 June 1994
.Dt SKEYAUDIT 1
diff --git a/usr.bin/skey/skeyaudit.sh b/usr.bin/skey/skeyaudit.sh
index eb1109bff51..7f617923f5a 100644
--- a/usr.bin/skey/skeyaudit.sh
+++ b/usr.bin/skey/skeyaudit.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# $Id: skeyaudit.sh,v 1.1 1995/10/18 08:46:08 deraadt Exp $
+# $OpenBSD: skeyaudit.sh,v 1.2 1996/06/26 05:39:21 deraadt Exp $
# This script will look thru the skeykeys file for
# people with sequence numbers less then LOWLIMIT=12
# and send them an e-mail reminder to use skeyinit soon
diff --git a/usr.bin/skey/skeyinfo.1 b/usr.bin/skey/skeyinfo.1
index e013e77b4ef..cf0b47c6797 100644
--- a/usr.bin/skey/skeyinfo.1
+++ b/usr.bin/skey/skeyinfo.1
@@ -1,5 +1,5 @@
+.\" $OpenBSD: skeyinfo.1,v 1.2 1996/06/26 05:39:22 deraadt Exp $
.\"
-.\" $Id: skeyinfo.1,v 1.1 1995/10/18 08:46:08 deraadt Exp $
.\"
.Dd 9 June 1994
.Dt SKEYINFO 1
diff --git a/usr.bin/skey/skeyinfo.sh b/usr.bin/skey/skeyinfo.sh
index bca1e319dc5..1367604b485 100644
--- a/usr.bin/skey/skeyinfo.sh
+++ b/usr.bin/skey/skeyinfo.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# $Id: skeyinfo.sh,v 1.1 1995/10/18 08:46:08 deraadt Exp $
+# $OpenBSD: skeyinfo.sh,v 1.2 1996/06/26 05:39:22 deraadt Exp $
# search /etc/skeykeys for the skey string for
# this user OR user specified in 1st parameter
diff --git a/usr.bin/skeyinit/Makefile b/usr.bin/skeyinit/Makefile
index d0d584a521c..48ae357529b 100644
--- a/usr.bin/skeyinit/Makefile
+++ b/usr.bin/skeyinit/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.2 1996/02/15 05:02:27 etheisen Exp $
+# $OpenBSD: Makefile,v 1.3 1996/06/26 05:39:23 deraadt Exp $
PROG= skeyinit
BINOWN=root
diff --git a/usr.bin/skeyinit/skeyinit.1 b/usr.bin/skeyinit/skeyinit.1
index 725dc5340e0..8a66b88d463 100644
--- a/usr.bin/skeyinit/skeyinit.1
+++ b/usr.bin/skeyinit/skeyinit.1
@@ -1,3 +1,4 @@
+.\" $OpenBSD: skeyinit.1,v 1.3 1996/06/26 05:39:23 deraadt Exp $
.\" $NetBSD: skeyinit.1,v 1.4 1995/07/07 22:24:09 jtc Exp $
.\" @(#)skeyinit.1 1.1 10/28/93
.\"
diff --git a/usr.bin/skeyinit/skeyinit.c b/usr.bin/skeyinit/skeyinit.c
index b94327239f5..193ca0d8f1d 100644
--- a/usr.bin/skeyinit/skeyinit.c
+++ b/usr.bin/skeyinit/skeyinit.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: skeyinit.c,v 1.3 1996/06/26 05:39:24 deraadt Exp $ */
/* $NetBSD: skeyinit.c,v 1.6 1995/06/05 19:50:48 pk Exp $ */
/* S/KEY v1.1b (skeyinit.c)
diff --git a/usr.bin/soelim/Makefile b/usr.bin/soelim/Makefile
index e2b64fc68bc..6be166a28a2 100644
--- a/usr.bin/soelim/Makefile
+++ b/usr.bin/soelim/Makefile
@@ -1,5 +1,5 @@
+# $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 $
-# @(#)Makefile 8.1 (Berkeley) 6/6/93
PROG= soelim
diff --git a/usr.bin/soelim/soelim.1 b/usr.bin/soelim/soelim.1
index fd246aa8c89..ff830527b52 100644
--- a/usr.bin/soelim/soelim.1
+++ b/usr.bin/soelim/soelim.1
@@ -1,3 +1,4 @@
+.\" $OpenBSD: soelim.1,v 1.2 1996/06/26 05:39:25 deraadt Exp $
.\" $NetBSD: soelim.1,v 1.3 1994/12/21 08:11:24 jtc Exp $
.\"
.\" Copyright (c) 1980, 1990, 1993
diff --git a/usr.bin/soelim/soelim.c b/usr.bin/soelim/soelim.c
index 529ae0fedfd..1038ab36d87 100644
--- a/usr.bin/soelim/soelim.c
+++ b/usr.bin/soelim/soelim.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: soelim.c,v 1.2 1996/06/26 05:39:26 deraadt Exp $ */
/* $NetBSD: soelim.c,v 1.3 1994/12/21 08:11:26 jtc Exp $ */
/*
@@ -43,7 +44,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)soelim.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$NetBSD: soelim.c,v 1.3 1994/12/21 08:11:26 jtc Exp $";
+static char rcsid[] = "$OpenBSD: soelim.c,v 1.2 1996/06/26 05:39:26 deraadt Exp $";
#endif /* not lint */
#include <stdio.h>
diff --git a/usr.bin/split/Makefile b/usr.bin/split/Makefile
index 8b902ffd33a..2babfb9d8e0 100644
--- a/usr.bin/split/Makefile
+++ b/usr.bin/split/Makefile
@@ -1,5 +1,5 @@
+# $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 $
-# @(#)Makefile 8.1 (Berkeley) 6/6/93
PROG= split
diff --git a/usr.bin/split/split.1 b/usr.bin/split/split.1
index 788f1007b93..0e59fb11795 100644
--- a/usr.bin/split/split.1
+++ b/usr.bin/split/split.1
@@ -1,3 +1,4 @@
+.\" $OpenBSD: split.1,v 1.2 1996/06/26 05:39:28 deraadt Exp $
.\" $NetBSD: split.1,v 1.5 1994/12/21 08:20:35 jtc Exp $
.\"
.\" Copyright (c) 1990, 1991, 1993, 1994
diff --git a/usr.bin/split/split.c b/usr.bin/split/split.c
index ab981252cbc..50c42025282 100644
--- a/usr.bin/split/split.c
+++ b/usr.bin/split/split.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: split.c,v 1.2 1996/06/26 05:39:28 deraadt Exp $ */
/* $NetBSD: split.c,v 1.5 1995/08/31 22:22:05 jtc Exp $ */
/*
@@ -43,7 +44,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)split.c 8.3 (Berkeley) 4/25/94";
#endif
-static char rcsid[] = "$NetBSD: split.c,v 1.5 1995/08/31 22:22:05 jtc Exp $";
+static char rcsid[] = "$OpenBSD: split.c,v 1.2 1996/06/26 05:39:28 deraadt Exp $";
#endif /* not lint */
#include <sys/param.h>
diff --git a/usr.bin/strings/Makefile b/usr.bin/strings/Makefile
index 6e1b31fe4ff..ec7b114ff35 100644
--- a/usr.bin/strings/Makefile
+++ b/usr.bin/strings/Makefile
@@ -1,5 +1,5 @@
+# $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 $
-# @(#)Makefile 8.1 (Berkeley) 6/6/93
PROG= strings
diff --git a/usr.bin/strings/strings.1 b/usr.bin/strings/strings.1
index 91ebc133d5d..d225e1eb50b 100644
--- a/usr.bin/strings/strings.1
+++ b/usr.bin/strings/strings.1
@@ -1,3 +1,4 @@
+.\" $OpenBSD: strings.1,v 1.2 1996/06/26 05:39:30 deraadt Exp $
.\" $NetBSD: strings.1,v 1.4 1994/12/10 11:54:28 jtc Exp $
.\"
.\" Copyright (c) 1980, 1990, 1993
diff --git a/usr.bin/strings/strings.c b/usr.bin/strings/strings.c
index 0b24402e610..2053cf3dd69 100644
--- a/usr.bin/strings/strings.c
+++ b/usr.bin/strings/strings.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: strings.c,v 1.2 1996/06/26 05:39:30 deraadt Exp $ */
/* $NetBSD: strings.c,v 1.7 1995/02/15 15:49:19 jtc Exp $ */
/*
@@ -43,7 +44,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)strings.c 8.2 (Berkeley) 1/28/94";
#endif
-static char rcsid[] = "$NetBSD: strings.c,v 1.7 1995/02/15 15:49:19 jtc Exp $";
+static char rcsid[] = "$OpenBSD: strings.c,v 1.2 1996/06/26 05:39:30 deraadt Exp $";
#endif /* not lint */
#include <sys/types.h>
diff --git a/usr.bin/strip/Makefile b/usr.bin/strip/Makefile
index 75c8582d179..aa7a8026c26 100644
--- a/usr.bin/strip/Makefile
+++ b/usr.bin/strip/Makefile
@@ -1,5 +1,4 @@
-# from: @(#)Makefile 5.4 (Berkeley) 5/11/90
-# $Id: Makefile,v 1.1 1995/10/18 08:46:09 deraadt Exp $
+# $OpenBSD: Makefile,v 1.2 1996/06/26 05:39:31 deraadt Exp $
PROG= strip
diff --git a/usr.bin/strip/strip.1 b/usr.bin/strip/strip.1
index 3945577f799..6ecaf5ec0e1 100644
--- a/usr.bin/strip/strip.1
+++ b/usr.bin/strip/strip.1
@@ -1,3 +1,4 @@
+.\" $OpenBSD: strip.1,v 1.2 1996/06/26 05:39:32 deraadt Exp $
.\" Copyright (c) 1989, 1990 The Regents of the University of California.
.\" All rights reserved.
.\"
@@ -30,7 +31,6 @@
.\" SUCH DAMAGE.
.\"
.\" from: @(#)strip.1 6.6 (Berkeley) 5/26/91
-.\" $Id: strip.1,v 1.1 1995/10/18 08:46:09 deraadt Exp $
.\"
.Dd May 26, 1991
.Dt STRIP 1
diff --git a/usr.bin/strip/strip.c b/usr.bin/strip/strip.c
index 831d06fbdbb..a2763d2a888 100644
--- a/usr.bin/strip/strip.c
+++ b/usr.bin/strip/strip.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: strip.c,v 1.2 1996/06/26 05:39:32 deraadt Exp $ */
+
/*
* Copyright (c) 1988 Regents of the University of California.
* All rights reserved.
@@ -39,7 +41,7 @@ char copyright[] =
#ifndef lint
/*static char sccsid[] = "from: @(#)strip.c 5.8 (Berkeley) 11/6/91";*/
-static char rcsid[] = "$Id: strip.c,v 1.1 1995/10/18 08:46:09 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: strip.c,v 1.2 1996/06/26 05:39:32 deraadt Exp $";
#endif /* not lint */
#include <sys/types.h>
diff --git a/usr.bin/su/Makefile b/usr.bin/su/Makefile
index 3ac94ce8884..75d457cb02c 100644
--- a/usr.bin/su/Makefile
+++ b/usr.bin/su/Makefile
@@ -1,5 +1,4 @@
-# from: @(#)Makefile 5.5 (Berkeley) 5/11/90
-# $Id: Makefile,v 1.3 1996/02/15 05:02:28 etheisen Exp $
+# $OpenBSD: Makefile,v 1.4 1996/06/26 05:39:33 deraadt Exp $
PROG= su
BINOWN= root
diff --git a/usr.bin/su/su.1 b/usr.bin/su/su.1
index 4165f970d75..4809407d143 100644
--- a/usr.bin/su/su.1
+++ b/usr.bin/su/su.1
@@ -1,3 +1,4 @@
+.\" $OpenBSD: su.1,v 1.3 1996/06/26 05:39:34 deraadt Exp $
.\" Copyright (c) 1988, 1990 The Regents of the University of California.
.\" All rights reserved.
.\"
@@ -30,7 +31,6 @@
.\" SUCH DAMAGE.
.\"
.\" from: @(#)su.1 6.12 (Berkeley) 7/29/91
-.\" $Id: su.1,v 1.2 1996/01/07 09:51:21 deraadt Exp $
.\"
.Dd July 29, 1991
.Dt SU 1
diff --git a/usr.bin/su/su.c b/usr.bin/su/su.c
index 36b249cc1a3..56b3b30d7b9 100644
--- a/usr.bin/su/su.c
+++ b/usr.bin/su/su.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: su.c,v 1.4 1996/06/26 05:39:34 deraadt Exp $ */
+
/*
* Copyright (c) 1988 The Regents of the University of California.
* All rights reserved.
@@ -39,7 +41,7 @@ char copyright[] =
#ifndef lint
/*static char sccsid[] = "from: @(#)su.c 5.26 (Berkeley) 7/6/91";*/
-static char rcsid[] = "$Id: su.c,v 1.3 1996/01/07 09:51:22 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: su.c,v 1.4 1996/06/26 05:39:34 deraadt Exp $";
#endif /* not lint */
#include <sys/param.h>
diff --git a/usr.bin/sup/Makefile b/usr.bin/sup/Makefile
index b6045b6b869..76803ba28e8 100644
--- a/usr.bin/sup/Makefile
+++ b/usr.bin/sup/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.1 1995/12/16 11:46:39 deraadt Exp $
+# $OpenBSD: Makefile,v 1.2 1996/06/26 05:39:35 deraadt Exp $
SUBDIR= sup supscan supfilesrv
diff --git a/usr.bin/sup/Makefile.inc b/usr.bin/sup/Makefile.inc
index b8c97c5eed8..9fe3afa14b8 100644
--- a/usr.bin/sup/Makefile.inc
+++ b/usr.bin/sup/Makefile.inc
@@ -1,2 +1,4 @@
+# $OpenBSD: Makefile.inc,v 1.2 1996/06/26 05:39:36 deraadt Exp $
+
CFLAGS+=-UCMUCS -UCMU -UMACH -DVAR_TMP -DHAS_DAEMON -DHAS_POSIX_DIR
diff --git a/usr.bin/sup/src/Makefile.save b/usr.bin/sup/src/Makefile.save
index 0aad1c0f1bf..2fa0febf8f8 100644
--- a/usr.bin/sup/src/Makefile.save
+++ b/usr.bin/sup/src/Makefile.save
@@ -1,3 +1,5 @@
+# $OpenBSD: Makefile.save,v 1.2 1996/06/26 05:39:36 deraadt Exp $
+
# Copyright (c) 1992,1991 Carnegie Mellon University
# All Rights Reserved.
#
diff --git a/usr.bin/sup/src/atoo.c b/usr.bin/sup/src/atoo.c
index eac0764e31c..83925d6abbf 100644
--- a/usr.bin/sup/src/atoo.c
+++ b/usr.bin/sup/src/atoo.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: atoo.c,v 1.2 1996/06/26 05:39:37 deraadt Exp $ */
+
/*
* Copyright (c) 1991 Carnegie Mellon University
* All Rights Reserved.
diff --git a/usr.bin/sup/src/c.h b/usr.bin/sup/src/c.h
index 801331d098e..01e80ecb9f7 100644
--- a/usr.bin/sup/src/c.h
+++ b/usr.bin/sup/src/c.h
@@ -1,3 +1,5 @@
+/* $OpenBSD: c.h,v 1.2 1996/06/26 05:39:38 deraadt Exp $ */
+
/*
* Copyright (c) 1991 Carnegie Mellon University
* All Rights Reserved.
diff --git a/usr.bin/sup/src/ci.c b/usr.bin/sup/src/ci.c
index 8960eb50cee..772f36dc384 100644
--- a/usr.bin/sup/src/ci.c
+++ b/usr.bin/sup/src/ci.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: ci.c,v 1.2 1996/06/26 05:39:38 deraadt Exp $ */
+
/*
* Copyright (c) 1991 Carnegie Mellon University
* All Rights Reserved.
diff --git a/usr.bin/sup/src/cvt.c b/usr.bin/sup/src/cvt.c
index 0551a266948..0bf3379aa8e 100644
--- a/usr.bin/sup/src/cvt.c
+++ b/usr.bin/sup/src/cvt.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: cvt.c,v 1.2 1996/06/26 05:39:39 deraadt Exp $ */
+
/*
* Quick hack to convert old binary sup when.collection files into
* the new ascii format.
diff --git a/usr.bin/sup/src/errmsg.c b/usr.bin/sup/src/errmsg.c
index 0ca7c9d04f4..b947180bdbc 100644
--- a/usr.bin/sup/src/errmsg.c
+++ b/usr.bin/sup/src/errmsg.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: errmsg.c,v 1.2 1996/06/26 05:39:39 deraadt Exp $ */
+
/*
* Copyright (c) 1991 Carnegie Mellon University
* All Rights Reserved.
diff --git a/usr.bin/sup/src/expand.c b/usr.bin/sup/src/expand.c
index 0014ebba911..9716d914a76 100644
--- a/usr.bin/sup/src/expand.c
+++ b/usr.bin/sup/src/expand.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: expand.c,v 1.2 1996/06/26 05:39:40 deraadt Exp $ */
+
/*
* Copyright (c) 1991 Carnegie Mellon University
* All Rights Reserved.
diff --git a/usr.bin/sup/src/ffilecopy.c b/usr.bin/sup/src/ffilecopy.c
index e6834239f5c..3ac78041af5 100644
--- a/usr.bin/sup/src/ffilecopy.c
+++ b/usr.bin/sup/src/ffilecopy.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: ffilecopy.c,v 1.2 1996/06/26 05:39:40 deraadt Exp $ */
+
/*
* Copyright (c) 1991 Carnegie Mellon University
* All Rights Reserved.
diff --git a/usr.bin/sup/src/filecopy.c b/usr.bin/sup/src/filecopy.c
index 553becb34cc..081fa84b6b6 100644
--- a/usr.bin/sup/src/filecopy.c
+++ b/usr.bin/sup/src/filecopy.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: filecopy.c,v 1.2 1996/06/26 05:39:41 deraadt Exp $ */
+
/*
* Copyright (c) 1991 Carnegie Mellon University
* All Rights Reserved.
diff --git a/usr.bin/sup/src/libc.h b/usr.bin/sup/src/libc.h
index bac8444ec15..4486cb090d2 100644
--- a/usr.bin/sup/src/libc.h
+++ b/usr.bin/sup/src/libc.h
@@ -1,3 +1,5 @@
+/* $OpenBSD: libc.h,v 1.2 1996/06/26 05:39:41 deraadt Exp $ */
+
/*
* Copyright (c) 1991 Carnegie Mellon University
* All Rights Reserved.
@@ -26,6 +28,9 @@
**********************************************************************
* HISTORY
* $Log: libc.h,v $
+ * Revision 1.2 1996/06/26 05:39:41 deraadt
+ * rcsid
+ *
* Revision 1.1 1995/12/16 11:46:46 deraadt
* add sup to the tree
*
diff --git a/usr.bin/sup/src/log.c b/usr.bin/sup/src/log.c
index 4a0ab60b8fa..e5fc0541bd0 100644
--- a/usr.bin/sup/src/log.c
+++ b/usr.bin/sup/src/log.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: log.c,v 1.2 1996/06/26 05:39:42 deraadt Exp $ */
+
/*
* Copyright (c) 1992 Carnegie Mellon University
* All Rights Reserved.
@@ -27,6 +29,9 @@
**********************************************************************
* HISTORY
* $Log: log.c,v $
+ * Revision 1.2 1996/06/26 05:39:42 deraadt
+ * rcsid
+ *
* Revision 1.1 1995/12/16 11:46:47 deraadt
* add sup to the tree
*
diff --git a/usr.bin/sup/src/netcryptvoid.c b/usr.bin/sup/src/netcryptvoid.c
index 4676df945c5..00ce0482aa0 100644
--- a/usr.bin/sup/src/netcryptvoid.c
+++ b/usr.bin/sup/src/netcryptvoid.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: netcryptvoid.c,v 1.2 1996/06/26 05:39:43 deraadt Exp $ */
+
/*
* Copyright (c) 1992 Carnegie Mellon University
* All Rights Reserved.
@@ -25,6 +27,9 @@
/**********************************************************************
* HISTORY
* $Log: netcryptvoid.c,v $
+ * Revision 1.2 1996/06/26 05:39:43 deraadt
+ * rcsid
+ *
* Revision 1.1 1995/12/16 11:46:47 deraadt
* add sup to the tree
*
diff --git a/usr.bin/sup/src/nxtarg.c b/usr.bin/sup/src/nxtarg.c
index 9e93c2840ee..2999be38614 100644
--- a/usr.bin/sup/src/nxtarg.c
+++ b/usr.bin/sup/src/nxtarg.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: nxtarg.c,v 1.2 1996/06/26 05:39:44 deraadt Exp $ */
+
/*
* Copyright (c) 1991 Carnegie Mellon University
* All Rights Reserved.
diff --git a/usr.bin/sup/src/path.c b/usr.bin/sup/src/path.c
index f9822689dc8..fd2d21a7699 100644
--- a/usr.bin/sup/src/path.c
+++ b/usr.bin/sup/src/path.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: path.c,v 1.2 1996/06/26 05:39:44 deraadt Exp $ */
+
/*
* Copyright (c) 1991 Carnegie Mellon University
* All Rights Reserved.
diff --git a/usr.bin/sup/src/quit.c b/usr.bin/sup/src/quit.c
index e867c8b2d6a..d1089ec00cc 100644
--- a/usr.bin/sup/src/quit.c
+++ b/usr.bin/sup/src/quit.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: quit.c,v 1.2 1996/06/26 05:39:45 deraadt Exp $ */
+
/*
* Copyright (c) 1991 Carnegie Mellon University
* All Rights Reserved.
@@ -36,6 +38,9 @@
**********************************************************************
* HISTORY
* $Log: quit.c,v $
+ * Revision 1.2 1996/06/26 05:39:45 deraadt
+ * rcsid
+ *
* Revision 1.1 1995/12/16 11:46:49 deraadt
* add sup to the tree
*
diff --git a/usr.bin/sup/src/run.c b/usr.bin/sup/src/run.c
index 7f625c1d27c..ec11f15a613 100644
--- a/usr.bin/sup/src/run.c
+++ b/usr.bin/sup/src/run.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: run.c,v 1.2 1996/06/26 05:39:45 deraadt Exp $ */
+
/*
* Copyright (c) 1991 Carnegie Mellon University
* All Rights Reserved.
@@ -48,6 +50,9 @@
**********************************************************************
* HISTORY
* $Log: run.c,v $
+ * Revision 1.2 1996/06/26 05:39:45 deraadt
+ * rcsid
+ *
* Revision 1.1 1995/12/16 11:46:49 deraadt
* add sup to the tree
*
diff --git a/usr.bin/sup/src/salloc.c b/usr.bin/sup/src/salloc.c
index bd0e804251f..9e7d88e9cc5 100644
--- a/usr.bin/sup/src/salloc.c
+++ b/usr.bin/sup/src/salloc.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: salloc.c,v 1.2 1996/06/26 05:39:46 deraadt Exp $ */
+
/*
* Copyright (c) 1991 Carnegie Mellon University
* All Rights Reserved.
diff --git a/usr.bin/sup/src/scan.c b/usr.bin/sup/src/scan.c
index 8d52fa7777d..7ce17a69a76 100644
--- a/usr.bin/sup/src/scan.c
+++ b/usr.bin/sup/src/scan.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: scan.c,v 1.3 1996/06/26 05:39:46 deraadt Exp $ */
+
/*
* Copyright (c) 1992 Carnegie Mellon University
* All Rights Reserved.
@@ -28,6 +30,9 @@
**********************************************************************
* HISTORY
* $Log: scan.c,v $
+ * Revision 1.3 1996/06/26 05:39:46 deraadt
+ * rcsid
+ *
* Revision 1.2 1996/04/17 17:24:13 dm
* Shouldn't visually encode execute commands, only file names.
*
diff --git a/usr.bin/sup/src/scm.c b/usr.bin/sup/src/scm.c
index 59be450716d..e08121584a5 100644
--- a/usr.bin/sup/src/scm.c
+++ b/usr.bin/sup/src/scm.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: scm.c,v 1.2 1996/06/26 05:39:47 deraadt Exp $ */
+
/*
* Copyright (c) 1992 Carnegie Mellon University
* All Rights Reserved.
@@ -69,6 +71,9 @@
* since Tahoe version of <netinet/in.h> does not define them.
*
* $Log: scm.c,v $
+ * Revision 1.2 1996/06/26 05:39:47 deraadt
+ * rcsid
+ *
* Revision 1.1 1995/12/16 11:46:51 deraadt
* add sup to the tree
*
diff --git a/usr.bin/sup/src/scmio.c b/usr.bin/sup/src/scmio.c
index b0852e2d9de..6c4f4f3ff6d 100644
--- a/usr.bin/sup/src/scmio.c
+++ b/usr.bin/sup/src/scmio.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: scmio.c,v 1.2 1996/06/26 05:39:47 deraadt Exp $ */
+
/*
* Copyright (c) 1992 Carnegie Mellon University
* All Rights Reserved.
@@ -109,6 +111,9 @@
**********************************************************************
* HISTORY
* $Log: scmio.c,v $
+ * Revision 1.2 1996/06/26 05:39:47 deraadt
+ * rcsid
+ *
* Revision 1.1 1995/12/16 11:46:52 deraadt
* add sup to the tree
*
diff --git a/usr.bin/sup/src/skipto.c b/usr.bin/sup/src/skipto.c
index 2fa5a4f4022..2b071b1c36e 100644
--- a/usr.bin/sup/src/skipto.c
+++ b/usr.bin/sup/src/skipto.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: skipto.c,v 1.2 1996/06/26 05:39:48 deraadt Exp $ */
+
/*
* Copyright (c) 1991 Carnegie Mellon University
* All Rights Reserved.
diff --git a/usr.bin/sup/src/stree.c b/usr.bin/sup/src/stree.c
index 125c37e50e9..eadb38f3582 100644
--- a/usr.bin/sup/src/stree.c
+++ b/usr.bin/sup/src/stree.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: stree.c,v 1.2 1996/06/26 05:39:48 deraadt Exp $ */
+
/*
* Copyright (c) 1992 Carnegie Mellon University
* All Rights Reserved.
@@ -28,6 +30,9 @@
**********************************************************************
* HISTORY
* $Log: stree.c,v $
+ * Revision 1.2 1996/06/26 05:39:48 deraadt
+ * rcsid
+ *
* Revision 1.1 1995/12/16 11:46:53 deraadt
* add sup to the tree
*
diff --git a/usr.bin/sup/src/sup.1 b/usr.bin/sup/src/sup.1
index f3999e024d6..442283158f7 100644
--- a/usr.bin/sup/src/sup.1
+++ b/usr.bin/sup/src/sup.1
@@ -1,3 +1,5 @@
+.\" $OpenBSD: sup.1,v 1.2 1996/06/26 05:39:49 deraadt Exp $
+.\"
.\" Copyright (c) 1992 Carnegie Mellon University
.\" All Rights Reserved.
.\"
@@ -23,6 +25,9 @@
.\"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
.\" HISTORY
.\" $Log: sup.1,v $
+.\" Revision 1.2 1996/06/26 05:39:49 deraadt
+.\" rcsid
+.\"
.\" Revision 1.1 1995/12/16 11:46:54 deraadt
.\" add sup to the tree
.\"
diff --git a/usr.bin/sup/src/sup.h b/usr.bin/sup/src/sup.h
index eee3b860107..ecdc27bc6c0 100644
--- a/usr.bin/sup/src/sup.h
+++ b/usr.bin/sup/src/sup.h
@@ -1,3 +1,5 @@
+/* $OpenBSD: sup.h,v 1.2 1996/06/26 05:39:50 deraadt Exp $ */
+
/*
* Copyright (c) 1992 Carnegie Mellon University
* All Rights Reserved.
@@ -39,6 +41,9 @@
* across the network to save BandWidth
*
* $Log: sup.h,v $
+ * Revision 1.2 1996/06/26 05:39:50 deraadt
+ * rcsid
+ *
* Revision 1.1 1995/12/16 11:46:55 deraadt
* add sup to the tree
*
diff --git a/usr.bin/sup/src/supcdefs.h b/usr.bin/sup/src/supcdefs.h
index 12261403e34..0283f6b253f 100644
--- a/usr.bin/sup/src/supcdefs.h
+++ b/usr.bin/sup/src/supcdefs.h
@@ -1,3 +1,5 @@
+/* $OpenBSD: supcdefs.h,v 1.2 1996/06/26 05:39:50 deraadt Exp $ */
+
/*
* Copyright (c) 1992 Carnegie Mellon University
* All Rights Reserved.
@@ -33,6 +35,9 @@
* across the network to save BandWidth
*
* $Log: supcdefs.h,v $
+ * Revision 1.2 1996/06/26 05:39:50 deraadt
+ * rcsid
+ *
* Revision 1.1 1995/12/16 11:46:55 deraadt
* add sup to the tree
*
diff --git a/usr.bin/sup/src/supcmain.c b/usr.bin/sup/src/supcmain.c
index 5568acb91a8..ab072451e01 100644
--- a/usr.bin/sup/src/supcmain.c
+++ b/usr.bin/sup/src/supcmain.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: supcmain.c,v 1.2 1996/06/26 05:39:51 deraadt Exp $ */
+
/*
* Copyright (c) 1992 Carnegie Mellon University
* All Rights Reserved.
@@ -174,6 +176,9 @@
* across the network to save BandWidth
*
* $Log: supcmain.c,v $
+ * Revision 1.2 1996/06/26 05:39:51 deraadt
+ * rcsid
+ *
* Revision 1.1 1995/12/16 11:46:56 deraadt
* add sup to the tree
*
diff --git a/usr.bin/sup/src/supcmeat.c b/usr.bin/sup/src/supcmeat.c
index daf07be7e2a..ebfdaca991b 100644
--- a/usr.bin/sup/src/supcmeat.c
+++ b/usr.bin/sup/src/supcmeat.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: supcmeat.c,v 1.2 1996/06/26 05:39:51 deraadt Exp $ */
+
/*
* Copyright (c) 1992 Carnegie Mellon University
* All Rights Reserved.
@@ -32,6 +34,9 @@
* across the network to save BandWidth
*
* $Log: supcmeat.c,v $
+ * Revision 1.2 1996/06/26 05:39:51 deraadt
+ * rcsid
+ *
* Revision 1.1 1995/12/16 11:46:56 deraadt
* add sup to the tree
*
diff --git a/usr.bin/sup/src/supcmisc.c b/usr.bin/sup/src/supcmisc.c
index 54bade3eb10..9b86c66babf 100644
--- a/usr.bin/sup/src/supcmisc.c
+++ b/usr.bin/sup/src/supcmisc.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: supcmisc.c,v 1.2 1996/06/26 05:39:52 deraadt Exp $ */
+
/*
* Copyright (c) 1992 Carnegie Mellon University
* All Rights Reserved.
@@ -27,6 +29,9 @@
**********************************************************************
* HISTORY
* $Log: supcmisc.c,v $
+ * Revision 1.2 1996/06/26 05:39:52 deraadt
+ * rcsid
+ *
* Revision 1.1 1995/12/16 11:46:57 deraadt
* add sup to the tree
*
diff --git a/usr.bin/sup/src/supcname.c b/usr.bin/sup/src/supcname.c
index fbad5e3e325..1e9444637f5 100644
--- a/usr.bin/sup/src/supcname.c
+++ b/usr.bin/sup/src/supcname.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: supcname.c,v 1.2 1996/06/26 05:39:53 deraadt Exp $ */
+
/*
* Copyright (c) 1992 Carnegie Mellon University
* All Rights Reserved.
@@ -27,6 +29,9 @@
**********************************************************************
* HISTORY
* $Log: supcname.c,v $
+ * Revision 1.2 1996/06/26 05:39:53 deraadt
+ * rcsid
+ *
* Revision 1.1 1995/12/16 11:46:58 deraadt
* add sup to the tree
*
diff --git a/usr.bin/sup/src/supcparse.c b/usr.bin/sup/src/supcparse.c
index ea3eb6e6eb4..21dd7f7c212 100644
--- a/usr.bin/sup/src/supcparse.c
+++ b/usr.bin/sup/src/supcparse.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: supcparse.c,v 1.2 1996/06/26 05:39:53 deraadt Exp $ */
+
/*
* Copyright (c) 1992 Carnegie Mellon University
* All Rights Reserved.
@@ -32,6 +34,9 @@
* across the network to save BandWidth
*
* $Log: supcparse.c,v $
+ * Revision 1.2 1996/06/26 05:39:53 deraadt
+ * rcsid
+ *
* Revision 1.1 1995/12/16 11:46:58 deraadt
* add sup to the tree
*
diff --git a/usr.bin/sup/src/supcvers.c b/usr.bin/sup/src/supcvers.c
index e325fe97c1d..e928c427d71 100644
--- a/usr.bin/sup/src/supcvers.c
+++ b/usr.bin/sup/src/supcvers.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: supcvers.c,v 1.2 1996/06/26 05:39:53 deraadt Exp $ */
+
/*
* Copyright (c) 1992 Carnegie Mellon University
* All Rights Reserved.
@@ -26,6 +28,9 @@
**********************************************************************
* HISTORY
* $Log: supcvers.c,v $
+ * Revision 1.2 1996/06/26 05:39:53 deraadt
+ * rcsid
+ *
* Revision 1.1 1995/12/16 11:46:59 deraadt
* add sup to the tree
*
diff --git a/usr.bin/sup/src/supfilesrv.c b/usr.bin/sup/src/supfilesrv.c
index 839ceee6c71..b38f2269eef 100644
--- a/usr.bin/sup/src/supfilesrv.c
+++ b/usr.bin/sup/src/supfilesrv.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: supfilesrv.c,v 1.3 1996/06/26 05:39:54 deraadt Exp $ */
+
/*
* Copyright (c) 1992 Carnegie Mellon University
* All Rights Reserved.
@@ -42,6 +44,9 @@
* across the network to save BandWidth
*
* $Log: supfilesrv.c,v $
+ * Revision 1.3 1996/06/26 05:39:54 deraadt
+ * rcsid
+ *
* Revision 1.2 1996/06/10 20:45:35 deraadt
* hack: print hostname connection failed with
*
diff --git a/usr.bin/sup/src/supmsg.c b/usr.bin/sup/src/supmsg.c
index 21b49916f6a..13d07817777 100644
--- a/usr.bin/sup/src/supmsg.c
+++ b/usr.bin/sup/src/supmsg.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: supmsg.c,v 1.2 1996/06/26 05:39:55 deraadt Exp $ */
+
/*
* Copyright (c) 1992 Carnegie Mellon University
* All Rights Reserved.
@@ -31,6 +33,9 @@
* across the network to save BandWidth
*
* $Log: supmsg.c,v $
+ * Revision 1.2 1996/06/26 05:39:55 deraadt
+ * rcsid
+ *
* Revision 1.1 1995/12/16 11:47:00 deraadt
* add sup to the tree
*
diff --git a/usr.bin/sup/src/supmsg.h b/usr.bin/sup/src/supmsg.h
index d4da8531d36..3a57cab83d3 100644
--- a/usr.bin/sup/src/supmsg.h
+++ b/usr.bin/sup/src/supmsg.h
@@ -1,3 +1,5 @@
+/* $OpenBSD: supmsg.h,v 1.2 1996/06/26 05:39:56 deraadt Exp $ */
+
/*
* Copyright (c) 1992 Carnegie Mellon University
* All Rights Reserved.
@@ -33,6 +35,9 @@
* across the network to save BandWidth
*
* $Log: supmsg.h,v $
+ * Revision 1.2 1996/06/26 05:39:56 deraadt
+ * rcsid
+ *
* Revision 1.1 1995/12/16 11:47:01 deraadt
* add sup to the tree
*
diff --git a/usr.bin/sup/src/supscan.c b/usr.bin/sup/src/supscan.c
index 1e6e8088373..0ac4b276467 100644
--- a/usr.bin/sup/src/supscan.c
+++ b/usr.bin/sup/src/supscan.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: supscan.c,v 1.2 1996/06/26 05:39:56 deraadt Exp $ */
+
/*
* Copyright (c) 1992 Carnegie Mellon University
* All Rights Reserved.
@@ -39,6 +41,9 @@
**********************************************************************
* HISTORY
* $Log: supscan.c,v $
+ * Revision 1.2 1996/06/26 05:39:56 deraadt
+ * rcsid
+ *
* Revision 1.1 1995/12/16 11:47:01 deraadt
* add sup to the tree
*
diff --git a/usr.bin/sup/src/supservers.8 b/usr.bin/sup/src/supservers.8
index 53d2e9f8a85..102034630cc 100644
--- a/usr.bin/sup/src/supservers.8
+++ b/usr.bin/sup/src/supservers.8
@@ -1,3 +1,5 @@
+.\" $OpenBSD: supservers.8,v 1.2 1996/06/26 05:39:57 deraadt Exp $
+.\"
.\" Copyright (c) 1992 Carnegie Mellon University
.\" All Rights Reserved.
.\"
@@ -23,6 +25,9 @@
.\"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
.\" HISTORY
.\" $Log: supservers.8,v $
+.\" Revision 1.2 1996/06/26 05:39:57 deraadt
+.\" rcsid
+.\"
.\" Revision 1.1 1995/12/16 11:47:02 deraadt
.\" add sup to the tree
.\"
diff --git a/usr.bin/sup/src/sysent.h b/usr.bin/sup/src/sysent.h
index d513ea6c2f9..7ec9cccaa03 100644
--- a/usr.bin/sup/src/sysent.h
+++ b/usr.bin/sup/src/sysent.h
@@ -1,3 +1,5 @@
+/* $OpenBSD: sysent.h,v 1.2 1996/06/26 05:39:57 deraadt Exp $ */
+
/*
* Copyright (c) 1991 Carnegie Mellon University
* All Rights Reserved.
@@ -26,6 +28,9 @@
**********************************************************************
* HISTORY
* $Log: sysent.h,v $
+ * Revision 1.2 1996/06/26 05:39:57 deraadt
+ * rcsid
+ *
* Revision 1.1 1995/12/16 11:47:02 deraadt
* add sup to the tree
*
diff --git a/usr.bin/sup/src/time.h b/usr.bin/sup/src/time.h
index 0b4ea542613..b1fa9e9aa13 100644
--- a/usr.bin/sup/src/time.h
+++ b/usr.bin/sup/src/time.h
@@ -1,3 +1,5 @@
+/* $OpenBSD: time.h,v 1.2 1996/06/26 05:39:58 deraadt Exp $ */
+
/*
* Copyright (c) 1991 Carnegie Mellon University
* All Rights Reserved.
diff --git a/usr.bin/sup/src/vprintf.c b/usr.bin/sup/src/vprintf.c
index 01280c21e94..f7b84d9ec2c 100644
--- a/usr.bin/sup/src/vprintf.c
+++ b/usr.bin/sup/src/vprintf.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: vprintf.c,v 1.2 1996/06/26 05:39:58 deraadt Exp $ */
+
/*
* Copyright (c) 1991 Carnegie Mellon University
* All Rights Reserved.
@@ -28,6 +30,9 @@
**********************************************************************
* HISTORY
* $Log: vprintf.c,v $
+ * Revision 1.2 1996/06/26 05:39:58 deraadt
+ * rcsid
+ *
* Revision 1.1 1995/12/16 11:47:03 deraadt
* add sup to the tree
*
diff --git a/usr.bin/sup/sup/Makefile b/usr.bin/sup/sup/Makefile
index 0718f1403ae..1043cb010ff 100644
--- a/usr.bin/sup/sup/Makefile
+++ b/usr.bin/sup/sup/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.2 1995/12/17 12:58:09 deraadt Exp $
+# $OpenBSD: Makefile,v 1.3 1996/06/26 05:40:01 deraadt Exp $
PROG= sup
MAN= sup.1
diff --git a/usr.bin/sup/supfilesrv/Makefile b/usr.bin/sup/supfilesrv/Makefile
index 880ae34c9b4..84e425b8c92 100644
--- a/usr.bin/sup/supfilesrv/Makefile
+++ b/usr.bin/sup/supfilesrv/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.4 1996/02/15 05:47:09 etheisen Exp $
+# $OpenBSD: Makefile,v 1.5 1996/06/26 05:40:02 deraadt Exp $
PROG= supfilesrv
MAN= supservers.8
diff --git a/usr.bin/sup/supscan/Makefile b/usr.bin/sup/supscan/Makefile
index 1b52c470157..24fb9a2ec65 100644
--- a/usr.bin/sup/supscan/Makefile
+++ b/usr.bin/sup/supscan/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.3 1996/02/03 10:05:06 deraadt Exp $
+# $OpenBSD: Makefile,v 1.4 1996/06/26 05:40:03 deraadt Exp $
PROG= supscan
NOMAN=
diff --git a/usr.bin/systat/cmds.c b/usr.bin/systat/cmds.c
index 2225a059a8d..c57904645df 100644
--- a/usr.bin/systat/cmds.c
+++ b/usr.bin/systat/cmds.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: cmds.c,v 1.4 1996/06/26 05:40:04 deraadt Exp $ */
/* $NetBSD: cmds.c,v 1.4 1996/05/10 23:16:32 thorpej Exp $ */
/*-
@@ -37,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)cmds.c 8.2 (Berkeley) 4/29/95";
#endif
-static char rcsid[] = "$NetBSD: cmds.c,v 1.4 1996/05/10 23:16:32 thorpej Exp $";
+static char rcsid[] = "$OpenBSD: cmds.c,v 1.4 1996/06/26 05:40:04 deraadt Exp $";
#endif /* not lint */
#include <stdlib.h>
diff --git a/usr.bin/systat/cmdtab.c b/usr.bin/systat/cmdtab.c
index 0ae1db53544..cc71c61ad3d 100644
--- a/usr.bin/systat/cmdtab.c
+++ b/usr.bin/systat/cmdtab.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: cmdtab.c,v 1.2 1996/06/26 05:40:05 deraadt Exp $ */
/* $NetBSD: cmdtab.c,v 1.2 1995/01/20 08:51:51 jtc Exp $ */
/*-
@@ -37,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)cmdtab.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$NetBSD: cmdtab.c,v 1.2 1995/01/20 08:51:51 jtc Exp $";
+static char rcsid[] = "$OpenBSD: cmdtab.c,v 1.2 1996/06/26 05:40:05 deraadt Exp $";
#endif /* not lint */
#include "systat.h"
diff --git a/usr.bin/systat/disks.c b/usr.bin/systat/disks.c
index 348022ace90..c5e564debc5 100644
--- a/usr.bin/systat/disks.c
+++ b/usr.bin/systat/disks.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: disks.c,v 1.5 1996/06/26 05:40:05 deraadt Exp $ */
/* $NetBSD: disks.c,v 1.4 1996/05/10 23:16:33 thorpej Exp $ */
/*-
@@ -37,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)disks.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$NetBSD: disks.c,v 1.4 1996/05/10 23:16:33 thorpej Exp $";
+static char rcsid[] = "$OpenBSD: disks.c,v 1.5 1996/06/26 05:40:05 deraadt Exp $";
#endif /* not lint */
#include "systat.h"
diff --git a/usr.bin/systat/extern.h b/usr.bin/systat/extern.h
index 6a9f0f73f21..d1ded2d14a0 100644
--- a/usr.bin/systat/extern.h
+++ b/usr.bin/systat/extern.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: extern.h,v 1.3 1996/06/26 05:40:06 deraadt Exp $ */
/* $NetBSD: extern.h,v 1.3 1996/05/10 23:16:34 thorpej Exp $ */
/*-
diff --git a/usr.bin/systat/fetch.c b/usr.bin/systat/fetch.c
index 31f212cc8ab..ebb11bd5e68 100644
--- a/usr.bin/systat/fetch.c
+++ b/usr.bin/systat/fetch.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: fetch.c,v 1.2 1996/06/26 05:40:06 deraadt Exp $ */
/* $NetBSD: fetch.c,v 1.2 1995/01/20 08:51:56 jtc Exp $ */
/*-
@@ -37,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)fetch.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$NetBSD: fetch.c,v 1.2 1995/01/20 08:51:56 jtc Exp $";
+static char rcsid[] = "$OpenBSD: fetch.c,v 1.2 1996/06/26 05:40:06 deraadt Exp $";
#endif /* not lint */
#include <sys/types.h>
diff --git a/usr.bin/systat/iostat.c b/usr.bin/systat/iostat.c
index ec2b625ba1e..e7fb72c5392 100644
--- a/usr.bin/systat/iostat.c
+++ b/usr.bin/systat/iostat.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: iostat.c,v 1.5 1996/06/26 05:40:07 deraadt Exp $ */
/* $NetBSD: iostat.c,v 1.5 1996/05/10 23:16:35 thorpej Exp $ */
/*
@@ -37,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)iostat.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$NetBSD: iostat.c,v 1.5 1996/05/10 23:16:35 thorpej Exp $";
+static char rcsid[] = "$OpenBSD: iostat.c,v 1.5 1996/06/26 05:40:07 deraadt Exp $";
#endif not lint
#include <sys/param.h>
diff --git a/usr.bin/systat/keyboard.c b/usr.bin/systat/keyboard.c
index 1923091b6a2..1487659d085 100644
--- a/usr.bin/systat/keyboard.c
+++ b/usr.bin/systat/keyboard.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: keyboard.c,v 1.2 1996/06/26 05:40:07 deraadt Exp $ */
/* $NetBSD: keyboard.c,v 1.2 1995/01/20 08:51:59 jtc Exp $ */
/*-
@@ -37,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)keyboard.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$NetBSD: keyboard.c,v 1.2 1995/01/20 08:51:59 jtc Exp $";
+static char rcsid[] = "$OpenBSD: keyboard.c,v 1.2 1996/06/26 05:40:07 deraadt Exp $";
#endif /* not lint */
#include <ctype.h>
diff --git a/usr.bin/systat/main.c b/usr.bin/systat/main.c
index 03391852d74..d1ee81a9481 100644
--- a/usr.bin/systat/main.c
+++ b/usr.bin/systat/main.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: main.c,v 1.4 1996/06/26 05:40:08 deraadt Exp $ */
/* $NetBSD: main.c,v 1.8 1996/05/10 23:16:36 thorpej Exp $ */
/*-
@@ -43,7 +44,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)main.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$NetBSD: main.c,v 1.8 1996/05/10 23:16:36 thorpej Exp $";
+static char rcsid[] = "$OpenBSD: main.c,v 1.4 1996/06/26 05:40:08 deraadt Exp $";
#endif /* not lint */
#include <sys/param.h>
diff --git a/usr.bin/systat/mbufs.c b/usr.bin/systat/mbufs.c
index cf1b3b3ff6b..f1e569a184e 100644
--- a/usr.bin/systat/mbufs.c
+++ b/usr.bin/systat/mbufs.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: mbufs.c,v 1.3 1996/06/26 05:40:08 deraadt Exp $ */
/* $NetBSD: mbufs.c,v 1.2 1995/01/20 08:52:02 jtc Exp $ */
/*-
@@ -37,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)mbufs.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$NetBSD: mbufs.c,v 1.2 1995/01/20 08:52:02 jtc Exp $";
+static char rcsid[] = "$OpenBSD: mbufs.c,v 1.3 1996/06/26 05:40:08 deraadt Exp $";
#endif /* not lint */
#include <sys/param.h>
diff --git a/usr.bin/systat/netcmds.c b/usr.bin/systat/netcmds.c
index 3830a02a35a..e362dd508a9 100644
--- a/usr.bin/systat/netcmds.c
+++ b/usr.bin/systat/netcmds.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: netcmds.c,v 1.2 1996/06/26 05:40:09 deraadt Exp $ */
/* $NetBSD: netcmds.c,v 1.4 1995/05/21 17:14:38 mycroft Exp $ */
/*-
@@ -37,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)netcmds.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$NetBSD: netcmds.c,v 1.4 1995/05/21 17:14:38 mycroft Exp $";
+static char rcsid[] = "$OpenBSD: netcmds.c,v 1.2 1996/06/26 05:40:09 deraadt Exp $";
#endif /* not lint */
/*
diff --git a/usr.bin/systat/netstat.c b/usr.bin/systat/netstat.c
index 4310b23aa3d..7a0cc403e3a 100644
--- a/usr.bin/systat/netstat.c
+++ b/usr.bin/systat/netstat.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: netstat.c,v 1.3 1996/06/26 05:40:09 deraadt Exp $ */
/* $NetBSD: netstat.c,v 1.3 1995/06/18 23:53:07 cgd Exp $ */
/*-
@@ -37,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)netstat.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$NetBSD: netstat.c,v 1.3 1995/06/18 23:53:07 cgd Exp $";
+static char rcsid[] = "$OpenBSD: netstat.c,v 1.3 1996/06/26 05:40:09 deraadt Exp $";
#endif /* not lint */
/*
diff --git a/usr.bin/systat/pigs.c b/usr.bin/systat/pigs.c
index d6c33358e0a..66f044353ee 100644
--- a/usr.bin/systat/pigs.c
+++ b/usr.bin/systat/pigs.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: pigs.c,v 1.3 1996/06/26 05:40:10 deraadt Exp $ */
/* $NetBSD: pigs.c,v 1.3 1995/04/29 05:54:50 cgd Exp $ */
/*-
@@ -37,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)pigs.c 8.2 (Berkeley) 9/23/93";
#endif
-static char rcsid[] = "$NetBSD: pigs.c,v 1.3 1995/04/29 05:54:50 cgd Exp $";
+static char rcsid[] = "$OpenBSD: pigs.c,v 1.3 1996/06/26 05:40:10 deraadt Exp $";
#endif /* not lint */
/*
diff --git a/usr.bin/systat/swap.c b/usr.bin/systat/swap.c
index 63e95c7e883..9c40fa92148 100644
--- a/usr.bin/systat/swap.c
+++ b/usr.bin/systat/swap.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: swap.c,v 1.4 1996/06/26 05:40:11 deraadt Exp $ */
/* $NetBSD: swap.c,v 1.5 1996/05/10 23:16:38 thorpej Exp $ */
/*-
@@ -37,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)swap.c 8.3 (Berkeley) 4/29/95";
#endif
-static char rcsid[] = "$NetBSD: swap.c,v 1.5 1996/05/10 23:16:38 thorpej Exp $";
+static char rcsid[] = "$OpenBSD: swap.c,v 1.4 1996/06/26 05:40:11 deraadt Exp $";
#endif /* not lint */
/*
diff --git a/usr.bin/systat/systat.1 b/usr.bin/systat/systat.1
index 8d17f8afe41..e88ce63d0e8 100644
--- a/usr.bin/systat/systat.1
+++ b/usr.bin/systat/systat.1
@@ -1,3 +1,4 @@
+.\" $OpenBSD: systat.1,v 1.3 1996/06/26 05:40:11 deraadt Exp $
.\" $NetBSD: systat.1,v 1.6 1996/05/10 23:16:39 thorpej Exp $
.\"
.\" Copyright (c) 1985, 1990, 1993
diff --git a/usr.bin/systat/systat.h b/usr.bin/systat/systat.h
index e08f5364bea..d0725aa9dec 100644
--- a/usr.bin/systat/systat.h
+++ b/usr.bin/systat/systat.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: systat.h,v 1.2 1996/06/26 05:40:12 deraadt Exp $ */
/* $NetBSD: systat.h,v 1.2 1995/01/20 08:52:14 jtc Exp $ */
/*-
diff --git a/usr.bin/systat/vmstat.c b/usr.bin/systat/vmstat.c
index d31596affb4..78d9898d476 100644
--- a/usr.bin/systat/vmstat.c
+++ b/usr.bin/systat/vmstat.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: vmstat.c,v 1.4 1996/06/26 05:40:12 deraadt Exp $ */
/* $NetBSD: vmstat.c,v 1.5 1996/05/10 23:16:40 thorpej Exp $ */
/*-
@@ -37,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)vmstat.c 8.2 (Berkeley) 1/12/94";
#endif
-static char rcsid[] = "$NetBSD: vmstat.c,v 1.5 1996/05/10 23:16:40 thorpej Exp $";
+static char rcsid[] = "$OpenBSD: vmstat.c,v 1.4 1996/06/26 05:40:12 deraadt Exp $";
#endif /* not lint */
/*
diff --git a/usr.bin/tail/Makefile b/usr.bin/tail/Makefile
index d189e21ec87..f523042957c 100644
--- a/usr.bin/tail/Makefile
+++ b/usr.bin/tail/Makefile
@@ -1,5 +1,5 @@
+# $OpenBSD: Makefile,v 1.2 1996/06/26 05:40:14 deraadt Exp $
# $NetBSD: Makefile,v 1.3 1994/11/23 07:41:55 jtc Exp $
-# @(#)Makefile 8.1 (Berkeley) 6/6/93
PROG= tail
SRCS= forward.c misc.c read.c reverse.c tail.c
diff --git a/usr.bin/tail/extern.h b/usr.bin/tail/extern.h
index 20e874f4b88..e1a57d062f1 100644
--- a/usr.bin/tail/extern.h
+++ b/usr.bin/tail/extern.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: extern.h,v 1.2 1996/06/26 05:40:14 deraadt Exp $ */
/* $NetBSD: extern.h,v 1.3 1994/11/23 07:42:00 jtc Exp $ */
/*-
diff --git a/usr.bin/tail/forward.c b/usr.bin/tail/forward.c
index c5eb266a45b..7e46d1ad5b5 100644
--- a/usr.bin/tail/forward.c
+++ b/usr.bin/tail/forward.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: forward.c,v 1.3 1996/06/26 05:40:15 deraadt Exp $ */
/* $NetBSD: forward.c,v 1.7 1996/02/13 16:49:10 ghudson Exp $ */
/*-
@@ -40,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)forward.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$NetBSD: forward.c,v 1.7 1996/02/13 16:49:10 ghudson Exp $";
+static char rcsid[] = "$OpenBSD: forward.c,v 1.3 1996/06/26 05:40:15 deraadt Exp $";
#endif /* not lint */
#include <sys/types.h>
diff --git a/usr.bin/tail/misc.c b/usr.bin/tail/misc.c
index a5581f523ee..bdc77c9efb1 100644
--- a/usr.bin/tail/misc.c
+++ b/usr.bin/tail/misc.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: misc.c,v 1.2 1996/06/26 05:40:16 deraadt Exp $ */
+
/*-
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
@@ -38,7 +40,7 @@
#if 0
static char sccsid[] = "@(#)misc.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$NetBSD: misc.c,v 1.3 1994/11/23 07:42:04 jtc Exp $";
+static char rcsid[] = "$OpenBSD: misc.c,v 1.2 1996/06/26 05:40:16 deraadt Exp $";
#endif /* not lint */
#include <sys/types.h>
diff --git a/usr.bin/tail/read.c b/usr.bin/tail/read.c
index 650d8cf4476..14adc658199 100644
--- a/usr.bin/tail/read.c
+++ b/usr.bin/tail/read.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: read.c,v 1.2 1996/06/26 05:40:16 deraadt Exp $ */
/* $NetBSD: read.c,v 1.4 1994/11/23 07:42:07 jtc Exp $ */
/*-
@@ -40,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)read.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$NetBSD: read.c,v 1.4 1994/11/23 07:42:07 jtc Exp $";
+static char rcsid[] = "$OpenBSD: read.c,v 1.2 1996/06/26 05:40:16 deraadt Exp $";
#endif /* not lint */
#include <sys/types.h>
diff --git a/usr.bin/tail/reverse.c b/usr.bin/tail/reverse.c
index d027d2180a4..6e3a28f18a3 100644
--- a/usr.bin/tail/reverse.c
+++ b/usr.bin/tail/reverse.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: reverse.c,v 1.2 1996/06/26 05:40:17 deraadt Exp $ */
/* $NetBSD: reverse.c,v 1.6 1994/11/23 07:42:10 jtc Exp $ */
/*-
@@ -40,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)reverse.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$NetBSD: reverse.c,v 1.6 1994/11/23 07:42:10 jtc Exp $";
+static char rcsid[] = "$OpenBSD: reverse.c,v 1.2 1996/06/26 05:40:17 deraadt Exp $";
#endif /* not lint */
#include <sys/param.h>
diff --git a/usr.bin/tail/tail.1 b/usr.bin/tail/tail.1
index 0a602e60105..2c55eaaa386 100644
--- a/usr.bin/tail/tail.1
+++ b/usr.bin/tail/tail.1
@@ -1,3 +1,4 @@
+.\" $OpenBSD: tail.1,v 1.2 1996/06/26 05:40:17 deraadt Exp $
.\" $NetBSD: tail.1,v 1.4 1994/11/23 07:42:13 jtc Exp $
.\"
.\" Copyright (c) 1980, 1990, 1991, 1993
diff --git a/usr.bin/tail/tail.c b/usr.bin/tail/tail.c
index d60256a7917..da7436244ad 100644
--- a/usr.bin/tail/tail.c
+++ b/usr.bin/tail/tail.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: tail.c,v 1.2 1996/06/26 05:40:18 deraadt Exp $ */
+
/*-
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
@@ -44,7 +46,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)tail.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$NetBSD: tail.c,v 1.4 1994/11/23 07:42:16 jtc Exp $";
+static char rcsid[] = "$OpenBSD: tail.c,v 1.2 1996/06/26 05:40:18 deraadt Exp $";
#endif /* not lint */
#include <sys/types.h>
diff --git a/usr.bin/talk/Makefile b/usr.bin/talk/Makefile
index 3a28ecb382f..117b5606194 100644
--- a/usr.bin/talk/Makefile
+++ b/usr.bin/talk/Makefile
@@ -1,5 +1,5 @@
+# $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 $
-# @(#)Makefile 8.1 (Berkeley) 6/6/93
PROG= talk
DPADD= ${LIBCURSES} ${LIBTERMLIB} ${LIBCOMPAT}
diff --git a/usr.bin/talk/ctl.c b/usr.bin/talk/ctl.c
index de86bf04fa5..fcfb2c2a0d9 100644
--- a/usr.bin/talk/ctl.c
+++ b/usr.bin/talk/ctl.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: ctl.c,v 1.2 1996/06/26 05:40:20 deraadt Exp $ */
/* $NetBSD: ctl.c,v 1.3 1994/12/09 02:14:10 jtc Exp $ */
/*
@@ -37,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)ctl.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$NetBSD: ctl.c,v 1.3 1994/12/09 02:14:10 jtc Exp $";
+static char rcsid[] = "$OpenBSD: ctl.c,v 1.2 1996/06/26 05:40:20 deraadt Exp $";
#endif /* not lint */
/*
diff --git a/usr.bin/talk/ctl_transact.c b/usr.bin/talk/ctl_transact.c
index e3b7cae55b1..6648b461d43 100644
--- a/usr.bin/talk/ctl_transact.c
+++ b/usr.bin/talk/ctl_transact.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: ctl_transact.c,v 1.3 1996/06/26 05:40:20 deraadt Exp $ */
/* $NetBSD: ctl_transact.c,v 1.3 1994/12/09 02:14:12 jtc Exp $ */
/*
@@ -37,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)ctl_transact.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$NetBSD: ctl_transact.c,v 1.3 1994/12/09 02:14:12 jtc Exp $";
+static char rcsid[] = "$OpenBSD: ctl_transact.c,v 1.3 1996/06/26 05:40:20 deraadt Exp $";
#endif /* not lint */
#include <sys/types.h>
diff --git a/usr.bin/talk/display.c b/usr.bin/talk/display.c
index 0434685199b..427f65b41e3 100644
--- a/usr.bin/talk/display.c
+++ b/usr.bin/talk/display.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: display.c,v 1.2 1996/06/26 05:40:21 deraadt Exp $ */
/* $NetBSD: display.c,v 1.3 1994/12/09 02:14:13 jtc Exp $ */
/*
@@ -37,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)display.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$NetBSD: display.c,v 1.3 1994/12/09 02:14:13 jtc Exp $";
+static char rcsid[] = "$OpenBSD: display.c,v 1.2 1996/06/26 05:40:21 deraadt Exp $";
#endif /* not lint */
/*
diff --git a/usr.bin/talk/get_addrs.c b/usr.bin/talk/get_addrs.c
index e65e88a5209..1167cb12df2 100644
--- a/usr.bin/talk/get_addrs.c
+++ b/usr.bin/talk/get_addrs.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: get_addrs.c,v 1.2 1996/06/26 05:40:21 deraadt Exp $ */
/* $NetBSD: get_addrs.c,v 1.3 1994/12/09 02:14:14 jtc Exp $ */
/*
@@ -37,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)get_addrs.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$NetBSD: get_addrs.c,v 1.3 1994/12/09 02:14:14 jtc Exp $";
+static char rcsid[] = "$OpenBSD: get_addrs.c,v 1.2 1996/06/26 05:40:21 deraadt Exp $";
#endif /* not lint */
#include <sys/types.h>
diff --git a/usr.bin/talk/get_names.c b/usr.bin/talk/get_names.c
index 0d7a21ac1c9..6a1ec23ae05 100644
--- a/usr.bin/talk/get_names.c
+++ b/usr.bin/talk/get_names.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: get_names.c,v 1.2 1996/06/26 05:40:22 deraadt Exp $ */
/* $NetBSD: get_names.c,v 1.4 1994/12/09 02:14:16 jtc Exp $ */
/*
@@ -37,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)get_names.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$NetBSD: get_names.c,v 1.4 1994/12/09 02:14:16 jtc Exp $";
+static char rcsid[] = "$OpenBSD: get_names.c,v 1.2 1996/06/26 05:40:22 deraadt Exp $";
#endif /* not lint */
#include <sys/param.h>
diff --git a/usr.bin/talk/init_disp.c b/usr.bin/talk/init_disp.c
index bd2f12173da..f10f2a3a546 100644
--- a/usr.bin/talk/init_disp.c
+++ b/usr.bin/talk/init_disp.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: init_disp.c,v 1.3 1996/06/26 05:40:22 deraadt Exp $ */
/* $NetBSD: init_disp.c,v 1.6 1994/12/09 02:14:17 jtc Exp $ */
/*
@@ -37,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)init_disp.c 8.2 (Berkeley) 2/16/94";
#endif
-static char rcsid[] = "$NetBSD: init_disp.c,v 1.6 1994/12/09 02:14:17 jtc Exp $";
+static char rcsid[] = "$OpenBSD: init_disp.c,v 1.3 1996/06/26 05:40:22 deraadt Exp $";
#endif /* not lint */
/*
diff --git a/usr.bin/talk/invite.c b/usr.bin/talk/invite.c
index 20e835805d4..db0bc5427e6 100644
--- a/usr.bin/talk/invite.c
+++ b/usr.bin/talk/invite.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: invite.c,v 1.3 1996/06/26 05:40:23 deraadt Exp $ */
/* $NetBSD: invite.c,v 1.3 1994/12/09 02:14:18 jtc Exp $ */
/*
@@ -37,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)invite.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$NetBSD: invite.c,v 1.3 1994/12/09 02:14:18 jtc Exp $";
+static char rcsid[] = "$OpenBSD: invite.c,v 1.3 1996/06/26 05:40:23 deraadt Exp $";
#endif /* not lint */
#include <sys/types.h>
diff --git a/usr.bin/talk/io.c b/usr.bin/talk/io.c
index 6e6f1b62f5e..a39c34d4bd8 100644
--- a/usr.bin/talk/io.c
+++ b/usr.bin/talk/io.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: io.c,v 1.3 1996/06/26 05:40:23 deraadt Exp $ */
/* $NetBSD: io.c,v 1.4 1994/12/09 02:14:20 jtc Exp $ */
/*
@@ -37,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)io.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$NetBSD: io.c,v 1.4 1994/12/09 02:14:20 jtc Exp $";
+static char rcsid[] = "$OpenBSD: io.c,v 1.3 1996/06/26 05:40:23 deraadt Exp $";
#endif /* not lint */
/*
diff --git a/usr.bin/talk/look_up.c b/usr.bin/talk/look_up.c
index ab2b7e9ef15..d1c06d227da 100644
--- a/usr.bin/talk/look_up.c
+++ b/usr.bin/talk/look_up.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: look_up.c,v 1.3 1996/06/26 05:40:24 deraadt Exp $ */
/* $NetBSD: look_up.c,v 1.3 1994/12/09 02:14:21 jtc Exp $ */
/*
@@ -37,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)look_up.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$NetBSD: look_up.c,v 1.3 1994/12/09 02:14:21 jtc Exp $";
+static char rcsid[] = "$OpenBSD: look_up.c,v 1.3 1996/06/26 05:40:24 deraadt Exp $";
#endif /* not lint */
#include <sys/types.h>
diff --git a/usr.bin/talk/msgs.c b/usr.bin/talk/msgs.c
index c6799c651fa..ba8b141e47f 100644
--- a/usr.bin/talk/msgs.c
+++ b/usr.bin/talk/msgs.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: msgs.c,v 1.2 1996/06/26 05:40:25 deraadt Exp $ */
/* $NetBSD: msgs.c,v 1.3 1994/12/09 02:14:22 jtc Exp $ */
/*
@@ -37,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)msgs.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$NetBSD: msgs.c,v 1.3 1994/12/09 02:14:22 jtc Exp $";
+static char rcsid[] = "$OpenBSD: msgs.c,v 1.2 1996/06/26 05:40:25 deraadt Exp $";
#endif /* not lint */
/*
diff --git a/usr.bin/talk/talk.1 b/usr.bin/talk/talk.1
index 820766b13f2..e197d4462b7 100644
--- a/usr.bin/talk/talk.1
+++ b/usr.bin/talk/talk.1
@@ -1,3 +1,4 @@
+.\" $OpenBSD: talk.1,v 1.2 1996/06/26 05:40:25 deraadt Exp $
.\" $NetBSD: talk.1,v 1.3 1994/12/09 02:14:23 jtc Exp $
.\"
.\" Copyright (c) 1983, 1990, 1993
diff --git a/usr.bin/talk/talk.c b/usr.bin/talk/talk.c
index 64ed6b465b8..4e0839d2ec2 100644
--- a/usr.bin/talk/talk.c
+++ b/usr.bin/talk/talk.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: talk.c,v 1.2 1996/06/26 05:40:26 deraadt Exp $ */
/* $NetBSD: talk.c,v 1.3 1994/12/09 02:14:25 jtc Exp $ */
/*
@@ -43,7 +44,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)talk.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$NetBSD: talk.c,v 1.3 1994/12/09 02:14:25 jtc Exp $";
+static char rcsid[] = "$OpenBSD: talk.c,v 1.2 1996/06/26 05:40:26 deraadt Exp $";
#endif /* not lint */
#include "talk.h"
diff --git a/usr.bin/talk/talk.h b/usr.bin/talk/talk.h
index ac5230022de..99ef7e28e7c 100644
--- a/usr.bin/talk/talk.h
+++ b/usr.bin/talk/talk.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: talk.h,v 1.2 1996/06/26 05:40:26 deraadt Exp $ */
/* $NetBSD: talk.h,v 1.3 1994/12/09 02:14:27 jtc Exp $ */
/*
diff --git a/usr.bin/talk/talk_ctl.h b/usr.bin/talk/talk_ctl.h
index 2e2550a18ad..c7ed3efcff6 100644
--- a/usr.bin/talk/talk_ctl.h
+++ b/usr.bin/talk/talk_ctl.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: talk_ctl.h,v 1.2 1996/06/26 05:40:27 deraadt Exp $ */
/* $NetBSD: talk_ctl.h,v 1.3 1994/12/09 02:14:28 jtc Exp $ */
/*
diff --git a/usr.bin/tcopy/Makefile b/usr.bin/tcopy/Makefile
index d47f1604c56..185f6189569 100644
--- a/usr.bin/tcopy/Makefile
+++ b/usr.bin/tcopy/Makefile
@@ -1,5 +1,5 @@
+# $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 $
-# @(#)Makefile 8.1 (Berkeley) 6/6/93
PROG= tcopy
diff --git a/usr.bin/tcopy/pathnames.h b/usr.bin/tcopy/pathnames.h
index f59afd61f08..e7784a04074 100644
--- a/usr.bin/tcopy/pathnames.h
+++ b/usr.bin/tcopy/pathnames.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: pathnames.h,v 1.2 1996/06/26 05:40:28 deraadt Exp $ */
/* $NetBSD: pathnames.h,v 1.3 1994/12/09 02:14:36 jtc Exp $ */
/*
diff --git a/usr.bin/tcopy/tcopy.1 b/usr.bin/tcopy/tcopy.1
index 58222ea1f52..55a4b47fdda 100644
--- a/usr.bin/tcopy/tcopy.1
+++ b/usr.bin/tcopy/tcopy.1
@@ -1,3 +1,4 @@
+.\" $OpenBSD: tcopy.1,v 1.2 1996/06/26 05:40:29 deraadt Exp $
.\" $NetBSD: tcopy.1,v 1.3 1994/12/09 02:14:38 jtc Exp $
.\"
.\" Copyright (c) 1985, 1990, 1991, 1993
diff --git a/usr.bin/tcopy/tcopy.c b/usr.bin/tcopy/tcopy.c
index 1dcf79a3bdd..23c8a367f53 100644
--- a/usr.bin/tcopy/tcopy.c
+++ b/usr.bin/tcopy/tcopy.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: tcopy.c,v 1.2 1996/06/26 05:40:29 deraadt Exp $ */
/* $NetBSD: tcopy.c,v 1.4 1995/08/31 22:17:24 jtc Exp $ */
/*
@@ -43,7 +44,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)tcopy.c 8.3 (Berkeley) 1/23/95";
#endif
-static char rcsid[] = "$NetBSD: tcopy.c,v 1.4 1995/08/31 22:17:24 jtc Exp $";
+static char rcsid[] = "$OpenBSD: tcopy.c,v 1.2 1996/06/26 05:40:29 deraadt Exp $";
#endif /* not lint */
#include <sys/types.h>
diff --git a/usr.bin/tee/Makefile b/usr.bin/tee/Makefile
index a238fe4ec40..c0dd457875f 100644
--- a/usr.bin/tee/Makefile
+++ b/usr.bin/tee/Makefile
@@ -1,5 +1,5 @@
+# $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 $
-# @(#)Makefile 8.1 (Berkeley) 6/6/93
PROG= tee
diff --git a/usr.bin/tee/tee.1 b/usr.bin/tee/tee.1
index a73add030ea..b705fe12a96 100644
--- a/usr.bin/tee/tee.1
+++ b/usr.bin/tee/tee.1
@@ -1,3 +1,4 @@
+.\" $OpenBSD: tee.1,v 1.2 1996/06/26 05:40:31 deraadt Exp $
.\" $NetBSD: tee.1,v 1.4 1994/12/09 01:43:37 jtc Exp $
.\"
.\" Copyright (c) 1991, 1993
diff --git a/usr.bin/tee/tee.c b/usr.bin/tee/tee.c
index 9ab61c90c6c..7d1ff049bdb 100644
--- a/usr.bin/tee/tee.c
+++ b/usr.bin/tee/tee.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: tee.c,v 1.2 1996/06/26 05:40:32 deraadt Exp $ */
/* $NetBSD: tee.c,v 1.5 1994/12/09 01:43:39 jtc Exp $ */
/*
@@ -43,7 +44,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)tee.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$NetBSD: tee.c,v 1.5 1994/12/09 01:43:39 jtc Exp $";
+static char rcsid[] = "$OpenBSD: tee.c,v 1.2 1996/06/26 05:40:32 deraadt Exp $";
#endif
#include <sys/types.h>
diff --git a/usr.bin/tftp/Makefile b/usr.bin/tftp/Makefile
index c2f36b6bdd5..10e2b97e8c5 100644
--- a/usr.bin/tftp/Makefile
+++ b/usr.bin/tftp/Makefile
@@ -1,5 +1,5 @@
+# $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 $
-# @(#)Makefile 8.1 (Berkeley) 6/6/93
PROG= tftp
SRCS= main.c tftp.c tftpsubs.c
diff --git a/usr.bin/tftp/extern.h b/usr.bin/tftp/extern.h
index 7c4e679f87c..faddc0b22dd 100644
--- a/usr.bin/tftp/extern.h
+++ b/usr.bin/tftp/extern.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: extern.h,v 1.2 1996/06/26 05:40:33 deraadt Exp $ */
/* $NetBSD: extern.h,v 1.2 1994/12/08 09:51:24 jtc Exp $ */
/*
diff --git a/usr.bin/tftp/main.c b/usr.bin/tftp/main.c
index 1595cadef5a..c27ca9cdc60 100644
--- a/usr.bin/tftp/main.c
+++ b/usr.bin/tftp/main.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: main.c,v 1.2 1996/06/26 05:40:34 deraadt Exp $ */
/* $NetBSD: main.c,v 1.6 1995/05/21 16:54:10 mycroft Exp $ */
/*
@@ -43,7 +44,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)main.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$NetBSD: main.c,v 1.6 1995/05/21 16:54:10 mycroft Exp $";
+static char rcsid[] = "$OpenBSD: main.c,v 1.2 1996/06/26 05:40:34 deraadt Exp $";
#endif /* not lint */
/* Many bug fixes are from Jim Guyton <guyton@rand-unix> */
diff --git a/usr.bin/tftp/tftp.1 b/usr.bin/tftp/tftp.1
index 8a4b7a7172d..f09aeeaa0d7 100644
--- a/usr.bin/tftp/tftp.1
+++ b/usr.bin/tftp/tftp.1
@@ -1,3 +1,4 @@
+.\" $OpenBSD: tftp.1,v 1.2 1996/06/26 05:40:35 deraadt Exp $
.\" $NetBSD: tftp.1,v 1.5 1995/08/18 14:45:44 pk Exp $
.\"
.\" Copyright (c) 1990, 1993, 1994
diff --git a/usr.bin/tftp/tftp.c b/usr.bin/tftp/tftp.c
index d7097969717..d813f9bc55b 100644
--- a/usr.bin/tftp/tftp.c
+++ b/usr.bin/tftp/tftp.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: tftp.c,v 1.2 1996/06/26 05:40:35 deraadt Exp $ */
/* $NetBSD: tftp.c,v 1.5 1995/04/29 05:55:25 cgd Exp $ */
/*
@@ -37,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)tftp.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$NetBSD: tftp.c,v 1.5 1995/04/29 05:55:25 cgd Exp $";
+static char rcsid[] = "$OpenBSD: tftp.c,v 1.2 1996/06/26 05:40:35 deraadt Exp $";
#endif /* not lint */
/* Many bug fixes are from Jim Guyton <guyton@rand-unix> */
diff --git a/usr.bin/tftp/tftpsubs.c b/usr.bin/tftp/tftpsubs.c
index de1d37199f7..8151a40c853 100644
--- a/usr.bin/tftp/tftpsubs.c
+++ b/usr.bin/tftp/tftpsubs.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: tftpsubs.c,v 1.2 1996/06/26 05:40:36 deraadt Exp $ */
/* $NetBSD: tftpsubs.c,v 1.3 1994/12/08 09:51:31 jtc Exp $ */
/*
@@ -37,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)tftpsubs.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$NetBSD: tftpsubs.c,v 1.3 1994/12/08 09:51:31 jtc Exp $";
+static char rcsid[] = "$OpenBSD: tftpsubs.c,v 1.2 1996/06/26 05:40:36 deraadt Exp $";
#endif /* not lint */
/* Simple minded read-ahead/write-behind subroutines for tftp user and
diff --git a/usr.bin/tftp/tftpsubs.h b/usr.bin/tftp/tftpsubs.h
index 5fc6316a060..626f6c09999 100644
--- a/usr.bin/tftp/tftpsubs.h
+++ b/usr.bin/tftp/tftpsubs.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: tftpsubs.h,v 1.2 1996/06/26 05:40:37 deraadt Exp $ */
/* $NetBSD: tftpsubs.h,v 1.2 1994/12/08 09:51:32 jtc Exp $ */
/*
diff --git a/usr.bin/time/Makefile b/usr.bin/time/Makefile
index df8ff522d1d..979255e07e4 100644
--- a/usr.bin/time/Makefile
+++ b/usr.bin/time/Makefile
@@ -1,5 +1,5 @@
+# $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 $
-# @(#)Makefile 8.1 (Berkeley) 6/6/93
PROG= time
diff --git a/usr.bin/time/time.1 b/usr.bin/time/time.1
index 986bf465457..cac1af0729d 100644
--- a/usr.bin/time/time.1
+++ b/usr.bin/time/time.1
@@ -1,3 +1,4 @@
+.\" $OpenBSD: time.1,v 1.2 1996/06/26 05:40:38 deraadt Exp $
.\" $NetBSD: time.1,v 1.5 1994/12/08 09:36:57 jtc Exp $
.\"
.\" Copyright (c) 1980, 1991, 1993
diff --git a/usr.bin/time/time.c b/usr.bin/time/time.c
index fc557230e37..6e3df6abc30 100644
--- a/usr.bin/time/time.c
+++ b/usr.bin/time/time.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: time.c,v 1.2 1996/06/26 05:40:39 deraadt Exp $ */
/* $NetBSD: time.c,v 1.7 1995/06/27 00:34:00 jtc Exp $ */
/*
@@ -43,7 +44,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)time.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$NetBSD: time.c,v 1.7 1995/06/27 00:34:00 jtc Exp $";
+static char rcsid[] = "$OpenBSD: time.c,v 1.2 1996/06/26 05:40:39 deraadt Exp $";
#endif /* not lint */
#include <sys/types.h>
diff --git a/usr.bin/tip/Makefile b/usr.bin/tip/Makefile
index 25218c0cae4..a6b58c07bf5 100644
--- a/usr.bin/tip/Makefile
+++ b/usr.bin/tip/Makefile
@@ -1,5 +1,5 @@
+# $OpenBSD: Makefile,v 1.2 1996/06/26 05:40:40 deraadt Exp $
# $NetBSD: Makefile,v 1.4 1994/12/08 09:30:36 jtc Exp $
-# @(#)Makefile 8.1 (Berkeley) 6/6/93
#
# Files are:
# /etc/remote remote host description file
diff --git a/usr.bin/tip/acu.c b/usr.bin/tip/acu.c
index e2fa8b8bb0b..68cc61885cb 100644
--- a/usr.bin/tip/acu.c
+++ b/usr.bin/tip/acu.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: acu.c,v 1.2 1996/06/26 05:40:40 deraadt Exp $ */
/* $NetBSD: acu.c,v 1.3 1994/12/08 09:30:39 jtc Exp $ */
/*
@@ -37,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)acu.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$NetBSD: acu.c,v 1.3 1994/12/08 09:30:39 jtc Exp $";
+static char rcsid[] = "$OpenBSD: acu.c,v 1.2 1996/06/26 05:40:40 deraadt Exp $";
#endif /* not lint */
#include "tip.h"
diff --git a/usr.bin/tip/aculib/biz22.c b/usr.bin/tip/aculib/biz22.c
index 165ce59dd69..8d642df4c61 100644
--- a/usr.bin/tip/aculib/biz22.c
+++ b/usr.bin/tip/aculib/biz22.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: biz22.c,v 1.3 1996/06/26 05:40:51 deraadt Exp $ */
/* $NetBSD: biz22.c,v 1.4 1995/10/29 00:49:47 pk Exp $ */
/*
@@ -37,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)biz22.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$NetBSD: biz22.c,v 1.4 1995/10/29 00:49:47 pk Exp $";
+static char rcsid[] = "$OpenBSD: biz22.c,v 1.3 1996/06/26 05:40:51 deraadt Exp $";
#endif /* not lint */
#include "tip.h"
diff --git a/usr.bin/tip/aculib/biz31.c b/usr.bin/tip/aculib/biz31.c
index a82c6282ee8..a3b0e4185e5 100644
--- a/usr.bin/tip/aculib/biz31.c
+++ b/usr.bin/tip/aculib/biz31.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: biz31.c,v 1.3 1996/06/26 05:40:51 deraadt Exp $ */
/* $NetBSD: biz31.c,v 1.4 1995/10/29 00:49:48 pk Exp $ */
/*
@@ -37,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)biz31.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$NetBSD: biz31.c,v 1.4 1995/10/29 00:49:48 pk Exp $";
+static char rcsid[] = "$OpenBSD: biz31.c,v 1.3 1996/06/26 05:40:51 deraadt Exp $";
#endif /* not lint */
#include "tip.h"
diff --git a/usr.bin/tip/aculib/courier.c b/usr.bin/tip/aculib/courier.c
index 57f14f149e8..1b3949c43ca 100644
--- a/usr.bin/tip/aculib/courier.c
+++ b/usr.bin/tip/aculib/courier.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: courier.c,v 1.3 1996/06/26 05:40:52 deraadt Exp $ */
/* $NetBSD: courier.c,v 1.5 1995/10/29 00:49:50 pk Exp $ */
/*
@@ -37,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)courier.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$NetBSD: courier.c,v 1.5 1995/10/29 00:49:50 pk Exp $";
+static char rcsid[] = "$OpenBSD: courier.c,v 1.3 1996/06/26 05:40:52 deraadt Exp $";
#endif /* not lint */
/*
diff --git a/usr.bin/tip/aculib/df.c b/usr.bin/tip/aculib/df.c
index f0581e63c7a..9050b6eb44a 100644
--- a/usr.bin/tip/aculib/df.c
+++ b/usr.bin/tip/aculib/df.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: df.c,v 1.3 1996/06/26 05:40:52 deraadt Exp $ */
/* $NetBSD: df.c,v 1.4 1995/10/29 00:49:51 pk Exp $ */
/*
@@ -37,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)df.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$NetBSD: df.c,v 1.4 1995/10/29 00:49:51 pk Exp $";
+static char rcsid[] = "$OpenBSD: df.c,v 1.3 1996/06/26 05:40:52 deraadt Exp $";
#endif /* not lint */
/*
diff --git a/usr.bin/tip/aculib/dn11.c b/usr.bin/tip/aculib/dn11.c
index 37d97618d64..4d5e590a81e 100644
--- a/usr.bin/tip/aculib/dn11.c
+++ b/usr.bin/tip/aculib/dn11.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: dn11.c,v 1.3 1996/06/26 05:40:53 deraadt Exp $ */
/* $NetBSD: dn11.c,v 1.4 1995/10/29 00:49:53 pk Exp $ */
/*
@@ -37,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)dn11.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$NetBSD: dn11.c,v 1.4 1995/10/29 00:49:53 pk Exp $";
+static char rcsid[] = "$OpenBSD: dn11.c,v 1.3 1996/06/26 05:40:53 deraadt Exp $";
#endif /* not lint */
/*
diff --git a/usr.bin/tip/aculib/hayes.c b/usr.bin/tip/aculib/hayes.c
index d8ff831e587..77a11e680f5 100644
--- a/usr.bin/tip/aculib/hayes.c
+++ b/usr.bin/tip/aculib/hayes.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: hayes.c,v 1.3 1996/06/26 05:40:53 deraadt Exp $ */
/* $NetBSD: hayes.c,v 1.4 1995/10/29 00:49:54 pk Exp $ */
/*
@@ -37,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)hayes.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$NetBSD: hayes.c,v 1.4 1995/10/29 00:49:54 pk Exp $";
+static char rcsid[] = "$OpenBSD: hayes.c,v 1.3 1996/06/26 05:40:53 deraadt Exp $";
#endif /* not lint */
/*
diff --git a/usr.bin/tip/aculib/t3000.c b/usr.bin/tip/aculib/t3000.c
index 94bbf9a6f0a..ae704882457 100644
--- a/usr.bin/tip/aculib/t3000.c
+++ b/usr.bin/tip/aculib/t3000.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: t3000.c,v 1.3 1996/06/26 05:40:54 deraadt Exp $ */
/* $NetBSD: t3000.c,v 1.3 1995/10/29 00:49:57 pk Exp $ */
/*
@@ -37,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)t3000.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$NetBSD: t3000.c,v 1.3 1995/10/29 00:49:57 pk Exp $";
+static char rcsid[] = "$OpenBSD: t3000.c,v 1.3 1996/06/26 05:40:54 deraadt Exp $";
#endif /* not lint */
/*
diff --git a/usr.bin/tip/aculib/v3451.c b/usr.bin/tip/aculib/v3451.c
index da7f23c405e..214d0d769ae 100644
--- a/usr.bin/tip/aculib/v3451.c
+++ b/usr.bin/tip/aculib/v3451.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: v3451.c,v 1.3 1996/06/26 05:40:55 deraadt Exp $ */
/* $NetBSD: v3451.c,v 1.4 1995/10/29 00:49:59 pk Exp $ */
/*
@@ -37,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)v3451.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$NetBSD: v3451.c,v 1.4 1995/10/29 00:49:59 pk Exp $";
+static char rcsid[] = "$OpenBSD: v3451.c,v 1.3 1996/06/26 05:40:55 deraadt Exp $";
#endif /* not lint */
/*
diff --git a/usr.bin/tip/aculib/v831.c b/usr.bin/tip/aculib/v831.c
index 42994e540a8..48cfbbb31a0 100644
--- a/usr.bin/tip/aculib/v831.c
+++ b/usr.bin/tip/aculib/v831.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: v831.c,v 1.3 1996/06/26 05:40:56 deraadt Exp $ */
/* $NetBSD: v831.c,v 1.4 1995/10/29 00:50:02 pk Exp $ */
/*
@@ -37,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)v831.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$NetBSD: v831.c,v 1.4 1995/10/29 00:50:02 pk Exp $";
+static char rcsid[] = "$OpenBSD: v831.c,v 1.3 1996/06/26 05:40:56 deraadt Exp $";
#endif /* not lint */
/*
diff --git a/usr.bin/tip/aculib/ventel.c b/usr.bin/tip/aculib/ventel.c
index 0ce43ed7aad..e46498006af 100644
--- a/usr.bin/tip/aculib/ventel.c
+++ b/usr.bin/tip/aculib/ventel.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: ventel.c,v 1.3 1996/06/26 05:40:57 deraadt Exp $ */
/* $NetBSD: ventel.c,v 1.4 1995/10/29 00:50:04 pk Exp $ */
/*
@@ -37,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)ventel.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$NetBSD: ventel.c,v 1.4 1995/10/29 00:50:04 pk Exp $";
+static char rcsid[] = "$OpenBSD: ventel.c,v 1.3 1996/06/26 05:40:57 deraadt Exp $";
#endif /* not lint */
/*
diff --git a/usr.bin/tip/acutab.c b/usr.bin/tip/acutab.c
index 774d5e72999..193b8cc70ca 100644
--- a/usr.bin/tip/acutab.c
+++ b/usr.bin/tip/acutab.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: acutab.c,v 1.2 1996/06/26 05:40:41 deraadt Exp $ */
/* $NetBSD: acutab.c,v 1.3 1994/12/08 09:30:41 jtc Exp $ */
/*
@@ -37,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)acutab.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$NetBSD: acutab.c,v 1.3 1994/12/08 09:30:41 jtc Exp $";
+static char rcsid[] = "$OpenBSD: acutab.c,v 1.2 1996/06/26 05:40:41 deraadt Exp $";
#endif /* not lint */
#include "tip.h"
diff --git a/usr.bin/tip/cmds.c b/usr.bin/tip/cmds.c
index 8d2409b0b9d..8d66a492909 100644
--- a/usr.bin/tip/cmds.c
+++ b/usr.bin/tip/cmds.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: cmds.c,v 1.3 1996/06/26 05:40:41 deraadt Exp $ */
/* $NetBSD: cmds.c,v 1.6 1995/10/29 00:49:38 pk Exp $ */
/*
@@ -37,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)cmds.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$NetBSD: cmds.c,v 1.6 1995/10/29 00:49:38 pk Exp $";
+static char rcsid[] = "$OpenBSD: cmds.c,v 1.3 1996/06/26 05:40:41 deraadt Exp $";
#endif /* not lint */
#include "tip.h"
diff --git a/usr.bin/tip/cmdtab.c b/usr.bin/tip/cmdtab.c
index 912cb6d87c2..cc2d5219087 100644
--- a/usr.bin/tip/cmdtab.c
+++ b/usr.bin/tip/cmdtab.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: cmdtab.c,v 1.2 1996/06/26 05:40:42 deraadt Exp $ */
/* $NetBSD: cmdtab.c,v 1.3 1994/12/08 09:30:46 jtc Exp $ */
/*
@@ -37,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)cmdtab.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$NetBSD: cmdtab.c,v 1.3 1994/12/08 09:30:46 jtc Exp $";
+static char rcsid[] = "$OpenBSD: cmdtab.c,v 1.2 1996/06/26 05:40:42 deraadt Exp $";
#endif /* not lint */
#include "tip.h"
diff --git a/usr.bin/tip/cu.c b/usr.bin/tip/cu.c
index de1162fa465..dc9d8a7ab5d 100644
--- a/usr.bin/tip/cu.c
+++ b/usr.bin/tip/cu.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: cu.c,v 1.2 1996/06/26 05:40:43 deraadt Exp $ */
/* $NetBSD: cu.c,v 1.3 1994/12/08 09:30:48 jtc Exp $ */
/*
@@ -37,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)cu.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$NetBSD: cu.c,v 1.3 1994/12/08 09:30:48 jtc Exp $";
+static char rcsid[] = "$OpenBSD: cu.c,v 1.2 1996/06/26 05:40:43 deraadt Exp $";
#endif /* not lint */
#include "tip.h"
diff --git a/usr.bin/tip/hunt.c b/usr.bin/tip/hunt.c
index b490a7f7de2..1d5952f6cdd 100644
--- a/usr.bin/tip/hunt.c
+++ b/usr.bin/tip/hunt.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: hunt.c,v 1.3 1996/06/26 05:40:43 deraadt Exp $ */
/* $NetBSD: hunt.c,v 1.5 1995/10/29 00:49:40 pk Exp $ */
/*
@@ -37,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)hunt.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$NetBSD: hunt.c,v 1.5 1995/10/29 00:49:40 pk Exp $";
+static char rcsid[] = "$OpenBSD: hunt.c,v 1.3 1996/06/26 05:40:43 deraadt Exp $";
#endif /* not lint */
#include "tip.h"
diff --git a/usr.bin/tip/log.c b/usr.bin/tip/log.c
index f3ac646aafe..57cd3c9a135 100644
--- a/usr.bin/tip/log.c
+++ b/usr.bin/tip/log.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: log.c,v 1.2 1996/06/26 05:40:44 deraadt Exp $ */
/* $NetBSD: log.c,v 1.4 1994/12/24 17:56:28 cgd Exp $ */
/*
@@ -37,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)log.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$NetBSD: log.c,v 1.4 1994/12/24 17:56:28 cgd Exp $";
+static char rcsid[] = "$OpenBSD: log.c,v 1.2 1996/06/26 05:40:44 deraadt Exp $";
#endif /* not lint */
#include "tip.h"
diff --git a/usr.bin/tip/partab.c b/usr.bin/tip/partab.c
index cbed13107dd..53419ea86f4 100644
--- a/usr.bin/tip/partab.c
+++ b/usr.bin/tip/partab.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: partab.c,v 1.2 1996/06/26 05:40:44 deraadt Exp $ */
/* $NetBSD: partab.c,v 1.3 1994/12/08 09:30:55 jtc Exp $ */
/*
@@ -37,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)partab.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$NetBSD: partab.c,v 1.3 1994/12/08 09:30:55 jtc Exp $";
+static char rcsid[] = "$OpenBSD: partab.c,v 1.2 1996/06/26 05:40:44 deraadt Exp $";
#endif /* not lint */
/*
diff --git a/usr.bin/tip/pathnames.h b/usr.bin/tip/pathnames.h
index 00b126d3694..cc7cbf4a7a2 100644
--- a/usr.bin/tip/pathnames.h
+++ b/usr.bin/tip/pathnames.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: pathnames.h,v 1.2 1996/06/26 05:40:45 deraadt Exp $ */
/* $NetBSD: pathnames.h,v 1.3 1994/12/08 09:30:59 jtc Exp $ */
/*
diff --git a/usr.bin/tip/remote.c b/usr.bin/tip/remote.c
index a8f62c1be30..883807e36fe 100644
--- a/usr.bin/tip/remote.c
+++ b/usr.bin/tip/remote.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: remote.c,v 1.2 1996/06/26 05:40:46 deraadt Exp $ */
/* $NetBSD: remote.c,v 1.3 1994/12/08 09:31:03 jtc Exp $ */
/*
@@ -44,7 +45,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)remote.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$NetBSD: remote.c,v 1.3 1994/12/08 09:31:03 jtc Exp $";
+static char rcsid[] = "$OpenBSD: remote.c,v 1.2 1996/06/26 05:40:46 deraadt Exp $";
#endif /* not lint */
#include <stdio.h>
diff --git a/usr.bin/tip/tip.1 b/usr.bin/tip/tip.1
index 6d550c07578..1583cfc6aab 100644
--- a/usr.bin/tip/tip.1
+++ b/usr.bin/tip/tip.1
@@ -1,3 +1,4 @@
+.\" $OpenBSD: tip.1,v 1.2 1996/06/26 05:40:46 deraadt Exp $
.\" $NetBSD: tip.1,v 1.7 1994/12/08 09:31:05 jtc Exp $
.\"
.\" Copyright (c) 1980, 1990, 1993
diff --git a/usr.bin/tip/tip.c b/usr.bin/tip/tip.c
index 860f2456765..f7084050a25 100644
--- a/usr.bin/tip/tip.c
+++ b/usr.bin/tip/tip.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: tip.c,v 1.3 1996/06/26 05:40:47 deraadt Exp $ */
/* $NetBSD: tip.c,v 1.8 1995/10/29 00:49:42 pk Exp $ */
/*
@@ -43,7 +44,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)tip.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$NetBSD: tip.c,v 1.8 1995/10/29 00:49:42 pk Exp $";
+static char rcsid[] = "$OpenBSD: tip.c,v 1.3 1996/06/26 05:40:47 deraadt Exp $";
#endif /* not lint */
/*
diff --git a/usr.bin/tip/tip.h b/usr.bin/tip/tip.h
index 7591ebf1877..85ee224f98f 100644
--- a/usr.bin/tip/tip.h
+++ b/usr.bin/tip/tip.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: tip.h,v 1.3 1996/06/26 05:40:47 deraadt Exp $ */
/* $NetBSD: tip.h,v 1.4 1995/10/29 00:49:43 pk Exp $ */
/*
diff --git a/usr.bin/tip/tipout.c b/usr.bin/tip/tipout.c
index 08571567020..c92c61ef585 100644
--- a/usr.bin/tip/tipout.c
+++ b/usr.bin/tip/tipout.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: tipout.c,v 1.3 1996/06/26 05:40:48 deraadt Exp $ */
/* $NetBSD: tipout.c,v 1.4 1995/10/29 00:49:45 pk Exp $ */
/*
@@ -37,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)tipout.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$NetBSD: tipout.c,v 1.4 1995/10/29 00:49:45 pk Exp $";
+static char rcsid[] = "$OpenBSD: tipout.c,v 1.3 1996/06/26 05:40:48 deraadt Exp $";
#endif /* not lint */
#include "tip.h"
diff --git a/usr.bin/tip/uucplock.c b/usr.bin/tip/uucplock.c
index cf653acce9f..07724655575 100644
--- a/usr.bin/tip/uucplock.c
+++ b/usr.bin/tip/uucplock.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: uucplock.c,v 1.2 1996/06/26 05:40:49 deraadt Exp $ */
/* $NetBSD: uucplock.c,v 1.6 1995/09/26 06:02:14 jtc Exp $ */
/*
@@ -37,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)uucplock.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$NetBSD: uucplock.c,v 1.6 1995/09/26 06:02:14 jtc Exp $";
+static char rcsid[] = "$OpenBSD: uucplock.c,v 1.2 1996/06/26 05:40:49 deraadt Exp $";
#endif /* not lint */
#include <stdio.h>
diff --git a/usr.bin/tip/value.c b/usr.bin/tip/value.c
index 76163740b19..20eef43a3a6 100644
--- a/usr.bin/tip/value.c
+++ b/usr.bin/tip/value.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: value.c,v 1.2 1996/06/26 05:40:49 deraadt Exp $ */
/* $NetBSD: value.c,v 1.3 1994/12/08 09:31:17 jtc Exp $ */
/*
@@ -37,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)value.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$NetBSD: value.c,v 1.3 1994/12/08 09:31:17 jtc Exp $";
+static char rcsid[] = "$OpenBSD: value.c,v 1.2 1996/06/26 05:40:49 deraadt Exp $";
#endif /* not lint */
#include "tip.h"
diff --git a/usr.bin/tip/vars.c b/usr.bin/tip/vars.c
index 9a708c1d88f..6131dd29f97 100644
--- a/usr.bin/tip/vars.c
+++ b/usr.bin/tip/vars.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: vars.c,v 1.2 1996/06/26 05:40:50 deraadt Exp $ */
/* $NetBSD: vars.c,v 1.3 1994/12/08 09:31:19 jtc Exp $ */
/*
@@ -37,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)vars.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$NetBSD: vars.c,v 1.3 1994/12/08 09:31:19 jtc Exp $";
+static char rcsid[] = "$OpenBSD: vars.c,v 1.2 1996/06/26 05:40:50 deraadt Exp $";
#endif /* not lint */
#include "tip.h"
diff --git a/usr.bin/tn3270/Makefile b/usr.bin/tn3270/Makefile
index c3724e4d255..5e1c44ddfb6 100644
--- a/usr.bin/tn3270/Makefile
+++ b/usr.bin/tn3270/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.2 1995/12/14 03:31:36 deraadt Exp $
+# $OpenBSD: Makefile,v 1.3 1996/06/26 05:40:58 deraadt Exp $
.if make(clean) || make(cleandir) || make(depend) || make(obj) || make(lint)
SUBDIR += tools
diff --git a/usr.bin/tn3270/Makefile.inc b/usr.bin/tn3270/Makefile.inc
index 2f1ff56b59b..b85a759f9a8 100644
--- a/usr.bin/tn3270/Makefile.inc
+++ b/usr.bin/tn3270/Makefile.inc
@@ -1,4 +1,4 @@
-# $Id: Makefile.inc,v 1.1 1995/10/18 08:46:18 deraadt Exp $
+# $OpenBSD: Makefile.inc,v 1.2 1996/06/26 05:40:59 deraadt Exp $
CFLAGS += -DTERMCAP -DSRCRT -DKLUDGELINEMODE -DUSE_TERMIO -DTN3270 -Dunix
KBD = unix.kbd
diff --git a/usr.bin/tn3270/api/api_bsd.c b/usr.bin/tn3270/api/api_bsd.c
index f5ab46b0f81..94434bf715e 100644
--- a/usr.bin/tn3270/api/api_bsd.c
+++ b/usr.bin/tn3270/api/api_bsd.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: api_bsd.c,v 1.2 1996/06/26 05:41:00 deraadt Exp $ */
+
/*-
* Copyright (c) 1988 The Regents of the University of California.
* All rights reserved.
@@ -33,7 +35,7 @@
#ifndef lint
/*static char sccsid[] = "from: @(#)api_bsd.c 4.2 (Berkeley) 4/26/91";*/
-static char rcsid[] = "$Id: api_bsd.c,v 1.1 1995/10/18 08:46:18 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: api_bsd.c,v 1.2 1996/06/26 05:41:00 deraadt Exp $";
#endif /* not lint */
#if defined(unix)
diff --git a/usr.bin/tn3270/api/api_exch.c b/usr.bin/tn3270/api/api_exch.c
index 2aa3ef065be..74bd8e21b1f 100644
--- a/usr.bin/tn3270/api/api_exch.c
+++ b/usr.bin/tn3270/api/api_exch.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: api_exch.c,v 1.2 1996/06/26 05:41:00 deraadt Exp $ */
+
/*-
* Copyright (c) 1988 The Regents of the University of California.
* All rights reserved.
@@ -33,7 +35,7 @@
#ifndef lint
/*static char sccsid[] = "from: @(#)api_exch.c 4.2 (Berkeley) 4/26/91";*/
-static char rcsid[] = "$Id: api_exch.c,v 1.1 1995/10/18 08:46:18 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: api_exch.c,v 1.2 1996/06/26 05:41:00 deraadt Exp $";
#endif /* not lint */
#include <stdio.h>
diff --git a/usr.bin/tn3270/api/api_exch.h b/usr.bin/tn3270/api/api_exch.h
index f29c09527f0..c2e6f27f0d6 100644
--- a/usr.bin/tn3270/api/api_exch.h
+++ b/usr.bin/tn3270/api/api_exch.h
@@ -1,3 +1,4 @@
+/* * $OpenBSD: api_exch.h,v 1.2 1996/06/26 05:41:01 deraadt Exp $*/
/*-
* Copyright (c) 1988 The Regents of the University of California.
* All rights reserved.
@@ -31,7 +32,6 @@
* SUCH DAMAGE.
*
* from: @(#)api_exch.h 4.2 (Berkeley) 4/26/91
- * $Id: api_exch.h,v 1.1 1995/10/18 08:46:19 deraadt Exp $
*/
/*
diff --git a/usr.bin/tn3270/api/apilib.c b/usr.bin/tn3270/api/apilib.c
index 7163b6eaee4..f8137eceaad 100644
--- a/usr.bin/tn3270/api/apilib.c
+++ b/usr.bin/tn3270/api/apilib.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: apilib.c,v 1.2 1996/06/26 05:41:02 deraadt Exp $ */
+
/*-
* Copyright (c) 1988 The Regents of the University of California.
* All rights reserved.
@@ -33,7 +35,7 @@
#ifndef lint
/*static char sccsid[] = "from: @(#)apilib.c 4.2 (Berkeley) 4/26/91";*/
-static char rcsid[] = "$Id: apilib.c,v 1.1 1995/10/18 08:46:19 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: apilib.c,v 1.2 1996/06/26 05:41:02 deraadt Exp $";
#endif /* not lint */
#include "../ctlr/api.h"
diff --git a/usr.bin/tn3270/api/apilib.h b/usr.bin/tn3270/api/apilib.h
index d90700f05be..a7e0d6d4f22 100644
--- a/usr.bin/tn3270/api/apilib.h
+++ b/usr.bin/tn3270/api/apilib.h
@@ -1,3 +1,4 @@
+/* * $OpenBSD: apilib.h,v 1.2 1996/06/26 05:41:02 deraadt Exp $*/
/*-
* Copyright (c) 1988 The Regents of the University of California.
* All rights reserved.
@@ -31,7 +32,6 @@
* SUCH DAMAGE.
*
* from: @(#)apilib.h 4.2 (Berkeley) 4/26/91
- * $Id: apilib.h,v 1.1 1995/10/18 08:46:19 deraadt Exp $
*/
/*
diff --git a/usr.bin/tn3270/api/asc_ebc.c b/usr.bin/tn3270/api/asc_ebc.c
index d69a10a5c00..3f4f4957c76 100644
--- a/usr.bin/tn3270/api/asc_ebc.c
+++ b/usr.bin/tn3270/api/asc_ebc.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: asc_ebc.c,v 1.2 1996/06/26 05:41:03 deraadt Exp $ */
+
/*-
* Copyright (c) 1988 The Regents of the University of California.
* All rights reserved.
@@ -33,7 +35,7 @@
#ifndef lint
/*static char sccsid[] = "from: @(#)asc_ebc.c 4.2 (Berkeley) 4/26/91";*/
-static char rcsid[] = "$Id: asc_ebc.c,v 1.1 1995/10/18 08:46:19 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: asc_ebc.c,v 1.2 1996/06/26 05:41:03 deraadt Exp $";
#endif /* not lint */
/*
diff --git a/usr.bin/tn3270/api/asc_ebc.h b/usr.bin/tn3270/api/asc_ebc.h
index fd44491cbf6..d66c1d48564 100644
--- a/usr.bin/tn3270/api/asc_ebc.h
+++ b/usr.bin/tn3270/api/asc_ebc.h
@@ -1,3 +1,4 @@
+/* * $OpenBSD: asc_ebc.h,v 1.2 1996/06/26 05:41:03 deraadt Exp $*/
/*-
* Copyright (c) 1988 The Regents of the University of California.
* All rights reserved.
@@ -31,7 +32,6 @@
* SUCH DAMAGE.
*
* from: @(#)asc_ebc.h 4.2 (Berkeley) 4/26/91
- * $Id: asc_ebc.h,v 1.1 1995/10/18 08:46:19 deraadt Exp $
*/
/*
diff --git a/usr.bin/tn3270/api/astosc.c b/usr.bin/tn3270/api/astosc.c
index 183738d81d6..6926971c225 100644
--- a/usr.bin/tn3270/api/astosc.c
+++ b/usr.bin/tn3270/api/astosc.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: astosc.c,v 1.2 1996/06/26 05:41:04 deraadt Exp $ */
+
/*-
* Copyright (c) 1988 The Regents of the University of California.
* All rights reserved.
@@ -33,7 +35,7 @@
#ifndef lint
/*static char sccsid[] = "from: @(#)astosc.c 4.2 (Berkeley) 4/26/91";*/
-static char rcsid[] = "$Id: astosc.c,v 1.1 1995/10/18 08:46:19 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: astosc.c,v 1.2 1996/06/26 05:41:04 deraadt Exp $";
#endif /* not lint */
#include <ctype.h>
diff --git a/usr.bin/tn3270/api/astosc.h b/usr.bin/tn3270/api/astosc.h
index ef680fca0cb..d055508b79f 100644
--- a/usr.bin/tn3270/api/astosc.h
+++ b/usr.bin/tn3270/api/astosc.h
@@ -1,3 +1,4 @@
+/* * $OpenBSD: astosc.h,v 1.2 1996/06/26 05:41:05 deraadt Exp $*/
/*-
* Copyright (c) 1988 The Regents of the University of California.
* All rights reserved.
@@ -31,7 +32,6 @@
* SUCH DAMAGE.
*
* from: @(#)astosc.h 4.2 (Berkeley) 4/26/91
- * $Id: astosc.h,v 1.1 1995/10/18 08:46:19 deraadt Exp $
*/
/*
diff --git a/usr.bin/tn3270/api/dctype.c b/usr.bin/tn3270/api/dctype.c
index 1ab7714a25f..e461b9c4c96 100644
--- a/usr.bin/tn3270/api/dctype.c
+++ b/usr.bin/tn3270/api/dctype.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: dctype.c,v 1.2 1996/06/26 05:41:05 deraadt Exp $ */
+
/*-
* Copyright (c) 1988 The Regents of the University of California.
* All rights reserved.
@@ -33,7 +35,7 @@
#ifndef lint
/*static char sccsid[] = "from: @(#)dctype.c 4.2 (Berkeley) 4/26/91";*/
-static char rcsid[] = "$Id: dctype.c,v 1.1 1995/10/18 08:46:19 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: dctype.c,v 1.2 1996/06/26 05:41:05 deraadt Exp $";
#endif /* not lint */
#include "dctype.h"
diff --git a/usr.bin/tn3270/api/dctype.h b/usr.bin/tn3270/api/dctype.h
index 52fc98d9cf4..3188e9c62ee 100644
--- a/usr.bin/tn3270/api/dctype.h
+++ b/usr.bin/tn3270/api/dctype.h
@@ -1,3 +1,4 @@
+/* * $OpenBSD: dctype.h,v 1.2 1996/06/26 05:41:06 deraadt Exp $*/
/*-
* Copyright (c) 1988 The Regents of the University of California.
* All rights reserved.
@@ -31,7 +32,6 @@
* SUCH DAMAGE.
*
* from: @(#)dctype.h 4.2 (Berkeley) 4/26/91
- * $Id: dctype.h,v 1.1 1995/10/18 08:46:19 deraadt Exp $
*/
#define INCLUDED_ECTYPE
diff --git a/usr.bin/tn3270/api/disp_asc.c b/usr.bin/tn3270/api/disp_asc.c
index b0ae2e50d04..fef6b944835 100644
--- a/usr.bin/tn3270/api/disp_asc.c
+++ b/usr.bin/tn3270/api/disp_asc.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: disp_asc.c,v 1.2 1996/06/26 05:41:06 deraadt Exp $ */
+
/*-
* Copyright (c) 1988 The Regents of the University of California.
* All rights reserved.
@@ -33,7 +35,7 @@
#ifndef lint
/*static char sccsid[] = "from: @(#)disp_asc.c 4.2 (Berkeley) 4/26/91";*/
-static char rcsid[] = "$Id: disp_asc.c,v 1.1 1995/10/18 08:46:19 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: disp_asc.c,v 1.2 1996/06/26 05:41:06 deraadt Exp $";
#endif /* not lint */
/*
diff --git a/usr.bin/tn3270/api/disp_asc.h b/usr.bin/tn3270/api/disp_asc.h
index 1f5963f03a4..9afb904db67 100644
--- a/usr.bin/tn3270/api/disp_asc.h
+++ b/usr.bin/tn3270/api/disp_asc.h
@@ -1,3 +1,4 @@
+/* * $OpenBSD: disp_asc.h,v 1.2 1996/06/26 05:41:07 deraadt Exp $*/
/*-
* Copyright (c) 1988 The Regents of the University of California.
* All rights reserved.
@@ -31,7 +32,6 @@
* SUCH DAMAGE.
*
* from: @(#)disp_asc.h 4.2 (Berkeley) 4/26/91
- * $Id: disp_asc.h,v 1.1 1995/10/18 08:46:19 deraadt Exp $
*/
/*
diff --git a/usr.bin/tn3270/api/ebc_disp.c b/usr.bin/tn3270/api/ebc_disp.c
index a23c79260b7..523eed6dce1 100644
--- a/usr.bin/tn3270/api/ebc_disp.c
+++ b/usr.bin/tn3270/api/ebc_disp.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: ebc_disp.c,v 1.2 1996/06/26 05:41:08 deraadt Exp $ */
+
/*-
* Copyright (c) 1988 The Regents of the University of California.
* All rights reserved.
@@ -33,7 +35,7 @@
#ifndef lint
/*static char sccsid[] = "from: @(#)ebc_disp.c 4.2 (Berkeley) 4/26/91";*/
-static char rcsid[] = "$Id: ebc_disp.c,v 1.1 1995/10/18 08:46:19 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: ebc_disp.c,v 1.2 1996/06/26 05:41:08 deraadt Exp $";
#endif /* not lint */
/*
diff --git a/usr.bin/tn3270/api/ebc_disp.h b/usr.bin/tn3270/api/ebc_disp.h
index 6a4ea2c8d3a..ccb3a8a354d 100644
--- a/usr.bin/tn3270/api/ebc_disp.h
+++ b/usr.bin/tn3270/api/ebc_disp.h
@@ -1,3 +1,4 @@
+/* * $OpenBSD: ebc_disp.h,v 1.2 1996/06/26 05:41:08 deraadt Exp $*/
/*-
* Copyright (c) 1988 The Regents of the University of California.
* All rights reserved.
@@ -31,7 +32,6 @@
* SUCH DAMAGE.
*
* from: @(#)ebc_disp.h 4.2 (Berkeley) 4/26/91
- * $Id: ebc_disp.h,v 1.1 1995/10/18 08:46:19 deraadt Exp $
*/
extern unsigned char
diff --git a/usr.bin/tn3270/ascii/default.map b/usr.bin/tn3270/ascii/default.map
index 94141ab65df..8e4a9b15265 100644
--- a/usr.bin/tn3270/ascii/default.map
+++ b/usr.bin/tn3270/ascii/default.map
@@ -1,3 +1,5 @@
+/* $OpenBSD: default.map,v 1.2 1996/06/26 05:41:09 deraadt Exp $ */
+
/*-
* Copyright (c) 1988 The Regents of the University of California.
* All rights reserved.
diff --git a/usr.bin/tn3270/ascii/map3270.c b/usr.bin/tn3270/ascii/map3270.c
index c6fbba17080..8c8d5a6541f 100644
--- a/usr.bin/tn3270/ascii/map3270.c
+++ b/usr.bin/tn3270/ascii/map3270.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: map3270.c,v 1.2 1996/06/26 05:41:10 deraadt Exp $ */
+
/*-
* Copyright (c) 1988 The Regents of the University of California.
* All rights reserved.
@@ -33,7 +35,7 @@
#ifndef lint
/*static char sccsid[] = "from: @(#)map3270.c 4.2 (Berkeley) 4/26/91";*/
-static char rcsid[] = "$Id: map3270.c,v 1.1 1995/10/18 08:46:20 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: map3270.c,v 1.2 1996/06/26 05:41:10 deraadt Exp $";
#endif /* not lint */
/* This program reads a description file, somewhat like /etc/termcap,
diff --git a/usr.bin/tn3270/ascii/map3270.h b/usr.bin/tn3270/ascii/map3270.h
index a33105d3832..07501bdf3b3 100644
--- a/usr.bin/tn3270/ascii/map3270.h
+++ b/usr.bin/tn3270/ascii/map3270.h
@@ -1,3 +1,4 @@
+/* * $OpenBSD: map3270.h,v 1.2 1996/06/26 05:41:10 deraadt Exp $*/
/*-
* Copyright (c) 1988 The Regents of the University of California.
* All rights reserved.
@@ -31,7 +32,6 @@
* SUCH DAMAGE.
*
* from: @(#)map3270.h 4.2 (Berkeley) 4/26/91
- * $Id: map3270.h,v 1.1 1995/10/18 08:46:20 deraadt Exp $
*/
/*
diff --git a/usr.bin/tn3270/ascii/mset.c b/usr.bin/tn3270/ascii/mset.c
index 41183cc633d..13ebfd5fd1d 100644
--- a/usr.bin/tn3270/ascii/mset.c
+++ b/usr.bin/tn3270/ascii/mset.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: mset.c,v 1.2 1996/06/26 05:41:11 deraadt Exp $ */
+
/*-
* Copyright (c) 1988 The Regents of the University of California.
* All rights reserved.
@@ -39,7 +41,7 @@ char copyright[] =
#ifndef lint
/*static char sccsid[] = "from: @(#)mset.c 4.2 (Berkeley) 4/26/91";*/
-static char rcsid[] = "$Id: mset.c,v 1.1 1995/10/18 08:46:20 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: mset.c,v 1.2 1996/06/26 05:41:11 deraadt Exp $";
#endif /* not lint */
/*
diff --git a/usr.bin/tn3270/ascii/state.h b/usr.bin/tn3270/ascii/state.h
index 84ba5658b5a..e1a22d2daba 100644
--- a/usr.bin/tn3270/ascii/state.h
+++ b/usr.bin/tn3270/ascii/state.h
@@ -1,3 +1,4 @@
+/* * $OpenBSD: state.h,v 1.2 1996/06/26 05:41:12 deraadt Exp $*/
/*-
* Copyright (c) 1988 The Regents of the University of California.
* All rights reserved.
@@ -31,7 +32,6 @@
* SUCH DAMAGE.
*
* from: @(#)state.h 4.2 (Berkeley) 4/26/91
- * $Id: state.h,v 1.1 1995/10/18 08:46:20 deraadt Exp $
*/
#define INCLUDED_STATE
diff --git a/usr.bin/tn3270/ascii/termin.c b/usr.bin/tn3270/ascii/termin.c
index 5f462074dfa..58649e6b0d7 100644
--- a/usr.bin/tn3270/ascii/termin.c
+++ b/usr.bin/tn3270/ascii/termin.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: termin.c,v 1.2 1996/06/26 05:41:12 deraadt Exp $ */
+
/*-
* Copyright (c) 1988 The Regents of the University of California.
* All rights reserved.
@@ -33,7 +35,7 @@
#ifndef lint
/*static char sccsid[] = "from: @(#)termin.c 4.2 (Berkeley) 4/26/91";*/
-static char rcsid[] = "$Id: termin.c,v 1.1 1995/10/18 08:46:20 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: termin.c,v 1.2 1996/06/26 05:41:12 deraadt Exp $";
#endif /* not lint */
/* this takes characters from the keyboard, and produces 3270 keystroke
diff --git a/usr.bin/tn3270/ctlr/3180.kbd b/usr.bin/tn3270/ctlr/3180.kbd
index a912e4453f5..996564efcbf 100644
--- a/usr.bin/tn3270/ctlr/3180.kbd
+++ b/usr.bin/tn3270/ctlr/3180.kbd
@@ -1,3 +1,5 @@
+/* $OpenBSD: 3180.kbd,v 1.2 1996/06/26 05:41:13 deraadt Exp $ */
+
/*-
* Copyright (c) 1988 The Regents of the University of California.
* All rights reserved.
diff --git a/usr.bin/tn3270/ctlr/3270pc.kbd b/usr.bin/tn3270/ctlr/3270pc.kbd
index 161010347fb..833976df2e0 100644
--- a/usr.bin/tn3270/ctlr/3270pc.kbd
+++ b/usr.bin/tn3270/ctlr/3270pc.kbd
@@ -1,3 +1,5 @@
+/* $OpenBSD: 3270pc.kbd,v 1.2 1996/06/26 05:41:14 deraadt Exp $ */
+
/*-
* Copyright (c) 1988 The Regents of the University of California.
* All rights reserved.
diff --git a/usr.bin/tn3270/ctlr/api.c b/usr.bin/tn3270/ctlr/api.c
index 5835532c2c3..3d38a6339c2 100644
--- a/usr.bin/tn3270/ctlr/api.c
+++ b/usr.bin/tn3270/ctlr/api.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: api.c,v 1.2 1996/06/26 05:41:15 deraadt Exp $ */
+
/*-
* Copyright (c) 1988 The Regents of the University of California.
* All rights reserved.
@@ -33,7 +35,7 @@
#ifndef lint
/*static char sccsid[] = "from: @(#)api.c 4.5 (Berkeley) 4/26/91";*/
-static char rcsid[] = "$Id: api.c,v 1.1 1995/10/18 08:46:20 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: api.c,v 1.2 1996/06/26 05:41:15 deraadt Exp $";
#endif /* not lint */
/*
diff --git a/usr.bin/tn3270/ctlr/api.h b/usr.bin/tn3270/ctlr/api.h
index 30fac649334..d03055f9ccf 100644
--- a/usr.bin/tn3270/ctlr/api.h
+++ b/usr.bin/tn3270/ctlr/api.h
@@ -1,3 +1,4 @@
+/* * $OpenBSD: api.h,v 1.2 1996/06/26 05:41:15 deraadt Exp $*/
/*-
* Copyright (c) 1988 The Regents of the University of California.
* All rights reserved.
@@ -31,7 +32,6 @@
* SUCH DAMAGE.
*
* from: @(#)api.h 4.4 (Berkeley) 4/26/91
- * $Id: api.h,v 1.1 1995/10/18 08:46:20 deraadt Exp $
*/
/*
diff --git a/usr.bin/tn3270/ctlr/declare.h b/usr.bin/tn3270/ctlr/declare.h
index 41320ef5743..a958640d1ae 100644
--- a/usr.bin/tn3270/ctlr/declare.h
+++ b/usr.bin/tn3270/ctlr/declare.h
@@ -1,3 +1,4 @@
+/* * $OpenBSD: declare.h,v 1.2 1996/06/26 05:41:16 deraadt Exp $*/
/*-
* Copyright (c) 1988 The Regents of the University of California.
* All rights reserved.
@@ -31,7 +32,6 @@
* SUCH DAMAGE.
*
* from: @(#)declare.h 4.2 (Berkeley) 4/26/91
- * $Id: declare.h,v 1.1 1995/10/18 08:46:20 deraadt Exp $
*/
/*
diff --git a/usr.bin/tn3270/ctlr/externs.h b/usr.bin/tn3270/ctlr/externs.h
index ef703e9c729..e03b12139e9 100644
--- a/usr.bin/tn3270/ctlr/externs.h
+++ b/usr.bin/tn3270/ctlr/externs.h
@@ -1,3 +1,4 @@
+/* * $OpenBSD: externs.h,v 1.2 1996/06/26 05:41:16 deraadt Exp $*/
/*-
* Copyright (c) 1988 The Regents of the University of California.
* All rights reserved.
@@ -31,7 +32,6 @@
* SUCH DAMAGE.
*
* from: @(#)externs.h 4.2 (Berkeley) 4/26/91
- * $Id: externs.h,v 1.1 1995/10/18 08:46:21 deraadt Exp $
*/
/*
diff --git a/usr.bin/tn3270/ctlr/function.c b/usr.bin/tn3270/ctlr/function.c
index 437d7becdc7..46808987703 100644
--- a/usr.bin/tn3270/ctlr/function.c
+++ b/usr.bin/tn3270/ctlr/function.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: function.c,v 1.2 1996/06/26 05:41:17 deraadt Exp $ */
+
/*-
* Copyright (c) 1988 The Regents of the University of California.
* All rights reserved.
@@ -33,7 +35,7 @@
#ifndef lint
/*static char sccsid[] = "from: @(#)function.c 4.2 (Berkeley) 4/26/91";*/
-static char rcsid[] = "$Id: function.c,v 1.1 1995/10/18 08:46:21 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: function.c,v 1.2 1996/06/26 05:41:17 deraadt Exp $";
#endif /* not lint */
/*
diff --git a/usr.bin/tn3270/ctlr/function.h b/usr.bin/tn3270/ctlr/function.h
index 8366d5d1d81..31ddc354474 100644
--- a/usr.bin/tn3270/ctlr/function.h
+++ b/usr.bin/tn3270/ctlr/function.h
@@ -1,3 +1,4 @@
+/* * $OpenBSD: function.h,v 1.2 1996/06/26 05:41:18 deraadt Exp $*/
/*-
* Copyright (c) 1988 The Regents of the University of California.
* All rights reserved.
@@ -31,7 +32,6 @@
* SUCH DAMAGE.
*
* from: @(#)function.h 4.2 (Berkeley) 4/26/91
- * $Id: function.h,v 1.1 1995/10/18 08:46:21 deraadt Exp $
*/
/*
diff --git a/usr.bin/tn3270/ctlr/hostctlr.h b/usr.bin/tn3270/ctlr/hostctlr.h
index 21358db89f4..ae91c86c8e5 100644
--- a/usr.bin/tn3270/ctlr/hostctlr.h
+++ b/usr.bin/tn3270/ctlr/hostctlr.h
@@ -1,3 +1,4 @@
+/* * $OpenBSD: hostctlr.h,v 1.2 1996/06/26 05:41:18 deraadt Exp $*/
/*-
* Copyright (c) 1988 The Regents of the University of California.
* All rights reserved.
@@ -31,7 +32,6 @@
* SUCH DAMAGE.
*
* from: @(#)hostctlr.h 4.2 (Berkeley) 4/26/91
- * $Id: hostctlr.h,v 1.1 1995/10/18 08:46:21 deraadt Exp $
*/
#define INCLUDED_HOST3270
diff --git a/usr.bin/tn3270/ctlr/inbound.c b/usr.bin/tn3270/ctlr/inbound.c
index babadac867b..18f64708b81 100644
--- a/usr.bin/tn3270/ctlr/inbound.c
+++ b/usr.bin/tn3270/ctlr/inbound.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: inbound.c,v 1.2 1996/06/26 05:41:19 deraadt Exp $ */
+
/*-
* Copyright (c) 1988 The Regents of the University of California.
* All rights reserved.
@@ -33,7 +35,7 @@
#ifndef lint
/*static char sccsid[] = "from: @(#)inbound.c 4.3 (Berkeley) 4/26/91";*/
-static char rcsid[] = "$Id: inbound.c,v 1.1 1995/10/18 08:46:21 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: inbound.c,v 1.2 1996/06/26 05:41:19 deraadt Exp $";
#endif /* not lint */
#include <stdio.h>
diff --git a/usr.bin/tn3270/ctlr/oia.c b/usr.bin/tn3270/ctlr/oia.c
index 7de14480fae..20128df8936 100644
--- a/usr.bin/tn3270/ctlr/oia.c
+++ b/usr.bin/tn3270/ctlr/oia.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: oia.c,v 1.2 1996/06/26 05:41:20 deraadt Exp $ */
+
/*-
* Copyright (c) 1988 The Regents of the University of California.
* All rights reserved.
@@ -33,7 +35,7 @@
#ifndef lint
/*static char sccsid[] = "from: @(#)oia.c 4.2 (Berkeley) 4/26/91";*/
-static char rcsid[] = "$Id: oia.c,v 1.1 1995/10/18 08:46:21 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: oia.c,v 1.2 1996/06/26 05:41:20 deraadt Exp $";
#endif /* not lint */
/*
diff --git a/usr.bin/tn3270/ctlr/oia.h b/usr.bin/tn3270/ctlr/oia.h
index 33c61128527..2086efee7c7 100644
--- a/usr.bin/tn3270/ctlr/oia.h
+++ b/usr.bin/tn3270/ctlr/oia.h
@@ -1,3 +1,4 @@
+/* * $OpenBSD: oia.h,v 1.2 1996/06/26 05:41:20 deraadt Exp $*/
/*-
* Copyright (c) 1988 The Regents of the University of California.
* All rights reserved.
@@ -31,7 +32,6 @@
* SUCH DAMAGE.
*
* from: @(#)oia.h 4.2 (Berkeley) 4/26/91
- * $Id: oia.h,v 1.1 1995/10/18 08:46:21 deraadt Exp $
*/
/*
diff --git a/usr.bin/tn3270/ctlr/options.c b/usr.bin/tn3270/ctlr/options.c
index 6c0f49243e6..4ac81245b34 100644
--- a/usr.bin/tn3270/ctlr/options.c
+++ b/usr.bin/tn3270/ctlr/options.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: options.c,v 1.2 1996/06/26 05:41:21 deraadt Exp $ */
+
/*-
* Copyright (c) 1988 The Regents of the University of California.
* All rights reserved.
@@ -33,7 +35,7 @@
#ifndef lint
/*static char sccsid[] = "from: @(#)options.c 4.2 (Berkeley) 4/26/91";*/
-static char rcsid[] = "$Id: options.c,v 1.1 1995/10/18 08:46:21 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: options.c,v 1.2 1996/06/26 05:41:21 deraadt Exp $";
#endif /* not lint */
/*
diff --git a/usr.bin/tn3270/ctlr/options.h b/usr.bin/tn3270/ctlr/options.h
index fe2fbfa1f7e..3985fe4a12a 100644
--- a/usr.bin/tn3270/ctlr/options.h
+++ b/usr.bin/tn3270/ctlr/options.h
@@ -1,3 +1,4 @@
+/* * $OpenBSD: options.h,v 1.2 1996/06/26 05:41:21 deraadt Exp $*/
/*-
* Copyright (c) 1988 The Regents of the University of California.
* All rights reserved.
@@ -31,7 +32,6 @@
* SUCH DAMAGE.
*
* from: @(#)options.h 4.2 (Berkeley) 4/26/91
- * $Id: options.h,v 1.1 1995/10/18 08:46:21 deraadt Exp $
*/
/*
diff --git a/usr.bin/tn3270/ctlr/outbound.c b/usr.bin/tn3270/ctlr/outbound.c
index eda42e2475c..d5ad75cf65a 100644
--- a/usr.bin/tn3270/ctlr/outbound.c
+++ b/usr.bin/tn3270/ctlr/outbound.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: outbound.c,v 1.2 1996/06/26 05:41:22 deraadt Exp $ */
+
/*-
* Copyright (c) 1988 The Regents of the University of California.
* All rights reserved.
@@ -33,7 +35,7 @@
#ifndef lint
/*static char sccsid[] = "from: @(#)outbound.c 4.3 (Berkeley) 4/26/91";*/
-static char rcsid[] = "$Id: outbound.c,v 1.1 1995/10/18 08:46:21 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: outbound.c,v 1.2 1996/06/26 05:41:22 deraadt Exp $";
#endif /* not lint */
#include <stdio.h>
diff --git a/usr.bin/tn3270/ctlr/screen.h b/usr.bin/tn3270/ctlr/screen.h
index f4a76154ea2..cce934dff46 100644
--- a/usr.bin/tn3270/ctlr/screen.h
+++ b/usr.bin/tn3270/ctlr/screen.h
@@ -1,3 +1,4 @@
+/* * $OpenBSD: screen.h,v 1.2 1996/06/26 05:41:23 deraadt Exp $*/
/*-
* Copyright (c) 1988 The Regents of the University of California.
* All rights reserved.
@@ -31,7 +32,6 @@
* SUCH DAMAGE.
*
* from: @(#)screen.h 4.3 (Berkeley) 4/26/91
- * $Id: screen.h,v 1.1 1995/10/18 08:46:21 deraadt Exp $
*/
#define INCLUDED_SCREEN
diff --git a/usr.bin/tn3270/ctlr/scrnctlr.h b/usr.bin/tn3270/ctlr/scrnctlr.h
index 8da484f7253..53f043627a6 100644
--- a/usr.bin/tn3270/ctlr/scrnctlr.h
+++ b/usr.bin/tn3270/ctlr/scrnctlr.h
@@ -1,3 +1,4 @@
+/* * $OpenBSD: scrnctlr.h,v 1.2 1996/06/26 05:41:23 deraadt Exp $*/
/*-
* Copyright (c) 1988 The Regents of the University of California.
* All rights reserved.
@@ -31,7 +32,6 @@
* SUCH DAMAGE.
*
* from: @(#)scrnctlr.h 4.2 (Berkeley) 4/26/91
- * $Id: scrnctlr.h,v 1.1 1995/10/18 08:46:21 deraadt Exp $
*/
/*
diff --git a/usr.bin/tn3270/ctlr/unix.kbd b/usr.bin/tn3270/ctlr/unix.kbd
index e0e30db06cc..903c909a667 100644
--- a/usr.bin/tn3270/ctlr/unix.kbd
+++ b/usr.bin/tn3270/ctlr/unix.kbd
@@ -1,3 +1,5 @@
+/* $OpenBSD: unix.kbd,v 1.2 1996/06/26 05:41:24 deraadt Exp $ */
+
/*-
* Copyright (c) 1988 The Regents of the University of California.
* All rights reserved.
diff --git a/usr.bin/tn3270/general/genbsubs.c b/usr.bin/tn3270/general/genbsubs.c
index a20c6cffcbf..3a5313bf588 100644
--- a/usr.bin/tn3270/general/genbsubs.c
+++ b/usr.bin/tn3270/general/genbsubs.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: genbsubs.c,v 1.2 1996/06/26 05:41:25 deraadt Exp $ */
+
/*-
* Copyright (c) 1988 The Regents of the University of California.
* All rights reserved.
@@ -33,7 +35,7 @@
#ifndef lint
/*static char sccsid[] = "from: @(#)genbsubs.c 4.2 (Berkeley) 4/26/91";*/
-static char rcsid[] = "$Id: genbsubs.c,v 1.1 1995/10/18 08:46:21 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: genbsubs.c,v 1.2 1996/06/26 05:41:25 deraadt Exp $";
#endif /* not lint */
/* The output of bunequal is the offset of the byte which didn't match;
diff --git a/usr.bin/tn3270/general/general.h b/usr.bin/tn3270/general/general.h
index cb2e365dc4e..0b92a5045e2 100644
--- a/usr.bin/tn3270/general/general.h
+++ b/usr.bin/tn3270/general/general.h
@@ -1,3 +1,4 @@
+/* * $OpenBSD: general.h,v 1.4 1996/06/26 05:41:25 deraadt Exp $*/
/*-
* Copyright (c) 1988 The Regents of the University of California.
* All rights reserved.
@@ -31,7 +32,6 @@
* SUCH DAMAGE.
*
* from: @(#)general.h 4.2 (Berkeley) 4/26/91
- * $Id: general.h,v 1.3 1996/02/23 15:15:28 niklas Exp $
*/
/*
diff --git a/usr.bin/tn3270/general/globals.c b/usr.bin/tn3270/general/globals.c
index 31434759222..a4625fc1e1b 100644
--- a/usr.bin/tn3270/general/globals.c
+++ b/usr.bin/tn3270/general/globals.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: globals.c,v 1.2 1996/06/26 05:41:26 deraadt Exp $ */
+
/*-
* Copyright (c) 1988 The Regents of the University of California.
* All rights reserved.
@@ -33,7 +35,7 @@
#ifndef lint
/*static char sccsid[] = "from: @(#)globals.c 4.2 (Berkeley) 4/26/91";*/
-static char rcsid[] = "$Id: globals.c,v 1.1 1995/10/18 08:46:22 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: globals.c,v 1.2 1996/06/26 05:41:26 deraadt Exp $";
#endif /* not lint */
/*
diff --git a/usr.bin/tn3270/general/globals.h b/usr.bin/tn3270/general/globals.h
index 81d393197ae..d3483b762fb 100644
--- a/usr.bin/tn3270/general/globals.h
+++ b/usr.bin/tn3270/general/globals.h
@@ -1,3 +1,4 @@
+/* * $OpenBSD: globals.h,v 1.2 1996/06/26 05:41:27 deraadt Exp $*/
/*-
* Copyright (c) 1988 The Regents of the University of California.
* All rights reserved.
@@ -31,7 +32,6 @@
* SUCH DAMAGE.
*
* from: @(#)globals.h 4.2 (Berkeley) 4/26/91
- * $Id: globals.h,v 1.1 1995/10/18 08:46:22 deraadt Exp $
*/
/*
diff --git a/usr.bin/tn3270/general/vaxbsubs.s b/usr.bin/tn3270/general/vaxbsubs.s
index ddbe516c4ca..fc3055a11b5 100644
--- a/usr.bin/tn3270/general/vaxbsubs.s
+++ b/usr.bin/tn3270/general/vaxbsubs.s
@@ -1,3 +1,4 @@
+/* * $OpenBSD: vaxbsubs.s,v 1.2 1996/06/26 05:41:27 deraadt Exp $*/
/*-
* Copyright (c) 1988 The Regents of the University of California.
* All rights reserved.
@@ -31,7 +32,6 @@
* SUCH DAMAGE.
*
* from: @(#)vaxbsubs.s 4.2 (Berkeley) 4/26/91
- * $Id: vaxbsubs.s,v 1.1 1995/10/18 08:46:22 deraadt Exp $
*/
/* This is taken from bcmp.s from 4.2.
diff --git a/usr.bin/tn3270/mset/Makefile b/usr.bin/tn3270/mset/Makefile
index 2fe1319d9e8..ee04c0d875a 100644
--- a/usr.bin/tn3270/mset/Makefile
+++ b/usr.bin/tn3270/mset/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.2 1995/12/14 03:31:38 deraadt Exp $
+# $OpenBSD: Makefile,v 1.3 1996/06/26 05:41:28 deraadt Exp $
.include "../../Makefile.inc"
diff --git a/usr.bin/tn3270/mset/map3270.5 b/usr.bin/tn3270/mset/map3270.5
index ec20d338d3c..4bf844795a0 100644
--- a/usr.bin/tn3270/mset/map3270.5
+++ b/usr.bin/tn3270/mset/map3270.5
@@ -1,3 +1,4 @@
+.\" $OpenBSD: map3270.5,v 1.2 1996/06/26 05:41:29 deraadt Exp $
.\" Copyright (c) 1986 The Regents of the University of California.
.\" All rights reserved.
.\"
@@ -30,7 +31,6 @@
.\" SUCH DAMAGE.
.\"
.\" from: @(#)map3270.5 4.5 (Berkeley) 7/31/91
-.\" $Id: map3270.5,v 1.1 1995/10/18 08:46:22 deraadt Exp $
.\"
.TH MAP3270 5 "July 31, 1991"
.UC 6
diff --git a/usr.bin/tn3270/mset/mset.1 b/usr.bin/tn3270/mset/mset.1
index aac00dc61a8..a3ace88aae5 100644
--- a/usr.bin/tn3270/mset/mset.1
+++ b/usr.bin/tn3270/mset/mset.1
@@ -1,3 +1,4 @@
+.\" $OpenBSD: mset.1,v 1.3 1996/06/26 05:41:30 deraadt Exp $
.\" Copyright (c) 1986, 1990 The Regents of the University of California.
.\" All rights reserved.
.\"
@@ -30,7 +31,6 @@
.\" SUCH DAMAGE.
.\"
.\" from: @(#)mset.1 4.6 (Berkeley) 7/27/91
-.\" $Id: mset.1,v 1.2 1995/12/08 19:48:21 deraadt Exp $
.\"
.Dd July 27, 1991
.Dt MSET 1
diff --git a/usr.bin/tn3270/sys_curses/system.c b/usr.bin/tn3270/sys_curses/system.c
index 4f4ec47602c..c935e2eb817 100644
--- a/usr.bin/tn3270/sys_curses/system.c
+++ b/usr.bin/tn3270/sys_curses/system.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: system.c,v 1.2 1996/06/26 05:41:31 deraadt Exp $ */
+
/*-
* Copyright (c) 1988 The Regents of the University of California.
* All rights reserved.
@@ -33,7 +35,7 @@
#ifndef lint
/*static char sccsid[] = "from: @(#)system.c 4.5 (Berkeley) 4/26/91";*/
-static char rcsid[] = "$Id: system.c,v 1.1 1995/10/18 08:46:22 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: system.c,v 1.2 1996/06/26 05:41:31 deraadt Exp $";
#endif /* not lint */
#include <sys/types.h>
diff --git a/usr.bin/tn3270/sys_curses/telextrn.h b/usr.bin/tn3270/sys_curses/telextrn.h
index 146c4e9fac1..e0ccda4c6d0 100644
--- a/usr.bin/tn3270/sys_curses/telextrn.h
+++ b/usr.bin/tn3270/sys_curses/telextrn.h
@@ -1,3 +1,4 @@
+/* * $OpenBSD: telextrn.h,v 1.2 1996/06/26 05:41:31 deraadt Exp $*/
/*-
* Copyright (c) 1988 The Regents of the University of California.
* All rights reserved.
@@ -31,7 +32,6 @@
* SUCH DAMAGE.
*
* from: @(#)telextrn.h 4.2 (Berkeley) 4/26/91
- * $Id: telextrn.h,v 1.1 1995/10/18 08:46:22 deraadt Exp $
*/
/*
diff --git a/usr.bin/tn3270/sys_curses/terminal.h b/usr.bin/tn3270/sys_curses/terminal.h
index 4a9f12166b7..6b8c967d8a9 100644
--- a/usr.bin/tn3270/sys_curses/terminal.h
+++ b/usr.bin/tn3270/sys_curses/terminal.h
@@ -1,3 +1,4 @@
+/* * $OpenBSD: terminal.h,v 1.2 1996/06/26 05:41:32 deraadt Exp $*/
/*-
* Copyright (c) 1988 The Regents of the University of California.
* All rights reserved.
@@ -31,7 +32,6 @@
* SUCH DAMAGE.
*
* from: @(#)terminal.h 4.3 (Berkeley) 4/26/91
- * $Id: terminal.h,v 1.1 1995/10/18 08:46:22 deraadt Exp $
*/
#define INCLUDED_TERMINAL
diff --git a/usr.bin/tn3270/sys_curses/termout.c b/usr.bin/tn3270/sys_curses/termout.c
index d603708e2c1..680b9ef6d7c 100644
--- a/usr.bin/tn3270/sys_curses/termout.c
+++ b/usr.bin/tn3270/sys_curses/termout.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: termout.c,v 1.5 1996/06/26 05:41:32 deraadt Exp $ */
+
/*-
* Copyright (c) 1988 The Regents of the University of California.
* All rights reserved.
@@ -33,7 +35,7 @@
#ifndef lint
/*static char sccsid[] = "from: @(#)termout.c 4.3 (Berkeley) 4/26/91";*/
-static char rcsid[] = "$Id: termout.c,v 1.4 1996/06/02 20:10:59 tholo Exp $";
+static char rcsid[] = "$OpenBSD: termout.c,v 1.5 1996/06/26 05:41:32 deraadt Exp $";
#endif /* not lint */
#if defined(unix)
diff --git a/usr.bin/tn3270/tn3270/Makefile b/usr.bin/tn3270/tn3270/Makefile
index 19dc61ff65b..feb640a52d4 100644
--- a/usr.bin/tn3270/tn3270/Makefile
+++ b/usr.bin/tn3270/tn3270/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.6 1996/06/02 20:22:33 tholo Exp $
+# $OpenBSD: Makefile,v 1.7 1996/06/26 05:41:33 deraadt Exp $
.include "../../Makefile.inc"
diff --git a/usr.bin/tn3270/tn3270/tn3270.1 b/usr.bin/tn3270/tn3270/tn3270.1
index 05c8c09928e..a245f0fa21a 100644
--- a/usr.bin/tn3270/tn3270/tn3270.1
+++ b/usr.bin/tn3270/tn3270/tn3270.1
@@ -1,3 +1,4 @@
+.\" $OpenBSD: tn3270.1,v 1.2 1996/06/26 05:41:34 deraadt Exp $
.\" Copyright (c) 1986, 1990 The Regents of the University of California.
.\" All rights reserved.
.\"
@@ -30,7 +31,6 @@
.\" SUCH DAMAGE.
.\"
.\" from: @(#)tn3270.1 4.6 (Berkeley) 7/27/91
-.\" $Id: tn3270.1,v 1.1 1995/10/18 08:46:23 deraadt Exp $
.\"
.Dd July 27, 1991
.Dt TN3270 1
diff --git a/usr.bin/tn3270/tools/mkastods/mkastods.c b/usr.bin/tn3270/tools/mkastods/mkastods.c
index a78f2fb3d58..998838bbab2 100644
--- a/usr.bin/tn3270/tools/mkastods/mkastods.c
+++ b/usr.bin/tn3270/tools/mkastods/mkastods.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: mkastods.c,v 1.2 1996/06/26 05:41:36 deraadt Exp $ */
+
/*-
* Copyright (c) 1988 The Regents of the University of California.
* All rights reserved.
@@ -39,7 +41,7 @@ char copyright[] =
#ifndef lint
/*static char sccsid[] = "from: @(#)mkastods.c 4.2 (Berkeley) 4/26/91";*/
-static char rcsid[] = "$Id: mkastods.c,v 1.1 1995/10/18 08:46:23 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: mkastods.c,v 1.2 1996/06/26 05:41:36 deraadt Exp $";
#endif /* not lint */
#include <stdio.h>
diff --git a/usr.bin/tn3270/tools/mkastosc/mkastosc.c b/usr.bin/tn3270/tools/mkastosc/mkastosc.c
index 3ce731af819..f457c3dbe81 100644
--- a/usr.bin/tn3270/tools/mkastosc/mkastosc.c
+++ b/usr.bin/tn3270/tools/mkastosc/mkastosc.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: mkastosc.c,v 1.2 1996/06/26 05:41:37 deraadt Exp $ */
+
/*-
* Copyright (c) 1988 The Regents of the University of California.
* All rights reserved.
@@ -39,7 +41,7 @@ char copyright[] =
#ifndef lint
/*static char sccsid[] = "from: @(#)mkastosc.c 4.2 (Berkeley) 4/26/91";*/
-static char rcsid[] = "$Id: mkastosc.c,v 1.1 1995/10/18 08:46:24 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: mkastosc.c,v 1.2 1996/06/26 05:41:37 deraadt Exp $";
#endif /* not lint */
#include <stdio.h>
diff --git a/usr.bin/tn3270/tools/mkdctype/ectype.c b/usr.bin/tn3270/tools/mkdctype/ectype.c
index f301131bfc8..86aa5abcaec 100644
--- a/usr.bin/tn3270/tools/mkdctype/ectype.c
+++ b/usr.bin/tn3270/tools/mkdctype/ectype.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: ectype.c,v 1.2 1996/06/26 05:41:38 deraadt Exp $ */
+
/*-
* Copyright (c) 1988 The Regents of the University of California.
* All rights reserved.
@@ -33,7 +35,7 @@
#ifndef lint
/*static char sccsid[] = "from: @(#)ectype.c 4.2 (Berkeley) 4/26/91";*/
-static char rcsid[] = "$Id: ectype.c,v 1.1 1995/10/18 08:46:24 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: ectype.c,v 1.2 1996/06/26 05:41:38 deraadt Exp $";
#endif /* not lint */
#include "ectype.h"
diff --git a/usr.bin/tn3270/tools/mkdctype/ectype.h b/usr.bin/tn3270/tools/mkdctype/ectype.h
index 21f61101f32..f3a2292029b 100644
--- a/usr.bin/tn3270/tools/mkdctype/ectype.h
+++ b/usr.bin/tn3270/tools/mkdctype/ectype.h
@@ -1,3 +1,4 @@
+/* * $OpenBSD: ectype.h,v 1.2 1996/06/26 05:41:39 deraadt Exp $*/
/*-
* Copyright (c) 1988 The Regents of the University of California.
* All rights reserved.
@@ -31,7 +32,6 @@
* SUCH DAMAGE.
*
* from: @(#)ectype.h 4.2 (Berkeley) 4/26/91
- * $Id: ectype.h,v 1.1 1995/10/18 08:46:24 deraadt Exp $
*/
#define INCLUDED_ECTYPE
diff --git a/usr.bin/tn3270/tools/mkdctype/mkdctype.c b/usr.bin/tn3270/tools/mkdctype/mkdctype.c
index d3078c35142..0054e917b38 100644
--- a/usr.bin/tn3270/tools/mkdctype/mkdctype.c
+++ b/usr.bin/tn3270/tools/mkdctype/mkdctype.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: mkdctype.c,v 1.2 1996/06/26 05:41:39 deraadt Exp $ */
+
/*-
* Copyright (c) 1988 The Regents of the University of California.
* All rights reserved.
@@ -39,7 +41,7 @@ char copyright[] =
#ifndef lint
/*static char sccsid[] = "from: @(#)mkdctype.c 4.2 (Berkeley) 4/26/91";*/
-static char rcsid[] = "$Id: mkdctype.c,v 1.1 1995/10/18 08:46:24 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: mkdctype.c,v 1.2 1996/06/26 05:41:39 deraadt Exp $";
#endif /* not lint */
#include "../api/ebc_disp.h"
diff --git a/usr.bin/tn3270/tools/mkdstoas/mkdstoas.c b/usr.bin/tn3270/tools/mkdstoas/mkdstoas.c
index e5cff62090a..d049c1f576d 100644
--- a/usr.bin/tn3270/tools/mkdstoas/mkdstoas.c
+++ b/usr.bin/tn3270/tools/mkdstoas/mkdstoas.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: mkdstoas.c,v 1.2 1996/06/26 05:41:40 deraadt Exp $ */
+
/*-
* Copyright (c) 1988 The Regents of the University of California.
* All rights reserved.
@@ -39,7 +41,7 @@ char copyright[] =
#ifndef lint
/*static char sccsid[] = "from: @(#)mkdstoas.c 4.2 (Berkeley) 4/26/91";*/
-static char rcsid[] = "$Id: mkdstoas.c,v 1.1 1995/10/18 08:46:24 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: mkdstoas.c,v 1.2 1996/06/26 05:41:40 deraadt Exp $";
#endif /* not lint */
#include <stdio.h>
diff --git a/usr.bin/tn3270/tools/mkhits/dohits.c b/usr.bin/tn3270/tools/mkhits/dohits.c
index df18f019f70..cf34bac4d21 100644
--- a/usr.bin/tn3270/tools/mkhits/dohits.c
+++ b/usr.bin/tn3270/tools/mkhits/dohits.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: dohits.c,v 1.2 1996/06/26 05:41:41 deraadt Exp $ */
+
/*-
* Copyright (c) 1988 The Regents of the University of California.
* All rights reserved.
@@ -33,7 +35,7 @@
#ifndef lint
/*static char sccsid[] = "from: @(#)dohits.c 4.2 (Berkeley) 4/26/91";*/
-static char rcsid[] = "$Id: dohits.c,v 1.1 1995/10/18 08:46:25 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: dohits.c,v 1.2 1996/06/26 05:41:41 deraadt Exp $";
#endif /* not lint */
/*
diff --git a/usr.bin/tn3270/tools/mkhits/dohits.h b/usr.bin/tn3270/tools/mkhits/dohits.h
index 4b9c5c54b2f..3ef0f1973df 100644
--- a/usr.bin/tn3270/tools/mkhits/dohits.h
+++ b/usr.bin/tn3270/tools/mkhits/dohits.h
@@ -1,3 +1,4 @@
+/* * $OpenBSD: dohits.h,v 1.2 1996/06/26 05:41:42 deraadt Exp $*/
/*-
* Copyright (c) 1988 The Regents of the University of California.
* All rights reserved.
@@ -31,7 +32,6 @@
* SUCH DAMAGE.
*
* from: @(#)dohits.h 4.2 (Berkeley) 4/26/91
- * $Id: dohits.h,v 1.1 1995/10/18 08:46:25 deraadt Exp $
*/
#define numberof(x) (sizeof x/sizeof x[0])
diff --git a/usr.bin/tn3270/tools/mkhits/mkhits.c b/usr.bin/tn3270/tools/mkhits/mkhits.c
index d0363f2f913..c5bff29d793 100644
--- a/usr.bin/tn3270/tools/mkhits/mkhits.c
+++ b/usr.bin/tn3270/tools/mkhits/mkhits.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: mkhits.c,v 1.2 1996/06/26 05:41:42 deraadt Exp $ */
+
/*-
* Copyright (c) 1988 The Regents of the University of California.
* All rights reserved.
@@ -39,7 +41,7 @@ char copyright[] =
#ifndef lint
/*static char sccsid[] = "from: @(#)mkhits.c 4.2 (Berkeley) 4/26/91";*/
-static char rcsid[] = "$Id: mkhits.c,v 1.1 1995/10/18 08:46:25 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: mkhits.c,v 1.2 1996/06/26 05:41:42 deraadt Exp $";
#endif /* not lint */
/*
diff --git a/usr.bin/tn3270/tools/prt3270.c b/usr.bin/tn3270/tools/prt3270.c
index 759767d39e7..94caead8164 100644
--- a/usr.bin/tn3270/tools/prt3270.c
+++ b/usr.bin/tn3270/tools/prt3270.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: prt3270.c,v 1.2 1996/06/26 05:41:35 deraadt Exp $ */
+
/*-
* Copyright (c) 1988 The Regents of the University of California.
* All rights reserved.
@@ -39,7 +41,7 @@ char copyright[] =
#ifndef lint
/*static char sccsid[] = "from: @(#)prt3270.c 4.2 (Berkeley) 4/26/91";*/
-static char rcsid[] = "$Id: prt3270.c,v 1.1 1995/10/18 08:46:23 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: prt3270.c,v 1.2 1996/06/26 05:41:35 deraadt Exp $";
#endif /* not lint */
#if defined(unix)
diff --git a/usr.bin/touch/Makefile b/usr.bin/touch/Makefile
index 29eb115f800..97f40783165 100644
--- a/usr.bin/touch/Makefile
+++ b/usr.bin/touch/Makefile
@@ -1,5 +1,5 @@
+# $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 $
-# @(#)Makefile 8.1 (Berkeley) 6/6/93
PROG= touch
diff --git a/usr.bin/touch/touch.1 b/usr.bin/touch/touch.1
index e52a5f36527..17bac8f70ca 100644
--- a/usr.bin/touch/touch.1
+++ b/usr.bin/touch/touch.1
@@ -1,3 +1,4 @@
+.\" $OpenBSD: touch.1,v 1.2 1996/06/26 05:41:44 deraadt Exp $
.\" $NetBSD: touch.1,v 1.8 1995/08/31 22:10:05 jtc Exp $
.\"
.\" Copyright (c) 1991, 1993
diff --git a/usr.bin/touch/touch.c b/usr.bin/touch/touch.c
index 9465bc0925a..87a7c14fd9f 100644
--- a/usr.bin/touch/touch.c
+++ b/usr.bin/touch/touch.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: touch.c,v 1.2 1996/06/26 05:41:45 deraadt Exp $ */
/* $NetBSD: touch.c,v 1.11 1995/08/31 22:10:06 jtc Exp $ */
/*
@@ -43,7 +44,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)touch.c 8.2 (Berkeley) 4/28/95";
#endif
-static char rcsid[] = "$NetBSD: touch.c,v 1.11 1995/08/31 22:10:06 jtc Exp $";
+static char rcsid[] = "$OpenBSD: touch.c,v 1.2 1996/06/26 05:41:45 deraadt Exp $";
#endif /* not lint */
#include <sys/types.h>
diff --git a/usr.bin/tput/Makefile b/usr.bin/tput/Makefile
index 3e679fff80d..a13f97feee4 100644
--- a/usr.bin/tput/Makefile
+++ b/usr.bin/tput/Makefile
@@ -1,5 +1,5 @@
+# $OpenBSD: Makefile,v 1.2 1996/06/26 05:41:46 deraadt Exp $
# $NetBSD: Makefile,v 1.3 1994/12/07 08:49:07 jtc Exp $
-# @(#)Makefile 8.1 (Berkeley) 6/6/93
PROG= tput
DPADD= ${LIBTERMCAP}
diff --git a/usr.bin/tput/clear.sh b/usr.bin/tput/clear.sh
index 5fffaf06730..dec606400d9 100644
--- a/usr.bin/tput/clear.sh
+++ b/usr.bin/tput/clear.sh
@@ -1,4 +1,5 @@
#!/bin/sh -
+# $OpenBSD: clear.sh,v 1.2 1996/06/26 05:41:46 deraadt Exp $
# $NetBSD: clear.sh,v 1.2 1994/12/07 08:49:09 jtc Exp $
#
# Copyright (c) 1989, 1993
diff --git a/usr.bin/tput/tput.1 b/usr.bin/tput/tput.1
index 08ba4b78bc8..87db594eb0c 100644
--- a/usr.bin/tput/tput.1
+++ b/usr.bin/tput/tput.1
@@ -1,3 +1,4 @@
+.\" $OpenBSD: tput.1,v 1.2 1996/06/26 05:41:47 deraadt Exp $
.\" $NetBSD: tput.1,v 1.4 1994/12/07 08:49:10 jtc Exp $
.\"
.\" Copyright (c) 1989, 1990, 1993
diff --git a/usr.bin/tput/tput.c b/usr.bin/tput/tput.c
index d8b3280a640..63f13549337 100644
--- a/usr.bin/tput/tput.c
+++ b/usr.bin/tput/tput.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: tput.c,v 1.2 1996/06/26 05:41:47 deraadt Exp $ */
/* $NetBSD: tput.c,v 1.8 1995/08/31 22:11:37 jtc Exp $ */
/*-
@@ -43,7 +44,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)tput.c 8.3 (Berkeley) 4/28/95";
#endif
-static char rcsid[] = "$NetBSD: tput.c,v 1.8 1995/08/31 22:11:37 jtc Exp $";
+static char rcsid[] = "$OpenBSD: tput.c,v 1.2 1996/06/26 05:41:47 deraadt Exp $";
#endif /* not lint */
#include <termios.h>
diff --git a/usr.bin/tr/Makefile b/usr.bin/tr/Makefile
index cff62318fe2..b534698f099 100644
--- a/usr.bin/tr/Makefile
+++ b/usr.bin/tr/Makefile
@@ -1,5 +1,5 @@
+# $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 $
-# @(#)Makefile 8.1 (Berkeley) 6/6/93
PROG= tr
SRCS= str.c tr.c
diff --git a/usr.bin/tr/extern.h b/usr.bin/tr/extern.h
index df0fe4bc686..a4768226b53 100644
--- a/usr.bin/tr/extern.h
+++ b/usr.bin/tr/extern.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: extern.h,v 1.3 1996/06/26 05:41:49 deraadt Exp $ */
/* $NetBSD: extern.h,v 1.4 1995/11/01 00:45:22 pk Exp $ */
/*-
diff --git a/usr.bin/tr/str.c b/usr.bin/tr/str.c
index bec54a12864..89da12674bb 100644
--- a/usr.bin/tr/str.c
+++ b/usr.bin/tr/str.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: str.c,v 1.2 1996/06/26 05:41:49 deraadt Exp $ */
/* $NetBSD: str.c,v 1.7 1995/08/31 22:13:47 jtc Exp $ */
/*-
@@ -37,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)str.c 8.2 (Berkeley) 4/28/95";
#endif
-static char rcsid[] = "$NetBSD: str.c,v 1.7 1995/08/31 22:13:47 jtc Exp $";
+static char rcsid[] = "$OpenBSD: str.c,v 1.2 1996/06/26 05:41:49 deraadt Exp $";
#endif /* not lint */
#include <sys/cdefs.h>
diff --git a/usr.bin/tr/tr.1 b/usr.bin/tr/tr.1
index 42a131ff34d..8d24519b2f9 100644
--- a/usr.bin/tr/tr.1
+++ b/usr.bin/tr/tr.1
@@ -1,3 +1,4 @@
+.\" $OpenBSD: tr.1,v 1.2 1996/06/26 05:41:50 deraadt Exp $
.\" $NetBSD: tr.1,v 1.5 1994/12/07 08:35:13 jtc Exp $
.\"
.\" Copyright (c) 1991, 1993
diff --git a/usr.bin/tr/tr.c b/usr.bin/tr/tr.c
index 1eb114651cb..74af9024d05 100644
--- a/usr.bin/tr/tr.c
+++ b/usr.bin/tr/tr.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: tr.c,v 1.2 1996/06/26 05:41:51 deraadt Exp $ */
/* $NetBSD: tr.c,v 1.5 1995/08/31 22:13:48 jtc Exp $ */
/*
@@ -43,7 +44,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)tr.c 8.2 (Berkeley) 5/4/95";
#endif
-static char rcsid[] = "$NetBSD: tr.c,v 1.5 1995/08/31 22:13:48 jtc Exp $";
+static char rcsid[] = "$OpenBSD: tr.c,v 1.2 1996/06/26 05:41:51 deraadt Exp $";
#endif /* not lint */
#include <sys/types.h>
diff --git a/usr.bin/true/Makefile b/usr.bin/true/Makefile
index 56dc51076ae..cc876f880f4 100644
--- a/usr.bin/true/Makefile
+++ b/usr.bin/true/Makefile
@@ -1,5 +1,4 @@
-# from: @(#)Makefile 5.3 (Berkeley) 5/11/90
-# $Id: Makefile,v 1.1 1995/10/18 08:46:26 deraadt Exp $
+# $OpenBSD: Makefile,v 1.2 1996/06/26 05:41:52 deraadt Exp $
MAN= true.1
diff --git a/usr.bin/true/true.1 b/usr.bin/true/true.1
index 52ab7dc7a74..98993663ecf 100644
--- a/usr.bin/true/true.1
+++ b/usr.bin/true/true.1
@@ -1,3 +1,4 @@
+.\" $OpenBSD: true.1,v 1.2 1996/06/26 05:41:52 deraadt Exp $
.\" Copyright (c) 1983, 1985, 1990 The Regents of the University of California.
.\" All rights reserved.
.\"
@@ -33,7 +34,6 @@
.\" SUCH DAMAGE.
.\"
.\" from: @(#)true.1 6.4 (Berkeley) 6/27/91
-.\" $Id: true.1,v 1.1 1995/10/18 08:46:26 deraadt Exp $
.\"
.Dd June 27, 1991
.Dt TRUE 1
diff --git a/usr.bin/true/true.sh b/usr.bin/true/true.sh
index 20f87efe15d..ad0c82ca4a0 100644
--- a/usr.bin/true/true.sh
+++ b/usr.bin/true/true.sh
@@ -1,2 +1,4 @@
#! /bin/sh
+# $OpenBSD: true.sh,v 1.2 1996/06/26 05:41:53 deraadt Exp $
+
exit 0
diff --git a/usr.bin/tset/Makefile b/usr.bin/tset/Makefile
index b341156fa65..8b748e09836 100644
--- a/usr.bin/tset/Makefile
+++ b/usr.bin/tset/Makefile
@@ -1,5 +1,5 @@
+# $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 $
-# @(#)Makefile 8.1 (Berkeley) 6/9/93
PROG= tset
SRCS= map.c misc.c set.c term.c tset.c wrterm.c
diff --git a/usr.bin/tset/extern.h b/usr.bin/tset/extern.h
index 80c68f72c1d..d7517411753 100644
--- a/usr.bin/tset/extern.h
+++ b/usr.bin/tset/extern.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: extern.h,v 1.2 1996/06/26 05:41:54 deraadt Exp $ */
/* $NetBSD: extern.h,v 1.3 1994/12/07 05:08:06 jtc Exp $ */
/*-
diff --git a/usr.bin/tset/map.c b/usr.bin/tset/map.c
index 78de7e77b1c..6b8e1b7f649 100644
--- a/usr.bin/tset/map.c
+++ b/usr.bin/tset/map.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: map.c,v 1.2 1996/06/26 05:41:55 deraadt Exp $ */
/* $NetBSD: map.c,v 1.4 1994/12/07 05:08:07 jtc Exp $ */
/*-
@@ -37,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)map.c 8.1 (Berkeley) 6/9/93";
#endif
-static char rcsid[] = "$NetBSD: map.c,v 1.4 1994/12/07 05:08:07 jtc Exp $";
+static char rcsid[] = "$OpenBSD: map.c,v 1.2 1996/06/26 05:41:55 deraadt Exp $";
#endif /* not lint */
#include <sys/types.h>
diff --git a/usr.bin/tset/misc.c b/usr.bin/tset/misc.c
index dc978b39587..80729beb22d 100644
--- a/usr.bin/tset/misc.c
+++ b/usr.bin/tset/misc.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: misc.c,v 1.2 1996/06/26 05:41:55 deraadt Exp $ */
/* $NetBSD: misc.c,v 1.3 1994/12/07 05:08:09 jtc Exp $ */
/*-
@@ -37,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)misc.c 8.1 (Berkeley) 6/9/93";
#endif
-static char rcsid[] = "$NetBSD: misc.c,v 1.3 1994/12/07 05:08:09 jtc Exp $";
+static char rcsid[] = "$OpenBSD: misc.c,v 1.2 1996/06/26 05:41:55 deraadt Exp $";
#endif /* not lint */
#include <fcntl.h>
diff --git a/usr.bin/tset/set.c b/usr.bin/tset/set.c
index 226cc2f448b..d3093c761ee 100644
--- a/usr.bin/tset/set.c
+++ b/usr.bin/tset/set.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: set.c,v 1.2 1996/06/26 05:41:56 deraadt Exp $ */
/* $NetBSD: set.c,v 1.6 1994/12/07 05:08:10 jtc Exp $ */
/*-
@@ -37,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)set.c 8.2 (Berkeley) 2/28/94";
#endif
-static char rcsid[] = "$NetBSD: set.c,v 1.6 1994/12/07 05:08:10 jtc Exp $";
+static char rcsid[] = "$OpenBSD: set.c,v 1.2 1996/06/26 05:41:56 deraadt Exp $";
#endif /* not lint */
#include <termios.h>
diff --git a/usr.bin/tset/term.c b/usr.bin/tset/term.c
index 4c4217fc553..a773f92fd24 100644
--- a/usr.bin/tset/term.c
+++ b/usr.bin/tset/term.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: term.c,v 1.2 1996/06/26 05:41:57 deraadt Exp $ */
/* $NetBSD: term.c,v 1.6 1994/12/07 05:08:12 jtc Exp $ */
/*-
@@ -37,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)term.c 8.1 (Berkeley) 6/9/93";
#endif
-static char rcsid[] = "$NetBSD: term.c,v 1.6 1994/12/07 05:08:12 jtc Exp $";
+static char rcsid[] = "$OpenBSD: term.c,v 1.2 1996/06/26 05:41:57 deraadt Exp $";
#endif /* not lint */
#include <sys/types.h>
diff --git a/usr.bin/tset/tset.1 b/usr.bin/tset/tset.1
index da74ff34da4..df427b1c11e 100644
--- a/usr.bin/tset/tset.1
+++ b/usr.bin/tset/tset.1
@@ -1,3 +1,4 @@
+.\" $OpenBSD: tset.1,v 1.3 1996/06/26 05:41:57 deraadt Exp $
.\" $NetBSD: tset.1,v 1.4.2.1 1995/12/05 02:53:34 jtc Exp $
.\"
.\" Copyright (c) 1985, 1990, 1993
diff --git a/usr.bin/tset/tset.c b/usr.bin/tset/tset.c
index 170fab7f90e..ebfa48a5319 100644
--- a/usr.bin/tset/tset.c
+++ b/usr.bin/tset/tset.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: tset.c,v 1.2 1996/06/26 05:41:58 deraadt Exp $ */
/* $NetBSD: tset.c,v 1.4 1994/12/07 05:08:15 jtc Exp $ */
/*-
@@ -43,7 +44,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)tset.c 8.1 (Berkeley) 6/9/93";
#endif
-static char rcsid[] = "$NetBSD: tset.c,v 1.4 1994/12/07 05:08:15 jtc Exp $";
+static char rcsid[] = "$OpenBSD: tset.c,v 1.2 1996/06/26 05:41:58 deraadt Exp $";
#endif /* not lint */
#include <sys/types.h>
diff --git a/usr.bin/tset/wrterm.c b/usr.bin/tset/wrterm.c
index 399956ec085..9fb1b10854e 100644
--- a/usr.bin/tset/wrterm.c
+++ b/usr.bin/tset/wrterm.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: wrterm.c,v 1.2 1996/06/26 05:41:59 deraadt Exp $ */
/* $NetBSD: wrterm.c,v 1.3 1994/12/07 05:08:16 jtc Exp $ */
/*-
@@ -37,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)wrterm.c 8.1 (Berkeley) 6/9/93";
#endif
-static char rcsid[] = "$NetBSD: wrterm.c,v 1.3 1994/12/07 05:08:16 jtc Exp $";
+static char rcsid[] = "$OpenBSD: wrterm.c,v 1.2 1996/06/26 05:41:59 deraadt Exp $";
#endif /* not lint */
#include <sys/types.h>
diff --git a/usr.bin/tsort/Makefile b/usr.bin/tsort/Makefile
index e8341cbafa6..d2b6c2ab321 100644
--- a/usr.bin/tsort/Makefile
+++ b/usr.bin/tsort/Makefile
@@ -1,5 +1,5 @@
+# $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 $
-# @(#)Makefile 8.1 (Berkeley) 6/9/93
PROG= tsort
diff --git a/usr.bin/tsort/tsort.1 b/usr.bin/tsort/tsort.1
index 9efe9b2a516..e943d270fd9 100644
--- a/usr.bin/tsort/tsort.1
+++ b/usr.bin/tsort/tsort.1
@@ -1,3 +1,4 @@
+.\" $OpenBSD: tsort.1,v 1.3 1996/06/26 05:42:00 deraadt Exp $
.\" $NetBSD: tsort.1,v 1.6 1996/01/17 20:37:49 mycroft Exp $
.\"
.\" Copyright (c) 1990, 1993, 1994
diff --git a/usr.bin/tsort/tsort.c b/usr.bin/tsort/tsort.c
index 106162dd24c..4312d34278b 100644
--- a/usr.bin/tsort/tsort.c
+++ b/usr.bin/tsort/tsort.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: tsort.c,v 1.3 1996/06/26 05:42:00 deraadt Exp $ */
/* $NetBSD: tsort.c,v 1.11 1996/01/17 20:37:53 mycroft Exp $ */
/*
@@ -46,7 +47,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)tsort.c 8.3 (Berkeley) 5/4/95";
#endif
-static char rcsid[] = "$NetBSD: tsort.c,v 1.11 1996/01/17 20:37:53 mycroft Exp $";
+static char rcsid[] = "$OpenBSD: tsort.c,v 1.3 1996/06/26 05:42:00 deraadt Exp $";
#endif /* not lint */
#include <sys/types.h>
diff --git a/usr.bin/tty/Makefile b/usr.bin/tty/Makefile
index ce23e458293..60ca6211317 100644
--- a/usr.bin/tty/Makefile
+++ b/usr.bin/tty/Makefile
@@ -1,5 +1,5 @@
+# $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 $
-# @(#)Makefile 8.1 (Berkeley) 6/6/93
PROG= tty
diff --git a/usr.bin/tty/tty.1 b/usr.bin/tty/tty.1
index 378168635e4..25c820392d6 100644
--- a/usr.bin/tty/tty.1
+++ b/usr.bin/tty/tty.1
@@ -1,3 +1,4 @@
+.\" $OpenBSD: tty.1,v 1.2 1996/06/26 05:42:02 deraadt Exp $
.\" $NetBSD: tty.1,v 1.4 1994/12/07 00:46:55 jtc Exp $
.\"
.\" Copyright (c) 1990, 1993
diff --git a/usr.bin/tty/tty.c b/usr.bin/tty/tty.c
index d6785e0ec5d..881b749244c 100644
--- a/usr.bin/tty/tty.c
+++ b/usr.bin/tty/tty.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: tty.c,v 1.2 1996/06/26 05:42:03 deraadt Exp $ */
/* $NetBSD: tty.c,v 1.4 1994/12/07 00:46:57 jtc Exp $ */
/*
@@ -43,7 +44,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)tty.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$NetBSD: tty.c,v 1.4 1994/12/07 00:46:57 jtc Exp $";
+static char rcsid[] = "$OpenBSD: tty.c,v 1.2 1996/06/26 05:42:03 deraadt Exp $";
#endif /* not lint */
#include <stdio.h>
diff --git a/usr.bin/ul/Makefile b/usr.bin/ul/Makefile
index 93a51ac4ae8..a55035223b4 100644
--- a/usr.bin/ul/Makefile
+++ b/usr.bin/ul/Makefile
@@ -1,5 +1,5 @@
+# $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 $
-# @(#)Makefile 8.1 (Berkeley) 6/6/93
PROG= ul
DPADD= ${LIBTERMCAP}
diff --git a/usr.bin/ul/ul.1 b/usr.bin/ul/ul.1
index 7db19f2075d..af6c7d4bd85 100644
--- a/usr.bin/ul/ul.1
+++ b/usr.bin/ul/ul.1
@@ -1,3 +1,4 @@
+.\" $OpenBSD: ul.1,v 1.2 1996/06/26 05:42:04 deraadt Exp $
.\" $NetBSD: ul.1,v 1.3 1994/12/07 00:28:23 jtc Exp $
.\"
.\" Copyright (c) 1980, 1991, 1993
diff --git a/usr.bin/ul/ul.c b/usr.bin/ul/ul.c
index b806688ec04..7c2dd8f7983 100644
--- a/usr.bin/ul/ul.c
+++ b/usr.bin/ul/ul.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: ul.c,v 1.3 1996/06/26 05:42:05 deraadt Exp $ */
/* $NetBSD: ul.c,v 1.3 1994/12/07 00:28:24 jtc Exp $ */
/*
@@ -43,7 +44,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)ul.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$NetBSD: ul.c,v 1.3 1994/12/07 00:28:24 jtc Exp $";
+static char rcsid[] = "$OpenBSD: ul.c,v 1.3 1996/06/26 05:42:05 deraadt Exp $";
#endif /* not lint */
#include <stdio.h>
diff --git a/usr.bin/uname/Makefile b/usr.bin/uname/Makefile
index 7effbf7f5a6..32998b328f3 100644
--- a/usr.bin/uname/Makefile
+++ b/usr.bin/uname/Makefile
@@ -1,5 +1,4 @@
-# from: @(#)Makefile 5.3 (Berkeley) 5/11/90
-# $Id: Makefile,v 1.1 1995/10/18 08:46:28 deraadt Exp $
+# $OpenBSD: Makefile,v 1.2 1996/06/26 05:42:06 deraadt Exp $
PROG= uname
diff --git a/usr.bin/uname/uname.1 b/usr.bin/uname/uname.1
index 55caae2e4ca..8df79193321 100644
--- a/usr.bin/uname/uname.1
+++ b/usr.bin/uname/uname.1
@@ -1,3 +1,4 @@
+.\" $OpenBSD: uname.1,v 1.2 1996/06/26 05:42:06 deraadt Exp $
.\" Copyright (c) 1990 The Regents of the University of California.
.\" All rights reserved.
.\"
@@ -30,7 +31,6 @@
.\" SUCH DAMAGE.
.\"
.\" from: @(#)du.1 6.13 (Berkeley) 6/20/91
-.\" $Id: uname.1,v 1.1 1995/10/18 08:46:28 deraadt Exp $
.\"
.Dd January 26, 1994
.Dt UNAME 1
diff --git a/usr.bin/uname/uname.c b/usr.bin/uname/uname.c
index 0c81cea2ba2..998262c74ba 100644
--- a/usr.bin/uname/uname.c
+++ b/usr.bin/uname/uname.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: uname.c,v 1.2 1996/06/26 05:42:07 deraadt Exp $ */
+
/*
* Copyright (c) 1994 Winning Strategies, Inc.
* All rights reserved.
@@ -30,7 +32,7 @@
*/
#ifndef lint
-static char rcsid[] = "$Id: uname.c,v 1.1 1995/10/18 08:46:28 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: uname.c,v 1.2 1996/06/26 05:42:07 deraadt Exp $";
#endif /* not lint */
#include <stdio.h>
diff --git a/usr.bin/unexpand/Makefile b/usr.bin/unexpand/Makefile
index 6004d43ed41..4213fee36fb 100644
--- a/usr.bin/unexpand/Makefile
+++ b/usr.bin/unexpand/Makefile
@@ -1,5 +1,5 @@
+# $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 $
-# @(#)Makefile 8.1 (Berkeley) 6/6/93
PROG= unexpand
NOMAN= noman
diff --git a/usr.bin/unexpand/unexpand.c b/usr.bin/unexpand/unexpand.c
index 681aaf235f1..902e14968aa 100644
--- a/usr.bin/unexpand/unexpand.c
+++ b/usr.bin/unexpand/unexpand.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: unexpand.c,v 1.2 1996/06/26 05:42:08 deraadt Exp $ */
/* $NetBSD: unexpand.c,v 1.5 1994/12/24 17:08:05 cgd Exp $ */
/*-
@@ -43,7 +44,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)unexpand.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$NetBSD: unexpand.c,v 1.5 1994/12/24 17:08:05 cgd Exp $";
+static char rcsid[] = "$OpenBSD: unexpand.c,v 1.2 1996/06/26 05:42:08 deraadt Exp $";
#endif /* not lint */
/*
diff --git a/usr.bin/unifdef/Makefile b/usr.bin/unifdef/Makefile
index 88450d25a3d..41a17987df4 100644
--- a/usr.bin/unifdef/Makefile
+++ b/usr.bin/unifdef/Makefile
@@ -1,5 +1,5 @@
+# $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 $
-# @(#)Makefile 8.1 (Berkeley) 6/6/93
PROG= unifdef
diff --git a/usr.bin/unifdef/unifdef.1 b/usr.bin/unifdef/unifdef.1
index 3e862297258..00e376d52b6 100644
--- a/usr.bin/unifdef/unifdef.1
+++ b/usr.bin/unifdef/unifdef.1
@@ -1,3 +1,4 @@
+.\" $OpenBSD: unifdef.1,v 1.2 1996/06/26 05:42:10 deraadt Exp $
.\" $NetBSD: unifdef.1,v 1.4 1994/12/07 00:33:48 jtc Exp $
.\"
.\" Copyright (c) 1985, 1991, 1993
diff --git a/usr.bin/unifdef/unifdef.c b/usr.bin/unifdef/unifdef.c
index 8b331b72890..f117311ffc0 100644
--- a/usr.bin/unifdef/unifdef.c
+++ b/usr.bin/unifdef/unifdef.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: unifdef.c,v 1.2 1996/06/26 05:42:10 deraadt Exp $ */
/* $NetBSD: unifdef.c,v 1.4 1994/12/20 01:44:07 jtc Exp $ */
/*
@@ -46,7 +47,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)unifdef.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$NetBSD: unifdef.c,v 1.4 1994/12/20 01:44:07 jtc Exp $";
+static char rcsid[] = "$OpenBSD: unifdef.c,v 1.2 1996/06/26 05:42:10 deraadt Exp $";
#endif /* not lint */
/*
diff --git a/usr.bin/uniq/Makefile b/usr.bin/uniq/Makefile
index 3727cf9a705..4269e6d1920 100644
--- a/usr.bin/uniq/Makefile
+++ b/usr.bin/uniq/Makefile
@@ -1,5 +1,5 @@
+# $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 $
-# @(#)Makefile 8.1 (Berkeley) 6/6/93
PROG= uniq
diff --git a/usr.bin/uniq/uniq.1 b/usr.bin/uniq/uniq.1
index b6b086dc9da..4459c497d8a 100644
--- a/usr.bin/uniq/uniq.1
+++ b/usr.bin/uniq/uniq.1
@@ -1,3 +1,4 @@
+.\" $OpenBSD: uniq.1,v 1.2 1996/06/26 05:42:12 deraadt Exp $
.\" $NetBSD: uniq.1,v 1.5 1994/12/06 07:51:15 jtc Exp $
.\"
.\" Copyright (c) 1991, 1993
diff --git a/usr.bin/uniq/uniq.c b/usr.bin/uniq/uniq.c
index 142a9e17ec8..d4f9b1296bf 100644
--- a/usr.bin/uniq/uniq.c
+++ b/usr.bin/uniq/uniq.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: uniq.c,v 1.2 1996/06/26 05:42:13 deraadt Exp $ */
/* $NetBSD: uniq.c,v 1.7 1995/08/31 22:03:48 jtc Exp $ */
/*
@@ -46,7 +47,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)uniq.c 8.3 (Berkeley) 5/4/95";
#endif
-static char rcsid[] = "$NetBSD: uniq.c,v 1.7 1995/08/31 22:03:48 jtc Exp $";
+static char rcsid[] = "$OpenBSD: uniq.c,v 1.2 1996/06/26 05:42:13 deraadt Exp $";
#endif /* not lint */
#include <errno.h>
diff --git a/usr.bin/units/README b/usr.bin/units/README
index ce335343db6..e18fa1b9f31 100644
--- a/usr.bin/units/README
+++ b/usr.bin/units/README
@@ -1,3 +1,4 @@
+# $OpenBSD: README,v 1.3 1996/06/26 05:42:14 deraadt Exp $
# $NetBSD: README,v 1.2 1996/04/06 06:00:59 thorpej Exp $
This is a program which I wrote as a clone of the UNIX 'units'
diff --git a/usr.bin/units/pathnames.h b/usr.bin/units/pathnames.h
index 94253eaf253..e7842d07928 100644
--- a/usr.bin/units/pathnames.h
+++ b/usr.bin/units/pathnames.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: pathnames.h,v 1.3 1996/06/26 05:42:14 deraadt Exp $ */
/* $NetBSD: pathnames.h,v 1.3 1996/04/06 06:01:00 thorpej Exp $ */
/*
diff --git a/usr.bin/units/units.1 b/usr.bin/units/units.1
index d5e0f6cdd80..edca7388b09 100644
--- a/usr.bin/units/units.1
+++ b/usr.bin/units/units.1
@@ -1,3 +1,4 @@
+.\" $OpenBSD: units.1,v 1.3 1996/06/26 05:42:15 deraadt Exp $
.\" $NetBSD: units.1,v 1.6 1996/04/06 06:01:02 thorpej Exp $
.TH UNITS 1 "14 July 1993"
.SH NAME
diff --git a/usr.bin/units/units.c b/usr.bin/units/units.c
index 13aaf1a2d06..4fbe0c20afd 100644
--- a/usr.bin/units/units.c
+++ b/usr.bin/units/units.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: units.c,v 1.3 1996/06/26 05:42:15 deraadt Exp $ */
/* $NetBSD: units.c,v 1.6 1996/04/06 06:01:03 thorpej Exp $ */
/*
diff --git a/usr.bin/units/units.lib b/usr.bin/units/units.lib
index 060e3ed3d82..c603673afbd 100644
--- a/usr.bin/units/units.lib
+++ b/usr.bin/units/units.lib
@@ -1,3 +1,4 @@
+/ $OpenBSD: units.lib,v 1.3 1996/06/26 05:42:16 deraadt Exp $
/ $NetBSD: units.lib,v 1.3 1996/04/06 06:01:04 thorpej Exp $
/ primitive units
diff --git a/usr.bin/unvis/Makefile b/usr.bin/unvis/Makefile
index 677e61d94d8..63c8bd56251 100644
--- a/usr.bin/unvis/Makefile
+++ b/usr.bin/unvis/Makefile
@@ -1,5 +1,5 @@
+# $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 $
-# @(#)Makefile 8.1 (Berkeley) 6/6/93
PROG= unvis
diff --git a/usr.bin/unvis/unvis.1 b/usr.bin/unvis/unvis.1
index 54b325fb318..e31b270f009 100644
--- a/usr.bin/unvis/unvis.1
+++ b/usr.bin/unvis/unvis.1
@@ -1,3 +1,4 @@
+.\" $OpenBSD: unvis.1,v 1.2 1996/06/26 05:42:17 deraadt Exp $
.\" $NetBSD: unvis.1,v 1.3 1994/12/06 07:36:08 jtc Exp $
.\"
.\" Copyright (c) 1989, 1990, 1993
diff --git a/usr.bin/unvis/unvis.c b/usr.bin/unvis/unvis.c
index 82deb92f06b..d1962fe4603 100644
--- a/usr.bin/unvis/unvis.c
+++ b/usr.bin/unvis/unvis.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: unvis.c,v 1.2 1996/06/26 05:42:18 deraadt Exp $ */
+
/*-
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
@@ -41,7 +43,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)unvis.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$Id: unvis.c,v 1.1 1995/10/18 08:46:30 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: unvis.c,v 1.2 1996/06/26 05:42:18 deraadt Exp $";
#endif /* not lint */
#include <stdio.h>
diff --git a/usr.bin/users/Makefile b/usr.bin/users/Makefile
index a08789a78f9..defc3606489 100644
--- a/usr.bin/users/Makefile
+++ b/usr.bin/users/Makefile
@@ -1,5 +1,5 @@
+# $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 $
-# @(#)Makefile 8.1 (Berkeley) 6/6/93
PROG= users
diff --git a/usr.bin/users/users.1 b/usr.bin/users/users.1
index 991a4f3c344..a8a17a09601 100644
--- a/usr.bin/users/users.1
+++ b/usr.bin/users/users.1
@@ -1,3 +1,4 @@
+.\" $OpenBSD: users.1,v 1.2 1996/06/26 05:42:19 deraadt Exp $
.\" $NetBSD: users.1,v 1.4 1994/12/06 07:32:27 jtc Exp $
.\"
.\" Copyright (c) 1980, 1990, 1991, 1993
diff --git a/usr.bin/users/users.c b/usr.bin/users/users.c
index 4439aad7b5e..748173355ff 100644
--- a/usr.bin/users/users.c
+++ b/usr.bin/users/users.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: users.c,v 1.2 1996/06/26 05:42:20 deraadt Exp $ */
/* $NetBSD: users.c,v 1.5 1994/12/20 15:58:19 jtc Exp $ */
/*
@@ -43,7 +44,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)users.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$NetBSD: users.c,v 1.5 1994/12/20 15:58:19 jtc Exp $";
+static char rcsid[] = "$OpenBSD: users.c,v 1.2 1996/06/26 05:42:20 deraadt Exp $";
#endif /* not lint */
#include <sys/types.h>
diff --git a/usr.bin/uudecode/Makefile b/usr.bin/uudecode/Makefile
index 2a65b994d6b..d80f3376b42 100644
--- a/usr.bin/uudecode/Makefile
+++ b/usr.bin/uudecode/Makefile
@@ -1,5 +1,5 @@
+# $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 $
-# @(#)Makefile 8.1 (Berkeley) 6/6/93
PROG= uudecode
NOMAN= noman
diff --git a/usr.bin/uudecode/uudecode.c b/usr.bin/uudecode/uudecode.c
index b8eba445d37..8225aff90c0 100644
--- a/usr.bin/uudecode/uudecode.c
+++ b/usr.bin/uudecode/uudecode.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: uudecode.c,v 1.2 1996/06/26 05:42:21 deraadt Exp $ */
/* $NetBSD: uudecode.c,v 1.6 1994/11/17 07:40:43 jtc Exp $ */
/*-
@@ -41,7 +42,7 @@ char copyright[] =
#if 0
static char sccsid[] = "@(#)uudecode.c 8.2 (Berkeley) 4/2/94";
#endif
-static char rcsid[] = "$NetBSD: uudecode.c,v 1.6 1994/11/17 07:40:43 jtc Exp $";
+static char rcsid[] = "$OpenBSD: uudecode.c,v 1.2 1996/06/26 05:42:21 deraadt Exp $";
#endif /* not lint */
/*
diff --git a/usr.bin/uuencode/Makefile b/usr.bin/uuencode/Makefile
index ba4294171d6..0d40494abe8 100644
--- a/usr.bin/uuencode/Makefile
+++ b/usr.bin/uuencode/Makefile
@@ -1,5 +1,5 @@
+# $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 $
-# @(#)Makefile 8.1 (Berkeley) 6/6/93
PROG= uuencode
MAN= uuencode.1 uuencode.5
diff --git a/usr.bin/uuencode/uuencode.1 b/usr.bin/uuencode/uuencode.1
index 566a06b1e5b..30f564b8297 100644
--- a/usr.bin/uuencode/uuencode.1
+++ b/usr.bin/uuencode/uuencode.1
@@ -1,3 +1,4 @@
+.\" $OpenBSD: uuencode.1,v 1.3 1996/06/26 05:42:23 deraadt Exp $
.\" $NetBSD: uuencode.1,v 1.4 1994/11/17 07:39:42 jtc Exp $
.\"
.\" Copyright (c) 1980, 1990, 1993
diff --git a/usr.bin/uuencode/uuencode.5 b/usr.bin/uuencode/uuencode.5
index 7e741d6ddcf..0802109b826 100644
--- a/usr.bin/uuencode/uuencode.5
+++ b/usr.bin/uuencode/uuencode.5
@@ -1,3 +1,4 @@
+.\" $OpenBSD: uuencode.5,v 1.2 1996/06/26 05:42:24 deraadt Exp $
.\" $NetBSD: uuencode.format.5,v 1.3 1994/11/17 07:39:45 jtc Exp $
.\"
.\" Copyright (c) 1989, 1991, 1993
diff --git a/usr.bin/uuencode/uuencode.c b/usr.bin/uuencode/uuencode.c
index 8fe7b43a5f2..6bb2218e02c 100644
--- a/usr.bin/uuencode/uuencode.c
+++ b/usr.bin/uuencode/uuencode.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: uuencode.c,v 1.2 1996/06/26 05:42:24 deraadt Exp $ */
/* $NetBSD: uuencode.c,v 1.7 1994/11/17 07:41:15 jtc Exp $ */
/*-
@@ -41,7 +42,7 @@ char copyright[] =
#if 0
static char sccsid[] = "@(#)uuencode.c 8.2 (Berkeley) 4/2/94";
#endif
-static char rcsid[] = "$NetBSD: uuencode.c,v 1.7 1994/11/17 07:41:15 jtc Exp $";
+static char rcsid[] = "$OpenBSD: uuencode.c,v 1.2 1996/06/26 05:42:24 deraadt Exp $";
#endif /* not lint */
/*
diff --git a/usr.bin/vacation/Makefile b/usr.bin/vacation/Makefile
index 5bf7c0cacf6..ffa81318566 100644
--- a/usr.bin/vacation/Makefile
+++ b/usr.bin/vacation/Makefile
@@ -1,5 +1,5 @@
+# $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 $
-# @(#)Makefile 8.1 (Berkeley) 6/6/93
PROG= vacation
diff --git a/usr.bin/vacation/vacation.1 b/usr.bin/vacation/vacation.1
index 5b3c9f2e69a..2d57331c580 100644
--- a/usr.bin/vacation/vacation.1
+++ b/usr.bin/vacation/vacation.1
@@ -1,3 +1,4 @@
+.\" $OpenBSD: vacation.1,v 1.2 1996/06/26 05:42:26 deraadt Exp $
.\" $NetBSD: vacation.1,v 1.5 1995/08/31 21:57:08 jtc Exp $
.\"
.\" Copyright (c) 1985, 1987, 1990, 1991, 1993
diff --git a/usr.bin/vacation/vacation.c b/usr.bin/vacation/vacation.c
index 41d0f8b23d3..fe7561fa276 100644
--- a/usr.bin/vacation/vacation.c
+++ b/usr.bin/vacation/vacation.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: vacation.c,v 1.2 1996/06/26 05:42:27 deraadt Exp $ */
/* $NetBSD: vacation.c,v 1.7 1995/04/29 05:58:27 cgd Exp $ */
/*
@@ -43,7 +44,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)vacation.c 8.2 (Berkeley) 1/26/94";
#endif
-static char rcsid[] = "$NetBSD: vacation.c,v 1.7 1995/04/29 05:58:27 cgd Exp $";
+static char rcsid[] = "$OpenBSD: vacation.c,v 1.2 1996/06/26 05:42:27 deraadt Exp $";
#endif /* not lint */
/*
diff --git a/usr.bin/vgrind/Makefile b/usr.bin/vgrind/Makefile
index 8e41d6dcf10..c922efac1cf 100644
--- a/usr.bin/vgrind/Makefile
+++ b/usr.bin/vgrind/Makefile
@@ -1,5 +1,5 @@
+# $OpenBSD: Makefile,v 1.2 1996/06/26 05:42:28 deraadt Exp $
# $NetBSD: Makefile,v 1.5 1994/12/23 21:11:56 pk Exp $
-# @(#)Makefile 8.1 (Berkeley) 6/9/93
PROG= vfontedpr
SRCS= regexp.c vfontedpr.c
diff --git a/usr.bin/vgrind/RETEST/Makefile b/usr.bin/vgrind/RETEST/Makefile
index d22dd218881..a0d561f393c 100644
--- a/usr.bin/vgrind/RETEST/Makefile
+++ b/usr.bin/vgrind/RETEST/Makefile
@@ -1,5 +1,5 @@
+# $OpenBSD: Makefile,v 1.2 1996/06/26 05:42:34 deraadt Exp $
# $NetBSD: Makefile,v 1.2 1994/11/17 08:28:17 jtc Exp $
-# @(#)Makefile 8.1 (Berkeley) 6/6/93
PROG= retest
SRCS= regexp.c retest.c
diff --git a/usr.bin/vgrind/RETEST/retest.c b/usr.bin/vgrind/RETEST/retest.c
index ad11588569e..f5d8652a2c1 100644
--- a/usr.bin/vgrind/RETEST/retest.c
+++ b/usr.bin/vgrind/RETEST/retest.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: retest.c,v 1.2 1996/06/26 05:42:34 deraadt Exp $ */
/* $NetBSD: retest.c,v 1.2 1994/11/17 08:28:18 jtc Exp $ */
/*
@@ -43,7 +44,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)retest.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$NetBSD: retest.c,v 1.2 1994/11/17 08:28:18 jtc Exp $":
+static char rcsid[] = "$OpenBSD: retest.c,v 1.2 1996/06/26 05:42:34 deraadt Exp $":
#endif /* not lint */
#include <ctype.h>
diff --git a/usr.bin/vgrind/extern.h b/usr.bin/vgrind/extern.h
index 2a3cfa0ed89..48da3dae355 100644
--- a/usr.bin/vgrind/extern.h
+++ b/usr.bin/vgrind/extern.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: extern.h,v 1.2 1996/06/26 05:42:28 deraadt Exp $ */
/* $NetBSD: extern.h,v 1.2 1994/11/17 08:27:59 jtc Exp $ */
/*
diff --git a/usr.bin/vgrind/pathnames.h b/usr.bin/vgrind/pathnames.h
index 2de2022d411..c51d4bdc866 100644
--- a/usr.bin/vgrind/pathnames.h
+++ b/usr.bin/vgrind/pathnames.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: pathnames.h,v 1.2 1996/06/26 05:42:29 deraadt Exp $ */
/* $NetBSD: pathnames.h,v 1.3 1994/11/17 08:28:01 jtc Exp $ */
/*
diff --git a/usr.bin/vgrind/regexp.c b/usr.bin/vgrind/regexp.c
index 5a0b458b55d..da1bcb81118 100644
--- a/usr.bin/vgrind/regexp.c
+++ b/usr.bin/vgrind/regexp.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: regexp.c,v 1.2 1996/06/26 05:42:29 deraadt Exp $ */
/* $NetBSD: regexp.c,v 1.3 1994/11/17 08:28:02 jtc Exp $ */
/*
@@ -44,7 +45,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)regexp.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$NetBSD: regexp.c,v 1.3 1994/11/17 08:28:02 jtc Exp $";
+static char rcsid[] = "$OpenBSD: regexp.c,v 1.2 1996/06/26 05:42:29 deraadt Exp $";
#endif /* not lint */
#include <ctype.h>
diff --git a/usr.bin/vgrind/vfontedpr.c b/usr.bin/vgrind/vfontedpr.c
index 2b67f566a3f..fff7fa17776 100644
--- a/usr.bin/vgrind/vfontedpr.c
+++ b/usr.bin/vgrind/vfontedpr.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: vfontedpr.c,v 1.3 1996/06/26 05:42:30 deraadt Exp $ */
/* $NetBSD: vfontedpr.c,v 1.4 1996/03/21 18:08:30 jtc Exp $ */
/*
@@ -43,7 +44,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)vfontedpr.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$NetBSD: vfontedpr.c,v 1.4 1996/03/21 18:08:30 jtc Exp $";
+static char rcsid[] = "$OpenBSD: vfontedpr.c,v 1.3 1996/06/26 05:42:30 deraadt Exp $";
#endif /* not lint */
#include <sys/types.h>
diff --git a/usr.bin/vgrind/vgrind.1 b/usr.bin/vgrind/vgrind.1
index d44881f44fb..a56b79ff1ad 100644
--- a/usr.bin/vgrind/vgrind.1
+++ b/usr.bin/vgrind/vgrind.1
@@ -1,3 +1,4 @@
+.\" $OpenBSD: vgrind.1,v 1.2 1996/06/26 05:42:31 deraadt Exp $
.\" $NetBSD: vgrind.1,v 1.4 1994/11/17 08:28:04 jtc Exp $
.\"
.\" Copyright (c) 1980, 1990, 1993
diff --git a/usr.bin/vgrind/vgrind.sh b/usr.bin/vgrind/vgrind.sh
index 7879f4d7be2..3a699887f5b 100644
--- a/usr.bin/vgrind/vgrind.sh
+++ b/usr.bin/vgrind/vgrind.sh
@@ -1,5 +1,6 @@
#!/bin/csh -f
#
+# $OpenBSD: vgrind.sh,v 1.2 1996/06/26 05:42:31 deraadt Exp $
# $NetBSD: vgrind.sh,v 1.3 1994/11/17 08:28:06 jtc Exp $
#
# Copyright (c) 1980, 1993
diff --git a/usr.bin/vgrind/vgrindefs.5 b/usr.bin/vgrind/vgrindefs.5
index 967f9a409f4..98b321f940c 100644
--- a/usr.bin/vgrind/vgrindefs.5
+++ b/usr.bin/vgrind/vgrindefs.5
@@ -1,3 +1,4 @@
+.\" $OpenBSD: vgrindefs.5,v 1.2 1996/06/26 05:42:32 deraadt Exp $
.\" $NetBSD: vgrindefs.5,v 1.3 1994/11/17 08:28:07 jtc Exp $
.\"
.\" Copyright (c) 1989, 1991, 1993
diff --git a/usr.bin/vgrind/vgrindefs.c b/usr.bin/vgrind/vgrindefs.c
index 753f77d81b2..3734f51a08f 100644
--- a/usr.bin/vgrind/vgrindefs.c
+++ b/usr.bin/vgrind/vgrindefs.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: vgrindefs.c,v 1.2 1996/06/26 05:42:32 deraadt Exp $ */
/* $NetBSD: vgrindefs.c,v 1.5 1994/12/20 12:05:29 cgd Exp $ */
/*
@@ -37,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)vgrindefs.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$NetBSD: vgrindefs.c,v 1.5 1994/12/20 12:05:29 cgd Exp $";
+static char rcsid[] = "$OpenBSD: vgrindefs.c,v 1.2 1996/06/26 05:42:32 deraadt Exp $";
#endif /* not lint */
#define BUFSIZ 1024
diff --git a/usr.bin/vgrind/vgrindefs.src b/usr.bin/vgrind/vgrindefs.src
index 6cfc56cd2b0..09a5c06d3de 100644
--- a/usr.bin/vgrind/vgrindefs.src
+++ b/usr.bin/vgrind/vgrindefs.src
@@ -1,3 +1,4 @@
+# $OpenBSD: vgrindefs.src,v 1.2 1996/06/26 05:42:33 deraadt Exp $
# $NetBSD: vgrindefs.src,v 1.2 1994/11/17 08:28:09 jtc Exp $
#
# Copyright (c) 1987, 1993
diff --git a/usr.bin/vis/Makefile b/usr.bin/vis/Makefile
index 696b62a73db..3a7c1c4f316 100644
--- a/usr.bin/vis/Makefile
+++ b/usr.bin/vis/Makefile
@@ -1,5 +1,5 @@
+# $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 $
-# @(#)Makefile 8.1 (Berkeley) 6/6/93
PROG= vis
SRCS= vis.c foldit.c
diff --git a/usr.bin/vis/foldit.c b/usr.bin/vis/foldit.c
index 625e3bbe99b..311ced827e0 100644
--- a/usr.bin/vis/foldit.c
+++ b/usr.bin/vis/foldit.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: foldit.c,v 1.2 1996/06/26 05:42:37 deraadt Exp $ */
/* $NetBSD: foldit.c,v 1.4 1994/12/20 16:13:02 jtc Exp $ */
/*-
@@ -37,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)foldit.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$NetBSD: foldit.c,v 1.4 1994/12/20 16:13:02 jtc Exp $";
+static char rcsid[] = "$OpenBSD: foldit.c,v 1.2 1996/06/26 05:42:37 deraadt Exp $";
#endif /* not lint */
#include <stdio.h>
diff --git a/usr.bin/vis/vis.1 b/usr.bin/vis/vis.1
index 7ed56eb6e25..fb623e385b0 100644
--- a/usr.bin/vis/vis.1
+++ b/usr.bin/vis/vis.1
@@ -1,3 +1,4 @@
+.\" $OpenBSD: vis.1,v 1.2 1996/06/26 05:42:38 deraadt Exp $
.\" $NetBSD: vis.1,v 1.5 1994/11/17 07:56:00 jtc Exp $
.\"
.\" Copyright (c) 1989, 1991, 1993, 1994
diff --git a/usr.bin/vis/vis.c b/usr.bin/vis/vis.c
index 822b744a4a6..345e821b2d0 100644
--- a/usr.bin/vis/vis.c
+++ b/usr.bin/vis/vis.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: vis.c,v 1.2 1996/06/26 05:42:39 deraadt Exp $ */
/* $NetBSD: vis.c,v 1.4 1994/12/20 16:13:03 jtc Exp $ */
/*-
@@ -43,7 +44,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)vis.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$NetBSD: vis.c,v 1.4 1994/12/20 16:13:03 jtc Exp $";
+static char rcsid[] = "$OpenBSD: vis.c,v 1.2 1996/06/26 05:42:39 deraadt Exp $";
#endif /* not lint */
#include <stdio.h>
diff --git a/usr.bin/vmstat/dkstats.c b/usr.bin/vmstat/dkstats.c
index 70796e86afb..d8a84f4f564 100644
--- a/usr.bin/vmstat/dkstats.c
+++ b/usr.bin/vmstat/dkstats.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: dkstats.c,v 1.3 1996/06/26 05:42:40 deraadt Exp $ */
/* $NetBSD: dkstats.c,v 1.1 1996/05/10 23:19:27 thorpej Exp $ */
/*
diff --git a/usr.bin/vmstat/dkstats.h b/usr.bin/vmstat/dkstats.h
index bfde443e533..d69337cb3ed 100644
--- a/usr.bin/vmstat/dkstats.h
+++ b/usr.bin/vmstat/dkstats.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: dkstats.h,v 1.3 1996/06/26 05:42:40 deraadt Exp $ */
/* $NetBSD: dkstats.h,v 1.1 1996/05/10 23:19:28 thorpej Exp $ */
/*
diff --git a/usr.bin/vmstat/vmstat.8 b/usr.bin/vmstat/vmstat.8
index 4f5d6234d73..d761b73c4c3 100644
--- a/usr.bin/vmstat/vmstat.8
+++ b/usr.bin/vmstat/vmstat.8
@@ -1,3 +1,4 @@
+.\" $OpenBSD: vmstat.8,v 1.4 1996/06/26 05:42:41 deraadt Exp $
.\" $NetBSD: vmstat.8,v 1.12 1996/05/10 23:19:30 thorpej Exp $
.\"
.\" Copyright (c) 1986, 1993
diff --git a/usr.bin/w/Makefile b/usr.bin/w/Makefile
index 876c196ab0a..8bfc85f7524 100644
--- a/usr.bin/w/Makefile
+++ b/usr.bin/w/Makefile
@@ -1,4 +1,5 @@
-# @(#)Makefile 8.1 (Berkeley) 6/6/93
+# $OpenBSD: Makefile,v 1.2 1996/06/26 05:42:42 deraadt Exp $
+
PROG= w
SRCS= fmt.c pr_time.c proc_compare.c w.c
diff --git a/usr.bin/w/extern.h b/usr.bin/w/extern.h
index 3ee843b09da..de201afd439 100644
--- a/usr.bin/w/extern.h
+++ b/usr.bin/w/extern.h
@@ -1,3 +1,5 @@
+/* $OpenBSD: extern.h,v 1.2 1996/06/26 05:42:42 deraadt Exp $ */
+
/*-
* Copyright (c) 1993
* The Regents of the University of California. All rights reserved.
diff --git a/usr.bin/w/pr_time.c b/usr.bin/w/pr_time.c
index 7c43aebf55a..e1625c64351 100644
--- a/usr.bin/w/pr_time.c
+++ b/usr.bin/w/pr_time.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: pr_time.c,v 1.6 1996/06/26 05:42:43 deraadt Exp $ */
+
/*-
* Copyright (c) 1990, 1993, 1994
* The Regents of the University of California. All rights reserved.
diff --git a/usr.bin/w/proc_compare.c b/usr.bin/w/proc_compare.c
index e95359c9d25..df85e571a59 100644
--- a/usr.bin/w/proc_compare.c
+++ b/usr.bin/w/proc_compare.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: proc_compare.c,v 1.2 1996/06/26 05:42:43 deraadt Exp $ */
+
/*-
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/usr.bin/w/uptime.1 b/usr.bin/w/uptime.1
index 8290da95ace..a8fde47f70b 100644
--- a/usr.bin/w/uptime.1
+++ b/usr.bin/w/uptime.1
@@ -1,3 +1,5 @@
+.\" $OpenBSD: uptime.1,v 1.2 1996/06/26 05:42:44 deraadt Exp $
+.\"
.\" Copyright (c) 1980, 1990, 1993, 1994
.\" The Regents of the University of California. All rights reserved.
.\"
diff --git a/usr.bin/w/w.1 b/usr.bin/w/w.1
index d66e6e0e2fe..281eccdc276 100644
--- a/usr.bin/w/w.1
+++ b/usr.bin/w/w.1
@@ -1,3 +1,5 @@
+.\" $OpenBSD: w.1,v 1.2 1996/06/26 05:42:45 deraadt Exp $
+.\"
.\" Copyright (c) 1980, 1990, 1991, 1993
.\" The Regents of the University of California. All rights reserved.
.\"
diff --git a/usr.bin/w/w.c b/usr.bin/w/w.c
index f7deb59f1f7..fae6dbbb875 100644
--- a/usr.bin/w/w.c
+++ b/usr.bin/w/w.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: w.c,v 1.4 1996/06/26 05:42:45 deraadt Exp $ */
+
/*-
* Copyright (c) 1980, 1991, 1993, 1994
* The Regents of the University of California. All rights reserved.
diff --git a/usr.bin/wall/Makefile b/usr.bin/wall/Makefile
index 34d9c20634b..f9fbe234c43 100644
--- a/usr.bin/wall/Makefile
+++ b/usr.bin/wall/Makefile
@@ -1,5 +1,5 @@
+# $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 $
-# @(#)Makefile 8.1 (Berkeley) 6/6/93
PROG= wall
SRCS= ttymsg.c wall.c
diff --git a/usr.bin/wall/ttymsg.c b/usr.bin/wall/ttymsg.c
index 982481fe4e7..770132df4df 100644
--- a/usr.bin/wall/ttymsg.c
+++ b/usr.bin/wall/ttymsg.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: ttymsg.c,v 1.2 1996/06/26 05:42:47 deraadt Exp $ */
/* $NetBSD: ttymsg.c,v 1.3 1994/11/17 07:17:55 jtc Exp $ */
/*
@@ -37,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)ttymsg.c 8.2 (Berkeley) 11/16/93";
#endif
-static char rcsid[] = "$NetBSD: ttymsg.c,v 1.3 1994/11/17 07:17:55 jtc Exp $";
+static char rcsid[] = "$OpenBSD: ttymsg.c,v 1.2 1996/06/26 05:42:47 deraadt Exp $";
#endif /* not lint */
#include <sys/types.h>
diff --git a/usr.bin/wall/wall.1 b/usr.bin/wall/wall.1
index d2e15e4f688..4535f133e59 100644
--- a/usr.bin/wall/wall.1
+++ b/usr.bin/wall/wall.1
@@ -1,3 +1,4 @@
+.\" $OpenBSD: wall.1,v 1.2 1996/06/26 05:42:47 deraadt Exp $
.\" $NetBSD: wall.1,v 1.3 1994/11/17 07:17:57 jtc Exp $
.\"
.\" Copyright (c) 1989, 1990, 1993
diff --git a/usr.bin/wall/wall.c b/usr.bin/wall/wall.c
index 4082ec9e4b4..4f2c785c387 100644
--- a/usr.bin/wall/wall.c
+++ b/usr.bin/wall/wall.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: wall.c,v 1.2 1996/06/26 05:42:48 deraadt Exp $ */
/* $NetBSD: wall.c,v 1.6 1994/11/17 07:17:58 jtc Exp $ */
/*
@@ -43,7 +44,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)wall.c 8.2 (Berkeley) 11/16/93";
#endif
-static char rcsid[] = "$NetBSD: wall.c,v 1.6 1994/11/17 07:17:58 jtc Exp $";
+static char rcsid[] = "$OpenBSD: wall.c,v 1.2 1996/06/26 05:42:48 deraadt Exp $";
#endif /* not lint */
/*
diff --git a/usr.bin/wc/Makefile b/usr.bin/wc/Makefile
index 590b2e51913..657cf724cfa 100644
--- a/usr.bin/wc/Makefile
+++ b/usr.bin/wc/Makefile
@@ -1,5 +1,4 @@
-# from: @(#)Makefile 5.3 (Berkeley) 5/11/90
-# $Id: Makefile,v 1.1 1995/10/18 08:46:51 deraadt Exp $
+# $OpenBSD: Makefile,v 1.2 1996/06/26 05:42:49 deraadt Exp $
PROG= wc
diff --git a/usr.bin/wc/wc.1 b/usr.bin/wc/wc.1
index 152748f15ef..af136e061cc 100644
--- a/usr.bin/wc/wc.1
+++ b/usr.bin/wc/wc.1
@@ -1,3 +1,4 @@
+.\" $OpenBSD: wc.1,v 1.2 1996/06/26 05:42:49 deraadt Exp $
.\" Copyright (c) 1991 Regents of the University of California.
.\" All rights reserved.
.\"
@@ -33,7 +34,6 @@
.\" SUCH DAMAGE.
.\"
.\" from: @(#)wc.1 6.4 (Berkeley) 6/27/91
-.\" $Id: wc.1,v 1.1 1995/10/18 08:46:51 deraadt Exp $
.\"
.Dd June 27, 1991
.Dt WC 1
diff --git a/usr.bin/wc/wc.c b/usr.bin/wc/wc.c
index bc73b545c4c..974227949b9 100644
--- a/usr.bin/wc/wc.c
+++ b/usr.bin/wc/wc.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: wc.c,v 1.2 1996/06/26 05:42:50 deraadt Exp $ */
+
/*
* Copyright (c) 1980, 1987 Regents of the University of California.
* All rights reserved.
@@ -39,7 +41,7 @@ char copyright[] =
#ifndef lint
/*static char sccsid[] = "from: @(#)wc.c 5.7 (Berkeley) 3/2/91";*/
-static char rcsid[] = "$Id: wc.c,v 1.1 1995/10/18 08:46:51 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: wc.c,v 1.2 1996/06/26 05:42:50 deraadt Exp $";
#endif /* not lint */
/* wc line, word and char count */
diff --git a/usr.bin/what/Makefile b/usr.bin/what/Makefile
index 41d719036d6..3b7416b759a 100644
--- a/usr.bin/what/Makefile
+++ b/usr.bin/what/Makefile
@@ -1,5 +1,5 @@
+# $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 $
-# @(#)Makefile 8.1 (Berkeley) 6/6/93
PROG= what
diff --git a/usr.bin/what/what.1 b/usr.bin/what/what.1
index 198576da386..ca0c620ba9a 100644
--- a/usr.bin/what/what.1
+++ b/usr.bin/what/what.1
@@ -1,3 +1,4 @@
+.\" $OpenBSD: what.1,v 1.2 1996/06/26 05:42:51 deraadt Exp $
.\" $NetBSD: what.1,v 1.3 1994/11/17 06:59:38 jtc Exp $
.\"
.\" Copyright (c) 1980, 1991, 1993
diff --git a/usr.bin/what/what.c b/usr.bin/what/what.c
index 3bdea8e83c9..98c8122d4c4 100644
--- a/usr.bin/what/what.c
+++ b/usr.bin/what/what.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: what.c,v 1.2 1996/06/26 05:42:52 deraadt Exp $ */
/* $NetBSD: what.c,v 1.4 1994/12/20 16:01:03 jtc Exp $ */
/*
@@ -43,7 +44,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)what.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$NetBSD: what.c,v 1.4 1994/12/20 16:01:03 jtc Exp $";
+static char rcsid[] = "$OpenBSD: what.c,v 1.2 1996/06/26 05:42:52 deraadt Exp $";
#endif /* not lint */
#include <stdio.h>
diff --git a/usr.bin/whatis/Makefile b/usr.bin/whatis/Makefile
index 8655a7c9378..2a790f49f4a 100644
--- a/usr.bin/whatis/Makefile
+++ b/usr.bin/whatis/Makefile
@@ -1,4 +1,5 @@
-# @(#)Makefile 8.1 (Berkeley) 6/6/93
+# $OpenBSD: Makefile,v 1.2 1996/06/26 05:42:53 deraadt Exp $
+
PROG= whatis
SRCS= whatis.c config.c
diff --git a/usr.bin/whatis/whatis.1 b/usr.bin/whatis/whatis.1
index 0f1b0a1b04d..b0664a5b66c 100644
--- a/usr.bin/whatis/whatis.1
+++ b/usr.bin/whatis/whatis.1
@@ -1,3 +1,5 @@
+.\" $OpenBSD: whatis.1,v 1.2 1996/06/26 05:42:54 deraadt Exp $
+.\"
.\" Copyright (c) 1989, 1990, 1993
.\" The Regents of the University of California. All rights reserved.
.\"
diff --git a/usr.bin/whatis/whatis.c b/usr.bin/whatis/whatis.c
index 36e36b8dc5b..0daf5b617d8 100644
--- a/usr.bin/whatis/whatis.c
+++ b/usr.bin/whatis/whatis.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: whatis.c,v 1.2 1996/06/26 05:42:54 deraadt Exp $ */
+
/*
* Copyright (c) 1987, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/usr.bin/whereis/Makefile b/usr.bin/whereis/Makefile
index 39c4095adc4..77ecaf558bf 100644
--- a/usr.bin/whereis/Makefile
+++ b/usr.bin/whereis/Makefile
@@ -1,5 +1,4 @@
-# from: @(#)Makefile 8.1 (Berkeley) 6/6/93
-# $Id: Makefile,v 1.1 1995/10/18 08:46:52 deraadt Exp $
+# $OpenBSD: Makefile,v 1.2 1996/06/26 05:42:55 deraadt Exp $
PROG= whereis
diff --git a/usr.bin/whereis/whereis.1 b/usr.bin/whereis/whereis.1
index cc5783ef008..3369b73ecfb 100644
--- a/usr.bin/whereis/whereis.1
+++ b/usr.bin/whereis/whereis.1
@@ -1,3 +1,4 @@
+.\" $OpenBSD: whereis.1,v 1.2 1996/06/26 05:42:56 deraadt Exp $
.\" $NetBSD: whereis.1,v 1.4 1995/08/31 21:54:51 jtc Exp $
.\"
.\" Copyright (c) 1993
diff --git a/usr.bin/whereis/whereis.c b/usr.bin/whereis/whereis.c
index 412063a8731..cc1d0f64e57 100644
--- a/usr.bin/whereis/whereis.c
+++ b/usr.bin/whereis/whereis.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: whereis.c,v 1.2 1996/06/26 05:42:56 deraadt Exp $ */
/* $NetBSD: whereis.c,v 1.6 1995/08/31 21:54:52 jtc Exp $ */
/*-
@@ -43,7 +44,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)whereis.c 8.3 (Berkeley) 5/4/95";
#endif
-static char *rcsid = "$NetBSD: whereis.c,v 1.6 1995/08/31 21:54:52 jtc Exp $";
+static char *rcsid = "$OpenBSD: whereis.c,v 1.2 1996/06/26 05:42:56 deraadt Exp $";
#endif /* not lint */
#include <sys/param.h>
diff --git a/usr.bin/which/Makefile b/usr.bin/which/Makefile
index 613855aac0a..839ba2f78e5 100644
--- a/usr.bin/which/Makefile
+++ b/usr.bin/which/Makefile
@@ -1,5 +1,4 @@
-# from: @(#)Makefile 5.5 (Berkeley) 7/1/90
-# $Id: Makefile,v 1.1 1995/10/18 08:46:52 deraadt Exp $
+# $OpenBSD: Makefile,v 1.2 1996/06/26 05:42:57 deraadt Exp $
MAN= which.1
diff --git a/usr.bin/which/which.1 b/usr.bin/which/which.1
index 605bf1b3dc2..5eb92a3cc99 100644
--- a/usr.bin/which/which.1
+++ b/usr.bin/which/which.1
@@ -1,3 +1,4 @@
+.\" $OpenBSD: which.1,v 1.2 1996/06/26 05:42:58 deraadt Exp $
.\" Copyright (c) 1980, 1991 Regents of the University of California.
.\" All rights reserved.
.\"
@@ -30,7 +31,6 @@
.\" SUCH DAMAGE.
.\"
.\" from: @(#)which.1 6.3 (Berkeley) 4/23/91
-.\" $Id: which.1,v 1.1 1995/10/18 08:46:52 deraadt Exp $
.\"
.Dd April 23, 1991
.Dt WHICH 1
diff --git a/usr.bin/which/which.csh b/usr.bin/which/which.csh
index 5295deb2457..f958018d6db 100644
--- a/usr.bin/which/which.csh
+++ b/usr.bin/which/which.csh
@@ -1,4 +1,6 @@
#!/bin/csh
+# $OpenBSD: which.csh,v 1.2 1996/06/26 05:42:58 deraadt Exp $
+
#
# DO NOT USE "csh -f"
#
diff --git a/usr.bin/who/Makefile b/usr.bin/who/Makefile
index 0c6b9e7ce7c..e9448564bfa 100644
--- a/usr.bin/who/Makefile
+++ b/usr.bin/who/Makefile
@@ -1,5 +1,5 @@
+# $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 $
-# @(#)Makefile 8.1 (Berkeley) 6/6/93
PROG= who
diff --git a/usr.bin/who/who.1 b/usr.bin/who/who.1
index c2bf9983156..50bb6265339 100644
--- a/usr.bin/who/who.1
+++ b/usr.bin/who/who.1
@@ -1,3 +1,4 @@
+.\" $OpenBSD: who.1,v 1.2 1996/06/26 05:43:00 deraadt Exp $
.\" $NetBSD: who.1,v 1.5 1994/12/07 04:28:47 jtc Exp $
.\"
.\" Copyright (c) 1986, 1991, 1993
diff --git a/usr.bin/who/who.c b/usr.bin/who/who.c
index 743d36be45b..a5537513eb9 100644
--- a/usr.bin/who/who.c
+++ b/usr.bin/who/who.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: who.c,v 1.2 1996/06/26 05:43:00 deraadt Exp $ */
/* $NetBSD: who.c,v 1.4 1994/12/07 04:28:49 jtc Exp $ */
/*
@@ -46,7 +47,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)who.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$NetBSD: who.c,v 1.4 1994/12/07 04:28:49 jtc Exp $";
+static char rcsid[] = "$OpenBSD: who.c,v 1.2 1996/06/26 05:43:00 deraadt Exp $";
#endif /* not lint */
#include <sys/types.h>
diff --git a/usr.bin/whois/Makefile b/usr.bin/whois/Makefile
index b7044a53829..bcc22b7210d 100644
--- a/usr.bin/whois/Makefile
+++ b/usr.bin/whois/Makefile
@@ -1,5 +1,5 @@
+# $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 $
-# @(#)Makefile 8.1 (Berkeley) 6/6/93
PROG= whois
diff --git a/usr.bin/whois/whois.1 b/usr.bin/whois/whois.1
index 255ca1f2df5..13283bc204a 100644
--- a/usr.bin/whois/whois.1
+++ b/usr.bin/whois/whois.1
@@ -1,3 +1,4 @@
+.\" $OpenBSD: whois.1,v 1.2 1996/06/26 05:43:02 deraadt Exp $
.\" $NetBSD: whois.1,v 1.5 1995/08/31 21:51:32 jtc Exp $
.\"
.\" Copyright (c) 1985, 1990, 1993
diff --git a/usr.bin/whois/whois.c b/usr.bin/whois/whois.c
index 4e936fc385c..9ed130763e9 100644
--- a/usr.bin/whois/whois.c
+++ b/usr.bin/whois/whois.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: whois.c,v 1.2 1996/06/26 05:43:02 deraadt Exp $ */
/* $NetBSD: whois.c,v 1.5 1994/11/14 05:13:25 jtc Exp $ */
/*
@@ -43,7 +44,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)whois.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$NetBSD: whois.c,v 1.5 1994/11/14 05:13:25 jtc Exp $";
+static char rcsid[] = "$OpenBSD: whois.c,v 1.2 1996/06/26 05:43:02 deraadt Exp $";
#endif /* not lint */
#include <sys/types.h>
diff --git a/usr.bin/window/Makefile b/usr.bin/window/Makefile
index f86f4180f05..33806b368ac 100644
--- a/usr.bin/window/Makefile
+++ b/usr.bin/window/Makefile
@@ -1,5 +1,5 @@
+# $OpenBSD: Makefile,v 1.3 1996/06/26 05:43:03 deraadt Exp $
# $NetBSD: Makefile,v 1.6 1995/12/21 05:24:49 mycroft Exp $
-# @(#)Makefile 8.1 (Berkeley) 6/6/93
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/window/README b/usr.bin/window/README
index 42d45b368a3..2612b69bb9d 100644
--- a/usr.bin/window/README
+++ b/usr.bin/window/README
@@ -1,3 +1,5 @@
+/* $OpenBSD: README,v 1.2 1996/06/26 05:43:04 deraadt Exp $ */
+
/*-
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/usr.bin/window/alias.h b/usr.bin/window/alias.h
index 0722933aa36..f6db0b6bdf9 100644
--- a/usr.bin/window/alias.h
+++ b/usr.bin/window/alias.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: alias.h,v 1.2 1996/06/26 05:43:05 deraadt Exp $ */
/* $NetBSD: alias.h,v 1.3 1995/09/28 10:33:59 tls Exp $ */
/*
diff --git a/usr.bin/window/char.c b/usr.bin/window/char.c
index cd93c89c66d..4392ebb483f 100644
--- a/usr.bin/window/char.c
+++ b/usr.bin/window/char.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: char.c,v 1.2 1996/06/26 05:43:05 deraadt Exp $ */
/* $NetBSD: char.c,v 1.3 1995/09/28 10:34:00 tls Exp $ */
/*
@@ -40,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)char.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$NetBSD: char.c,v 1.3 1995/09/28 10:34:00 tls Exp $";
+static char rcsid[] = "$OpenBSD: char.c,v 1.2 1996/06/26 05:43:05 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/char.h b/usr.bin/window/char.h
index bdfb438ee82..d46c2efa325 100644
--- a/usr.bin/window/char.h
+++ b/usr.bin/window/char.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: char.h,v 1.2 1996/06/26 05:43:06 deraadt Exp $ */
/* $NetBSD: char.h,v 1.3 1995/09/28 10:34:01 tls Exp $ */
/*
diff --git a/usr.bin/window/cmd.c b/usr.bin/window/cmd.c
index 582c4e37469..3526f0a009d 100644
--- a/usr.bin/window/cmd.c
+++ b/usr.bin/window/cmd.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: cmd.c,v 1.3 1996/06/26 05:43:06 deraadt Exp $ */
/* $NetBSD: cmd.c,v 1.4 1996/02/08 20:44:57 mycroft Exp $ */
/*
@@ -40,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)cmd.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$NetBSD: cmd.c,v 1.4 1996/02/08 20:44:57 mycroft Exp $";
+static char rcsid[] = "$OpenBSD: cmd.c,v 1.3 1996/06/26 05:43:06 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/cmd1.c b/usr.bin/window/cmd1.c
index b3013c690de..41613489f42 100644
--- a/usr.bin/window/cmd1.c
+++ b/usr.bin/window/cmd1.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: cmd1.c,v 1.3 1996/06/26 05:43:07 deraadt Exp $ */
/* $NetBSD: cmd1.c,v 1.4 1996/02/08 20:44:59 mycroft Exp $ */
/*
@@ -40,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)cmd1.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$NetBSD: cmd1.c,v 1.4 1996/02/08 20:44:59 mycroft Exp $";
+static char rcsid[] = "$OpenBSD: cmd1.c,v 1.3 1996/06/26 05:43:07 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/cmd2.c b/usr.bin/window/cmd2.c
index c986cd89277..94e962a3767 100644
--- a/usr.bin/window/cmd2.c
+++ b/usr.bin/window/cmd2.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: cmd2.c,v 1.2 1996/06/26 05:43:07 deraadt Exp $ */
/* $NetBSD: cmd2.c,v 1.3 1995/09/28 10:34:05 tls Exp $ */
/*
@@ -40,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)cmd2.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$NetBSD: cmd2.c,v 1.3 1995/09/28 10:34:05 tls Exp $";
+static char rcsid[] = "$OpenBSD: cmd2.c,v 1.2 1996/06/26 05:43:07 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/cmd3.c b/usr.bin/window/cmd3.c
index d89fa5eca05..7203771096a 100644
--- a/usr.bin/window/cmd3.c
+++ b/usr.bin/window/cmd3.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: cmd3.c,v 1.2 1996/06/26 05:43:08 deraadt Exp $ */
/* $NetBSD: cmd3.c,v 1.3 1995/09/28 10:34:07 tls Exp $ */
/*
@@ -40,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)cmd3.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$NetBSD: cmd3.c,v 1.3 1995/09/28 10:34:07 tls Exp $";
+static char rcsid[] = "$OpenBSD: cmd3.c,v 1.2 1996/06/26 05:43:08 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/cmd4.c b/usr.bin/window/cmd4.c
index 23930c8271b..643b89add35 100644
--- a/usr.bin/window/cmd4.c
+++ b/usr.bin/window/cmd4.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: cmd4.c,v 1.2 1996/06/26 05:43:09 deraadt Exp $ */
/* $NetBSD: cmd4.c,v 1.3 1995/09/28 10:34:08 tls Exp $ */
/*
@@ -40,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)cmd4.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$NetBSD: cmd4.c,v 1.3 1995/09/28 10:34:08 tls Exp $";
+static char rcsid[] = "$OpenBSD: cmd4.c,v 1.2 1996/06/26 05:43:09 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/cmd5.c b/usr.bin/window/cmd5.c
index 45f3815cca7..27be19c6abd 100644
--- a/usr.bin/window/cmd5.c
+++ b/usr.bin/window/cmd5.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: cmd5.c,v 1.2 1996/06/26 05:43:09 deraadt Exp $ */
/* $NetBSD: cmd5.c,v 1.3 1995/09/28 10:34:09 tls Exp $ */
/*
@@ -40,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)cmd5.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$NetBSD: cmd5.c,v 1.3 1995/09/28 10:34:09 tls Exp $";
+static char rcsid[] = "$OpenBSD: cmd5.c,v 1.2 1996/06/26 05:43:09 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/cmd6.c b/usr.bin/window/cmd6.c
index 66dc5a1ba2f..5bfa962729c 100644
--- a/usr.bin/window/cmd6.c
+++ b/usr.bin/window/cmd6.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: cmd6.c,v 1.2 1996/06/26 05:43:10 deraadt Exp $ */
/* $NetBSD: cmd6.c,v 1.3 1995/09/28 10:34:10 tls Exp $ */
/*
@@ -40,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)cmd6.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$NetBSD: cmd6.c,v 1.3 1995/09/28 10:34:10 tls Exp $";
+static char rcsid[] = "$OpenBSD: cmd6.c,v 1.2 1996/06/26 05:43:10 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/cmd7.c b/usr.bin/window/cmd7.c
index 4884b20a7f3..cc675ac47c5 100644
--- a/usr.bin/window/cmd7.c
+++ b/usr.bin/window/cmd7.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: cmd7.c,v 1.2 1996/06/26 05:43:10 deraadt Exp $ */
/* $NetBSD: cmd7.c,v 1.3 1995/09/28 10:34:12 tls Exp $ */
/*
@@ -40,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)cmd7.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$NetBSD: cmd7.c,v 1.3 1995/09/28 10:34:12 tls Exp $";
+static char rcsid[] = "$OpenBSD: cmd7.c,v 1.2 1996/06/26 05:43:10 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/compress.c b/usr.bin/window/compress.c
index ba77458501f..a88773067af 100644
--- a/usr.bin/window/compress.c
+++ b/usr.bin/window/compress.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: compress.c,v 1.2 1996/06/26 05:43:11 deraadt Exp $ */
/* $NetBSD: compress.c,v 1.3 1995/09/28 10:34:13 tls Exp $ */
/*
@@ -40,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)compress.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$NetBSD: compress.c,v 1.3 1995/09/28 10:34:13 tls Exp $";
+static char rcsid[] = "$OpenBSD: compress.c,v 1.2 1996/06/26 05:43:11 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/context.c b/usr.bin/window/context.c
index 1251ebd589a..f6dbdcdd09f 100644
--- a/usr.bin/window/context.c
+++ b/usr.bin/window/context.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: context.c,v 1.2 1996/06/26 05:43:11 deraadt Exp $ */
/* $NetBSD: context.c,v 1.3 1995/09/28 10:34:15 tls Exp $ */
/*
@@ -40,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)context.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$NetBSD: context.c,v 1.3 1995/09/28 10:34:15 tls Exp $";
+static char rcsid[] = "$OpenBSD: context.c,v 1.2 1996/06/26 05:43:11 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/context.h b/usr.bin/window/context.h
index a38cb80b989..d0b9a8cf3d7 100644
--- a/usr.bin/window/context.h
+++ b/usr.bin/window/context.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: context.h,v 1.2 1996/06/26 05:43:12 deraadt Exp $ */
/* $NetBSD: context.h,v 1.3 1995/09/28 10:34:17 tls Exp $ */
/*
diff --git a/usr.bin/window/defs.h b/usr.bin/window/defs.h
index 24f06e64b98..e4dbcc0e245 100644
--- a/usr.bin/window/defs.h
+++ b/usr.bin/window/defs.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: defs.h,v 1.2 1996/06/26 05:43:13 deraadt Exp $ */
/* $NetBSD: defs.h,v 1.3 1995/09/28 10:34:19 tls Exp $ */
/*
diff --git a/usr.bin/window/error.c b/usr.bin/window/error.c
index acfbd27a487..8c52f019545 100644
--- a/usr.bin/window/error.c
+++ b/usr.bin/window/error.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: error.c,v 1.2 1996/06/26 05:43:13 deraadt Exp $ */
/* $NetBSD: error.c,v 1.3 1995/09/28 10:34:20 tls Exp $ */
/*
@@ -40,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)error.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$NetBSD: error.c,v 1.3 1995/09/28 10:34:20 tls Exp $";
+static char rcsid[] = "$OpenBSD: error.c,v 1.2 1996/06/26 05:43:13 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/lcmd.c b/usr.bin/window/lcmd.c
index 69b275e12f3..e89f7296f87 100644
--- a/usr.bin/window/lcmd.c
+++ b/usr.bin/window/lcmd.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: lcmd.c,v 1.2 1996/06/26 05:43:14 deraadt Exp $ */
/* $NetBSD: lcmd.c,v 1.3 1995/09/28 10:34:21 tls Exp $ */
/*
@@ -40,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)lcmd.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$NetBSD: lcmd.c,v 1.3 1995/09/28 10:34:21 tls Exp $";
+static char rcsid[] = "$OpenBSD: lcmd.c,v 1.2 1996/06/26 05:43:14 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/lcmd.h b/usr.bin/window/lcmd.h
index d50f4fed0ae..481ebdd3679 100644
--- a/usr.bin/window/lcmd.h
+++ b/usr.bin/window/lcmd.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: lcmd.h,v 1.2 1996/06/26 05:43:14 deraadt Exp $ */
/* $NetBSD: lcmd.h,v 1.3 1995/09/28 10:34:22 tls Exp $ */
/*
diff --git a/usr.bin/window/lcmd1.c b/usr.bin/window/lcmd1.c
index 8ce2f92a77b..0b7d1110ebd 100644
--- a/usr.bin/window/lcmd1.c
+++ b/usr.bin/window/lcmd1.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: lcmd1.c,v 1.3 1996/06/26 05:43:15 deraadt Exp $ */
/* $NetBSD: lcmd1.c,v 1.6 1996/02/08 20:45:00 mycroft Exp $ */
/*
@@ -40,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)lcmd1.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$NetBSD: lcmd1.c,v 1.6 1996/02/08 20:45:00 mycroft Exp $";
+static char rcsid[] = "$OpenBSD: lcmd1.c,v 1.3 1996/06/26 05:43:15 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/lcmd2.c b/usr.bin/window/lcmd2.c
index 027086eb025..6b7d8a22afb 100644
--- a/usr.bin/window/lcmd2.c
+++ b/usr.bin/window/lcmd2.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: lcmd2.c,v 1.2 1996/06/26 05:43:15 deraadt Exp $ */
/* $NetBSD: lcmd2.c,v 1.7 1995/09/29 00:44:04 cgd Exp $ */
/*
@@ -40,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)lcmd2.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$NetBSD: lcmd2.c,v 1.7 1995/09/29 00:44:04 cgd Exp $";
+static char rcsid[] = "$OpenBSD: lcmd2.c,v 1.2 1996/06/26 05:43:15 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/local.h b/usr.bin/window/local.h
index 435b5facc1c..4cf31ffa3f6 100644
--- a/usr.bin/window/local.h
+++ b/usr.bin/window/local.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: local.h,v 1.2 1996/06/26 05:43:16 deraadt Exp $ */
/* $NetBSD: local.h,v 1.3 1995/09/28 10:34:26 tls Exp $ */
/*
diff --git a/usr.bin/window/main.c b/usr.bin/window/main.c
index d801897a93f..4f2303676bd 100644
--- a/usr.bin/window/main.c
+++ b/usr.bin/window/main.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: main.c,v 1.4 1996/06/26 05:43:17 deraadt Exp $ */
/* $NetBSD: main.c,v 1.6 1996/02/08 20:45:01 mycroft Exp $ */
/*
@@ -46,7 +47,7 @@ char copyright[] =
#if 0
static char sccsid[] = "@(#)main.c 8.2 (Berkeley) 4/2/94";
#else
-static char rcsid[] = "$NetBSD: main.c,v 1.6 1996/02/08 20:45:01 mycroft Exp $";
+static char rcsid[] = "$OpenBSD: main.c,v 1.4 1996/06/26 05:43:17 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/mloop.c b/usr.bin/window/mloop.c
index 64aaf6f4dcf..bfa3878d70e 100644
--- a/usr.bin/window/mloop.c
+++ b/usr.bin/window/mloop.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: mloop.c,v 1.4 1996/06/26 05:43:17 deraadt Exp $ */
/* $NetBSD: mloop.c,v 1.5 1996/02/08 20:45:03 mycroft Exp $ */
/*
@@ -40,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)mloop.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$NetBSD: mloop.c,v 1.5 1996/02/08 20:45:03 mycroft Exp $";
+static char rcsid[] = "$OpenBSD: mloop.c,v 1.4 1996/06/26 05:43:17 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/parser.h b/usr.bin/window/parser.h
index 4626d288122..8f0229cc692 100644
--- a/usr.bin/window/parser.h
+++ b/usr.bin/window/parser.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: parser.h,v 1.2 1996/06/26 05:43:18 deraadt Exp $ */
/* $NetBSD: parser.h,v 1.3 1995/09/28 10:34:29 tls Exp $ */
/*
diff --git a/usr.bin/window/parser1.c b/usr.bin/window/parser1.c
index d0d145f5e1c..69959ee5c48 100644
--- a/usr.bin/window/parser1.c
+++ b/usr.bin/window/parser1.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: parser1.c,v 1.2 1996/06/26 05:43:18 deraadt Exp $ */
/* $NetBSD: parser1.c,v 1.3 1995/09/28 10:34:31 tls Exp $ */
/*
@@ -40,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)parser1.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$NetBSD: parser1.c,v 1.3 1995/09/28 10:34:31 tls Exp $";
+static char rcsid[] = "$OpenBSD: parser1.c,v 1.2 1996/06/26 05:43:18 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/parser2.c b/usr.bin/window/parser2.c
index 286f15ced68..1b1927a18bc 100644
--- a/usr.bin/window/parser2.c
+++ b/usr.bin/window/parser2.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: parser2.c,v 1.2 1996/06/26 05:43:19 deraadt Exp $ */
/* $NetBSD: parser2.c,v 1.3 1995/09/28 10:34:32 tls Exp $ */
/*
@@ -40,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)parser2.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$NetBSD: parser2.c,v 1.3 1995/09/28 10:34:32 tls Exp $";
+static char rcsid[] = "$OpenBSD: parser2.c,v 1.2 1996/06/26 05:43:19 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/parser3.c b/usr.bin/window/parser3.c
index 74140c01582..18319e4efc0 100644
--- a/usr.bin/window/parser3.c
+++ b/usr.bin/window/parser3.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: parser3.c,v 1.2 1996/06/26 05:43:19 deraadt Exp $ */
/* $NetBSD: parser3.c,v 1.3 1995/09/28 10:34:33 tls Exp $ */
/*
@@ -40,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)parser3.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$NetBSD: parser3.c,v 1.3 1995/09/28 10:34:33 tls Exp $";
+static char rcsid[] = "$OpenBSD: parser3.c,v 1.2 1996/06/26 05:43:19 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/parser4.c b/usr.bin/window/parser4.c
index c2a0dac28d1..0b4681536a2 100644
--- a/usr.bin/window/parser4.c
+++ b/usr.bin/window/parser4.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: parser4.c,v 1.2 1996/06/26 05:43:20 deraadt Exp $ */
/* $NetBSD: parser4.c,v 1.5 1995/09/29 00:44:05 cgd Exp $ */
/*
@@ -40,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)parser4.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$NetBSD: parser4.c,v 1.5 1995/09/29 00:44:05 cgd Exp $";
+static char rcsid[] = "$OpenBSD: parser4.c,v 1.2 1996/06/26 05:43:20 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/parser5.c b/usr.bin/window/parser5.c
index 7ff5eb89536..aed4fa07f6f 100644
--- a/usr.bin/window/parser5.c
+++ b/usr.bin/window/parser5.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: parser5.c,v 1.2 1996/06/26 05:43:20 deraadt Exp $ */
/* $NetBSD: parser5.c,v 1.3 1995/09/28 10:34:35 tls Exp $ */
/*
@@ -40,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)parser5.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$NetBSD: parser5.c,v 1.3 1995/09/28 10:34:35 tls Exp $";
+static char rcsid[] = "$OpenBSD: parser5.c,v 1.2 1996/06/26 05:43:20 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/scanner.c b/usr.bin/window/scanner.c
index 7d3029cc61f..be848514ee7 100644
--- a/usr.bin/window/scanner.c
+++ b/usr.bin/window/scanner.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: scanner.c,v 1.2 1996/06/26 05:43:21 deraadt Exp $ */
/* $NetBSD: scanner.c,v 1.3 1995/09/28 10:34:36 tls Exp $ */
/*
@@ -40,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)scanner.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$NetBSD: scanner.c,v 1.3 1995/09/28 10:34:36 tls Exp $";
+static char rcsid[] = "$OpenBSD: scanner.c,v 1.2 1996/06/26 05:43:21 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/startup.c b/usr.bin/window/startup.c
index 9f9c1dbc994..88cb4209b2e 100644
--- a/usr.bin/window/startup.c
+++ b/usr.bin/window/startup.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: startup.c,v 1.3 1996/06/26 05:43:21 deraadt Exp $ */
/* $NetBSD: startup.c,v 1.4 1996/02/08 20:45:04 mycroft Exp $ */
/*
@@ -40,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)startup.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$NetBSD: startup.c,v 1.4 1996/02/08 20:45:04 mycroft Exp $";
+static char rcsid[] = "$OpenBSD: startup.c,v 1.3 1996/06/26 05:43:21 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/string.c b/usr.bin/window/string.c
index 2f5bee41dc1..061aad2ff7b 100644
--- a/usr.bin/window/string.c
+++ b/usr.bin/window/string.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: string.c,v 1.2 1996/06/26 05:43:22 deraadt Exp $ */
/* $NetBSD: string.c,v 1.5 1995/09/29 00:44:06 cgd Exp $ */
/*
@@ -40,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)string.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$NetBSD: string.c,v 1.5 1995/09/29 00:44:06 cgd Exp $";
+static char rcsid[] = "$OpenBSD: string.c,v 1.2 1996/06/26 05:43:22 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/string.h b/usr.bin/window/string.h
index a26b2bc30c6..9017531894c 100644
--- a/usr.bin/window/string.h
+++ b/usr.bin/window/string.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: string.h,v 1.2 1996/06/26 05:43:23 deraadt Exp $ */
/* $NetBSD: string.h,v 1.3 1995/09/28 10:34:40 tls Exp $ */
/*
diff --git a/usr.bin/window/token.h b/usr.bin/window/token.h
index aa002230520..f0b890054d6 100644
--- a/usr.bin/window/token.h
+++ b/usr.bin/window/token.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: token.h,v 1.2 1996/06/26 05:43:23 deraadt Exp $ */
/* $NetBSD: token.h,v 1.3 1995/09/28 10:34:41 tls Exp $ */
/*
diff --git a/usr.bin/window/tt.h b/usr.bin/window/tt.h
index ed4c13b8335..d1c445f4686 100644
--- a/usr.bin/window/tt.h
+++ b/usr.bin/window/tt.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: tt.h,v 1.2 1996/06/26 05:43:24 deraadt Exp $ */
/* $NetBSD: tt.h,v 1.3 1995/09/28 10:34:42 tls Exp $ */
/*
diff --git a/usr.bin/window/ttf100.c b/usr.bin/window/ttf100.c
index b9c14b69f43..0fcac078697 100644
--- a/usr.bin/window/ttf100.c
+++ b/usr.bin/window/ttf100.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: ttf100.c,v 1.2 1996/06/26 05:43:24 deraadt Exp $ */
/* $NetBSD: ttf100.c,v 1.3 1995/09/28 10:34:44 tls Exp $ */
/*
@@ -40,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)ttf100.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$NetBSD: ttf100.c,v 1.3 1995/09/28 10:34:44 tls Exp $";
+static char rcsid[] = "$OpenBSD: ttf100.c,v 1.2 1996/06/26 05:43:24 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/ttgeneric.c b/usr.bin/window/ttgeneric.c
index 640758e42a0..237af4b0904 100644
--- a/usr.bin/window/ttgeneric.c
+++ b/usr.bin/window/ttgeneric.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: ttgeneric.c,v 1.2 1996/06/26 05:43:25 deraadt Exp $ */
/* $NetBSD: ttgeneric.c,v 1.3 1995/09/28 10:34:45 tls Exp $ */
/*
@@ -40,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)ttgeneric.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$NetBSD: ttgeneric.c,v 1.3 1995/09/28 10:34:45 tls Exp $";
+static char rcsid[] = "$OpenBSD: ttgeneric.c,v 1.2 1996/06/26 05:43:25 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/tth19.c b/usr.bin/window/tth19.c
index edeed049cc4..3aa904e55af 100644
--- a/usr.bin/window/tth19.c
+++ b/usr.bin/window/tth19.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: tth19.c,v 1.2 1996/06/26 05:43:25 deraadt Exp $ */
/* $NetBSD: tth19.c,v 1.3 1995/09/28 10:34:47 tls Exp $ */
/*
@@ -40,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)tth19.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$NetBSD: tth19.c,v 1.3 1995/09/28 10:34:47 tls Exp $";
+static char rcsid[] = "$OpenBSD: tth19.c,v 1.2 1996/06/26 05:43:25 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/tth29.c b/usr.bin/window/tth29.c
index 127abb08f6d..97dcacd06ca 100644
--- a/usr.bin/window/tth29.c
+++ b/usr.bin/window/tth29.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: tth29.c,v 1.2 1996/06/26 05:43:26 deraadt Exp $ */
/* $NetBSD: tth29.c,v 1.3 1995/09/28 10:34:48 tls Exp $ */
/*
@@ -40,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)tth29.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$NetBSD: tth29.c,v 1.3 1995/09/28 10:34:48 tls Exp $";
+static char rcsid[] = "$OpenBSD: tth29.c,v 1.2 1996/06/26 05:43:26 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/ttinit.c b/usr.bin/window/ttinit.c
index 8ec1fd42a29..0ab44cbf50b 100644
--- a/usr.bin/window/ttinit.c
+++ b/usr.bin/window/ttinit.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: ttinit.c,v 1.2 1996/06/26 05:43:26 deraadt Exp $ */
/* $NetBSD: ttinit.c,v 1.3 1995/09/28 10:34:50 tls Exp $ */
/*
@@ -40,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)ttinit.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$NetBSD: ttinit.c,v 1.3 1995/09/28 10:34:50 tls Exp $";
+static char rcsid[] = "$OpenBSD: ttinit.c,v 1.2 1996/06/26 05:43:26 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/ttoutput.c b/usr.bin/window/ttoutput.c
index 28f4980f09b..2b662489761 100644
--- a/usr.bin/window/ttoutput.c
+++ b/usr.bin/window/ttoutput.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: ttoutput.c,v 1.2 1996/06/26 05:43:27 deraadt Exp $ */
/* $NetBSD: ttoutput.c,v 1.3 1995/09/28 10:34:51 tls Exp $ */
/*
@@ -40,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)ttoutput.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$NetBSD: ttoutput.c,v 1.3 1995/09/28 10:34:51 tls Exp $";
+static char rcsid[] = "$OpenBSD: ttoutput.c,v 1.2 1996/06/26 05:43:27 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/tttermcap.c b/usr.bin/window/tttermcap.c
index 0a057a3dd0e..8d110580bb1 100644
--- a/usr.bin/window/tttermcap.c
+++ b/usr.bin/window/tttermcap.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: tttermcap.c,v 1.2 1996/06/26 05:43:27 deraadt Exp $ */
/* $NetBSD: tttermcap.c,v 1.3 1995/09/28 10:34:52 tls Exp $ */
/*
@@ -40,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)tttermcap.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$NetBSD: tttermcap.c,v 1.3 1995/09/28 10:34:52 tls Exp $";
+static char rcsid[] = "$OpenBSD: tttermcap.c,v 1.2 1996/06/26 05:43:27 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/tttvi925.c b/usr.bin/window/tttvi925.c
index 7897230b764..a47c194333b 100644
--- a/usr.bin/window/tttvi925.c
+++ b/usr.bin/window/tttvi925.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: tttvi925.c,v 1.2 1996/06/26 05:43:28 deraadt Exp $ */
/* $NetBSD: tttvi925.c,v 1.3 1995/09/28 10:34:54 tls Exp $ */
/*
@@ -40,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)tttvi925.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$NetBSD: tttvi925.c,v 1.3 1995/09/28 10:34:54 tls Exp $";
+static char rcsid[] = "$OpenBSD: tttvi925.c,v 1.2 1996/06/26 05:43:28 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/ttwyse60.c b/usr.bin/window/ttwyse60.c
index c75dd4de2f7..3b457e73b21 100644
--- a/usr.bin/window/ttwyse60.c
+++ b/usr.bin/window/ttwyse60.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: ttwyse60.c,v 1.2 1996/06/26 05:43:28 deraadt Exp $ */
/* $NetBSD: ttwyse60.c,v 1.3 1995/09/28 10:34:55 tls Exp $ */
/*
@@ -47,7 +48,7 @@
#if 0
static char sccsid[] = "@(#)ttwyse60.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$NetBSD: ttwyse60.c,v 1.3 1995/09/28 10:34:55 tls Exp $";
+static char rcsid[] = "$OpenBSD: ttwyse60.c,v 1.2 1996/06/26 05:43:28 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/ttwyse75.c b/usr.bin/window/ttwyse75.c
index 014eb6df1d3..91b095103a4 100644
--- a/usr.bin/window/ttwyse75.c
+++ b/usr.bin/window/ttwyse75.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: ttwyse75.c,v 1.2 1996/06/26 05:43:29 deraadt Exp $ */
/* $NetBSD: ttwyse75.c,v 1.3 1995/09/28 10:34:56 tls Exp $ */
/*
@@ -47,7 +48,7 @@
#if 0
static char sccsid[] = "@(#)ttwyse75.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$NetBSD: ttwyse75.c,v 1.3 1995/09/28 10:34:56 tls Exp $";
+static char rcsid[] = "$OpenBSD: ttwyse75.c,v 1.2 1996/06/26 05:43:29 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/ttzapple.c b/usr.bin/window/ttzapple.c
index 8e7857de30f..481faa7df66 100644
--- a/usr.bin/window/ttzapple.c
+++ b/usr.bin/window/ttzapple.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: ttzapple.c,v 1.2 1996/06/26 05:43:30 deraadt Exp $ */
/* $NetBSD: ttzapple.c,v 1.3 1995/09/28 10:34:57 tls Exp $ */
/*
@@ -40,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)ttzapple.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$NetBSD: ttzapple.c,v 1.3 1995/09/28 10:34:57 tls Exp $";
+static char rcsid[] = "$OpenBSD: ttzapple.c,v 1.2 1996/06/26 05:43:30 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/ttzentec.c b/usr.bin/window/ttzentec.c
index bec398be3f8..5bbee9cbb4e 100644
--- a/usr.bin/window/ttzentec.c
+++ b/usr.bin/window/ttzentec.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: ttzentec.c,v 1.2 1996/06/26 05:43:30 deraadt Exp $ */
/* $NetBSD: ttzentec.c,v 1.3 1995/09/28 10:34:58 tls Exp $ */
/*
@@ -40,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)ttzentec.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$NetBSD: ttzentec.c,v 1.3 1995/09/28 10:34:58 tls Exp $";
+static char rcsid[] = "$OpenBSD: ttzentec.c,v 1.2 1996/06/26 05:43:30 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/value.h b/usr.bin/window/value.h
index d6b051f84b7..60d959bff53 100644
--- a/usr.bin/window/value.h
+++ b/usr.bin/window/value.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: value.h,v 1.2 1996/06/26 05:43:31 deraadt Exp $ */
/* $NetBSD: value.h,v 1.3 1995/09/28 10:35:00 tls Exp $ */
/*
diff --git a/usr.bin/window/var.c b/usr.bin/window/var.c
index 3f034b64cd2..0b06ff144b1 100644
--- a/usr.bin/window/var.c
+++ b/usr.bin/window/var.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: var.c,v 1.2 1996/06/26 05:43:31 deraadt Exp $ */
/* $NetBSD: var.c,v 1.4 1995/09/28 10:35:01 tls Exp $ */
/*
@@ -40,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)var.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$NetBSD: var.c,v 1.4 1995/09/28 10:35:01 tls Exp $";
+static char rcsid[] = "$OpenBSD: var.c,v 1.2 1996/06/26 05:43:31 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/var.h b/usr.bin/window/var.h
index 1038e496c5a..3545cd5b43b 100644
--- a/usr.bin/window/var.h
+++ b/usr.bin/window/var.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: var.h,v 1.2 1996/06/26 05:43:32 deraadt Exp $ */
/* $NetBSD: var.h,v 1.3 1995/09/28 10:35:02 tls Exp $ */
/*
diff --git a/usr.bin/window/win.c b/usr.bin/window/win.c
index a8b5c9ab05b..64565e9ce6a 100644
--- a/usr.bin/window/win.c
+++ b/usr.bin/window/win.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: win.c,v 1.4 1996/06/26 05:43:32 deraadt Exp $ */
/* $NetBSD: win.c,v 1.8 1996/02/08 21:07:57 mycroft Exp $ */
/*
@@ -40,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)win.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$NetBSD: win.c,v 1.8 1996/02/08 21:07:57 mycroft Exp $";
+static char rcsid[] = "$OpenBSD: win.c,v 1.4 1996/06/26 05:43:32 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/window.1 b/usr.bin/window/window.1
index 46dea8dc812..4d1882f6d56 100644
--- a/usr.bin/window/window.1
+++ b/usr.bin/window/window.1
@@ -1,3 +1,4 @@
+.\" $OpenBSD: window.1,v 1.2 1996/06/26 05:43:33 deraadt Exp $
.\" $NetBSD: window.1,v 1.3 1995/09/28 10:35:05 tls Exp $
.\"
.\" Copyright (c) 1985, 1990, 1993
diff --git a/usr.bin/window/windowrc b/usr.bin/window/windowrc
index 57c695a7223..fe0b5208cdd 100644
--- a/usr.bin/window/windowrc
+++ b/usr.bin/window/windowrc
@@ -1,3 +1,5 @@
+# $OpenBSD: windowrc,v 1.2 1996/06/26 05:43:34 deraadt Exp $
+
# Copyright (c) 1983, 1993
# The Regents of the University of California. All rights reserved.
#
diff --git a/usr.bin/window/ww.h b/usr.bin/window/ww.h
index 6b44cf0dcab..ad71da8c81d 100644
--- a/usr.bin/window/ww.h
+++ b/usr.bin/window/ww.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: ww.h,v 1.4 1996/06/26 05:43:34 deraadt Exp $ */
/* $NetBSD: ww.h,v 1.8 1996/02/08 21:48:51 mycroft Exp $ */
/*
diff --git a/usr.bin/window/wwadd.c b/usr.bin/window/wwadd.c
index 1ec834cb3df..01ad76aa943 100644
--- a/usr.bin/window/wwadd.c
+++ b/usr.bin/window/wwadd.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: wwadd.c,v 1.3 1996/06/26 05:43:35 deraadt Exp $ */
/* $NetBSD: wwadd.c,v 1.4 1996/02/08 21:48:56 mycroft Exp $ */
/*
@@ -40,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)wwadd.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$NetBSD: wwadd.c,v 1.4 1996/02/08 21:48:56 mycroft Exp $";
+static char rcsid[] = "$OpenBSD: wwadd.c,v 1.3 1996/06/26 05:43:35 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/wwalloc.c b/usr.bin/window/wwalloc.c
index 31e81a18d8d..89fdb449694 100644
--- a/usr.bin/window/wwalloc.c
+++ b/usr.bin/window/wwalloc.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: wwalloc.c,v 1.2 1996/06/26 05:43:35 deraadt Exp $ */
/* $NetBSD: wwalloc.c,v 1.3 1995/09/28 10:35:10 tls Exp $ */
/*
@@ -40,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)wwalloc.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$NetBSD: wwalloc.c,v 1.3 1995/09/28 10:35:10 tls Exp $";
+static char rcsid[] = "$OpenBSD: wwalloc.c,v 1.2 1996/06/26 05:43:35 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/wwbox.c b/usr.bin/window/wwbox.c
index 91862d70881..5371f73e109 100644
--- a/usr.bin/window/wwbox.c
+++ b/usr.bin/window/wwbox.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: wwbox.c,v 1.2 1996/06/26 05:43:36 deraadt Exp $ */
/* $NetBSD: wwbox.c,v 1.3 1995/09/28 10:35:11 tls Exp $ */
/*
@@ -40,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)wwbox.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$NetBSD: wwbox.c,v 1.3 1995/09/28 10:35:11 tls Exp $";
+static char rcsid[] = "$OpenBSD: wwbox.c,v 1.2 1996/06/26 05:43:36 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/wwchild.c b/usr.bin/window/wwchild.c
index 0b1cfac43f6..47a0518a5ec 100644
--- a/usr.bin/window/wwchild.c
+++ b/usr.bin/window/wwchild.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: wwchild.c,v 1.2 1996/06/26 05:43:36 deraadt Exp $ */
/* $NetBSD: wwchild.c,v 1.3 1995/09/28 10:35:13 tls Exp $ */
/*
@@ -40,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)wwchild.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$NetBSD: wwchild.c,v 1.3 1995/09/28 10:35:13 tls Exp $";
+static char rcsid[] = "$OpenBSD: wwchild.c,v 1.2 1996/06/26 05:43:36 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/wwclose.c b/usr.bin/window/wwclose.c
index a0d4bc78636..d4cf4ee1cc7 100644
--- a/usr.bin/window/wwclose.c
+++ b/usr.bin/window/wwclose.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: wwclose.c,v 1.2 1996/06/26 05:43:37 deraadt Exp $ */
/* $NetBSD: wwclose.c,v 1.3 1995/09/28 10:35:14 tls Exp $ */
/*
@@ -40,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)wwclose.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$NetBSD: wwclose.c,v 1.3 1995/09/28 10:35:14 tls Exp $";
+static char rcsid[] = "$OpenBSD: wwclose.c,v 1.2 1996/06/26 05:43:37 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/wwclreol.c b/usr.bin/window/wwclreol.c
index 1237225b8d2..78e82a65ada 100644
--- a/usr.bin/window/wwclreol.c
+++ b/usr.bin/window/wwclreol.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: wwclreol.c,v 1.3 1996/06/26 05:43:37 deraadt Exp $ */
/* $NetBSD: wwclreol.c,v 1.4 1996/02/08 21:48:58 mycroft Exp $ */
/*
@@ -40,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)wwclreol.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$NetBSD: wwclreol.c,v 1.4 1996/02/08 21:48:58 mycroft Exp $";
+static char rcsid[] = "$OpenBSD: wwclreol.c,v 1.3 1996/06/26 05:43:37 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/wwclreos.c b/usr.bin/window/wwclreos.c
index 5a348d5ef6c..a57b6f51072 100644
--- a/usr.bin/window/wwclreos.c
+++ b/usr.bin/window/wwclreos.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: wwclreos.c,v 1.3 1996/06/26 05:43:38 deraadt Exp $ */
/* $NetBSD: wwclreos.c,v 1.4 1996/02/08 20:45:07 mycroft Exp $ */
/*
@@ -40,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)wwclreos.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$NetBSD: wwclreos.c,v 1.4 1996/02/08 20:45:07 mycroft Exp $";
+static char rcsid[] = "$OpenBSD: wwclreos.c,v 1.3 1996/06/26 05:43:38 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/wwcursor.c b/usr.bin/window/wwcursor.c
index a50638dcd14..5d19d5e6feb 100644
--- a/usr.bin/window/wwcursor.c
+++ b/usr.bin/window/wwcursor.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: wwcursor.c,v 1.3 1996/06/26 05:43:38 deraadt Exp $ */
/* $NetBSD: wwcursor.c,v 1.4 1996/02/08 20:45:08 mycroft Exp $ */
/*
@@ -40,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)wwcursor.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$NetBSD: wwcursor.c,v 1.4 1996/02/08 20:45:08 mycroft Exp $";
+static char rcsid[] = "$OpenBSD: wwcursor.c,v 1.3 1996/06/26 05:43:38 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/wwdata.c b/usr.bin/window/wwdata.c
index 6406c10c212..fb6458bdccf 100644
--- a/usr.bin/window/wwdata.c
+++ b/usr.bin/window/wwdata.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: wwdata.c,v 1.2 1996/06/26 05:43:39 deraadt Exp $ */
/* $NetBSD: wwdata.c,v 1.3 1995/09/28 10:35:20 tls Exp $ */
/*
@@ -40,6 +41,6 @@
#if 0
static char sccsid[] = "@(#)wwdata.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$NetBSD: wwdata.c,v 1.3 1995/09/28 10:35:20 tls Exp $";
+static char rcsid[] = "$OpenBSD: wwdata.c,v 1.2 1996/06/26 05:43:39 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/wwdelchar.c b/usr.bin/window/wwdelchar.c
index d8910fc8f46..9aec8fb4e59 100644
--- a/usr.bin/window/wwdelchar.c
+++ b/usr.bin/window/wwdelchar.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: wwdelchar.c,v 1.3 1996/06/26 05:43:39 deraadt Exp $ */
/* $NetBSD: wwdelchar.c,v 1.4 1996/02/08 21:49:00 mycroft Exp $ */
/*
@@ -40,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)wwdelchar.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$NetBSD: wwdelchar.c,v 1.4 1996/02/08 21:49:00 mycroft Exp $";
+static char rcsid[] = "$OpenBSD: wwdelchar.c,v 1.3 1996/06/26 05:43:39 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/wwdelete.c b/usr.bin/window/wwdelete.c
index 9e3db62ba5c..5a92de11af7 100644
--- a/usr.bin/window/wwdelete.c
+++ b/usr.bin/window/wwdelete.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: wwdelete.c,v 1.3 1996/06/26 05:43:40 deraadt Exp $ */
/* $NetBSD: wwdelete.c,v 1.4 1996/02/08 21:49:01 mycroft Exp $ */
/*
@@ -40,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)wwdelete.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$NetBSD: wwdelete.c,v 1.4 1996/02/08 21:49:01 mycroft Exp $";
+static char rcsid[] = "$OpenBSD: wwdelete.c,v 1.3 1996/06/26 05:43:40 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/wwdelline.c b/usr.bin/window/wwdelline.c
index 7a1b5c1d1b9..fc879e0e519 100644
--- a/usr.bin/window/wwdelline.c
+++ b/usr.bin/window/wwdelline.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: wwdelline.c,v 1.2 1996/06/26 05:43:40 deraadt Exp $ */
/* $NetBSD: wwdelline.c,v 1.3 1995/09/28 10:35:24 tls Exp $ */
/*
@@ -40,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)wwdelline.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$NetBSD: wwdelline.c,v 1.3 1995/09/28 10:35:24 tls Exp $";
+static char rcsid[] = "$OpenBSD: wwdelline.c,v 1.2 1996/06/26 05:43:40 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/wwdump.c b/usr.bin/window/wwdump.c
index 4cc156e4e3a..31a632c0e96 100644
--- a/usr.bin/window/wwdump.c
+++ b/usr.bin/window/wwdump.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: wwdump.c,v 1.2 1996/06/26 05:43:41 deraadt Exp $ */
/* $NetBSD: wwdump.c,v 1.5 1995/09/29 00:44:09 cgd Exp $ */
/*
@@ -40,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)wwdump.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$NetBSD: wwdump.c,v 1.5 1995/09/29 00:44:09 cgd Exp $";
+static char rcsid[] = "$OpenBSD: wwdump.c,v 1.2 1996/06/26 05:43:41 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/wwend.c b/usr.bin/window/wwend.c
index 0c6704f408a..afad2fa7d1f 100644
--- a/usr.bin/window/wwend.c
+++ b/usr.bin/window/wwend.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: wwend.c,v 1.2 1996/06/26 05:43:41 deraadt Exp $ */
/* $NetBSD: wwend.c,v 1.3 1995/09/28 10:35:26 tls Exp $ */
/*
@@ -40,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)wwend.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$NetBSD: wwend.c,v 1.3 1995/09/28 10:35:26 tls Exp $";
+static char rcsid[] = "$OpenBSD: wwend.c,v 1.2 1996/06/26 05:43:41 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/wwenviron.c b/usr.bin/window/wwenviron.c
index 229bd47991d..ad7b973ea00 100644
--- a/usr.bin/window/wwenviron.c
+++ b/usr.bin/window/wwenviron.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: wwenviron.c,v 1.3 1996/06/26 05:43:41 deraadt Exp $ */
/* $NetBSD: wwenviron.c,v 1.4 1995/12/21 08:39:50 mycroft Exp $ */
/*
@@ -40,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)wwenviron.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$NetBSD: wwenviron.c,v 1.4 1995/12/21 08:39:50 mycroft Exp $";
+static char rcsid[] = "$OpenBSD: wwenviron.c,v 1.3 1996/06/26 05:43:41 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/wwerror.c b/usr.bin/window/wwerror.c
index ed33454def7..c2cfde01596 100644
--- a/usr.bin/window/wwerror.c
+++ b/usr.bin/window/wwerror.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: wwerror.c,v 1.2 1996/06/26 05:43:42 deraadt Exp $ */
/* $NetBSD: wwerror.c,v 1.3 1995/09/28 10:35:29 tls Exp $ */
/*
@@ -40,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)wwerror.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$NetBSD: wwerror.c,v 1.3 1995/09/28 10:35:29 tls Exp $";
+static char rcsid[] = "$OpenBSD: wwerror.c,v 1.2 1996/06/26 05:43:42 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/wwflush.c b/usr.bin/window/wwflush.c
index 4ccf896c106..64df995124d 100644
--- a/usr.bin/window/wwflush.c
+++ b/usr.bin/window/wwflush.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: wwflush.c,v 1.3 1996/06/26 05:43:42 deraadt Exp $ */
/* $NetBSD: wwflush.c,v 1.5 1995/12/21 10:46:08 mycroft Exp $ */
/*
@@ -40,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)wwflush.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$NetBSD: wwflush.c,v 1.5 1995/12/21 10:46:08 mycroft Exp $";
+static char rcsid[] = "$OpenBSD: wwflush.c,v 1.3 1996/06/26 05:43:42 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/wwframe.c b/usr.bin/window/wwframe.c
index fb54eb4dc58..bcd6e9cfb6e 100644
--- a/usr.bin/window/wwframe.c
+++ b/usr.bin/window/wwframe.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: wwframe.c,v 1.3 1996/06/26 05:43:43 deraadt Exp $ */
/* $NetBSD: wwframe.c,v 1.4 1996/02/08 21:49:05 mycroft Exp $ */
/*
@@ -40,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)wwframe.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$NetBSD: wwframe.c,v 1.4 1996/02/08 21:49:05 mycroft Exp $";
+static char rcsid[] = "$OpenBSD: wwframe.c,v 1.3 1996/06/26 05:43:43 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/wwgets.c b/usr.bin/window/wwgets.c
index 43fc69b8d6b..e66b29b3184 100644
--- a/usr.bin/window/wwgets.c
+++ b/usr.bin/window/wwgets.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: wwgets.c,v 1.3 1996/06/26 05:43:43 deraadt Exp $ */
/* $NetBSD: wwgets.c,v 1.6 1996/02/08 20:45:08 mycroft Exp $ */
/*
@@ -40,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)wwgets.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$NetBSD: wwgets.c,v 1.6 1996/02/08 20:45:08 mycroft Exp $";
+static char rcsid[] = "$OpenBSD: wwgets.c,v 1.3 1996/06/26 05:43:43 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/wwinit.c b/usr.bin/window/wwinit.c
index 5c2a1e103d2..077862d00c7 100644
--- a/usr.bin/window/wwinit.c
+++ b/usr.bin/window/wwinit.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: wwinit.c,v 1.4 1996/06/26 05:43:44 deraadt Exp $ */
/* $NetBSD: wwinit.c,v 1.11 1996/02/08 21:49:07 mycroft Exp $ */
/*
@@ -40,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)wwinit.c 8.2 (Berkeley) 4/28/95";
#else
-static char rcsid[] = "$NetBSD: wwinit.c,v 1.11 1996/02/08 21:49:07 mycroft Exp $";
+static char rcsid[] = "$OpenBSD: wwinit.c,v 1.4 1996/06/26 05:43:44 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/wwinschar.c b/usr.bin/window/wwinschar.c
index 7ca98921101..7a676a510b1 100644
--- a/usr.bin/window/wwinschar.c
+++ b/usr.bin/window/wwinschar.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: wwinschar.c,v 1.3 1996/06/26 05:43:44 deraadt Exp $ */
/* $NetBSD: wwinschar.c,v 1.4 1996/02/08 21:49:09 mycroft Exp $ */
/*
@@ -40,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)wwinschar.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$NetBSD: wwinschar.c,v 1.4 1996/02/08 21:49:09 mycroft Exp $";
+static char rcsid[] = "$OpenBSD: wwinschar.c,v 1.3 1996/06/26 05:43:44 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/wwinsline.c b/usr.bin/window/wwinsline.c
index 1189d6e4424..1b90e951700 100644
--- a/usr.bin/window/wwinsline.c
+++ b/usr.bin/window/wwinsline.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: wwinsline.c,v 1.2 1996/06/26 05:43:45 deraadt Exp $ */
/* $NetBSD: wwinsline.c,v 1.3 1995/09/28 10:35:36 tls Exp $ */
/*
@@ -40,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)wwinsline.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$NetBSD: wwinsline.c,v 1.3 1995/09/28 10:35:36 tls Exp $";
+static char rcsid[] = "$OpenBSD: wwinsline.c,v 1.2 1996/06/26 05:43:45 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/wwiomux.c b/usr.bin/window/wwiomux.c
index 0d8711a7967..433a136ef8c 100644
--- a/usr.bin/window/wwiomux.c
+++ b/usr.bin/window/wwiomux.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: wwiomux.c,v 1.4 1996/06/26 05:43:45 deraadt Exp $ */
/* $NetBSD: wwiomux.c,v 1.5 1996/02/08 20:45:09 mycroft Exp $ */
/*
@@ -40,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)wwiomux.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$NetBSD: wwiomux.c,v 1.5 1996/02/08 20:45:09 mycroft Exp $";
+static char rcsid[] = "$OpenBSD: wwiomux.c,v 1.4 1996/06/26 05:43:45 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/wwlabel.c b/usr.bin/window/wwlabel.c
index 0c091fe25b9..0e32612ddfb 100644
--- a/usr.bin/window/wwlabel.c
+++ b/usr.bin/window/wwlabel.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: wwlabel.c,v 1.3 1996/06/26 05:43:46 deraadt Exp $ */
/* $NetBSD: wwlabel.c,v 1.4 1996/02/08 21:49:11 mycroft Exp $ */
/*
@@ -40,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)wwlabel.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$NetBSD: wwlabel.c,v 1.4 1996/02/08 21:49:11 mycroft Exp $";
+static char rcsid[] = "$OpenBSD: wwlabel.c,v 1.3 1996/06/26 05:43:46 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/wwmisc.c b/usr.bin/window/wwmisc.c
index 8f0ae51d70e..868482760d4 100644
--- a/usr.bin/window/wwmisc.c
+++ b/usr.bin/window/wwmisc.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: wwmisc.c,v 1.3 1996/06/26 05:43:46 deraadt Exp $ */
/* $NetBSD: wwmisc.c,v 1.4 1996/02/08 20:45:10 mycroft Exp $ */
/*
@@ -40,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)wwmisc.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$NetBSD: wwmisc.c,v 1.4 1996/02/08 20:45:10 mycroft Exp $";
+static char rcsid[] = "$OpenBSD: wwmisc.c,v 1.3 1996/06/26 05:43:46 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/wwmove.c b/usr.bin/window/wwmove.c
index 35de1c20d64..dbf2e04cba7 100644
--- a/usr.bin/window/wwmove.c
+++ b/usr.bin/window/wwmove.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: wwmove.c,v 1.3 1996/06/26 05:43:47 deraadt Exp $ */
/* $NetBSD: wwmove.c,v 1.4 1996/02/08 21:49:14 mycroft Exp $ */
/*
@@ -40,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)wwmove.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$NetBSD: wwmove.c,v 1.4 1996/02/08 21:49:14 mycroft Exp $";
+static char rcsid[] = "$OpenBSD: wwmove.c,v 1.3 1996/06/26 05:43:47 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/wwopen.c b/usr.bin/window/wwopen.c
index fb2dea0c51b..45608516e0d 100644
--- a/usr.bin/window/wwopen.c
+++ b/usr.bin/window/wwopen.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: wwopen.c,v 1.4 1996/06/26 05:43:47 deraadt Exp $ */
/* $NetBSD: wwopen.c,v 1.6 1996/02/08 21:08:04 mycroft Exp $ */
/*
@@ -40,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)wwopen.c 8.2 (Berkeley) 4/28/95";
#else
-static char rcsid[] = "$NetBSD: wwopen.c,v 1.6 1996/02/08 21:08:04 mycroft Exp $";
+static char rcsid[] = "$OpenBSD: wwopen.c,v 1.4 1996/06/26 05:43:47 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/wwprintf.c b/usr.bin/window/wwprintf.c
index f4c19638ea9..21adbb7357a 100644
--- a/usr.bin/window/wwprintf.c
+++ b/usr.bin/window/wwprintf.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: wwprintf.c,v 1.2 1996/06/26 05:43:48 deraadt Exp $ */
/* $NetBSD: wwprintf.c,v 1.3 1995/09/28 10:35:44 tls Exp $ */
/*
@@ -40,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)wwprintf.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$NetBSD: wwprintf.c,v 1.3 1995/09/28 10:35:44 tls Exp $";
+static char rcsid[] = "$OpenBSD: wwprintf.c,v 1.2 1996/06/26 05:43:48 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/wwpty.c b/usr.bin/window/wwpty.c
index 918de2f9f27..aa9e8174aa3 100644
--- a/usr.bin/window/wwpty.c
+++ b/usr.bin/window/wwpty.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: wwpty.c,v 1.2 1996/06/26 05:43:48 deraadt Exp $ */
/* $NetBSD: wwpty.c,v 1.3 1995/09/28 10:35:45 tls Exp $ */
/*
@@ -40,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)wwpty.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$NetBSD: wwpty.c,v 1.3 1995/09/28 10:35:45 tls Exp $";
+static char rcsid[] = "$OpenBSD: wwpty.c,v 1.2 1996/06/26 05:43:48 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/wwputc.c b/usr.bin/window/wwputc.c
index f910128a4fc..fd75b9654af 100644
--- a/usr.bin/window/wwputc.c
+++ b/usr.bin/window/wwputc.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: wwputc.c,v 1.2 1996/06/26 05:43:49 deraadt Exp $ */
/* $NetBSD: wwputc.c,v 1.3 1995/09/28 10:35:47 tls Exp $ */
/*
@@ -40,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)wwputc.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$NetBSD: wwputc.c,v 1.3 1995/09/28 10:35:47 tls Exp $";
+static char rcsid[] = "$OpenBSD: wwputc.c,v 1.2 1996/06/26 05:43:49 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/wwputs.c b/usr.bin/window/wwputs.c
index 1e4d45d8227..572379a078e 100644
--- a/usr.bin/window/wwputs.c
+++ b/usr.bin/window/wwputs.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: wwputs.c,v 1.2 1996/06/26 05:43:49 deraadt Exp $ */
/* $NetBSD: wwputs.c,v 1.3 1995/09/28 10:35:48 tls Exp $ */
/*
@@ -40,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)wwputs.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$NetBSD: wwputs.c,v 1.3 1995/09/28 10:35:48 tls Exp $";
+static char rcsid[] = "$OpenBSD: wwputs.c,v 1.2 1996/06/26 05:43:49 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/wwredraw.c b/usr.bin/window/wwredraw.c
index 517ffdcf272..d4e34b5d94a 100644
--- a/usr.bin/window/wwredraw.c
+++ b/usr.bin/window/wwredraw.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: wwredraw.c,v 1.2 1996/06/26 05:43:50 deraadt Exp $ */
/* $NetBSD: wwredraw.c,v 1.3 1995/09/28 10:35:49 tls Exp $ */
/*
@@ -40,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)wwredraw.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$NetBSD: wwredraw.c,v 1.3 1995/09/28 10:35:49 tls Exp $";
+static char rcsid[] = "$OpenBSD: wwredraw.c,v 1.2 1996/06/26 05:43:50 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/wwredrawwin.c b/usr.bin/window/wwredrawwin.c
index fcc8c8ad145..e2dcdbe166f 100644
--- a/usr.bin/window/wwredrawwin.c
+++ b/usr.bin/window/wwredrawwin.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: wwredrawwin.c,v 1.3 1996/06/26 05:43:50 deraadt Exp $ */
/* $NetBSD: wwredrawwin.c,v 1.4 1996/02/08 21:49:15 mycroft Exp $ */
/*
@@ -40,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)wwredrawwin.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$NetBSD: wwredrawwin.c,v 1.4 1996/02/08 21:49:15 mycroft Exp $";
+static char rcsid[] = "$OpenBSD: wwredrawwin.c,v 1.3 1996/06/26 05:43:50 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/wwrint.c b/usr.bin/window/wwrint.c
index c7ef28ed6ec..9c82395b059 100644
--- a/usr.bin/window/wwrint.c
+++ b/usr.bin/window/wwrint.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: wwrint.c,v 1.3 1996/06/26 05:43:50 deraadt Exp $ */
/* $NetBSD: wwrint.c,v 1.4 1995/12/21 10:46:24 mycroft Exp $ */
/*
@@ -40,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)wwrint.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$NetBSD: wwrint.c,v 1.4 1995/12/21 10:46:24 mycroft Exp $";
+static char rcsid[] = "$OpenBSD: wwrint.c,v 1.3 1996/06/26 05:43:50 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/wwscroll.c b/usr.bin/window/wwscroll.c
index 07d8d2e2802..8b8b732fe65 100644
--- a/usr.bin/window/wwscroll.c
+++ b/usr.bin/window/wwscroll.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: wwscroll.c,v 1.2 1996/06/26 05:43:51 deraadt Exp $ */
/* $NetBSD: wwscroll.c,v 1.3 1995/09/28 10:35:53 tls Exp $ */
/*
@@ -40,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)wwscroll.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$NetBSD: wwscroll.c,v 1.3 1995/09/28 10:35:53 tls Exp $";
+static char rcsid[] = "$OpenBSD: wwscroll.c,v 1.2 1996/06/26 05:43:51 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/wwsize.c b/usr.bin/window/wwsize.c
index 1ec4b520148..3350d9b5da0 100644
--- a/usr.bin/window/wwsize.c
+++ b/usr.bin/window/wwsize.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: wwsize.c,v 1.4 1996/06/26 05:43:51 deraadt Exp $ */
/* $NetBSD: wwsize.c,v 1.5 1996/02/08 20:45:11 mycroft Exp $ */
/*
@@ -40,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)wwsize.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$NetBSD: wwsize.c,v 1.5 1996/02/08 20:45:11 mycroft Exp $";
+static char rcsid[] = "$OpenBSD: wwsize.c,v 1.4 1996/06/26 05:43:51 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/wwspawn.c b/usr.bin/window/wwspawn.c
index 4699df22843..07cabd0d552 100644
--- a/usr.bin/window/wwspawn.c
+++ b/usr.bin/window/wwspawn.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: wwspawn.c,v 1.3 1996/06/26 05:43:52 deraadt Exp $ */
/* $NetBSD: wwspawn.c,v 1.4 1995/12/21 08:39:57 mycroft Exp $ */
/*
@@ -40,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)wwspawn.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$NetBSD: wwspawn.c,v 1.4 1995/12/21 08:39:57 mycroft Exp $";
+static char rcsid[] = "$OpenBSD: wwspawn.c,v 1.3 1996/06/26 05:43:52 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/wwsuspend.c b/usr.bin/window/wwsuspend.c
index 356d19c2351..9346edea83e 100644
--- a/usr.bin/window/wwsuspend.c
+++ b/usr.bin/window/wwsuspend.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: wwsuspend.c,v 1.2 1996/06/26 05:43:52 deraadt Exp $ */
/* $NetBSD: wwsuspend.c,v 1.3 1995/09/28 10:35:56 tls Exp $ */
/*
@@ -40,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)wwsuspend.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$NetBSD: wwsuspend.c,v 1.3 1995/09/28 10:35:56 tls Exp $";
+static char rcsid[] = "$OpenBSD: wwsuspend.c,v 1.2 1996/06/26 05:43:52 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/wwterminfo.c b/usr.bin/window/wwterminfo.c
index 8039b1ede40..0152301d77e 100644
--- a/usr.bin/window/wwterminfo.c
+++ b/usr.bin/window/wwterminfo.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: wwterminfo.c,v 1.2 1996/06/26 05:43:53 deraadt Exp $ */
+
/*
* Copyright (c) 1982, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/usr.bin/window/wwtty.c b/usr.bin/window/wwtty.c
index e20b8c5c2c4..c207edecc9a 100644
--- a/usr.bin/window/wwtty.c
+++ b/usr.bin/window/wwtty.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: wwtty.c,v 1.3 1996/06/26 05:43:53 deraadt Exp $ */
/* $NetBSD: wwtty.c,v 1.4 1995/12/21 11:06:50 mycroft Exp $ */
/*
@@ -40,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)wwtty.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$NetBSD: wwtty.c,v 1.4 1995/12/21 11:06:50 mycroft Exp $";
+static char rcsid[] = "$OpenBSD: wwtty.c,v 1.3 1996/06/26 05:43:53 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/wwunframe.c b/usr.bin/window/wwunframe.c
index e0e0531e766..244163e3c0c 100644
--- a/usr.bin/window/wwunframe.c
+++ b/usr.bin/window/wwunframe.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: wwunframe.c,v 1.3 1996/06/26 05:43:54 deraadt Exp $ */
/* $NetBSD: wwunframe.c,v 1.4 1996/02/08 21:49:17 mycroft Exp $ */
/*
@@ -40,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)wwunframe.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$NetBSD: wwunframe.c,v 1.4 1996/02/08 21:49:17 mycroft Exp $";
+static char rcsid[] = "$OpenBSD: wwunframe.c,v 1.3 1996/06/26 05:43:54 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/wwupdate.c b/usr.bin/window/wwupdate.c
index 834da7ba4bc..28e92c0f1ef 100644
--- a/usr.bin/window/wwupdate.c
+++ b/usr.bin/window/wwupdate.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: wwupdate.c,v 1.2 1996/06/26 05:43:54 deraadt Exp $ */
/* $NetBSD: wwupdate.c,v 1.3 1995/09/28 10:36:00 tls Exp $ */
/*
@@ -40,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)wwupdate.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$NetBSD: wwupdate.c,v 1.3 1995/09/28 10:36:00 tls Exp $";
+static char rcsid[] = "$OpenBSD: wwupdate.c,v 1.2 1996/06/26 05:43:54 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/wwwrite.c b/usr.bin/window/wwwrite.c
index 316c89a4c08..8a06db562cc 100644
--- a/usr.bin/window/wwwrite.c
+++ b/usr.bin/window/wwwrite.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: wwwrite.c,v 1.3 1996/06/26 05:43:55 deraadt Exp $ */
/* $NetBSD: wwwrite.c,v 1.5 1996/02/08 21:49:19 mycroft Exp $ */
/*
@@ -40,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)wwwrite.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$NetBSD: wwwrite.c,v 1.5 1996/02/08 21:49:19 mycroft Exp $";
+static char rcsid[] = "$OpenBSD: wwwrite.c,v 1.3 1996/06/26 05:43:55 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/xx.c b/usr.bin/window/xx.c
index 83d7355be0a..138caf26f0a 100644
--- a/usr.bin/window/xx.c
+++ b/usr.bin/window/xx.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: xx.c,v 1.2 1996/06/26 05:43:55 deraadt Exp $ */
/* $NetBSD: xx.c,v 1.3 1995/09/28 10:36:03 tls Exp $ */
/*
@@ -40,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)xx.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$NetBSD: xx.c,v 1.3 1995/09/28 10:36:03 tls Exp $";
+static char rcsid[] = "$OpenBSD: xx.c,v 1.2 1996/06/26 05:43:55 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/xx.h b/usr.bin/window/xx.h
index 62c1945025b..f9655f9f692 100644
--- a/usr.bin/window/xx.h
+++ b/usr.bin/window/xx.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: xx.h,v 1.2 1996/06/26 05:43:56 deraadt Exp $ */
/* $NetBSD: xx.h,v 1.3 1995/09/28 10:36:04 tls Exp $ */
/*
diff --git a/usr.bin/window/xxflush.c b/usr.bin/window/xxflush.c
index c18ec6afd2a..e6f67ff2149 100644
--- a/usr.bin/window/xxflush.c
+++ b/usr.bin/window/xxflush.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: xxflush.c,v 1.2 1996/06/26 05:43:56 deraadt Exp $ */
/* $NetBSD: xxflush.c,v 1.3 1995/09/28 10:36:05 tls Exp $ */
/*
@@ -40,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)xxflush.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$NetBSD: xxflush.c,v 1.3 1995/09/28 10:36:05 tls Exp $";
+static char rcsid[] = "$OpenBSD: xxflush.c,v 1.2 1996/06/26 05:43:56 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/write/Makefile b/usr.bin/write/Makefile
index 9edc315b75a..1b4c277b85b 100644
--- a/usr.bin/write/Makefile
+++ b/usr.bin/write/Makefile
@@ -1,5 +1,4 @@
-# from: @(#)Makefile 8.1 (Berkeley) 6/6/93
-# $Id: Makefile,v 1.1 1995/10/18 08:47:00 deraadt Exp $
+# $OpenBSD: Makefile,v 1.2 1996/06/26 05:43:59 deraadt Exp $
PROG= write
BINMODE=2555
diff --git a/usr.bin/write/write.1 b/usr.bin/write/write.1
index e2399c592f8..25d5186ed72 100644
--- a/usr.bin/write/write.1
+++ b/usr.bin/write/write.1
@@ -1,3 +1,4 @@
+.\" $OpenBSD: write.1,v 1.2 1996/06/26 05:44:00 deraadt Exp $
.\" Copyright (c) 1989, 1993
.\" The Regents of the University of California. All rights reserved.
.\"
@@ -33,7 +34,6 @@
.\" SUCH DAMAGE.
.\"
.\" from: @(#)write.1 8.1 (Berkeley) 6/6/93
-.\" $Id: write.1,v 1.1 1995/10/18 08:47:00 deraadt Exp $
.\"
.Dd June 6, 1993
.Dt WRITE 1
diff --git a/usr.bin/write/write.c b/usr.bin/write/write.c
index 00d5e169e2e..30bbb6753e7 100644
--- a/usr.bin/write/write.c
+++ b/usr.bin/write/write.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: write.c,v 1.4 1996/06/26 05:44:00 deraadt Exp $ */
/* $NetBSD: write.c,v 1.5 1995/08/31 21:48:32 jtc Exp $ */
/*
@@ -46,7 +47,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)write.c 8.2 (Berkeley) 4/27/95";
#endif
-static char *rcsid = "$NetBSD: write.c,v 1.5 1995/08/31 21:48:32 jtc Exp $";
+static char *rcsid = "$OpenBSD: write.c,v 1.4 1996/06/26 05:44:00 deraadt Exp $";
#endif /* not lint */
#include <sys/types.h>
diff --git a/usr.bin/xargs/Makefile b/usr.bin/xargs/Makefile
index a6d1261223c..921a1f70408 100644
--- a/usr.bin/xargs/Makefile
+++ b/usr.bin/xargs/Makefile
@@ -1,5 +1,5 @@
+# $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 $
-# @(#)Makefile 8.1 (Berkeley) 6/6/93
PROG= xargs
diff --git a/usr.bin/xargs/pathnames.h b/usr.bin/xargs/pathnames.h
index 402bb43078a..9e4b007af9e 100644
--- a/usr.bin/xargs/pathnames.h
+++ b/usr.bin/xargs/pathnames.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: pathnames.h,v 1.3 1996/06/26 05:44:02 deraadt Exp $ */
/* $NetBSD: pathnames.h,v 1.3 1994/11/14 06:51:38 jtc Exp $ */
/*-
diff --git a/usr.bin/xargs/xargs.1 b/usr.bin/xargs/xargs.1
index e5d0e0ba697..51ac00c39fc 100644
--- a/usr.bin/xargs/xargs.1
+++ b/usr.bin/xargs/xargs.1
@@ -1,3 +1,4 @@
+.\" $OpenBSD: xargs.1,v 1.4 1996/06/26 05:44:02 deraadt Exp $
.\" $NetBSD: xargs.1,v 1.6 1994/11/14 06:51:40 jtc Exp $
.\"
.\" Copyright (c) 1990, 1991, 1993
diff --git a/usr.bin/xargs/xargs.c b/usr.bin/xargs/xargs.c
index 062f54f1f49..2180c9ea106 100644
--- a/usr.bin/xargs/xargs.c
+++ b/usr.bin/xargs/xargs.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: xargs.c,v 1.3 1996/06/26 05:44:03 deraadt Exp $ */
/* $NetBSD: xargs.c,v 1.7 1994/11/14 06:51:41 jtc Exp $ */
/*-
@@ -46,7 +47,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)xargs.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$NetBSD: xargs.c,v 1.7 1994/11/14 06:51:41 jtc Exp $";
+static char rcsid[] = "$OpenBSD: xargs.c,v 1.3 1996/06/26 05:44:03 deraadt Exp $";
#endif /* not lint */
#include <sys/types.h>
diff --git a/usr.bin/xinstall/Makefile b/usr.bin/xinstall/Makefile
index d4e38b10922..47af6d60c64 100644
--- a/usr.bin/xinstall/Makefile
+++ b/usr.bin/xinstall/Makefile
@@ -1,5 +1,5 @@
+# $OpenBSD: Makefile,v 1.2 1996/06/26 05:44:04 deraadt Exp $
# $NetBSD: Makefile,v 1.7 1994/12/22 12:31:39 cgd Exp $
-# @(#)Makefile 8.1 (Berkeley) 6/6/93
PROG= xinstall
SRCS= stat_flags.c xinstall.c
diff --git a/usr.bin/xinstall/install.1 b/usr.bin/xinstall/install.1
index 77f695d088b..e2f830c1158 100644
--- a/usr.bin/xinstall/install.1
+++ b/usr.bin/xinstall/install.1
@@ -1,3 +1,4 @@
+.\" $OpenBSD: install.1,v 1.2 1996/06/26 05:44:04 deraadt Exp $
.\" $NetBSD: install.1,v 1.4 1994/11/14 04:57:17 jtc Exp $
.\"
.\" Copyright (c) 1987, 1990, 1993
diff --git a/usr.bin/xinstall/pathnames.h b/usr.bin/xinstall/pathnames.h
index 56843d95fc8..4a7599900e9 100644
--- a/usr.bin/xinstall/pathnames.h
+++ b/usr.bin/xinstall/pathnames.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: pathnames.h,v 1.2 1996/06/26 05:44:05 deraadt Exp $ */
/* $NetBSD: pathnames.h,v 1.3 1994/11/14 04:57:18 jtc Exp $ */
/*
diff --git a/usr.bin/xinstall/xinstall.c b/usr.bin/xinstall/xinstall.c
index 789bd0e4598..2c93e82768b 100644
--- a/usr.bin/xinstall/xinstall.c
+++ b/usr.bin/xinstall/xinstall.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: xinstall.c,v 1.3 1996/06/26 05:44:05 deraadt Exp $ */
/* $NetBSD: xinstall.c,v 1.9 1995/12/20 10:25:17 jonathan Exp $ */
/*
@@ -43,7 +44,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)xinstall.c 8.1 (Berkeley) 7/21/93";
#endif
-static char rcsid[] = "$NetBSD: xinstall.c,v 1.9 1995/12/20 10:25:17 jonathan Exp $";
+static char rcsid[] = "$OpenBSD: xinstall.c,v 1.3 1996/06/26 05:44:05 deraadt Exp $";
#endif /* not lint */
#include <sys/param.h>
@@ -300,6 +301,7 @@ copy(from_fd, from_name, to_fd, to_name, size)
register int nr, nw;
int serrno;
char *p, buf[MAXBSIZE];
+ volatile size_t siz;
/*
* Mmap and write if less than 8M (the limit is so we don't totally
@@ -310,7 +312,8 @@ copy(from_fd, from_name, to_fd, to_name, size)
if ((p = mmap(NULL, (size_t)size, PROT_READ,
0, from_fd, (off_t)0)) == (char *)-1)
err(1, "%s", from_name);
- if (write(to_fd, p, size) != size)
+ siz = (size_t)size;
+ if (write(to_fd, p, siz) != siz)
err(1, "%s", to_name);
} else {
while ((nr = read(from_fd, buf, sizeof(buf))) > 0)
diff --git a/usr.bin/xlint/Makefile b/usr.bin/xlint/Makefile
index 01557adee1d..89fe2bc7a1b 100644
--- a/usr.bin/xlint/Makefile
+++ b/usr.bin/xlint/Makefile
@@ -1,3 +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 $
SUBDIR= lint1 lint2 xlint llib
diff --git a/usr.bin/xlint/lint1/Makefile b/usr.bin/xlint/lint1/Makefile
index d5e519a4cad..e46f647fc1f 100644
--- a/usr.bin/xlint/lint1/Makefile
+++ b/usr.bin/xlint/lint1/Makefile
@@ -1,3 +1,4 @@
+# $OpenBSD: Makefile,v 1.2 1996/06/26 05:44:07 deraadt Exp $
# $NetBSD: Makefile,v 1.3 1995/07/04 01:53:05 cgd Exp $
PROG= lint1
diff --git a/usr.bin/xlint/lint1/cgram.y b/usr.bin/xlint/lint1/cgram.y
index 502994decc0..7fdc3d44e63 100644
--- a/usr.bin/xlint/lint1/cgram.y
+++ b/usr.bin/xlint/lint1/cgram.y
@@ -1,4 +1,5 @@
%{
+/* $OpenBSD: cgram.y,v 1.3 1996/06/26 05:44:08 deraadt Exp $ */
/* $NetBSD: cgram.y,v 1.8 1995/10/02 17:31:35 jpo Exp $ */
/*
@@ -33,7 +34,7 @@
*/
#ifndef lint
-static char rcsid[] = "$NetBSD: cgram.y,v 1.8 1995/10/02 17:31:35 jpo Exp $";
+static char rcsid[] = "$OpenBSD: cgram.y,v 1.3 1996/06/26 05:44:08 deraadt Exp $";
#endif
#include <stdlib.h>
diff --git a/usr.bin/xlint/lint1/decl.c b/usr.bin/xlint/lint1/decl.c
index fa023b7557c..375fc782c16 100644
--- a/usr.bin/xlint/lint1/decl.c
+++ b/usr.bin/xlint/lint1/decl.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: decl.c,v 1.2 1996/06/26 05:44:09 deraadt Exp $ */
/* $NetBSD: decl.c,v 1.11 1995/10/02 17:34:16 jpo Exp $ */
/*
@@ -32,7 +33,7 @@
*/
#ifndef lint
-static char rcsid[] = "$NetBSD: decl.c,v 1.11 1995/10/02 17:34:16 jpo Exp $";
+static char rcsid[] = "$OpenBSD: decl.c,v 1.2 1996/06/26 05:44:09 deraadt Exp $";
#endif
#include <sys/param.h>
diff --git a/usr.bin/xlint/lint1/emit.c b/usr.bin/xlint/lint1/emit.c
index f98f5404cfd..5d2156a50cf 100644
--- a/usr.bin/xlint/lint1/emit.c
+++ b/usr.bin/xlint/lint1/emit.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: emit.c,v 1.2 1996/06/26 05:44:10 deraadt Exp $ */
/* $NetBSD: emit.c,v 1.2 1995/07/03 21:24:00 cgd Exp $ */
/*
@@ -32,7 +33,7 @@
*/
#ifndef lint
-static char rcsid[] = "$NetBSD: emit.c,v 1.2 1995/07/03 21:24:00 cgd Exp $";
+static char rcsid[] = "$OpenBSD: emit.c,v 1.2 1996/06/26 05:44:10 deraadt Exp $";
#endif
#include <stdio.h>
diff --git a/usr.bin/xlint/lint1/emit1.c b/usr.bin/xlint/lint1/emit1.c
index ee2434ead59..83ae2df2e58 100644
--- a/usr.bin/xlint/lint1/emit1.c
+++ b/usr.bin/xlint/lint1/emit1.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: emit1.c,v 1.2 1996/06/26 05:44:10 deraadt Exp $ */
/* $NetBSD: emit1.c,v 1.4 1995/10/02 17:21:28 jpo Exp $ */
/*
@@ -32,7 +33,7 @@
*/
#ifndef lint
-static char rcsid[] = "$NetBSD: emit1.c,v 1.4 1995/10/02 17:21:28 jpo Exp $";
+static char rcsid[] = "$OpenBSD: emit1.c,v 1.2 1996/06/26 05:44:10 deraadt Exp $";
#endif
#include <ctype.h>
diff --git a/usr.bin/xlint/lint1/err.c b/usr.bin/xlint/lint1/err.c
index 32c80c4cd53..0e43b2d5dbe 100644
--- a/usr.bin/xlint/lint1/err.c
+++ b/usr.bin/xlint/lint1/err.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: err.c,v 1.2 1996/06/26 05:44:11 deraadt Exp $ */
/* $NetBSD: err.c,v 1.8 1995/10/02 17:37:00 jpo Exp $ */
/*
@@ -32,7 +33,7 @@
*/
#ifndef lint
-static char rcsid[] = "$NetBSD: err.c,v 1.8 1995/10/02 17:37:00 jpo Exp $";
+static char rcsid[] = "$OpenBSD: err.c,v 1.2 1996/06/26 05:44:11 deraadt Exp $";
#endif
/* number of errors found */
diff --git a/usr.bin/xlint/lint1/externs.h b/usr.bin/xlint/lint1/externs.h
index e61f8d065f2..a4755975e45 100644
--- a/usr.bin/xlint/lint1/externs.h
+++ b/usr.bin/xlint/lint1/externs.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: externs.h,v 1.2 1996/06/26 05:44:12 deraadt Exp $ */
/* $NetBSD: externs.h,v 1.2 1995/07/03 21:24:06 cgd Exp $ */
/*
diff --git a/usr.bin/xlint/lint1/externs1.h b/usr.bin/xlint/lint1/externs1.h
index e9923c77d19..052e432eca4 100644
--- a/usr.bin/xlint/lint1/externs1.h
+++ b/usr.bin/xlint/lint1/externs1.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: externs1.h,v 1.2 1996/06/26 05:44:12 deraadt Exp $ */
/* $NetBSD: externs1.h,v 1.7 1995/10/02 17:31:39 jpo Exp $ */
/*
diff --git a/usr.bin/xlint/lint1/func.c b/usr.bin/xlint/lint1/func.c
index 5d3a17218c3..0e4b451b4f1 100644
--- a/usr.bin/xlint/lint1/func.c
+++ b/usr.bin/xlint/lint1/func.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: func.c,v 1.2 1996/06/26 05:44:13 deraadt Exp $ */
/* $NetBSD: func.c,v 1.7 1995/10/02 17:31:40 jpo Exp $ */
/*
@@ -32,7 +33,7 @@
*/
#ifndef lint
-static char rcsid[] = "$NetBSD: func.c,v 1.7 1995/10/02 17:31:40 jpo Exp $";
+static char rcsid[] = "$OpenBSD: func.c,v 1.2 1996/06/26 05:44:13 deraadt Exp $";
#endif
#include <stdlib.h>
diff --git a/usr.bin/xlint/lint1/init.c b/usr.bin/xlint/lint1/init.c
index dbd216bc41e..6a8902dfee4 100644
--- a/usr.bin/xlint/lint1/init.c
+++ b/usr.bin/xlint/lint1/init.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: init.c,v 1.2 1996/06/26 05:44:14 deraadt Exp $ */
/* $NetBSD: init.c,v 1.4 1995/10/02 17:21:37 jpo Exp $ */
/*
@@ -32,7 +33,7 @@
*/
#ifndef lint
-static char rcsid[] = "$NetBSD: init.c,v 1.4 1995/10/02 17:21:37 jpo Exp $";
+static char rcsid[] = "$OpenBSD: init.c,v 1.2 1996/06/26 05:44:14 deraadt Exp $";
#endif
#include <stdlib.h>
diff --git a/usr.bin/xlint/lint1/lint.h b/usr.bin/xlint/lint1/lint.h
index cadcd7a3e5e..4f5cdc99c39 100644
--- a/usr.bin/xlint/lint1/lint.h
+++ b/usr.bin/xlint/lint1/lint.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: lint.h,v 1.2 1996/06/26 05:44:14 deraadt Exp $ */
/* $NetBSD: lint.h,v 1.2 1995/07/03 21:24:18 cgd Exp $ */
/*
diff --git a/usr.bin/xlint/lint1/lint1.h b/usr.bin/xlint/lint1/lint1.h
index 019c98d5605..2777d386f7a 100644
--- a/usr.bin/xlint/lint1/lint1.h
+++ b/usr.bin/xlint/lint1/lint1.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: lint1.h,v 1.2 1996/06/26 05:44:15 deraadt Exp $ */
/* $NetBSD: lint1.h,v 1.6 1995/10/02 17:31:41 jpo Exp $ */
/*
diff --git a/usr.bin/xlint/lint1/main1.c b/usr.bin/xlint/lint1/main1.c
index 0add2067946..880286d0411 100644
--- a/usr.bin/xlint/lint1/main1.c
+++ b/usr.bin/xlint/lint1/main1.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: main1.c,v 1.2 1996/06/26 05:44:16 deraadt Exp $ */
/* $NetBSD: main1.c,v 1.3 1995/10/02 17:29:56 jpo Exp $ */
/*
@@ -32,7 +33,7 @@
*/
#ifndef lint
-static char rcsid[] = "$NetBSD: main1.c,v 1.3 1995/10/02 17:29:56 jpo Exp $";
+static char rcsid[] = "$OpenBSD: main1.c,v 1.2 1996/06/26 05:44:16 deraadt Exp $";
#endif
#include <stdio.h>
diff --git a/usr.bin/xlint/lint1/mem.c b/usr.bin/xlint/lint1/mem.c
index 71fba06e9bd..aff067f8f49 100644
--- a/usr.bin/xlint/lint1/mem.c
+++ b/usr.bin/xlint/lint1/mem.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: mem.c,v 1.2 1996/06/26 05:44:16 deraadt Exp $ */
/* $NetBSD: mem.c,v 1.2 1995/07/03 21:24:24 cgd Exp $ */
/*
@@ -32,7 +33,7 @@
*/
#ifndef lint
-static char rcsid[] = "$NetBSD: mem.c,v 1.2 1995/07/03 21:24:24 cgd Exp $";
+static char rcsid[] = "$OpenBSD: mem.c,v 1.2 1996/06/26 05:44:16 deraadt Exp $";
#endif
#include <stdlib.h>
diff --git a/usr.bin/xlint/lint1/mem1.c b/usr.bin/xlint/lint1/mem1.c
index df880b13373..23305299cc4 100644
--- a/usr.bin/xlint/lint1/mem1.c
+++ b/usr.bin/xlint/lint1/mem1.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: mem1.c,v 1.2 1996/06/26 05:44:17 deraadt Exp $ */
/* $NetBSD: mem1.c,v 1.2 1995/07/03 21:24:25 cgd Exp $ */
/*
@@ -32,7 +33,7 @@
*/
#ifndef lint
-static char rcsid[] = "$NetBSD: mem1.c,v 1.2 1995/07/03 21:24:25 cgd Exp $";
+static char rcsid[] = "$OpenBSD: mem1.c,v 1.2 1996/06/26 05:44:17 deraadt Exp $";
#endif
#include <sys/types.h>
diff --git a/usr.bin/xlint/lint1/op.h b/usr.bin/xlint/lint1/op.h
index 11f05a5404e..66528a4842c 100644
--- a/usr.bin/xlint/lint1/op.h
+++ b/usr.bin/xlint/lint1/op.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: op.h,v 1.2 1996/06/26 05:44:17 deraadt Exp $ */
/* $NetBSD: op.h,v 1.2 1995/07/03 21:24:27 cgd Exp $ */
/*
diff --git a/usr.bin/xlint/lint1/param.h b/usr.bin/xlint/lint1/param.h
index 46ae4b74322..556aad3303f 100644
--- a/usr.bin/xlint/lint1/param.h
+++ b/usr.bin/xlint/lint1/param.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: param.h,v 1.4 1996/06/26 05:44:18 deraadt Exp $ */
/* $NetBSD: param.h,v 1.6 1996/04/01 21:47:57 mark Exp $ */
/*
diff --git a/usr.bin/xlint/lint1/scan.l b/usr.bin/xlint/lint1/scan.l
index 5e23c6b6b4b..11ee1dad37d 100644
--- a/usr.bin/xlint/lint1/scan.l
+++ b/usr.bin/xlint/lint1/scan.l
@@ -1,4 +1,5 @@
%{
+/* $OpenBSD: scan.l,v 1.3 1996/06/26 05:44:18 deraadt Exp $ */
/* $NetBSD: scan.l,v 1.8 1995/10/23 13:38:51 jpo Exp $ */
/*
@@ -33,7 +34,7 @@
*/
#ifndef lint
-static char rcsid[] = "$NetBSD: scan.l,v 1.8 1995/10/23 13:38:51 jpo Exp $";
+static char rcsid[] = "$OpenBSD: scan.l,v 1.3 1996/06/26 05:44:18 deraadt Exp $";
#endif
#include <stdlib.h>
diff --git a/usr.bin/xlint/lint1/tree.c b/usr.bin/xlint/lint1/tree.c
index 525e407c20a..bad831d8577 100644
--- a/usr.bin/xlint/lint1/tree.c
+++ b/usr.bin/xlint/lint1/tree.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: tree.c,v 1.2 1996/06/26 05:44:19 deraadt Exp $ */
/* $NetBSD: tree.c,v 1.12 1995/10/02 17:37:57 jpo Exp $ */
/*
@@ -32,7 +33,7 @@
*/
#ifndef lint
-static char rcsid[] = "$NetBSD: tree.c,v 1.12 1995/10/02 17:37:57 jpo Exp $";
+static char rcsid[] = "$OpenBSD: tree.c,v 1.2 1996/06/26 05:44:19 deraadt Exp $";
#endif
#include <stdlib.h>
diff --git a/usr.bin/xlint/lint2/Makefile b/usr.bin/xlint/lint2/Makefile
index 0e7d4052947..e6ac091582b 100644
--- a/usr.bin/xlint/lint2/Makefile
+++ b/usr.bin/xlint/lint2/Makefile
@@ -1,3 +1,4 @@
+# $OpenBSD: Makefile,v 1.2 1996/06/26 05:44:21 deraadt Exp $
# $NetBSD: Makefile,v 1.2 1995/07/03 21:24:39 cgd Exp $
.PATH: ${.CURDIR}/../lint1
diff --git a/usr.bin/xlint/lint2/chk.c b/usr.bin/xlint/lint2/chk.c
index 0aac8529b3c..536a579a285 100644
--- a/usr.bin/xlint/lint2/chk.c
+++ b/usr.bin/xlint/lint2/chk.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: chk.c,v 1.2 1996/06/26 05:44:21 deraadt Exp $ */
/* $NetBSD: chk.c,v 1.2 1995/07/03 21:24:42 cgd Exp $ */
/*
@@ -32,7 +33,7 @@
*/
#ifndef lint
-static char rcsid[] = "$NetBSD: chk.c,v 1.2 1995/07/03 21:24:42 cgd Exp $";
+static char rcsid[] = "$OpenBSD: chk.c,v 1.2 1996/06/26 05:44:21 deraadt Exp $";
#endif
#include <stdlib.h>
diff --git a/usr.bin/xlint/lint2/emit2.c b/usr.bin/xlint/lint2/emit2.c
index 82527b517e7..04a00ddec32 100644
--- a/usr.bin/xlint/lint2/emit2.c
+++ b/usr.bin/xlint/lint2/emit2.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: emit2.c,v 1.2 1996/06/26 05:44:22 deraadt Exp $ */
/* $NetBSD: emit2.c,v 1.2 1995/07/03 21:24:44 cgd Exp $ */
/*
@@ -32,7 +33,7 @@
*/
#ifndef lint
-static char rcsid[] = "$NetBSD: emit2.c,v 1.2 1995/07/03 21:24:44 cgd Exp $";
+static char rcsid[] = "$OpenBSD: emit2.c,v 1.2 1996/06/26 05:44:22 deraadt Exp $";
#endif
#include <err.h>
diff --git a/usr.bin/xlint/lint2/externs2.h b/usr.bin/xlint/lint2/externs2.h
index 2e65e53e9e8..f0edc7c227b 100644
--- a/usr.bin/xlint/lint2/externs2.h
+++ b/usr.bin/xlint/lint2/externs2.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: externs2.h,v 1.2 1996/06/26 05:44:23 deraadt Exp $ */
/* $NetBSD: externs2.h,v 1.2 1995/07/03 21:24:46 cgd Exp $ */
/*
diff --git a/usr.bin/xlint/lint2/hash.c b/usr.bin/xlint/lint2/hash.c
index 79018025c95..2122f4e5fa4 100644
--- a/usr.bin/xlint/lint2/hash.c
+++ b/usr.bin/xlint/lint2/hash.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: hash.c,v 1.2 1996/06/26 05:44:23 deraadt Exp $ */
/* $NetBSD: hash.c,v 1.2 1995/07/03 21:24:47 cgd Exp $ */
/*
@@ -32,7 +33,7 @@
*/
#ifndef lint
-static char rcsid[] = "$NetBSD: hash.c,v 1.2 1995/07/03 21:24:47 cgd Exp $";
+static char rcsid[] = "$OpenBSD: hash.c,v 1.2 1996/06/26 05:44:23 deraadt Exp $";
#endif
#include <stddef.h>
diff --git a/usr.bin/xlint/lint2/lint2.h b/usr.bin/xlint/lint2/lint2.h
index 0ade1104681..daf26446168 100644
--- a/usr.bin/xlint/lint2/lint2.h
+++ b/usr.bin/xlint/lint2/lint2.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: lint2.h,v 1.2 1996/06/26 05:44:24 deraadt Exp $ */
/* $NetBSD: lint2.h,v 1.2 1995/07/03 21:24:49 cgd Exp $ */
/*
diff --git a/usr.bin/xlint/lint2/main2.c b/usr.bin/xlint/lint2/main2.c
index 171344ac399..2d672b03d4b 100644
--- a/usr.bin/xlint/lint2/main2.c
+++ b/usr.bin/xlint/lint2/main2.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: main2.c,v 1.2 1996/06/26 05:44:24 deraadt Exp $ */
/* $NetBSD: main2.c,v 1.2 1995/07/03 21:24:53 cgd Exp $ */
/*
@@ -32,7 +33,7 @@
*/
#ifndef lint
-static char rcsid[] = "$NetBSD: main2.c,v 1.2 1995/07/03 21:24:53 cgd Exp $";
+static char rcsid[] = "$OpenBSD: main2.c,v 1.2 1996/06/26 05:44:24 deraadt Exp $";
#endif
#include <stdio.h>
diff --git a/usr.bin/xlint/lint2/mem2.c b/usr.bin/xlint/lint2/mem2.c
index 06d749153ed..5a8abb258db 100644
--- a/usr.bin/xlint/lint2/mem2.c
+++ b/usr.bin/xlint/lint2/mem2.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: mem2.c,v 1.2 1996/06/26 05:44:25 deraadt Exp $ */
/* $NetBSD: mem2.c,v 1.3 1995/10/02 17:27:11 jpo Exp $ */
/*
@@ -32,7 +33,7 @@
*/
#ifndef lint
-static char rcsid[] = "$NetBSD: mem2.c,v 1.3 1995/10/02 17:27:11 jpo Exp $";
+static char rcsid[] = "$OpenBSD: mem2.c,v 1.2 1996/06/26 05:44:25 deraadt Exp $";
#endif
#include <sys/param.h>
diff --git a/usr.bin/xlint/lint2/msg.c b/usr.bin/xlint/lint2/msg.c
index c55ba96d5d4..cc5f7bb420d 100644
--- a/usr.bin/xlint/lint2/msg.c
+++ b/usr.bin/xlint/lint2/msg.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: msg.c,v 1.2 1996/06/26 05:44:25 deraadt Exp $ */
/* $NetBSD: msg.c,v 1.2 1995/07/03 21:24:56 cgd Exp $ */
/*
@@ -32,7 +33,7 @@
*/
#ifndef lint
-static char rcsid[] = "$NetBSD: msg.c,v 1.2 1995/07/03 21:24:56 cgd Exp $";
+static char rcsid[] = "$OpenBSD: msg.c,v 1.2 1996/06/26 05:44:25 deraadt Exp $";
#endif
#include <string.h>
diff --git a/usr.bin/xlint/lint2/read.c b/usr.bin/xlint/lint2/read.c
index daffe1e4d4e..8c442892b30 100644
--- a/usr.bin/xlint/lint2/read.c
+++ b/usr.bin/xlint/lint2/read.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: read.c,v 1.2 1996/06/26 05:44:26 deraadt Exp $ */
/* $NetBSD: read.c,v 1.2 1995/07/03 21:24:59 cgd Exp $ */
/*
@@ -32,7 +33,7 @@
*/
#ifndef lint
-static char rcsid[] = "$NetBSD: read.c,v 1.2 1995/07/03 21:24:59 cgd Exp $";
+static char rcsid[] = "$OpenBSD: read.c,v 1.2 1996/06/26 05:44:26 deraadt Exp $";
#endif
#include <stdio.h>
diff --git a/usr.bin/xlint/llib/Makefile b/usr.bin/xlint/llib/Makefile
index 2e24c3102d4..ae5a9b4bac8 100644
--- a/usr.bin/xlint/llib/Makefile
+++ b/usr.bin/xlint/llib/Makefile
@@ -1,3 +1,4 @@
+# $OpenBSD: Makefile,v 1.2 1996/06/26 05:44:27 deraadt Exp $
# $NetBSD: Makefile,v 1.2 1995/07/03 21:25:05 cgd Exp $
LIBS= llib-lposix.ln llib-lstdc.ln
diff --git a/usr.bin/xlint/llib/llib-lposix b/usr.bin/xlint/llib/llib-lposix
index db1b3cfe42b..99645c659eb 100644
--- a/usr.bin/xlint/llib/llib-lposix
+++ b/usr.bin/xlint/llib/llib-lposix
@@ -1,3 +1,4 @@
+/* $OpenBSD: llib-lposix,v 1.2 1996/06/26 05:44:28 deraadt Exp $ */
/* $NetBSD: llib-lposix,v 1.2 1995/07/03 21:25:09 cgd Exp $ */
/*
diff --git a/usr.bin/xlint/llib/llib-lstdc b/usr.bin/xlint/llib/llib-lstdc
index f2b33da6a8e..15bc2ccc1dd 100644
--- a/usr.bin/xlint/llib/llib-lstdc
+++ b/usr.bin/xlint/llib/llib-lstdc
@@ -1,3 +1,4 @@
+/* $OpenBSD: llib-lstdc,v 1.2 1996/06/26 05:44:28 deraadt Exp $ */
/* $NetBSD: llib-lstdc,v 1.3 1995/07/03 21:39:28 cgd Exp $ */
/*
diff --git a/usr.bin/xlint/xlint/Makefile b/usr.bin/xlint/xlint/Makefile
index 41c833ca15d..298ec6ac55e 100644
--- a/usr.bin/xlint/xlint/Makefile
+++ b/usr.bin/xlint/xlint/Makefile
@@ -1,3 +1,4 @@
+# $OpenBSD: Makefile,v 1.2 1996/06/26 05:44:29 deraadt Exp $
# $NetBSD: Makefile,v 1.2 1995/07/03 21:25:14 cgd Exp $
.PATH: ${.CURDIR}/../lint1
diff --git a/usr.bin/xlint/xlint/lint.1 b/usr.bin/xlint/xlint/lint.1
index 99d459cb004..0efa6707d70 100644
--- a/usr.bin/xlint/xlint/lint.1
+++ b/usr.bin/xlint/xlint/lint.1
@@ -1,3 +1,4 @@
+.\" $OpenBSD: lint.1,v 1.3 1996/06/26 05:44:30 deraadt Exp $
.\" $NetBSD: lint.1,v 1.3 1995/10/23 13:45:31 jpo Exp $
.\"
.\" Copyright (c) 1994, 1995 Jochen Pohl
diff --git a/usr.bin/xlint/xlint/pathnames.h b/usr.bin/xlint/xlint/pathnames.h
index d03845d1e4f..fdb64a50345 100644
--- a/usr.bin/xlint/xlint/pathnames.h
+++ b/usr.bin/xlint/xlint/pathnames.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: pathnames.h,v 1.2 1996/06/26 05:44:31 deraadt Exp $ */
/* $NetBSD: pathnames.h,v 1.2 1995/07/03 21:25:20 cgd Exp $ */
/*
diff --git a/usr.bin/xlint/xlint/xlint.c b/usr.bin/xlint/xlint/xlint.c
index 3e577974d69..7964d647b88 100644
--- a/usr.bin/xlint/xlint/xlint.c
+++ b/usr.bin/xlint/xlint/xlint.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: xlint.c,v 1.3 1996/06/26 05:44:31 deraadt Exp $ */
/* $NetBSD: xlint.c,v 1.3 1995/10/23 14:29:30 jpo Exp $ */
/*
@@ -32,7 +33,7 @@
*/
#ifndef lint
-static char rcsid[] = "$NetBSD: xlint.c,v 1.3 1995/10/23 14:29:30 jpo Exp $";
+static char rcsid[] = "$OpenBSD: xlint.c,v 1.3 1996/06/26 05:44:31 deraadt Exp $";
#endif
#include <sys/param.h>
diff --git a/usr.bin/xstr/Makefile b/usr.bin/xstr/Makefile
index fe2acea95ed..620b6659b22 100644
--- a/usr.bin/xstr/Makefile
+++ b/usr.bin/xstr/Makefile
@@ -1,5 +1,5 @@
+# $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 $
-# @(#)Makefile 8.1 (Berkeley) 6/9/93
PROG= xstr
diff --git a/usr.bin/xstr/pathnames.h b/usr.bin/xstr/pathnames.h
index 2a29b8c61e4..1561072a06e 100644
--- a/usr.bin/xstr/pathnames.h
+++ b/usr.bin/xstr/pathnames.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: pathnames.h,v 1.2 1996/06/26 05:44:33 deraadt Exp $ */
/* $NetBSD: pathnames.h,v 1.3 1994/11/14 04:56:22 jtc Exp $ */
/*
diff --git a/usr.bin/xstr/xstr.1 b/usr.bin/xstr/xstr.1
index bdcb1882cf4..dbcde7ba975 100644
--- a/usr.bin/xstr/xstr.1
+++ b/usr.bin/xstr/xstr.1
@@ -1,3 +1,4 @@
+.\" $OpenBSD: xstr.1,v 1.2 1996/06/26 05:44:34 deraadt Exp $
.\" $NetBSD: xstr.1,v 1.4 1994/11/26 09:25:22 jtc Exp $
.\"
.\" Copyright (c) 1980, 1993
diff --git a/usr.bin/xstr/xstr.c b/usr.bin/xstr/xstr.c
index 2db9862096c..a97f8d9c11b 100644
--- a/usr.bin/xstr/xstr.c
+++ b/usr.bin/xstr/xstr.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: xstr.c,v 1.2 1996/06/26 05:44:34 deraadt Exp $ */
/* $NetBSD: xstr.c,v 1.5 1994/12/24 16:57:59 cgd Exp $ */
/*
@@ -43,7 +44,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)xstr.c 8.1 (Berkeley) 6/9/93";
#endif
-static char rcsid[] = "$NetBSD: xstr.c,v 1.5 1994/12/24 16:57:59 cgd Exp $";
+static char rcsid[] = "$OpenBSD: xstr.c,v 1.2 1996/06/26 05:44:34 deraadt Exp $";
#endif /* not lint */
#include <sys/types.h>
diff --git a/usr.bin/yacc/closure.c b/usr.bin/yacc/closure.c
index 303bfbaf0c4..654290df1d4 100644
--- a/usr.bin/yacc/closure.c
+++ b/usr.bin/yacc/closure.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: closure.c,v 1.3 1996/06/26 05:44:35 deraadt Exp $ */
/* $NetBSD: closure.c,v 1.4 1996/03/19 03:21:29 jtc Exp $ */
/*
@@ -40,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)closure.c 5.3 (Berkeley) 5/24/93";
#else
-static char rcsid[] = "$NetBSD: closure.c,v 1.4 1996/03/19 03:21:29 jtc Exp $";
+static char rcsid[] = "$OpenBSD: closure.c,v 1.3 1996/06/26 05:44:35 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/yacc/error.c b/usr.bin/yacc/error.c
index 9b33f451c72..8929c5bd08d 100644
--- a/usr.bin/yacc/error.c
+++ b/usr.bin/yacc/error.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: error.c,v 1.3 1996/06/26 05:44:36 deraadt Exp $ */
/* $NetBSD: error.c,v 1.4 1996/03/19 03:21:32 jtc Exp $ */
/*
@@ -40,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)error.c 5.3 (Berkeley) 6/1/90";
#else
-static char rcsid[] = "$NetBSD: error.c,v 1.4 1996/03/19 03:21:32 jtc Exp $";
+static char rcsid[] = "$OpenBSD: error.c,v 1.3 1996/06/26 05:44:36 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/yacc/lalr.c b/usr.bin/yacc/lalr.c
index bf28f5510ab..69a6e48e113 100644
--- a/usr.bin/yacc/lalr.c
+++ b/usr.bin/yacc/lalr.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: lalr.c,v 1.3 1996/06/26 05:44:37 deraadt Exp $ */
/* $NetBSD: lalr.c,v 1.4 1996/03/19 03:21:33 jtc Exp $ */
/*
@@ -40,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)lalr.c 5.3 (Berkeley) 6/1/90";
#else
-static char rcsid[] = "$NetBSD: lalr.c,v 1.4 1996/03/19 03:21:33 jtc Exp $";
+static char rcsid[] = "$OpenBSD: lalr.c,v 1.3 1996/06/26 05:44:37 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/yacc/lr0.c b/usr.bin/yacc/lr0.c
index 678f3579b36..4f1bd9577cd 100644
--- a/usr.bin/yacc/lr0.c
+++ b/usr.bin/yacc/lr0.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: lr0.c,v 1.3 1996/06/26 05:44:37 deraadt Exp $ */
/* $NetBSD: lr0.c,v 1.4 1996/03/19 03:21:35 jtc Exp $ */
/*
@@ -40,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)lr0.c 5.3 (Berkeley) 1/20/91";
#else
-static char rcsid[] = "$NetBSD: lr0.c,v 1.4 1996/03/19 03:21:35 jtc Exp $";
+static char rcsid[] = "$OpenBSD: lr0.c,v 1.3 1996/06/26 05:44:37 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/yacc/main.c b/usr.bin/yacc/main.c
index 13749a7f2ac..981a3cd7a2d 100644
--- a/usr.bin/yacc/main.c
+++ b/usr.bin/yacc/main.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: main.c,v 1.5 1996/06/26 05:44:38 deraadt Exp $ */
/* $NetBSD: main.c,v 1.5 1996/03/19 03:21:38 jtc Exp $ */
/*
@@ -46,7 +47,7 @@ char copyright[] =
#if 0
static char sccsid[] = "@(#)main.c 5.5 (Berkeley) 5/24/93";
#else
-static char rcsid[] = "$NetBSD: main.c,v 1.5 1996/03/19 03:21:38 jtc Exp $";
+static char rcsid[] = "$OpenBSD: main.c,v 1.5 1996/06/26 05:44:38 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/yacc/output.c b/usr.bin/yacc/output.c
index 63844fcfdbd..b7ab0700d3d 100644
--- a/usr.bin/yacc/output.c
+++ b/usr.bin/yacc/output.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: output.c,v 1.3 1996/06/26 05:44:39 deraadt Exp $ */
/* $NetBSD: output.c,v 1.4 1996/03/19 03:21:41 jtc Exp $ */
/*
@@ -40,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)output.c 5.7 (Berkeley) 5/24/93";
#else
-static char rcsid[] = "$NetBSD: output.c,v 1.4 1996/03/19 03:21:41 jtc Exp $";
+static char rcsid[] = "$OpenBSD: output.c,v 1.3 1996/06/26 05:44:39 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/yacc/symtab.c b/usr.bin/yacc/symtab.c
index 64677bd7651..9874b994eb5 100644
--- a/usr.bin/yacc/symtab.c
+++ b/usr.bin/yacc/symtab.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: symtab.c,v 1.3 1996/06/26 05:44:39 deraadt Exp $ */
/* $NetBSD: symtab.c,v 1.4 1996/03/19 03:21:48 jtc Exp $ */
/*
@@ -40,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)symtab.c 5.3 (Berkeley) 6/1/90";
#else
-static char rcsid[] = "$NetBSD: symtab.c,v 1.4 1996/03/19 03:21:48 jtc Exp $";
+static char rcsid[] = "$OpenBSD: symtab.c,v 1.3 1996/06/26 05:44:39 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/yacc/test/error.tab.h b/usr.bin/yacc/test/error.tab.h
index e69de29bb2d..cdd3186d8e8 100644
--- a/usr.bin/yacc/test/error.tab.h
+++ b/usr.bin/yacc/test/error.tab.h
@@ -0,0 +1,2 @@
+/* $OpenBSD: error.tab.h,v 1.2 1996/06/26 05:44:42 deraadt Exp $ */
+
diff --git a/usr.bin/yacc/test/ftp.tab.h b/usr.bin/yacc/test/ftp.tab.h
index 24f0791390a..56a4200cf22 100644
--- a/usr.bin/yacc/test/ftp.tab.h
+++ b/usr.bin/yacc/test/ftp.tab.h
@@ -1,3 +1,5 @@
+/* $OpenBSD: ftp.tab.h,v 1.2 1996/06/26 05:44:42 deraadt Exp $ */
+
#define A 257
#define B 258
#define C 259
diff --git a/usr.bin/yacc/verbose.c b/usr.bin/yacc/verbose.c
index 41481d8959f..a932dbe79a5 100644
--- a/usr.bin/yacc/verbose.c
+++ b/usr.bin/yacc/verbose.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: verbose.c,v 1.3 1996/06/26 05:44:40 deraadt Exp $ */
/* $NetBSD: verbose.c,v 1.4 1996/03/19 03:21:50 jtc Exp $ */
/*
@@ -40,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)verbose.c 5.3 (Berkeley) 1/20/91";
#else
-static char rcsid[] = "$NetBSD: verbose.c,v 1.4 1996/03/19 03:21:50 jtc Exp $";
+static char rcsid[] = "$OpenBSD: verbose.c,v 1.3 1996/06/26 05:44:40 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/yacc/warshall.c b/usr.bin/yacc/warshall.c
index 03567fa88e0..0dd4b3d74cb 100644
--- a/usr.bin/yacc/warshall.c
+++ b/usr.bin/yacc/warshall.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: warshall.c,v 1.3 1996/06/26 05:44:40 deraadt Exp $ */
/* $NetBSD: warshall.c,v 1.4 1996/03/19 03:21:51 jtc Exp $ */
/*
@@ -40,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)warshall.c 5.4 (Berkeley) 5/24/93";
#else
-static char rcsid[] = "$NetBSD: warshall.c,v 1.4 1996/03/19 03:21:51 jtc Exp $";
+static char rcsid[] = "$OpenBSD: warshall.c,v 1.3 1996/06/26 05:44:40 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/yacc/yacc.1 b/usr.bin/yacc/yacc.1
index 5b7b0fc609e..6429084fcfc 100644
--- a/usr.bin/yacc/yacc.1
+++ b/usr.bin/yacc/yacc.1
@@ -1,3 +1,4 @@
+.\" $OpenBSD: yacc.1,v 1.3 1996/06/26 05:44:41 deraadt Exp $
.\" Copyright (c) 1989, 1990 The Regents of the University of California.
.\" All rights reserved.
.\"
@@ -33,7 +34,6 @@
.\" SUCH DAMAGE.
.\"
.\" from: @(#)yacc.1 5.7 (Berkeley) 7/30/91
-.\" $Id: yacc.1,v 1.2 1996/01/11 17:52:34 deraadt Exp $
.\"
.Dd July 30, 1991
.Dt YACC 1
diff --git a/usr.bin/yes/Makefile b/usr.bin/yes/Makefile
index c2450836cb1..b5a19438ab7 100644
--- a/usr.bin/yes/Makefile
+++ b/usr.bin/yes/Makefile
@@ -1,4 +1,4 @@
-# @(#)Makefile 8.1 (Berkeley) 6/6/93
+# $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 $
PROG= yes
diff --git a/usr.bin/yes/yes.1 b/usr.bin/yes/yes.1
index d83c55c2ce0..05bd7f5ce09 100644
--- a/usr.bin/yes/yes.1
+++ b/usr.bin/yes/yes.1
@@ -1,3 +1,4 @@
+.\" $OpenBSD: yes.1,v 1.2 1996/06/26 05:44:44 deraadt Exp $
.\" $NetBSD: yes.1,v 1.3 1994/11/14 04:56:14 jtc Exp $
.\"
.\" Copyright (c) 1980, 1991, 1993
diff --git a/usr.bin/yes/yes.c b/usr.bin/yes/yes.c
index ae6f2a55feb..7946c0706d5 100644
--- a/usr.bin/yes/yes.c
+++ b/usr.bin/yes/yes.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: yes.c,v 1.2 1996/06/26 05:44:44 deraadt Exp $ */
/* $NetBSD: yes.c,v 1.3 1994/11/14 04:56:15 jtc Exp $ */
/*
@@ -43,7 +44,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)yes.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$NetBSD: yes.c,v 1.3 1994/11/14 04:56:15 jtc Exp $";
+static char rcsid[] = "$OpenBSD: yes.c,v 1.2 1996/06/26 05:44:44 deraadt Exp $";
#endif /* not lint */
main(argc, argv)