summaryrefslogtreecommitdiff
path: root/usr.bin
diff options
context:
space:
mode:
authoragc <agc@NetBSD.org>2003-08-07 11:13:06 +0000
committeragc <agc@NetBSD.org>2003-08-07 11:13:06 +0000
commit89aaa1bb64ba8db54daf131749fe578e804d9382 (patch)
tree57ca36a9ec77286fc0094f173063d9b41f7f765b /usr.bin
parent075022b349321510ad14036d70908681ed02f117 (diff)
Move UCB-licensed code from 4-clause to 3-clause licence.
Patches provided by Joel Baker in PR 22365, verified by myself.
Diffstat (limited to 'usr.bin')
-rw-r--r--usr.bin/apply/apply.18
-rw-r--r--usr.bin/apply/apply.c10
-rw-r--r--usr.bin/apropos/apropos.18
-rw-r--r--usr.bin/apropos/apropos.c10
-rw-r--r--usr.bin/at/stime.c10
-rw-r--r--usr.bin/at/stime.h8
-rw-r--r--usr.bin/banner/banner.c10
-rw-r--r--usr.bin/banner/chset.c10
-rw-r--r--usr.bin/basename/basename.18
-rw-r--r--usr.bin/basename/basename.c10
-rw-r--r--usr.bin/bdes/bdes.18
-rw-r--r--usr.bin/bdes/bdes.c10
-rw-r--r--usr.bin/biff/biff.18
-rw-r--r--usr.bin/biff/biff.c10
-rw-r--r--usr.bin/cal/cal.18
-rw-r--r--usr.bin/cal/cal.c10
-rw-r--r--usr.bin/calendar/calendar.18
-rw-r--r--usr.bin/calendar/calendar.c10
-rw-r--r--usr.bin/calendar/pathnames.h8
-rw-r--r--usr.bin/cap_mkdb/cap_mkdb.18
-rw-r--r--usr.bin/cap_mkdb/cap_mkdb.c10
-rw-r--r--usr.bin/checknr/checknr.18
-rw-r--r--usr.bin/checknr/checknr.c10
-rw-r--r--usr.bin/chflags/chflags.18
-rw-r--r--usr.bin/chflags/chflags.c10
-rw-r--r--usr.bin/chpass/chpass.18
-rw-r--r--usr.bin/chpass/chpass.c10
-rw-r--r--usr.bin/chpass/chpass.h8
-rw-r--r--usr.bin/chpass/edit.c10
-rw-r--r--usr.bin/chpass/field.c10
-rw-r--r--usr.bin/chpass/pathnames.h8
-rw-r--r--usr.bin/chpass/pw_yp.c10
-rw-r--r--usr.bin/chpass/table.c10
-rw-r--r--usr.bin/chpass/util.c10
-rw-r--r--usr.bin/cksum/cksum.18
-rw-r--r--usr.bin/cksum/cksum.c36
-rw-r--r--usr.bin/cksum/crc.c10
-rw-r--r--usr.bin/cksum/extern.h8
-rw-r--r--usr.bin/cksum/print.c10
-rw-r--r--usr.bin/cksum/sum1.c10
-rw-r--r--usr.bin/cksum/sum2.c10
-rw-r--r--usr.bin/cmp/cmp.18
-rw-r--r--usr.bin/cmp/cmp.c10
-rw-r--r--usr.bin/cmp/extern.h8
-rw-r--r--usr.bin/cmp/misc.c10
-rw-r--r--usr.bin/cmp/regular.c10
-rw-r--r--usr.bin/cmp/special.c10
-rw-r--r--usr.bin/col/col.18
-rw-r--r--usr.bin/col/col.c10
-rw-r--r--usr.bin/colcrt/colcrt.18
-rw-r--r--usr.bin/colcrt/colcrt.c10
-rw-r--r--usr.bin/colrm/colrm.18
-rw-r--r--usr.bin/colrm/colrm.c10
-rw-r--r--usr.bin/column/column.18
-rw-r--r--usr.bin/column/column.c10
-rw-r--r--usr.bin/comm/comm.18
-rw-r--r--usr.bin/comm/comm.c10
-rw-r--r--usr.bin/compress/compress.18
-rw-r--r--usr.bin/compress/compress.c10
-rw-r--r--usr.bin/compress/zopen.38
-rw-r--r--usr.bin/compress/zopen.c10
-rw-r--r--usr.bin/ctags/C.c10
-rw-r--r--usr.bin/ctags/ctags.18
-rw-r--r--usr.bin/ctags/ctags.c10
-rw-r--r--usr.bin/ctags/ctags.h8
-rw-r--r--usr.bin/ctags/fortran.c10
-rw-r--r--usr.bin/ctags/lisp.c10
-rw-r--r--usr.bin/ctags/print.c10
-rw-r--r--usr.bin/ctags/tree.c10
-rw-r--r--usr.bin/ctags/yacc.c10
-rw-r--r--usr.bin/cut/cut.18
-rw-r--r--usr.bin/cut/cut.c10
-rw-r--r--usr.bin/dirname/dirname.c10
-rw-r--r--usr.bin/du/du.18
-rw-r--r--usr.bin/du/du.c10
-rw-r--r--usr.bin/env/env.110
-rw-r--r--usr.bin/env/env.c8
-rw-r--r--usr.bin/error/error.18
-rw-r--r--usr.bin/error/error.h8
-rw-r--r--usr.bin/error/filter.c10
-rw-r--r--usr.bin/error/input.c10
-rw-r--r--usr.bin/error/main.c10
-rw-r--r--usr.bin/error/pathnames.h8
-rw-r--r--usr.bin/error/pi.c10
-rw-r--r--usr.bin/error/subr.c10
-rw-r--r--usr.bin/error/touch.c10
-rw-r--r--usr.bin/expand/expand.18
-rw-r--r--usr.bin/expand/expand.c10
-rw-r--r--usr.bin/false/false.110
-rw-r--r--usr.bin/find/extern.h8
-rw-r--r--usr.bin/find/find.18
-rw-r--r--usr.bin/find/find.c10
-rw-r--r--usr.bin/find/find.h8
-rw-r--r--usr.bin/find/function.c10
-rw-r--r--usr.bin/find/ls.c10
-rw-r--r--usr.bin/find/main.c10
-rw-r--r--usr.bin/find/misc.c10
-rw-r--r--usr.bin/find/operator.c10
-rw-r--r--usr.bin/find/option.c10
-rw-r--r--usr.bin/finger/extern.h8
-rw-r--r--usr.bin/finger/finger.18
-rw-r--r--usr.bin/finger/finger.c10
-rw-r--r--usr.bin/finger/finger.h8
-rw-r--r--usr.bin/finger/lprint.c10
-rw-r--r--usr.bin/finger/net.c10
-rw-r--r--usr.bin/finger/sprint.c10
-rw-r--r--usr.bin/finger/util.c34
-rw-r--r--usr.bin/fmt/fmt.18
-rw-r--r--usr.bin/fmt/fmt.c10
-rw-r--r--usr.bin/fold/fold.18
-rw-r--r--usr.bin/fold/fold.c10
-rw-r--r--usr.bin/fpr/fpr.18
-rw-r--r--usr.bin/fpr/fpr.c10
-rw-r--r--usr.bin/from/from.18
-rw-r--r--usr.bin/from/from.c10
-rw-r--r--usr.bin/fsplit/fsplit.18
-rw-r--r--usr.bin/fsplit/fsplit.c8
-rw-r--r--usr.bin/fstat/fstat.110
-rw-r--r--usr.bin/fstat/fstat.c10
-rw-r--r--usr.bin/fstat/fstat.h8
-rw-r--r--usr.bin/fstat/isofs.c10
-rw-r--r--usr.bin/ftp/cmds.c10
-rw-r--r--usr.bin/ftp/cmdtab.c10
-rw-r--r--usr.bin/ftp/domacro.c10
-rw-r--r--usr.bin/ftp/extern.h8
-rw-r--r--usr.bin/ftp/ftp.18
-rw-r--r--usr.bin/ftp/ftp.c10
-rw-r--r--usr.bin/ftp/ftp_var.h8
-rw-r--r--usr.bin/ftp/main.c10
-rw-r--r--usr.bin/ftp/ruserpass.c10
-rw-r--r--usr.bin/ftp/util.c10
-rw-r--r--usr.bin/gprof/PSD.doc/abstract.me8
-rw-r--r--usr.bin/gprof/PSD.doc/gathering.me8
-rw-r--r--usr.bin/gprof/PSD.doc/header.me8
-rw-r--r--usr.bin/gprof/PSD.doc/intro.me8
-rw-r--r--usr.bin/gprof/PSD.doc/postp.me8
-rw-r--r--usr.bin/gprof/PSD.doc/postp1.pic8
-rw-r--r--usr.bin/gprof/PSD.doc/postp2.pic8
-rw-r--r--usr.bin/gprof/PSD.doc/postp3.pic8
-rw-r--r--usr.bin/gprof/PSD.doc/pres1.pic8
-rw-r--r--usr.bin/gprof/PSD.doc/pres2.pic8
-rw-r--r--usr.bin/gprof/PSD.doc/present.me8
-rw-r--r--usr.bin/gprof/PSD.doc/profiling.me8
-rw-r--r--usr.bin/gprof/PSD.doc/refs.me8
-rw-r--r--usr.bin/head/head.18
-rw-r--r--usr.bin/head/head.c10
-rw-r--r--usr.bin/hexdump/conv.c10
-rw-r--r--usr.bin/hexdump/display.c10
-rw-r--r--usr.bin/hexdump/hexdump.18
-rw-r--r--usr.bin/hexdump/hexdump.c10
-rw-r--r--usr.bin/hexdump/hexdump.h8
-rw-r--r--usr.bin/hexdump/hexsyntax.c10
-rw-r--r--usr.bin/hexdump/odsyntax.c10
-rw-r--r--usr.bin/hexdump/parse.c10
-rw-r--r--usr.bin/id/groups.110
-rw-r--r--usr.bin/id/id.18
-rw-r--r--usr.bin/id/id.c8
-rw-r--r--usr.bin/id/whoami.110
-rw-r--r--usr.bin/indent/args.c31
-rw-r--r--usr.bin/indent/indent.127
-rw-r--r--usr.bin/indent/indent.c31
-rw-r--r--usr.bin/indent/indent_codes.h35
-rw-r--r--usr.bin/indent/indent_globs.h35
-rw-r--r--usr.bin/indent/io.c31
-rw-r--r--usr.bin/indent/lexi.c31
-rw-r--r--usr.bin/indent/parse.c31
-rw-r--r--usr.bin/indent/pr_comment.c31
-rw-r--r--usr.bin/join/join.110
-rw-r--r--usr.bin/join/join.c10
-rw-r--r--usr.bin/jot/jot.18
-rw-r--r--usr.bin/jot/jot.c10
-rw-r--r--usr.bin/kdump/kdump.18
-rw-r--r--usr.bin/kdump/kdump.c10
-rw-r--r--usr.bin/kdump/setemul.c10
-rw-r--r--usr.bin/kdump/setemul.h8
-rw-r--r--usr.bin/ktrace/ktrace.18
-rw-r--r--usr.bin/ktrace/ktrace.c10
-rw-r--r--usr.bin/ktrace/ktrace.h8
-rw-r--r--usr.bin/ktrace/subr.c10
-rw-r--r--usr.bin/ktruss/dump.c10
-rw-r--r--usr.bin/lam/lam.18
-rw-r--r--usr.bin/lam/lam.c10
-rw-r--r--usr.bin/last/last.18
-rw-r--r--usr.bin/last/last.c10
-rw-r--r--usr.bin/last/want.c8
-rw-r--r--usr.bin/lastcomm/lastcomm.18
-rw-r--r--usr.bin/lastcomm/lastcomm.c10
-rw-r--r--usr.bin/lastcomm/pathnames.h8
-rw-r--r--usr.bin/leave/leave.18
-rw-r--r--usr.bin/leave/leave.c10
-rw-r--r--usr.bin/locate/bigram/locate.bigram.c10
-rw-r--r--usr.bin/locate/code/locate.code.c10
-rw-r--r--usr.bin/locate/locate/locate.18
-rw-r--r--usr.bin/locate/locate/locate.c10
-rw-r--r--usr.bin/locate/locate/locate.h8
-rw-r--r--usr.bin/locate/locate/pathnames.h8
-rw-r--r--usr.bin/lock/lock.18
-rw-r--r--usr.bin/lock/lock.c10
-rw-r--r--usr.bin/logger/logger.18
-rw-r--r--usr.bin/logger/logger.c10
-rw-r--r--usr.bin/login/k5login.c10
-rw-r--r--usr.bin/login/klogin.c10
-rw-r--r--usr.bin/login/login.18
-rw-r--r--usr.bin/login/login.c10
-rw-r--r--usr.bin/login/pathnames.h8
-rw-r--r--usr.bin/logname/logname.18
-rw-r--r--usr.bin/logname/logname.c10
-rw-r--r--usr.bin/look/look.18
-rw-r--r--usr.bin/look/look.c10
-rw-r--r--usr.bin/look/pathnames.h8
-rw-r--r--usr.bin/lorder/lorder.18
-rw-r--r--usr.bin/m4/eval.c10
-rw-r--r--usr.bin/m4/expr.c10
-rw-r--r--usr.bin/m4/extern.h8
-rw-r--r--usr.bin/m4/look.c10
-rw-r--r--usr.bin/m4/main.c10
-rw-r--r--usr.bin/m4/mdef.h8
-rw-r--r--usr.bin/m4/misc.c10
-rw-r--r--usr.bin/m4/pathnames.h8
-rw-r--r--usr.bin/m4/stdd.h8
-rw-r--r--usr.bin/machine/machine.110
-rw-r--r--usr.bin/mail/USD.doc/mail0.nr8
-rw-r--r--usr.bin/mail/USD.doc/mail1.nr8
-rw-r--r--usr.bin/mail/USD.doc/mail2.nr8
-rw-r--r--usr.bin/mail/USD.doc/mail3.nr8
-rw-r--r--usr.bin/mail/USD.doc/mail4.nr8
-rw-r--r--usr.bin/mail/USD.doc/mail5.nr8
-rw-r--r--usr.bin/mail/USD.doc/mail6.nr8
-rw-r--r--usr.bin/mail/USD.doc/mail7.nr8
-rw-r--r--usr.bin/mail/USD.doc/mail8.nr8
-rw-r--r--usr.bin/mail/USD.doc/mail9.nr8
-rw-r--r--usr.bin/mail/USD.doc/maila.nr8
-rw-r--r--usr.bin/mail/cmd1.c10
-rw-r--r--usr.bin/mail/cmd2.c10
-rw-r--r--usr.bin/mail/cmd3.c10
-rw-r--r--usr.bin/mail/cmdtab.c10
-rw-r--r--usr.bin/mail/collect.c10
-rw-r--r--usr.bin/mail/def.h10
-rw-r--r--usr.bin/mail/edit.c10
-rw-r--r--usr.bin/mail/extern.h10
-rw-r--r--usr.bin/mail/fio.c10
-rw-r--r--usr.bin/mail/getname.c10
-rw-r--r--usr.bin/mail/glob.h10
-rw-r--r--usr.bin/mail/head.c10
-rw-r--r--usr.bin/mail/lex.c10
-rw-r--r--usr.bin/mail/list.c10
-rw-r--r--usr.bin/mail/mail.18
-rw-r--r--usr.bin/mail/main.c10
-rw-r--r--usr.bin/mail/names.c10
-rw-r--r--usr.bin/mail/pathnames.h10
-rw-r--r--usr.bin/mail/popen.c10
-rw-r--r--usr.bin/mail/quit.c10
-rw-r--r--usr.bin/mail/rcv.h10
-rw-r--r--usr.bin/mail/send.c10
-rw-r--r--usr.bin/mail/strings.c10
-rw-r--r--usr.bin/mail/support.c10
-rw-r--r--usr.bin/mail/temp.c10
-rw-r--r--usr.bin/mail/tty.c10
-rw-r--r--usr.bin/mail/v7.local.c10
-rw-r--r--usr.bin/mail/vars.c10
-rw-r--r--usr.bin/mail/version.c10
-rw-r--r--usr.bin/make/PSD.doc/tutorial.ms34
-rw-r--r--usr.bin/make/arch.c36
-rw-r--r--usr.bin/make/bit.h34
-rw-r--r--usr.bin/make/buf.c37
-rw-r--r--usr.bin/make/buf.h34
-rw-r--r--usr.bin/make/compat.c37
-rw-r--r--usr.bin/make/cond.c37
-rw-r--r--usr.bin/make/config.h34
-rw-r--r--usr.bin/make/dir.c37
-rw-r--r--usr.bin/make/dir.h34
-rw-r--r--usr.bin/make/for.c12
-rw-r--r--usr.bin/make/hash.c37
-rw-r--r--usr.bin/make/hash.h34
-rw-r--r--usr.bin/make/job.c37
-rw-r--r--usr.bin/make/job.h35
-rw-r--r--usr.bin/make/list.h35
-rw-r--r--usr.bin/make/lst.h35
-rw-r--r--usr.bin/make/lst.lib/lstAppend.c12
-rw-r--r--usr.bin/make/lst.lib/lstAtEnd.c12
-rw-r--r--usr.bin/make/lst.lib/lstAtFront.c12
-rw-r--r--usr.bin/make/lst.lib/lstClose.c12
-rw-r--r--usr.bin/make/lst.lib/lstConcat.c12
-rw-r--r--usr.bin/make/lst.lib/lstDatum.c12
-rw-r--r--usr.bin/make/lst.lib/lstDeQueue.c12
-rw-r--r--usr.bin/make/lst.lib/lstDestroy.c12
-rw-r--r--usr.bin/make/lst.lib/lstDupl.c12
-rw-r--r--usr.bin/make/lst.lib/lstEnQueue.c12
-rw-r--r--usr.bin/make/lst.lib/lstFind.c12
-rw-r--r--usr.bin/make/lst.lib/lstFindFrom.c12
-rw-r--r--usr.bin/make/lst.lib/lstFirst.c12
-rw-r--r--usr.bin/make/lst.lib/lstForEach.c12
-rw-r--r--usr.bin/make/lst.lib/lstForEachFrom.c12
-rw-r--r--usr.bin/make/lst.lib/lstInit.c12
-rw-r--r--usr.bin/make/lst.lib/lstInsert.c12
-rw-r--r--usr.bin/make/lst.lib/lstInt.h8
-rw-r--r--usr.bin/make/lst.lib/lstIsAtEnd.c12
-rw-r--r--usr.bin/make/lst.lib/lstIsEmpty.c12
-rw-r--r--usr.bin/make/lst.lib/lstLast.c12
-rw-r--r--usr.bin/make/lst.lib/lstMember.c12
-rw-r--r--usr.bin/make/lst.lib/lstNext.c12
-rw-r--r--usr.bin/make/lst.lib/lstOpen.c12
-rw-r--r--usr.bin/make/lst.lib/lstRemove.c12
-rw-r--r--usr.bin/make/lst.lib/lstReplace.c12
-rw-r--r--usr.bin/make/lst.lib/lstSucc.c12
-rw-r--r--usr.bin/make/main.c36
-rw-r--r--usr.bin/make/make.18
-rw-r--r--usr.bin/make/make.c36
-rw-r--r--usr.bin/make/make.h34
-rw-r--r--usr.bin/make/nonints.h34
-rw-r--r--usr.bin/make/parse.c36
-rw-r--r--usr.bin/make/pathnames.h8
-rw-r--r--usr.bin/make/sprite.h34
-rw-r--r--usr.bin/make/str.c36
-rw-r--r--usr.bin/make/suff.c36
-rw-r--r--usr.bin/make/targ.c36
-rw-r--r--usr.bin/make/var.c36
-rw-r--r--usr.bin/man/man.18
-rw-r--r--usr.bin/man/man.c10
-rw-r--r--usr.bin/man/man.conf.58
-rw-r--r--usr.bin/man/manconf.c10
-rw-r--r--usr.bin/man/manconf.h8
-rw-r--r--usr.bin/man/pathnames.h8
-rw-r--r--usr.bin/mesg/mesg.18
-rw-r--r--usr.bin/mesg/mesg.c10
-rw-r--r--usr.bin/mkdep/mkdep.18
-rw-r--r--usr.bin/mkfifo/mkfifo.18
-rw-r--r--usr.bin/mkfifo/mkfifo.c10
-rw-r--r--usr.bin/mklocale/ldef.h8
-rw-r--r--usr.bin/mklocale/lex.l10
-rw-r--r--usr.bin/mklocale/mklocale.18
-rw-r--r--usr.bin/mklocale/yacc.y10
-rw-r--r--usr.bin/mkstr/mkstr.18
-rw-r--r--usr.bin/mkstr/mkstr.c10
-rw-r--r--usr.bin/mktemp/mktemp.18
-rw-r--r--usr.bin/msgs/msgs.18
-rw-r--r--usr.bin/msgs/msgs.c10
-rw-r--r--usr.bin/msgs/pathnames.h8
-rw-r--r--usr.bin/netstat/atalk.c10
-rw-r--r--usr.bin/netstat/if.c10
-rw-r--r--usr.bin/netstat/inet.c10
-rw-r--r--usr.bin/netstat/inet6.c10
-rw-r--r--usr.bin/netstat/ipsec.c10
-rw-r--r--usr.bin/netstat/iso.c10
-rw-r--r--usr.bin/netstat/main.c10
-rw-r--r--usr.bin/netstat/mbuf.c10
-rw-r--r--usr.bin/netstat/mroute.c38
-rw-r--r--usr.bin/netstat/mroute6.c36
-rw-r--r--usr.bin/netstat/netstat.18
-rw-r--r--usr.bin/netstat/netstat.h8
-rw-r--r--usr.bin/netstat/ns.c10
-rw-r--r--usr.bin/netstat/route.c10
-rw-r--r--usr.bin/netstat/unix.c10
-rw-r--r--usr.bin/nfsstat/nfsstat.18
-rw-r--r--usr.bin/nfsstat/nfsstat.c10
-rw-r--r--usr.bin/nice/nice.18
-rw-r--r--usr.bin/nice/nice.c10
-rw-r--r--usr.bin/nohup/nohup.18
-rw-r--r--usr.bin/nohup/nohup.c10
-rw-r--r--usr.bin/pagesize/pagesize.18
-rw-r--r--usr.bin/passwd/extern.h8
-rw-r--r--usr.bin/passwd/local_passwd.c10
-rw-r--r--usr.bin/passwd/passwd.18
-rw-r--r--usr.bin/passwd/passwd.c10
-rw-r--r--usr.bin/passwd/yp_passwd.c10
-rw-r--r--usr.bin/paste/paste.110
-rw-r--r--usr.bin/paste/paste.c10
-rw-r--r--usr.bin/pr/egetopt.c36
-rw-r--r--usr.bin/pr/extern.h39
-rw-r--r--usr.bin/pr/pr.134
-rw-r--r--usr.bin/pr/pr.c36
-rw-r--r--usr.bin/pr/pr.h39
-rw-r--r--usr.bin/printenv/printenv.110
-rw-r--r--usr.bin/printenv/printenv.c10
-rw-r--r--usr.bin/printf/printf.18
-rw-r--r--usr.bin/printf/printf.c10
-rw-r--r--usr.bin/quota/quota.18
-rw-r--r--usr.bin/quota/quota.c10
-rw-r--r--usr.bin/rdist/defs.h8
-rw-r--r--usr.bin/rdist/docmd.c10
-rw-r--r--usr.bin/rdist/expand.c10
-rw-r--r--usr.bin/rdist/gram.y10
-rw-r--r--usr.bin/rdist/lookup.c10
-rw-r--r--usr.bin/rdist/main.c10
-rw-r--r--usr.bin/rdist/pathnames.h8
-rw-r--r--usr.bin/rdist/rdist.18
-rw-r--r--usr.bin/rdist/server.c10
-rw-r--r--usr.bin/renice/renice.810
-rw-r--r--usr.bin/renice/renice.c10
-rw-r--r--usr.bin/rev/rev.18
-rw-r--r--usr.bin/rev/rev.c10
-rw-r--r--usr.bin/rlogin/kcmd.c10
-rw-r--r--usr.bin/rlogin/krb.h8
-rw-r--r--usr.bin/rlogin/krcmd.c10
-rw-r--r--usr.bin/rlogin/rlogin.18
-rw-r--r--usr.bin/rlogin/rlogin.c10
-rw-r--r--usr.bin/rs/rs.18
-rw-r--r--usr.bin/rs/rs.c10
-rw-r--r--usr.bin/rsh/pathnames.h10
-rw-r--r--usr.bin/rsh/rsh.18
-rw-r--r--usr.bin/rsh/rsh.c10
-rw-r--r--usr.bin/rup/rup.18
-rw-r--r--usr.bin/ruptime/ruptime.110
-rw-r--r--usr.bin/ruptime/ruptime.c10
-rw-r--r--usr.bin/rusers/rusers.110
-rw-r--r--usr.bin/rwall/rwall.110
-rw-r--r--usr.bin/rwall/rwall.c33
-rw-r--r--usr.bin/rwho/rwho.110
-rw-r--r--usr.bin/rwho/rwho.c10
-rw-r--r--usr.bin/script/script.18
-rw-r--r--usr.bin/script/script.c10
-rw-r--r--usr.bin/sed/compile.c36
-rw-r--r--usr.bin/sed/defs.h39
-rw-r--r--usr.bin/sed/extern.h39
-rw-r--r--usr.bin/sed/main.c36
-rw-r--r--usr.bin/sed/misc.c36
-rw-r--r--usr.bin/sed/process.c36
-rw-r--r--usr.bin/sed/sed.18
-rw-r--r--usr.bin/shar/shar.18
-rw-r--r--usr.bin/showmount/showmount.88
-rw-r--r--usr.bin/showmount/showmount.c10
-rw-r--r--usr.bin/soelim/soelim.18
-rw-r--r--usr.bin/soelim/soelim.c10
-rw-r--r--usr.bin/sort/append.c10
-rw-r--r--usr.bin/sort/fields.c10
-rw-r--r--usr.bin/sort/files.c10
-rw-r--r--usr.bin/sort/fsort.c10
-rw-r--r--usr.bin/sort/fsort.h8
-rw-r--r--usr.bin/sort/init.c10
-rw-r--r--usr.bin/sort/msort.c10
-rw-r--r--usr.bin/sort/pathnames.h8
-rw-r--r--usr.bin/sort/sort.18
-rw-r--r--usr.bin/sort/sort.c10
-rw-r--r--usr.bin/sort/sort.h8
-rw-r--r--usr.bin/sort/tmp.c10
-rw-r--r--usr.bin/split/split.18
-rw-r--r--usr.bin/split/split.c10
-rw-r--r--usr.bin/su/su.18
-rw-r--r--usr.bin/su/su.c10
-rw-r--r--usr.bin/systat/cmds.c10
-rw-r--r--usr.bin/systat/cmdtab.c10
-rw-r--r--usr.bin/systat/disks.c10
-rw-r--r--usr.bin/systat/extern.h8
-rw-r--r--usr.bin/systat/fetch.c10
-rw-r--r--usr.bin/systat/iostat.c10
-rw-r--r--usr.bin/systat/keyboard.c10
-rw-r--r--usr.bin/systat/main.c10
-rw-r--r--usr.bin/systat/mbufs.c10
-rw-r--r--usr.bin/systat/netcmds.c10
-rw-r--r--usr.bin/systat/netstat.c10
-rw-r--r--usr.bin/systat/pigs.c10
-rw-r--r--usr.bin/systat/swap.c33
-rw-r--r--usr.bin/systat/systat.18
-rw-r--r--usr.bin/systat/systat.h6
-rw-r--r--usr.bin/systat/vmstat.c10
-rw-r--r--usr.bin/tail/extern.h8
-rw-r--r--usr.bin/tail/forward.c10
-rw-r--r--usr.bin/tail/misc.c8
-rw-r--r--usr.bin/tail/read.c10
-rw-r--r--usr.bin/tail/reverse.c10
-rw-r--r--usr.bin/tail/tail.18
-rw-r--r--usr.bin/tail/tail.c8
-rw-r--r--usr.bin/talk/ctl.c10
-rw-r--r--usr.bin/talk/ctl_transact.c10
-rw-r--r--usr.bin/talk/display.c10
-rw-r--r--usr.bin/talk/get_addrs.c10
-rw-r--r--usr.bin/talk/get_names.c10
-rw-r--r--usr.bin/talk/init_disp.c10
-rw-r--r--usr.bin/talk/invite.c10
-rw-r--r--usr.bin/talk/io.c10
-rw-r--r--usr.bin/talk/look_up.c10
-rw-r--r--usr.bin/talk/msgs.c10
-rw-r--r--usr.bin/talk/talk.18
-rw-r--r--usr.bin/talk/talk.c10
-rw-r--r--usr.bin/talk/talk.h8
-rw-r--r--usr.bin/talk/talk_ctl.h8
-rw-r--r--usr.bin/tcopy/tcopy.18
-rw-r--r--usr.bin/tcopy/tcopy.c10
-rw-r--r--usr.bin/tee/tee.18
-rw-r--r--usr.bin/tee/tee.c10
-rw-r--r--usr.bin/telnet/authenc.c10
-rw-r--r--usr.bin/telnet/commands.c10
-rw-r--r--usr.bin/telnet/defines.h8
-rw-r--r--usr.bin/telnet/externs.h8
-rw-r--r--usr.bin/telnet/general.h8
-rw-r--r--usr.bin/telnet/main.c10
-rw-r--r--usr.bin/telnet/network.c10
-rw-r--r--usr.bin/telnet/ring.c10
-rw-r--r--usr.bin/telnet/ring.h8
-rw-r--r--usr.bin/telnet/sys_bsd.c10
-rw-r--r--usr.bin/telnet/telnet.18
-rw-r--r--usr.bin/telnet/telnet.c10
-rw-r--r--usr.bin/telnet/terminal.c10
-rw-r--r--usr.bin/telnet/tn3270.c10
-rw-r--r--usr.bin/telnet/types.h8
-rw-r--r--usr.bin/telnet/utilities.c10
-rw-r--r--usr.bin/tftp/extern.h8
-rw-r--r--usr.bin/tftp/main.c10
-rw-r--r--usr.bin/tftp/tftp.18
-rw-r--r--usr.bin/tftp/tftp.c10
-rw-r--r--usr.bin/tftp/tftpsubs.c10
-rw-r--r--usr.bin/tftp/tftpsubs.h8
-rw-r--r--usr.bin/time/time.18
-rw-r--r--usr.bin/time/time.c10
-rw-r--r--usr.bin/tip/acu.c10
-rw-r--r--usr.bin/tip/aculib/biz22.c10
-rw-r--r--usr.bin/tip/aculib/biz31.c10
-rw-r--r--usr.bin/tip/aculib/courier.c10
-rw-r--r--usr.bin/tip/aculib/df.c10
-rw-r--r--usr.bin/tip/aculib/dn11.c10
-rw-r--r--usr.bin/tip/aculib/hayes.c10
-rw-r--r--usr.bin/tip/aculib/t3000.c10
-rw-r--r--usr.bin/tip/aculib/v3451.c10
-rw-r--r--usr.bin/tip/aculib/v831.c10
-rw-r--r--usr.bin/tip/aculib/ventel.c10
-rw-r--r--usr.bin/tip/acutab.c10
-rw-r--r--usr.bin/tip/cmds.c10
-rw-r--r--usr.bin/tip/cmdtab.c10
-rw-r--r--usr.bin/tip/cu.c10
-rw-r--r--usr.bin/tip/hunt.c10
-rw-r--r--usr.bin/tip/log.c10
-rw-r--r--usr.bin/tip/partab.c10
-rw-r--r--usr.bin/tip/pathnames.h8
-rw-r--r--usr.bin/tip/remote.c10
-rw-r--r--usr.bin/tip/tip.18
-rw-r--r--usr.bin/tip/tip.c10
-rw-r--r--usr.bin/tip/tip.h8
-rw-r--r--usr.bin/tip/tipout.c10
-rw-r--r--usr.bin/tip/uucplock.c10
-rw-r--r--usr.bin/tip/value.c10
-rw-r--r--usr.bin/tip/vars.c10
-rw-r--r--usr.bin/tn3270/api/api_bsd.c10
-rw-r--r--usr.bin/tn3270/api/api_exch.c10
-rw-r--r--usr.bin/tn3270/api/api_exch.h8
-rw-r--r--usr.bin/tn3270/api/apilib.c10
-rw-r--r--usr.bin/tn3270/api/apilib.h8
-rw-r--r--usr.bin/tn3270/api/asc_ebc.c10
-rw-r--r--usr.bin/tn3270/api/asc_ebc.h8
-rw-r--r--usr.bin/tn3270/api/astosc.c10
-rw-r--r--usr.bin/tn3270/api/astosc.h8
-rw-r--r--usr.bin/tn3270/api/dctype.c10
-rw-r--r--usr.bin/tn3270/api/dctype.h8
-rw-r--r--usr.bin/tn3270/api/disp_asc.c10
-rw-r--r--usr.bin/tn3270/api/disp_asc.h8
-rw-r--r--usr.bin/tn3270/api/ebc_disp.c10
-rw-r--r--usr.bin/tn3270/api/ebc_disp.h8
-rw-r--r--usr.bin/tn3270/ascii/default.map6
-rw-r--r--usr.bin/tn3270/ascii/map3270.c10
-rw-r--r--usr.bin/tn3270/ascii/map3270.h8
-rw-r--r--usr.bin/tn3270/ascii/mset.c10
-rw-r--r--usr.bin/tn3270/ascii/state.h8
-rw-r--r--usr.bin/tn3270/ascii/termin.c10
-rw-r--r--usr.bin/tn3270/ctlr/3180.kbd6
-rw-r--r--usr.bin/tn3270/ctlr/3270pc.kbd6
-rw-r--r--usr.bin/tn3270/ctlr/api.c10
-rw-r--r--usr.bin/tn3270/ctlr/api.h8
-rw-r--r--usr.bin/tn3270/ctlr/declare.h8
-rw-r--r--usr.bin/tn3270/ctlr/function.c10
-rw-r--r--usr.bin/tn3270/ctlr/function.h8
-rw-r--r--usr.bin/tn3270/ctlr/hostctlr.h8
-rw-r--r--usr.bin/tn3270/ctlr/inbound.c10
-rw-r--r--usr.bin/tn3270/ctlr/oia.c10
-rw-r--r--usr.bin/tn3270/ctlr/oia.h8
-rw-r--r--usr.bin/tn3270/ctlr/options.c10
-rw-r--r--usr.bin/tn3270/ctlr/options.h8
-rw-r--r--usr.bin/tn3270/ctlr/outbound.c10
-rw-r--r--usr.bin/tn3270/ctlr/screen.h8
-rw-r--r--usr.bin/tn3270/ctlr/scrnctlr.h8
-rw-r--r--usr.bin/tn3270/ctlr/unix.kbd6
-rw-r--r--usr.bin/tn3270/general/genbsubs.c10
-rw-r--r--usr.bin/tn3270/general/general.h8
-rw-r--r--usr.bin/tn3270/general/globals.c10
-rw-r--r--usr.bin/tn3270/general/globals.h8
-rw-r--r--usr.bin/tn3270/general/vaxbsubs.s10
-rw-r--r--usr.bin/tn3270/mset/map3270.510
-rw-r--r--usr.bin/tn3270/mset/mset.110
-rw-r--r--usr.bin/tn3270/sys_curses/system.c10
-rw-r--r--usr.bin/tn3270/sys_curses/telextrn.h8
-rw-r--r--usr.bin/tn3270/sys_curses/terminal.h8
-rw-r--r--usr.bin/tn3270/sys_curses/termout.c10
-rw-r--r--usr.bin/tn3270/tn3270/tn3270.110
-rw-r--r--usr.bin/tn3270/tools/mkastods/mkastods.c10
-rw-r--r--usr.bin/tn3270/tools/mkastosc/mkastosc.c10
-rw-r--r--usr.bin/tn3270/tools/mkdctype/ectype.c10
-rw-r--r--usr.bin/tn3270/tools/mkdctype/ectype.h8
-rw-r--r--usr.bin/tn3270/tools/mkdctype/mkdctype.c10
-rw-r--r--usr.bin/tn3270/tools/mkdstoas/mkdstoas.c10
-rw-r--r--usr.bin/tn3270/tools/mkhits/dohits.c10
-rw-r--r--usr.bin/tn3270/tools/mkhits/dohits.h8
-rw-r--r--usr.bin/tn3270/tools/mkhits/mkhits.c10
-rw-r--r--usr.bin/tn3270/tools/mkmake/mkmake.y10
-rw-r--r--usr.bin/tn3270/tools/prt3270/prt3270.c10
-rw-r--r--usr.bin/touch/touch.18
-rw-r--r--usr.bin/touch/touch.c10
-rw-r--r--usr.bin/tput/tput.18
-rw-r--r--usr.bin/tput/tput.c10
-rw-r--r--usr.bin/tr/extern.h8
-rw-r--r--usr.bin/tr/str.c10
-rw-r--r--usr.bin/tr/tr.18
-rw-r--r--usr.bin/tr/tr.c10
-rw-r--r--usr.bin/true/true.110
-rw-r--r--usr.bin/tset/extern.h8
-rw-r--r--usr.bin/tset/map.c10
-rw-r--r--usr.bin/tset/misc.c10
-rw-r--r--usr.bin/tset/set.c10
-rw-r--r--usr.bin/tset/term.c10
-rw-r--r--usr.bin/tset/tset.18
-rw-r--r--usr.bin/tset/tset.c10
-rw-r--r--usr.bin/tset/wrterm.c10
-rw-r--r--usr.bin/tsort/tsort.18
-rw-r--r--usr.bin/tsort/tsort.c10
-rw-r--r--usr.bin/tty/tty.18
-rw-r--r--usr.bin/tty/tty.c10
-rw-r--r--usr.bin/ul/ul.18
-rw-r--r--usr.bin/ul/ul.c10
-rw-r--r--usr.bin/uname/uname.110
-rw-r--r--usr.bin/unexpand/unexpand.c10
-rw-r--r--usr.bin/unifdef/unifdef.133
-rw-r--r--usr.bin/unifdef/unifdef.c36
-rw-r--r--usr.bin/uniq/uniq.18
-rw-r--r--usr.bin/uniq/uniq.c10
-rw-r--r--usr.bin/unvis/unvis.18
-rw-r--r--usr.bin/unvis/unvis.c10
-rw-r--r--usr.bin/users/users.18
-rw-r--r--usr.bin/users/users.c10
-rw-r--r--usr.bin/uudecode/uudecode.c10
-rw-r--r--usr.bin/uuencode/uuencode.18
-rw-r--r--usr.bin/uuencode/uuencode.58
-rw-r--r--usr.bin/uuencode/uuencode.c10
-rw-r--r--usr.bin/vacation/vacation.18
-rw-r--r--usr.bin/vacation/vacation.c10
-rw-r--r--usr.bin/vgrind/RETEST/retest.c10
-rw-r--r--usr.bin/vgrind/extern.h8
-rw-r--r--usr.bin/vgrind/pathnames.h8
-rw-r--r--usr.bin/vgrind/regexp.c10
-rw-r--r--usr.bin/vgrind/vfontedpr.c10
-rw-r--r--usr.bin/vgrind/vgrind.18
-rw-r--r--usr.bin/vgrind/vgrindefs.58
-rw-r--r--usr.bin/vgrind/vgrindefs.c10
-rw-r--r--usr.bin/vi/LICENSE27
-rw-r--r--usr.bin/vi/catalog/dump.c8
-rw-r--r--usr.bin/vi/docs/USD.doc/edit/edit.vindex8
-rw-r--r--usr.bin/vi/docs/USD.doc/edit/edittut.ms8
-rw-r--r--usr.bin/vi/docs/USD.doc/exref/ex.rm8
-rw-r--r--usr.bin/vi/docs/USD.doc/exref/ex.summary8
-rw-r--r--usr.bin/vi/docs/USD.doc/vitut/vi.apwh.ms8
-rw-r--r--usr.bin/vi/docs/USD.doc/vitut/vi.chars8
-rw-r--r--usr.bin/vi/docs/USD.doc/vitut/vi.in8
-rw-r--r--usr.bin/vi/docs/USD.doc/vitut/vi.summary8
-rw-r--r--usr.bin/vi/include/bitstring.h8
-rw-r--r--usr.bin/vis/foldit.c10
-rw-r--r--usr.bin/vis/vis.18
-rw-r--r--usr.bin/vis/vis.c10
-rw-r--r--usr.bin/vmstat/vmstat.18
-rw-r--r--usr.bin/vmstat/vmstat.c10
-rw-r--r--usr.bin/w/extern.h8
-rw-r--r--usr.bin/w/pr_time.c10
-rw-r--r--usr.bin/w/proc_compare.c10
-rw-r--r--usr.bin/w/uptime.18
-rw-r--r--usr.bin/w/w.18
-rw-r--r--usr.bin/w/w.c10
-rw-r--r--usr.bin/wall/wall.18
-rw-r--r--usr.bin/wall/wall.c10
-rw-r--r--usr.bin/wc/wc.18
-rw-r--r--usr.bin/wc/wc.c10
-rw-r--r--usr.bin/what/what.18
-rw-r--r--usr.bin/what/what.c10
-rw-r--r--usr.bin/whatis/whatis.18
-rw-r--r--usr.bin/whatis/whatis.c10
-rw-r--r--usr.bin/whereis/whereis.18
-rw-r--r--usr.bin/whereis/whereis.c10
-rw-r--r--usr.bin/which/which.110
-rw-r--r--usr.bin/who/who.18
-rw-r--r--usr.bin/who/who.c10
-rw-r--r--usr.bin/whois/whois.18
-rw-r--r--usr.bin/whois/whois.c12
-rw-r--r--usr.bin/window/README6
-rw-r--r--usr.bin/window/alias.h8
-rw-r--r--usr.bin/window/char.c10
-rw-r--r--usr.bin/window/char.h8
-rw-r--r--usr.bin/window/cmd.c10
-rw-r--r--usr.bin/window/cmd1.c10
-rw-r--r--usr.bin/window/cmd2.c10
-rw-r--r--usr.bin/window/cmd3.c10
-rw-r--r--usr.bin/window/cmd4.c10
-rw-r--r--usr.bin/window/cmd5.c10
-rw-r--r--usr.bin/window/cmd6.c10
-rw-r--r--usr.bin/window/cmd7.c10
-rw-r--r--usr.bin/window/compress.c10
-rw-r--r--usr.bin/window/context.c10
-rw-r--r--usr.bin/window/context.h8
-rw-r--r--usr.bin/window/defs.h8
-rw-r--r--usr.bin/window/error.c10
-rw-r--r--usr.bin/window/lcmd.c10
-rw-r--r--usr.bin/window/lcmd.h8
-rw-r--r--usr.bin/window/lcmd1.c10
-rw-r--r--usr.bin/window/lcmd2.c10
-rw-r--r--usr.bin/window/local.h8
-rw-r--r--usr.bin/window/main.c10
-rw-r--r--usr.bin/window/mloop.c10
-rw-r--r--usr.bin/window/parser.h8
-rw-r--r--usr.bin/window/parser1.c10
-rw-r--r--usr.bin/window/parser2.c10
-rw-r--r--usr.bin/window/parser3.c10
-rw-r--r--usr.bin/window/parser4.c10
-rw-r--r--usr.bin/window/parser5.c10
-rw-r--r--usr.bin/window/scanner.c10
-rw-r--r--usr.bin/window/startup.c10
-rw-r--r--usr.bin/window/string.c10
-rw-r--r--usr.bin/window/token.h8
-rw-r--r--usr.bin/window/tt.h8
-rw-r--r--usr.bin/window/ttf100.c10
-rw-r--r--usr.bin/window/ttgeneric.c10
-rw-r--r--usr.bin/window/tth19.c10
-rw-r--r--usr.bin/window/tth29.c10
-rw-r--r--usr.bin/window/ttinit.c10
-rw-r--r--usr.bin/window/ttoutput.c10
-rw-r--r--usr.bin/window/tttermcap.c10
-rw-r--r--usr.bin/window/tttvi925.c10
-rw-r--r--usr.bin/window/ttwyse60.c10
-rw-r--r--usr.bin/window/ttwyse75.c10
-rw-r--r--usr.bin/window/ttzapple.c10
-rw-r--r--usr.bin/window/ttzentec.c10
-rw-r--r--usr.bin/window/value.h8
-rw-r--r--usr.bin/window/var.c10
-rw-r--r--usr.bin/window/var.h8
-rw-r--r--usr.bin/window/win.c10
-rw-r--r--usr.bin/window/window.18
-rw-r--r--usr.bin/window/window_string.h8
-rw-r--r--usr.bin/window/ww.h8
-rw-r--r--usr.bin/window/wwadd.c10
-rw-r--r--usr.bin/window/wwalloc.c10
-rw-r--r--usr.bin/window/wwbox.c10
-rw-r--r--usr.bin/window/wwchild.c10
-rw-r--r--usr.bin/window/wwclose.c10
-rw-r--r--usr.bin/window/wwclreol.c10
-rw-r--r--usr.bin/window/wwclreos.c10
-rw-r--r--usr.bin/window/wwcursor.c10
-rw-r--r--usr.bin/window/wwdata.c10
-rw-r--r--usr.bin/window/wwdelchar.c10
-rw-r--r--usr.bin/window/wwdelete.c10
-rw-r--r--usr.bin/window/wwdelline.c10
-rw-r--r--usr.bin/window/wwdump.c10
-rw-r--r--usr.bin/window/wwend.c10
-rw-r--r--usr.bin/window/wwenviron.c10
-rw-r--r--usr.bin/window/wwerror.c10
-rw-r--r--usr.bin/window/wwflush.c10
-rw-r--r--usr.bin/window/wwframe.c10
-rw-r--r--usr.bin/window/wwgets.c10
-rw-r--r--usr.bin/window/wwinit.c10
-rw-r--r--usr.bin/window/wwinschar.c10
-rw-r--r--usr.bin/window/wwinsline.c10
-rw-r--r--usr.bin/window/wwiomux.c10
-rw-r--r--usr.bin/window/wwlabel.c10
-rw-r--r--usr.bin/window/wwmisc.c10
-rw-r--r--usr.bin/window/wwmove.c10
-rw-r--r--usr.bin/window/wwopen.c10
-rw-r--r--usr.bin/window/wwprintf.c10
-rw-r--r--usr.bin/window/wwpty.c10
-rw-r--r--usr.bin/window/wwputc.c10
-rw-r--r--usr.bin/window/wwputs.c10
-rw-r--r--usr.bin/window/wwredraw.c10
-rw-r--r--usr.bin/window/wwredrawwin.c10
-rw-r--r--usr.bin/window/wwrint.c10
-rw-r--r--usr.bin/window/wwscroll.c10
-rw-r--r--usr.bin/window/wwsize.c10
-rw-r--r--usr.bin/window/wwspawn.c10
-rw-r--r--usr.bin/window/wwsuspend.c10
-rw-r--r--usr.bin/window/wwterminfo.c10
-rw-r--r--usr.bin/window/wwtty.c10
-rw-r--r--usr.bin/window/wwunframe.c10
-rw-r--r--usr.bin/window/wwupdate.c10
-rw-r--r--usr.bin/window/wwwrite.c10
-rw-r--r--usr.bin/window/xx.c10
-rw-r--r--usr.bin/window/xx.h8
-rw-r--r--usr.bin/window/xxflush.c10
-rw-r--r--usr.bin/write/term_chk.c10
-rw-r--r--usr.bin/write/term_chk.h8
-rw-r--r--usr.bin/write/write.18
-rw-r--r--usr.bin/write/write.c10
-rw-r--r--usr.bin/xargs/pathnames.h8
-rw-r--r--usr.bin/xargs/xargs.18
-rw-r--r--usr.bin/xargs/xargs.c10
-rw-r--r--usr.bin/xinstall/install.18
-rw-r--r--usr.bin/xinstall/pathnames.h8
-rw-r--r--usr.bin/xinstall/xinstall.c10
-rw-r--r--usr.bin/xstr/pathnames.h10
-rw-r--r--usr.bin/xstr/xstr.18
-rw-r--r--usr.bin/xstr/xstr.c10
-rw-r--r--usr.bin/yacc/closure.c10
-rw-r--r--usr.bin/yacc/defs.h8
-rw-r--r--usr.bin/yacc/error.c10
-rw-r--r--usr.bin/yacc/lalr.c10
-rw-r--r--usr.bin/yacc/lr0.c10
-rw-r--r--usr.bin/yacc/main.c10
-rw-r--r--usr.bin/yacc/mkpar.c10
-rw-r--r--usr.bin/yacc/output.c10
-rw-r--r--usr.bin/yacc/reader.c10
-rw-r--r--usr.bin/yacc/skeleton.c12
-rw-r--r--usr.bin/yacc/symtab.c10
-rw-r--r--usr.bin/yacc/verbose.c10
-rw-r--r--usr.bin/yacc/warshall.c10
-rw-r--r--usr.bin/yacc/yacc.110
-rw-r--r--usr.bin/yes/yes.18
-rw-r--r--usr.bin/yes/yes.c10
805 files changed, 3788 insertions, 5132 deletions
diff --git a/usr.bin/apply/apply.1 b/usr.bin/apply/apply.1
index 50aefd57860..26d7029be0c 100644
--- a/usr.bin/apply/apply.1
+++ b/usr.bin/apply/apply.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: apply.1,v 1.10 2003/02/25 10:35:35 wiz Exp $
+.\" $NetBSD: apply.1,v 1.11 2003/08/07 11:13:06 agc Exp $
.\"
.\" Copyright (c) 1983, 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -11,11 +11,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/apply/apply.c b/usr.bin/apply/apply.c
index 1671e409c2a..1880484b1ce 100644
--- a/usr.bin/apply/apply.c
+++ b/usr.bin/apply/apply.c
@@ -1,4 +1,4 @@
-/* $NetBSD: apply.c,v 1.10 2001/02/19 23:03:42 cgd Exp $ */
+/* $NetBSD: apply.c,v 1.11 2003/08/07 11:13:06 agc Exp $ */
/*-
* Copyright (c) 1994
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)apply.c 8.4 (Berkeley) 4/4/94";
#else
-__RCSID("$NetBSD: apply.c,v 1.10 2001/02/19 23:03:42 cgd Exp $");
+__RCSID("$NetBSD: apply.c,v 1.11 2003/08/07 11:13:06 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/apropos/apropos.1 b/usr.bin/apropos/apropos.1
index 46fe9b3407d..b97628fa0f3 100644
--- a/usr.bin/apropos/apropos.1
+++ b/usr.bin/apropos/apropos.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: apropos.1,v 1.9 2002/03/08 20:27:41 jdolecek Exp $
+.\" $NetBSD: apropos.1,v 1.10 2003/08/07 11:13:07 agc Exp $
.\"
.\" Copyright (c) 1989, 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -11,11 +11,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/apropos/apropos.c b/usr.bin/apropos/apropos.c
index 3162312a7da..6a57e972a04 100644
--- a/usr.bin/apropos/apropos.c
+++ b/usr.bin/apropos/apropos.c
@@ -1,4 +1,4 @@
-/* $NetBSD: apropos.c,v 1.21 2002/09/19 11:29:54 lukem Exp $ */
+/* $NetBSD: apropos.c,v 1.22 2003/08/07 11:13:08 agc Exp $ */
/*
* Copyright (c) 1987, 1993, 1994
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -44,7 +40,7 @@ __COPYRIGHT("@(#) Copyright (c) 1987, 1993, 1994\n\
#if 0
static char sccsid[] = "@(#)apropos.c 8.8 (Berkeley) 5/4/95";
#else
-__RCSID("$NetBSD: apropos.c,v 1.21 2002/09/19 11:29:54 lukem Exp $");
+__RCSID("$NetBSD: apropos.c,v 1.22 2003/08/07 11:13:08 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/at/stime.c b/usr.bin/at/stime.c
index 3042ec37e19..8a706a2b723 100644
--- a/usr.bin/at/stime.c
+++ b/usr.bin/at/stime.c
@@ -1,4 +1,4 @@
-/* $NetBSD: stime.c,v 1.2 2000/10/15 15:33:46 bjh21 Exp $ */
+/* $NetBSD: stime.c,v 1.3 2003/08/07 11:13:08 agc Exp $ */
/*
* Copyright (c) 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -43,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1993\n\
#if 0
static char sccsid[] = "from: @(#)touch.c 8.2 (Berkeley) 4/28/95";
#endif
-__RCSID("$NetBSD: stime.c,v 1.2 2000/10/15 15:33:46 bjh21 Exp $");
+__RCSID("$NetBSD: stime.c,v 1.3 2003/08/07 11:13:08 agc Exp $");
#endif /* not lint */
diff --git a/usr.bin/at/stime.h b/usr.bin/at/stime.h
index 25ce85254e8..a1d78bbffbb 100644
--- a/usr.bin/at/stime.h
+++ b/usr.bin/at/stime.h
@@ -1,4 +1,4 @@
-/* $NetBSD: stime.h,v 1.1 2000/10/15 14:51:15 kleink Exp $ */
+/* $NetBSD: stime.h,v 1.2 2003/08/07 11:13:08 agc Exp $ */
/*
* Copyright (c) 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/banner/banner.c b/usr.bin/banner/banner.c
index 29687bf1ac7..d7b6495a987 100644
--- a/usr.bin/banner/banner.c
+++ b/usr.bin/banner/banner.c
@@ -1,4 +1,4 @@
-/* $NetBSD: banner.c,v 1.10 2003/03/13 20:49:11 he Exp $ */
+/* $NetBSD: banner.c,v 1.11 2003/08/07 11:13:09 agc Exp $ */
/*
* Changes for banner(1)
@@ -31,11 +31,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -62,7 +58,7 @@ __COPYRIGHT("@(#) Copyright (c) 1983, 1993\n\
#if 0
static char sccsid[] = "@(#)printjob.c 8.2 (Berkeley) 4/16/94";
#else
-__RCSID("$NetBSD: banner.c,v 1.10 2003/03/13 20:49:11 he Exp $");
+__RCSID("$NetBSD: banner.c,v 1.11 2003/08/07 11:13:09 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/banner/chset.c b/usr.bin/banner/chset.c
index e5fc8ff3cc2..6a6ba15828e 100644
--- a/usr.bin/banner/chset.c
+++ b/usr.bin/banner/chset.c
@@ -1,4 +1,4 @@
-/* $NetBSD: chset.c,v 1.5 2000/10/04 19:33:16 mjl Exp $ */
+/* $NetBSD: chset.c,v 1.6 2003/08/07 11:13:09 agc Exp $ */
/*
* Changes for banner(1)
@@ -30,11 +30,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -56,7 +52,7 @@
#if 0
static char sccsid[] = "@(#)lpdchar.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: chset.c,v 1.5 2000/10/04 19:33:16 mjl Exp $");
+__RCSID("$NetBSD: chset.c,v 1.6 2003/08/07 11:13:09 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/basename/basename.1 b/usr.bin/basename/basename.1
index 4fe7b83070e..4527144086d 100644
--- a/usr.bin/basename/basename.1
+++ b/usr.bin/basename/basename.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: basename.1,v 1.15 2002/02/08 01:36:19 ross Exp $
+.\" $NetBSD: basename.1,v 1.16 2003/08/07 11:13:10 agc Exp $
.\"
.\" Copyright (c) 1990, 1993, 1994
.\" The Regents of the University of California. All rights reserved.
@@ -14,11 +14,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/basename/basename.c b/usr.bin/basename/basename.c
index ac02aa1a9ec..9c0f1365f3b 100644
--- a/usr.bin/basename/basename.c
+++ b/usr.bin/basename/basename.c
@@ -1,4 +1,4 @@
-/* $NetBSD: basename.c,v 1.10 1997/10/18 12:18:20 lukem Exp $ */
+/* $NetBSD: basename.c,v 1.11 2003/08/07 11:13:10 agc Exp $ */
/*-
* Copyright (c) 1991, 1993, 1994
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -43,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1991, 1993, 1994\n\
#if 0
static char sccsid[] = "@(#)basename.c 8.4 (Berkeley) 5/4/95";
#endif
-__RCSID("$NetBSD: basename.c,v 1.10 1997/10/18 12:18:20 lukem Exp $");
+__RCSID("$NetBSD: basename.c,v 1.11 2003/08/07 11:13:10 agc Exp $");
#endif /* not lint */
#include <stdio.h>
diff --git a/usr.bin/bdes/bdes.1 b/usr.bin/bdes/bdes.1
index 795959a7e30..bbb4bcfa487 100644
--- a/usr.bin/bdes/bdes.1
+++ b/usr.bin/bdes/bdes.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: bdes.1,v 1.10 2003/02/25 10:35:37 wiz Exp $
+.\" $NetBSD: bdes.1,v 1.11 2003/08/07 11:13:11 agc Exp $
.\"
.\" Copyright (c) 1991, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -14,11 +14,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/bdes/bdes.c b/usr.bin/bdes/bdes.c
index 88f046100a9..041779826fc 100644
--- a/usr.bin/bdes/bdes.c
+++ b/usr.bin/bdes/bdes.c
@@ -1,4 +1,4 @@
-/* $NetBSD: bdes.c,v 1.4 2001/02/19 23:03:44 cgd Exp $ */
+/* $NetBSD: bdes.c,v 1.5 2003/08/07 11:13:11 agc Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -19,11 +19,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -50,7 +46,7 @@ __COPYRIGHT("@(#) Copyright (c) 1991, 1993\n\
#if 0
static char sccsid[] = "@(#)bdes.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: bdes.c,v 1.4 2001/02/19 23:03:44 cgd Exp $");
+__RCSID("$NetBSD: bdes.c,v 1.5 2003/08/07 11:13:11 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/biff/biff.1 b/usr.bin/biff/biff.1
index a7fe6144a58..90605e18634 100644
--- a/usr.bin/biff/biff.1
+++ b/usr.bin/biff/biff.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: biff.1,v 1.8 2003/02/25 10:35:37 wiz Exp $
+.\" $NetBSD: biff.1,v 1.9 2003/08/07 11:13:12 agc Exp $
.\"
.\" Copyright (c) 1980, 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -11,11 +11,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/biff/biff.c b/usr.bin/biff/biff.c
index 5267b091227..c546263eb6f 100644
--- a/usr.bin/biff/biff.c
+++ b/usr.bin/biff/biff.c
@@ -1,4 +1,4 @@
-/* $NetBSD: biff.c,v 1.7 2000/07/07 15:13:21 itojun Exp $ */
+/* $NetBSD: biff.c,v 1.8 2003/08/07 11:13:12 agc Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -43,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 1993\n\
#if 0
static char sccsid[] = "@(#)biff.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: biff.c,v 1.7 2000/07/07 15:13:21 itojun Exp $");
+__RCSID("$NetBSD: biff.c,v 1.8 2003/08/07 11:13:12 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/cal/cal.1 b/usr.bin/cal/cal.1
index f8074680081..9100d0c1af9 100644
--- a/usr.bin/cal/cal.1
+++ b/usr.bin/cal/cal.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: cal.1,v 1.17 2003/07/24 01:19:45 atatat Exp $
+.\" $NetBSD: cal.1,v 1.18 2003/08/07 11:13:13 agc Exp $
.\"
.\" Copyright (c) 1989, 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -14,11 +14,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/cal/cal.c b/usr.bin/cal/cal.c
index 4566952fa76..2e9ac817e28 100644
--- a/usr.bin/cal/cal.c
+++ b/usr.bin/cal/cal.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cal.c,v 1.17 2003/07/24 01:19:45 atatat Exp $ */
+/* $NetBSD: cal.c,v 1.18 2003/08/07 11:13:13 agc Exp $ */
/*
* Copyright (c) 1989, 1993, 1994
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -46,7 +42,7 @@ __COPYRIGHT("@(#) Copyright (c) 1989, 1993, 1994\n\
#if 0
static char sccsid[] = "@(#)cal.c 8.4 (Berkeley) 4/2/94";
#else
-__RCSID("$NetBSD: cal.c,v 1.17 2003/07/24 01:19:45 atatat Exp $");
+__RCSID("$NetBSD: cal.c,v 1.18 2003/08/07 11:13:13 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/calendar/calendar.1 b/usr.bin/calendar/calendar.1
index 903a6762adb..2c5739a39be 100644
--- a/usr.bin/calendar/calendar.1
+++ b/usr.bin/calendar/calendar.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: calendar.1,v 1.12 2002/02/08 01:36:20 ross Exp $
+.\" $NetBSD: calendar.1,v 1.13 2003/08/07 11:13:14 agc Exp $
.\"
.\" Copyright (c) 1989, 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -11,11 +11,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/calendar/calendar.c b/usr.bin/calendar/calendar.c
index 1edc51aec6c..f7c367ef1b6 100644
--- a/usr.bin/calendar/calendar.c
+++ b/usr.bin/calendar/calendar.c
@@ -1,4 +1,4 @@
-/* $NetBSD: calendar.c,v 1.27 2002/11/30 03:10:55 lukem Exp $ */
+/* $NetBSD: calendar.c,v 1.28 2003/08/07 11:13:14 agc Exp $ */
/*
* Copyright (c) 1989, 1993, 1994
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -43,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1989, 1993\n\
#if 0
static char sccsid[] = "@(#)calendar.c 8.4 (Berkeley) 1/7/95";
#endif
-__RCSID("$NetBSD: calendar.c,v 1.27 2002/11/30 03:10:55 lukem Exp $");
+__RCSID("$NetBSD: calendar.c,v 1.28 2003/08/07 11:13:14 agc Exp $");
#endif /* not lint */
#include <sys/param.h>
diff --git a/usr.bin/calendar/pathnames.h b/usr.bin/calendar/pathnames.h
index ff6e595a04c..6f45b9e348f 100644
--- a/usr.bin/calendar/pathnames.h
+++ b/usr.bin/calendar/pathnames.h
@@ -1,4 +1,4 @@
-/* $NetBSD: pathnames.h,v 1.4 1998/10/12 20:38:55 wsanchez Exp $ */
+/* $NetBSD: pathnames.h,v 1.5 2003/08/07 11:13:14 agc Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/cap_mkdb/cap_mkdb.1 b/usr.bin/cap_mkdb/cap_mkdb.1
index f76b84c9ba8..5f0817dc7d0 100644
--- a/usr.bin/cap_mkdb/cap_mkdb.1
+++ b/usr.bin/cap_mkdb/cap_mkdb.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: cap_mkdb.1,v 1.13 2002/09/30 11:08:58 grant Exp $
+.\" $NetBSD: cap_mkdb.1,v 1.14 2003/08/07 11:13:15 agc Exp $
.\"
.\" Copyright (c) 1992, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -11,11 +11,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/cap_mkdb/cap_mkdb.c b/usr.bin/cap_mkdb/cap_mkdb.c
index 6edcacdffcf..3ed5b3a64da 100644
--- a/usr.bin/cap_mkdb/cap_mkdb.c
+++ b/usr.bin/cap_mkdb/cap_mkdb.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cap_mkdb.c,v 1.17 2003/01/31 20:50:30 uwe Exp $ */
+/* $NetBSD: cap_mkdb.c,v 1.18 2003/08/07 11:13:15 agc Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -47,7 +43,7 @@ __COPYRIGHT("@(#) Copyright (c) 1992, 1993\n\
#if 0
static char sccsid[] = "@(#)cap_mkdb.c 8.2 (Berkeley) 4/27/95";
#endif
-__RCSID("$NetBSD: cap_mkdb.c,v 1.17 2003/01/31 20:50:30 uwe Exp $");
+__RCSID("$NetBSD: cap_mkdb.c,v 1.18 2003/08/07 11:13:15 agc Exp $");
#endif /* not lint */
#include <sys/param.h>
diff --git a/usr.bin/checknr/checknr.1 b/usr.bin/checknr/checknr.1
index d60ea387976..3cdbacca6bb 100644
--- a/usr.bin/checknr/checknr.1
+++ b/usr.bin/checknr/checknr.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: checknr.1,v 1.13 2003/02/25 10:35:38 wiz Exp $
+.\" $NetBSD: checknr.1,v 1.14 2003/08/07 11:13:16 agc Exp $
.\"
.\" Copyright (c) 1980, 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -11,11 +11,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/checknr/checknr.c b/usr.bin/checknr/checknr.c
index f076b95a25f..3f41ed5274f 100644
--- a/usr.bin/checknr/checknr.c
+++ b/usr.bin/checknr/checknr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: checknr.c,v 1.11 2003/05/09 08:44:57 wiz Exp $ */
+/* $NetBSD: checknr.c,v 1.12 2003/08/07 11:13:16 agc Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -43,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 1993\n\
#if 0
static char sccsid[] = "@(#)checknr.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: checknr.c,v 1.11 2003/05/09 08:44:57 wiz Exp $");
+__RCSID("$NetBSD: checknr.c,v 1.12 2003/08/07 11:13:16 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/chflags/chflags.1 b/usr.bin/chflags/chflags.1
index cc012b9e5c1..8fc75ef2561 100644
--- a/usr.bin/chflags/chflags.1
+++ b/usr.bin/chflags/chflags.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: chflags.1,v 1.16 2002/10/24 18:51:19 chopps Exp $
+.\" $NetBSD: chflags.1,v 1.17 2003/08/07 11:13:16 agc Exp $
.\"
.\" Copyright (c) 1989, 1990, 1993, 1994
.\" The Regents of the University of California. All rights reserved.
@@ -14,11 +14,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/chflags/chflags.c b/usr.bin/chflags/chflags.c
index ef2f3368337..d8d1cf7ef04 100644
--- a/usr.bin/chflags/chflags.c
+++ b/usr.bin/chflags/chflags.c
@@ -1,4 +1,4 @@
-/* $NetBSD: chflags.c,v 1.9 2002/07/07 11:44:03 bjh21 Exp $ */
+/* $NetBSD: chflags.c,v 1.10 2003/08/07 11:13:17 agc Exp $ */
/*
* Copyright (c) 1992, 1993, 1994
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -43,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1992, 1993, 1994\n\
#if 0
static char sccsid[] = "from: @(#)chflags.c 8.5 (Berkeley) 4/1/94";
#else
-__RCSID("$NetBSD: chflags.c,v 1.9 2002/07/07 11:44:03 bjh21 Exp $");
+__RCSID("$NetBSD: chflags.c,v 1.10 2003/08/07 11:13:17 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/chpass/chpass.1 b/usr.bin/chpass/chpass.1
index 1776c869b59..62addb53a1d 100644
--- a/usr.bin/chpass/chpass.1
+++ b/usr.bin/chpass/chpass.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: chpass.1,v 1.20 2003/02/16 16:18:23 wiz Exp $
+.\" $NetBSD: chpass.1,v 1.21 2003/08/07 11:13:17 agc Exp $
.\"
.\" Copyright (c) 1988, 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -11,11 +11,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/chpass/chpass.c b/usr.bin/chpass/chpass.c
index 605dd93029b..1f1b486c8dc 100644
--- a/usr.bin/chpass/chpass.c
+++ b/usr.bin/chpass/chpass.c
@@ -1,4 +1,4 @@
-/* $NetBSD: chpass.c,v 1.27 2002/11/16 15:59:26 itojun Exp $ */
+/* $NetBSD: chpass.c,v 1.28 2003/08/07 11:13:18 agc Exp $ */
/*-
* Copyright (c) 1988, 1993, 1994
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -43,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1988, 1993, 1994\n\
#if 0
static char sccsid[] = "@(#)chpass.c 8.4 (Berkeley) 4/2/94";
#else
-__RCSID("$NetBSD: chpass.c,v 1.27 2002/11/16 15:59:26 itojun Exp $");
+__RCSID("$NetBSD: chpass.c,v 1.28 2003/08/07 11:13:18 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/chpass/chpass.h b/usr.bin/chpass/chpass.h
index 84bcdbc8e5c..4babf026033 100644
--- a/usr.bin/chpass/chpass.h
+++ b/usr.bin/chpass/chpass.h
@@ -1,4 +1,4 @@
-/* $NetBSD: chpass.h,v 1.10 2001/02/05 01:37:33 christos Exp $ */
+/* $NetBSD: chpass.h,v 1.11 2003/08/07 11:13:18 agc Exp $ */
/*
* Copyright (c) 1988, 1993, 1994
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/chpass/edit.c b/usr.bin/chpass/edit.c
index ec39116ad80..288fd9c673c 100644
--- a/usr.bin/chpass/edit.c
+++ b/usr.bin/chpass/edit.c
@@ -1,4 +1,4 @@
-/* $NetBSD: edit.c,v 1.15 2003/02/03 17:45:20 christos Exp $ */
+/* $NetBSD: edit.c,v 1.16 2003/08/07 11:13:18 agc Exp $ */
/*-
* Copyright (c) 1990, 1993, 1994
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)edit.c 8.3 (Berkeley) 4/2/94";
#else
-__RCSID("$NetBSD: edit.c,v 1.15 2003/02/03 17:45:20 christos Exp $");
+__RCSID("$NetBSD: edit.c,v 1.16 2003/08/07 11:13:18 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/chpass/field.c b/usr.bin/chpass/field.c
index 7c6f6723c84..a2e1dfe76e5 100644
--- a/usr.bin/chpass/field.c
+++ b/usr.bin/chpass/field.c
@@ -1,4 +1,4 @@
-/* $NetBSD: field.c,v 1.8 2002/05/09 01:58:39 simonb Exp $ */
+/* $NetBSD: field.c,v 1.9 2003/08/07 11:13:18 agc Exp $ */
/*
* Copyright (c) 1988, 1993, 1994
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)field.c 8.4 (Berkeley) 4/2/94";
#else
-__RCSID("$NetBSD: field.c,v 1.8 2002/05/09 01:58:39 simonb Exp $");
+__RCSID("$NetBSD: field.c,v 1.9 2003/08/07 11:13:18 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/chpass/pathnames.h b/usr.bin/chpass/pathnames.h
index 9645040507c..f867a34d427 100644
--- a/usr.bin/chpass/pathnames.h
+++ b/usr.bin/chpass/pathnames.h
@@ -1,4 +1,4 @@
-/* $NetBSD: pathnames.h,v 1.3 1995/03/26 04:55:29 glass Exp $ */
+/* $NetBSD: pathnames.h,v 1.4 2003/08/07 11:13:19 agc Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/chpass/pw_yp.c b/usr.bin/chpass/pw_yp.c
index 18cb4de0a54..c95bee3e48a 100644
--- a/usr.bin/chpass/pw_yp.c
+++ b/usr.bin/chpass/pw_yp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pw_yp.c,v 1.19 2002/11/16 15:59:27 itojun Exp $ */
+/* $NetBSD: pw_yp.c,v 1.20 2003/08/07 11:13:19 agc Exp $ */
/*
* Copyright (c) 1988 The Regents of the University of California.
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -37,7 +33,7 @@
#if 0
static char sccsid[] = "@(#)pw_yp.c 1.0 2/2/93";
#else
-__RCSID("$NetBSD: pw_yp.c,v 1.19 2002/11/16 15:59:27 itojun Exp $");
+__RCSID("$NetBSD: pw_yp.c,v 1.20 2003/08/07 11:13:19 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/chpass/table.c b/usr.bin/chpass/table.c
index 96beaba5190..f194183b019 100644
--- a/usr.bin/chpass/table.c
+++ b/usr.bin/chpass/table.c
@@ -1,4 +1,4 @@
-/* $NetBSD: table.c,v 1.5 1998/08/10 23:21:05 kim Exp $ */
+/* $NetBSD: table.c,v 1.6 2003/08/07 11:13:19 agc Exp $ */
/*-
* Copyright (c) 1990, 1993, 1994
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)table.c 8.3 (Berkeley) 4/2/94";
#else
-__RCSID("$NetBSD: table.c,v 1.5 1998/08/10 23:21:05 kim Exp $");
+__RCSID("$NetBSD: table.c,v 1.6 2003/08/07 11:13:19 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/chpass/util.c b/usr.bin/chpass/util.c
index 83a270af0e2..611a90b8258 100644
--- a/usr.bin/chpass/util.c
+++ b/usr.bin/chpass/util.c
@@ -1,4 +1,4 @@
-/* $NetBSD: util.c,v 1.10 1998/07/26 15:13:14 mycroft Exp $ */
+/* $NetBSD: util.c,v 1.11 2003/08/07 11:13:19 agc Exp $ */
/*-
* Copyright (c) 1988, 1993, 1994
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)util.c 8.4 (Berkeley) 4/2/94";
#else
-__RCSID("$NetBSD: util.c,v 1.10 1998/07/26 15:13:14 mycroft Exp $");
+__RCSID("$NetBSD: util.c,v 1.11 2003/08/07 11:13:19 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/cksum/cksum.1 b/usr.bin/cksum/cksum.1
index 24abfb52c65..53e27ddb487 100644
--- a/usr.bin/cksum/cksum.1
+++ b/usr.bin/cksum/cksum.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: cksum.1,v 1.22 2003/06/26 17:00:55 wiz Exp $
+.\" $NetBSD: cksum.1,v 1.23 2003/08/07 11:13:20 agc Exp $
.\"
.\" Copyright (c) 1991, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -14,11 +14,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/cksum/cksum.c b/usr.bin/cksum/cksum.c
index 1db78f6bc5f..538e06c9ec1 100644
--- a/usr.bin/cksum/cksum.c
+++ b/usr.bin/cksum/cksum.c
@@ -1,7 +1,6 @@
-/* $NetBSD: cksum.c,v 1.17 2002/10/18 20:30:13 atatat Exp $ */
+/* $NetBSD: cksum.c,v 1.18 2003/08/07 11:13:20 agc Exp $ */
/*-
- * Copyright (c) 1997 Jason R. Thorpe. All rights reserved.
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
*
@@ -16,6 +15,37 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+/*-
+ * Copyright (c) 1997 Jason R. Thorpe. All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * James W. Williams of NASA Goddard Space Flight Center.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* This product includes software developed by the University of
@@ -47,7 +77,7 @@ __COPYRIGHT("@(#) Copyright (c) 1991, 1993\n\
#if 0
static char sccsid[] = "@(#)cksum.c 8.2 (Berkeley) 4/28/95";
#endif
-__RCSID("$NetBSD: cksum.c,v 1.17 2002/10/18 20:30:13 atatat Exp $");
+__RCSID("$NetBSD: cksum.c,v 1.18 2003/08/07 11:13:20 agc Exp $");
#endif /* not lint */
#include <sys/cdefs.h>
diff --git a/usr.bin/cksum/crc.c b/usr.bin/cksum/crc.c
index 394d8ad3060..7a6c5a83deb 100644
--- a/usr.bin/cksum/crc.c
+++ b/usr.bin/cksum/crc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: crc.c,v 1.12 2002/03/31 14:43:22 bjh21 Exp $ */
+/* $NetBSD: crc.c,v 1.13 2003/08/07 11:13:20 agc Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)crc.c 8.1 (Berkeley) 6/17/93";
#else
-__RCSID("$NetBSD: crc.c,v 1.12 2002/03/31 14:43:22 bjh21 Exp $");
+__RCSID("$NetBSD: crc.c,v 1.13 2003/08/07 11:13:20 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/cksum/extern.h b/usr.bin/cksum/extern.h
index bfd0aedd4ac..24439e9e76a 100644
--- a/usr.bin/cksum/extern.h
+++ b/usr.bin/cksum/extern.h
@@ -1,4 +1,4 @@
-/* $NetBSD: extern.h,v 1.10 2002/03/31 14:30:21 bjh21 Exp $ */
+/* $NetBSD: extern.h,v 1.11 2003/08/07 11:13:20 agc Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/cksum/print.c b/usr.bin/cksum/print.c
index 308483de90d..45ede0c7e78 100644
--- a/usr.bin/cksum/print.c
+++ b/usr.bin/cksum/print.c
@@ -1,4 +1,4 @@
-/* $NetBSD: print.c,v 1.7 2002/03/31 14:43:22 bjh21 Exp $ */
+/* $NetBSD: print.c,v 1.8 2003/08/07 11:13:20 agc Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)print.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: print.c,v 1.7 2002/03/31 14:43:22 bjh21 Exp $");
+__RCSID("$NetBSD: print.c,v 1.8 2003/08/07 11:13:20 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/cksum/sum1.c b/usr.bin/cksum/sum1.c
index 96e7ee2adc2..5ba21d8275d 100644
--- a/usr.bin/cksum/sum1.c
+++ b/usr.bin/cksum/sum1.c
@@ -1,4 +1,4 @@
-/* $NetBSD: sum1.c,v 1.8 2002/03/31 14:43:23 bjh21 Exp $ */
+/* $NetBSD: sum1.c,v 1.9 2003/08/07 11:13:21 agc Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)sum1.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: sum1.c,v 1.8 2002/03/31 14:43:23 bjh21 Exp $");
+__RCSID("$NetBSD: sum1.c,v 1.9 2003/08/07 11:13:21 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/cksum/sum2.c b/usr.bin/cksum/sum2.c
index c2932df6427..bd838442b00 100644
--- a/usr.bin/cksum/sum2.c
+++ b/usr.bin/cksum/sum2.c
@@ -1,4 +1,4 @@
-/* $NetBSD: sum2.c,v 1.8 2002/03/31 14:43:23 bjh21 Exp $ */
+/* $NetBSD: sum2.c,v 1.9 2003/08/07 11:13:21 agc Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)sum2.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: sum2.c,v 1.8 2002/03/31 14:43:23 bjh21 Exp $");
+__RCSID("$NetBSD: sum2.c,v 1.9 2003/08/07 11:13:21 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/cmp/cmp.1 b/usr.bin/cmp/cmp.1
index a870da524a4..17b66ed9da8 100644
--- a/usr.bin/cmp/cmp.1
+++ b/usr.bin/cmp/cmp.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: cmp.1,v 1.8 2002/02/08 01:36:20 ross Exp $
+.\" $NetBSD: cmp.1,v 1.9 2003/08/07 11:13:21 agc Exp $
.\"
.\" Copyright (c) 1987, 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -14,11 +14,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/cmp/cmp.c b/usr.bin/cmp/cmp.c
index 1ebb803dfe8..c1074350592 100644
--- a/usr.bin/cmp/cmp.c
+++ b/usr.bin/cmp/cmp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cmp.c,v 1.12 1998/01/12 08:11:19 mikel Exp $ */
+/* $NetBSD: cmp.c,v 1.13 2003/08/07 11:13:22 agc Exp $ */
/*
* Copyright (c) 1987, 1990, 1993, 1994
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -43,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1987, 1990, 1993, 1994\n\
#if 0
static char sccsid[] = "@(#)cmp.c 8.3 (Berkeley) 4/2/94";
#else
-__RCSID("$NetBSD: cmp.c,v 1.12 1998/01/12 08:11:19 mikel Exp $");
+__RCSID("$NetBSD: cmp.c,v 1.13 2003/08/07 11:13:22 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/cmp/extern.h b/usr.bin/cmp/extern.h
index e839406d2b2..369ce6f5fc3 100644
--- a/usr.bin/cmp/extern.h
+++ b/usr.bin/cmp/extern.h
@@ -1,4 +1,4 @@
-/* $NetBSD: extern.h,v 1.3 1997/01/09 20:18:29 tls Exp $ */
+/* $NetBSD: extern.h,v 1.4 2003/08/07 11:13:22 agc Exp $ */
/*-
* Copyright (c) 1991, 1993, 1994
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/cmp/misc.c b/usr.bin/cmp/misc.c
index 1cef6438dcf..68d514f127c 100644
--- a/usr.bin/cmp/misc.c
+++ b/usr.bin/cmp/misc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: misc.c,v 1.6 2001/01/04 23:05:54 lukem Exp $ */
+/* $NetBSD: misc.c,v 1.7 2003/08/07 11:13:22 agc Exp $ */
/*-
* Copyright (c) 1991, 1993, 1994
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)misc.c 8.3 (Berkeley) 4/2/94";
#else
-__RCSID("$NetBSD: misc.c,v 1.6 2001/01/04 23:05:54 lukem Exp $");
+__RCSID("$NetBSD: misc.c,v 1.7 2003/08/07 11:13:22 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/cmp/regular.c b/usr.bin/cmp/regular.c
index e89a54069f8..5bfb94d8c40 100644
--- a/usr.bin/cmp/regular.c
+++ b/usr.bin/cmp/regular.c
@@ -1,4 +1,4 @@
-/* $NetBSD: regular.c,v 1.11 2001/01/04 23:05:54 lukem Exp $ */
+/* $NetBSD: regular.c,v 1.12 2003/08/07 11:13:23 agc Exp $ */
/*-
* Copyright (c) 1991, 1993, 1994
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)regular.c 8.3 (Berkeley) 4/2/94";
#else
-__RCSID("$NetBSD: regular.c,v 1.11 2001/01/04 23:05:54 lukem Exp $");
+__RCSID("$NetBSD: regular.c,v 1.12 2003/08/07 11:13:23 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/cmp/special.c b/usr.bin/cmp/special.c
index b25d55a6a19..f67cfd63672 100644
--- a/usr.bin/cmp/special.c
+++ b/usr.bin/cmp/special.c
@@ -1,4 +1,4 @@
-/* $NetBSD: special.c,v 1.7 2001/01/04 23:05:54 lukem Exp $ */
+/* $NetBSD: special.c,v 1.8 2003/08/07 11:13:23 agc Exp $ */
/*-
* Copyright (c) 1991, 1993, 1994
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)special.c 8.3 (Berkeley) 4/2/94";
#else
-__RCSID("$NetBSD: special.c,v 1.7 2001/01/04 23:05:54 lukem Exp $");
+__RCSID("$NetBSD: special.c,v 1.8 2003/08/07 11:13:23 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/col/col.1 b/usr.bin/col/col.1
index 0fc927bf858..f67ff3d1d8f 100644
--- a/usr.bin/col/col.1
+++ b/usr.bin/col/col.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: col.1,v 1.8 2001/12/01 16:43:10 wiz Exp $
+.\" $NetBSD: col.1,v 1.9 2003/08/07 11:13:23 agc Exp $
.\"
.\" Copyright (c) 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -14,11 +14,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/col/col.c b/usr.bin/col/col.c
index 5d3117633db..c7f2d6f6132 100644
--- a/usr.bin/col/col.c
+++ b/usr.bin/col/col.c
@@ -1,4 +1,4 @@
-/* $NetBSD: col.c,v 1.11 1999/09/23 08:47:47 tron Exp $ */
+/* $NetBSD: col.c,v 1.12 2003/08/07 11:13:23 agc Exp $ */
/*-
* Copyright (c) 1990, 1993, 1994
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -46,7 +42,7 @@ __COPYRIGHT("@(#) Copyright (c) 1990, 1993, 1994\n\
#if 0
static char sccsid[] = "@(#)col.c 8.5 (Berkeley) 5/4/95";
#endif
-__RCSID("$NetBSD: col.c,v 1.11 1999/09/23 08:47:47 tron Exp $");
+__RCSID("$NetBSD: col.c,v 1.12 2003/08/07 11:13:23 agc Exp $");
#endif /* not lint */
#include <ctype.h>
diff --git a/usr.bin/colcrt/colcrt.1 b/usr.bin/colcrt/colcrt.1
index 689a3db045c..50cb6534872 100644
--- a/usr.bin/colcrt/colcrt.1
+++ b/usr.bin/colcrt/colcrt.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: colcrt.1,v 1.7 2001/12/01 18:57:03 wiz Exp $
+.\" $NetBSD: colcrt.1,v 1.8 2003/08/07 11:13:24 agc Exp $
.\"
.\" Copyright (c) 1980, 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -11,11 +11,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/colcrt/colcrt.c b/usr.bin/colcrt/colcrt.c
index c636feae4c9..1b663fd4b0b 100644
--- a/usr.bin/colcrt/colcrt.c
+++ b/usr.bin/colcrt/colcrt.c
@@ -1,4 +1,4 @@
-/* $NetBSD: colcrt.c,v 1.5 2000/07/03 02:51:15 matt Exp $ */
+/* $NetBSD: colcrt.c,v 1.6 2003/08/07 11:13:24 agc Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -43,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 1993\n\
#if 0
static char sccsid[] = "@(#)colcrt.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: colcrt.c,v 1.5 2000/07/03 02:51:15 matt Exp $");
+__RCSID("$NetBSD: colcrt.c,v 1.6 2003/08/07 11:13:24 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/colrm/colrm.1 b/usr.bin/colrm/colrm.1
index 90007e3b1c0..738eefad396 100644
--- a/usr.bin/colrm/colrm.1
+++ b/usr.bin/colrm/colrm.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: colrm.1,v 1.6 2001/12/01 16:43:11 wiz Exp $
+.\" $NetBSD: colrm.1,v 1.7 2003/08/07 11:13:25 agc Exp $
.\"
.\" Copyright (c) 1980, 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -11,11 +11,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/colrm/colrm.c b/usr.bin/colrm/colrm.c
index a220098afac..c3a54e3f816 100644
--- a/usr.bin/colrm/colrm.c
+++ b/usr.bin/colrm/colrm.c
@@ -1,4 +1,4 @@
-/* $NetBSD: colrm.c,v 1.5 1997/10/18 13:00:20 lukem Exp $ */
+/* $NetBSD: colrm.c,v 1.6 2003/08/07 11:13:25 agc Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -43,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1991, 1993\n\
#if 0
static char sccsid[] = "@(#)colrm.c 8.2 (Berkeley) 5/4/95";
#endif
-__RCSID("$NetBSD: colrm.c,v 1.5 1997/10/18 13:00:20 lukem Exp $");
+__RCSID("$NetBSD: colrm.c,v 1.6 2003/08/07 11:13:25 agc Exp $");
#endif /* not lint */
#include <sys/types.h>
diff --git a/usr.bin/column/column.1 b/usr.bin/column/column.1
index 3ebd0add330..1376e7a16de 100644
--- a/usr.bin/column/column.1
+++ b/usr.bin/column/column.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: column.1,v 1.6 2002/02/08 01:36:21 ross Exp $
+.\" $NetBSD: column.1,v 1.7 2003/08/07 11:13:26 agc Exp $
.\"
.\" Copyright (c) 1989, 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -11,11 +11,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/column/column.c b/usr.bin/column/column.c
index ef3a2a01179..ce442c9b5b2 100644
--- a/usr.bin/column/column.c
+++ b/usr.bin/column/column.c
@@ -1,4 +1,4 @@
-/* $NetBSD: column.c,v 1.9 1998/11/06 22:59:12 christos Exp $ */
+/* $NetBSD: column.c,v 1.10 2003/08/07 11:13:26 agc Exp $ */
/*
* Copyright (c) 1989, 1993, 1994
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -43,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1989, 1993, 1994\n\
#if 0
static char sccsid[] = "@(#)column.c 8.4 (Berkeley) 5/4/95";
#endif
-__RCSID("$NetBSD: column.c,v 1.9 1998/11/06 22:59:12 christos Exp $");
+__RCSID("$NetBSD: column.c,v 1.10 2003/08/07 11:13:26 agc Exp $");
#endif /* not lint */
#include <sys/types.h>
diff --git a/usr.bin/comm/comm.1 b/usr.bin/comm/comm.1
index bb08f913a13..f88a4a407e2 100644
--- a/usr.bin/comm/comm.1
+++ b/usr.bin/comm/comm.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: comm.1,v 1.9 2002/02/08 01:36:21 ross Exp $
+.\" $NetBSD: comm.1,v 1.10 2003/08/07 11:13:27 agc Exp $
.\"
.\" Copyright (c) 1989, 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -14,11 +14,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/comm/comm.c b/usr.bin/comm/comm.c
index f45b5685b61..4f64e17b775 100644
--- a/usr.bin/comm/comm.c
+++ b/usr.bin/comm/comm.c
@@ -1,4 +1,4 @@
-/* $NetBSD: comm.c,v 1.12 1999/02/11 00:53:24 hubertf Exp $ */
+/* $NetBSD: comm.c,v 1.13 2003/08/07 11:13:27 agc Exp $ */
/*
* Copyright (c) 1989, 1993, 1994
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -46,7 +42,7 @@ __COPYRIGHT("@(#) Copyright (c) 1989, 1993, 1994\n\
#if 0
static char sccsid[] = "@(#)comm.c 8.4 (Berkeley) 5/4/95";
#endif
-__RCSID("$NetBSD: comm.c,v 1.12 1999/02/11 00:53:24 hubertf Exp $");
+__RCSID("$NetBSD: comm.c,v 1.13 2003/08/07 11:13:27 agc Exp $");
#endif /* not lint */
#include <err.h>
diff --git a/usr.bin/compress/compress.1 b/usr.bin/compress/compress.1
index 344975a2ddf..d3daffb195d 100644
--- a/usr.bin/compress/compress.1
+++ b/usr.bin/compress/compress.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: compress.1,v 1.13 2003/01/23 08:53:46 wiz Exp $
+.\" $NetBSD: compress.1,v 1.14 2003/08/07 11:13:28 agc Exp $
.\"
.\" Copyright (c) 1986, 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -15,11 +15,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/compress/compress.c b/usr.bin/compress/compress.c
index 37b89b4dfbb..fa4113384b0 100644
--- a/usr.bin/compress/compress.c
+++ b/usr.bin/compress/compress.c
@@ -1,4 +1,4 @@
-/* $NetBSD: compress.c,v 1.19 2002/05/26 22:21:22 wiz Exp $ */
+/* $NetBSD: compress.c,v 1.20 2003/08/07 11:13:28 agc Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -43,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1992, 1993\n\
#if 0
static char sccsid[] = "@(#)compress.c 8.2 (Berkeley) 1/7/94";
#else
-__RCSID("$NetBSD: compress.c,v 1.19 2002/05/26 22:21:22 wiz Exp $");
+__RCSID("$NetBSD: compress.c,v 1.20 2003/08/07 11:13:28 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/compress/zopen.3 b/usr.bin/compress/zopen.3
index 1900c1f26d8..32be9c4c6ce 100644
--- a/usr.bin/compress/zopen.3
+++ b/usr.bin/compress/zopen.3
@@ -1,4 +1,4 @@
-.\" $NetBSD: zopen.3,v 1.6 2003/04/16 13:35:37 wiz Exp $
+.\" $NetBSD: zopen.3,v 1.7 2003/08/07 11:13:29 agc Exp $
.\"
.\" Copyright (c) 1992, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -11,11 +11,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/compress/zopen.c b/usr.bin/compress/zopen.c
index f6c33d48117..69c8bda65fc 100644
--- a/usr.bin/compress/zopen.c
+++ b/usr.bin/compress/zopen.c
@@ -1,4 +1,4 @@
-/* $NetBSD: zopen.c,v 1.7 2002/05/26 22:25:38 wiz Exp $ */
+/* $NetBSD: zopen.c,v 1.8 2003/08/07 11:13:29 agc Exp $ */
/*-
* Copyright (c) 1985, 1986, 1992, 1993
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)zopen.c 8.1 (Berkeley) 6/27/93";
#else
-static char rcsid[] = "$NetBSD: zopen.c,v 1.7 2002/05/26 22:25:38 wiz Exp $";
+static char rcsid[] = "$NetBSD: zopen.c,v 1.8 2003/08/07 11:13:29 agc Exp $";
#endif
#endif /* LIBC_SCCS and not lint */
diff --git a/usr.bin/ctags/C.c b/usr.bin/ctags/C.c
index 1d29fc10f9e..426fd5c922e 100644
--- a/usr.bin/ctags/C.c
+++ b/usr.bin/ctags/C.c
@@ -1,4 +1,4 @@
-/* $NetBSD: C.c,v 1.9 2002/01/31 19:26:34 tv Exp $ */
+/* $NetBSD: C.c,v 1.10 2003/08/07 11:13:30 agc Exp $ */
/*
* Copyright (c) 1987, 1993, 1994
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)C.c 8.4 (Berkeley) 4/2/94";
#else
-__RCSID("$NetBSD: C.c,v 1.9 2002/01/31 19:26:34 tv Exp $");
+__RCSID("$NetBSD: C.c,v 1.10 2003/08/07 11:13:30 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/ctags/ctags.1 b/usr.bin/ctags/ctags.1
index d796651b7e0..f20341ea024 100644
--- a/usr.bin/ctags/ctags.1
+++ b/usr.bin/ctags/ctags.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: ctags.1,v 1.14 2003/02/25 10:35:39 wiz Exp $
+.\" $NetBSD: ctags.1,v 1.15 2003/08/07 11:13:30 agc Exp $
.\"
.\" Copyright (c) 1987, 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -11,11 +11,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/ctags/ctags.c b/usr.bin/ctags/ctags.c
index 3915981f0bb..90dde76f42d 100644
--- a/usr.bin/ctags/ctags.c
+++ b/usr.bin/ctags/ctags.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ctags.c,v 1.8 2003/07/14 09:40:26 itojun Exp $ */
+/* $NetBSD: ctags.c,v 1.9 2003/08/07 11:13:30 agc Exp $ */
/*
* Copyright (c) 1987, 1993, 1994, 1995
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -43,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1987, 1993, 1994, 1995\n\
#if 0
static char sccsid[] = "@(#)ctags.c 8.4 (Berkeley) 2/7/95";
#endif
-__RCSID("$NetBSD: ctags.c,v 1.8 2003/07/14 09:40:26 itojun Exp $");
+__RCSID("$NetBSD: ctags.c,v 1.9 2003/08/07 11:13:30 agc Exp $");
#endif /* not lint */
#include <err.h>
diff --git a/usr.bin/ctags/ctags.h b/usr.bin/ctags/ctags.h
index 716b5895f34..c423874be32 100644
--- a/usr.bin/ctags/ctags.h
+++ b/usr.bin/ctags/ctags.h
@@ -1,4 +1,4 @@
-/* $NetBSD: ctags.h,v 1.5 2002/01/31 22:43:52 tv Exp $ */
+/* $NetBSD: ctags.h,v 1.6 2003/08/07 11:13:31 agc Exp $ */
/*
* Copyright (c) 1987, 1993, 1994
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/ctags/fortran.c b/usr.bin/ctags/fortran.c
index 637e627d6be..335a0ba42a5 100644
--- a/usr.bin/ctags/fortran.c
+++ b/usr.bin/ctags/fortran.c
@@ -1,4 +1,4 @@
-/* $NetBSD: fortran.c,v 1.7 2003/07/14 09:40:26 itojun Exp $ */
+/* $NetBSD: fortran.c,v 1.8 2003/08/07 11:13:31 agc Exp $ */
/*
* Copyright (c) 1987, 1993, 1994
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)fortran.c 8.3 (Berkeley) 4/2/94";
#else
-__RCSID("$NetBSD: fortran.c,v 1.7 2003/07/14 09:40:26 itojun Exp $");
+__RCSID("$NetBSD: fortran.c,v 1.8 2003/08/07 11:13:31 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/ctags/lisp.c b/usr.bin/ctags/lisp.c
index 195fdfc713e..fafe479c80b 100644
--- a/usr.bin/ctags/lisp.c
+++ b/usr.bin/ctags/lisp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: lisp.c,v 1.7 2003/07/14 09:40:27 itojun Exp $ */
+/* $NetBSD: lisp.c,v 1.8 2003/08/07 11:13:31 agc Exp $ */
/*
* Copyright (c) 1987, 1993, 1994
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)lisp.c 8.3 (Berkeley) 4/2/94";
#else
-__RCSID("$NetBSD: lisp.c,v 1.7 2003/07/14 09:40:27 itojun Exp $");
+__RCSID("$NetBSD: lisp.c,v 1.8 2003/08/07 11:13:31 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/ctags/print.c b/usr.bin/ctags/print.c
index 03329eaa9ca..e1846faec0a 100644
--- a/usr.bin/ctags/print.c
+++ b/usr.bin/ctags/print.c
@@ -1,4 +1,4 @@
-/* $NetBSD: print.c,v 1.6 2002/01/31 19:26:35 tv Exp $ */
+/* $NetBSD: print.c,v 1.7 2003/08/07 11:13:31 agc Exp $ */
/*
* Copyright (c) 1987, 1993, 1994
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)print.c 8.3 (Berkeley) 4/2/94";
#else
-__RCSID("$NetBSD: print.c,v 1.6 2002/01/31 19:26:35 tv Exp $");
+__RCSID("$NetBSD: print.c,v 1.7 2003/08/07 11:13:31 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/ctags/tree.c b/usr.bin/ctags/tree.c
index 533b346f905..f1cb32f41f5 100644
--- a/usr.bin/ctags/tree.c
+++ b/usr.bin/ctags/tree.c
@@ -1,4 +1,4 @@
-/* $NetBSD: tree.c,v 1.8 2003/07/14 09:40:27 itojun Exp $ */
+/* $NetBSD: tree.c,v 1.9 2003/08/07 11:13:31 agc Exp $ */
/*
* Copyright (c) 1987, 1993, 1994
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)tree.c 8.3 (Berkeley) 4/2/94";
#else
-__RCSID("$NetBSD: tree.c,v 1.8 2003/07/14 09:40:27 itojun Exp $");
+__RCSID("$NetBSD: tree.c,v 1.9 2003/08/07 11:13:31 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/ctags/yacc.c b/usr.bin/ctags/yacc.c
index 9e00f6f4897..d355d9fffb9 100644
--- a/usr.bin/ctags/yacc.c
+++ b/usr.bin/ctags/yacc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: yacc.c,v 1.7 2002/01/31 19:26:36 tv Exp $ */
+/* $NetBSD: yacc.c,v 1.8 2003/08/07 11:13:32 agc Exp $ */
/*
* Copyright (c) 1987, 1993, 1994
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)yacc.c 8.3 (Berkeley) 4/2/94";
#else
-__RCSID("$NetBSD: yacc.c,v 1.7 2002/01/31 19:26:36 tv Exp $");
+__RCSID("$NetBSD: yacc.c,v 1.8 2003/08/07 11:13:32 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/cut/cut.1 b/usr.bin/cut/cut.1
index 34b37eec413..a771ac644b6 100644
--- a/usr.bin/cut/cut.1
+++ b/usr.bin/cut/cut.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: cut.1,v 1.11 2003/07/07 12:20:04 jmmv Exp $
+.\" $NetBSD: cut.1,v 1.12 2003/08/07 11:13:32 agc Exp $
.\"
.\" Copyright (c) 1989, 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -14,11 +14,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/cut/cut.c b/usr.bin/cut/cut.c
index e39848e0d1e..b032266001c 100644
--- a/usr.bin/cut/cut.c
+++ b/usr.bin/cut/cut.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cut.c,v 1.15 2002/06/11 06:06:18 itojun Exp $ */
+/* $NetBSD: cut.c,v 1.16 2003/08/07 11:13:32 agc Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -46,7 +42,7 @@ __COPYRIGHT("@(#) Copyright (c) 1989, 1993\n\
#if 0
static char sccsid[] = "@(#)cut.c 8.3 (Berkeley) 5/4/95";
#endif
-__RCSID("$NetBSD: cut.c,v 1.15 2002/06/11 06:06:18 itojun Exp $");
+__RCSID("$NetBSD: cut.c,v 1.16 2003/08/07 11:13:32 agc Exp $");
#endif /* not lint */
#include <ctype.h>
diff --git a/usr.bin/dirname/dirname.c b/usr.bin/dirname/dirname.c
index 19f5b37a692..b956b5b534d 100644
--- a/usr.bin/dirname/dirname.c
+++ b/usr.bin/dirname/dirname.c
@@ -1,4 +1,4 @@
-/* $NetBSD: dirname.c,v 1.7 1997/10/18 13:21:41 lukem Exp $ */
+/* $NetBSD: dirname.c,v 1.8 2003/08/07 11:13:34 agc Exp $ */
/*-
* Copyright (c) 1991, 1993, 1994
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -43,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1991, 1993, 1994\n\
#if 0
static char sccsid[] = "@(#)dirname.c 8.4 (Berkeley) 5/4/95";
#endif
-__RCSID("$NetBSD: dirname.c,v 1.7 1997/10/18 13:21:41 lukem Exp $");
+__RCSID("$NetBSD: dirname.c,v 1.8 2003/08/07 11:13:34 agc Exp $");
#endif /* not lint */
#include <stdio.h>
diff --git a/usr.bin/du/du.1 b/usr.bin/du/du.1
index ec3a7216e24..bbc4aa11381 100644
--- a/usr.bin/du/du.1
+++ b/usr.bin/du/du.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: du.1,v 1.16 2003/04/18 13:16:50 grant Exp $
+.\" $NetBSD: du.1,v 1.17 2003/08/07 11:13:34 agc Exp $
.\"
.\" Copyright (c) 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -11,11 +11,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/du/du.c b/usr.bin/du/du.c
index 89e1c9a13d5..79186a18ff1 100644
--- a/usr.bin/du/du.c
+++ b/usr.bin/du/du.c
@@ -1,4 +1,4 @@
-/* $NetBSD: du.c,v 1.22 2003/05/30 00:17:26 simonb Exp $ */
+/* $NetBSD: du.c,v 1.23 2003/08/07 11:13:34 agc Exp $ */
/*
* Copyright (c) 1989, 1993, 1994
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -46,7 +42,7 @@ __COPYRIGHT("@(#) Copyright (c) 1989, 1993, 1994\n\
#if 0
static char sccsid[] = "@(#)du.c 8.5 (Berkeley) 5/4/95";
#else
-__RCSID("$NetBSD: du.c,v 1.22 2003/05/30 00:17:26 simonb Exp $");
+__RCSID("$NetBSD: du.c,v 1.23 2003/08/07 11:13:34 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/env/env.1 b/usr.bin/env/env.1
index 75cac316737..f84b876f1ea 100644
--- a/usr.bin/env/env.1
+++ b/usr.bin/env/env.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: env.1,v 1.10 2002/09/30 11:08:59 grant Exp $
+.\" $NetBSD: env.1,v 1.11 2003/08/07 11:13:35 agc Exp $
.\"
.\" Copyright (c) 1980, 1990 The Regents of the University of California.
.\" All rights reserved.
@@ -13,11 +13,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
@@ -34,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" from: @(#)printenv.1 6.7 (Berkeley) 7/28/91
-.\" $NetBSD: env.1,v 1.10 2002/09/30 11:08:59 grant Exp $
+.\" $NetBSD: env.1,v 1.11 2003/08/07 11:13:35 agc Exp $
.\"
.Dd August 27, 1993
.Dt ENV 1
diff --git a/usr.bin/env/env.c b/usr.bin/env/env.c
index 66bbbcab704..a283382ef68 100644
--- a/usr.bin/env/env.c
+++ b/usr.bin/env/env.c
@@ -10,11 +10,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -39,7 +35,7 @@ __COPYRIGHT("@(#) Copyright (c) 1988, 1993, 1994\n\
#ifndef lint
/*static char sccsid[] = "@(#)env.c 8.3 (Berkeley) 4/2/94";*/
-__RCSID("$NetBSD: env.c,v 1.14 2001/02/05 01:41:51 christos Exp $");
+__RCSID("$NetBSD: env.c,v 1.15 2003/08/07 11:13:35 agc Exp $");
#endif /* not lint */
#include <err.h>
diff --git a/usr.bin/error/error.1 b/usr.bin/error/error.1
index 0051ca97a12..17940008467 100644
--- a/usr.bin/error/error.1
+++ b/usr.bin/error/error.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: error.1,v 1.11 2003/03/31 01:53:27 perry Exp $
+.\" $NetBSD: error.1,v 1.12 2003/08/07 11:13:36 agc Exp $
.\"
.\" Copyright (c) 1980, 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -11,11 +11,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/error/error.h b/usr.bin/error/error.h
index e45a637ede7..3804d8afccb 100644
--- a/usr.bin/error/error.h
+++ b/usr.bin/error/error.h
@@ -1,4 +1,4 @@
-/* $NetBSD: error.h,v 1.8 2003/07/14 11:09:19 itojun Exp $ */
+/* $NetBSD: error.h,v 1.9 2003/08/07 11:13:36 agc Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/error/filter.c b/usr.bin/error/filter.c
index bf372b7aac6..b11d55303d0 100644
--- a/usr.bin/error/filter.c
+++ b/usr.bin/error/filter.c
@@ -1,4 +1,4 @@
-/* $NetBSD: filter.c,v 1.9 2003/07/14 11:09:19 itojun Exp $ */
+/* $NetBSD: filter.c,v 1.10 2003/08/07 11:13:37 agc Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)filter.c 8.1 (Berkeley) 6/6/93";
#endif
-__RCSID("$NetBSD: filter.c,v 1.9 2003/07/14 11:09:19 itojun Exp $");
+__RCSID("$NetBSD: filter.c,v 1.10 2003/08/07 11:13:37 agc Exp $");
#endif /* not lint */
#include <sys/param.h>
diff --git a/usr.bin/error/input.c b/usr.bin/error/input.c
index 58109197890..e247158d417 100644
--- a/usr.bin/error/input.c
+++ b/usr.bin/error/input.c
@@ -1,4 +1,4 @@
-/* $NetBSD: input.c,v 1.9 2002/05/26 22:41:21 wiz Exp $ */
+/* $NetBSD: input.c,v 1.10 2003/08/07 11:13:37 agc Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)input.c 8.1 (Berkeley) 6/6/93";
#endif
-__RCSID("$NetBSD: input.c,v 1.9 2002/05/26 22:41:21 wiz Exp $");
+__RCSID("$NetBSD: input.c,v 1.10 2003/08/07 11:13:37 agc Exp $");
#endif /* not lint */
#include <stdio.h>
diff --git a/usr.bin/error/main.c b/usr.bin/error/main.c
index dcabfae4f5d..629b926bc56 100644
--- a/usr.bin/error/main.c
+++ b/usr.bin/error/main.c
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.7 2002/05/26 22:41:21 wiz Exp $ */
+/* $NetBSD: main.c,v 1.8 2003/08/07 11:13:37 agc Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -43,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 1993\n\
#if 0
static char sccsid[] = "@(#)main.c 8.1 (Berkeley) 6/6/93";
#endif
-__RCSID("$NetBSD: main.c,v 1.7 2002/05/26 22:41:21 wiz Exp $");
+__RCSID("$NetBSD: main.c,v 1.8 2003/08/07 11:13:37 agc Exp $");
#endif /* not lint */
#include <signal.h>
diff --git a/usr.bin/error/pathnames.h b/usr.bin/error/pathnames.h
index 961a5383ad2..3c19ba68730 100644
--- a/usr.bin/error/pathnames.h
+++ b/usr.bin/error/pathnames.h
@@ -1,4 +1,4 @@
-/* $NetBSD: pathnames.h,v 1.4 1999/11/06 15:11:46 kleink Exp $ */
+/* $NetBSD: pathnames.h,v 1.5 2003/08/07 11:13:37 agc Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/error/pi.c b/usr.bin/error/pi.c
index 458c8700995..2107907e55e 100644
--- a/usr.bin/error/pi.c
+++ b/usr.bin/error/pi.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pi.c,v 1.10 2003/07/14 11:09:19 itojun Exp $ */
+/* $NetBSD: pi.c,v 1.11 2003/08/07 11:13:38 agc Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)pi.c 8.1 (Berkeley) 6/6/93";
#endif
-__RCSID("$NetBSD: pi.c,v 1.10 2003/07/14 11:09:19 itojun Exp $");
+__RCSID("$NetBSD: pi.c,v 1.11 2003/08/07 11:13:38 agc Exp $");
#endif /* not lint */
#include <stdio.h>
diff --git a/usr.bin/error/subr.c b/usr.bin/error/subr.c
index d4a52b9b79f..be9a8ccfe96 100644
--- a/usr.bin/error/subr.c
+++ b/usr.bin/error/subr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: subr.c,v 1.13 2003/07/14 11:09:19 itojun Exp $ */
+/* $NetBSD: subr.c,v 1.14 2003/08/07 11:13:38 agc Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)subr.c 8.1 (Berkeley) 6/6/93";
#endif
-__RCSID("$NetBSD: subr.c,v 1.13 2003/07/14 11:09:19 itojun Exp $");
+__RCSID("$NetBSD: subr.c,v 1.14 2003/08/07 11:13:38 agc Exp $");
#endif /* not lint */
#include <ctype.h>
diff --git a/usr.bin/error/touch.c b/usr.bin/error/touch.c
index d30d7c86362..3f33857eea8 100644
--- a/usr.bin/error/touch.c
+++ b/usr.bin/error/touch.c
@@ -1,4 +1,4 @@
-/* $NetBSD: touch.c,v 1.13 2002/05/26 22:41:21 wiz Exp $ */
+/* $NetBSD: touch.c,v 1.14 2003/08/07 11:13:38 agc Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)touch.c 8.1 (Berkeley) 6/6/93";
#endif
-__RCSID("$NetBSD: touch.c,v 1.13 2002/05/26 22:41:21 wiz Exp $");
+__RCSID("$NetBSD: touch.c,v 1.14 2003/08/07 11:13:38 agc Exp $");
#endif /* not lint */
#include <sys/param.h>
diff --git a/usr.bin/expand/expand.1 b/usr.bin/expand/expand.1
index 24651cd4922..4314d24ad34 100644
--- a/usr.bin/expand/expand.1
+++ b/usr.bin/expand/expand.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: expand.1,v 1.9 2003/04/08 11:56:07 wiz Exp $
+.\" $NetBSD: expand.1,v 1.10 2003/08/07 11:13:39 agc Exp $
.\"
.\" Copyright (c) 1980, 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -11,11 +11,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/expand/expand.c b/usr.bin/expand/expand.c
index fff3b672d50..41ebaae3d6c 100644
--- a/usr.bin/expand/expand.c
+++ b/usr.bin/expand/expand.c
@@ -1,4 +1,4 @@
-/* $NetBSD: expand.c,v 1.8 1999/02/10 16:15:31 kleink Exp $ */
+/* $NetBSD: expand.c,v 1.9 2003/08/07 11:13:39 agc Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -43,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 1993\n\
#if 0
static char sccsid[] = "@(#)expand.c 8.1 (Berkeley) 6/9/93";
#endif
-__RCSID("$NetBSD: expand.c,v 1.8 1999/02/10 16:15:31 kleink Exp $");
+__RCSID("$NetBSD: expand.c,v 1.9 2003/08/07 11:13:39 agc Exp $");
#endif /* not lint */
#include <stdio.h>
diff --git a/usr.bin/false/false.1 b/usr.bin/false/false.1
index 7a92cb0cc58..175b67a1afe 100644
--- a/usr.bin/false/false.1
+++ b/usr.bin/false/false.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: false.1,v 1.7 2001/06/05 11:40:04 wiz Exp $
+.\" $NetBSD: false.1,v 1.8 2003/08/07 11:13:40 agc Exp $
.\"
.\" Copyright (c) 1983, 1990 The Regents of the University of California.
.\" All rights reserved.
@@ -14,11 +14,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
@@ -35,7 +31,7 @@
.\" SUCH DAMAGE.
.\"
.\" from: @(#)false.1 6.6 (Berkeley) 7/24/91
-.\" $NetBSD: false.1,v 1.7 2001/06/05 11:40:04 wiz Exp $
+.\" $NetBSD: false.1,v 1.8 2003/08/07 11:13:40 agc Exp $
.\"
.Dd July 24, 1991
.Dt FALSE 1
diff --git a/usr.bin/find/extern.h b/usr.bin/find/extern.h
index 7f8352b4904..f2a55f67df9 100644
--- a/usr.bin/find/extern.h
+++ b/usr.bin/find/extern.h
@@ -1,4 +1,4 @@
-/* $NetBSD: extern.h,v 1.19 2003/08/03 19:46:03 provos Exp $ */
+/* $NetBSD: extern.h,v 1.20 2003/08/07 11:13:40 agc Exp $ */
/*-
* Copyright (c) 1991, 1993, 1994
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/find/find.1 b/usr.bin/find/find.1
index 2e04ef5fb19..b5ef0a21681 100644
--- a/usr.bin/find/find.1
+++ b/usr.bin/find/find.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: find.1,v 1.46 2003/08/03 19:46:03 provos Exp $
+.\" $NetBSD: find.1,v 1.47 2003/08/07 11:13:40 agc Exp $
.\"
.\" Copyright (c) 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -14,11 +14,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/find/find.c b/usr.bin/find/find.c
index b29ae65032e..e2461194c80 100644
--- a/usr.bin/find/find.c
+++ b/usr.bin/find/find.c
@@ -1,4 +1,4 @@
-/* $NetBSD: find.c,v 1.17 2003/05/22 15:48:44 yamt Exp $ */
+/* $NetBSD: find.c,v 1.18 2003/08/07 11:13:41 agc Exp $ */
/*-
* Copyright (c) 1991, 1993, 1994
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "from: @(#)find.c 8.5 (Berkeley) 8/5/94";
#else
-__RCSID("$NetBSD: find.c,v 1.17 2003/05/22 15:48:44 yamt Exp $");
+__RCSID("$NetBSD: find.c,v 1.18 2003/08/07 11:13:41 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/find/find.h b/usr.bin/find/find.h
index bf1f6dd69a6..cb9dab2dfd2 100644
--- a/usr.bin/find/find.h
+++ b/usr.bin/find/find.h
@@ -1,4 +1,4 @@
-/* $NetBSD: find.h,v 1.17 2003/08/03 19:46:04 provos Exp $ */
+/* $NetBSD: find.h,v 1.18 2003/08/07 11:13:41 agc Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/find/function.c b/usr.bin/find/function.c
index ec66ed833e5..760583d28f7 100644
--- a/usr.bin/find/function.c
+++ b/usr.bin/find/function.c
@@ -1,4 +1,4 @@
-/* $NetBSD: function.c,v 1.45 2003/08/03 19:46:04 provos Exp $ */
+/* $NetBSD: function.c,v 1.46 2003/08/07 11:13:41 agc Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "from: @(#)function.c 8.10 (Berkeley) 5/4/95";
#else
-__RCSID("$NetBSD: function.c,v 1.45 2003/08/03 19:46:04 provos Exp $");
+__RCSID("$NetBSD: function.c,v 1.46 2003/08/07 11:13:41 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/find/ls.c b/usr.bin/find/ls.c
index 4d1ec2c4f8e..bf846245187 100644
--- a/usr.bin/find/ls.c
+++ b/usr.bin/find/ls.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ls.c,v 1.17 2003/07/12 13:57:50 itojun Exp $ */
+/* $NetBSD: ls.c,v 1.18 2003/08/07 11:13:42 agc Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "from: @(#)ls.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: ls.c,v 1.17 2003/07/12 13:57:50 itojun Exp $");
+__RCSID("$NetBSD: ls.c,v 1.18 2003/08/07 11:13:42 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/find/main.c b/usr.bin/find/main.c
index 21ded23a66c..8cd2e149b4a 100644
--- a/usr.bin/find/main.c
+++ b/usr.bin/find/main.c
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.19 2002/09/27 23:29:12 thorpej Exp $ */
+/* $NetBSD: main.c,v 1.20 2003/08/07 11:13:42 agc Exp $ */
/*-
* Copyright (c) 1990, 1993, 1994
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -43,7 +39,7 @@ static char sccsid[] = "@(#)main.c 8.4 (Berkeley) 5/4/95";
#else
__COPYRIGHT("@(#) Copyright (c) 1990, 1993, 1994\n\
The Regents of the University of California. All rights reserved.\n");
-__RCSID("$NetBSD: main.c,v 1.19 2002/09/27 23:29:12 thorpej Exp $");
+__RCSID("$NetBSD: main.c,v 1.20 2003/08/07 11:13:42 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/find/misc.c b/usr.bin/find/misc.c
index 6611f589f88..92d40b6d49b 100644
--- a/usr.bin/find/misc.c
+++ b/usr.bin/find/misc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: misc.c,v 1.11 2003/05/22 15:48:45 yamt Exp $ */
+/* $NetBSD: misc.c,v 1.12 2003/08/07 11:13:42 agc Exp $ */
/*-
* Copyright (c) 1990, 1993, 1994
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "from: @(#)misc.c 8.2 (Berkeley) 4/1/94";
#else
-__RCSID("$NetBSD: misc.c,v 1.11 2003/05/22 15:48:45 yamt Exp $");
+__RCSID("$NetBSD: misc.c,v 1.12 2003/08/07 11:13:42 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/find/operator.c b/usr.bin/find/operator.c
index bf4441dc0f8..71463d955d5 100644
--- a/usr.bin/find/operator.c
+++ b/usr.bin/find/operator.c
@@ -1,4 +1,4 @@
-/* $NetBSD: operator.c,v 1.7 1999/01/02 02:34:15 lukem Exp $ */
+/* $NetBSD: operator.c,v 1.8 2003/08/07 11:13:43 agc Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "from: @(#)operator.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: operator.c,v 1.7 1999/01/02 02:34:15 lukem Exp $");
+__RCSID("$NetBSD: operator.c,v 1.8 2003/08/07 11:13:43 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/find/option.c b/usr.bin/find/option.c
index 6186e5475d1..1d9d831e292 100644
--- a/usr.bin/find/option.c
+++ b/usr.bin/find/option.c
@@ -1,4 +1,4 @@
-/* $NetBSD: option.c,v 1.19 2003/08/03 19:46:04 provos Exp $ */
+/* $NetBSD: option.c,v 1.20 2003/08/07 11:13:43 agc Exp $ */
/*-
* Copyright (c) 1990, 1993, 1994
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "from: @(#)option.c 8.2 (Berkeley) 4/16/94";
#else
-__RCSID("$NetBSD: option.c,v 1.19 2003/08/03 19:46:04 provos Exp $");
+__RCSID("$NetBSD: option.c,v 1.20 2003/08/07 11:13:43 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/finger/extern.h b/usr.bin/finger/extern.h
index 1d2f8dee0e0..ec25c62707a 100644
--- a/usr.bin/finger/extern.h
+++ b/usr.bin/finger/extern.h
@@ -1,4 +1,4 @@
-/* $NetBSD: extern.h,v 1.8 2002/09/12 01:31:41 kim Exp $ */
+/* $NetBSD: extern.h,v 1.9 2003/08/07 11:13:44 agc Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/finger/finger.1 b/usr.bin/finger/finger.1
index 8b202370d36..e63e559f4f4 100644
--- a/usr.bin/finger/finger.1
+++ b/usr.bin/finger/finger.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: finger.1,v 1.14 2002/09/30 11:09:00 grant Exp $
+.\" $NetBSD: finger.1,v 1.15 2003/08/07 11:13:44 agc Exp $
.\"
.\" Copyright (c) 1989, 1990, 1993, 1994
.\" The Regents of the University of California. All rights reserved.
@@ -11,11 +11,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/finger/finger.c b/usr.bin/finger/finger.c
index 616aa143bb1..ede49b2bb2c 100644
--- a/usr.bin/finger/finger.c
+++ b/usr.bin/finger/finger.c
@@ -1,4 +1,4 @@
-/* $NetBSD: finger.c,v 1.22 2003/07/26 20:34:13 salo Exp $ */
+/* $NetBSD: finger.c,v 1.23 2003/08/07 11:13:44 agc Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -56,7 +52,7 @@ __COPYRIGHT("@(#) Copyright (c) 1989, 1993\n\
#if 0
static char sccsid[] = "@(#)finger.c 8.5 (Berkeley) 5/4/95";
#else
-__RCSID("$NetBSD: finger.c,v 1.22 2003/07/26 20:34:13 salo Exp $");
+__RCSID("$NetBSD: finger.c,v 1.23 2003/08/07 11:13:44 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/finger/finger.h b/usr.bin/finger/finger.h
index 6aaaa4ddde9..019fcc01616 100644
--- a/usr.bin/finger/finger.h
+++ b/usr.bin/finger/finger.h
@@ -1,4 +1,4 @@
-/* $NetBSD: finger.h,v 1.8 2002/08/02 00:10:40 christos Exp $ */
+/* $NetBSD: finger.h,v 1.9 2003/08/07 11:13:45 agc Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/finger/lprint.c b/usr.bin/finger/lprint.c
index 72fc8b153a5..642dcbbd673 100644
--- a/usr.bin/finger/lprint.c
+++ b/usr.bin/finger/lprint.c
@@ -1,4 +1,4 @@
-/* $NetBSD: lprint.c,v 1.18 2002/09/12 01:31:41 kim Exp $ */
+/* $NetBSD: lprint.c,v 1.19 2003/08/07 11:13:45 agc Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)lprint.c 8.3 (Berkeley) 4/28/95";
#else
-__RCSID( "$NetBSD: lprint.c,v 1.18 2002/09/12 01:31:41 kim Exp $");
+__RCSID( "$NetBSD: lprint.c,v 1.19 2003/08/07 11:13:45 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/finger/net.c b/usr.bin/finger/net.c
index 12fae5613e3..3cf4328f128 100644
--- a/usr.bin/finger/net.c
+++ b/usr.bin/finger/net.c
@@ -1,4 +1,4 @@
-/* $NetBSD: net.c,v 1.19 2002/09/12 01:31:41 kim Exp $ */
+/* $NetBSD: net.c,v 1.20 2003/08/07 11:13:45 agc Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)net.c 8.4 (Berkeley) 4/28/95";
#else
-__RCSID("$NetBSD: net.c,v 1.19 2002/09/12 01:31:41 kim Exp $");
+__RCSID("$NetBSD: net.c,v 1.20 2003/08/07 11:13:45 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/finger/sprint.c b/usr.bin/finger/sprint.c
index bce2545f12f..46d400e304f 100644
--- a/usr.bin/finger/sprint.c
+++ b/usr.bin/finger/sprint.c
@@ -1,4 +1,4 @@
-/* $NetBSD: sprint.c,v 1.14 2003/01/06 20:30:40 wiz Exp $ */
+/* $NetBSD: sprint.c,v 1.15 2003/08/07 11:13:46 agc Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)sprint.c 8.3 (Berkeley) 4/28/95";
#else
-__RCSID("$NetBSD: sprint.c,v 1.14 2003/01/06 20:30:40 wiz Exp $");
+__RCSID("$NetBSD: sprint.c,v 1.15 2003/08/07 11:13:46 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/finger/util.c b/usr.bin/finger/util.c
index 4e151cfad06..338332953f1 100644
--- a/usr.bin/finger/util.c
+++ b/usr.bin/finger/util.c
@@ -1,8 +1,38 @@
-/* $NetBSD: util.c,v 1.20 2003/07/12 13:28:10 itojun Exp $ */
+/* $NetBSD: util.c,v 1.21 2003/08/07 11:13:46 agc Exp $ */
/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Tony Nardo of the Johns Hopkins University/Applied Physics Lab.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+/*
* Portions Copyright (c) 1983, 1995, 1996 Eric P. Allman
*
* This code is derived from software contributed to Berkeley by
@@ -42,7 +72,7 @@
#if 0
static char sccsid[] = "@(#)util.c 8.3 (Berkeley) 4/28/95";
#else
-__RCSID("$NetBSD: util.c,v 1.20 2003/07/12 13:28:10 itojun Exp $");
+__RCSID("$NetBSD: util.c,v 1.21 2003/08/07 11:13:46 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/fmt/fmt.1 b/usr.bin/fmt/fmt.1
index 34a27ac5f1d..5825f521fbf 100644
--- a/usr.bin/fmt/fmt.1
+++ b/usr.bin/fmt/fmt.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: fmt.1,v 1.7 2001/12/01 19:11:58 wiz Exp $
+.\" $NetBSD: fmt.1,v 1.8 2003/08/07 11:13:47 agc Exp $
.\"
.\" Copyright (c) 1980, 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -11,11 +11,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/fmt/fmt.c b/usr.bin/fmt/fmt.c
index df86de61490..7ad995276ee 100644
--- a/usr.bin/fmt/fmt.c
+++ b/usr.bin/fmt/fmt.c
@@ -1,4 +1,4 @@
-/* $NetBSD: fmt.c,v 1.16 2002/03/02 13:55:13 wiz Exp $ */
+/* $NetBSD: fmt.c,v 1.17 2003/08/07 11:13:47 agc Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -43,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 1993\n\
#if 0
static char sccsid[] = "@(#)fmt.c 8.1 (Berkeley) 7/20/93";
#endif
-__RCSID("$NetBSD: fmt.c,v 1.16 2002/03/02 13:55:13 wiz Exp $");
+__RCSID("$NetBSD: fmt.c,v 1.17 2003/08/07 11:13:47 agc Exp $");
#endif /* not lint */
#include <ctype.h>
diff --git a/usr.bin/fold/fold.1 b/usr.bin/fold/fold.1
index 2cc7273bff6..2330f58fcc8 100644
--- a/usr.bin/fold/fold.1
+++ b/usr.bin/fold/fold.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: fold.1,v 1.9 2003/02/25 10:35:41 wiz Exp $
+.\" $NetBSD: fold.1,v 1.10 2003/08/07 11:13:47 agc Exp $
.\"
.\" Copyright (c) 1980, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -11,11 +11,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/fold/fold.c b/usr.bin/fold/fold.c
index c89d5a1a984..2ad960a2ce6 100644
--- a/usr.bin/fold/fold.c
+++ b/usr.bin/fold/fold.c
@@ -1,4 +1,4 @@
-/* $NetBSD: fold.c,v 1.11 2000/09/08 12:57:28 mjl Exp $ */
+/* $NetBSD: fold.c,v 1.12 2003/08/07 11:13:48 agc Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -46,7 +42,7 @@ __COPYRIGHT("@(#) Copyright (c) 1990, 1993\n\
#if 0
static char sccsid[] = "@(#)fold.c 8.1 (Berkeley) 6/6/93";
#endif
-__RCSID("$NetBSD: fold.c,v 1.11 2000/09/08 12:57:28 mjl Exp $");
+__RCSID("$NetBSD: fold.c,v 1.12 2003/08/07 11:13:48 agc Exp $");
#endif /* not lint */
#include <stdio.h>
diff --git a/usr.bin/fpr/fpr.1 b/usr.bin/fpr/fpr.1
index 8ec322ea8d8..4588e014c14 100644
--- a/usr.bin/fpr/fpr.1
+++ b/usr.bin/fpr/fpr.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: fpr.1,v 1.8 2002/10/12 22:57:49 wiz Exp $
+.\" $NetBSD: fpr.1,v 1.9 2003/08/07 11:13:48 agc Exp $
.\"
.\" Copyright (c) 1989, 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -13,11 +13,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/fpr/fpr.c b/usr.bin/fpr/fpr.c
index 427b9a35348..6f123408bd1 100644
--- a/usr.bin/fpr/fpr.c
+++ b/usr.bin/fpr/fpr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: fpr.c,v 1.5 2002/05/30 17:46:24 thorpej Exp $ */
+/* $NetBSD: fpr.c,v 1.6 2003/08/07 11:13:48 agc Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -46,7 +42,7 @@ __COPYRIGHT("@(#) Copyright (c) 1989, 1993\n\
#if 0
static char sccsid[] = "@(#)fpr.c 8.1 (Berkeley) 6/6/93";
#endif
-__RCSID("$NetBSD: fpr.c,v 1.5 2002/05/30 17:46:24 thorpej Exp $");
+__RCSID("$NetBSD: fpr.c,v 1.6 2003/08/07 11:13:48 agc Exp $");
#endif /* not lint */
#include <err.h>
diff --git a/usr.bin/from/from.1 b/usr.bin/from/from.1
index 2fc23281771..b9085a32b30 100644
--- a/usr.bin/from/from.1
+++ b/usr.bin/from/from.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: from.1,v 1.7 2001/12/01 16:43:14 wiz Exp $
+.\" $NetBSD: from.1,v 1.8 2003/08/07 11:13:49 agc Exp $
.\"
.\" Copyright (c) 1980, 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -11,11 +11,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/from/from.c b/usr.bin/from/from.c
index da61cc5c5b5..d87afdfb5ff 100644
--- a/usr.bin/from/from.c
+++ b/usr.bin/from/from.c
@@ -1,4 +1,4 @@
-/* $NetBSD: from.c,v 1.14 2001/11/15 14:16:11 kleink Exp $ */
+/* $NetBSD: from.c,v 1.15 2003/08/07 11:13:49 agc Exp $ */
/*
* Copyright (c) 1980, 1988, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -43,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 1988, 1993\n\
#if 0
static char sccsid[] = "@(#)from.c 8.1 (Berkeley) 6/6/93";
#endif
-__RCSID("$NetBSD: from.c,v 1.14 2001/11/15 14:16:11 kleink Exp $");
+__RCSID("$NetBSD: from.c,v 1.15 2003/08/07 11:13:49 agc Exp $");
#endif /* not lint */
#include <sys/types.h>
diff --git a/usr.bin/fsplit/fsplit.1 b/usr.bin/fsplit/fsplit.1
index 3b2043cad75..34e5eadb1d6 100644
--- a/usr.bin/fsplit/fsplit.1
+++ b/usr.bin/fsplit/fsplit.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: fsplit.1,v 1.8 2003/02/25 10:35:42 wiz Exp $
+.\" $NetBSD: fsplit.1,v 1.9 2003/08/07 11:13:50 agc Exp $
.\"
.\" Copyright (c) 1983, 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -13,11 +13,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/fsplit/fsplit.c b/usr.bin/fsplit/fsplit.c
index 874bcdecc67..0e9c50c2e43 100644
--- a/usr.bin/fsplit/fsplit.c
+++ b/usr.bin/fsplit/fsplit.c
@@ -13,11 +13,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -44,7 +40,7 @@ __COPYRIGHT("@(#) Copyright (c) 1983, 1993\n\
#if 0
static char sccsid[] = "from: @(#)fsplit.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: fsplit.c,v 1.9 2003/07/14 11:59:07 itojun Exp $");
+__RCSID("$NetBSD: fsplit.c,v 1.10 2003/08/07 11:13:50 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/fstat/fstat.1 b/usr.bin/fstat/fstat.1
index a79ae337d11..820cc957272 100644
--- a/usr.bin/fstat/fstat.1
+++ b/usr.bin/fstat/fstat.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: fstat.1,v 1.22 2002/11/07 13:52:04 enami Exp $
+.\" $NetBSD: fstat.1,v 1.23 2003/08/07 11:13:50 agc Exp $
.\"
.\" Copyright (c) 1987, 1991, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -11,11 +11,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
@@ -32,7 +28,7 @@
.\" SUCH DAMAGE.
.\"
.\" from: @(#)fstat.1 8.3 (Berkeley) 2/25/94
-.\" $NetBSD: fstat.1,v 1.22 2002/11/07 13:52:04 enami Exp $
+.\" $NetBSD: fstat.1,v 1.23 2003/08/07 11:13:50 agc Exp $
.\"
.Dd February 18, 1999
.Dt FSTAT 1
diff --git a/usr.bin/fstat/fstat.c b/usr.bin/fstat/fstat.c
index fd1031441d9..83cbf6c941f 100644
--- a/usr.bin/fstat/fstat.c
+++ b/usr.bin/fstat/fstat.c
@@ -1,4 +1,4 @@
-/* $NetBSD: fstat.c,v 1.63 2003/07/15 05:56:55 itojun Exp $ */
+/* $NetBSD: fstat.c,v 1.64 2003/08/07 11:13:51 agc Exp $ */
/*-
* Copyright (c) 1988, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -43,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1988, 1993\n\
#if 0
static char sccsid[] = "@(#)fstat.c 8.3 (Berkeley) 5/2/95";
#else
-__RCSID("$NetBSD: fstat.c,v 1.63 2003/07/15 05:56:55 itojun Exp $");
+__RCSID("$NetBSD: fstat.c,v 1.64 2003/08/07 11:13:51 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/fstat/fstat.h b/usr.bin/fstat/fstat.h
index 5da96a063e7..ce05e482f55 100644
--- a/usr.bin/fstat/fstat.h
+++ b/usr.bin/fstat/fstat.h
@@ -1,4 +1,4 @@
-/* $NetBSD: fstat.h,v 1.3 2000/02/04 10:35:46 jdolecek Exp $ */
+/* $NetBSD: fstat.h,v 1.4 2003/08/07 11:13:51 agc Exp $ */
/*-
* Copyright (c) 1988, 1993
* The Regents of the University of California. All rights reserved.
@@ -11,11 +11,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/fstat/isofs.c b/usr.bin/fstat/isofs.c
index d8314feb7a6..1720ed8dffa 100644
--- a/usr.bin/fstat/isofs.c
+++ b/usr.bin/fstat/isofs.c
@@ -1,4 +1,4 @@
-/* $NetBSD: isofs.c,v 1.3 2003/02/02 02:35:58 christos Exp $ */
+/* $NetBSD: isofs.c,v 1.4 2003/08/07 11:13:51 agc Exp $ */
/*-
* Copyright (c) 1988, 1993
* The Regents of the University of California. All rights reserved.
@@ -11,11 +11,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -33,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: isofs.c,v 1.3 2003/02/02 02:35:58 christos Exp $");
+__RCSID("$NetBSD: isofs.c,v 1.4 2003/08/07 11:13:51 agc Exp $");
#include <sys/param.h>
#include <sys/time.h>
diff --git a/usr.bin/ftp/cmds.c b/usr.bin/ftp/cmds.c
index 3acb0db6b84..027872180d9 100644
--- a/usr.bin/ftp/cmds.c
+++ b/usr.bin/ftp/cmds.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cmds.c,v 1.101 2003/07/31 07:06:41 lukem Exp $ */
+/* $NetBSD: cmds.c,v 1.102 2003/08/07 11:13:52 agc Exp $ */
/*-
* Copyright (c) 1996-2002 The NetBSD Foundation, Inc.
@@ -52,11 +52,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -107,7 +103,7 @@
#if 0
static char sccsid[] = "@(#)cmds.c 8.6 (Berkeley) 10/9/94";
#else
-__RCSID("$NetBSD: cmds.c,v 1.101 2003/07/31 07:06:41 lukem Exp $");
+__RCSID("$NetBSD: cmds.c,v 1.102 2003/08/07 11:13:52 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/ftp/cmdtab.c b/usr.bin/ftp/cmdtab.c
index 0d013b46ef8..f342a81a6c4 100644
--- a/usr.bin/ftp/cmdtab.c
+++ b/usr.bin/ftp/cmdtab.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cmdtab.c,v 1.40 2002/07/29 04:24:47 lukem Exp $ */
+/* $NetBSD: cmdtab.c,v 1.41 2003/08/07 11:13:53 agc Exp $ */
/*-
* Copyright (c) 1996-2000 The NetBSD Foundation, Inc.
@@ -48,11 +48,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -74,7 +70,7 @@
#if 0
static char sccsid[] = "@(#)cmdtab.c 8.4 (Berkeley) 10/9/94";
#else
-__RCSID("$NetBSD: cmdtab.c,v 1.40 2002/07/29 04:24:47 lukem Exp $");
+__RCSID("$NetBSD: cmdtab.c,v 1.41 2003/08/07 11:13:53 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/ftp/domacro.c b/usr.bin/ftp/domacro.c
index 5a4c736c30e..2e10e1c69e8 100644
--- a/usr.bin/ftp/domacro.c
+++ b/usr.bin/ftp/domacro.c
@@ -1,4 +1,4 @@
-/* $NetBSD: domacro.c,v 1.19 2002/02/01 05:04:43 itojun Exp $ */
+/* $NetBSD: domacro.c,v 1.20 2003/08/07 11:13:53 agc Exp $ */
/*
* Copyright (c) 1985, 1993, 1994
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)domacro.c 8.3 (Berkeley) 4/2/94";
#else
-__RCSID("$NetBSD: domacro.c,v 1.19 2002/02/01 05:04:43 itojun Exp $");
+__RCSID("$NetBSD: domacro.c,v 1.20 2003/08/07 11:13:53 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/ftp/extern.h b/usr.bin/ftp/extern.h
index 06fdc407fd3..9dba874a4a7 100644
--- a/usr.bin/ftp/extern.h
+++ b/usr.bin/ftp/extern.h
@@ -1,4 +1,4 @@
-/* $NetBSD: extern.h,v 1.61 2003/01/21 16:08:07 jhawk Exp $ */
+/* $NetBSD: extern.h,v 1.62 2003/08/07 11:13:54 agc Exp $ */
/*-
* Copyright (c) 1996-2003 The NetBSD Foundation, Inc.
@@ -48,11 +48,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/ftp/ftp.1 b/usr.bin/ftp/ftp.1
index cbf91674996..a17ef567bae 100644
--- a/usr.bin/ftp/ftp.1
+++ b/usr.bin/ftp/ftp.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: ftp.1,v 1.99 2003/07/31 05:24:00 lukem Exp $
+.\" $NetBSD: ftp.1,v 1.100 2003/08/07 11:13:54 agc Exp $
.\"
.\" Copyright (c) 1996-2003 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -46,11 +46,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/ftp/ftp.c b/usr.bin/ftp/ftp.c
index c8751a33874..ad3aa47c0b8 100644
--- a/usr.bin/ftp/ftp.c
+++ b/usr.bin/ftp/ftp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ftp.c,v 1.121 2003/07/31 07:06:41 lukem Exp $ */
+/* $NetBSD: ftp.c,v 1.122 2003/08/07 11:13:55 agc Exp $ */
/*-
* Copyright (c) 1996-2002 The NetBSD Foundation, Inc.
@@ -48,11 +48,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -103,7 +99,7 @@
#if 0
static char sccsid[] = "@(#)ftp.c 8.6 (Berkeley) 10/27/94";
#else
-__RCSID("$NetBSD: ftp.c,v 1.121 2003/07/31 07:06:41 lukem Exp $");
+__RCSID("$NetBSD: ftp.c,v 1.122 2003/08/07 11:13:55 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/ftp/ftp_var.h b/usr.bin/ftp/ftp_var.h
index ac7c87ae035..46c4b61396f 100644
--- a/usr.bin/ftp/ftp_var.h
+++ b/usr.bin/ftp/ftp_var.h
@@ -1,4 +1,4 @@
-/* $NetBSD: ftp_var.h,v 1.64 2003/01/21 16:08:07 jhawk Exp $ */
+/* $NetBSD: ftp_var.h,v 1.65 2003/08/07 11:13:56 agc Exp $ */
/*-
* Copyright (c) 1996-2003 The NetBSD Foundation, Inc.
@@ -48,11 +48,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/ftp/main.c b/usr.bin/ftp/main.c
index bc2b4009b65..be2940a1d0b 100644
--- a/usr.bin/ftp/main.c
+++ b/usr.bin/ftp/main.c
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.85 2003/07/26 20:34:13 salo Exp $ */
+/* $NetBSD: main.c,v 1.86 2003/08/07 11:13:56 agc Exp $ */
/*-
* Copyright (c) 1996-2002 The NetBSD Foundation, Inc.
@@ -48,11 +48,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -108,7 +104,7 @@ __COPYRIGHT("@(#) Copyright (c) 1985, 1989, 1993, 1994\n\
#if 0
static char sccsid[] = "@(#)main.c 8.6 (Berkeley) 10/9/94";
#else
-__RCSID("$NetBSD: main.c,v 1.85 2003/07/26 20:34:13 salo Exp $");
+__RCSID("$NetBSD: main.c,v 1.86 2003/08/07 11:13:56 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/ftp/ruserpass.c b/usr.bin/ftp/ruserpass.c
index a773086542f..9cb318a0909 100644
--- a/usr.bin/ftp/ruserpass.c
+++ b/usr.bin/ftp/ruserpass.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ruserpass.c,v 1.28 2000/11/15 00:11:04 lukem Exp $ */
+/* $NetBSD: ruserpass.c,v 1.29 2003/08/07 11:13:57 agc Exp $ */
/*
* Copyright (c) 1985, 1993, 1994
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)ruserpass.c 8.4 (Berkeley) 4/27/95";
#else
-__RCSID("$NetBSD: ruserpass.c,v 1.28 2000/11/15 00:11:04 lukem Exp $");
+__RCSID("$NetBSD: ruserpass.c,v 1.29 2003/08/07 11:13:57 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/ftp/util.c b/usr.bin/ftp/util.c
index c6485a8e570..a8111d5ea5b 100644
--- a/usr.bin/ftp/util.c
+++ b/usr.bin/ftp/util.c
@@ -1,4 +1,4 @@
-/* $NetBSD: util.c,v 1.113 2003/07/31 06:57:07 lukem Exp $ */
+/* $NetBSD: util.c,v 1.114 2003/08/07 11:13:57 agc Exp $ */
/*-
* Copyright (c) 1997-2003 The NetBSD Foundation, Inc.
@@ -52,11 +52,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -75,7 +71,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: util.c,v 1.113 2003/07/31 06:57:07 lukem Exp $");
+__RCSID("$NetBSD: util.c,v 1.114 2003/08/07 11:13:57 agc Exp $");
#endif /* not lint */
/*
diff --git a/usr.bin/gprof/PSD.doc/abstract.me b/usr.bin/gprof/PSD.doc/abstract.me
index 7eebfe62d41..6d2f09927c3 100644
--- a/usr.bin/gprof/PSD.doc/abstract.me
+++ b/usr.bin/gprof/PSD.doc/abstract.me
@@ -1,4 +1,4 @@
-.\" $NetBSD: abstract.me,v 1.2 1995/04/19 07:16:37 cgd Exp $
+.\" $NetBSD: abstract.me,v 1.3 2003/08/07 11:13:58 agc Exp $
.\"
.\" Copyright (c) 1982, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -11,11 +11,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/gprof/PSD.doc/gathering.me b/usr.bin/gprof/PSD.doc/gathering.me
index 835d8a9ef39..a07e301c29f 100644
--- a/usr.bin/gprof/PSD.doc/gathering.me
+++ b/usr.bin/gprof/PSD.doc/gathering.me
@@ -1,4 +1,4 @@
-.\" $NetBSD: gathering.me,v 1.2 1995/04/19 07:16:39 cgd Exp $
+.\" $NetBSD: gathering.me,v 1.3 2003/08/07 11:13:59 agc Exp $
.\"
.\" Copyright (c) 1982, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -11,11 +11,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/gprof/PSD.doc/header.me b/usr.bin/gprof/PSD.doc/header.me
index 4b4772e6fd6..d8531d09f84 100644
--- a/usr.bin/gprof/PSD.doc/header.me
+++ b/usr.bin/gprof/PSD.doc/header.me
@@ -1,4 +1,4 @@
-.\" $NetBSD: header.me,v 1.2 1995/04/19 07:16:41 cgd Exp $
+.\" $NetBSD: header.me,v 1.3 2003/08/07 11:13:59 agc Exp $
.\"
.\" Copyright (c) 1982, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -11,11 +11,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/gprof/PSD.doc/intro.me b/usr.bin/gprof/PSD.doc/intro.me
index 9428568debe..bcb391ed96a 100644
--- a/usr.bin/gprof/PSD.doc/intro.me
+++ b/usr.bin/gprof/PSD.doc/intro.me
@@ -1,4 +1,4 @@
-.\" $NetBSD: intro.me,v 1.2 1995/04/19 07:16:42 cgd Exp $
+.\" $NetBSD: intro.me,v 1.3 2003/08/07 11:13:59 agc Exp $
.\"
.\" Copyright (c) 1982, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -11,11 +11,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/gprof/PSD.doc/postp.me b/usr.bin/gprof/PSD.doc/postp.me
index 8587882da21..951cdeb757c 100644
--- a/usr.bin/gprof/PSD.doc/postp.me
+++ b/usr.bin/gprof/PSD.doc/postp.me
@@ -1,4 +1,4 @@
-.\" $NetBSD: postp.me,v 1.2 1995/04/19 07:16:44 cgd Exp $
+.\" $NetBSD: postp.me,v 1.3 2003/08/07 11:13:59 agc Exp $
.\"
.\" Copyright (c) 1982, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -11,11 +11,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/gprof/PSD.doc/postp1.pic b/usr.bin/gprof/PSD.doc/postp1.pic
index 7a776a725db..cb935f6cd00 100644
--- a/usr.bin/gprof/PSD.doc/postp1.pic
+++ b/usr.bin/gprof/PSD.doc/postp1.pic
@@ -1,4 +1,4 @@
-.\" $NetBSD: postp1.pic,v 1.2 1995/04/19 07:16:46 cgd Exp $
+.\" $NetBSD: postp1.pic,v 1.3 2003/08/07 11:14:00 agc Exp $
.\"
.\" Copyright (c) 1986, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -11,11 +11,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/gprof/PSD.doc/postp2.pic b/usr.bin/gprof/PSD.doc/postp2.pic
index 5d90291f357..6143bea5a41 100644
--- a/usr.bin/gprof/PSD.doc/postp2.pic
+++ b/usr.bin/gprof/PSD.doc/postp2.pic
@@ -1,4 +1,4 @@
-.\" $NetBSD: postp2.pic,v 1.2 1995/04/19 07:16:48 cgd Exp $
+.\" $NetBSD: postp2.pic,v 1.3 2003/08/07 11:14:00 agc Exp $
.\"
.\" Copyright (c) 1986, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -11,11 +11,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/gprof/PSD.doc/postp3.pic b/usr.bin/gprof/PSD.doc/postp3.pic
index 4a3ce97a62e..e1766db2a2f 100644
--- a/usr.bin/gprof/PSD.doc/postp3.pic
+++ b/usr.bin/gprof/PSD.doc/postp3.pic
@@ -1,4 +1,4 @@
-.\" $NetBSD: postp3.pic,v 1.2 1995/04/19 07:16:50 cgd Exp $
+.\" $NetBSD: postp3.pic,v 1.3 2003/08/07 11:14:00 agc Exp $
.\"
.\" Copyright (c) 1986, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -11,11 +11,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/gprof/PSD.doc/pres1.pic b/usr.bin/gprof/PSD.doc/pres1.pic
index 50f33f9a5a6..1c6aeb0694f 100644
--- a/usr.bin/gprof/PSD.doc/pres1.pic
+++ b/usr.bin/gprof/PSD.doc/pres1.pic
@@ -1,4 +1,4 @@
-.\" $NetBSD: pres1.pic,v 1.2 1995/04/19 07:16:52 cgd Exp $
+.\" $NetBSD: pres1.pic,v 1.3 2003/08/07 11:14:00 agc Exp $
.\"
.\" Copyright (c) 1986, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -11,11 +11,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/gprof/PSD.doc/pres2.pic b/usr.bin/gprof/PSD.doc/pres2.pic
index acb32c1e61e..746a27deef0 100644
--- a/usr.bin/gprof/PSD.doc/pres2.pic
+++ b/usr.bin/gprof/PSD.doc/pres2.pic
@@ -1,4 +1,4 @@
-.\" $NetBSD: pres2.pic,v 1.2 1995/04/19 07:16:53 cgd Exp $
+.\" $NetBSD: pres2.pic,v 1.3 2003/08/07 11:14:00 agc Exp $
.\"
.\" Copyright (c) 1986, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -11,11 +11,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/gprof/PSD.doc/present.me b/usr.bin/gprof/PSD.doc/present.me
index 04b6ab314f1..f1f6a8afd53 100644
--- a/usr.bin/gprof/PSD.doc/present.me
+++ b/usr.bin/gprof/PSD.doc/present.me
@@ -1,4 +1,4 @@
-.\" $NetBSD: present.me,v 1.2 1995/04/19 07:16:54 cgd Exp $
+.\" $NetBSD: present.me,v 1.3 2003/08/07 11:14:01 agc Exp $
.\"
.\" Copyright (c) 1982, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -11,11 +11,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/gprof/PSD.doc/profiling.me b/usr.bin/gprof/PSD.doc/profiling.me
index 13c375c602e..952324749b9 100644
--- a/usr.bin/gprof/PSD.doc/profiling.me
+++ b/usr.bin/gprof/PSD.doc/profiling.me
@@ -1,4 +1,4 @@
-.\" $NetBSD: profiling.me,v 1.2 1995/04/19 07:16:56 cgd Exp $
+.\" $NetBSD: profiling.me,v 1.3 2003/08/07 11:14:01 agc Exp $
.\"
.\" Copyright (c) 1982, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -11,11 +11,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/gprof/PSD.doc/refs.me b/usr.bin/gprof/PSD.doc/refs.me
index a027b01e559..01ef5ccd0d1 100644
--- a/usr.bin/gprof/PSD.doc/refs.me
+++ b/usr.bin/gprof/PSD.doc/refs.me
@@ -1,4 +1,4 @@
-.\" $NetBSD: refs.me,v 1.2 1995/04/19 07:16:58 cgd Exp $
+.\" $NetBSD: refs.me,v 1.3 2003/08/07 11:14:01 agc Exp $
.\"
.\" Copyright (c) 1982, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -11,11 +11,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/head/head.1 b/usr.bin/head/head.1
index 3da71cb4475..9cca125adf1 100644
--- a/usr.bin/head/head.1
+++ b/usr.bin/head/head.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: head.1,v 1.9 2002/02/08 01:36:24 ross Exp $
+.\" $NetBSD: head.1,v 1.10 2003/08/07 11:14:02 agc Exp $
.\"
.\" Copyright (c) 1980, 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -11,11 +11,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/head/head.c b/usr.bin/head/head.c
index be18dfcef02..687005e0b81 100644
--- a/usr.bin/head/head.c
+++ b/usr.bin/head/head.c
@@ -1,4 +1,4 @@
-/* $NetBSD: head.c,v 1.15 2003/04/18 03:21:01 lukem Exp $ */
+/* $NetBSD: head.c,v 1.16 2003/08/07 11:14:02 agc Exp $ */
/*
* Copyright (c) 1980, 1987, 1992, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -43,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 1987, 1992, 1993\n\
#if 0
static char sccsid[] = "@(#)head.c 8.2 (Berkeley) 5/4/95";
#else
-__RCSID("$NetBSD: head.c,v 1.15 2003/04/18 03:21:01 lukem Exp $");
+__RCSID("$NetBSD: head.c,v 1.16 2003/08/07 11:14:02 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/hexdump/conv.c b/usr.bin/hexdump/conv.c
index 031e6e37ecf..1d22faeb42f 100644
--- a/usr.bin/hexdump/conv.c
+++ b/usr.bin/hexdump/conv.c
@@ -1,4 +1,4 @@
-/* $NetBSD: conv.c,v 1.8 2003/03/12 18:26:32 augustss Exp $ */
+/* $NetBSD: conv.c,v 1.9 2003/08/07 11:14:02 agc Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)conv.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: conv.c,v 1.8 2003/03/12 18:26:32 augustss Exp $");
+__RCSID("$NetBSD: conv.c,v 1.9 2003/08/07 11:14:02 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/hexdump/display.c b/usr.bin/hexdump/display.c
index 10f13b5a0e3..676c870d472 100644
--- a/usr.bin/hexdump/display.c
+++ b/usr.bin/hexdump/display.c
@@ -1,4 +1,4 @@
-/* $NetBSD: display.c,v 1.13 2003/03/12 18:32:51 augustss Exp $ */
+/* $NetBSD: display.c,v 1.14 2003/08/07 11:14:03 agc Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)display.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: display.c,v 1.13 2003/03/12 18:32:51 augustss Exp $");
+__RCSID("$NetBSD: display.c,v 1.14 2003/08/07 11:14:03 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/hexdump/hexdump.1 b/usr.bin/hexdump/hexdump.1
index 7d17be609ee..001491ad383 100644
--- a/usr.bin/hexdump/hexdump.1
+++ b/usr.bin/hexdump/hexdump.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: hexdump.1,v 1.17 2003/06/30 19:12:33 wiz Exp $
+.\" $NetBSD: hexdump.1,v 1.18 2003/08/07 11:14:03 agc Exp $
.\"
.\" Copyright (c) 1989, 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -11,11 +11,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/hexdump/hexdump.c b/usr.bin/hexdump/hexdump.c
index ffe058ae7a1..64af05dc655 100644
--- a/usr.bin/hexdump/hexdump.c
+++ b/usr.bin/hexdump/hexdump.c
@@ -1,4 +1,4 @@
-/* $NetBSD: hexdump.c,v 1.9 2003/03/12 16:46:33 augustss Exp $ */
+/* $NetBSD: hexdump.c,v 1.10 2003/08/07 11:14:03 agc Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -43,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1989, 1993\n\
#if 0
static char sccsid[] = "@(#)hexdump.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: hexdump.c,v 1.9 2003/03/12 16:46:33 augustss Exp $");
+__RCSID("$NetBSD: hexdump.c,v 1.10 2003/08/07 11:14:03 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/hexdump/hexdump.h b/usr.bin/hexdump/hexdump.h
index 262c39800f7..1583539bdf2 100644
--- a/usr.bin/hexdump/hexdump.h
+++ b/usr.bin/hexdump/hexdump.h
@@ -1,4 +1,4 @@
-/* $NetBSD: hexdump.h,v 1.7 2001/12/07 15:14:29 bjh21 Exp $ */
+/* $NetBSD: hexdump.h,v 1.8 2003/08/07 11:14:04 agc Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/hexdump/hexsyntax.c b/usr.bin/hexdump/hexsyntax.c
index 0a81700fdf7..9474991241c 100644
--- a/usr.bin/hexdump/hexsyntax.c
+++ b/usr.bin/hexdump/hexsyntax.c
@@ -1,4 +1,4 @@
-/* $NetBSD: hexsyntax.c,v 1.9 2003/03/12 18:32:51 augustss Exp $ */
+/* $NetBSD: hexsyntax.c,v 1.10 2003/08/07 11:14:05 agc Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)hexsyntax.c 8.2 (Berkeley) 5/4/95";
#else
-__RCSID("$NetBSD: hexsyntax.c,v 1.9 2003/03/12 18:32:51 augustss Exp $");
+__RCSID("$NetBSD: hexsyntax.c,v 1.10 2003/08/07 11:14:05 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/hexdump/odsyntax.c b/usr.bin/hexdump/odsyntax.c
index e19ecc94ef4..1660fcb0718 100644
--- a/usr.bin/hexdump/odsyntax.c
+++ b/usr.bin/hexdump/odsyntax.c
@@ -1,4 +1,4 @@
-/* $NetBSD: odsyntax.c,v 1.17 2003/03/12 18:26:32 augustss Exp $ */
+/* $NetBSD: odsyntax.c,v 1.18 2003/08/07 11:14:05 agc Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)odsyntax.c 8.2 (Berkeley) 5/4/95";
#else
-__RCSID("$NetBSD: odsyntax.c,v 1.17 2003/03/12 18:26:32 augustss Exp $");
+__RCSID("$NetBSD: odsyntax.c,v 1.18 2003/08/07 11:14:05 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/hexdump/parse.c b/usr.bin/hexdump/parse.c
index 3f192dfb18c..1e43c819fc7 100644
--- a/usr.bin/hexdump/parse.c
+++ b/usr.bin/hexdump/parse.c
@@ -1,4 +1,4 @@
-/* $NetBSD: parse.c,v 1.14 2003/03/12 18:26:32 augustss Exp $ */
+/* $NetBSD: parse.c,v 1.15 2003/08/07 11:14:05 agc Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)parse.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: parse.c,v 1.14 2003/03/12 18:26:32 augustss Exp $");
+__RCSID("$NetBSD: parse.c,v 1.15 2003/08/07 11:14:05 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/id/groups.1 b/usr.bin/id/groups.1
index d5cb74e0ed3..f9154bb2771 100644
--- a/usr.bin/id/groups.1
+++ b/usr.bin/id/groups.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: groups.1,v 1.8 2002/02/08 01:36:25 ross Exp $
+.\" $NetBSD: groups.1,v 1.9 2003/08/07 11:14:06 agc Exp $
.\"
.\" Copyright (c) 1991, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -11,11 +11,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
@@ -32,7 +28,7 @@
.\" SUCH DAMAGE.
.\"
.\" from: @(#)groups.1 8.1 (Berkeley) 6/6/93
-.\" $NetBSD: groups.1,v 1.8 2002/02/08 01:36:25 ross Exp $
+.\" $NetBSD: groups.1,v 1.9 2003/08/07 11:14:06 agc Exp $
.\"
.Dd June 6, 1993
.Dt GROUPS 1
diff --git a/usr.bin/id/id.1 b/usr.bin/id/id.1
index 9bb90fd0cf5..2732328fd11 100644
--- a/usr.bin/id/id.1
+++ b/usr.bin/id/id.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: id.1,v 1.10 2003/02/25 10:35:43 wiz Exp $
+.\" $NetBSD: id.1,v 1.11 2003/08/07 11:14:06 agc Exp $
.\"
.\" Copyright (c) 1991, 1993, 1994
.\" The Regents of the University of California. All rights reserved.
@@ -14,11 +14,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/id/id.c b/usr.bin/id/id.c
index ea05edf1148..bbb5bfef047 100644
--- a/usr.bin/id/id.c
+++ b/usr.bin/id/id.c
@@ -10,11 +10,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@ __COPYRIGHT("@(#) Copyright (c) 1991, 1993\n\
#if 0
static char sccsid[] = "@(#)id.c 8.3 (Berkeley) 4/28/95";
#else
-__RCSID("$NetBSD: id.c,v 1.18 2001/02/19 23:03:47 cgd Exp $");
+__RCSID("$NetBSD: id.c,v 1.19 2003/08/07 11:14:07 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/id/whoami.1 b/usr.bin/id/whoami.1
index c4d53d4ccfe..bcb6e87a468 100644
--- a/usr.bin/id/whoami.1
+++ b/usr.bin/id/whoami.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: whoami.1,v 1.8 2002/02/08 01:36:25 ross Exp $
+.\" $NetBSD: whoami.1,v 1.9 2003/08/07 11:14:07 agc Exp $
.\"
.\" Copyright (c) 1991, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -11,11 +11,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
@@ -32,7 +28,7 @@
.\" SUCH DAMAGE.
.\"
.\" from: @(#)whoami.1 8.1 (Berkeley) 6/6/93
-.\" $NetBSD: whoami.1,v 1.8 2002/02/08 01:36:25 ross Exp $
+.\" $NetBSD: whoami.1,v 1.9 2003/08/07 11:14:07 agc Exp $
.\"
.Dd June 6, 1993
.Dt WHOAMI 1
diff --git a/usr.bin/indent/args.c b/usr.bin/indent/args.c
index a856fb2df20..0dcc9d98bb2 100644
--- a/usr.bin/indent/args.c
+++ b/usr.bin/indent/args.c
@@ -1,8 +1,35 @@
-/* $NetBSD: args.c,v 1.8 2003/07/14 09:44:00 itojun Exp $ */
+/* $NetBSD: args.c,v 1.9 2003/08/07 11:14:07 agc Exp $ */
/*
* Copyright (c) 1980, 1993
* The Regents of the University of California. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+/*
* Copyright (c) 1976 Board of Trustees of the University of Illinois.
* Copyright (c) 1985 Sun Microsystems, Inc.
* All rights reserved.
@@ -41,7 +68,7 @@
#if 0
static char sccsid[] = "@(#)args.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: args.c,v 1.8 2003/07/14 09:44:00 itojun Exp $");
+__RCSID("$NetBSD: args.c,v 1.9 2003/08/07 11:14:07 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/indent/indent.1 b/usr.bin/indent/indent.1
index 2c7bbc70de2..516c686778e 100644
--- a/usr.bin/indent/indent.1
+++ b/usr.bin/indent/indent.1
@@ -1,7 +1,32 @@
-.\" $NetBSD: indent.1,v 1.16 2003/02/25 10:35:44 wiz Exp $
+.\" $NetBSD: indent.1,v 1.17 2003/08/07 11:14:08 agc Exp $
.\"
.\" Copyright (c) 1980, 1990, 1993
.\" The Regents of the University of California. All rights reserved.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\" 1. Redistributions of source code must retain the above copyright
+.\" notice, this list of conditions and the following disclaimer.
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\" notice, this list of conditions and the following disclaimer in the
+.\" documentation and/or other materials provided with the distribution.
+.\" 3. Neither the name of the University nor the names of its contributors
+.\" may be used to endorse or promote products derived from this software
+.\" without specific prior written permission.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
.\" Copyright (c) 1985 Sun Microsystems, Inc.
.\" Copyright (c) 1976 Board of Trustees of the University of Illinois.
.\" All rights reserved.
diff --git a/usr.bin/indent/indent.c b/usr.bin/indent/indent.c
index a82946abcee..3180d7eeeda 100644
--- a/usr.bin/indent/indent.c
+++ b/usr.bin/indent/indent.c
@@ -1,8 +1,35 @@
-/* $NetBSD: indent.c,v 1.14 2003/06/19 15:45:22 christos Exp $ */
+/* $NetBSD: indent.c,v 1.15 2003/08/07 11:14:08 agc Exp $ */
/*
* Copyright (c) 1980, 1993
* The Regents of the University of California. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+/*
* Copyright (c) 1976 Board of Trustees of the University of Illinois.
* Copyright (c) 1985 Sun Microsystems, Inc.
* All rights reserved.
@@ -48,7 +75,7 @@ __COPYRIGHT("@(#) Copyright (c) 1985 Sun Microsystems, Inc.\n\
#if 0
static char sccsid[] = "@(#)indent.c 5.17 (Berkeley) 6/7/93";
#else
-__RCSID("$NetBSD: indent.c,v 1.14 2003/06/19 15:45:22 christos Exp $");
+__RCSID("$NetBSD: indent.c,v 1.15 2003/08/07 11:14:08 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/indent/indent_codes.h b/usr.bin/indent/indent_codes.h
index 52312dc2ae4..d65c3210d4e 100644
--- a/usr.bin/indent/indent_codes.h
+++ b/usr.bin/indent/indent_codes.h
@@ -1,11 +1,40 @@
-/* $NetBSD: indent_codes.h,v 1.4 1997/10/18 16:04:36 mrg Exp $ */
+/* $NetBSD: indent_codes.h,v 1.5 2003/08/07 11:14:08 agc Exp $ */
+
+/*
+ * Copyright (c) 1980, 1993
+ * The Regents of the University of California. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * from: @(#)indent_codes.h 8.1 (Berkeley) 6/6/93
+ */
/*
* Copyright (c) 1985 Sun Microsystems, Inc.
* Copyright (c) 1976 Board of Trustees of the University of Illinois.
* All rights reserved.
- * Copyright (c) 1980, 1993
- * The Regents of the University of California. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/usr.bin/indent/indent_globs.h b/usr.bin/indent/indent_globs.h
index d9a9ffeb057..dfb9bff11bf 100644
--- a/usr.bin/indent/indent_globs.h
+++ b/usr.bin/indent/indent_globs.h
@@ -1,11 +1,40 @@
-/* $NetBSD: indent_globs.h,v 1.7 2002/05/26 22:53:38 wiz Exp $ */
+/* $NetBSD: indent_globs.h,v 1.8 2003/08/07 11:14:08 agc Exp $ */
+
+/*
+ * Copyright (c) 1980, 1993
+ * The Regents of the University of California. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * from: @(#)indent_globs.h 8.1 (Berkeley) 6/6/93
+ */
/*
* Copyright (c) 1985 Sun Microsystems, Inc.
* Copyright (c) 1976 Board of Trustees of the University of Illinois.
* All rights reserved.
- * Copyright (c) 1980, 1993
- * The Regents of the University of California. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/usr.bin/indent/io.c b/usr.bin/indent/io.c
index d875fb3b7bd..cda954bd949 100644
--- a/usr.bin/indent/io.c
+++ b/usr.bin/indent/io.c
@@ -1,8 +1,35 @@
-/* $NetBSD: io.c,v 1.11 2002/05/26 22:53:38 wiz Exp $ */
+/* $NetBSD: io.c,v 1.12 2003/08/07 11:14:09 agc Exp $ */
/*
* Copyright (c) 1980, 1993
* The Regents of the University of California. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+/*
* Copyright (c) 1976 Board of Trustees of the University of Illinois.
* Copyright (c) 1985 Sun Microsystems, Inc.
* All rights reserved.
@@ -41,7 +68,7 @@
#if 0
static char sccsid[] = "@(#)io.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: io.c,v 1.11 2002/05/26 22:53:38 wiz Exp $");
+__RCSID("$NetBSD: io.c,v 1.12 2003/08/07 11:14:09 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/indent/lexi.c b/usr.bin/indent/lexi.c
index c712c82bf5d..4792a56f2d9 100644
--- a/usr.bin/indent/lexi.c
+++ b/usr.bin/indent/lexi.c
@@ -1,8 +1,35 @@
-/* $NetBSD: lexi.c,v 1.11 2002/05/26 22:53:38 wiz Exp $ */
+/* $NetBSD: lexi.c,v 1.12 2003/08/07 11:14:09 agc Exp $ */
/*
* Copyright (c) 1980, 1993
* The Regents of the University of California. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+/*
* Copyright (c) 1976 Board of Trustees of the University of Illinois.
* Copyright (c) 1985 Sun Microsystems, Inc.
* All rights reserved.
@@ -41,7 +68,7 @@
#if 0
static char sccsid[] = "@(#)lexi.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: lexi.c,v 1.11 2002/05/26 22:53:38 wiz Exp $");
+__RCSID("$NetBSD: lexi.c,v 1.12 2003/08/07 11:14:09 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/indent/parse.c b/usr.bin/indent/parse.c
index 0ad706b8e3c..1f30c71b1d6 100644
--- a/usr.bin/indent/parse.c
+++ b/usr.bin/indent/parse.c
@@ -1,8 +1,35 @@
-/* $NetBSD: parse.c,v 1.6 2002/05/26 22:53:38 wiz Exp $ */
+/* $NetBSD: parse.c,v 1.7 2003/08/07 11:14:09 agc Exp $ */
/*
* Copyright (c) 1980, 1993
* The Regents of the University of California. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+/*
* Copyright (c) 1976 Board of Trustees of the University of Illinois.
* Copyright (c) 1985 Sun Microsystems, Inc.
* All rights reserved.
@@ -41,7 +68,7 @@
#if 0
static char sccsid[] = "@(#)parse.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: parse.c,v 1.6 2002/05/26 22:53:38 wiz Exp $");
+__RCSID("$NetBSD: parse.c,v 1.7 2003/08/07 11:14:09 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/indent/pr_comment.c b/usr.bin/indent/pr_comment.c
index e5d021788c7..10f8d38c83d 100644
--- a/usr.bin/indent/pr_comment.c
+++ b/usr.bin/indent/pr_comment.c
@@ -1,8 +1,35 @@
-/* $NetBSD: pr_comment.c,v 1.8 2003/06/19 15:45:22 christos Exp $ */
+/* $NetBSD: pr_comment.c,v 1.9 2003/08/07 11:14:09 agc Exp $ */
/*
* Copyright (c) 1980, 1993
* The Regents of the University of California. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+/*
* Copyright (c) 1976 Board of Trustees of the University of Illinois.
* Copyright (c) 1985 Sun Microsystems, Inc.
* All rights reserved.
@@ -41,7 +68,7 @@
#if 0
static char sccsid[] = "@(#)pr_comment.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: pr_comment.c,v 1.8 2003/06/19 15:45:22 christos Exp $");
+__RCSID("$NetBSD: pr_comment.c,v 1.9 2003/08/07 11:14:09 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/join/join.1 b/usr.bin/join/join.1
index b683e7db5d3..97a41a016b8 100644
--- a/usr.bin/join/join.1
+++ b/usr.bin/join/join.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: join.1,v 1.11 2003/03/31 01:55:23 perry Exp $
+.\" $NetBSD: join.1,v 1.12 2003/08/07 11:14:10 agc Exp $
.\"
.\" Copyright (c) 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -14,11 +14,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
@@ -35,7 +31,7 @@
.\" SUCH DAMAGE.
.\"
.\" from: @(#)join.1 8.3 (Berkeley) 4/28/95
-.\" $NetBSD: join.1,v 1.11 2003/03/31 01:55:23 perry Exp $
+.\" $NetBSD: join.1,v 1.12 2003/08/07 11:14:10 agc Exp $
.\"
.Dd April 28, 1995
.Dt JOIN 1
diff --git a/usr.bin/join/join.c b/usr.bin/join/join.c
index 0e8926dc151..a4115e5e3cc 100644
--- a/usr.bin/join/join.c
+++ b/usr.bin/join/join.c
@@ -1,4 +1,4 @@
-/* $NetBSD: join.c,v 1.22 2003/04/24 08:22:05 wiz Exp $ */
+/* $NetBSD: join.c,v 1.23 2003/08/07 11:14:10 agc Exp $ */
/*-
* Copyright (c) 1991 The Regents of the University of California.
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -48,7 +44,7 @@ __COPYRIGHT(
#if 0
static char sccsid[] = "from: @(#)join.c 5.1 (Berkeley) 11/18/91";
#else
-__RCSID("$NetBSD: join.c,v 1.22 2003/04/24 08:22:05 wiz Exp $");
+__RCSID("$NetBSD: join.c,v 1.23 2003/08/07 11:14:10 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/jot/jot.1 b/usr.bin/jot/jot.1
index a86f33d4a5c..2c76b0a7f9e 100644
--- a/usr.bin/jot/jot.1
+++ b/usr.bin/jot/jot.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: jot.1,v 1.6 2003/02/25 10:35:45 wiz Exp $
+.\" $NetBSD: jot.1,v 1.7 2003/08/07 11:14:11 agc Exp $
.\"
.\" Copyright (c) 1993
.\" The Regents of the University of California. All rights reserved.
@@ -11,11 +11,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/jot/jot.c b/usr.bin/jot/jot.c
index ccb54e5b922..f033d89668e 100644
--- a/usr.bin/jot/jot.c
+++ b/usr.bin/jot/jot.c
@@ -1,4 +1,4 @@
-/* $NetBSD: jot.c,v 1.9 2002/09/27 20:54:51 atatat Exp $ */
+/* $NetBSD: jot.c,v 1.10 2003/08/07 11:14:12 agc Exp $ */
/*-
* Copyright (c) 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -43,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1993\n\
#if 0
static char sccsid[] = "@(#)jot.c 8.1 (Berkeley) 6/6/93";
#endif
-__RCSID("$NetBSD: jot.c,v 1.9 2002/09/27 20:54:51 atatat Exp $");
+__RCSID("$NetBSD: jot.c,v 1.10 2003/08/07 11:14:12 agc Exp $");
#endif /* not lint */
/*
diff --git a/usr.bin/kdump/kdump.1 b/usr.bin/kdump/kdump.1
index 3394ff3cf05..b58715780dd 100644
--- a/usr.bin/kdump/kdump.1
+++ b/usr.bin/kdump/kdump.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: kdump.1,v 1.21 2003/07/17 09:05:13 dsl Exp $
+.\" $NetBSD: kdump.1,v 1.22 2003/08/07 11:14:12 agc Exp $
.\"
.\" Copyright (c) 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -11,11 +11,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/kdump/kdump.c b/usr.bin/kdump/kdump.c
index 1c3e8b3a3f4..66137a6e2b0 100644
--- a/usr.bin/kdump/kdump.c
+++ b/usr.bin/kdump/kdump.c
@@ -1,4 +1,4 @@
-/* $NetBSD: kdump.c,v 1.58 2003/07/17 09:05:13 dsl Exp $ */
+/* $NetBSD: kdump.c,v 1.59 2003/08/07 11:14:13 agc Exp $ */
/*-
* Copyright (c) 1988, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -43,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1988, 1993\n\
#if 0
static char sccsid[] = "@(#)kdump.c 8.4 (Berkeley) 4/28/95";
#else
-__RCSID("$NetBSD: kdump.c,v 1.58 2003/07/17 09:05:13 dsl Exp $");
+__RCSID("$NetBSD: kdump.c,v 1.59 2003/08/07 11:14:13 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/kdump/setemul.c b/usr.bin/kdump/setemul.c
index 8732054c8d5..c1bf7649d2e 100644
--- a/usr.bin/kdump/setemul.c
+++ b/usr.bin/kdump/setemul.c
@@ -1,4 +1,4 @@
-/* $NetBSD: setemul.c,v 1.14 2002/11/15 19:58:05 manu Exp $ */
+/* $NetBSD: setemul.c,v 1.15 2003/08/07 11:14:13 agc Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -50,11 +50,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -73,7 +69,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: setemul.c,v 1.14 2002/11/15 19:58:05 manu Exp $");
+__RCSID("$NetBSD: setemul.c,v 1.15 2003/08/07 11:14:13 agc Exp $");
#endif /* not lint */
#include <sys/param.h>
diff --git a/usr.bin/kdump/setemul.h b/usr.bin/kdump/setemul.h
index 2c771c30f4a..440537826a8 100644
--- a/usr.bin/kdump/setemul.h
+++ b/usr.bin/kdump/setemul.h
@@ -1,4 +1,4 @@
-/* $NetBSD: setemul.h,v 1.7 2002/11/15 19:58:05 manu Exp $ */
+/* $NetBSD: setemul.h,v 1.8 2003/08/07 11:14:13 agc Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -50,11 +50,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/ktrace/ktrace.1 b/usr.bin/ktrace/ktrace.1
index a0c3b6f4b3e..5a84c47c706 100644
--- a/usr.bin/ktrace/ktrace.1
+++ b/usr.bin/ktrace/ktrace.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: ktrace.1,v 1.23 2003/07/24 18:21:31 wiz Exp $
+.\" $NetBSD: ktrace.1,v 1.24 2003/08/07 11:14:14 agc Exp $
.\"
.\" Copyright (c) 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -11,11 +11,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/ktrace/ktrace.c b/usr.bin/ktrace/ktrace.c
index 1510f2e27a9..f37a25bfc4d 100644
--- a/usr.bin/ktrace/ktrace.c
+++ b/usr.bin/ktrace/ktrace.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ktrace.c,v 1.27 2003/07/17 09:05:12 dsl Exp $ */
+/* $NetBSD: ktrace.c,v 1.28 2003/08/07 11:14:14 agc Exp $ */
/*-
* Copyright (c) 1988, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -43,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1988, 1993\n\
#if 0
static char sccsid[] = "@(#)ktrace.c 8.2 (Berkeley) 4/28/95";
#else
-__RCSID("$NetBSD: ktrace.c,v 1.27 2003/07/17 09:05:12 dsl Exp $");
+__RCSID("$NetBSD: ktrace.c,v 1.28 2003/08/07 11:14:14 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/ktrace/ktrace.h b/usr.bin/ktrace/ktrace.h
index 731992de2a2..bb43d18f90e 100644
--- a/usr.bin/ktrace/ktrace.h
+++ b/usr.bin/ktrace/ktrace.h
@@ -1,4 +1,4 @@
-/* $NetBSD: ktrace.h,v 1.12 2003/07/17 09:05:12 dsl Exp $ */
+/* $NetBSD: ktrace.h,v 1.13 2003/08/07 11:14:14 agc Exp $ */
/*-
* Copyright (c) 1988, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/ktrace/subr.c b/usr.bin/ktrace/subr.c
index 88098eab2fc..a6f4372efc3 100644
--- a/usr.bin/ktrace/subr.c
+++ b/usr.bin/ktrace/subr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: subr.c,v 1.10 2003/07/17 09:05:12 dsl Exp $ */
+/* $NetBSD: subr.c,v 1.11 2003/08/07 11:14:14 agc Exp $ */
/*-
* Copyright (c) 1988, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)subr.c 8.2 (Berkeley) 4/28/95";
#else
-__RCSID("$NetBSD: subr.c,v 1.10 2003/07/17 09:05:12 dsl Exp $");
+__RCSID("$NetBSD: subr.c,v 1.11 2003/08/07 11:14:14 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/ktruss/dump.c b/usr.bin/ktruss/dump.c
index 56f58f6e481..fb224ccc159 100644
--- a/usr.bin/ktruss/dump.c
+++ b/usr.bin/ktruss/dump.c
@@ -1,4 +1,4 @@
-/* $NetBSD: dump.c,v 1.14 2003/03/16 09:59:09 jdolecek Exp $ */
+/* $NetBSD: dump.c,v 1.15 2003/08/07 11:14:15 agc Exp $ */
/*-
* Copyright (c) 1988, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -43,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1988, 1993\n\
#if 0
static char sccsid[] = "@(#)kdump.c 8.4 (Berkeley) 4/28/95";
#endif
-__RCSID("$NetBSD: dump.c,v 1.14 2003/03/16 09:59:09 jdolecek Exp $");
+__RCSID("$NetBSD: dump.c,v 1.15 2003/08/07 11:14:15 agc Exp $");
#endif /* not lint */
#include <sys/param.h>
diff --git a/usr.bin/lam/lam.1 b/usr.bin/lam/lam.1
index f64d0a718ff..a99da83f71c 100644
--- a/usr.bin/lam/lam.1
+++ b/usr.bin/lam/lam.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: lam.1,v 1.4 2002/02/08 01:36:25 ross Exp $
+.\" $NetBSD: lam.1,v 1.5 2003/08/07 11:14:16 agc Exp $
.\"
.\" Copyright (c) 1993
.\" The Regents of the University of California. All rights reserved.
@@ -11,11 +11,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/lam/lam.c b/usr.bin/lam/lam.c
index e77a87272d9..ae30ae17cc9 100644
--- a/usr.bin/lam/lam.c
+++ b/usr.bin/lam/lam.c
@@ -1,4 +1,4 @@
-/* $NetBSD: lam.c,v 1.3 1997/10/19 03:42:18 lukem Exp $ */
+/* $NetBSD: lam.c,v 1.4 2003/08/07 11:14:16 agc Exp $ */
/*-
* Copyright (c) 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -43,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1993\n\
#if 0
static char sccsid[] = "@(#)lam.c 8.1 (Berkeley) 6/6/93";
#endif
-__RCSID("$NetBSD: lam.c,v 1.3 1997/10/19 03:42:18 lukem Exp $");
+__RCSID("$NetBSD: lam.c,v 1.4 2003/08/07 11:14:16 agc Exp $");
#endif /* not lint */
/*
diff --git a/usr.bin/last/last.1 b/usr.bin/last/last.1
index 2f6e7f6bc58..e8e1209b790 100644
--- a/usr.bin/last/last.1
+++ b/usr.bin/last/last.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: last.1,v 1.11 2003/03/03 07:17:35 wiz Exp $
+.\" $NetBSD: last.1,v 1.12 2003/08/07 11:14:17 agc Exp $
.\"
.\" Copyright (c) 1980, 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -11,11 +11,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/last/last.c b/usr.bin/last/last.c
index b9277a638ff..c8f82e16f04 100644
--- a/usr.bin/last/last.c
+++ b/usr.bin/last/last.c
@@ -1,4 +1,4 @@
-/* $NetBSD: last.c,v 1.20 2003/07/14 12:02:00 itojun Exp $ */
+/* $NetBSD: last.c,v 1.21 2003/08/07 11:14:17 agc Exp $ */
/*
* Copyright (c) 1987, 1993, 1994
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -44,7 +40,7 @@ __COPYRIGHT(
#if 0
static char sccsid[] = "@(#)last.c 8.2 (Berkeley) 4/2/94";
#endif
-__RCSID("$NetBSD: last.c,v 1.20 2003/07/14 12:02:00 itojun Exp $");
+__RCSID("$NetBSD: last.c,v 1.21 2003/08/07 11:14:17 agc Exp $");
#endif /* not lint */
#include <sys/param.h>
diff --git a/usr.bin/last/want.c b/usr.bin/last/want.c
index f39e001f532..65e1023051d 100644
--- a/usr.bin/last/want.c
+++ b/usr.bin/last/want.c
@@ -1,4 +1,4 @@
-/* $NetBSD: want.c,v 1.1 2003/02/17 15:08:57 christos Exp $ */
+/* $NetBSD: want.c,v 1.2 2003/08/07 11:14:18 agc Exp $ */
/*
* Copyright (c) 1987, 1993, 1994
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/lastcomm/lastcomm.1 b/usr.bin/lastcomm/lastcomm.1
index f9b712259a9..93b1f9c413e 100644
--- a/usr.bin/lastcomm/lastcomm.1
+++ b/usr.bin/lastcomm/lastcomm.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: lastcomm.1,v 1.9 2001/04/04 09:37:19 wiz Exp $
+.\" $NetBSD: lastcomm.1,v 1.10 2003/08/07 11:14:18 agc Exp $
.\"
.\" Copyright (c) 1980, 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -11,11 +11,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/lastcomm/lastcomm.c b/usr.bin/lastcomm/lastcomm.c
index 242d9591e2d..2689c6ee274 100644
--- a/usr.bin/lastcomm/lastcomm.c
+++ b/usr.bin/lastcomm/lastcomm.c
@@ -1,4 +1,4 @@
-/* $NetBSD: lastcomm.c,v 1.14 1998/04/02 10:22:03 kleink Exp $ */
+/* $NetBSD: lastcomm.c,v 1.15 2003/08/07 11:14:18 agc Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -43,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 1993\n\
#if 0
static char sccsid[] = "@(#)lastcomm.c 8.2 (Berkeley) 4/29/95";
#endif
-__RCSID("$NetBSD: lastcomm.c,v 1.14 1998/04/02 10:22:03 kleink Exp $");
+__RCSID("$NetBSD: lastcomm.c,v 1.15 2003/08/07 11:14:18 agc Exp $");
#endif /* not lint */
#include <sys/param.h>
diff --git a/usr.bin/lastcomm/pathnames.h b/usr.bin/lastcomm/pathnames.h
index 963d27942a7..6ca75d87192 100644
--- a/usr.bin/lastcomm/pathnames.h
+++ b/usr.bin/lastcomm/pathnames.h
@@ -1,4 +1,4 @@
-/* $NetBSD: pathnames.h,v 1.3 1994/12/22 01:07:05 jtc Exp $ */
+/* $NetBSD: pathnames.h,v 1.4 2003/08/07 11:14:18 agc Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/leave/leave.1 b/usr.bin/leave/leave.1
index ab1f851cbd3..d5036f6dda2 100644
--- a/usr.bin/leave/leave.1
+++ b/usr.bin/leave/leave.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: leave.1,v 1.9 2002/01/21 11:42:55 wiz Exp $
+.\" $NetBSD: leave.1,v 1.10 2003/08/07 11:14:19 agc Exp $
.\"
.\" Copyright (c) 1980, 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -11,11 +11,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/leave/leave.c b/usr.bin/leave/leave.c
index 0c561fcef31..eaca4dab945 100644
--- a/usr.bin/leave/leave.c
+++ b/usr.bin/leave/leave.c
@@ -1,4 +1,4 @@
-/* $NetBSD: leave.c,v 1.11 2003/04/02 19:43:02 christos Exp $ */
+/* $NetBSD: leave.c,v 1.12 2003/08/07 11:14:19 agc Exp $ */
/*
* Copyright (c) 1980, 1988, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -43,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 1988, 1993\n\
#if 0
static char sccsid[] = "@(#)leave.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: leave.c,v 1.11 2003/04/02 19:43:02 christos Exp $");
+__RCSID("$NetBSD: leave.c,v 1.12 2003/08/07 11:14:19 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/locate/bigram/locate.bigram.c b/usr.bin/locate/bigram/locate.bigram.c
index 06d4d9e344a..116b2f57c99 100644
--- a/usr.bin/locate/bigram/locate.bigram.c
+++ b/usr.bin/locate/bigram/locate.bigram.c
@@ -1,4 +1,4 @@
-/* $NetBSD: locate.bigram.c,v 1.9 2000/05/06 10:26:45 mycroft Exp $ */
+/* $NetBSD: locate.bigram.c,v 1.10 2003/08/07 11:14:20 agc Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -46,7 +42,7 @@ __COPYRIGHT("@(#) Copyright (c) 1989, 1993\n\
#if 0
static char sccsid[] = "@(#)locate.bigram.c 8.2 (Berkeley) 4/28/95";
#endif
-__RCSID("$NetBSD: locate.bigram.c,v 1.9 2000/05/06 10:26:45 mycroft Exp $");
+__RCSID("$NetBSD: locate.bigram.c,v 1.10 2003/08/07 11:14:20 agc Exp $");
#endif /* not lint */
/*
diff --git a/usr.bin/locate/code/locate.code.c b/usr.bin/locate/code/locate.code.c
index 900e8a1f357..cc8431833ad 100644
--- a/usr.bin/locate/code/locate.code.c
+++ b/usr.bin/locate/code/locate.code.c
@@ -1,4 +1,4 @@
-/* $NetBSD: locate.code.c,v 1.8 2000/05/06 10:02:06 mycroft Exp $ */
+/* $NetBSD: locate.code.c,v 1.9 2003/08/07 11:14:20 agc Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -46,7 +42,7 @@ __COPYRIGHT("@(#) Copyright (c) 1989, 1993\n\
#if 0
static char sccsid[] = "@(#)locate.code.c 8.4 (Berkeley) 5/4/95";
#endif
-__RCSID("$NetBSD: locate.code.c,v 1.8 2000/05/06 10:02:06 mycroft Exp $");
+__RCSID("$NetBSD: locate.code.c,v 1.9 2003/08/07 11:14:20 agc Exp $");
#endif /* not lint */
/*
diff --git a/usr.bin/locate/locate/locate.1 b/usr.bin/locate/locate/locate.1
index a71768c815f..9a292317afa 100644
--- a/usr.bin/locate/locate/locate.1
+++ b/usr.bin/locate/locate/locate.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: locate.1,v 1.13 2003/04/05 17:57:47 wiz Exp $
+.\" $NetBSD: locate.1,v 1.14 2003/08/07 11:14:21 agc Exp $
.\"
.\" Copyright (c) 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -11,11 +11,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/locate/locate/locate.c b/usr.bin/locate/locate/locate.c
index cf1faeaaaaa..e8c68a46e46 100644
--- a/usr.bin/locate/locate/locate.c
+++ b/usr.bin/locate/locate/locate.c
@@ -1,4 +1,4 @@
-/* $NetBSD: locate.c,v 1.12 2003/04/07 04:00:59 christos Exp $ */
+/* $NetBSD: locate.c,v 1.13 2003/08/07 11:14:21 agc Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -46,7 +42,7 @@ __COPYRIGHT("@(#) Copyright (c) 1989, 1993\n\
#if 0
static char sccsid[] = "@(#)locate.c 8.1 (Berkeley) 6/6/93";
#endif
-__RCSID("$NetBSD: locate.c,v 1.12 2003/04/07 04:00:59 christos Exp $");
+__RCSID("$NetBSD: locate.c,v 1.13 2003/08/07 11:14:21 agc Exp $");
#endif /* not lint */
/*
diff --git a/usr.bin/locate/locate/locate.h b/usr.bin/locate/locate/locate.h
index 467c2cbcdea..9f65ea99972 100644
--- a/usr.bin/locate/locate/locate.h
+++ b/usr.bin/locate/locate/locate.h
@@ -1,4 +1,4 @@
-/* $NetBSD: locate.h,v 1.3 1994/12/22 06:17:48 jtc Exp $ */
+/* $NetBSD: locate.h,v 1.4 2003/08/07 11:14:21 agc Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/locate/locate/pathnames.h b/usr.bin/locate/locate/pathnames.h
index 8021ffecb3b..19ee742c242 100644
--- a/usr.bin/locate/locate/pathnames.h
+++ b/usr.bin/locate/locate/pathnames.h
@@ -1,4 +1,4 @@
-/* $NetBSD: pathnames.h,v 1.3 1994/12/22 06:17:49 jtc Exp $ */
+/* $NetBSD: pathnames.h,v 1.4 2003/08/07 11:14:22 agc Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/lock/lock.1 b/usr.bin/lock/lock.1
index 81db651b8c8..e42dc7c74d9 100644
--- a/usr.bin/lock/lock.1
+++ b/usr.bin/lock/lock.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: lock.1,v 1.8 2002/09/26 01:11:33 wiz Exp $
+.\" $NetBSD: lock.1,v 1.9 2003/08/07 11:14:22 agc Exp $
.\"
.\" Copyright (c) 1987, 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -11,11 +11,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/lock/lock.c b/usr.bin/lock/lock.c
index 53eded07b5b..37d10d40340 100644
--- a/usr.bin/lock/lock.c
+++ b/usr.bin/lock/lock.c
@@ -1,4 +1,4 @@
-/* $NetBSD: lock.c,v 1.20 2002/11/16 15:59:28 itojun Exp $ */
+/* $NetBSD: lock.c,v 1.21 2003/08/07 11:14:22 agc Exp $ */
/*
* Copyright (c) 1980, 1987, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -46,7 +42,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 1987, 1993\n\
#if 0
static char sccsid[] = "@(#)lock.c 8.1 (Berkeley) 6/6/93";
#endif
-__RCSID("$NetBSD: lock.c,v 1.20 2002/11/16 15:59:28 itojun Exp $");
+__RCSID("$NetBSD: lock.c,v 1.21 2003/08/07 11:14:22 agc Exp $");
#endif /* not lint */
/*
diff --git a/usr.bin/logger/logger.1 b/usr.bin/logger/logger.1
index e3b543bec3e..d6b18d68782 100644
--- a/usr.bin/logger/logger.1
+++ b/usr.bin/logger/logger.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: logger.1,v 1.8 2002/02/08 01:36:27 ross Exp $
+.\" $NetBSD: logger.1,v 1.9 2003/08/07 11:14:23 agc Exp $
.\"
.\" Copyright (c) 1983, 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -11,11 +11,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/logger/logger.c b/usr.bin/logger/logger.c
index 833f68c1f99..56f0f71d8a7 100644
--- a/usr.bin/logger/logger.c
+++ b/usr.bin/logger/logger.c
@@ -1,4 +1,4 @@
-/* $NetBSD: logger.c,v 1.8 2001/02/20 23:52:26 cgd Exp $ */
+/* $NetBSD: logger.c,v 1.9 2003/08/07 11:14:23 agc Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -43,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1983, 1993\n\
#if 0
static char sccsid[] = "@(#)logger.c 8.1 (Berkeley) 6/6/93";
#endif
-__RCSID("$NetBSD: logger.c,v 1.8 2001/02/20 23:52:26 cgd Exp $");
+__RCSID("$NetBSD: logger.c,v 1.9 2003/08/07 11:14:23 agc Exp $");
#endif /* not lint */
#include <errno.h>
diff --git a/usr.bin/login/k5login.c b/usr.bin/login/k5login.c
index bcf7cf031c3..f2898de6bbf 100644
--- a/usr.bin/login/k5login.c
+++ b/usr.bin/login/k5login.c
@@ -1,4 +1,4 @@
-/* $NetBSD: k5login.c,v 1.23 2003/05/15 00:52:53 itojun Exp $ */
+/* $NetBSD: k5login.c,v 1.24 2003/08/07 11:14:24 agc Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -55,7 +51,7 @@
#if 0
static char sccsid[] = "@(#)klogin.c 5.11 (Berkeley) 7/12/92";
#endif
-__RCSID("$NetBSD: k5login.c,v 1.23 2003/05/15 00:52:53 itojun Exp $");
+__RCSID("$NetBSD: k5login.c,v 1.24 2003/08/07 11:14:24 agc Exp $");
#endif /* not lint */
#ifdef KERBEROS5
diff --git a/usr.bin/login/klogin.c b/usr.bin/login/klogin.c
index 9514c4bb0c6..25a686ece64 100644
--- a/usr.bin/login/klogin.c
+++ b/usr.bin/login/klogin.c
@@ -1,4 +1,4 @@
-/* $NetBSD: klogin.c,v 1.18 2003/07/23 20:31:18 itojun Exp $ */
+/* $NetBSD: klogin.c,v 1.19 2003/08/07 11:14:24 agc Exp $ */
/*-
* Copyright (c) 1990, 1993, 1994
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)klogin.c 8.3 (Berkeley) 4/2/94";
#endif
-__RCSID("$NetBSD: klogin.c,v 1.18 2003/07/23 20:31:18 itojun Exp $");
+__RCSID("$NetBSD: klogin.c,v 1.19 2003/08/07 11:14:24 agc Exp $");
#endif /* not lint */
#ifdef KERBEROS
diff --git a/usr.bin/login/login.1 b/usr.bin/login/login.1
index 0008ce7ef49..c217228b89b 100644
--- a/usr.bin/login/login.1
+++ b/usr.bin/login/login.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: login.1,v 1.21 2003/03/29 18:05:29 perry Exp $
+.\" $NetBSD: login.1,v 1.22 2003/08/07 11:14:25 agc Exp $
.\"
.\" Copyright (c) 1980, 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -11,11 +11,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/login/login.c b/usr.bin/login/login.c
index 315d1dbaa37..7b49ae5ba16 100644
--- a/usr.bin/login/login.c
+++ b/usr.bin/login/login.c
@@ -1,4 +1,4 @@
-/* $NetBSD: login.c,v 1.72 2003/01/01 00:00:14 mycroft Exp $ */
+/* $NetBSD: login.c,v 1.73 2003/08/07 11:14:25 agc Exp $ */
/*-
* Copyright (c) 1980, 1987, 1988, 1991, 1993, 1994
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -44,7 +40,7 @@ __COPYRIGHT(
#if 0
static char sccsid[] = "@(#)login.c 8.4 (Berkeley) 4/2/94";
#endif
-__RCSID("$NetBSD: login.c,v 1.72 2003/01/01 00:00:14 mycroft Exp $");
+__RCSID("$NetBSD: login.c,v 1.73 2003/08/07 11:14:25 agc Exp $");
#endif /* not lint */
/*
diff --git a/usr.bin/login/pathnames.h b/usr.bin/login/pathnames.h
index 8b70c9d29d8..e95e5cbe013 100644
--- a/usr.bin/login/pathnames.h
+++ b/usr.bin/login/pathnames.h
@@ -1,4 +1,4 @@
-/* $NetBSD: pathnames.h,v 1.5 1997/08/16 13:50:47 lukem Exp $ */
+/* $NetBSD: pathnames.h,v 1.6 2003/08/07 11:14:26 agc Exp $ */
/*-
* Copyright (c) 1989, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/logname/logname.1 b/usr.bin/logname/logname.1
index 0cd8ee630b8..8c57897b455 100644
--- a/usr.bin/logname/logname.1
+++ b/usr.bin/logname/logname.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: logname.1,v 1.11 2002/02/08 01:36:27 ross Exp $
+.\" $NetBSD: logname.1,v 1.12 2003/08/07 11:14:26 agc Exp $
.\"
.\" Copyright (c) 1991, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -14,11 +14,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/logname/logname.c b/usr.bin/logname/logname.c
index ed63ffece44..c5de23b33e2 100644
--- a/usr.bin/logname/logname.c
+++ b/usr.bin/logname/logname.c
@@ -1,4 +1,4 @@
-/* $NetBSD: logname.c,v 1.7 1997/10/19 04:20:06 lukem Exp $ */
+/* $NetBSD: logname.c,v 1.8 2003/08/07 11:14:26 agc Exp $ */
/*-
* Copyright (c) 1991, 1993, 1994
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -43,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1991, 1993, 1994\n\
#if 0
static char sccsid[] = "@(#)logname.c 8.2 (Berkeley) 4/3/94";
#endif
-__RCSID("$NetBSD: logname.c,v 1.7 1997/10/19 04:20:06 lukem Exp $");
+__RCSID("$NetBSD: logname.c,v 1.8 2003/08/07 11:14:26 agc Exp $");
#endif /* not lint */
#include <stdio.h>
diff --git a/usr.bin/look/look.1 b/usr.bin/look/look.1
index f02863b8714..29da4b36a5c 100644
--- a/usr.bin/look/look.1
+++ b/usr.bin/look/look.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: look.1,v 1.7 2002/02/08 01:36:27 ross Exp $
+.\" $NetBSD: look.1,v 1.8 2003/08/07 11:14:27 agc Exp $
.\"
.\" Copyright (c) 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -11,11 +11,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/look/look.c b/usr.bin/look/look.c
index b2454f0b1e8..e62406d76d4 100644
--- a/usr.bin/look/look.c
+++ b/usr.bin/look/look.c
@@ -1,4 +1,4 @@
-/* $NetBSD: look.c,v 1.10 1998/02/20 09:26:00 mycroft Exp $ */
+/* $NetBSD: look.c,v 1.11 2003/08/07 11:14:28 agc Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -46,7 +42,7 @@ __COPYRIGHT("@(#) Copyright (c) 1991, 1993\n\
#if 0
static char sccsid[] = "@(#)look.c 8.2 (Berkeley) 5/4/95";
#endif
-__RCSID("$NetBSD: look.c,v 1.10 1998/02/20 09:26:00 mycroft Exp $");
+__RCSID("$NetBSD: look.c,v 1.11 2003/08/07 11:14:28 agc Exp $");
#endif /* not lint */
/*
diff --git a/usr.bin/look/pathnames.h b/usr.bin/look/pathnames.h
index 25ec1a56ca7..6d61fb3abe4 100644
--- a/usr.bin/look/pathnames.h
+++ b/usr.bin/look/pathnames.h
@@ -1,4 +1,4 @@
-/* $NetBSD: pathnames.h,v 1.3 1994/12/23 01:11:03 jtc Exp $ */
+/* $NetBSD: pathnames.h,v 1.4 2003/08/07 11:14:28 agc Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/lorder/lorder.1 b/usr.bin/lorder/lorder.1
index 45fe0e61519..5a051ce64c9 100644
--- a/usr.bin/lorder/lorder.1
+++ b/usr.bin/lorder/lorder.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: lorder.1,v 1.6 1997/10/19 04:21:49 lukem Exp $
+.\" $NetBSD: lorder.1,v 1.7 2003/08/07 11:14:29 agc Exp $
.\"
.\" Copyright (c) 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -11,11 +11,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/m4/eval.c b/usr.bin/m4/eval.c
index 63f7bb41431..701ba752091 100644
--- a/usr.bin/m4/eval.c
+++ b/usr.bin/m4/eval.c
@@ -1,4 +1,4 @@
-/* $NetBSD: eval.c,v 1.16 2002/01/31 19:36:47 tv Exp $ */
+/* $NetBSD: eval.c,v 1.17 2003/08/07 11:14:30 agc Exp $ */
/* $OpenBSD: eval.c,v 1.41 2001/10/10 23:25:31 espie Exp $ */
/*
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -42,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)eval.c 8.2 (Berkeley) 4/27/95";
#else
-__RCSID("$NetBSD: eval.c,v 1.16 2002/01/31 19:36:47 tv Exp $");
+__RCSID("$NetBSD: eval.c,v 1.17 2003/08/07 11:14:30 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/m4/expr.c b/usr.bin/m4/expr.c
index e58af802e70..e661d0f96b9 100644
--- a/usr.bin/m4/expr.c
+++ b/usr.bin/m4/expr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: expr.c,v 1.14 2002/01/31 19:36:47 tv Exp $ */
+/* $NetBSD: expr.c,v 1.15 2003/08/07 11:14:31 agc Exp $ */
/* $OpenBSD: expr.c,v 1.11 2000/01/11 14:00:57 espie Exp $ */
/*
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -42,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)expr.c 8.2 (Berkeley) 4/29/95";
#else
-__RCSID("$NetBSD: expr.c,v 1.14 2002/01/31 19:36:47 tv Exp $");
+__RCSID("$NetBSD: expr.c,v 1.15 2003/08/07 11:14:31 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/m4/extern.h b/usr.bin/m4/extern.h
index 769b53ee285..271805427c9 100644
--- a/usr.bin/m4/extern.h
+++ b/usr.bin/m4/extern.h
@@ -1,4 +1,4 @@
-/* $NetBSD: extern.h,v 1.10 2002/01/31 22:43:55 tv Exp $ */
+/* $NetBSD: extern.h,v 1.11 2003/08/07 11:14:31 agc Exp $ */
/* $OpenBSD: extern.h,v 1.28 2001/10/10 18:12:00 espie Exp $ */
/*-
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/m4/look.c b/usr.bin/m4/look.c
index b5f87515361..8d8bcfc726e 100644
--- a/usr.bin/m4/look.c
+++ b/usr.bin/m4/look.c
@@ -1,4 +1,4 @@
-/* $NetBSD: look.c,v 1.8 2002/01/31 19:36:47 tv Exp $ */
+/* $NetBSD: look.c,v 1.9 2003/08/07 11:14:32 agc Exp $ */
/* $OpenBSD: look.c,v 1.8 2001/09/17 08:11:13 espie Exp $ */
/*
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -42,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)look.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: look.c,v 1.8 2002/01/31 19:36:47 tv Exp $");
+__RCSID("$NetBSD: look.c,v 1.9 2003/08/07 11:14:32 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/m4/main.c b/usr.bin/m4/main.c
index d2648de162e..c38df97aa59 100644
--- a/usr.bin/m4/main.c
+++ b/usr.bin/m4/main.c
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.33 2002/05/02 14:24:06 wiz Exp $ */
+/* $NetBSD: main.c,v 1.34 2003/08/07 11:14:32 agc Exp $ */
/* $OpenBSD: main.c,v 1.51 2001/10/06 10:52:25 espie Exp $ */
/*-
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -47,7 +43,7 @@ __COPYRIGHT("@(#) Copyright (c) 1989, 1993\n\
#if 0
static char sccsid[] = "@(#)main.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: main.c,v 1.33 2002/05/02 14:24:06 wiz Exp $");
+__RCSID("$NetBSD: main.c,v 1.34 2003/08/07 11:14:32 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/m4/mdef.h b/usr.bin/m4/mdef.h
index d353c98162a..740e89afddf 100644
--- a/usr.bin/m4/mdef.h
+++ b/usr.bin/m4/mdef.h
@@ -1,4 +1,4 @@
-/* $NetBSD: mdef.h,v 1.11 2001/11/14 06:16:09 tv Exp $ */
+/* $NetBSD: mdef.h,v 1.12 2003/08/07 11:14:33 agc Exp $ */
/* $OpenBSD: mdef.h,v 1.21 2001/09/27 11:40:33 espie Exp $ */
/*
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/m4/misc.c b/usr.bin/m4/misc.c
index 8180126c0f2..52125468398 100644
--- a/usr.bin/m4/misc.c
+++ b/usr.bin/m4/misc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: misc.c,v 1.15 2002/01/31 19:36:47 tv Exp $ */
+/* $NetBSD: misc.c,v 1.16 2003/08/07 11:14:33 agc Exp $ */
/* $OpenBSD: misc.c,v 1.25 2001/10/10 11:17:37 espie Exp $ */
/*
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -42,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)misc.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: misc.c,v 1.15 2002/01/31 19:36:47 tv Exp $");
+__RCSID("$NetBSD: misc.c,v 1.16 2003/08/07 11:14:33 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/m4/pathnames.h b/usr.bin/m4/pathnames.h
index 7e2869c8480..a9f39106905 100644
--- a/usr.bin/m4/pathnames.h
+++ b/usr.bin/m4/pathnames.h
@@ -1,4 +1,4 @@
-/* $NetBSD: pathnames.h,v 1.11 2001/11/14 06:16:09 tv Exp $ */
+/* $NetBSD: pathnames.h,v 1.12 2003/08/07 11:14:33 agc Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/m4/stdd.h b/usr.bin/m4/stdd.h
index 082801fe3c4..0cbd681a379 100644
--- a/usr.bin/m4/stdd.h
+++ b/usr.bin/m4/stdd.h
@@ -1,4 +1,4 @@
-/* $NetBSD: stdd.h,v 1.3 2000/10/18 17:23:18 jdolecek Exp $ */
+/* $NetBSD: stdd.h,v 1.4 2003/08/07 11:14:34 agc Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/machine/machine.1 b/usr.bin/machine/machine.1
index f6d0556bbdb..2ea78e9d852 100644
--- a/usr.bin/machine/machine.1
+++ b/usr.bin/machine/machine.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: machine.1,v 1.6 2003/05/24 23:37:00 wiz Exp $
+.\" $NetBSD: machine.1,v 1.7 2003/08/07 11:14:34 agc Exp $
.\"
.\" Copyright (c) 1980, 1990 The Regents of the University of California.
.\" All rights reserved.
@@ -11,11 +11,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
@@ -32,7 +28,7 @@
.\" SUCH DAMAGE.
.\"
.\" from: @(#)machine.1 5.5 (Berkeley) 7/26/91
-.\" $NetBSD: machine.1,v 1.6 2003/05/24 23:37:00 wiz Exp $
+.\" $NetBSD: machine.1,v 1.7 2003/08/07 11:14:34 agc Exp $
.\"
.Dd May 24, 2003
.Dt MACHINE 1
diff --git a/usr.bin/mail/USD.doc/mail0.nr b/usr.bin/mail/USD.doc/mail0.nr
index b03c7ced716..2a40512a7c7 100644
--- a/usr.bin/mail/USD.doc/mail0.nr
+++ b/usr.bin/mail/USD.doc/mail0.nr
@@ -1,4 +1,4 @@
-.\" $NetBSD: mail0.nr,v 1.2 1998/01/09 08:05:50 perry Exp $
+.\" $NetBSD: mail0.nr,v 1.3 2003/08/07 11:14:43 agc Exp $
.\"
.\" Copyright (c) 1980, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -11,11 +11,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/mail/USD.doc/mail1.nr b/usr.bin/mail/USD.doc/mail1.nr
index dac1a359bf1..58e3c6170c6 100644
--- a/usr.bin/mail/USD.doc/mail1.nr
+++ b/usr.bin/mail/USD.doc/mail1.nr
@@ -1,4 +1,4 @@
-.\" $NetBSD: mail1.nr,v 1.3 1998/01/09 08:05:52 perry Exp $
+.\" $NetBSD: mail1.nr,v 1.4 2003/08/07 11:14:44 agc Exp $
.\"
.\" Copyright (c) 1980, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -11,11 +11,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/mail/USD.doc/mail2.nr b/usr.bin/mail/USD.doc/mail2.nr
index 0df1a6dc70d..8f9525cc104 100644
--- a/usr.bin/mail/USD.doc/mail2.nr
+++ b/usr.bin/mail/USD.doc/mail2.nr
@@ -1,4 +1,4 @@
-.\" $NetBSD: mail2.nr,v 1.3 1998/01/09 08:05:53 perry Exp $
+.\" $NetBSD: mail2.nr,v 1.4 2003/08/07 11:14:44 agc Exp $
.\"
.\" Copyright (c) 1980, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -11,11 +11,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/mail/USD.doc/mail3.nr b/usr.bin/mail/USD.doc/mail3.nr
index ac2e04a7146..78f15b7f314 100644
--- a/usr.bin/mail/USD.doc/mail3.nr
+++ b/usr.bin/mail/USD.doc/mail3.nr
@@ -1,4 +1,4 @@
-.\" $NetBSD: mail3.nr,v 1.2 1998/01/09 08:05:54 perry Exp $
+.\" $NetBSD: mail3.nr,v 1.3 2003/08/07 11:14:44 agc Exp $
.\"
.\" Copyright (c) 1980, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -11,11 +11,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/mail/USD.doc/mail4.nr b/usr.bin/mail/USD.doc/mail4.nr
index 132c9c72fd3..3ba766414a7 100644
--- a/usr.bin/mail/USD.doc/mail4.nr
+++ b/usr.bin/mail/USD.doc/mail4.nr
@@ -1,4 +1,4 @@
-.\" $NetBSD: mail4.nr,v 1.3 1998/01/09 08:05:55 perry Exp $
+.\" $NetBSD: mail4.nr,v 1.4 2003/08/07 11:14:44 agc Exp $
.\"
.\" Copyright (c) 1980, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -11,11 +11,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/mail/USD.doc/mail5.nr b/usr.bin/mail/USD.doc/mail5.nr
index 72286d6ab2f..54d574ead6f 100644
--- a/usr.bin/mail/USD.doc/mail5.nr
+++ b/usr.bin/mail/USD.doc/mail5.nr
@@ -1,4 +1,4 @@
-.\" $NetBSD: mail5.nr,v 1.4 1998/01/09 08:05:57 perry Exp $
+.\" $NetBSD: mail5.nr,v 1.5 2003/08/07 11:14:45 agc Exp $
.\"
.\" Copyright (c) 1980, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -11,11 +11,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/mail/USD.doc/mail6.nr b/usr.bin/mail/USD.doc/mail6.nr
index 30e3d123345..ded374ebf05 100644
--- a/usr.bin/mail/USD.doc/mail6.nr
+++ b/usr.bin/mail/USD.doc/mail6.nr
@@ -1,4 +1,4 @@
-.\" $NetBSD: mail6.nr,v 1.5 2000/03/13 23:22:52 soren Exp $
+.\" $NetBSD: mail6.nr,v 1.6 2003/08/07 11:14:45 agc Exp $
.\"
.\" Copyright (c) 1980, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -11,11 +11,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/mail/USD.doc/mail7.nr b/usr.bin/mail/USD.doc/mail7.nr
index 723588e085c..52ac1c55e39 100644
--- a/usr.bin/mail/USD.doc/mail7.nr
+++ b/usr.bin/mail/USD.doc/mail7.nr
@@ -1,4 +1,4 @@
-.\" $NetBSD: mail7.nr,v 1.2 1998/01/09 08:05:59 perry Exp $
+.\" $NetBSD: mail7.nr,v 1.3 2003/08/07 11:14:45 agc Exp $
.\"
.\" Copyright (c) 1980, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -11,11 +11,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/mail/USD.doc/mail8.nr b/usr.bin/mail/USD.doc/mail8.nr
index 69903d914ee..189c9e00256 100644
--- a/usr.bin/mail/USD.doc/mail8.nr
+++ b/usr.bin/mail/USD.doc/mail8.nr
@@ -1,4 +1,4 @@
-.\" $NetBSD: mail8.nr,v 1.4 1998/01/09 08:06:00 perry Exp $
+.\" $NetBSD: mail8.nr,v 1.5 2003/08/07 11:14:45 agc Exp $
.\"
.\" Copyright (c) 1980, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -11,11 +11,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/mail/USD.doc/mail9.nr b/usr.bin/mail/USD.doc/mail9.nr
index 600a3849544..dbe5b615d69 100644
--- a/usr.bin/mail/USD.doc/mail9.nr
+++ b/usr.bin/mail/USD.doc/mail9.nr
@@ -1,4 +1,4 @@
-.\" $NetBSD: mail9.nr,v 1.3 1998/01/09 08:06:01 perry Exp $
+.\" $NetBSD: mail9.nr,v 1.4 2003/08/07 11:14:46 agc Exp $
.\"
.\" Copyright (c) 1980, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -11,11 +11,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/mail/USD.doc/maila.nr b/usr.bin/mail/USD.doc/maila.nr
index 81199eac427..cabbe13e70c 100644
--- a/usr.bin/mail/USD.doc/maila.nr
+++ b/usr.bin/mail/USD.doc/maila.nr
@@ -1,4 +1,4 @@
-.\" $NetBSD: maila.nr,v 1.2 1998/01/09 08:06:02 perry Exp $
+.\" $NetBSD: maila.nr,v 1.3 2003/08/07 11:14:46 agc Exp $
.\"
.\" Copyright (c) 1980, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -11,11 +11,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/mail/cmd1.c b/usr.bin/mail/cmd1.c
index 2c08da4f7b1..d05aa366ce6 100644
--- a/usr.bin/mail/cmd1.c
+++ b/usr.bin/mail/cmd1.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cmd1.c,v 1.20 2003/03/29 21:41:04 christos Exp $ */
+/* $NetBSD: cmd1.c,v 1.21 2003/08/07 11:14:35 agc Exp $ */
/*-
* Copyright (c) 1980, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)cmd1.c 8.2 (Berkeley) 4/20/95";
#else
-__RCSID("$NetBSD: cmd1.c,v 1.20 2003/03/29 21:41:04 christos Exp $");
+__RCSID("$NetBSD: cmd1.c,v 1.21 2003/08/07 11:14:35 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/mail/cmd2.c b/usr.bin/mail/cmd2.c
index cac23048e9f..2189eb998a8 100644
--- a/usr.bin/mail/cmd2.c
+++ b/usr.bin/mail/cmd2.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cmd2.c,v 1.16 2002/03/29 15:10:02 ross Exp $ */
+/* $NetBSD: cmd2.c,v 1.17 2003/08/07 11:14:36 agc Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)cmd2.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: cmd2.c,v 1.16 2002/03/29 15:10:02 ross Exp $");
+__RCSID("$NetBSD: cmd2.c,v 1.17 2003/08/07 11:14:36 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/mail/cmd3.c b/usr.bin/mail/cmd3.c
index f2ad2bb179c..fc66b0465c3 100644
--- a/usr.bin/mail/cmd3.c
+++ b/usr.bin/mail/cmd3.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cmd3.c,v 1.20 2003/03/29 21:41:04 christos Exp $ */
+/* $NetBSD: cmd3.c,v 1.21 2003/08/07 11:14:36 agc Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)cmd3.c 8.2 (Berkeley) 4/20/95";
#else
-__RCSID("$NetBSD: cmd3.c,v 1.20 2003/03/29 21:41:04 christos Exp $");
+__RCSID("$NetBSD: cmd3.c,v 1.21 2003/08/07 11:14:36 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/mail/cmdtab.c b/usr.bin/mail/cmdtab.c
index e9f19460dcf..85802e5decb 100644
--- a/usr.bin/mail/cmdtab.c
+++ b/usr.bin/mail/cmdtab.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cmdtab.c,v 1.9 2002/03/29 15:10:02 ross Exp $ */
+/* $NetBSD: cmdtab.c,v 1.10 2003/08/07 11:14:36 agc Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)cmdtab.c 8.2 (Berkeley) 4/20/95";
#else
-__RCSID("$NetBSD: cmdtab.c,v 1.9 2002/03/29 15:10:02 ross Exp $");
+__RCSID("$NetBSD: cmdtab.c,v 1.10 2003/08/07 11:14:36 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/mail/collect.c b/usr.bin/mail/collect.c
index 30319eb12a5..226862aacfb 100644
--- a/usr.bin/mail/collect.c
+++ b/usr.bin/mail/collect.c
@@ -1,4 +1,4 @@
-/* $NetBSD: collect.c,v 1.29 2002/03/08 02:05:25 wiz Exp $ */
+/* $NetBSD: collect.c,v 1.30 2003/08/07 11:14:36 agc Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)collect.c 8.2 (Berkeley) 4/19/94";
#else
-__RCSID("$NetBSD: collect.c,v 1.29 2002/03/08 02:05:25 wiz Exp $");
+__RCSID("$NetBSD: collect.c,v 1.30 2003/08/07 11:14:36 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/mail/def.h b/usr.bin/mail/def.h
index 7edeee2f919..af9b521d2b1 100644
--- a/usr.bin/mail/def.h
+++ b/usr.bin/mail/def.h
@@ -1,4 +1,4 @@
-/* $NetBSD: def.h,v 1.15 2002/03/29 15:07:52 ross Exp $ */
+/* $NetBSD: def.h,v 1.16 2003/08/07 11:14:37 agc Exp $ */
/*
* Copyright (c) 1980, 1993
* The Regents of the University of California. All rights reserved.
@@ -11,11 +11,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -32,7 +28,7 @@
* SUCH DAMAGE.
*
* @(#)def.h 8.4 (Berkeley) 4/20/95
- * $NetBSD: def.h,v 1.15 2002/03/29 15:07:52 ross Exp $
+ * $NetBSD: def.h,v 1.16 2003/08/07 11:14:37 agc Exp $
*/
/*
diff --git a/usr.bin/mail/edit.c b/usr.bin/mail/edit.c
index 12111234b81..c841b3f2f71 100644
--- a/usr.bin/mail/edit.c
+++ b/usr.bin/mail/edit.c
@@ -1,4 +1,4 @@
-/* $NetBSD: edit.c,v 1.17 2003/07/14 20:49:14 christos Exp $ */
+/* $NetBSD: edit.c,v 1.18 2003/08/07 11:14:37 agc Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)edit.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: edit.c,v 1.17 2003/07/14 20:49:14 christos Exp $");
+__RCSID("$NetBSD: edit.c,v 1.18 2003/08/07 11:14:37 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/mail/extern.h b/usr.bin/mail/extern.h
index 983c20f1040..7b341d99503 100644
--- a/usr.bin/mail/extern.h
+++ b/usr.bin/mail/extern.h
@@ -1,4 +1,4 @@
-/* $NetBSD: extern.h,v 1.17 2003/03/29 21:41:04 christos Exp $ */
+/* $NetBSD: extern.h,v 1.18 2003/08/07 11:14:37 agc Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -33,7 +29,7 @@
* SUCH DAMAGE.
*
* @(#)extern.h 8.2 (Berkeley) 4/20/95
- * $NetBSD: extern.h,v 1.17 2003/03/29 21:41:04 christos Exp $
+ * $NetBSD: extern.h,v 1.18 2003/08/07 11:14:37 agc Exp $
*/
struct name;
diff --git a/usr.bin/mail/fio.c b/usr.bin/mail/fio.c
index bc4b946fe13..191c632f71b 100644
--- a/usr.bin/mail/fio.c
+++ b/usr.bin/mail/fio.c
@@ -1,4 +1,4 @@
-/* $NetBSD: fio.c,v 1.21 2002/03/29 15:07:52 ross Exp $ */
+/* $NetBSD: fio.c,v 1.22 2003/08/07 11:14:37 agc Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)fio.c 8.2 (Berkeley) 4/20/95";
#else
-__RCSID("$NetBSD: fio.c,v 1.21 2002/03/29 15:07:52 ross Exp $");
+__RCSID("$NetBSD: fio.c,v 1.22 2003/08/07 11:14:37 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/mail/getname.c b/usr.bin/mail/getname.c
index 152841d5d56..f6ef72b9b63 100644
--- a/usr.bin/mail/getname.c
+++ b/usr.bin/mail/getname.c
@@ -1,4 +1,4 @@
-/* $NetBSD: getname.c,v 1.8 2002/03/04 03:07:26 wiz Exp $ */
+/* $NetBSD: getname.c,v 1.9 2003/08/07 11:14:38 agc Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)getname.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: getname.c,v 1.8 2002/03/04 03:07:26 wiz Exp $");
+__RCSID("$NetBSD: getname.c,v 1.9 2003/08/07 11:14:38 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/mail/glob.h b/usr.bin/mail/glob.h
index be789a86c0e..64135b2c23f 100644
--- a/usr.bin/mail/glob.h
+++ b/usr.bin/mail/glob.h
@@ -1,4 +1,4 @@
-/* $NetBSD: glob.h,v 1.5 1998/10/08 17:36:55 wsanchez Exp $ */
+/* $NetBSD: glob.h,v 1.6 2003/08/07 11:14:38 agc Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -33,7 +29,7 @@
* SUCH DAMAGE.
*
* from: @(#)glob.h 8.1 (Berkeley) 6/6/93
- * $NetBSD: glob.h,v 1.5 1998/10/08 17:36:55 wsanchez Exp $
+ * $NetBSD: glob.h,v 1.6 2003/08/07 11:14:38 agc Exp $
*/
/*
diff --git a/usr.bin/mail/head.c b/usr.bin/mail/head.c
index c4e23ab0e8d..cddfa848dc2 100644
--- a/usr.bin/mail/head.c
+++ b/usr.bin/mail/head.c
@@ -1,4 +1,4 @@
-/* $NetBSD: head.c,v 1.11 2002/03/04 03:07:26 wiz Exp $ */
+/* $NetBSD: head.c,v 1.12 2003/08/07 11:14:38 agc Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)head.c 8.2 (Berkeley) 4/20/95";
#else
-__RCSID("$NetBSD: head.c,v 1.11 2002/03/04 03:07:26 wiz Exp $");
+__RCSID("$NetBSD: head.c,v 1.12 2003/08/07 11:14:38 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/mail/lex.c b/usr.bin/mail/lex.c
index b51f18539a5..4a3b50845e7 100644
--- a/usr.bin/mail/lex.c
+++ b/usr.bin/mail/lex.c
@@ -1,4 +1,4 @@
-/* $NetBSD: lex.c,v 1.22 2002/03/05 21:29:30 wiz Exp $ */
+/* $NetBSD: lex.c,v 1.23 2003/08/07 11:14:39 agc Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)lex.c 8.2 (Berkeley) 4/20/95";
#else
-__RCSID("$NetBSD: lex.c,v 1.22 2002/03/05 21:29:30 wiz Exp $");
+__RCSID("$NetBSD: lex.c,v 1.23 2003/08/07 11:14:39 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/mail/list.c b/usr.bin/mail/list.c
index d0a6289528d..ba2481d7514 100644
--- a/usr.bin/mail/list.c
+++ b/usr.bin/mail/list.c
@@ -1,4 +1,4 @@
-/* $NetBSD: list.c,v 1.12 2002/03/04 03:07:26 wiz Exp $ */
+/* $NetBSD: list.c,v 1.13 2003/08/07 11:14:39 agc Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)list.c 8.4 (Berkeley) 5/1/95";
#else
-__RCSID("$NetBSD: list.c,v 1.12 2002/03/04 03:07:26 wiz Exp $");
+__RCSID("$NetBSD: list.c,v 1.13 2003/08/07 11:14:39 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/mail/mail.1 b/usr.bin/mail/mail.1
index 8de1721f75f..2f2f662652c 100644
--- a/usr.bin/mail/mail.1
+++ b/usr.bin/mail/mail.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: mail.1,v 1.25 2003/06/26 16:48:20 wiz Exp $
+.\" $NetBSD: mail.1,v 1.26 2003/08/07 11:14:39 agc Exp $
.\"
.\" Copyright (c) 1980, 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -11,11 +11,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/mail/main.c b/usr.bin/mail/main.c
index a5e78439ca5..021cac725a2 100644
--- a/usr.bin/mail/main.c
+++ b/usr.bin/mail/main.c
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.17 2002/03/05 21:29:30 wiz Exp $ */
+/* $NetBSD: main.c,v 1.18 2003/08/07 11:14:40 agc Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -43,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 1993\n\
#if 0
static char sccsid[] = "@(#)main.c 8.2 (Berkeley) 4/20/95";
#else
-__RCSID("$NetBSD: main.c,v 1.17 2002/03/05 21:29:30 wiz Exp $");
+__RCSID("$NetBSD: main.c,v 1.18 2003/08/07 11:14:40 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/mail/names.c b/usr.bin/mail/names.c
index abbb4077109..1b547791bb0 100644
--- a/usr.bin/mail/names.c
+++ b/usr.bin/mail/names.c
@@ -1,4 +1,4 @@
-/* $NetBSD: names.c,v 1.16 2002/03/06 13:45:51 wiz Exp $ */
+/* $NetBSD: names.c,v 1.17 2003/08/07 11:14:40 agc Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)names.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: names.c,v 1.16 2002/03/06 13:45:51 wiz Exp $");
+__RCSID("$NetBSD: names.c,v 1.17 2003/08/07 11:14:40 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/mail/pathnames.h b/usr.bin/mail/pathnames.h
index d4f2af329a3..7109b1d018c 100644
--- a/usr.bin/mail/pathnames.h
+++ b/usr.bin/mail/pathnames.h
@@ -1,4 +1,4 @@
-/* $NetBSD: pathnames.h,v 1.4 1996/06/08 19:48:34 christos Exp $ */
+/* $NetBSD: pathnames.h,v 1.5 2003/08/07 11:14:40 agc Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -33,7 +29,7 @@
* SUCH DAMAGE.
*
* @(#)pathnames.h 8.1 (Berkeley) 6/6/93
- * $NetBSD: pathnames.h,v 1.4 1996/06/08 19:48:34 christos Exp $
+ * $NetBSD: pathnames.h,v 1.5 2003/08/07 11:14:40 agc Exp $
*/
#include <paths.h>
diff --git a/usr.bin/mail/popen.c b/usr.bin/mail/popen.c
index 20dddafc020..33d6d1082a5 100644
--- a/usr.bin/mail/popen.c
+++ b/usr.bin/mail/popen.c
@@ -1,4 +1,4 @@
-/* $NetBSD: popen.c,v 1.16 2003/03/29 21:41:04 christos Exp $ */
+/* $NetBSD: popen.c,v 1.17 2003/08/07 11:14:40 agc Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)popen.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: popen.c,v 1.16 2003/03/29 21:41:04 christos Exp $");
+__RCSID("$NetBSD: popen.c,v 1.17 2003/08/07 11:14:40 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/mail/quit.c b/usr.bin/mail/quit.c
index 1690ae8de54..bcf92387aa4 100644
--- a/usr.bin/mail/quit.c
+++ b/usr.bin/mail/quit.c
@@ -1,4 +1,4 @@
-/* $NetBSD: quit.c,v 1.18 2002/03/05 21:18:15 wiz Exp $ */
+/* $NetBSD: quit.c,v 1.19 2003/08/07 11:14:41 agc Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)quit.c 8.2 (Berkeley) 4/28/95";
#else
-__RCSID("$NetBSD: quit.c,v 1.18 2002/03/05 21:18:15 wiz Exp $");
+__RCSID("$NetBSD: quit.c,v 1.19 2003/08/07 11:14:41 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/mail/rcv.h b/usr.bin/mail/rcv.h
index 372a71fc47f..04f8eb7b25b 100644
--- a/usr.bin/mail/rcv.h
+++ b/usr.bin/mail/rcv.h
@@ -1,4 +1,4 @@
-/* $NetBSD: rcv.h,v 1.4 1996/06/08 19:48:38 christos Exp $ */
+/* $NetBSD: rcv.h,v 1.5 2003/08/07 11:14:41 agc Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -33,7 +29,7 @@
* SUCH DAMAGE.
*
* @(#)rcv.h 8.1 (Berkeley) 6/6/93
- * $NetBSD: rcv.h,v 1.4 1996/06/08 19:48:38 christos Exp $
+ * $NetBSD: rcv.h,v 1.5 2003/08/07 11:14:41 agc Exp $
*/
/*
diff --git a/usr.bin/mail/send.c b/usr.bin/mail/send.c
index fe8df987208..75f0800bf21 100644
--- a/usr.bin/mail/send.c
+++ b/usr.bin/mail/send.c
@@ -1,4 +1,4 @@
-/* $NetBSD: send.c,v 1.20 2002/03/06 17:36:44 wiz Exp $ */
+/* $NetBSD: send.c,v 1.21 2003/08/07 11:14:41 agc Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)send.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: send.c,v 1.20 2002/03/06 17:36:44 wiz Exp $");
+__RCSID("$NetBSD: send.c,v 1.21 2003/08/07 11:14:41 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/mail/strings.c b/usr.bin/mail/strings.c
index 0577f3ca640..2246d066caa 100644
--- a/usr.bin/mail/strings.c
+++ b/usr.bin/mail/strings.c
@@ -1,4 +1,4 @@
-/* $NetBSD: strings.c,v 1.9 2002/03/04 03:07:27 wiz Exp $ */
+/* $NetBSD: strings.c,v 1.10 2003/08/07 11:14:41 agc Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)strings.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: strings.c,v 1.9 2002/03/04 03:07:27 wiz Exp $");
+__RCSID("$NetBSD: strings.c,v 1.10 2003/08/07 11:14:41 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/mail/support.c b/usr.bin/mail/support.c
index 0b52c35346a..ade5f8baa48 100644
--- a/usr.bin/mail/support.c
+++ b/usr.bin/mail/support.c
@@ -1,4 +1,4 @@
-/* $NetBSD: support.c,v 1.9 2002/03/05 21:29:30 wiz Exp $ */
+/* $NetBSD: support.c,v 1.10 2003/08/07 11:14:42 agc Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)aux.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: support.c,v 1.9 2002/03/05 21:29:30 wiz Exp $");
+__RCSID("$NetBSD: support.c,v 1.10 2003/08/07 11:14:42 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/mail/temp.c b/usr.bin/mail/temp.c
index 4ec32384c8d..96f32cb58da 100644
--- a/usr.bin/mail/temp.c
+++ b/usr.bin/mail/temp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: temp.c,v 1.15 2002/03/06 17:36:44 wiz Exp $ */
+/* $NetBSD: temp.c,v 1.16 2003/08/07 11:14:42 agc Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)temp.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: temp.c,v 1.15 2002/03/06 17:36:44 wiz Exp $");
+__RCSID("$NetBSD: temp.c,v 1.16 2003/08/07 11:14:42 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/mail/tty.c b/usr.bin/mail/tty.c
index b06b5d48e96..c41514ccd9e 100644
--- a/usr.bin/mail/tty.c
+++ b/usr.bin/mail/tty.c
@@ -1,4 +1,4 @@
-/* $NetBSD: tty.c,v 1.16 2002/03/05 21:29:30 wiz Exp $ */
+/* $NetBSD: tty.c,v 1.17 2003/08/07 11:14:42 agc Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)tty.c 8.2 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: tty.c,v 1.16 2002/03/05 21:29:30 wiz Exp $");
+__RCSID("$NetBSD: tty.c,v 1.17 2003/08/07 11:14:42 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/mail/v7.local.c b/usr.bin/mail/v7.local.c
index 285328706c9..c63b5d54202 100644
--- a/usr.bin/mail/v7.local.c
+++ b/usr.bin/mail/v7.local.c
@@ -1,4 +1,4 @@
-/* $NetBSD: v7.local.c,v 1.13 2002/03/12 01:17:46 wiz Exp $ */
+/* $NetBSD: v7.local.c,v 1.14 2003/08/07 11:14:42 agc Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)v7.local.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: v7.local.c,v 1.13 2002/03/12 01:17:46 wiz Exp $");
+__RCSID("$NetBSD: v7.local.c,v 1.14 2003/08/07 11:14:42 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/mail/vars.c b/usr.bin/mail/vars.c
index 2894413bccb..9aaaa78b903 100644
--- a/usr.bin/mail/vars.c
+++ b/usr.bin/mail/vars.c
@@ -1,4 +1,4 @@
-/* $NetBSD: vars.c,v 1.10 2002/08/12 02:42:53 itojun Exp $ */
+/* $NetBSD: vars.c,v 1.11 2003/08/07 11:14:42 agc Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)vars.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: vars.c,v 1.10 2002/08/12 02:42:53 itojun Exp $");
+__RCSID("$NetBSD: vars.c,v 1.11 2003/08/07 11:14:42 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/mail/version.c b/usr.bin/mail/version.c
index a5ecc03f818..b2b3df65774 100644
--- a/usr.bin/mail/version.c
+++ b/usr.bin/mail/version.c
@@ -1,4 +1,4 @@
-/* $NetBSD: version.c,v 1.5 1997/10/19 05:04:07 lukem Exp $ */
+/* $NetBSD: version.c,v 1.6 2003/08/07 11:14:43 agc Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)version.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: version.c,v 1.5 1997/10/19 05:04:07 lukem Exp $");
+__RCSID("$NetBSD: version.c,v 1.6 2003/08/07 11:14:43 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/make/PSD.doc/tutorial.ms b/usr.bin/make/PSD.doc/tutorial.ms
index bb816a295f4..3f80e513b2d 100644
--- a/usr.bin/make/PSD.doc/tutorial.ms
+++ b/usr.bin/make/PSD.doc/tutorial.ms
@@ -1,6 +1,4 @@
-.\" $NetBSD: tutorial.ms,v 1.7 2003/07/14 08:55:18 wiz Exp $
-.\" Copyright (c) 1988, 1989 by Adam de Boor
-.\" Copyright (c) 1989 by Berkeley Softworks
+.\" $NetBSD: tutorial.ms,v 1.8 2003/08/07 11:15:00 agc Exp $
.\" Copyright (c) 1988, 1989, 1993
.\" The Regents of the University of California. All rights reserved.
.\"
@@ -15,6 +13,36 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
+.\" 3. Neither the name of the University nor the names of its contributors
+.\" may be used to endorse or promote products derived from this software
+.\" without specific prior written permission.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.\" Copyright (c) 1988, 1989 by Adam de Boor
+.\" Copyright (c) 1989 by Berkeley Softworks
+.\"
+.\" This code is derived from software contributed to Berkeley by
+.\" Adam de Boor.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\" 1. Redistributions of source code must retain the above copyright
+.\" notice, this list of conditions and the following disclaimer.
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\" notice, this list of conditions and the following disclaimer in the
+.\" documentation and/or other materials provided with the distribution.
.\" 3. All advertising materials mentioning features or use of this software
.\" must display the following acknowledgement:
.\" This product includes software developed by the University of
diff --git a/usr.bin/make/arch.c b/usr.bin/make/arch.c
index d85a2923914..a406f1dbd88 100644
--- a/usr.bin/make/arch.c
+++ b/usr.bin/make/arch.c
@@ -1,8 +1,38 @@
-/* $NetBSD: arch.c,v 1.38 2003/07/14 21:13:48 sjg Exp $ */
+/* $NetBSD: arch.c,v 1.39 2003/08/07 11:14:47 agc Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
* The Regents of the University of California. All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Adam de Boor.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+/*
* Copyright (c) 1989 by Berkeley Softworks
* All rights reserved.
*
@@ -39,14 +69,14 @@
*/
#ifdef MAKE_BOOTSTRAP
-static char rcsid[] = "$NetBSD: arch.c,v 1.38 2003/07/14 21:13:48 sjg Exp $";
+static char rcsid[] = "$NetBSD: arch.c,v 1.39 2003/08/07 11:14:47 agc Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)arch.c 8.2 (Berkeley) 1/2/94";
#else
-__RCSID("$NetBSD: arch.c,v 1.38 2003/07/14 21:13:48 sjg Exp $");
+__RCSID("$NetBSD: arch.c,v 1.39 2003/08/07 11:14:47 agc Exp $");
#endif
#endif /* not lint */
#endif
diff --git a/usr.bin/make/bit.h b/usr.bin/make/bit.h
index 35c30a900bb..2461b2eea1e 100644
--- a/usr.bin/make/bit.h
+++ b/usr.bin/make/bit.h
@@ -1,7 +1,39 @@
-/* $NetBSD: bit.h,v 1.6 1997/11/08 09:33:15 lukem Exp $ */
+/* $NetBSD: bit.h,v 1.7 2003/08/07 11:14:47 agc Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Adam de Boor.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * from: @(#)bit.h 5.3 (Berkeley) 6/1/90
+ */
+
+/*
* Copyright (c) 1988, 1989 by Adam de Boor
* Copyright (c) 1989 by Berkeley Softworks
* All rights reserved.
diff --git a/usr.bin/make/buf.c b/usr.bin/make/buf.c
index 6047b809e7b..af299289c89 100644
--- a/usr.bin/make/buf.c
+++ b/usr.bin/make/buf.c
@@ -1,7 +1,38 @@
-/* $NetBSD: buf.c,v 1.13 2002/06/15 18:24:55 wiz Exp $ */
+/* $NetBSD: buf.c,v 1.14 2003/08/07 11:14:48 agc Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Adam de Boor.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+/*
* Copyright (c) 1988, 1989 by Adam de Boor
* Copyright (c) 1989 by Berkeley Softworks
* All rights reserved.
@@ -39,14 +70,14 @@
*/
#ifdef MAKE_BOOTSTRAP
-static char rcsid[] = "$NetBSD: buf.c,v 1.13 2002/06/15 18:24:55 wiz Exp $";
+static char rcsid[] = "$NetBSD: buf.c,v 1.14 2003/08/07 11:14:48 agc Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)buf.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: buf.c,v 1.13 2002/06/15 18:24:55 wiz Exp $");
+__RCSID("$NetBSD: buf.c,v 1.14 2003/08/07 11:14:48 agc Exp $");
#endif
#endif /* not lint */
#endif
diff --git a/usr.bin/make/buf.h b/usr.bin/make/buf.h
index fdf464fce41..1da75e5949c 100644
--- a/usr.bin/make/buf.h
+++ b/usr.bin/make/buf.h
@@ -1,7 +1,39 @@
-/* $NetBSD: buf.h,v 1.9 2002/06/15 18:24:56 wiz Exp $ */
+/* $NetBSD: buf.h,v 1.10 2003/08/07 11:14:48 agc Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Adam de Boor.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * from: @(#)buf.h 8.1 (Berkeley) 6/6/93
+ */
+
+/*
* Copyright (c) 1988, 1989 by Adam de Boor
* Copyright (c) 1989 by Berkeley Softworks
* All rights reserved.
diff --git a/usr.bin/make/compat.c b/usr.bin/make/compat.c
index 81483c39ddc..ed5348e3c5c 100644
--- a/usr.bin/make/compat.c
+++ b/usr.bin/make/compat.c
@@ -1,7 +1,38 @@
-/* $NetBSD: compat.c,v 1.46 2003/08/01 00:39:52 sjg Exp $ */
+/* $NetBSD: compat.c,v 1.47 2003/08/07 11:14:48 agc Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Adam de Boor.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+/*
* Copyright (c) 1988, 1989 by Adam de Boor
* Copyright (c) 1989 by Berkeley Softworks
* All rights reserved.
@@ -39,14 +70,14 @@
*/
#ifdef MAKE_BOOTSTRAP
-static char rcsid[] = "$NetBSD: compat.c,v 1.46 2003/08/01 00:39:52 sjg Exp $";
+static char rcsid[] = "$NetBSD: compat.c,v 1.47 2003/08/07 11:14:48 agc Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)compat.c 8.2 (Berkeley) 3/19/94";
#else
-__RCSID("$NetBSD: compat.c,v 1.46 2003/08/01 00:39:52 sjg Exp $");
+__RCSID("$NetBSD: compat.c,v 1.47 2003/08/07 11:14:48 agc Exp $");
#endif
#endif /* not lint */
#endif
diff --git a/usr.bin/make/cond.c b/usr.bin/make/cond.c
index 4f49a69a190..f72ae16afcb 100644
--- a/usr.bin/make/cond.c
+++ b/usr.bin/make/cond.c
@@ -1,7 +1,38 @@
-/* $NetBSD: cond.c,v 1.16 2003/07/14 18:19:11 christos Exp $ */
+/* $NetBSD: cond.c,v 1.17 2003/08/07 11:14:49 agc Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Adam de Boor.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+/*
* Copyright (c) 1988, 1989 by Adam de Boor
* Copyright (c) 1989 by Berkeley Softworks
* All rights reserved.
@@ -39,14 +70,14 @@
*/
#ifdef MAKE_BOOTSTRAP
-static char rcsid[] = "$NetBSD: cond.c,v 1.16 2003/07/14 18:19:11 christos Exp $";
+static char rcsid[] = "$NetBSD: cond.c,v 1.17 2003/08/07 11:14:49 agc Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)cond.c 8.2 (Berkeley) 1/2/94";
#else
-__RCSID("$NetBSD: cond.c,v 1.16 2003/07/14 18:19:11 christos Exp $");
+__RCSID("$NetBSD: cond.c,v 1.17 2003/08/07 11:14:49 agc Exp $");
#endif
#endif /* not lint */
#endif
diff --git a/usr.bin/make/config.h b/usr.bin/make/config.h
index 211f44b1539..89d558cb625 100644
--- a/usr.bin/make/config.h
+++ b/usr.bin/make/config.h
@@ -1,7 +1,39 @@
-/* $NetBSD: config.h,v 1.15 2003/08/01 00:39:52 sjg Exp $ */
+/* $NetBSD: config.h,v 1.16 2003/08/07 11:14:49 agc Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Adam de Boor.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * from: @(#)config.h 8.1 (Berkeley) 6/6/93
+ */
+
+/*
* Copyright (c) 1988, 1989 by Adam de Boor
* Copyright (c) 1989 by Berkeley Softworks
* All rights reserved.
diff --git a/usr.bin/make/dir.c b/usr.bin/make/dir.c
index 53e985de71a..1ece6f940d5 100644
--- a/usr.bin/make/dir.c
+++ b/usr.bin/make/dir.c
@@ -1,7 +1,38 @@
-/* $NetBSD: dir.c,v 1.36 2003/07/14 18:19:11 christos Exp $ */
+/* $NetBSD: dir.c,v 1.37 2003/08/07 11:14:49 agc Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Adam de Boor.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+/*
* Copyright (c) 1988, 1989 by Adam de Boor
* Copyright (c) 1989 by Berkeley Softworks
* All rights reserved.
@@ -39,14 +70,14 @@
*/
#ifdef MAKE_BOOTSTRAP
-static char rcsid[] = "$NetBSD: dir.c,v 1.36 2003/07/14 18:19:11 christos Exp $";
+static char rcsid[] = "$NetBSD: dir.c,v 1.37 2003/08/07 11:14:49 agc Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)dir.c 8.2 (Berkeley) 1/2/94";
#else
-__RCSID("$NetBSD: dir.c,v 1.36 2003/07/14 18:19:11 christos Exp $");
+__RCSID("$NetBSD: dir.c,v 1.37 2003/08/07 11:14:49 agc Exp $");
#endif
#endif /* not lint */
#endif
diff --git a/usr.bin/make/dir.h b/usr.bin/make/dir.h
index 74f9607d4f9..b55bec9f2a1 100644
--- a/usr.bin/make/dir.h
+++ b/usr.bin/make/dir.h
@@ -1,7 +1,39 @@
-/* $NetBSD: dir.h,v 1.9 2003/07/14 18:19:12 christos Exp $ */
+/* $NetBSD: dir.h,v 1.10 2003/08/07 11:14:50 agc Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Adam de Boor.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * from: @(#)dir.h 8.1 (Berkeley) 6/6/93
+ */
+
+/*
* Copyright (c) 1988, 1989 by Adam de Boor
* Copyright (c) 1989 by Berkeley Softworks
* All rights reserved.
diff --git a/usr.bin/make/for.c b/usr.bin/make/for.c
index 751e34809f2..548f5d0ae5a 100644
--- a/usr.bin/make/for.c
+++ b/usr.bin/make/for.c
@@ -1,4 +1,4 @@
-/* $NetBSD: for.c,v 1.14 2003/07/14 18:19:12 christos Exp $ */
+/* $NetBSD: for.c,v 1.15 2003/08/07 11:14:50 agc Exp $ */
/*
* Copyright (c) 1992, The Regents of the University of California.
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -34,14 +30,14 @@
*/
#ifdef MAKE_BOOTSTRAP
-static char rcsid[] = "$NetBSD: for.c,v 1.14 2003/07/14 18:19:12 christos Exp $";
+static char rcsid[] = "$NetBSD: for.c,v 1.15 2003/08/07 11:14:50 agc Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)for.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: for.c,v 1.14 2003/07/14 18:19:12 christos Exp $");
+__RCSID("$NetBSD: for.c,v 1.15 2003/08/07 11:14:50 agc Exp $");
#endif
#endif /* not lint */
#endif
diff --git a/usr.bin/make/hash.c b/usr.bin/make/hash.c
index bdb2c0265d4..f1303e3b913 100644
--- a/usr.bin/make/hash.c
+++ b/usr.bin/make/hash.c
@@ -1,7 +1,38 @@
-/* $NetBSD: hash.c,v 1.11 2003/07/14 18:19:12 christos Exp $ */
+/* $NetBSD: hash.c,v 1.12 2003/08/07 11:14:51 agc Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Adam de Boor.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+/*
* Copyright (c) 1988, 1989 by Adam de Boor
* Copyright (c) 1989 by Berkeley Softworks
* All rights reserved.
@@ -39,14 +70,14 @@
*/
#ifdef MAKE_BOOTSTRAP
-static char rcsid[] = "$NetBSD: hash.c,v 1.11 2003/07/14 18:19:12 christos Exp $";
+static char rcsid[] = "$NetBSD: hash.c,v 1.12 2003/08/07 11:14:51 agc Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)hash.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: hash.c,v 1.11 2003/07/14 18:19:12 christos Exp $");
+__RCSID("$NetBSD: hash.c,v 1.12 2003/08/07 11:14:51 agc Exp $");
#endif
#endif /* not lint */
#endif
diff --git a/usr.bin/make/hash.h b/usr.bin/make/hash.h
index 388dff281b3..0b6327ddc16 100644
--- a/usr.bin/make/hash.h
+++ b/usr.bin/make/hash.h
@@ -1,7 +1,39 @@
-/* $NetBSD: hash.h,v 1.7 2003/07/14 18:19:12 christos Exp $ */
+/* $NetBSD: hash.h,v 1.8 2003/08/07 11:14:51 agc Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Adam de Boor.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * from: @(#)hash.h 8.1 (Berkeley) 6/6/93
+ */
+
+/*
* Copyright (c) 1988, 1989 by Adam de Boor
* Copyright (c) 1989 by Berkeley Softworks
* All rights reserved.
diff --git a/usr.bin/make/job.c b/usr.bin/make/job.c
index e062bb3e04d..f4378c0babb 100644
--- a/usr.bin/make/job.c
+++ b/usr.bin/make/job.c
@@ -1,7 +1,38 @@
-/* $NetBSD: job.c,v 1.81 2003/08/01 00:39:52 sjg Exp $ */
+/* $NetBSD: job.c,v 1.82 2003/08/07 11:14:51 agc Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Adam de Boor.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+/*
* Copyright (c) 1988, 1989 by Adam de Boor
* Copyright (c) 1989 by Berkeley Softworks
* All rights reserved.
@@ -39,14 +70,14 @@
*/
#ifdef MAKE_BOOTSTRAP
-static char rcsid[] = "$NetBSD: job.c,v 1.81 2003/08/01 00:39:52 sjg Exp $";
+static char rcsid[] = "$NetBSD: job.c,v 1.82 2003/08/07 11:14:51 agc Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)job.c 8.2 (Berkeley) 3/19/94";
#else
-__RCSID("$NetBSD: job.c,v 1.81 2003/08/01 00:39:52 sjg Exp $");
+__RCSID("$NetBSD: job.c,v 1.82 2003/08/07 11:14:51 agc Exp $");
#endif
#endif /* not lint */
#endif
diff --git a/usr.bin/make/job.h b/usr.bin/make/job.h
index e0408862707..c5926ea8786 100644
--- a/usr.bin/make/job.h
+++ b/usr.bin/make/job.h
@@ -1,7 +1,40 @@
-/* $NetBSD: job.h,v 1.19 2003/08/01 00:39:53 sjg Exp $ */
+/* $NetBSD: job.h,v 1.20 2003/08/07 11:14:52 agc Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Adam de Boor.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * from: @(#)job.h 8.1 (Berkeley) 6/6/93
+ */
+
+/*
* Copyright (c) 1988, 1989 by Adam de Boor
* Copyright (c) 1989 by Berkeley Softworks
* All rights reserved.
diff --git a/usr.bin/make/list.h b/usr.bin/make/list.h
index 1e9f4a6f64f..3cae4e6d5b5 100644
--- a/usr.bin/make/list.h
+++ b/usr.bin/make/list.h
@@ -1,7 +1,40 @@
-/* $NetBSD: list.h,v 1.6 2002/05/16 19:48:18 wiz Exp $ */
+/* $NetBSD: list.h,v 1.7 2003/08/07 11:14:53 agc Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Adam de Boor.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * from: @(#)list.h 8.1 (Berkeley) 6/6/93
+ */
+
+/*
* Copyright (c) 1988, 1989 by Adam de Boor
* Copyright (c) 1989 by Berkeley Softworks
* All rights reserved.
diff --git a/usr.bin/make/lst.h b/usr.bin/make/lst.h
index 94f0c74f000..7e03c9aa404 100644
--- a/usr.bin/make/lst.h
+++ b/usr.bin/make/lst.h
@@ -1,7 +1,40 @@
-/* $NetBSD: lst.h,v 1.9 2002/06/15 18:24:57 wiz Exp $ */
+/* $NetBSD: lst.h,v 1.10 2003/08/07 11:14:53 agc Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Adam de Boor.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * from: @(#)lst.h 8.1 (Berkeley) 6/6/93
+ */
+
+/*
* Copyright (c) 1988, 1989 by Adam de Boor
* Copyright (c) 1989 by Berkeley Softworks
* All rights reserved.
diff --git a/usr.bin/make/lst.lib/lstAppend.c b/usr.bin/make/lst.lib/lstAppend.c
index e585ef34c44..0e4efd5a2e9 100644
--- a/usr.bin/make/lst.lib/lstAppend.c
+++ b/usr.bin/make/lst.lib/lstAppend.c
@@ -1,4 +1,4 @@
-/* $NetBSD: lstAppend.c,v 1.8 2002/06/15 18:24:59 wiz Exp $ */
+/* $NetBSD: lstAppend.c,v 1.9 2003/08/07 11:15:02 agc Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -37,14 +33,14 @@
*/
#ifdef MAKE_BOOTSTRAP
-static char rcsid[] = "$NetBSD: lstAppend.c,v 1.8 2002/06/15 18:24:59 wiz Exp $";
+static char rcsid[] = "$NetBSD: lstAppend.c,v 1.9 2003/08/07 11:15:02 agc Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)lstAppend.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: lstAppend.c,v 1.8 2002/06/15 18:24:59 wiz Exp $");
+__RCSID("$NetBSD: lstAppend.c,v 1.9 2003/08/07 11:15:02 agc Exp $");
#endif
#endif /* not lint */
#endif
diff --git a/usr.bin/make/lst.lib/lstAtEnd.c b/usr.bin/make/lst.lib/lstAtEnd.c
index cbc8306d0dc..3838f6965f5 100644
--- a/usr.bin/make/lst.lib/lstAtEnd.c
+++ b/usr.bin/make/lst.lib/lstAtEnd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: lstAtEnd.c,v 1.8 2002/06/15 18:24:59 wiz Exp $ */
+/* $NetBSD: lstAtEnd.c,v 1.9 2003/08/07 11:15:03 agc Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -37,14 +33,14 @@
*/
#ifdef MAKE_BOOTSTRAP
-static char rcsid[] = "$NetBSD: lstAtEnd.c,v 1.8 2002/06/15 18:24:59 wiz Exp $";
+static char rcsid[] = "$NetBSD: lstAtEnd.c,v 1.9 2003/08/07 11:15:03 agc Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)lstAtEnd.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: lstAtEnd.c,v 1.8 2002/06/15 18:24:59 wiz Exp $");
+__RCSID("$NetBSD: lstAtEnd.c,v 1.9 2003/08/07 11:15:03 agc Exp $");
#endif
#endif /* not lint */
#endif
diff --git a/usr.bin/make/lst.lib/lstAtFront.c b/usr.bin/make/lst.lib/lstAtFront.c
index 114bf5f9f7b..223a5111077 100644
--- a/usr.bin/make/lst.lib/lstAtFront.c
+++ b/usr.bin/make/lst.lib/lstAtFront.c
@@ -1,4 +1,4 @@
-/* $NetBSD: lstAtFront.c,v 1.8 2002/06/15 18:24:59 wiz Exp $ */
+/* $NetBSD: lstAtFront.c,v 1.9 2003/08/07 11:15:03 agc Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -37,14 +33,14 @@
*/
#ifdef MAKE_BOOTSTRAP
-static char rcsid[] = "$NetBSD: lstAtFront.c,v 1.8 2002/06/15 18:24:59 wiz Exp $";
+static char rcsid[] = "$NetBSD: lstAtFront.c,v 1.9 2003/08/07 11:15:03 agc Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)lstAtFront.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: lstAtFront.c,v 1.8 2002/06/15 18:24:59 wiz Exp $");
+__RCSID("$NetBSD: lstAtFront.c,v 1.9 2003/08/07 11:15:03 agc Exp $");
#endif
#endif /* not lint */
#endif
diff --git a/usr.bin/make/lst.lib/lstClose.c b/usr.bin/make/lst.lib/lstClose.c
index 28aa44028a7..880a5ad4dab 100644
--- a/usr.bin/make/lst.lib/lstClose.c
+++ b/usr.bin/make/lst.lib/lstClose.c
@@ -1,4 +1,4 @@
-/* $NetBSD: lstClose.c,v 1.8 2002/06/15 18:24:59 wiz Exp $ */
+/* $NetBSD: lstClose.c,v 1.9 2003/08/07 11:15:03 agc Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -37,14 +33,14 @@
*/
#ifdef MAKE_BOOTSTRAP
-static char rcsid[] = "$NetBSD: lstClose.c,v 1.8 2002/06/15 18:24:59 wiz Exp $";
+static char rcsid[] = "$NetBSD: lstClose.c,v 1.9 2003/08/07 11:15:03 agc Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)lstClose.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: lstClose.c,v 1.8 2002/06/15 18:24:59 wiz Exp $");
+__RCSID("$NetBSD: lstClose.c,v 1.9 2003/08/07 11:15:03 agc Exp $");
#endif
#endif /* not lint */
#endif
diff --git a/usr.bin/make/lst.lib/lstConcat.c b/usr.bin/make/lst.lib/lstConcat.c
index a5c45aeb92f..ab100999f80 100644
--- a/usr.bin/make/lst.lib/lstConcat.c
+++ b/usr.bin/make/lst.lib/lstConcat.c
@@ -1,4 +1,4 @@
-/* $NetBSD: lstConcat.c,v 1.10 2002/06/15 18:24:59 wiz Exp $ */
+/* $NetBSD: lstConcat.c,v 1.11 2003/08/07 11:15:03 agc Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -37,14 +33,14 @@
*/
#ifdef MAKE_BOOTSTRAP
-static char rcsid[] = "$NetBSD: lstConcat.c,v 1.10 2002/06/15 18:24:59 wiz Exp $";
+static char rcsid[] = "$NetBSD: lstConcat.c,v 1.11 2003/08/07 11:15:03 agc Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)lstConcat.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: lstConcat.c,v 1.10 2002/06/15 18:24:59 wiz Exp $");
+__RCSID("$NetBSD: lstConcat.c,v 1.11 2003/08/07 11:15:03 agc Exp $");
#endif
#endif /* not lint */
#endif
diff --git a/usr.bin/make/lst.lib/lstDatum.c b/usr.bin/make/lst.lib/lstDatum.c
index dff1a490da9..4ee787a1f6a 100644
--- a/usr.bin/make/lst.lib/lstDatum.c
+++ b/usr.bin/make/lst.lib/lstDatum.c
@@ -1,4 +1,4 @@
-/* $NetBSD: lstDatum.c,v 1.8 2002/06/15 18:24:59 wiz Exp $ */
+/* $NetBSD: lstDatum.c,v 1.9 2003/08/07 11:15:04 agc Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -37,14 +33,14 @@
*/
#ifdef MAKE_BOOTSTRAP
-static char rcsid[] = "$NetBSD: lstDatum.c,v 1.8 2002/06/15 18:24:59 wiz Exp $";
+static char rcsid[] = "$NetBSD: lstDatum.c,v 1.9 2003/08/07 11:15:04 agc Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)lstDatum.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: lstDatum.c,v 1.8 2002/06/15 18:24:59 wiz Exp $");
+__RCSID("$NetBSD: lstDatum.c,v 1.9 2003/08/07 11:15:04 agc Exp $");
#endif
#endif /* not lint */
#endif
diff --git a/usr.bin/make/lst.lib/lstDeQueue.c b/usr.bin/make/lst.lib/lstDeQueue.c
index 852535558ea..c1292a71018 100644
--- a/usr.bin/make/lst.lib/lstDeQueue.c
+++ b/usr.bin/make/lst.lib/lstDeQueue.c
@@ -1,4 +1,4 @@
-/* $NetBSD: lstDeQueue.c,v 1.8 2002/06/15 18:24:59 wiz Exp $ */
+/* $NetBSD: lstDeQueue.c,v 1.9 2003/08/07 11:15:04 agc Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -37,14 +33,14 @@
*/
#ifdef MAKE_BOOTSTRAP
-static char rcsid[] = "$NetBSD: lstDeQueue.c,v 1.8 2002/06/15 18:24:59 wiz Exp $";
+static char rcsid[] = "$NetBSD: lstDeQueue.c,v 1.9 2003/08/07 11:15:04 agc Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)lstDeQueue.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: lstDeQueue.c,v 1.8 2002/06/15 18:24:59 wiz Exp $");
+__RCSID("$NetBSD: lstDeQueue.c,v 1.9 2003/08/07 11:15:04 agc Exp $");
#endif
#endif /* not lint */
#endif
diff --git a/usr.bin/make/lst.lib/lstDestroy.c b/usr.bin/make/lst.lib/lstDestroy.c
index b6e5bca1da0..9b4a799c1ef 100644
--- a/usr.bin/make/lst.lib/lstDestroy.c
+++ b/usr.bin/make/lst.lib/lstDestroy.c
@@ -1,4 +1,4 @@
-/* $NetBSD: lstDestroy.c,v 1.9 2002/06/15 18:24:59 wiz Exp $ */
+/* $NetBSD: lstDestroy.c,v 1.10 2003/08/07 11:15:04 agc Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -37,14 +33,14 @@
*/
#ifdef MAKE_BOOTSTRAP
-static char rcsid[] = "$NetBSD: lstDestroy.c,v 1.9 2002/06/15 18:24:59 wiz Exp $";
+static char rcsid[] = "$NetBSD: lstDestroy.c,v 1.10 2003/08/07 11:15:04 agc Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)lstDestroy.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: lstDestroy.c,v 1.9 2002/06/15 18:24:59 wiz Exp $");
+__RCSID("$NetBSD: lstDestroy.c,v 1.10 2003/08/07 11:15:04 agc Exp $");
#endif
#endif /* not lint */
#endif
diff --git a/usr.bin/make/lst.lib/lstDupl.c b/usr.bin/make/lst.lib/lstDupl.c
index da76db248f8..0d9aa5582b7 100644
--- a/usr.bin/make/lst.lib/lstDupl.c
+++ b/usr.bin/make/lst.lib/lstDupl.c
@@ -1,4 +1,4 @@
-/* $NetBSD: lstDupl.c,v 1.9 2002/06/15 18:24:59 wiz Exp $ */
+/* $NetBSD: lstDupl.c,v 1.10 2003/08/07 11:15:04 agc Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -37,14 +33,14 @@
*/
#ifdef MAKE_BOOTSTRAP
-static char rcsid[] = "$NetBSD: lstDupl.c,v 1.9 2002/06/15 18:24:59 wiz Exp $";
+static char rcsid[] = "$NetBSD: lstDupl.c,v 1.10 2003/08/07 11:15:04 agc Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)lstDupl.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: lstDupl.c,v 1.9 2002/06/15 18:24:59 wiz Exp $");
+__RCSID("$NetBSD: lstDupl.c,v 1.10 2003/08/07 11:15:04 agc Exp $");
#endif
#endif /* not lint */
#endif
diff --git a/usr.bin/make/lst.lib/lstEnQueue.c b/usr.bin/make/lst.lib/lstEnQueue.c
index 3c55d6742a0..f6a997ff132 100644
--- a/usr.bin/make/lst.lib/lstEnQueue.c
+++ b/usr.bin/make/lst.lib/lstEnQueue.c
@@ -1,4 +1,4 @@
-/* $NetBSD: lstEnQueue.c,v 1.8 2002/06/15 18:24:59 wiz Exp $ */
+/* $NetBSD: lstEnQueue.c,v 1.9 2003/08/07 11:15:04 agc Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -37,14 +33,14 @@
*/
#ifdef MAKE_BOOTSTRAP
-static char rcsid[] = "$NetBSD: lstEnQueue.c,v 1.8 2002/06/15 18:24:59 wiz Exp $";
+static char rcsid[] = "$NetBSD: lstEnQueue.c,v 1.9 2003/08/07 11:15:04 agc Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)lstEnQueue.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: lstEnQueue.c,v 1.8 2002/06/15 18:24:59 wiz Exp $");
+__RCSID("$NetBSD: lstEnQueue.c,v 1.9 2003/08/07 11:15:04 agc Exp $");
#endif
#endif /* not lint */
#endif
diff --git a/usr.bin/make/lst.lib/lstFind.c b/usr.bin/make/lst.lib/lstFind.c
index b84a4354e2b..2de82236a11 100644
--- a/usr.bin/make/lst.lib/lstFind.c
+++ b/usr.bin/make/lst.lib/lstFind.c
@@ -1,4 +1,4 @@
-/* $NetBSD: lstFind.c,v 1.9 2002/06/15 18:24:59 wiz Exp $ */
+/* $NetBSD: lstFind.c,v 1.10 2003/08/07 11:15:05 agc Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -37,14 +33,14 @@
*/
#ifdef MAKE_BOOTSTRAP
-static char rcsid[] = "$NetBSD: lstFind.c,v 1.9 2002/06/15 18:24:59 wiz Exp $";
+static char rcsid[] = "$NetBSD: lstFind.c,v 1.10 2003/08/07 11:15:05 agc Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)lstFind.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: lstFind.c,v 1.9 2002/06/15 18:24:59 wiz Exp $");
+__RCSID("$NetBSD: lstFind.c,v 1.10 2003/08/07 11:15:05 agc Exp $");
#endif
#endif /* not lint */
#endif
diff --git a/usr.bin/make/lst.lib/lstFindFrom.c b/usr.bin/make/lst.lib/lstFindFrom.c
index 9e6724c048e..8585866cd50 100644
--- a/usr.bin/make/lst.lib/lstFindFrom.c
+++ b/usr.bin/make/lst.lib/lstFindFrom.c
@@ -1,4 +1,4 @@
-/* $NetBSD: lstFindFrom.c,v 1.9 2002/06/15 18:25:00 wiz Exp $ */
+/* $NetBSD: lstFindFrom.c,v 1.10 2003/08/07 11:15:05 agc Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -37,14 +33,14 @@
*/
#ifdef MAKE_BOOTSTRAP
-static char rcsid[] = "$NetBSD: lstFindFrom.c,v 1.9 2002/06/15 18:25:00 wiz Exp $";
+static char rcsid[] = "$NetBSD: lstFindFrom.c,v 1.10 2003/08/07 11:15:05 agc Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)lstFindFrom.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: lstFindFrom.c,v 1.9 2002/06/15 18:25:00 wiz Exp $");
+__RCSID("$NetBSD: lstFindFrom.c,v 1.10 2003/08/07 11:15:05 agc Exp $");
#endif
#endif /* not lint */
#endif
diff --git a/usr.bin/make/lst.lib/lstFirst.c b/usr.bin/make/lst.lib/lstFirst.c
index 0dfcbfb843d..aeabe79f298 100644
--- a/usr.bin/make/lst.lib/lstFirst.c
+++ b/usr.bin/make/lst.lib/lstFirst.c
@@ -1,4 +1,4 @@
-/* $NetBSD: lstFirst.c,v 1.8 2002/06/15 18:25:00 wiz Exp $ */
+/* $NetBSD: lstFirst.c,v 1.9 2003/08/07 11:15:05 agc Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -37,14 +33,14 @@
*/
#ifdef MAKE_BOOTSTRAP
-static char rcsid[] = "$NetBSD: lstFirst.c,v 1.8 2002/06/15 18:25:00 wiz Exp $";
+static char rcsid[] = "$NetBSD: lstFirst.c,v 1.9 2003/08/07 11:15:05 agc Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)lstFirst.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: lstFirst.c,v 1.8 2002/06/15 18:25:00 wiz Exp $");
+__RCSID("$NetBSD: lstFirst.c,v 1.9 2003/08/07 11:15:05 agc Exp $");
#endif
#endif /* not lint */
#endif
diff --git a/usr.bin/make/lst.lib/lstForEach.c b/usr.bin/make/lst.lib/lstForEach.c
index 76c234afdf9..c263597dccd 100644
--- a/usr.bin/make/lst.lib/lstForEach.c
+++ b/usr.bin/make/lst.lib/lstForEach.c
@@ -1,4 +1,4 @@
-/* $NetBSD: lstForEach.c,v 1.9 2002/06/15 18:25:00 wiz Exp $ */
+/* $NetBSD: lstForEach.c,v 1.10 2003/08/07 11:15:05 agc Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -37,14 +33,14 @@
*/
#ifdef MAKE_BOOTSTRAP
-static char rcsid[] = "$NetBSD: lstForEach.c,v 1.9 2002/06/15 18:25:00 wiz Exp $";
+static char rcsid[] = "$NetBSD: lstForEach.c,v 1.10 2003/08/07 11:15:05 agc Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)lstForEach.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: lstForEach.c,v 1.9 2002/06/15 18:25:00 wiz Exp $");
+__RCSID("$NetBSD: lstForEach.c,v 1.10 2003/08/07 11:15:05 agc Exp $");
#endif
#endif /* not lint */
#endif
diff --git a/usr.bin/make/lst.lib/lstForEachFrom.c b/usr.bin/make/lst.lib/lstForEachFrom.c
index 31cb6a76bea..fdb67b2e801 100644
--- a/usr.bin/make/lst.lib/lstForEachFrom.c
+++ b/usr.bin/make/lst.lib/lstForEachFrom.c
@@ -1,4 +1,4 @@
-/* $NetBSD: lstForEachFrom.c,v 1.9 2002/06/15 18:25:00 wiz Exp $ */
+/* $NetBSD: lstForEachFrom.c,v 1.10 2003/08/07 11:15:06 agc Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -37,14 +33,14 @@
*/
#ifdef MAKE_BOOTSTRAP
-static char rcsid[] = "$NetBSD: lstForEachFrom.c,v 1.9 2002/06/15 18:25:00 wiz Exp $";
+static char rcsid[] = "$NetBSD: lstForEachFrom.c,v 1.10 2003/08/07 11:15:06 agc Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)lstForEachFrom.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: lstForEachFrom.c,v 1.9 2002/06/15 18:25:00 wiz Exp $");
+__RCSID("$NetBSD: lstForEachFrom.c,v 1.10 2003/08/07 11:15:06 agc Exp $");
#endif
#endif /* not lint */
#endif
diff --git a/usr.bin/make/lst.lib/lstInit.c b/usr.bin/make/lst.lib/lstInit.c
index 0f4dc06d253..3f54a4cfc6a 100644
--- a/usr.bin/make/lst.lib/lstInit.c
+++ b/usr.bin/make/lst.lib/lstInit.c
@@ -1,4 +1,4 @@
-/* $NetBSD: lstInit.c,v 1.8 2002/06/15 18:25:00 wiz Exp $ */
+/* $NetBSD: lstInit.c,v 1.9 2003/08/07 11:15:06 agc Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -37,14 +33,14 @@
*/
#ifdef MAKE_BOOTSTRAP
-static char rcsid[] = "$NetBSD: lstInit.c,v 1.8 2002/06/15 18:25:00 wiz Exp $";
+static char rcsid[] = "$NetBSD: lstInit.c,v 1.9 2003/08/07 11:15:06 agc Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)lstInit.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: lstInit.c,v 1.8 2002/06/15 18:25:00 wiz Exp $");
+__RCSID("$NetBSD: lstInit.c,v 1.9 2003/08/07 11:15:06 agc Exp $");
#endif
#endif /* not lint */
#endif
diff --git a/usr.bin/make/lst.lib/lstInsert.c b/usr.bin/make/lst.lib/lstInsert.c
index 9caac27794e..c2e27faf25e 100644
--- a/usr.bin/make/lst.lib/lstInsert.c
+++ b/usr.bin/make/lst.lib/lstInsert.c
@@ -1,4 +1,4 @@
-/* $NetBSD: lstInsert.c,v 1.8 2002/06/15 18:25:00 wiz Exp $ */
+/* $NetBSD: lstInsert.c,v 1.9 2003/08/07 11:15:06 agc Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -37,14 +33,14 @@
*/
#ifdef MAKE_BOOTSTRAP
-static char rcsid[] = "$NetBSD: lstInsert.c,v 1.8 2002/06/15 18:25:00 wiz Exp $";
+static char rcsid[] = "$NetBSD: lstInsert.c,v 1.9 2003/08/07 11:15:06 agc Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)lstInsert.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: lstInsert.c,v 1.8 2002/06/15 18:25:00 wiz Exp $");
+__RCSID("$NetBSD: lstInsert.c,v 1.9 2003/08/07 11:15:06 agc Exp $");
#endif
#endif /* not lint */
#endif
diff --git a/usr.bin/make/lst.lib/lstInt.h b/usr.bin/make/lst.lib/lstInt.h
index 5aa3f4a4c6c..085ac24384f 100644
--- a/usr.bin/make/lst.lib/lstInt.h
+++ b/usr.bin/make/lst.lib/lstInt.h
@@ -1,4 +1,4 @@
-/* $NetBSD: lstInt.h,v 1.8 2001/01/16 02:50:30 cgd Exp $ */
+/* $NetBSD: lstInt.h,v 1.9 2003/08/07 11:15:06 agc Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/make/lst.lib/lstIsAtEnd.c b/usr.bin/make/lst.lib/lstIsAtEnd.c
index 95068685d4e..2b507f09f32 100644
--- a/usr.bin/make/lst.lib/lstIsAtEnd.c
+++ b/usr.bin/make/lst.lib/lstIsAtEnd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: lstIsAtEnd.c,v 1.8 2002/06/15 18:25:00 wiz Exp $ */
+/* $NetBSD: lstIsAtEnd.c,v 1.9 2003/08/07 11:15:07 agc Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -37,14 +33,14 @@
*/
#ifdef MAKE_BOOTSTRAP
-static char rcsid[] = "$NetBSD: lstIsAtEnd.c,v 1.8 2002/06/15 18:25:00 wiz Exp $";
+static char rcsid[] = "$NetBSD: lstIsAtEnd.c,v 1.9 2003/08/07 11:15:07 agc Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)lstIsAtEnd.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: lstIsAtEnd.c,v 1.8 2002/06/15 18:25:00 wiz Exp $");
+__RCSID("$NetBSD: lstIsAtEnd.c,v 1.9 2003/08/07 11:15:07 agc Exp $");
#endif
#endif /* not lint */
#endif
diff --git a/usr.bin/make/lst.lib/lstIsEmpty.c b/usr.bin/make/lst.lib/lstIsEmpty.c
index ae1cd5ed31a..ef76d3a7f34 100644
--- a/usr.bin/make/lst.lib/lstIsEmpty.c
+++ b/usr.bin/make/lst.lib/lstIsEmpty.c
@@ -1,4 +1,4 @@
-/* $NetBSD: lstIsEmpty.c,v 1.8 2002/06/15 18:25:00 wiz Exp $ */
+/* $NetBSD: lstIsEmpty.c,v 1.9 2003/08/07 11:15:07 agc Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -37,14 +33,14 @@
*/
#ifdef MAKE_BOOTSTRAP
-static char rcsid[] = "$NetBSD: lstIsEmpty.c,v 1.8 2002/06/15 18:25:00 wiz Exp $";
+static char rcsid[] = "$NetBSD: lstIsEmpty.c,v 1.9 2003/08/07 11:15:07 agc Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)lstIsEmpty.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: lstIsEmpty.c,v 1.8 2002/06/15 18:25:00 wiz Exp $");
+__RCSID("$NetBSD: lstIsEmpty.c,v 1.9 2003/08/07 11:15:07 agc Exp $");
#endif
#endif /* not lint */
#endif
diff --git a/usr.bin/make/lst.lib/lstLast.c b/usr.bin/make/lst.lib/lstLast.c
index b556be254cf..69e337f6acf 100644
--- a/usr.bin/make/lst.lib/lstLast.c
+++ b/usr.bin/make/lst.lib/lstLast.c
@@ -1,4 +1,4 @@
-/* $NetBSD: lstLast.c,v 1.8 2002/06/15 18:25:00 wiz Exp $ */
+/* $NetBSD: lstLast.c,v 1.9 2003/08/07 11:15:07 agc Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -37,14 +33,14 @@
*/
#ifdef MAKE_BOOTSTRAP
-static char rcsid[] = "$NetBSD: lstLast.c,v 1.8 2002/06/15 18:25:00 wiz Exp $";
+static char rcsid[] = "$NetBSD: lstLast.c,v 1.9 2003/08/07 11:15:07 agc Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)lstLast.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: lstLast.c,v 1.8 2002/06/15 18:25:00 wiz Exp $");
+__RCSID("$NetBSD: lstLast.c,v 1.9 2003/08/07 11:15:07 agc Exp $");
#endif
#endif /* not lint */
#endif
diff --git a/usr.bin/make/lst.lib/lstMember.c b/usr.bin/make/lst.lib/lstMember.c
index df3f58c10e8..33f7ac67c27 100644
--- a/usr.bin/make/lst.lib/lstMember.c
+++ b/usr.bin/make/lst.lib/lstMember.c
@@ -1,4 +1,4 @@
-/* $NetBSD: lstMember.c,v 1.8 2002/06/15 18:25:00 wiz Exp $ */
+/* $NetBSD: lstMember.c,v 1.9 2003/08/07 11:15:07 agc Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -37,14 +33,14 @@
*/
#ifdef MAKE_BOOTSTRAP
-static char rcsid[] = "$NetBSD: lstMember.c,v 1.8 2002/06/15 18:25:00 wiz Exp $";
+static char rcsid[] = "$NetBSD: lstMember.c,v 1.9 2003/08/07 11:15:07 agc Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)lstMember.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: lstMember.c,v 1.8 2002/06/15 18:25:00 wiz Exp $");
+__RCSID("$NetBSD: lstMember.c,v 1.9 2003/08/07 11:15:07 agc Exp $");
#endif
#endif /* not lint */
#endif
diff --git a/usr.bin/make/lst.lib/lstNext.c b/usr.bin/make/lst.lib/lstNext.c
index 9f13e1ddcc6..2fc93ad61de 100644
--- a/usr.bin/make/lst.lib/lstNext.c
+++ b/usr.bin/make/lst.lib/lstNext.c
@@ -1,4 +1,4 @@
-/* $NetBSD: lstNext.c,v 1.8 2002/06/15 18:25:00 wiz Exp $ */
+/* $NetBSD: lstNext.c,v 1.9 2003/08/07 11:15:08 agc Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -37,14 +33,14 @@
*/
#ifdef MAKE_BOOTSTRAP
-static char rcsid[] = "$NetBSD: lstNext.c,v 1.8 2002/06/15 18:25:00 wiz Exp $";
+static char rcsid[] = "$NetBSD: lstNext.c,v 1.9 2003/08/07 11:15:08 agc Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)lstNext.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: lstNext.c,v 1.8 2002/06/15 18:25:00 wiz Exp $");
+__RCSID("$NetBSD: lstNext.c,v 1.9 2003/08/07 11:15:08 agc Exp $");
#endif
#endif /* not lint */
#endif
diff --git a/usr.bin/make/lst.lib/lstOpen.c b/usr.bin/make/lst.lib/lstOpen.c
index b5daad10856..b9f88631da9 100644
--- a/usr.bin/make/lst.lib/lstOpen.c
+++ b/usr.bin/make/lst.lib/lstOpen.c
@@ -1,4 +1,4 @@
-/* $NetBSD: lstOpen.c,v 1.8 2002/06/15 18:25:00 wiz Exp $ */
+/* $NetBSD: lstOpen.c,v 1.9 2003/08/07 11:15:08 agc Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -37,14 +33,14 @@
*/
#ifdef MAKE_BOOTSTRAP
-static char rcsid[] = "$NetBSD: lstOpen.c,v 1.8 2002/06/15 18:25:00 wiz Exp $";
+static char rcsid[] = "$NetBSD: lstOpen.c,v 1.9 2003/08/07 11:15:08 agc Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)lstOpen.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: lstOpen.c,v 1.8 2002/06/15 18:25:00 wiz Exp $");
+__RCSID("$NetBSD: lstOpen.c,v 1.9 2003/08/07 11:15:08 agc Exp $");
#endif
#endif /* not lint */
#endif
diff --git a/usr.bin/make/lst.lib/lstRemove.c b/usr.bin/make/lst.lib/lstRemove.c
index e5693a0ae93..2554d94ba27 100644
--- a/usr.bin/make/lst.lib/lstRemove.c
+++ b/usr.bin/make/lst.lib/lstRemove.c
@@ -1,4 +1,4 @@
-/* $NetBSD: lstRemove.c,v 1.8 2002/06/15 18:25:00 wiz Exp $ */
+/* $NetBSD: lstRemove.c,v 1.9 2003/08/07 11:15:08 agc Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -37,14 +33,14 @@
*/
#ifdef MAKE_BOOTSTRAP
-static char rcsid[] = "$NetBSD: lstRemove.c,v 1.8 2002/06/15 18:25:00 wiz Exp $";
+static char rcsid[] = "$NetBSD: lstRemove.c,v 1.9 2003/08/07 11:15:08 agc Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)lstRemove.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: lstRemove.c,v 1.8 2002/06/15 18:25:00 wiz Exp $");
+__RCSID("$NetBSD: lstRemove.c,v 1.9 2003/08/07 11:15:08 agc Exp $");
#endif
#endif /* not lint */
#endif
diff --git a/usr.bin/make/lst.lib/lstReplace.c b/usr.bin/make/lst.lib/lstReplace.c
index 54cb86d9090..f8b8250123f 100644
--- a/usr.bin/make/lst.lib/lstReplace.c
+++ b/usr.bin/make/lst.lib/lstReplace.c
@@ -1,4 +1,4 @@
-/* $NetBSD: lstReplace.c,v 1.8 2002/06/15 18:25:00 wiz Exp $ */
+/* $NetBSD: lstReplace.c,v 1.9 2003/08/07 11:15:08 agc Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -37,14 +33,14 @@
*/
#ifdef MAKE_BOOTSTRAP
-static char rcsid[] = "$NetBSD: lstReplace.c,v 1.8 2002/06/15 18:25:00 wiz Exp $";
+static char rcsid[] = "$NetBSD: lstReplace.c,v 1.9 2003/08/07 11:15:08 agc Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)lstReplace.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: lstReplace.c,v 1.8 2002/06/15 18:25:00 wiz Exp $");
+__RCSID("$NetBSD: lstReplace.c,v 1.9 2003/08/07 11:15:08 agc Exp $");
#endif
#endif /* not lint */
#endif
diff --git a/usr.bin/make/lst.lib/lstSucc.c b/usr.bin/make/lst.lib/lstSucc.c
index 5bcc3292c95..e8eb0f924fe 100644
--- a/usr.bin/make/lst.lib/lstSucc.c
+++ b/usr.bin/make/lst.lib/lstSucc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: lstSucc.c,v 1.9 2003/01/28 22:35:22 wiz Exp $ */
+/* $NetBSD: lstSucc.c,v 1.10 2003/08/07 11:15:09 agc Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -37,14 +33,14 @@
*/
#ifdef MAKE_BOOTSTRAP
-static char rcsid[] = "$NetBSD: lstSucc.c,v 1.9 2003/01/28 22:35:22 wiz Exp $";
+static char rcsid[] = "$NetBSD: lstSucc.c,v 1.10 2003/08/07 11:15:09 agc Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)lstSucc.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: lstSucc.c,v 1.9 2003/01/28 22:35:22 wiz Exp $");
+__RCSID("$NetBSD: lstSucc.c,v 1.10 2003/08/07 11:15:09 agc Exp $");
#endif
#endif /* not lint */
#endif
diff --git a/usr.bin/make/main.c b/usr.bin/make/main.c
index eed926d4a80..e92fdcf20d4 100644
--- a/usr.bin/make/main.c
+++ b/usr.bin/make/main.c
@@ -1,8 +1,38 @@
-/* $NetBSD: main.c,v 1.90 2003/08/01 00:39:53 sjg Exp $ */
+/* $NetBSD: main.c,v 1.91 2003/08/07 11:14:53 agc Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
* The Regents of the University of California. All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Adam de Boor.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+/*
* Copyright (c) 1989 by Berkeley Softworks
* All rights reserved.
*
@@ -39,7 +69,7 @@
*/
#ifdef MAKE_BOOTSTRAP
-static char rcsid[] = "$NetBSD: main.c,v 1.90 2003/08/01 00:39:53 sjg Exp $";
+static char rcsid[] = "$NetBSD: main.c,v 1.91 2003/08/07 11:14:53 agc Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
@@ -51,7 +81,7 @@ __COPYRIGHT("@(#) Copyright (c) 1988, 1989, 1990, 1993\n\
#if 0
static char sccsid[] = "@(#)main.c 8.3 (Berkeley) 3/19/94";
#else
-__RCSID("$NetBSD: main.c,v 1.90 2003/08/01 00:39:53 sjg Exp $");
+__RCSID("$NetBSD: main.c,v 1.91 2003/08/07 11:14:53 agc Exp $");
#endif
#endif /* not lint */
#endif
diff --git a/usr.bin/make/make.1 b/usr.bin/make/make.1
index 57936d11d46..12a1692652a 100644
--- a/usr.bin/make/make.1
+++ b/usr.bin/make/make.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: make.1,v 1.83 2003/08/01 00:39:54 sjg Exp $
+.\" $NetBSD: make.1,v 1.84 2003/08/07 11:14:54 agc Exp $
.\"
.\" Copyright (c) 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -11,11 +11,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/make/make.c b/usr.bin/make/make.c
index 9277e3d468c..95863479596 100644
--- a/usr.bin/make/make.c
+++ b/usr.bin/make/make.c
@@ -1,8 +1,38 @@
-/* $NetBSD: make.c,v 1.50 2002/06/15 18:24:57 wiz Exp $ */
+/* $NetBSD: make.c,v 1.51 2003/08/07 11:14:54 agc Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
* The Regents of the University of California. All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Adam de Boor.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+/*
* Copyright (c) 1989 by Berkeley Softworks
* All rights reserved.
*
@@ -39,14 +69,14 @@
*/
#ifdef MAKE_BOOTSTRAP
-static char rcsid[] = "$NetBSD: make.c,v 1.50 2002/06/15 18:24:57 wiz Exp $";
+static char rcsid[] = "$NetBSD: make.c,v 1.51 2003/08/07 11:14:54 agc Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)make.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: make.c,v 1.50 2002/06/15 18:24:57 wiz Exp $");
+__RCSID("$NetBSD: make.c,v 1.51 2003/08/07 11:14:54 agc Exp $");
#endif
#endif /* not lint */
#endif
diff --git a/usr.bin/make/make.h b/usr.bin/make/make.h
index b5b33aec1dc..bc232f936d4 100644
--- a/usr.bin/make/make.h
+++ b/usr.bin/make/make.h
@@ -1,8 +1,40 @@
-/* $NetBSD: make.h,v 1.46 2003/07/14 18:19:12 christos Exp $ */
+/* $NetBSD: make.h,v 1.47 2003/08/07 11:14:55 agc Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
* The Regents of the University of California. All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Adam de Boor.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * from: @(#)make.h 8.3 (Berkeley) 6/13/95
+ */
+
+/*
* Copyright (c) 1989 by Berkeley Softworks
* All rights reserved.
*
diff --git a/usr.bin/make/nonints.h b/usr.bin/make/nonints.h
index 06f35c2bbea..4096d53fdb3 100644
--- a/usr.bin/make/nonints.h
+++ b/usr.bin/make/nonints.h
@@ -1,8 +1,40 @@
-/* $NetBSD: nonints.h,v 1.28 2003/07/14 18:19:13 christos Exp $ */
+/* $NetBSD: nonints.h,v 1.29 2003/08/07 11:14:55 agc Exp $ */
/*-
* Copyright (c) 1988, 1989, 1990, 1993
* The Regents of the University of California. All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Adam de Boor.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * from: @(#)nonints.h 8.3 (Berkeley) 3/19/94
+ */
+
+/*-
* Copyright (c) 1989 by Berkeley Softworks
* All rights reserved.
*
diff --git a/usr.bin/make/parse.c b/usr.bin/make/parse.c
index e36ce26d1c1..02ace5687c2 100644
--- a/usr.bin/make/parse.c
+++ b/usr.bin/make/parse.c
@@ -1,8 +1,38 @@
-/* $NetBSD: parse.c,v 1.93 2003/07/14 18:19:13 christos Exp $ */
+/* $NetBSD: parse.c,v 1.94 2003/08/07 11:14:56 agc Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
* The Regents of the University of California. All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Adam de Boor.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+/*
* Copyright (c) 1989 by Berkeley Softworks
* All rights reserved.
*
@@ -39,14 +69,14 @@
*/
#ifdef MAKE_BOOTSTRAP
-static char rcsid[] = "$NetBSD: parse.c,v 1.93 2003/07/14 18:19:13 christos Exp $";
+static char rcsid[] = "$NetBSD: parse.c,v 1.94 2003/08/07 11:14:56 agc Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)parse.c 8.3 (Berkeley) 3/19/94";
#else
-__RCSID("$NetBSD: parse.c,v 1.93 2003/07/14 18:19:13 christos Exp $");
+__RCSID("$NetBSD: parse.c,v 1.94 2003/08/07 11:14:56 agc Exp $");
#endif
#endif /* not lint */
#endif
diff --git a/usr.bin/make/pathnames.h b/usr.bin/make/pathnames.h
index 30470cf0fe6..d3c5c14ce50 100644
--- a/usr.bin/make/pathnames.h
+++ b/usr.bin/make/pathnames.h
@@ -1,4 +1,4 @@
-/* $NetBSD: pathnames.h,v 1.11 2003/08/01 00:39:54 sjg Exp $ */
+/* $NetBSD: pathnames.h,v 1.12 2003/08/07 11:14:57 agc Exp $ */
/*
* Copyright (c) 1990, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/make/sprite.h b/usr.bin/make/sprite.h
index fc11f8848f7..e3c18d5231c 100644
--- a/usr.bin/make/sprite.h
+++ b/usr.bin/make/sprite.h
@@ -1,8 +1,40 @@
-/* $NetBSD: sprite.h,v 1.7 2000/05/04 18:27:53 drochner Exp $ */
+/* $NetBSD: sprite.h,v 1.8 2003/08/07 11:14:57 agc Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
* The Regents of the University of California. All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Adam de Boor.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * from: @(#)sprite.h 8.1 (Berkeley) 6/6/93
+ */
+
+/*
* Copyright (c) 1989 by Berkeley Softworks
* All rights reserved.
*
diff --git a/usr.bin/make/str.c b/usr.bin/make/str.c
index 3c78f4d9554..7adc70e41da 100644
--- a/usr.bin/make/str.c
+++ b/usr.bin/make/str.c
@@ -1,8 +1,38 @@
-/* $NetBSD: str.c,v 1.19 2003/07/14 18:19:13 christos Exp $ */
+/* $NetBSD: str.c,v 1.20 2003/08/07 11:14:57 agc Exp $ */
/*-
* Copyright (c) 1988, 1989, 1990, 1993
* The Regents of the University of California. All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Adam de Boor.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+/*-
* Copyright (c) 1989 by Berkeley Softworks
* All rights reserved.
*
@@ -39,14 +69,14 @@
*/
#ifdef MAKE_BOOTSTRAP
-static char rcsid[] = "$NetBSD: str.c,v 1.19 2003/07/14 18:19:13 christos Exp $";
+static char rcsid[] = "$NetBSD: str.c,v 1.20 2003/08/07 11:14:57 agc Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)str.c 5.8 (Berkeley) 6/1/90";
#else
-__RCSID("$NetBSD: str.c,v 1.19 2003/07/14 18:19:13 christos Exp $");
+__RCSID("$NetBSD: str.c,v 1.20 2003/08/07 11:14:57 agc Exp $");
#endif
#endif /* not lint */
#endif
diff --git a/usr.bin/make/suff.c b/usr.bin/make/suff.c
index 28e42aa348a..334f90cd024 100644
--- a/usr.bin/make/suff.c
+++ b/usr.bin/make/suff.c
@@ -1,8 +1,38 @@
-/* $NetBSD: suff.c,v 1.41 2003/07/14 18:19:13 christos Exp $ */
+/* $NetBSD: suff.c,v 1.42 2003/08/07 11:14:57 agc Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
* The Regents of the University of California. All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Adam de Boor.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+/*
* Copyright (c) 1989 by Berkeley Softworks
* All rights reserved.
*
@@ -39,14 +69,14 @@
*/
#ifdef MAKE_BOOTSTRAP
-static char rcsid[] = "$NetBSD: suff.c,v 1.41 2003/07/14 18:19:13 christos Exp $";
+static char rcsid[] = "$NetBSD: suff.c,v 1.42 2003/08/07 11:14:57 agc Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)suff.c 8.4 (Berkeley) 3/21/94";
#else
-__RCSID("$NetBSD: suff.c,v 1.41 2003/07/14 18:19:13 christos Exp $");
+__RCSID("$NetBSD: suff.c,v 1.42 2003/08/07 11:14:57 agc Exp $");
#endif
#endif /* not lint */
#endif
diff --git a/usr.bin/make/targ.c b/usr.bin/make/targ.c
index 89b26205401..ecad32ad089 100644
--- a/usr.bin/make/targ.c
+++ b/usr.bin/make/targ.c
@@ -1,8 +1,38 @@
-/* $NetBSD: targ.c,v 1.29 2003/07/14 18:19:13 christos Exp $ */
+/* $NetBSD: targ.c,v 1.30 2003/08/07 11:14:58 agc Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
* The Regents of the University of California. All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Adam de Boor.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+/*
* Copyright (c) 1989 by Berkeley Softworks
* All rights reserved.
*
@@ -39,14 +69,14 @@
*/
#ifdef MAKE_BOOTSTRAP
-static char rcsid[] = "$NetBSD: targ.c,v 1.29 2003/07/14 18:19:13 christos Exp $";
+static char rcsid[] = "$NetBSD: targ.c,v 1.30 2003/08/07 11:14:58 agc Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)targ.c 8.2 (Berkeley) 3/19/94";
#else
-__RCSID("$NetBSD: targ.c,v 1.29 2003/07/14 18:19:13 christos Exp $");
+__RCSID("$NetBSD: targ.c,v 1.30 2003/08/07 11:14:58 agc Exp $");
#endif
#endif /* not lint */
#endif
diff --git a/usr.bin/make/var.c b/usr.bin/make/var.c
index 4a624e3a038..7d52afaad93 100644
--- a/usr.bin/make/var.c
+++ b/usr.bin/make/var.c
@@ -1,8 +1,38 @@
-/* $NetBSD: var.c,v 1.79 2003/07/31 13:48:11 scw Exp $ */
+/* $NetBSD: var.c,v 1.80 2003/08/07 11:14:59 agc Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
* The Regents of the University of California. All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Adam de Boor.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+/*
* Copyright (c) 1989 by Berkeley Softworks
* All rights reserved.
*
@@ -39,14 +69,14 @@
*/
#ifdef MAKE_BOOTSTRAP
-static char rcsid[] = "$NetBSD: var.c,v 1.79 2003/07/31 13:48:11 scw Exp $";
+static char rcsid[] = "$NetBSD: var.c,v 1.80 2003/08/07 11:14:59 agc Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)var.c 8.3 (Berkeley) 3/19/94";
#else
-__RCSID("$NetBSD: var.c,v 1.79 2003/07/31 13:48:11 scw Exp $");
+__RCSID("$NetBSD: var.c,v 1.80 2003/08/07 11:14:59 agc Exp $");
#endif
#endif /* not lint */
#endif
diff --git a/usr.bin/man/man.1 b/usr.bin/man/man.1
index 4080c110268..492d418a224 100644
--- a/usr.bin/man/man.1
+++ b/usr.bin/man/man.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: man.1,v 1.17 2003/02/25 10:35:47 wiz Exp $
+.\" $NetBSD: man.1,v 1.18 2003/08/07 11:15:10 agc Exp $
.\"
.\" Copyright (c) 1989, 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -11,11 +11,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/man/man.c b/usr.bin/man/man.c
index f93f0d66507..bd3d1f42a13 100644
--- a/usr.bin/man/man.c
+++ b/usr.bin/man/man.c
@@ -1,4 +1,4 @@
-/* $NetBSD: man.c,v 1.29 2002/09/13 15:56:38 thorpej Exp $ */
+/* $NetBSD: man.c,v 1.30 2003/08/07 11:15:10 agc Exp $ */
/*
* Copyright (c) 1987, 1993, 1994, 1995
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -44,7 +40,7 @@ __COPYRIGHT("@(#) Copyright (c) 1987, 1993, 1994, 1995\n\
#if 0
static char sccsid[] = "@(#)man.c 8.17 (Berkeley) 1/31/95";
#else
-__RCSID("$NetBSD: man.c,v 1.29 2002/09/13 15:56:38 thorpej Exp $");
+__RCSID("$NetBSD: man.c,v 1.30 2003/08/07 11:15:10 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/man/man.conf.5 b/usr.bin/man/man.conf.5
index 2266cd4f307..620a0f435ed 100644
--- a/usr.bin/man/man.conf.5
+++ b/usr.bin/man/man.conf.5
@@ -1,4 +1,4 @@
-.\" $NetBSD: man.conf.5,v 1.15 2002/09/30 10:32:16 grant Exp $
+.\" $NetBSD: man.conf.5,v 1.16 2003/08/07 11:15:10 agc Exp $
.\"
.\" Copyright (c) 1989, 1991, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -11,11 +11,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/man/manconf.c b/usr.bin/man/manconf.c
index 7bf893b0256..a0160c10168 100644
--- a/usr.bin/man/manconf.c
+++ b/usr.bin/man/manconf.c
@@ -1,4 +1,4 @@
-/* $NetBSD: manconf.c,v 1.2 2002/09/13 16:34:56 thorpej Exp $ */
+/* $NetBSD: manconf.c,v 1.3 2003/08/07 11:15:11 agc Exp $ */
/*
* Copyright (c) 1989, 1993, 1995
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -43,7 +39,7 @@
static char sccsid[] = "@(#)config.c 8.8 (Berkeley) 1/31/95";
#else
#if defined(__RCSID)
-__RCSID("$NetBSD: manconf.c,v 1.2 2002/09/13 16:34:56 thorpej Exp $");
+__RCSID("$NetBSD: manconf.c,v 1.3 2003/08/07 11:15:11 agc Exp $");
#endif
#endif
#endif /* not lint */
diff --git a/usr.bin/man/manconf.h b/usr.bin/man/manconf.h
index 459f48b1fcc..7596aad90dd 100644
--- a/usr.bin/man/manconf.h
+++ b/usr.bin/man/manconf.h
@@ -1,4 +1,4 @@
-/* $NetBSD: manconf.h,v 1.1 2002/09/13 15:56:39 thorpej Exp $ */
+/* $NetBSD: manconf.h,v 1.2 2003/08/07 11:15:11 agc Exp $ */
/*-
* Copyright (c) 1993
@@ -13,11 +13,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/man/pathnames.h b/usr.bin/man/pathnames.h
index 392c7b71f3d..95c2280d478 100644
--- a/usr.bin/man/pathnames.h
+++ b/usr.bin/man/pathnames.h
@@ -1,4 +1,4 @@
-/* $NetBSD: pathnames.h,v 1.4 1999/07/22 15:09:45 kleink Exp $ */
+/* $NetBSD: pathnames.h,v 1.5 2003/08/07 11:15:11 agc Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/mesg/mesg.1 b/usr.bin/mesg/mesg.1
index fb4f69f66ae..77a17215327 100644
--- a/usr.bin/mesg/mesg.1
+++ b/usr.bin/mesg/mesg.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: mesg.1,v 1.7 2002/02/08 01:36:28 ross Exp $
+.\" $NetBSD: mesg.1,v 1.8 2003/08/07 11:15:12 agc Exp $
.\"
.\" Copyright (c) 1987, 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -11,11 +11,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/mesg/mesg.c b/usr.bin/mesg/mesg.c
index 3fcbe73d60a..f01c361200e 100644
--- a/usr.bin/mesg/mesg.c
+++ b/usr.bin/mesg/mesg.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mesg.c,v 1.5 1997/08/01 04:32:44 mikel Exp $ */
+/* $NetBSD: mesg.c,v 1.6 2003/08/07 11:15:12 agc Exp $ */
/*
* Copyright (c) 1987, 1993
@@ -17,11 +17,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -49,7 +45,7 @@ __COPYRIGHT("@(#) Copyright (c) 1987, 1993\n\
#if 0
static char sccsid[] = "@(#)mesg.c 8.2 (Berkeley) 1/21/94";
#endif
-__RCSID("$NetBSD: mesg.c,v 1.5 1997/08/01 04:32:44 mikel Exp $");
+__RCSID("$NetBSD: mesg.c,v 1.6 2003/08/07 11:15:12 agc Exp $");
#endif /* not lint */
#include <sys/types.h>
diff --git a/usr.bin/mkdep/mkdep.1 b/usr.bin/mkdep/mkdep.1
index c787559b355..e58f84338b4 100644
--- a/usr.bin/mkdep/mkdep.1
+++ b/usr.bin/mkdep/mkdep.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: mkdep.1,v 1.9 2003/02/25 10:35:48 wiz Exp $
+.\" $NetBSD: mkdep.1,v 1.10 2003/08/07 11:15:12 agc Exp $
.\"
.\" Copyright (c) 1987, 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -11,11 +11,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/mkfifo/mkfifo.1 b/usr.bin/mkfifo/mkfifo.1
index bbfcab1e66c..f426a07e775 100644
--- a/usr.bin/mkfifo/mkfifo.1
+++ b/usr.bin/mkfifo/mkfifo.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: mkfifo.1,v 1.9 2002/02/08 01:36:28 ross Exp $
+.\" $NetBSD: mkfifo.1,v 1.10 2003/08/07 11:15:13 agc Exp $
.\"
.\" Copyright (c) 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -14,11 +14,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/mkfifo/mkfifo.c b/usr.bin/mkfifo/mkfifo.c
index 9fd4686ebde..f30663d5ec8 100644
--- a/usr.bin/mkfifo/mkfifo.c
+++ b/usr.bin/mkfifo/mkfifo.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mkfifo.c,v 1.9 2000/10/10 14:30:41 enami Exp $ */
+/* $NetBSD: mkfifo.c,v 1.10 2003/08/07 11:15:13 agc Exp $ */
/*
* Copyright (c) 1990, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -43,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1990, 1993\n\
#if 0
static char sccsid[] = "@(#)mkfifo.c 8.2 (Berkeley) 1/5/94";
#endif
-__RCSID("$NetBSD: mkfifo.c,v 1.9 2000/10/10 14:30:41 enami Exp $");
+__RCSID("$NetBSD: mkfifo.c,v 1.10 2003/08/07 11:15:13 agc Exp $");
#endif /* not lint */
#include <stdio.h>
diff --git a/usr.bin/mklocale/ldef.h b/usr.bin/mklocale/ldef.h
index 53a4bb6ed19..e7c2d01f6c6 100644
--- a/usr.bin/mklocale/ldef.h
+++ b/usr.bin/mklocale/ldef.h
@@ -1,4 +1,4 @@
-/* $NetBSD: ldef.h,v 1.3 2003/03/11 17:23:08 tshiozak Exp $ */
+/* $NetBSD: ldef.h,v 1.4 2003/08/07 11:15:14 agc Exp $ */
/*-
* Copyright (c) 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/mklocale/lex.l b/usr.bin/mklocale/lex.l
index 5a8197e6ac0..8e2e84088f1 100644
--- a/usr.bin/mklocale/lex.l
+++ b/usr.bin/mklocale/lex.l
@@ -1,4 +1,4 @@
-/* $NetBSD: lex.l,v 1.11 2003/04/21 08:41:28 bjh21 Exp $ */
+/* $NetBSD: lex.l,v 1.12 2003/08/07 11:15:14 agc Exp $ */
%{
/*-
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -47,7 +43,7 @@
static char sccsid[] = "@(#)lex.l 8.1 (Berkeley) 6/6/93";
#else
#ifdef __RCSID
-__RCSID("$NetBSD: lex.l,v 1.11 2003/04/21 08:41:28 bjh21 Exp $");
+__RCSID("$NetBSD: lex.l,v 1.12 2003/08/07 11:15:14 agc Exp $");
#endif
#endif
#endif /* not lint */
diff --git a/usr.bin/mklocale/mklocale.1 b/usr.bin/mklocale/mklocale.1
index 799a55fd056..c475de537ba 100644
--- a/usr.bin/mklocale/mklocale.1
+++ b/usr.bin/mklocale/mklocale.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: mklocale.1,v 1.11 2003/05/01 09:45:03 wiz Exp $
+.\" $NetBSD: mklocale.1,v 1.12 2003/08/07 11:15:15 agc Exp $
.\" FreeBSD: src/usr.bin/mklocale/mklocale.1,v 1.6 1999/09/20 09:15:21 phantom Exp
.\"
.\" Copyright (c) 1993, 1994
@@ -15,11 +15,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/mklocale/yacc.y b/usr.bin/mklocale/yacc.y
index 53ff98d4812..42c1c86d8de 100644
--- a/usr.bin/mklocale/yacc.y
+++ b/usr.bin/mklocale/yacc.y
@@ -1,4 +1,4 @@
-/* $NetBSD: yacc.y,v 1.21 2003/07/14 09:22:17 itojun Exp $ */
+/* $NetBSD: yacc.y,v 1.22 2003/08/07 11:15:15 agc Exp $ */
%{
/*-
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -48,7 +44,7 @@ static char sccsid[] = "@(#)yacc.y 8.1 (Berkeley) 6/6/93";
static char rcsid[] = "$FreeBSD$";
#else
#ifdef __RCSID
-__RCSID("$NetBSD: yacc.y,v 1.21 2003/07/14 09:22:17 itojun Exp $");
+__RCSID("$NetBSD: yacc.y,v 1.22 2003/08/07 11:15:15 agc Exp $");
#endif
#endif
#endif /* not lint */
diff --git a/usr.bin/mkstr/mkstr.1 b/usr.bin/mkstr/mkstr.1
index 4691d2e9740..85ab478b598 100644
--- a/usr.bin/mkstr/mkstr.1
+++ b/usr.bin/mkstr/mkstr.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: mkstr.1,v 1.10 2003/03/30 20:50:22 wiz Exp $
+.\" $NetBSD: mkstr.1,v 1.11 2003/08/07 11:15:16 agc Exp $
.\"
.\" Copyright (c) 1980, 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -11,11 +11,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/mkstr/mkstr.c b/usr.bin/mkstr/mkstr.c
index 040c5b6bc95..9773055a19d 100644
--- a/usr.bin/mkstr/mkstr.c
+++ b/usr.bin/mkstr/mkstr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mkstr.c,v 1.10 2003/07/14 09:35:52 itojun Exp $ */
+/* $NetBSD: mkstr.c,v 1.11 2003/08/07 11:15:16 agc Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -43,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 1993\n\
#if 0
static char sccsid[] = "@(#)mkstr.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: mkstr.c,v 1.10 2003/07/14 09:35:52 itojun Exp $");
+__RCSID("$NetBSD: mkstr.c,v 1.11 2003/08/07 11:15:16 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/mktemp/mktemp.1 b/usr.bin/mktemp/mktemp.1
index 11bc9245201..51d63831319 100644
--- a/usr.bin/mktemp/mktemp.1
+++ b/usr.bin/mktemp/mktemp.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: mktemp.1,v 1.8 2002/09/30 11:09:06 grant Exp $
+.\" $NetBSD: mktemp.1,v 1.9 2003/08/07 11:15:16 agc Exp $
.\" From: $FreeBSD: src/usr.bin/mktemp/mktemp.1,v 1.5 1999/08/28 01:04:13 peter Exp $
.\" From: $OpenBSD: mktemp.1,v 1.8 1998/03/19 06:13:37 millert Exp $
.\"
@@ -13,11 +13,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/msgs/msgs.1 b/usr.bin/msgs/msgs.1
index d5423bc4cbf..bc661a673c7 100644
--- a/usr.bin/msgs/msgs.1
+++ b/usr.bin/msgs/msgs.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: msgs.1,v 1.15 2003/02/25 10:35:49 wiz Exp $
+.\" $NetBSD: msgs.1,v 1.16 2003/08/07 11:15:17 agc Exp $
.\"
.\" Copyright (c) 1980, 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -11,11 +11,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/msgs/msgs.c b/usr.bin/msgs/msgs.c
index e452c09c2e0..6af60ac78a3 100644
--- a/usr.bin/msgs/msgs.c
+++ b/usr.bin/msgs/msgs.c
@@ -1,4 +1,4 @@
-/* $NetBSD: msgs.c,v 1.17 2001/07/01 00:20:47 mjl Exp $ */
+/* $NetBSD: msgs.c,v 1.18 2003/08/07 11:15:17 agc Exp $ */
/*-
* Copyright (c) 1980, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -43,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 1993\n\
#if 0
static char sccsid[] = "@(#)msgs.c 8.2 (Berkeley) 4/28/95";
#else
-__RCSID("$NetBSD: msgs.c,v 1.17 2001/07/01 00:20:47 mjl Exp $");
+__RCSID("$NetBSD: msgs.c,v 1.18 2003/08/07 11:15:17 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/msgs/pathnames.h b/usr.bin/msgs/pathnames.h
index 7d4ddb06bbf..0b0b618d35f 100644
--- a/usr.bin/msgs/pathnames.h
+++ b/usr.bin/msgs/pathnames.h
@@ -1,4 +1,4 @@
-/* $NetBSD: pathnames.h,v 1.3 1995/09/28 06:57:41 tls Exp $ */
+/* $NetBSD: pathnames.h,v 1.4 2003/08/07 11:15:18 agc Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/netstat/atalk.c b/usr.bin/netstat/atalk.c
index 91db31c8059..3cb6cf14f0f 100644
--- a/usr.bin/netstat/atalk.c
+++ b/usr.bin/netstat/atalk.c
@@ -1,4 +1,4 @@
-/* $NetBSD: atalk.c,v 1.7 2001/08/19 02:01:24 itojun Exp $ */
+/* $NetBSD: atalk.c,v 1.8 2003/08/07 11:15:18 agc Exp $ */
/*
* Copyright (c) 1983, 1988, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "from @(#)atalk.c 1.1 (Whistle) 6/6/96";
#else
-__RCSID("$NetBSD: atalk.c,v 1.7 2001/08/19 02:01:24 itojun Exp $");
+__RCSID("$NetBSD: atalk.c,v 1.8 2003/08/07 11:15:18 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/netstat/if.c b/usr.bin/netstat/if.c
index 7071151f744..f1fefee7eec 100644
--- a/usr.bin/netstat/if.c
+++ b/usr.bin/netstat/if.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if.c,v 1.54 2003/05/14 23:36:32 itojun Exp $ */
+/* $NetBSD: if.c,v 1.55 2003/08/07 11:15:18 agc Exp $ */
/*
* Copyright (c) 1983, 1988, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "from: @(#)if.c 8.2 (Berkeley) 2/21/94";
#else
-__RCSID("$NetBSD: if.c,v 1.54 2003/05/14 23:36:32 itojun Exp $");
+__RCSID("$NetBSD: if.c,v 1.55 2003/08/07 11:15:18 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/netstat/inet.c b/usr.bin/netstat/inet.c
index aece210d8a3..e3374e7e426 100644
--- a/usr.bin/netstat/inet.c
+++ b/usr.bin/netstat/inet.c
@@ -1,4 +1,4 @@
-/* $NetBSD: inet.c,v 1.57 2003/07/20 16:35:11 he Exp $ */
+/* $NetBSD: inet.c,v 1.58 2003/08/07 11:15:19 agc Exp $ */
/*
* Copyright (c) 1983, 1988, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "from: @(#)inet.c 8.4 (Berkeley) 4/20/94";
#else
-__RCSID("$NetBSD: inet.c,v 1.57 2003/07/20 16:35:11 he Exp $");
+__RCSID("$NetBSD: inet.c,v 1.58 2003/08/07 11:15:19 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/netstat/inet6.c b/usr.bin/netstat/inet6.c
index 6cd54d7033a..3344cb5c77e 100644
--- a/usr.bin/netstat/inet6.c
+++ b/usr.bin/netstat/inet6.c
@@ -1,4 +1,4 @@
-/* $NetBSD: inet6.c,v 1.27 2003/05/14 23:36:32 itojun Exp $ */
+/* $NetBSD: inet6.c,v 1.28 2003/08/07 11:15:19 agc Exp $ */
/* BSDI inet.c,v 2.3 1995/10/24 02:19:29 prb Exp */
/*
@@ -42,11 +42,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -68,7 +64,7 @@
#if 0
static char sccsid[] = "@(#)inet.c 8.4 (Berkeley) 4/20/94";
#else
-__RCSID("$NetBSD: inet6.c,v 1.27 2003/05/14 23:36:32 itojun Exp $");
+__RCSID("$NetBSD: inet6.c,v 1.28 2003/08/07 11:15:19 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/netstat/ipsec.c b/usr.bin/netstat/ipsec.c
index dc52bd525ae..36c6ce54de1 100644
--- a/usr.bin/netstat/ipsec.c
+++ b/usr.bin/netstat/ipsec.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ipsec.c,v 1.9 2003/07/25 10:11:40 itojun Exp $ */
+/* $NetBSD: ipsec.c,v 1.10 2003/08/07 11:15:19 agc Exp $ */
/* $KAME: ipsec.c,v 1.33 2003/07/25 09:54:32 itojun Exp $ */
/*
@@ -42,11 +42,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -69,7 +65,7 @@
static char sccsid[] = "from: @(#)inet.c 8.4 (Berkeley) 4/20/94";
#else
#ifdef __NetBSD__
-__RCSID("$NetBSD: ipsec.c,v 1.9 2003/07/25 10:11:40 itojun Exp $");
+__RCSID("$NetBSD: ipsec.c,v 1.10 2003/08/07 11:15:19 agc Exp $");
#endif
#endif
#endif /* not lint */
diff --git a/usr.bin/netstat/iso.c b/usr.bin/netstat/iso.c
index be8f8ef1cf7..f9326f2cdad 100644
--- a/usr.bin/netstat/iso.c
+++ b/usr.bin/netstat/iso.c
@@ -1,4 +1,4 @@
-/* $NetBSD: iso.c,v 1.22 2001/05/28 04:22:55 assar Exp $ */
+/* $NetBSD: iso.c,v 1.23 2003/08/07 11:15:20 agc Exp $ */
/*
* Copyright (c) 1983, 1988, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "from: @(#)iso.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: iso.c,v 1.22 2001/05/28 04:22:55 assar Exp $");
+__RCSID("$NetBSD: iso.c,v 1.23 2003/08/07 11:15:20 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/netstat/main.c b/usr.bin/netstat/main.c
index 5a54ea51098..92a8d1aaee5 100644
--- a/usr.bin/netstat/main.c
+++ b/usr.bin/netstat/main.c
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.41 2003/04/18 03:21:01 lukem Exp $ */
+/* $NetBSD: main.c,v 1.42 2003/08/07 11:15:20 agc Exp $ */
/*
* Copyright (c) 1983, 1988, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -43,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1983, 1988, 1993\n\
#if 0
static char sccsid[] = "from: @(#)main.c 8.4 (Berkeley) 3/1/94";
#else
-__RCSID("$NetBSD: main.c,v 1.41 2003/04/18 03:21:01 lukem Exp $");
+__RCSID("$NetBSD: main.c,v 1.42 2003/08/07 11:15:20 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/netstat/mbuf.c b/usr.bin/netstat/mbuf.c
index 95877808c35..048547232d3 100644
--- a/usr.bin/netstat/mbuf.c
+++ b/usr.bin/netstat/mbuf.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mbuf.c,v 1.20 2003/02/27 08:07:14 enami Exp $ */
+/* $NetBSD: mbuf.c,v 1.21 2003/08/07 11:15:20 agc Exp $ */
/*
* Copyright (c) 1983, 1988, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "from: @(#)mbuf.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: mbuf.c,v 1.20 2003/02/27 08:07:14 enami Exp $");
+__RCSID("$NetBSD: mbuf.c,v 1.21 2003/08/07 11:15:20 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/netstat/mroute.c b/usr.bin/netstat/mroute.c
index 2bb1bd06f13..29789c825f6 100644
--- a/usr.bin/netstat/mroute.c
+++ b/usr.bin/netstat/mroute.c
@@ -1,7 +1,6 @@
-/* $NetBSD: mroute.c,v 1.16 2003/04/15 08:07:10 itojun Exp $ */
+/* $NetBSD: mroute.c,v 1.17 2003/08/07 11:15:21 agc Exp $ */
/*
- * Copyright (c) 1989 Stephen Deering
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
@@ -16,6 +15,39 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * from: @(#)mroute.c 8.1 (Berkeley) 6/6/93
+ */
+
+/*
+ * Copyright (c) 1989 Stephen Deering
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Stephen Deering of Stanford University.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* This product includes software developed by the University of
@@ -44,7 +76,7 @@
#if 0
static char sccsid[] = "from: @(#)mroute.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: mroute.c,v 1.16 2003/04/15 08:07:10 itojun Exp $");
+__RCSID("$NetBSD: mroute.c,v 1.17 2003/08/07 11:15:21 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/netstat/mroute6.c b/usr.bin/netstat/mroute6.c
index 1c6572c6a3a..11d1ab27c90 100644
--- a/usr.bin/netstat/mroute6.c
+++ b/usr.bin/netstat/mroute6.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mroute6.c,v 1.10 2002/07/03 07:35:40 itojun Exp $ */
+/* $NetBSD: mroute6.c,v 1.11 2003/08/07 11:15:21 agc Exp $ */
/*
* Copyright (C) 1998 WIDE Project.
@@ -30,7 +30,6 @@
*/
/*
- * Copyright (c) 1989 Stephen Deering
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
@@ -45,6 +44,39 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * @(#)mroute.c 8.2 (Berkeley) 4/28/95
+ */
+
+/*
+ * Copyright (c) 1989 Stephen Deering
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Stephen Deering of Stanford University.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* This product includes software developed by the University of
diff --git a/usr.bin/netstat/netstat.1 b/usr.bin/netstat/netstat.1
index 05e3831d926..af9c984d62e 100644
--- a/usr.bin/netstat/netstat.1
+++ b/usr.bin/netstat/netstat.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: netstat.1,v 1.39 2003/03/02 01:59:06 itojun Exp $
+.\" $NetBSD: netstat.1,v 1.40 2003/08/07 11:15:21 agc Exp $
.\"
.\" Copyright (c) 1983, 1990, 1992, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -11,11 +11,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/netstat/netstat.h b/usr.bin/netstat/netstat.h
index 059a37c1d1f..0eb47f56f3a 100644
--- a/usr.bin/netstat/netstat.h
+++ b/usr.bin/netstat/netstat.h
@@ -1,4 +1,4 @@
-/* $NetBSD: netstat.h,v 1.27 2003/02/26 06:31:21 matt Exp $ */
+/* $NetBSD: netstat.h,v 1.28 2003/08/07 11:15:21 agc Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/netstat/ns.c b/usr.bin/netstat/ns.c
index 2fe8498e7a0..aa1d7b9c5ef 100644
--- a/usr.bin/netstat/ns.c
+++ b/usr.bin/netstat/ns.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ns.c,v 1.13 2001/06/19 13:42:22 wiz Exp $ */
+/* $NetBSD: ns.c,v 1.14 2003/08/07 11:15:21 agc Exp $ */
/*
* Copyright (c) 1983, 1988, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "from: @(#)ns.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: ns.c,v 1.13 2001/06/19 13:42:22 wiz Exp $");
+__RCSID("$NetBSD: ns.c,v 1.14 2003/08/07 11:15:21 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/netstat/route.c b/usr.bin/netstat/route.c
index ee33997ed67..8afbb3ab31a 100644
--- a/usr.bin/netstat/route.c
+++ b/usr.bin/netstat/route.c
@@ -1,4 +1,4 @@
-/* $NetBSD: route.c,v 1.62 2003/08/04 11:10:33 itojun Exp $ */
+/* $NetBSD: route.c,v 1.63 2003/08/07 11:15:21 agc Exp $ */
/*
* Copyright (c) 1983, 1988, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "from: @(#)route.c 8.3 (Berkeley) 3/9/94";
#else
-__RCSID("$NetBSD: route.c,v 1.62 2003/08/04 11:10:33 itojun Exp $");
+__RCSID("$NetBSD: route.c,v 1.63 2003/08/07 11:15:21 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/netstat/unix.c b/usr.bin/netstat/unix.c
index 7ef4ec8251c..325bb40909c 100644
--- a/usr.bin/netstat/unix.c
+++ b/usr.bin/netstat/unix.c
@@ -1,4 +1,4 @@
-/* $NetBSD: unix.c,v 1.20 2003/02/02 02:37:21 christos Exp $ */
+/* $NetBSD: unix.c,v 1.21 2003/08/07 11:15:22 agc Exp $ */
/*-
* Copyright (c) 1983, 1988, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "from: @(#)unix.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: unix.c,v 1.20 2003/02/02 02:37:21 christos Exp $");
+__RCSID("$NetBSD: unix.c,v 1.21 2003/08/07 11:15:22 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/nfsstat/nfsstat.1 b/usr.bin/nfsstat/nfsstat.1
index f0ef103381f..6bf8550fa79 100644
--- a/usr.bin/nfsstat/nfsstat.1
+++ b/usr.bin/nfsstat/nfsstat.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: nfsstat.1,v 1.12 2001/05/06 23:48:32 wiz Exp $
+.\" $NetBSD: nfsstat.1,v 1.13 2003/08/07 11:15:22 agc Exp $
.\"
.\" Copyright (c) 1989, 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -11,11 +11,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/nfsstat/nfsstat.c b/usr.bin/nfsstat/nfsstat.c
index 003474e8d21..94be7c1f0ff 100644
--- a/usr.bin/nfsstat/nfsstat.c
+++ b/usr.bin/nfsstat/nfsstat.c
@@ -1,4 +1,4 @@
-/* $NetBSD: nfsstat.c,v 1.17 2001/03/19 05:45:30 lukem Exp $ */
+/* $NetBSD: nfsstat.c,v 1.18 2003/08/07 11:15:22 agc Exp $ */
/*
* Copyright (c) 1983, 1989, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -46,7 +42,7 @@ __COPYRIGHT("@(#) Copyright (c) 1983, 1989, 1993\n\
#if 0
static char sccsid[] = "from: @(#)nfsstat.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: nfsstat.c,v 1.17 2001/03/19 05:45:30 lukem Exp $");
+__RCSID("$NetBSD: nfsstat.c,v 1.18 2003/08/07 11:15:22 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/nice/nice.1 b/usr.bin/nice/nice.1
index 1b5f6600154..87a5c93e47a 100644
--- a/usr.bin/nice/nice.1
+++ b/usr.bin/nice/nice.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: nice.1,v 1.13 2002/09/30 11:09:07 grant Exp $
+.\" $NetBSD: nice.1,v 1.14 2003/08/07 11:15:23 agc Exp $
.\"
.\" Copyright (c) 1980, 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -11,11 +11,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/nice/nice.c b/usr.bin/nice/nice.c
index 076b83dffbe..a28b82a62c5 100644
--- a/usr.bin/nice/nice.c
+++ b/usr.bin/nice/nice.c
@@ -1,4 +1,4 @@
-/* $NetBSD: nice.c,v 1.11 1998/12/19 20:11:20 christos Exp $ */
+/* $NetBSD: nice.c,v 1.12 2003/08/07 11:15:24 agc Exp $ */
/*
* Copyright (c) 1989 The Regents of the University of California.
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -44,7 +40,7 @@ __COPYRIGHT(
#if 0
static char sccsid[] = "@(#)nice.c 5.4 (Berkeley) 6/1/90";
#endif
-__RCSID("$NetBSD: nice.c,v 1.11 1998/12/19 20:11:20 christos Exp $");
+__RCSID("$NetBSD: nice.c,v 1.12 2003/08/07 11:15:24 agc Exp $");
#endif /* not lint */
#include <sys/types.h>
diff --git a/usr.bin/nohup/nohup.1 b/usr.bin/nohup/nohup.1
index deb5209bdf8..d76c12a8cf4 100644
--- a/usr.bin/nohup/nohup.1
+++ b/usr.bin/nohup/nohup.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: nohup.1,v 1.11 2003/02/25 10:35:50 wiz Exp $
+.\" $NetBSD: nohup.1,v 1.12 2003/08/07 11:15:24 agc Exp $
.\"
.\" Copyright (c) 1989, 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -14,11 +14,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/nohup/nohup.c b/usr.bin/nohup/nohup.c
index 7d5f2dbb5cc..481a82cbc9a 100644
--- a/usr.bin/nohup/nohup.c
+++ b/usr.bin/nohup/nohup.c
@@ -1,4 +1,4 @@
-/* $NetBSD: nohup.c,v 1.11 2003/07/14 09:31:16 itojun Exp $ */
+/* $NetBSD: nohup.c,v 1.12 2003/08/07 11:15:25 agc Exp $ */
/*
* Copyright (c) 1989 The Regents of the University of California.
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -44,7 +40,7 @@ __COPYRIGHT(
#if 0
static char sccsid[] = "@(#)nohup.c 5.4 (Berkeley) 6/1/90";
#endif
-__RCSID("$NetBSD: nohup.c,v 1.11 2003/07/14 09:31:16 itojun Exp $");
+__RCSID("$NetBSD: nohup.c,v 1.12 2003/08/07 11:15:25 agc Exp $");
#endif /* not lint */
#include <sys/param.h>
diff --git a/usr.bin/pagesize/pagesize.1 b/usr.bin/pagesize/pagesize.1
index b728e6fab85..d693384bfa3 100644
--- a/usr.bin/pagesize/pagesize.1
+++ b/usr.bin/pagesize/pagesize.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: pagesize.1,v 1.7 1999/03/22 18:16:41 garbled Exp $
+.\" $NetBSD: pagesize.1,v 1.8 2003/08/07 11:15:25 agc Exp $
.\"
.\" Copyright (c) 1983, 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -11,11 +11,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/passwd/extern.h b/usr.bin/passwd/extern.h
index 3d72a701716..32e3cd85ebd 100644
--- a/usr.bin/passwd/extern.h
+++ b/usr.bin/passwd/extern.h
@@ -1,4 +1,4 @@
-/* $NetBSD: extern.h,v 1.8 2000/07/06 11:17:25 ad Exp $ */
+/* $NetBSD: extern.h,v 1.9 2003/08/07 11:15:26 agc Exp $ */
/*
* Copyright (c) 1994
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/passwd/local_passwd.c b/usr.bin/passwd/local_passwd.c
index 311594c6f9d..08b2807ddb5 100644
--- a/usr.bin/passwd/local_passwd.c
+++ b/usr.bin/passwd/local_passwd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: local_passwd.c,v 1.25 2002/11/16 04:41:50 itojun Exp $ */
+/* $NetBSD: local_passwd.c,v 1.26 2003/08/07 11:15:26 agc Exp $ */
/*-
* Copyright (c) 1990, 1993, 1994
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "from: @(#)local_passwd.c 8.3 (Berkeley) 4/2/94";
#else
-__RCSID("$NetBSD: local_passwd.c,v 1.25 2002/11/16 04:41:50 itojun Exp $");
+__RCSID("$NetBSD: local_passwd.c,v 1.26 2003/08/07 11:15:26 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/passwd/passwd.1 b/usr.bin/passwd/passwd.1
index 8dc323a4476..67a4f6eb785 100644
--- a/usr.bin/passwd/passwd.1
+++ b/usr.bin/passwd/passwd.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: passwd.1,v 1.20 2003/04/05 18:06:52 lha Exp $
+.\" $NetBSD: passwd.1,v 1.21 2003/08/07 11:15:26 agc Exp $
.\"
.\" Copyright (c) 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -11,11 +11,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/passwd/passwd.c b/usr.bin/passwd/passwd.c
index 1a42cfc7b7e..72d1ffe112b 100644
--- a/usr.bin/passwd/passwd.c
+++ b/usr.bin/passwd/passwd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: passwd.c,v 1.22 2001/03/28 03:17:42 simonb Exp $ */
+/* $NetBSD: passwd.c,v 1.23 2003/08/07 11:15:27 agc Exp $ */
/*
* Copyright (c) 1988, 1993, 1994
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -43,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1988, 1993, 1994\n\
#if 0
static char sccsid[] = "from: @(#)passwd.c 8.3 (Berkeley) 4/2/94";
#else
-__RCSID("$NetBSD: passwd.c,v 1.22 2001/03/28 03:17:42 simonb Exp $");
+__RCSID("$NetBSD: passwd.c,v 1.23 2003/08/07 11:15:27 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/passwd/yp_passwd.c b/usr.bin/passwd/yp_passwd.c
index 6186e54c676..1d42f1acc03 100644
--- a/usr.bin/passwd/yp_passwd.c
+++ b/usr.bin/passwd/yp_passwd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: yp_passwd.c,v 1.26 2002/11/16 15:59:28 itojun Exp $ */
+/* $NetBSD: yp_passwd.c,v 1.27 2003/08/07 11:15:27 agc Exp $ */
/*
* Copyright (c) 1988, 1990, 1993, 1994
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "from: @(#)local_passwd.c 8.3 (Berkeley) 4/2/94";
#else
-__RCSID("$NetBSD: yp_passwd.c,v 1.26 2002/11/16 15:59:28 itojun Exp $");
+__RCSID("$NetBSD: yp_passwd.c,v 1.27 2003/08/07 11:15:27 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/paste/paste.1 b/usr.bin/paste/paste.1
index e12d90587aa..2cfd0b219aa 100644
--- a/usr.bin/paste/paste.1
+++ b/usr.bin/paste/paste.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: paste.1,v 1.6 2002/02/08 01:36:30 ross Exp $
+.\" $NetBSD: paste.1,v 1.7 2003/08/07 11:15:28 agc Exp $
.\"
.\" Copyright (c) 1989, 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -15,11 +15,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
@@ -36,7 +32,7 @@
.\" SUCH DAMAGE.
.\"
.\" from: @(#)paste.1 8.1 (Berkeley) 6/6/93
-.\" $NetBSD: paste.1,v 1.6 2002/02/08 01:36:30 ross Exp $
+.\" $NetBSD: paste.1,v 1.7 2003/08/07 11:15:28 agc Exp $
.\"
.Dd June 6, 1993
.Dt PASTE 1
diff --git a/usr.bin/paste/paste.c b/usr.bin/paste/paste.c
index d3abe02b677..6aaa30f49c8 100644
--- a/usr.bin/paste/paste.c
+++ b/usr.bin/paste/paste.c
@@ -1,4 +1,4 @@
-/* $NetBSD: paste.c,v 1.6 1998/10/13 17:02:16 wsanchez Exp $ */
+/* $NetBSD: paste.c,v 1.7 2003/08/07 11:15:28 agc Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -44,7 +40,7 @@ __COPYRIGHT("@(#) Copyright (c) 1989, 1993\n\
#ifndef lint
/*static char sccsid[] = "from: @(#)paste.c 8.1 (Berkeley) 6/6/93";*/
-__RCSID("$NetBSD: paste.c,v 1.6 1998/10/13 17:02:16 wsanchez Exp $");
+__RCSID("$NetBSD: paste.c,v 1.7 2003/08/07 11:15:28 agc Exp $");
#endif /* not lint */
#include <sys/types.h>
diff --git a/usr.bin/pr/egetopt.c b/usr.bin/pr/egetopt.c
index 47ff96d0e82..816e39e483e 100644
--- a/usr.bin/pr/egetopt.c
+++ b/usr.bin/pr/egetopt.c
@@ -1,7 +1,6 @@
-/* $NetBSD: egetopt.c,v 1.5 2002/02/26 02:37:30 wiz Exp $ */
+/* $NetBSD: egetopt.c,v 1.6 2003/08/07 11:15:29 agc Exp $ */
/*-
- * Copyright (c) 1991 Keith Muller.
* Copyright (c) 1993
* The Regents of the University of California. All rights reserved.
*
@@ -16,6 +15,37 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+/*-
+ * Copyright (c) 1991 Keith Muller.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Keith Muller of the University of California, San Diego.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* This product includes software developed by the University of
@@ -42,7 +72,7 @@
#if 0
from: static char sccsid[] = "@(#)egetopt.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: egetopt.c,v 1.5 2002/02/26 02:37:30 wiz Exp $");
+__RCSID("$NetBSD: egetopt.c,v 1.6 2003/08/07 11:15:29 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/pr/extern.h b/usr.bin/pr/extern.h
index f010149e4aa..2ff372918c5 100644
--- a/usr.bin/pr/extern.h
+++ b/usr.bin/pr/extern.h
@@ -1,7 +1,6 @@
-/* $NetBSD: extern.h,v 1.2 1997/01/09 15:01:35 tls Exp $ */
+/* $NetBSD: extern.h,v 1.3 2003/08/07 11:15:29 agc Exp $ */
/*-
- * Copyright (c) 1991 Keith Muller.
* Copyright (c) 1993
* The Regents of the University of California. All rights reserved.
*
@@ -16,6 +15,40 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * from: @(#)extern.h 8.1 (Berkeley) 6/6/93
+ * $NetBSD: extern.h,v 1.3 2003/08/07 11:15:29 agc Exp $
+ */
+
+/*-
+ * Copyright (c) 1991 Keith Muller.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Keith Muller of the University of California, San Diego.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* This product includes software developed by the University of
@@ -37,7 +70,7 @@
* SUCH DAMAGE.
*
* from: @(#)extern.h 8.1 (Berkeley) 6/6/93
- * $NetBSD: extern.h,v 1.2 1997/01/09 15:01:35 tls Exp $
+ * $NetBSD: extern.h,v 1.3 2003/08/07 11:15:29 agc Exp $
*/
extern int eoptind;
diff --git a/usr.bin/pr/pr.1 b/usr.bin/pr/pr.1
index e74b1a45ebb..fc6d3fe47fb 100644
--- a/usr.bin/pr/pr.1
+++ b/usr.bin/pr/pr.1
@@ -1,6 +1,5 @@
-.\" $NetBSD: pr.1,v 1.14 2003/02/25 10:35:51 wiz Exp $
+.\" $NetBSD: pr.1,v 1.15 2003/08/07 11:15:30 agc Exp $
.\"
-.\" Copyright (c) 1991 Keith Muller.
.\" Copyright (c) 1993
.\" The Regents of the University of California. All rights reserved.
.\"
@@ -15,6 +14,35 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
+.\" 3. Neither the name of the University nor the names of its contributors
+.\" may be used to endorse or promote products derived from this software
+.\" without specific prior written permission.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.\" Copyright (c) 1991 Keith Muller.
+.\"
+.\" This code is derived from software contributed to Berkeley by
+.\" Keith Muller of the University of California, San Diego.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\" 1. Redistributions of source code must retain the above copyright
+.\" notice, this list of conditions and the following disclaimer.
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\" notice, this list of conditions and the following disclaimer in the
+.\" documentation and/or other materials provided with the distribution.
.\" 3. All advertising materials mentioning features or use of this software
.\" must display the following acknowledgement:
.\" This product includes software developed by the University of
@@ -36,7 +64,7 @@
.\" SUCH DAMAGE.
.\"
.\" from: @(#)pr.1 8.1 (Berkeley) 6/6/93
-.\" $NetBSD: pr.1,v 1.14 2003/02/25 10:35:51 wiz Exp $
+.\" $NetBSD: pr.1,v 1.15 2003/08/07 11:15:30 agc Exp $
.\"
.Dd June 6, 1993
.Dt PR 1
diff --git a/usr.bin/pr/pr.c b/usr.bin/pr/pr.c
index 3460863f457..8970603fdd5 100644
--- a/usr.bin/pr/pr.c
+++ b/usr.bin/pr/pr.c
@@ -1,7 +1,6 @@
-/* $NetBSD: pr.c,v 1.10 2001/07/22 13:34:13 wiz Exp $ */
+/* $NetBSD: pr.c,v 1.11 2003/08/07 11:15:30 agc Exp $ */
/*-
- * Copyright (c) 1991 Keith Muller.
* Copyright (c) 1993
* The Regents of the University of California. All rights reserved.
*
@@ -16,6 +15,37 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+/*-
+ * Copyright (c) 1991 Keith Muller.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Keith Muller of the University of California, San Diego.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* This product includes software developed by the University of
@@ -47,7 +77,7 @@ __COPYRIGHT("@(#) Copyright (c) 1993\n\
#if 0
from: static char sccsid[] = "@(#)pr.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: pr.c,v 1.10 2001/07/22 13:34:13 wiz Exp $");
+__RCSID("$NetBSD: pr.c,v 1.11 2003/08/07 11:15:30 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/pr/pr.h b/usr.bin/pr/pr.h
index af0817d937c..7f63bed01fa 100644
--- a/usr.bin/pr/pr.h
+++ b/usr.bin/pr/pr.h
@@ -1,7 +1,6 @@
-/* $NetBSD: pr.h,v 1.2 1997/01/09 15:01:37 tls Exp $ */
+/* $NetBSD: pr.h,v 1.3 2003/08/07 11:15:30 agc Exp $ */
/*-
- * Copyright (c) 1991 Keith Muller.
* Copyright (c) 1993
* The Regents of the University of California. All rights reserved.
*
@@ -16,6 +15,40 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * from: @(#)pr.h 8.1 (Berkeley) 6/6/93
+ * $NetBSD: pr.h,v 1.3 2003/08/07 11:15:30 agc Exp $
+ */
+
+/*-
+ * Copyright (c) 1991 Keith Muller.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Keith Muller of the University of California, San Diego.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* This product includes software developed by the University of
@@ -37,7 +70,7 @@
* SUCH DAMAGE.
*
* from: @(#)pr.h 8.1 (Berkeley) 6/6/93
- * $NetBSD: pr.h,v 1.2 1997/01/09 15:01:37 tls Exp $
+ * $NetBSD: pr.h,v 1.3 2003/08/07 11:15:30 agc Exp $
*/
/*
diff --git a/usr.bin/printenv/printenv.1 b/usr.bin/printenv/printenv.1
index ec03e2746fe..d2b997c1ddf 100644
--- a/usr.bin/printenv/printenv.1
+++ b/usr.bin/printenv/printenv.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: printenv.1,v 1.6 2002/09/30 11:09:09 grant Exp $
+.\" $NetBSD: printenv.1,v 1.7 2003/08/07 11:15:31 agc Exp $
.\"
.\" Copyright (c) 1980, 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -13,11 +13,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
@@ -34,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" from: @(#)printenv.1 8.1 (Berkeley) 6/6/93
-.\" $NetBSD: printenv.1,v 1.6 2002/09/30 11:09:09 grant Exp $
+.\" $NetBSD: printenv.1,v 1.7 2003/08/07 11:15:31 agc Exp $
.\"
.Dd June 6, 1993
.Dt PRINTENV 1
diff --git a/usr.bin/printenv/printenv.c b/usr.bin/printenv/printenv.c
index ff2324e6caf..e1547ae8017 100644
--- a/usr.bin/printenv/printenv.c
+++ b/usr.bin/printenv/printenv.c
@@ -1,4 +1,4 @@
-/* $NetBSD: printenv.c,v 1.7 1999/09/10 04:05:28 simonb Exp $ */
+/* $NetBSD: printenv.c,v 1.8 2003/08/07 11:15:31 agc Exp $ */
/*
* Copyright (c) 1987, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@ __COPYRIGHT("@(#) Copyright (c) 1987, 1993\n\
#ifndef lint
/*static char sccsid[] = "from: @(#)printenv.c 8.2 (Berkeley) 5/4/95";*/
-__RCSID("$NetBSD: printenv.c,v 1.7 1999/09/10 04:05:28 simonb Exp $");
+__RCSID("$NetBSD: printenv.c,v 1.8 2003/08/07 11:15:31 agc Exp $");
#endif /* not lint */
#include <sys/types.h>
diff --git a/usr.bin/printf/printf.1 b/usr.bin/printf/printf.1
index 76afe0c3dc2..408c260a757 100644
--- a/usr.bin/printf/printf.1
+++ b/usr.bin/printf/printf.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: printf.1,v 1.19 2003/04/28 09:38:19 wiz Exp $
+.\" $NetBSD: printf.1,v 1.20 2003/08/07 11:15:32 agc Exp $
.\"
.\" Copyright (c) 1989, 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -14,11 +14,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/printf/printf.c b/usr.bin/printf/printf.c
index ecc9a33a14c..9456f94d2d6 100644
--- a/usr.bin/printf/printf.c
+++ b/usr.bin/printf/printf.c
@@ -1,4 +1,4 @@
-/* $NetBSD: printf.c,v 1.28 2003/06/25 12:56:59 dsl Exp $ */
+/* $NetBSD: printf.c,v 1.29 2003/08/07 11:15:33 agc Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -45,7 +41,7 @@ __COPYRIGHT("@(#) Copyright (c) 1989, 1993\n\
#if 0
static char sccsid[] = "@(#)printf.c 8.2 (Berkeley) 3/22/95";
#else
-__RCSID("$NetBSD: printf.c,v 1.28 2003/06/25 12:56:59 dsl Exp $");
+__RCSID("$NetBSD: printf.c,v 1.29 2003/08/07 11:15:33 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/quota/quota.1 b/usr.bin/quota/quota.1
index 54ae728aed3..f651066d000 100644
--- a/usr.bin/quota/quota.1
+++ b/usr.bin/quota/quota.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: quota.1,v 1.13 2003/02/25 10:35:51 wiz Exp $
+.\" $NetBSD: quota.1,v 1.14 2003/08/07 11:15:34 agc Exp $
.\"
.\" Copyright (c) 1983, 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -14,11 +14,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/quota/quota.c b/usr.bin/quota/quota.c
index 19824ecf4f0..0d60264731e 100644
--- a/usr.bin/quota/quota.c
+++ b/usr.bin/quota/quota.c
@@ -1,4 +1,4 @@
-/* $NetBSD: quota.c,v 1.25 2003/02/14 14:55:59 bouyer Exp $ */
+/* $NetBSD: quota.c,v 1.26 2003/08/07 11:15:34 agc Exp $ */
/*
* Copyright (c) 1980, 1990, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -46,7 +42,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 1990, 1993\n\
#if 0
static char sccsid[] = "@(#)quota.c 8.4 (Berkeley) 4/28/95";
#else
-__RCSID("$NetBSD: quota.c,v 1.25 2003/02/14 14:55:59 bouyer Exp $");
+__RCSID("$NetBSD: quota.c,v 1.26 2003/08/07 11:15:34 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/rdist/defs.h b/usr.bin/rdist/defs.h
index fc3c7fb9ffe..fea2e8379e7 100644
--- a/usr.bin/rdist/defs.h
+++ b/usr.bin/rdist/defs.h
@@ -1,4 +1,4 @@
-/* $NetBSD: defs.h,v 1.15 2002/12/06 03:09:28 thorpej Exp $ */
+/* $NetBSD: defs.h,v 1.16 2003/08/07 11:15:35 agc Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/rdist/docmd.c b/usr.bin/rdist/docmd.c
index 9b998ace345..e52217d17c7 100644
--- a/usr.bin/rdist/docmd.c
+++ b/usr.bin/rdist/docmd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: docmd.c,v 1.24 2003/07/23 04:11:12 itojun Exp $ */
+/* $NetBSD: docmd.c,v 1.25 2003/08/07 11:15:35 agc Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)docmd.c 8.1 (Berkeley) 6/9/93";
#else
-__RCSID("$NetBSD: docmd.c,v 1.24 2003/07/23 04:11:12 itojun Exp $");
+__RCSID("$NetBSD: docmd.c,v 1.25 2003/08/07 11:15:35 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/rdist/expand.c b/usr.bin/rdist/expand.c
index 5c016dcd71b..8cd4befc6d9 100644
--- a/usr.bin/rdist/expand.c
+++ b/usr.bin/rdist/expand.c
@@ -1,4 +1,4 @@
-/* $NetBSD: expand.c,v 1.15 2003/07/23 04:11:12 itojun Exp $ */
+/* $NetBSD: expand.c,v 1.16 2003/08/07 11:15:35 agc Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)expand.c 8.1 (Berkeley) 6/9/93";
#else
-__RCSID("$NetBSD: expand.c,v 1.15 2003/07/23 04:11:12 itojun Exp $");
+__RCSID("$NetBSD: expand.c,v 1.16 2003/08/07 11:15:35 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/rdist/gram.y b/usr.bin/rdist/gram.y
index 25834a9e73f..80e8d4ec4a5 100644
--- a/usr.bin/rdist/gram.y
+++ b/usr.bin/rdist/gram.y
@@ -1,5 +1,5 @@
%{
-/* $NetBSD: gram.y,v 1.9 2002/06/14 01:18:55 wiz Exp $ */
+/* $NetBSD: gram.y,v 1.10 2003/08/07 11:15:36 agc Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -13,11 +13,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -39,7 +35,7 @@
#if 0
static char sccsid[] = "@(#)gram.y 8.1 (Berkeley) 6/9/93";
#else
-__RCSID("$NetBSD: gram.y,v 1.9 2002/06/14 01:18:55 wiz Exp $");
+__RCSID("$NetBSD: gram.y,v 1.10 2003/08/07 11:15:36 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/rdist/lookup.c b/usr.bin/rdist/lookup.c
index 4c75909c1fc..ebeccbd5241 100644
--- a/usr.bin/rdist/lookup.c
+++ b/usr.bin/rdist/lookup.c
@@ -1,4 +1,4 @@
-/* $NetBSD: lookup.c,v 1.7 2002/06/14 01:18:55 wiz Exp $ */
+/* $NetBSD: lookup.c,v 1.8 2003/08/07 11:15:36 agc Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)lookup.c 8.1 (Berkeley) 6/9/93";
#else
-__RCSID("$NetBSD: lookup.c,v 1.7 2002/06/14 01:18:55 wiz Exp $");
+__RCSID("$NetBSD: lookup.c,v 1.8 2003/08/07 11:15:36 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/rdist/main.c b/usr.bin/rdist/main.c
index 04485b8a7cc..34f7bb00202 100644
--- a/usr.bin/rdist/main.c
+++ b/usr.bin/rdist/main.c
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.14 2003/07/23 04:11:13 itojun Exp $ */
+/* $NetBSD: main.c,v 1.15 2003/08/07 11:15:36 agc Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -43,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1983, 1993\n\
#if 0
static char sccsid[] = "@(#)main.c 8.1 (Berkeley) 6/9/93";
#else
-__RCSID("$NetBSD: main.c,v 1.14 2003/07/23 04:11:13 itojun Exp $");
+__RCSID("$NetBSD: main.c,v 1.15 2003/08/07 11:15:36 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/rdist/pathnames.h b/usr.bin/rdist/pathnames.h
index 8fe16cb07e1..152f34dbe68 100644
--- a/usr.bin/rdist/pathnames.h
+++ b/usr.bin/rdist/pathnames.h
@@ -1,4 +1,4 @@
-/* $NetBSD: pathnames.h,v 1.4 1996/07/12 00:46:28 thorpej Exp $ */
+/* $NetBSD: pathnames.h,v 1.5 2003/08/07 11:15:37 agc Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/rdist/rdist.1 b/usr.bin/rdist/rdist.1
index d28503f1625..4cc22f906ce 100644
--- a/usr.bin/rdist/rdist.1
+++ b/usr.bin/rdist/rdist.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: rdist.1,v 1.16 2003/02/25 10:35:51 wiz Exp $
+.\" $NetBSD: rdist.1,v 1.17 2003/08/07 11:15:37 agc Exp $
.\"
.\" Copyright (c) 1985, 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -11,11 +11,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/rdist/server.c b/usr.bin/rdist/server.c
index 331c47968d0..bfde7339d90 100644
--- a/usr.bin/rdist/server.c
+++ b/usr.bin/rdist/server.c
@@ -1,4 +1,4 @@
-/* $NetBSD: server.c,v 1.26 2003/07/23 04:11:13 itojun Exp $ */
+/* $NetBSD: server.c,v 1.27 2003/08/07 11:15:38 agc Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)server.c 8.1 (Berkeley) 6/9/93";
#else
-__RCSID("$NetBSD: server.c,v 1.26 2003/07/23 04:11:13 itojun Exp $");
+__RCSID("$NetBSD: server.c,v 1.27 2003/08/07 11:15:38 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/renice/renice.8 b/usr.bin/renice/renice.8
index 519ade50007..1bcd31f066d 100644
--- a/usr.bin/renice/renice.8
+++ b/usr.bin/renice/renice.8
@@ -1,4 +1,4 @@
-.\" $NetBSD: renice.8,v 1.11 2003/02/25 10:35:52 wiz Exp $
+.\" $NetBSD: renice.8,v 1.12 2003/08/07 11:15:38 agc Exp $
.\"
.\" Copyright (c) 1983, 1991, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -11,11 +11,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
@@ -32,7 +28,7 @@
.\" SUCH DAMAGE.
.\"
.\" from: @(#)renice.8 8.1 (Berkeley) 6/9/93
-.\" $NetBSD: renice.8,v 1.11 2003/02/25 10:35:52 wiz Exp $
+.\" $NetBSD: renice.8,v 1.12 2003/08/07 11:15:38 agc Exp $
.\"
.Dd June 9, 1993
.Dt RENICE 8
diff --git a/usr.bin/renice/renice.c b/usr.bin/renice/renice.c
index 9bd623f8a3d..a9ae1085aec 100644
--- a/usr.bin/renice/renice.c
+++ b/usr.bin/renice/renice.c
@@ -1,4 +1,4 @@
-/* $NetBSD: renice.c,v 1.12 2003/04/18 03:21:01 lukem Exp $ */
+/* $NetBSD: renice.c,v 1.13 2003/08/07 11:15:39 agc Exp $ */
/*
* Copyright (c) 1983, 1989, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@ __COPYRIGHT("@(#) Copyright (c) 1983, 1989, 1993\n\
#ifndef lint
/*static char sccsid[] = "from: @(#)renice.c 8.1 (Berkeley) 6/9/93";*/
-__RCSID("$NetBSD: renice.c,v 1.12 2003/04/18 03:21:01 lukem Exp $");
+__RCSID("$NetBSD: renice.c,v 1.13 2003/08/07 11:15:39 agc Exp $");
#endif /* not lint */
#include <sys/resource.h>
diff --git a/usr.bin/rev/rev.1 b/usr.bin/rev/rev.1
index df0b8d70881..3a73ec747f0 100644
--- a/usr.bin/rev/rev.1
+++ b/usr.bin/rev/rev.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: rev.1,v 1.5 2001/01/21 01:01:08 lukem Exp $
+.\" $NetBSD: rev.1,v 1.6 2003/08/07 11:15:39 agc Exp $
.\"
.\" Copyright (c) 1985, 1992, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -11,11 +11,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/rev/rev.c b/usr.bin/rev/rev.c
index b3f2a9eacc5..fc86603e3a4 100644
--- a/usr.bin/rev/rev.c
+++ b/usr.bin/rev/rev.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rev.c,v 1.6 1997/10/19 14:03:34 lukem Exp $ */
+/* $NetBSD: rev.c,v 1.7 2003/08/07 11:15:39 agc Exp $ */
/*-
* Copyright (c) 1987, 1992, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -43,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1987, 1992, 1993\n\
#if 0
static char sccsid[] = "@(#)rev.c 8.3 (Berkeley) 5/4/95";
#else
-__RCSID("$NetBSD: rev.c,v 1.6 1997/10/19 14:03:34 lukem Exp $");
+__RCSID("$NetBSD: rev.c,v 1.7 2003/08/07 11:15:39 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/rlogin/kcmd.c b/usr.bin/rlogin/kcmd.c
index dfdc6b89112..6afacda4ec7 100644
--- a/usr.bin/rlogin/kcmd.c
+++ b/usr.bin/rlogin/kcmd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: kcmd.c,v 1.12 2003/07/23 20:31:18 itojun Exp $ */
+/* $NetBSD: kcmd.c,v 1.13 2003/08/07 11:15:40 agc Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -39,7 +35,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
-__RCSID("$NetBSD: kcmd.c,v 1.12 2003/07/23 20:31:18 itojun Exp $");
+__RCSID("$NetBSD: kcmd.c,v 1.13 2003/08/07 11:15:40 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/rlogin/krb.h b/usr.bin/rlogin/krb.h
index 6896bec146f..eb962386318 100644
--- a/usr.bin/rlogin/krb.h
+++ b/usr.bin/rlogin/krb.h
@@ -1,4 +1,4 @@
-/* $NetBSD: krb.h,v 1.7 2002/06/14 00:55:48 wiz Exp $ */
+/* $NetBSD: krb.h,v 1.8 2003/08/07 11:15:40 agc Exp $ */
/*-
* Copyright (c) 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/rlogin/krcmd.c b/usr.bin/rlogin/krcmd.c
index 9367e7e3cbd..c93e5eb533e 100644
--- a/usr.bin/rlogin/krcmd.c
+++ b/usr.bin/rlogin/krcmd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: krcmd.c,v 1.8 2003/07/23 20:31:18 itojun Exp $ */
+/* $NetBSD: krcmd.c,v 1.9 2003/08/07 11:15:40 agc Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)krcmd.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: krcmd.c,v 1.8 2003/07/23 20:31:18 itojun Exp $");
+__RCSID("$NetBSD: krcmd.c,v 1.9 2003/08/07 11:15:40 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/rlogin/rlogin.1 b/usr.bin/rlogin/rlogin.1
index dcdafe1fe4b..dc15d15049a 100644
--- a/usr.bin/rlogin/rlogin.1
+++ b/usr.bin/rlogin/rlogin.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: rlogin.1,v 1.18 2003/07/04 08:13:59 wiz Exp $
+.\" $NetBSD: rlogin.1,v 1.19 2003/08/07 11:15:41 agc Exp $
.\"
.\" Copyright (c) 1983, 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -11,11 +11,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/rlogin/rlogin.c b/usr.bin/rlogin/rlogin.c
index 586378ac1bb..43a2d04532a 100644
--- a/usr.bin/rlogin/rlogin.c
+++ b/usr.bin/rlogin/rlogin.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rlogin.c,v 1.28 2003/04/07 01:46:42 hubertf Exp $ */
+/* $NetBSD: rlogin.c,v 1.29 2003/08/07 11:15:41 agc Exp $ */
/*
* Copyright (c) 1983, 1990, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -43,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1983, 1990, 1993\n\
#if 0
static char sccsid[] = "@(#)rlogin.c 8.4 (Berkeley) 4/29/95";
#else
-__RCSID("$NetBSD: rlogin.c,v 1.28 2003/04/07 01:46:42 hubertf Exp $");
+__RCSID("$NetBSD: rlogin.c,v 1.29 2003/08/07 11:15:41 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/rs/rs.1 b/usr.bin/rs/rs.1
index b1572b935ab..4e7974c4d5e 100644
--- a/usr.bin/rs/rs.1
+++ b/usr.bin/rs/rs.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: rs.1,v 1.6 2002/02/08 01:36:32 ross Exp $
+.\" $NetBSD: rs.1,v 1.7 2003/08/07 11:15:42 agc Exp $
.\"
.\" Copyright (c) 1993
.\" The Regents of the University of California. All rights reserved.
@@ -11,11 +11,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/rs/rs.c b/usr.bin/rs/rs.c
index d2b4d8b5242..593ffb48a1f 100644
--- a/usr.bin/rs/rs.c
+++ b/usr.bin/rs/rs.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rs.c,v 1.8 2002/06/11 06:06:20 itojun Exp $ */
+/* $NetBSD: rs.c,v 1.9 2003/08/07 11:15:42 agc Exp $ */
/*-
* Copyright (c) 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -43,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1993\n\
#if 0
static char sccsid[] = "@(#)rs.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: rs.c,v 1.8 2002/06/11 06:06:20 itojun Exp $");
+__RCSID("$NetBSD: rs.c,v 1.9 2003/08/07 11:15:42 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/rsh/pathnames.h b/usr.bin/rsh/pathnames.h
index 9dcffe40894..3168b3888fc 100644
--- a/usr.bin/rsh/pathnames.h
+++ b/usr.bin/rsh/pathnames.h
@@ -1,4 +1,4 @@
-/* $NetBSD: pathnames.h,v 1.4 1997/02/16 15:01:03 mrg Exp $ */
+/* $NetBSD: pathnames.h,v 1.5 2003/08/07 11:15:43 agc Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -33,7 +29,7 @@
* SUCH DAMAGE.
*
* from: @(#)pathnames.h 8.1 (Berkeley) 6/6/93
- * $NetBSD: pathnames.h,v 1.4 1997/02/16 15:01:03 mrg Exp $
+ * $NetBSD: pathnames.h,v 1.5 2003/08/07 11:15:43 agc Exp $
*/
#define _PATH_RLOGIN "/usr/bin/rlogin"
diff --git a/usr.bin/rsh/rsh.1 b/usr.bin/rsh/rsh.1
index 16c654465ee..b3d8940bf46 100644
--- a/usr.bin/rsh/rsh.1
+++ b/usr.bin/rsh/rsh.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: rsh.1,v 1.16 2003/07/04 08:15:00 wiz Exp $
+.\" $NetBSD: rsh.1,v 1.17 2003/08/07 11:15:43 agc Exp $
.\"
.\" Copyright (c) 1983, 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -11,11 +11,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/rsh/rsh.c b/usr.bin/rsh/rsh.c
index 891466b3e39..e64b4075884 100644
--- a/usr.bin/rsh/rsh.c
+++ b/usr.bin/rsh/rsh.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rsh.c,v 1.21 2003/07/23 20:31:19 itojun Exp $ */
+/* $NetBSD: rsh.c,v 1.22 2003/08/07 11:15:43 agc Exp $ */
/*-
* Copyright (c) 1983, 1990, 1993, 1994
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -43,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1983, 1990, 1993, 1994\n\
#if 0
static char sccsid[] = "@(#)rsh.c 8.4 (Berkeley) 4/29/95";
#else
-__RCSID("$NetBSD: rsh.c,v 1.21 2003/07/23 20:31:19 itojun Exp $");
+__RCSID("$NetBSD: rsh.c,v 1.22 2003/08/07 11:15:43 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/rup/rup.1 b/usr.bin/rup/rup.1
index 9f052c87230..806534d34ff 100644
--- a/usr.bin/rup/rup.1
+++ b/usr.bin/rup/rup.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: rup.1,v 1.16 2002/09/30 11:09:11 grant Exp $
+.\" $NetBSD: rup.1,v 1.17 2003/08/07 11:15:44 agc Exp $
.\"
.\" Copyright (c) 1985, 1991 The Regents of the University of California.
.\" All rights reserved.
@@ -11,11 +11,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/ruptime/ruptime.1 b/usr.bin/ruptime/ruptime.1
index cdd8e9e7c19..5fc3c6044f0 100644
--- a/usr.bin/ruptime/ruptime.1
+++ b/usr.bin/ruptime/ruptime.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: ruptime.1,v 1.7 1999/03/22 18:16:42 garbled Exp $
+.\" $NetBSD: ruptime.1,v 1.8 2003/08/07 11:15:45 agc Exp $
.\"
.\" Copyright (c) 1983, 1990, 1993, 1994
.\" The Regents of the University of California. All rights reserved.
@@ -11,11 +11,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
@@ -32,7 +28,7 @@
.\" SUCH DAMAGE.
.\"
.\" from: @(#)ruptime.1 8.2 (Berkeley) 4/5/94
-.\" $NetBSD: ruptime.1,v 1.7 1999/03/22 18:16:42 garbled Exp $
+.\" $NetBSD: ruptime.1,v 1.8 2003/08/07 11:15:45 agc Exp $
.\"
.Dd April 5, 1994
.Dt RUPTIME 1
diff --git a/usr.bin/ruptime/ruptime.c b/usr.bin/ruptime/ruptime.c
index 17e53d03497..f0d73874f2f 100644
--- a/usr.bin/ruptime/ruptime.c
+++ b/usr.bin/ruptime/ruptime.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ruptime.c,v 1.10 2001/01/05 07:14:46 mjl Exp $ */
+/* $NetBSD: ruptime.c,v 1.11 2003/08/07 11:15:45 agc Exp $ */
/*
* Copyright (c) 1983, 1993, 1994
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@ __COPYRIGHT("@(#) Copyright (c) 1983, 1993, 1994\n\
#ifndef lint
/*static char sccsid[] = "from: @(#)ruptime.c 8.2 (Berkeley) 4/5/94";*/
-__RCSID("$NetBSD: ruptime.c,v 1.10 2001/01/05 07:14:46 mjl Exp $");
+__RCSID("$NetBSD: ruptime.c,v 1.11 2003/08/07 11:15:45 agc Exp $");
#endif /* not lint */
#include <sys/param.h>
diff --git a/usr.bin/rusers/rusers.1 b/usr.bin/rusers/rusers.1
index f0d4186a208..59b22fb7758 100644
--- a/usr.bin/rusers/rusers.1
+++ b/usr.bin/rusers/rusers.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: rusers.1,v 1.13 2002/09/30 11:09:11 grant Exp $
+.\" $NetBSD: rusers.1,v 1.14 2003/08/07 11:15:45 agc Exp $
.\"
.\" Copyright (c) 1983, 1990 The Regents of the University of California.
.\" All rights reserved.
@@ -11,11 +11,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
@@ -32,7 +28,7 @@
.\" SUCH DAMAGE.
.\"
.\" from: @(#)rusers.1 6.7 (Berkeley) 4/23/91
-.\" $NetBSD: rusers.1,v 1.13 2002/09/30 11:09:11 grant Exp $
+.\" $NetBSD: rusers.1,v 1.14 2003/08/07 11:15:45 agc Exp $
.\"
.Dd April 23, 1991
.Dt RUSERS 1
diff --git a/usr.bin/rwall/rwall.1 b/usr.bin/rwall/rwall.1
index b4393050e96..a4c0a1bb91f 100644
--- a/usr.bin/rwall/rwall.1
+++ b/usr.bin/rwall/rwall.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: rwall.1,v 1.11 2002/09/30 11:09:11 grant Exp $
+.\" $NetBSD: rwall.1,v 1.12 2003/08/07 11:15:46 agc Exp $
.\"
.\" Copyright (c) 1983, 1990 The Regents of the University of California.
.\" All rights reserved.
@@ -11,11 +11,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
@@ -32,7 +28,7 @@
.\" SUCH DAMAGE.
.\"
.\" from: @(#)rwall.1 6.7 (Berkeley) 4/23/91
-.\" $NetBSD: rwall.1,v 1.11 2002/09/30 11:09:11 grant Exp $
+.\" $NetBSD: rwall.1,v 1.12 2003/08/07 11:15:46 agc Exp $
.\"
.Dd April 23, 1991
.Dt RWALL 1
diff --git a/usr.bin/rwall/rwall.c b/usr.bin/rwall/rwall.c
index dc138de9567..c06b9428c91 100644
--- a/usr.bin/rwall/rwall.c
+++ b/usr.bin/rwall/rwall.c
@@ -1,7 +1,6 @@
-/* $NetBSD: rwall.c,v 1.14 2001/08/16 01:00:31 enami Exp $ */
+/* $NetBSD: rwall.c,v 1.15 2003/08/07 11:15:46 agc Exp $ */
/*
- * Copyright (c) 1993 Christopher G. Demetriou
* Copyright (c) 1988, 1990 Regents of the University of California.
* All rights reserved.
*
@@ -13,6 +12,34 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+/*
+ * Copyright (c) 1993 Christopher G. Demetriou
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* This product includes software developed by the University of
@@ -44,7 +71,7 @@ __COPYRIGHT("@(#) Copyright (c) 1988 Regents of the University of California.\n\
#if 0
static char sccsid[] = "from: @(#)wall.c 5.14 (Berkeley) 3/2/91";
#else
-__RCSID("$NetBSD: rwall.c,v 1.14 2001/08/16 01:00:31 enami Exp $");
+__RCSID("$NetBSD: rwall.c,v 1.15 2003/08/07 11:15:46 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/rwho/rwho.1 b/usr.bin/rwho/rwho.1
index bf0cd37eb21..3aa6e1ca8d3 100644
--- a/usr.bin/rwho/rwho.1
+++ b/usr.bin/rwho/rwho.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: rwho.1,v 1.8 2002/09/30 11:09:12 grant Exp $
+.\" $NetBSD: rwho.1,v 1.9 2003/08/07 11:15:47 agc Exp $
.\"
.\" Copyright (c) 1983, 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -11,11 +11,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
@@ -32,7 +28,7 @@
.\" SUCH DAMAGE.
.\"
.\" from: @(#)rwho.1 8.1 (Berkeley) 6/6/93
-.\" $NetBSD: rwho.1,v 1.8 2002/09/30 11:09:12 grant Exp $
+.\" $NetBSD: rwho.1,v 1.9 2003/08/07 11:15:47 agc Exp $
.\"
.Dd June 6, 1993
.Dt RWHO 1
diff --git a/usr.bin/rwho/rwho.c b/usr.bin/rwho/rwho.c
index afb6f63dca3..1d2a2796a65 100644
--- a/usr.bin/rwho/rwho.c
+++ b/usr.bin/rwho/rwho.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rwho.c,v 1.13 2000/09/06 12:13:48 mjl Exp $ */
+/* $NetBSD: rwho.c,v 1.14 2003/08/07 11:15:47 agc Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@ __COPYRIGHT("@(#) Copyright (c) 1983, 1993\n\
#ifndef lint
/*static char sccsid[] = "from: @(#)rwho.c 8.1 (Berkeley) 6/6/93";*/
-__RCSID("$NetBSD: rwho.c,v 1.13 2000/09/06 12:13:48 mjl Exp $");
+__RCSID("$NetBSD: rwho.c,v 1.14 2003/08/07 11:15:47 agc Exp $");
#endif /* not lint */
#include <sys/param.h>
diff --git a/usr.bin/script/script.1 b/usr.bin/script/script.1
index 8848c9d75c9..fc5acf723d6 100644
--- a/usr.bin/script/script.1
+++ b/usr.bin/script/script.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: script.1,v 1.9 2003/02/25 10:35:53 wiz Exp $
+.\" $NetBSD: script.1,v 1.10 2003/08/07 11:15:48 agc Exp $
.\"
.\" Copyright (c) 1980, 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -11,11 +11,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/script/script.c b/usr.bin/script/script.c
index 05703331da6..640a571ec81 100644
--- a/usr.bin/script/script.c
+++ b/usr.bin/script/script.c
@@ -1,4 +1,4 @@
-/* $NetBSD: script.c,v 1.8 2002/06/21 18:46:31 atatat Exp $ */
+/* $NetBSD: script.c,v 1.9 2003/08/07 11:15:48 agc Exp $ */
/*
* Copyright (c) 1980, 1992, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -43,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 1992, 1993\n\
#if 0
static char sccsid[] = "@(#)script.c 8.1 (Berkeley) 6/6/93";
#endif
-__RCSID("$NetBSD: script.c,v 1.8 2002/06/21 18:46:31 atatat Exp $");
+__RCSID("$NetBSD: script.c,v 1.9 2003/08/07 11:15:48 agc Exp $");
#endif /* not lint */
#include <sys/types.h>
diff --git a/usr.bin/sed/compile.c b/usr.bin/sed/compile.c
index c5d2f125e85..9e27543d9d2 100644
--- a/usr.bin/sed/compile.c
+++ b/usr.bin/sed/compile.c
@@ -1,7 +1,6 @@
-/* $NetBSD: compile.c,v 1.24 2002/06/14 00:41:42 wiz Exp $ */
+/* $NetBSD: compile.c,v 1.25 2003/08/07 11:15:49 agc Exp $ */
/*-
- * Copyright (c) 1992 Diomidis Spinellis.
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
@@ -16,6 +15,37 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+/*-
+ * Copyright (c) 1992 Diomidis Spinellis.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Diomidis Spinellis of Imperial College, University of London.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* This product includes software developed by the University of
@@ -42,7 +72,7 @@
#if 0
static char sccsid[] = "@(#)compile.c 8.2 (Berkeley) 4/28/95";
#else
-__RCSID("$NetBSD: compile.c,v 1.24 2002/06/14 00:41:42 wiz Exp $");
+__RCSID("$NetBSD: compile.c,v 1.25 2003/08/07 11:15:49 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/sed/defs.h b/usr.bin/sed/defs.h
index 0ae4f4bb3e3..f869e21e469 100644
--- a/usr.bin/sed/defs.h
+++ b/usr.bin/sed/defs.h
@@ -1,7 +1,6 @@
-/* $NetBSD: defs.h,v 1.7 1997/01/09 20:21:28 tls Exp $ */
+/* $NetBSD: defs.h,v 1.8 2003/08/07 11:15:49 agc Exp $ */
/*-
- * Copyright (c) 1992 Diomidis Spinellis.
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
@@ -16,6 +15,40 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * from: @(#)defs.h 8.1 (Berkeley) 6/6/93
+ * $NetBSD: defs.h,v 1.8 2003/08/07 11:15:49 agc Exp $
+ */
+
+/*-
+ * Copyright (c) 1992 Diomidis Spinellis.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Diomidis Spinellis of Imperial College, University of London.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* This product includes software developed by the University of
@@ -37,7 +70,7 @@
* SUCH DAMAGE.
*
* from: @(#)defs.h 8.1 (Berkeley) 6/6/93
- * $NetBSD: defs.h,v 1.7 1997/01/09 20:21:28 tls Exp $
+ * $NetBSD: defs.h,v 1.8 2003/08/07 11:15:49 agc Exp $
*/
/*
diff --git a/usr.bin/sed/extern.h b/usr.bin/sed/extern.h
index 4777df368d5..d16742d8aba 100644
--- a/usr.bin/sed/extern.h
+++ b/usr.bin/sed/extern.h
@@ -1,7 +1,6 @@
-/* $NetBSD: extern.h,v 1.8 2002/06/14 00:41:42 wiz Exp $ */
+/* $NetBSD: extern.h,v 1.9 2003/08/07 11:15:49 agc Exp $ */
/*-
- * Copyright (c) 1992 Diomidis Spinellis.
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
@@ -16,6 +15,40 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * from: @(#)extern.h 8.1 (Berkeley) 6/6/93
+ * $NetBSD: extern.h,v 1.9 2003/08/07 11:15:49 agc Exp $
+ */
+
+/*-
+ * Copyright (c) 1992 Diomidis Spinellis.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Diomidis Spinellis of Imperial College, University of London.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* This product includes software developed by the University of
@@ -37,7 +70,7 @@
* SUCH DAMAGE.
*
* from: @(#)extern.h 8.1 (Berkeley) 6/6/93
- * $NetBSD: extern.h,v 1.8 2002/06/14 00:41:42 wiz Exp $
+ * $NetBSD: extern.h,v 1.9 2003/08/07 11:15:49 agc Exp $
*/
extern struct s_command *prog;
diff --git a/usr.bin/sed/main.c b/usr.bin/sed/main.c
index 229196b8833..4129eb7cc9c 100644
--- a/usr.bin/sed/main.c
+++ b/usr.bin/sed/main.c
@@ -1,7 +1,6 @@
-/* $NetBSD: main.c,v 1.13 2002/06/14 00:41:42 wiz Exp $ */
+/* $NetBSD: main.c,v 1.14 2003/08/07 11:15:49 agc Exp $ */
/*-
- * Copyright (c) 1992 Diomidis Spinellis.
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
@@ -16,6 +15,37 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+/*-
+ * Copyright (c) 1992 Diomidis Spinellis.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Diomidis Spinellis of Imperial College, University of London.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* This product includes software developed by the University of
@@ -47,7 +77,7 @@ __COPYRIGHT("@(#) Copyright (c) 1992, 1993\n\
#if 0
static char sccsid[] = "@(#)main.c 8.2 (Berkeley) 1/3/94";
#else
-__RCSID("$NetBSD: main.c,v 1.13 2002/06/14 00:41:42 wiz Exp $");
+__RCSID("$NetBSD: main.c,v 1.14 2003/08/07 11:15:49 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/sed/misc.c b/usr.bin/sed/misc.c
index 144ec8dbd2b..0066752c327 100644
--- a/usr.bin/sed/misc.c
+++ b/usr.bin/sed/misc.c
@@ -1,7 +1,6 @@
-/* $NetBSD: misc.c,v 1.7 2002/06/14 00:41:42 wiz Exp $ */
+/* $NetBSD: misc.c,v 1.8 2003/08/07 11:15:50 agc Exp $ */
/*-
- * Copyright (c) 1992 Diomidis Spinellis.
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
@@ -16,6 +15,37 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+/*-
+ * Copyright (c) 1992 Diomidis Spinellis.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Diomidis Spinellis of Imperial College, University of London.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* This product includes software developed by the University of
@@ -42,7 +72,7 @@
#if 0
static char sccsid[] = "@(#)misc.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: misc.c,v 1.7 2002/06/14 00:41:42 wiz Exp $");
+__RCSID("$NetBSD: misc.c,v 1.8 2003/08/07 11:15:50 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/sed/process.c b/usr.bin/sed/process.c
index df4f7701d7d..ac113ad602d 100644
--- a/usr.bin/sed/process.c
+++ b/usr.bin/sed/process.c
@@ -1,7 +1,6 @@
-/* $NetBSD: process.c,v 1.32 2002/06/14 00:41:42 wiz Exp $ */
+/* $NetBSD: process.c,v 1.33 2003/08/07 11:15:50 agc Exp $ */
/*-
- * Copyright (c) 1992 Diomidis Spinellis.
* Copyright (c) 1992, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
@@ -16,6 +15,37 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+/*-
+ * Copyright (c) 1992 Diomidis Spinellis.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Diomidis Spinellis of Imperial College, University of London.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* This product includes software developed by the University of
@@ -42,7 +72,7 @@
#if 0
static char sccsid[] = "@(#)process.c 8.6 (Berkeley) 4/20/94";
#else
-__RCSID("$NetBSD: process.c,v 1.32 2002/06/14 00:41:42 wiz Exp $");
+__RCSID("$NetBSD: process.c,v 1.33 2003/08/07 11:15:50 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/sed/sed.1 b/usr.bin/sed/sed.1
index b445fb4ee47..f8a8ee8d741 100644
--- a/usr.bin/sed/sed.1
+++ b/usr.bin/sed/sed.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: sed.1,v 1.20 2003/06/27 09:06:23 wiz Exp $
+.\" $NetBSD: sed.1,v 1.21 2003/08/07 11:15:50 agc Exp $
.\"
.\" Copyright (c) 1992, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -14,11 +14,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/shar/shar.1 b/usr.bin/shar/shar.1
index 6f7ca40c92a..3cfd8fcaae1 100644
--- a/usr.bin/shar/shar.1
+++ b/usr.bin/shar/shar.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: shar.1,v 1.10 2002/02/08 01:36:32 ross Exp $
+.\" $NetBSD: shar.1,v 1.11 2003/08/07 11:15:51 agc Exp $
.\"
.\" Copyright (c) 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -11,11 +11,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/showmount/showmount.8 b/usr.bin/showmount/showmount.8
index bb5c67c8a5f..774c681c49e 100644
--- a/usr.bin/showmount/showmount.8
+++ b/usr.bin/showmount/showmount.8
@@ -1,4 +1,4 @@
-.\" $NetBSD: showmount.8,v 1.10 2001/12/08 19:15:12 wiz Exp $
+.\" $NetBSD: showmount.8,v 1.11 2003/08/07 11:15:51 agc Exp $
.\"
.\" Copyright (c) 1989, 1991, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -14,11 +14,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/showmount/showmount.c b/usr.bin/showmount/showmount.c
index cb7dc89402e..03cca5ce798 100644
--- a/usr.bin/showmount/showmount.c
+++ b/usr.bin/showmount/showmount.c
@@ -1,4 +1,4 @@
-/* $NetBSD: showmount.c,v 1.11 2001/01/16 02:50:30 cgd Exp $ */
+/* $NetBSD: showmount.c,v 1.12 2003/08/07 11:15:51 agc Exp $ */
/*
* Copyright (c) 1989, 1993, 1995
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -46,7 +42,7 @@ __COPYRIGHT("@(#) Copyright (c) 1989, 1993, 1995\n\
#if 0
static char sccsid[] = "@(#)showmount.c 8.3 (Berkeley) 3/29/95";
#endif
-__RCSID("$NetBSD: showmount.c,v 1.11 2001/01/16 02:50:30 cgd Exp $");
+__RCSID("$NetBSD: showmount.c,v 1.12 2003/08/07 11:15:51 agc Exp $");
#endif /* not lint */
#include <sys/types.h>
diff --git a/usr.bin/soelim/soelim.1 b/usr.bin/soelim/soelim.1
index 507f1c3297e..6683e5911ec 100644
--- a/usr.bin/soelim/soelim.1
+++ b/usr.bin/soelim/soelim.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: soelim.1,v 1.7 2001/12/08 19:15:45 wiz Exp $
+.\" $NetBSD: soelim.1,v 1.8 2003/08/07 11:15:52 agc Exp $
.\"
.\" Copyright (c) 1980, 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -11,11 +11,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/soelim/soelim.c b/usr.bin/soelim/soelim.c
index 3aa8acf09a7..c30d3dd496a 100644
--- a/usr.bin/soelim/soelim.c
+++ b/usr.bin/soelim/soelim.c
@@ -1,4 +1,4 @@
-/* $NetBSD: soelim.c,v 1.10 2001/04/09 13:31:20 wiz Exp $ */
+/* $NetBSD: soelim.c,v 1.11 2003/08/07 11:15:52 agc Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -43,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 1993\n\
#if 0
static char sccsid[] = "@(#)soelim.c 8.1 (Berkeley) 6/6/93";
#endif
-__RCSID("$NetBSD: soelim.c,v 1.10 2001/04/09 13:31:20 wiz Exp $");
+__RCSID("$NetBSD: soelim.c,v 1.11 2003/08/07 11:15:52 agc Exp $");
#endif /* not lint */
/*
diff --git a/usr.bin/sort/append.c b/usr.bin/sort/append.c
index d02a96fcc49..f9a9514788f 100644
--- a/usr.bin/sort/append.c
+++ b/usr.bin/sort/append.c
@@ -1,4 +1,4 @@
-/* $NetBSD: append.c,v 1.10 2001/02/19 20:50:17 jdolecek Exp $ */
+/* $NetBSD: append.c,v 1.11 2003/08/07 11:15:53 agc Exp $ */
/*-
* Copyright (c) 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -39,7 +35,7 @@
#include "sort.h"
#ifndef lint
-__RCSID("$NetBSD: append.c,v 1.10 2001/02/19 20:50:17 jdolecek Exp $");
+__RCSID("$NetBSD: append.c,v 1.11 2003/08/07 11:15:53 agc Exp $");
__SCCSID("@(#)append.c 8.1 (Berkeley) 6/6/93");
#endif /* not lint */
diff --git a/usr.bin/sort/fields.c b/usr.bin/sort/fields.c
index 61427e0e425..c643320b230 100644
--- a/usr.bin/sort/fields.c
+++ b/usr.bin/sort/fields.c
@@ -1,4 +1,4 @@
-/* $NetBSD: fields.c,v 1.12 2003/04/09 09:30:40 jdolecek Exp $ */
+/* $NetBSD: fields.c,v 1.13 2003/08/07 11:15:53 agc Exp $ */
/*-
* Copyright (c) 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#include "sort.h"
#ifndef lint
-__RCSID("$NetBSD: fields.c,v 1.12 2003/04/09 09:30:40 jdolecek Exp $");
+__RCSID("$NetBSD: fields.c,v 1.13 2003/08/07 11:15:53 agc Exp $");
__SCCSID("@(#)fields.c 8.1 (Berkeley) 6/6/93");
#endif /* not lint */
diff --git a/usr.bin/sort/files.c b/usr.bin/sort/files.c
index 7111d094946..f722155e186 100644
--- a/usr.bin/sort/files.c
+++ b/usr.bin/sort/files.c
@@ -1,4 +1,4 @@
-/* $NetBSD: files.c,v 1.18 2002/12/24 15:09:27 jdolecek Exp $ */
+/* $NetBSD: files.c,v 1.19 2003/08/07 11:15:53 agc Exp $ */
/*-
* Copyright (c) 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -40,7 +36,7 @@
#include "fsort.h"
#ifndef lint
-__RCSID("$NetBSD: files.c,v 1.18 2002/12/24 15:09:27 jdolecek Exp $");
+__RCSID("$NetBSD: files.c,v 1.19 2003/08/07 11:15:53 agc Exp $");
__SCCSID("@(#)files.c 8.1 (Berkeley) 6/6/93");
#endif /* not lint */
diff --git a/usr.bin/sort/fsort.c b/usr.bin/sort/fsort.c
index 25675caff42..6475749fa75 100644
--- a/usr.bin/sort/fsort.c
+++ b/usr.bin/sort/fsort.c
@@ -1,4 +1,4 @@
-/* $NetBSD: fsort.c,v 1.24 2002/12/24 15:15:01 jdolecek Exp $ */
+/* $NetBSD: fsort.c,v 1.25 2003/08/07 11:15:54 agc Exp $ */
/*-
* Copyright (c) 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -47,7 +43,7 @@
#include "fsort.h"
#ifndef lint
-__RCSID("$NetBSD: fsort.c,v 1.24 2002/12/24 15:15:01 jdolecek Exp $");
+__RCSID("$NetBSD: fsort.c,v 1.25 2003/08/07 11:15:54 agc Exp $");
__SCCSID("@(#)fsort.c 8.1 (Berkeley) 6/6/93");
#endif /* not lint */
diff --git a/usr.bin/sort/fsort.h b/usr.bin/sort/fsort.h
index 45c6cd73d79..d89a10e8d84 100644
--- a/usr.bin/sort/fsort.h
+++ b/usr.bin/sort/fsort.h
@@ -1,4 +1,4 @@
-/* $NetBSD: fsort.h,v 1.10 2002/12/24 15:09:27 jdolecek Exp $ */
+/* $NetBSD: fsort.h,v 1.11 2003/08/07 11:15:54 agc Exp $ */
/*-
* Copyright (c) 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/sort/init.c b/usr.bin/sort/init.c
index 14f1effbcdf..89e53e845ac 100644
--- a/usr.bin/sort/init.c
+++ b/usr.bin/sort/init.c
@@ -1,4 +1,4 @@
-/* $NetBSD: init.c,v 1.7 2002/12/24 13:20:25 jdolecek Exp $ */
+/* $NetBSD: init.c,v 1.8 2003/08/07 11:15:54 agc Exp $ */
/*-
* Copyright (c) 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -39,7 +35,7 @@
#include "sort.h"
#ifndef lint
-__RCSID("$NetBSD: init.c,v 1.7 2002/12/24 13:20:25 jdolecek Exp $");
+__RCSID("$NetBSD: init.c,v 1.8 2003/08/07 11:15:54 agc Exp $");
__SCCSID("@(#)init.c 8.1 (Berkeley) 6/6/93");
#endif /* not lint */
diff --git a/usr.bin/sort/msort.c b/usr.bin/sort/msort.c
index 77dc658e22d..e964278b21f 100644
--- a/usr.bin/sort/msort.c
+++ b/usr.bin/sort/msort.c
@@ -1,4 +1,4 @@
-/* $NetBSD: msort.c,v 1.12 2003/03/20 16:13:03 jdolecek Exp $ */
+/* $NetBSD: msort.c,v 1.13 2003/08/07 11:15:54 agc Exp $ */
/*-
* Copyright (c) 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -40,7 +36,7 @@
#include "fsort.h"
#ifndef lint
-__RCSID("$NetBSD: msort.c,v 1.12 2003/03/20 16:13:03 jdolecek Exp $");
+__RCSID("$NetBSD: msort.c,v 1.13 2003/08/07 11:15:54 agc Exp $");
__SCCSID("@(#)msort.c 8.1 (Berkeley) 6/6/93");
#endif /* not lint */
diff --git a/usr.bin/sort/pathnames.h b/usr.bin/sort/pathnames.h
index 4f08e635144..3512bfc0f31 100644
--- a/usr.bin/sort/pathnames.h
+++ b/usr.bin/sort/pathnames.h
@@ -1,4 +1,4 @@
-/* $NetBSD: pathnames.h,v 1.3 2000/10/07 20:37:06 bjh21 Exp $ */
+/* $NetBSD: pathnames.h,v 1.4 2003/08/07 11:15:54 agc Exp $ */
/*-
* Copyright (c) 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/sort/sort.1 b/usr.bin/sort/sort.1
index 0a9768f9238..f4d029aeee9 100644
--- a/usr.bin/sort/sort.1
+++ b/usr.bin/sort/sort.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: sort.1,v 1.22 2003/06/27 09:15:55 wiz Exp $
+.\" $NetBSD: sort.1,v 1.23 2003/08/07 11:15:55 agc Exp $
.\"
.\" Copyright (c) 1991, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -14,11 +14,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/sort/sort.c b/usr.bin/sort/sort.c
index 3e3f7e9f247..849e7ef43fd 100644
--- a/usr.bin/sort/sort.c
+++ b/usr.bin/sort/sort.c
@@ -1,4 +1,4 @@
-/* $NetBSD: sort.c,v 1.32 2002/12/24 14:58:57 jdolecek Exp $ */
+/* $NetBSD: sort.c,v 1.33 2003/08/07 11:15:55 agc Exp $ */
/*-
* Copyright (c) 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -51,7 +47,7 @@ __COPYRIGHT("@(#) Copyright (c) 1993\n\
#endif /* not lint */
#ifndef lint
-__RCSID("$NetBSD: sort.c,v 1.32 2002/12/24 14:58:57 jdolecek Exp $");
+__RCSID("$NetBSD: sort.c,v 1.33 2003/08/07 11:15:55 agc Exp $");
__SCCSID("@(#)sort.c 8.1 (Berkeley) 6/6/93");
#endif /* not lint */
diff --git a/usr.bin/sort/sort.h b/usr.bin/sort/sort.h
index 493fcd1f6d2..722709efc74 100644
--- a/usr.bin/sort/sort.h
+++ b/usr.bin/sort/sort.h
@@ -1,4 +1,4 @@
-/* $NetBSD: sort.h,v 1.15 2002/12/25 21:19:15 jdolecek Exp $ */
+/* $NetBSD: sort.h,v 1.16 2003/08/07 11:15:55 agc Exp $ */
/*-
* Copyright (c) 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/sort/tmp.c b/usr.bin/sort/tmp.c
index 5a754ee8044..900c9000147 100644
--- a/usr.bin/sort/tmp.c
+++ b/usr.bin/sort/tmp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: tmp.c,v 1.9 2002/12/23 20:14:26 jdolecek Exp $ */
+/* $NetBSD: tmp.c,v 1.10 2003/08/07 11:15:55 agc Exp $ */
/*-
* Copyright (c) 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -39,7 +35,7 @@
#include <ctype.h>
#ifndef lint
-__RCSID("$NetBSD: tmp.c,v 1.9 2002/12/23 20:14:26 jdolecek Exp $");
+__RCSID("$NetBSD: tmp.c,v 1.10 2003/08/07 11:15:55 agc Exp $");
__SCCSID("@(#)tmp.c 8.1 (Berkeley) 6/6/93");
#endif /* not lint */
diff --git a/usr.bin/split/split.1 b/usr.bin/split/split.1
index 3d8b2fed7b2..67731e73ea8 100644
--- a/usr.bin/split/split.1
+++ b/usr.bin/split/split.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: split.1,v 1.12 2003/07/10 20:43:40 bjh21 Exp $
+.\" $NetBSD: split.1,v 1.13 2003/08/07 11:15:55 agc Exp $
.\"
.\" Copyright (c) 1990, 1991, 1993, 1994
.\" The Regents of the University of California. All rights reserved.
@@ -11,11 +11,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/split/split.c b/usr.bin/split/split.c
index bccdc99a4ff..6cd0f02f582 100644
--- a/usr.bin/split/split.c
+++ b/usr.bin/split/split.c
@@ -1,4 +1,4 @@
-/* $NetBSD: split.c,v 1.19 2003/07/10 21:30:16 bjh21 Exp $ */
+/* $NetBSD: split.c,v 1.20 2003/08/07 11:15:56 agc Exp $ */
/*
* Copyright (c) 1987, 1993, 1994
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -43,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1987, 1993, 1994\n\
#if 0
static char sccsid[] = "@(#)split.c 8.3 (Berkeley) 4/25/94";
#endif
-__RCSID("$NetBSD: split.c,v 1.19 2003/07/10 21:30:16 bjh21 Exp $");
+__RCSID("$NetBSD: split.c,v 1.20 2003/08/07 11:15:56 agc Exp $");
#endif /* not lint */
#include <sys/param.h>
diff --git a/usr.bin/su/su.1 b/usr.bin/su/su.1
index 9562360de92..c86d86ea40b 100644
--- a/usr.bin/su/su.1
+++ b/usr.bin/su/su.1
@@ -9,11 +9,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
@@ -30,7 +26,7 @@
.\" SUCH DAMAGE.
.\"
.\" from: @(#)su.1 8.2 (Berkeley) 4/18/94
-.\" $NetBSD: su.1,v 1.32 2003/04/27 11:09:29 wiz Exp $
+.\" $NetBSD: su.1,v 1.33 2003/08/07 11:15:56 agc Exp $
.\"
.Dd April 27, 2003
.Dt SU 1
diff --git a/usr.bin/su/su.c b/usr.bin/su/su.c
index f808957a9df..60450e5d38a 100644
--- a/usr.bin/su/su.c
+++ b/usr.bin/su/su.c
@@ -1,4 +1,4 @@
-/* $NetBSD: su.c,v 1.55 2003/06/18 21:02:03 jrf Exp $ */
+/* $NetBSD: su.c,v 1.56 2003/08/07 11:15:57 agc Exp $ */
/*
* Copyright (c) 1988 The Regents of the University of California.
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -44,7 +40,7 @@ __COPYRIGHT(
#if 0
static char sccsid[] = "@(#)su.c 8.3 (Berkeley) 4/2/94";*/
#else
-__RCSID("$NetBSD: su.c,v 1.55 2003/06/18 21:02:03 jrf Exp $");
+__RCSID("$NetBSD: su.c,v 1.56 2003/08/07 11:15:57 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/systat/cmds.c b/usr.bin/systat/cmds.c
index a164066e913..3be39627c25 100644
--- a/usr.bin/systat/cmds.c
+++ b/usr.bin/systat/cmds.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cmds.c,v 1.25 2000/12/01 02:19:43 simonb Exp $ */
+/* $NetBSD: cmds.c,v 1.26 2003/08/07 11:15:57 agc Exp $ */
/*-
* Copyright (c) 1980, 1992, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)cmds.c 8.2 (Berkeley) 4/29/95";
#endif
-__RCSID("$NetBSD: cmds.c,v 1.25 2000/12/01 02:19:43 simonb Exp $");
+__RCSID("$NetBSD: cmds.c,v 1.26 2003/08/07 11:15:57 agc Exp $");
#endif /* not lint */
#include <ctype.h>
diff --git a/usr.bin/systat/cmdtab.c b/usr.bin/systat/cmdtab.c
index 0a2eb2760b2..40cfa6bd01a 100644
--- a/usr.bin/systat/cmdtab.c
+++ b/usr.bin/systat/cmdtab.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cmdtab.c,v 1.17 2002/11/01 12:47:57 mrg Exp $ */
+/* $NetBSD: cmdtab.c,v 1.18 2003/08/07 11:15:57 agc Exp $ */
/*-
* Copyright (c) 1980, 1992, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)cmdtab.c 8.1 (Berkeley) 6/6/93";
#endif
-__RCSID("$NetBSD: cmdtab.c,v 1.17 2002/11/01 12:47:57 mrg Exp $");
+__RCSID("$NetBSD: cmdtab.c,v 1.18 2003/08/07 11:15:57 agc Exp $");
#endif /* not lint */
#include "systat.h"
diff --git a/usr.bin/systat/disks.c b/usr.bin/systat/disks.c
index 3da710208aa..e0ce5cbe408 100644
--- a/usr.bin/systat/disks.c
+++ b/usr.bin/systat/disks.c
@@ -1,4 +1,4 @@
-/* $NetBSD: disks.c,v 1.12 2000/12/01 02:19:43 simonb Exp $ */
+/* $NetBSD: disks.c,v 1.13 2003/08/07 11:15:57 agc Exp $ */
/*-
* Copyright (c) 1980, 1992, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)disks.c 8.1 (Berkeley) 6/6/93";
#endif
-__RCSID("$NetBSD: disks.c,v 1.12 2000/12/01 02:19:43 simonb Exp $");
+__RCSID("$NetBSD: disks.c,v 1.13 2003/08/07 11:15:57 agc Exp $");
#endif /* not lint */
#include <ctype.h>
diff --git a/usr.bin/systat/extern.h b/usr.bin/systat/extern.h
index 863aeefb75a..ab06062ce26 100644
--- a/usr.bin/systat/extern.h
+++ b/usr.bin/systat/extern.h
@@ -1,4 +1,4 @@
-/* $NetBSD: extern.h,v 1.30 2003/08/03 11:56:57 jdolecek Exp $ */
+/* $NetBSD: extern.h,v 1.31 2003/08/07 11:15:58 agc Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/systat/fetch.c b/usr.bin/systat/fetch.c
index 2feaec08c42..db65a184acd 100644
--- a/usr.bin/systat/fetch.c
+++ b/usr.bin/systat/fetch.c
@@ -1,4 +1,4 @@
-/* $NetBSD: fetch.c,v 1.10 2003/01/20 18:24:03 dsl Exp $ */
+/* $NetBSD: fetch.c,v 1.11 2003/08/07 11:15:58 agc Exp $ */
/*-
* Copyright (c) 1980, 1992, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)fetch.c 8.1 (Berkeley) 6/6/93";
#endif
-__RCSID("$NetBSD: fetch.c,v 1.10 2003/01/20 18:24:03 dsl Exp $");
+__RCSID("$NetBSD: fetch.c,v 1.11 2003/08/07 11:15:58 agc Exp $");
#endif /* not lint */
#include <sys/param.h>
diff --git a/usr.bin/systat/iostat.c b/usr.bin/systat/iostat.c
index b840363af44..4bc2c9f027d 100644
--- a/usr.bin/systat/iostat.c
+++ b/usr.bin/systat/iostat.c
@@ -1,4 +1,4 @@
-/* $NetBSD: iostat.c,v 1.27 2003/02/24 10:10:00 dsl Exp $ */
+/* $NetBSD: iostat.c,v 1.28 2003/08/07 11:15:58 agc Exp $ */
/*
* Copyright (c) 1980, 1992, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)iostat.c 8.1 (Berkeley) 6/6/93";
#endif
-__RCSID("$NetBSD: iostat.c,v 1.27 2003/02/24 10:10:00 dsl Exp $");
+__RCSID("$NetBSD: iostat.c,v 1.28 2003/08/07 11:15:58 agc Exp $");
#endif /* not lint */
#include <sys/param.h>
diff --git a/usr.bin/systat/keyboard.c b/usr.bin/systat/keyboard.c
index ffd52dcc771..d9b8d3c51b8 100644
--- a/usr.bin/systat/keyboard.c
+++ b/usr.bin/systat/keyboard.c
@@ -1,4 +1,4 @@
-/* $NetBSD: keyboard.c,v 1.13 2000/12/01 02:19:44 simonb Exp $ */
+/* $NetBSD: keyboard.c,v 1.14 2003/08/07 11:15:58 agc Exp $ */
/*-
* Copyright (c) 1980, 1992, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)keyboard.c 8.1 (Berkeley) 6/6/93";
#endif
-__RCSID("$NetBSD: keyboard.c,v 1.13 2000/12/01 02:19:44 simonb Exp $");
+__RCSID("$NetBSD: keyboard.c,v 1.14 2003/08/07 11:15:58 agc Exp $");
#endif /* not lint */
#include <sys/types.h>
diff --git a/usr.bin/systat/main.c b/usr.bin/systat/main.c
index 5d4caaf73d4..318a4d5314b 100644
--- a/usr.bin/systat/main.c
+++ b/usr.bin/systat/main.c
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.34 2003/08/03 12:14:58 jdolecek Exp $ */
+/* $NetBSD: main.c,v 1.35 2003/08/07 11:15:59 agc Exp $ */
/*-
* Copyright (c) 1980, 1992, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -40,7 +36,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 1992, 1993\n\
#if 0
static char sccsid[] = "@(#)main.c 8.1 (Berkeley) 6/6/93";
#endif
-__RCSID("$NetBSD: main.c,v 1.34 2003/08/03 12:14:58 jdolecek Exp $");
+__RCSID("$NetBSD: main.c,v 1.35 2003/08/07 11:15:59 agc Exp $");
#endif /* not lint */
#include <sys/param.h>
diff --git a/usr.bin/systat/mbufs.c b/usr.bin/systat/mbufs.c
index 59746f4e9da..b1a7c4597be 100644
--- a/usr.bin/systat/mbufs.c
+++ b/usr.bin/systat/mbufs.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mbufs.c,v 1.11 2003/02/24 10:10:00 dsl Exp $ */
+/* $NetBSD: mbufs.c,v 1.12 2003/08/07 11:15:59 agc Exp $ */
/*-
* Copyright (c) 1980, 1992, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)mbufs.c 8.1 (Berkeley) 6/6/93";
#endif
-__RCSID("$NetBSD: mbufs.c,v 1.11 2003/02/24 10:10:00 dsl Exp $");
+__RCSID("$NetBSD: mbufs.c,v 1.12 2003/08/07 11:15:59 agc Exp $");
#endif /* not lint */
#include <sys/param.h>
diff --git a/usr.bin/systat/netcmds.c b/usr.bin/systat/netcmds.c
index 983ab76af78..bca5ea0f725 100644
--- a/usr.bin/systat/netcmds.c
+++ b/usr.bin/systat/netcmds.c
@@ -1,4 +1,4 @@
-/* $NetBSD: netcmds.c,v 1.18 2003/05/15 01:00:07 itojun Exp $ */
+/* $NetBSD: netcmds.c,v 1.19 2003/08/07 11:15:59 agc Exp $ */
/*-
* Copyright (c) 1980, 1992, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)netcmds.c 8.1 (Berkeley) 6/6/93";
#endif
-__RCSID("$NetBSD: netcmds.c,v 1.18 2003/05/15 01:00:07 itojun Exp $");
+__RCSID("$NetBSD: netcmds.c,v 1.19 2003/08/07 11:15:59 agc Exp $");
#endif /* not lint */
/*
diff --git a/usr.bin/systat/netstat.c b/usr.bin/systat/netstat.c
index 2a1a87f6831..6b72406baba 100644
--- a/usr.bin/systat/netstat.c
+++ b/usr.bin/systat/netstat.c
@@ -1,4 +1,4 @@
-/* $NetBSD: netstat.c,v 1.23 2003/07/05 06:48:52 dsl Exp $ */
+/* $NetBSD: netstat.c,v 1.24 2003/08/07 11:15:59 agc Exp $ */
/*-
* Copyright (c) 1980, 1992, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)netstat.c 8.1 (Berkeley) 6/6/93";
#endif
-__RCSID("$NetBSD: netstat.c,v 1.23 2003/07/05 06:48:52 dsl Exp $");
+__RCSID("$NetBSD: netstat.c,v 1.24 2003/08/07 11:15:59 agc Exp $");
#endif /* not lint */
/*
diff --git a/usr.bin/systat/pigs.c b/usr.bin/systat/pigs.c
index 2221502032f..b60db28be68 100644
--- a/usr.bin/systat/pigs.c
+++ b/usr.bin/systat/pigs.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pigs.c,v 1.24 2003/02/24 10:10:00 dsl Exp $ */
+/* $NetBSD: pigs.c,v 1.25 2003/08/07 11:16:00 agc Exp $ */
/*-
* Copyright (c) 1980, 1992, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)pigs.c 8.2 (Berkeley) 9/23/93";
#endif
-__RCSID("$NetBSD: pigs.c,v 1.24 2003/02/24 10:10:00 dsl Exp $");
+__RCSID("$NetBSD: pigs.c,v 1.25 2003/08/07 11:16:00 agc Exp $");
#endif /* not lint */
/*
diff --git a/usr.bin/systat/swap.c b/usr.bin/systat/swap.c
index db593fd2dbc..34da58f510d 100644
--- a/usr.bin/systat/swap.c
+++ b/usr.bin/systat/swap.c
@@ -1,7 +1,6 @@
-/* $NetBSD: swap.c,v 1.15 2003/02/24 10:10:00 dsl Exp $ */
+/* $NetBSD: swap.c,v 1.16 2003/08/07 11:16:00 agc Exp $ */
/*-
- * Copyright (c) 1997 Matthew R. Green. All rights reserved.
* Copyright (c) 1980, 1992, 1993
* The Regents of the University of California. All rights reserved.
*
@@ -13,6 +12,34 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+/*-
+ * Copyright (c) 1997 Matthew R. Green. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* This product includes software developed by the University of
@@ -39,7 +66,7 @@
#if 0
static char sccsid[] = "@(#)swap.c 8.3 (Berkeley) 4/29/95";
#endif
-__RCSID("$NetBSD: swap.c,v 1.15 2003/02/24 10:10:00 dsl Exp $");
+__RCSID("$NetBSD: swap.c,v 1.16 2003/08/07 11:16:00 agc Exp $");
#endif /* not lint */
#include <sys/param.h>
diff --git a/usr.bin/systat/systat.1 b/usr.bin/systat/systat.1
index 8a4f977988c..a8fe5259642 100644
--- a/usr.bin/systat/systat.1
+++ b/usr.bin/systat/systat.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: systat.1,v 1.29 2003/06/27 09:38:58 wiz Exp $
+.\" $NetBSD: systat.1,v 1.30 2003/08/07 11:16:00 agc Exp $
.\"
.\" Copyright (c) 1985, 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -11,11 +11,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/systat/systat.h b/usr.bin/systat/systat.h
index 3078ab6ab9b..0960b23713e 100644
--- a/usr.bin/systat/systat.h
+++ b/usr.bin/systat/systat.h
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/systat/vmstat.c b/usr.bin/systat/vmstat.c
index fad444ed587..962932edd5c 100644
--- a/usr.bin/systat/vmstat.c
+++ b/usr.bin/systat/vmstat.c
@@ -1,4 +1,4 @@
-/* $NetBSD: vmstat.c,v 1.52 2003/08/05 20:01:25 grant Exp $ */
+/* $NetBSD: vmstat.c,v 1.53 2003/08/07 11:16:01 agc Exp $ */
/*-
* Copyright (c) 1983, 1989, 1992, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)vmstat.c 8.2 (Berkeley) 1/12/94";
#endif
-__RCSID("$NetBSD: vmstat.c,v 1.52 2003/08/05 20:01:25 grant Exp $");
+__RCSID("$NetBSD: vmstat.c,v 1.53 2003/08/07 11:16:01 agc Exp $");
#endif /* not lint */
/*
diff --git a/usr.bin/tail/extern.h b/usr.bin/tail/extern.h
index 63c0e4da0d1..e940861d02f 100644
--- a/usr.bin/tail/extern.h
+++ b/usr.bin/tail/extern.h
@@ -1,4 +1,4 @@
-/* $NetBSD: extern.h,v 1.6 2002/06/14 00:47:41 wiz Exp $ */
+/* $NetBSD: extern.h,v 1.7 2003/08/07 11:16:01 agc Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/tail/forward.c b/usr.bin/tail/forward.c
index b4a114a81ae..eb03b92fe4a 100644
--- a/usr.bin/tail/forward.c
+++ b/usr.bin/tail/forward.c
@@ -1,4 +1,4 @@
-/* $NetBSD: forward.c,v 1.24 2003/03/10 08:04:15 lukem Exp $ */
+/* $NetBSD: forward.c,v 1.25 2003/08/07 11:16:01 agc Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)forward.c 8.1 (Berkeley) 6/6/93";
#endif
-__RCSID("$NetBSD: forward.c,v 1.24 2003/03/10 08:04:15 lukem Exp $");
+__RCSID("$NetBSD: forward.c,v 1.25 2003/08/07 11:16:01 agc Exp $");
#endif /* not lint */
#include <sys/types.h>
diff --git a/usr.bin/tail/misc.c b/usr.bin/tail/misc.c
index 5122dc5384e..c343b3250e5 100644
--- a/usr.bin/tail/misc.c
+++ b/usr.bin/tail/misc.c
@@ -13,11 +13,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -39,7 +35,7 @@
#if 0
static char sccsid[] = "@(#)misc.c 8.1 (Berkeley) 6/6/93";
#endif
-__RCSID("$NetBSD: misc.c,v 1.5 2002/06/14 00:47:41 wiz Exp $");
+__RCSID("$NetBSD: misc.c,v 1.6 2003/08/07 11:16:02 agc Exp $");
#endif /* not lint */
#include <sys/types.h>
diff --git a/usr.bin/tail/read.c b/usr.bin/tail/read.c
index 03addf07804..a84aa2d5d13 100644
--- a/usr.bin/tail/read.c
+++ b/usr.bin/tail/read.c
@@ -1,4 +1,4 @@
-/* $NetBSD: read.c,v 1.8 2002/06/14 00:47:41 wiz Exp $ */
+/* $NetBSD: read.c,v 1.9 2003/08/07 11:16:02 agc Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)read.c 8.1 (Berkeley) 6/6/93";
#endif
-__RCSID("$NetBSD: read.c,v 1.8 2002/06/14 00:47:41 wiz Exp $");
+__RCSID("$NetBSD: read.c,v 1.9 2003/08/07 11:16:02 agc Exp $");
#endif /* not lint */
#include <sys/types.h>
diff --git a/usr.bin/tail/reverse.c b/usr.bin/tail/reverse.c
index 1e74b019256..9ab09c236bb 100644
--- a/usr.bin/tail/reverse.c
+++ b/usr.bin/tail/reverse.c
@@ -1,4 +1,4 @@
-/* $NetBSD: reverse.c,v 1.14 2002/06/14 00:47:41 wiz Exp $ */
+/* $NetBSD: reverse.c,v 1.15 2003/08/07 11:16:02 agc Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)reverse.c 8.1 (Berkeley) 6/6/93";
#endif
-__RCSID("$NetBSD: reverse.c,v 1.14 2002/06/14 00:47:41 wiz Exp $");
+__RCSID("$NetBSD: reverse.c,v 1.15 2003/08/07 11:16:02 agc Exp $");
#endif /* not lint */
#include <sys/param.h>
diff --git a/usr.bin/tail/tail.1 b/usr.bin/tail/tail.1
index e8c15bb494c..122dcec7fb7 100644
--- a/usr.bin/tail/tail.1
+++ b/usr.bin/tail/tail.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: tail.1,v 1.12 2003/02/25 10:35:56 wiz Exp $
+.\" $NetBSD: tail.1,v 1.13 2003/08/07 11:16:02 agc Exp $
.\"
.\" Copyright (c) 1980, 1990, 1991, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -14,11 +14,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/tail/tail.c b/usr.bin/tail/tail.c
index 0a6a9829eac..9648495811a 100644
--- a/usr.bin/tail/tail.c
+++ b/usr.bin/tail/tail.c
@@ -13,11 +13,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -44,7 +40,7 @@ __COPYRIGHT("@(#) Copyright (c) 1991, 1993\n\
#if 0
static char sccsid[] = "@(#)tail.c 8.1 (Berkeley) 6/6/93";
#endif
-__RCSID("$NetBSD: tail.c,v 1.10 2003/07/14 09:30:52 itojun Exp $");
+__RCSID("$NetBSD: tail.c,v 1.11 2003/08/07 11:16:03 agc Exp $");
#endif /* not lint */
#include <sys/types.h>
diff --git a/usr.bin/talk/ctl.c b/usr.bin/talk/ctl.c
index 14af5f2bbaa..137af70157d 100644
--- a/usr.bin/talk/ctl.c
+++ b/usr.bin/talk/ctl.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ctl.c,v 1.5 2000/03/02 17:37:46 christos Exp $ */
+/* $NetBSD: ctl.c,v 1.6 2003/08/07 11:16:03 agc Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)ctl.c 8.1 (Berkeley) 6/6/93";
#endif
-__RCSID("$NetBSD: ctl.c,v 1.5 2000/03/02 17:37:46 christos Exp $");
+__RCSID("$NetBSD: ctl.c,v 1.6 2003/08/07 11:16:03 agc Exp $");
#endif /* not lint */
/*
diff --git a/usr.bin/talk/ctl_transact.c b/usr.bin/talk/ctl_transact.c
index cdbf848d159..f4b167789ee 100644
--- a/usr.bin/talk/ctl_transact.c
+++ b/usr.bin/talk/ctl_transact.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ctl_transact.c,v 1.8 2002/09/23 12:48:03 mycroft Exp $ */
+/* $NetBSD: ctl_transact.c,v 1.9 2003/08/07 11:16:03 agc Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)ctl_transact.c 8.1 (Berkeley) 6/6/93";
#endif
-__RCSID("$NetBSD: ctl_transact.c,v 1.8 2002/09/23 12:48:03 mycroft Exp $");
+__RCSID("$NetBSD: ctl_transact.c,v 1.9 2003/08/07 11:16:03 agc Exp $");
#endif /* not lint */
#include "talk.h"
diff --git a/usr.bin/talk/display.c b/usr.bin/talk/display.c
index efbcab4681a..7b4ad4c5437 100644
--- a/usr.bin/talk/display.c
+++ b/usr.bin/talk/display.c
@@ -1,4 +1,4 @@
-/* $NetBSD: display.c,v 1.6 1999/08/13 13:52:59 proff Exp $ */
+/* $NetBSD: display.c,v 1.7 2003/08/07 11:16:04 agc Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)display.c 8.1 (Berkeley) 6/6/93";
#endif
-__RCSID("$NetBSD: display.c,v 1.6 1999/08/13 13:52:59 proff Exp $");
+__RCSID("$NetBSD: display.c,v 1.7 2003/08/07 11:16:04 agc Exp $");
#endif /* not lint */
/*
diff --git a/usr.bin/talk/get_addrs.c b/usr.bin/talk/get_addrs.c
index c6b05964480..a3060d7e827 100644
--- a/usr.bin/talk/get_addrs.c
+++ b/usr.bin/talk/get_addrs.c
@@ -1,4 +1,4 @@
-/* $NetBSD: get_addrs.c,v 1.7 2001/04/06 11:13:46 wiz Exp $ */
+/* $NetBSD: get_addrs.c,v 1.8 2003/08/07 11:16:04 agc Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)get_addrs.c 8.1 (Berkeley) 6/6/93";
#endif
-__RCSID("$NetBSD: get_addrs.c,v 1.7 2001/04/06 11:13:46 wiz Exp $");
+__RCSID("$NetBSD: get_addrs.c,v 1.8 2003/08/07 11:16:04 agc Exp $");
#endif /* not lint */
#include "talk.h"
diff --git a/usr.bin/talk/get_names.c b/usr.bin/talk/get_names.c
index 5a138bbea5f..602d20564cf 100644
--- a/usr.bin/talk/get_names.c
+++ b/usr.bin/talk/get_names.c
@@ -1,4 +1,4 @@
-/* $NetBSD: get_names.c,v 1.9 2001/04/06 11:13:46 wiz Exp $ */
+/* $NetBSD: get_names.c,v 1.10 2003/08/07 11:16:04 agc Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)get_names.c 8.1 (Berkeley) 6/6/93";
#endif
-__RCSID("$NetBSD: get_names.c,v 1.9 2001/04/06 11:13:46 wiz Exp $");
+__RCSID("$NetBSD: get_names.c,v 1.10 2003/08/07 11:16:04 agc Exp $");
#endif /* not lint */
#include "talk.h"
diff --git a/usr.bin/talk/init_disp.c b/usr.bin/talk/init_disp.c
index 7b72fa9bcdd..aec54d31a5b 100644
--- a/usr.bin/talk/init_disp.c
+++ b/usr.bin/talk/init_disp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: init_disp.c,v 1.10 2001/12/07 12:10:09 blymn Exp $ */
+/* $NetBSD: init_disp.c,v 1.11 2003/08/07 11:16:04 agc Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)init_disp.c 8.2 (Berkeley) 2/16/94";
#endif
-__RCSID("$NetBSD: init_disp.c,v 1.10 2001/12/07 12:10:09 blymn Exp $");
+__RCSID("$NetBSD: init_disp.c,v 1.11 2003/08/07 11:16:04 agc Exp $");
#endif /* not lint */
/*
diff --git a/usr.bin/talk/invite.c b/usr.bin/talk/invite.c
index 69b602a9577..9db66325a72 100644
--- a/usr.bin/talk/invite.c
+++ b/usr.bin/talk/invite.c
@@ -1,4 +1,4 @@
-/* $NetBSD: invite.c,v 1.5 2003/01/06 13:05:16 wiz Exp $ */
+/* $NetBSD: invite.c,v 1.6 2003/08/07 11:16:04 agc Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)invite.c 8.1 (Berkeley) 6/6/93";
#endif
-__RCSID("$NetBSD: invite.c,v 1.5 2003/01/06 13:05:16 wiz Exp $");
+__RCSID("$NetBSD: invite.c,v 1.6 2003/08/07 11:16:04 agc Exp $");
#endif /* not lint */
#include "talk.h"
diff --git a/usr.bin/talk/io.c b/usr.bin/talk/io.c
index 16a36400be3..81d18eeb37f 100644
--- a/usr.bin/talk/io.c
+++ b/usr.bin/talk/io.c
@@ -1,4 +1,4 @@
-/* $NetBSD: io.c,v 1.9 2002/12/06 03:21:43 thorpej Exp $ */
+/* $NetBSD: io.c,v 1.10 2003/08/07 11:16:04 agc Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)io.c 8.1 (Berkeley) 6/6/93";
#endif
-__RCSID("$NetBSD: io.c,v 1.9 2002/12/06 03:21:43 thorpej Exp $");
+__RCSID("$NetBSD: io.c,v 1.10 2003/08/07 11:16:04 agc Exp $");
#endif /* not lint */
/*
diff --git a/usr.bin/talk/look_up.c b/usr.bin/talk/look_up.c
index 8e04029fe8a..e219982e556 100644
--- a/usr.bin/talk/look_up.c
+++ b/usr.bin/talk/look_up.c
@@ -1,4 +1,4 @@
-/* $NetBSD: look_up.c,v 1.5 2001/09/27 14:43:31 christos Exp $ */
+/* $NetBSD: look_up.c,v 1.6 2003/08/07 11:16:05 agc Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)look_up.c 8.1 (Berkeley) 6/6/93";
#endif
-__RCSID("$NetBSD: look_up.c,v 1.5 2001/09/27 14:43:31 christos Exp $");
+__RCSID("$NetBSD: look_up.c,v 1.6 2003/08/07 11:16:05 agc Exp $");
#endif /* not lint */
#include "talk.h"
diff --git a/usr.bin/talk/msgs.c b/usr.bin/talk/msgs.c
index bc80fc175af..a55045e3c66 100644
--- a/usr.bin/talk/msgs.c
+++ b/usr.bin/talk/msgs.c
@@ -1,4 +1,4 @@
-/* $NetBSD: msgs.c,v 1.4 1997/10/20 00:23:27 lukem Exp $ */
+/* $NetBSD: msgs.c,v 1.5 2003/08/07 11:16:05 agc Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)msgs.c 8.1 (Berkeley) 6/6/93";
#endif
-__RCSID("$NetBSD: msgs.c,v 1.4 1997/10/20 00:23:27 lukem Exp $");
+__RCSID("$NetBSD: msgs.c,v 1.5 2003/08/07 11:16:05 agc Exp $");
#endif /* not lint */
/*
diff --git a/usr.bin/talk/talk.1 b/usr.bin/talk/talk.1
index d261b3c5e9f..6dbd983a9f2 100644
--- a/usr.bin/talk/talk.1
+++ b/usr.bin/talk/talk.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: talk.1,v 1.7 2002/09/30 11:09:12 grant Exp $
+.\" $NetBSD: talk.1,v 1.8 2003/08/07 11:16:05 agc Exp $
.\"
.\" Copyright (c) 1983, 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -11,11 +11,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/talk/talk.c b/usr.bin/talk/talk.c
index abe4f0d65d0..f96143e63cf 100644
--- a/usr.bin/talk/talk.c
+++ b/usr.bin/talk/talk.c
@@ -1,4 +1,4 @@
-/* $NetBSD: talk.c,v 1.5 1997/10/20 00:23:30 lukem Exp $ */
+/* $NetBSD: talk.c,v 1.6 2003/08/07 11:16:05 agc Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -43,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1983, 1993\n\
#if 0
static char sccsid[] = "@(#)talk.c 8.1 (Berkeley) 6/6/93";
#endif
-__RCSID("$NetBSD: talk.c,v 1.5 1997/10/20 00:23:30 lukem Exp $");
+__RCSID("$NetBSD: talk.c,v 1.6 2003/08/07 11:16:05 agc Exp $");
#endif /* not lint */
#include "talk.h"
diff --git a/usr.bin/talk/talk.h b/usr.bin/talk/talk.h
index 262d2a7337e..f24721a940d 100644
--- a/usr.bin/talk/talk.h
+++ b/usr.bin/talk/talk.h
@@ -1,4 +1,4 @@
-/* $NetBSD: talk.h,v 1.6 2000/03/02 17:37:47 christos Exp $ */
+/* $NetBSD: talk.h,v 1.7 2003/08/07 11:16:05 agc Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/talk/talk_ctl.h b/usr.bin/talk/talk_ctl.h
index 2e2550a18ad..e4bab520a15 100644
--- a/usr.bin/talk/talk_ctl.h
+++ b/usr.bin/talk/talk_ctl.h
@@ -1,4 +1,4 @@
-/* $NetBSD: talk_ctl.h,v 1.3 1994/12/09 02:14:28 jtc Exp $ */
+/* $NetBSD: talk_ctl.h,v 1.4 2003/08/07 11:16:05 agc Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/tcopy/tcopy.1 b/usr.bin/tcopy/tcopy.1
index 6307e50e12b..15f9e9fbe0e 100644
--- a/usr.bin/tcopy/tcopy.1
+++ b/usr.bin/tcopy/tcopy.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: tcopy.1,v 1.7 2002/09/30 11:09:12 grant Exp $
+.\" $NetBSD: tcopy.1,v 1.8 2003/08/07 11:16:06 agc Exp $
.\"
.\" Copyright (c) 1985, 1990, 1991, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -11,11 +11,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/tcopy/tcopy.c b/usr.bin/tcopy/tcopy.c
index 219a1355584..c09badc683b 100644
--- a/usr.bin/tcopy/tcopy.c
+++ b/usr.bin/tcopy/tcopy.c
@@ -1,4 +1,4 @@
-/* $NetBSD: tcopy.c,v 1.11 2001/01/04 23:05:56 lukem Exp $ */
+/* $NetBSD: tcopy.c,v 1.12 2003/08/07 11:16:06 agc Exp $ */
/*
* Copyright (c) 1985, 1987, 1993, 1995
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -43,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1985, 1987, 1993\n\
#if 0
static char sccsid[] = "@(#)tcopy.c 8.3 (Berkeley) 1/23/95";
#endif
-__RCSID("$NetBSD: tcopy.c,v 1.11 2001/01/04 23:05:56 lukem Exp $");
+__RCSID("$NetBSD: tcopy.c,v 1.12 2003/08/07 11:16:06 agc Exp $");
#endif /* not lint */
#include <sys/types.h>
diff --git a/usr.bin/tee/tee.1 b/usr.bin/tee/tee.1
index 12f80ee1b38..a02b868a29d 100644
--- a/usr.bin/tee/tee.1
+++ b/usr.bin/tee/tee.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: tee.1,v 1.6 2002/02/08 01:36:33 ross Exp $
+.\" $NetBSD: tee.1,v 1.7 2003/08/07 11:16:07 agc Exp $
.\"
.\" Copyright (c) 1991, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -14,11 +14,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/tee/tee.c b/usr.bin/tee/tee.c
index e916d900e5d..a9b8843f587 100644
--- a/usr.bin/tee/tee.c
+++ b/usr.bin/tee/tee.c
@@ -1,4 +1,4 @@
-/* $NetBSD: tee.c,v 1.6 1997/10/20 00:37:11 lukem Exp $ */
+/* $NetBSD: tee.c,v 1.7 2003/08/07 11:16:07 agc Exp $ */
/*
* Copyright (c) 1988, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -43,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1988, 1993\n\
#if 0
static char sccsid[] = "@(#)tee.c 8.1 (Berkeley) 6/6/93";
#endif
-__RCSID("$NetBSD: tee.c,v 1.6 1997/10/20 00:37:11 lukem Exp $");
+__RCSID("$NetBSD: tee.c,v 1.7 2003/08/07 11:16:07 agc Exp $");
#endif
#include <sys/types.h>
diff --git a/usr.bin/telnet/authenc.c b/usr.bin/telnet/authenc.c
index fe849a313b8..356ba7d8032 100644
--- a/usr.bin/telnet/authenc.c
+++ b/usr.bin/telnet/authenc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: authenc.c,v 1.11 2003/07/12 13:33:08 itojun Exp $ */
+/* $NetBSD: authenc.c,v 1.12 2003/08/07 11:16:07 agc Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)authenc.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: authenc.c,v 1.11 2003/07/12 13:33:08 itojun Exp $");
+__RCSID("$NetBSD: authenc.c,v 1.12 2003/08/07 11:16:07 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/telnet/commands.c b/usr.bin/telnet/commands.c
index 83254e3afa7..d592351392e 100644
--- a/usr.bin/telnet/commands.c
+++ b/usr.bin/telnet/commands.c
@@ -1,4 +1,4 @@
-/* $NetBSD: commands.c,v 1.56 2003/07/14 16:06:46 itojun Exp $ */
+/* $NetBSD: commands.c,v 1.57 2003/08/07 11:16:08 agc Exp $ */
/*
* Copyright (C) 1997 and 1998 WIDE Project.
@@ -41,11 +41,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -67,7 +63,7 @@
#if 0
static char sccsid[] = "@(#)commands.c 8.4 (Berkeley) 5/30/95";
#else
-__RCSID("$NetBSD: commands.c,v 1.56 2003/07/14 16:06:46 itojun Exp $");
+__RCSID("$NetBSD: commands.c,v 1.57 2003/08/07 11:16:08 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/telnet/defines.h b/usr.bin/telnet/defines.h
index 364d98dbc33..93f6aa0bdb1 100644
--- a/usr.bin/telnet/defines.h
+++ b/usr.bin/telnet/defines.h
@@ -1,4 +1,4 @@
-/* $NetBSD: defines.h,v 1.7 2003/07/14 15:56:29 itojun Exp $ */
+/* $NetBSD: defines.h,v 1.8 2003/08/07 11:16:09 agc Exp $ */
/*
* Copyright (c) 1988, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/telnet/externs.h b/usr.bin/telnet/externs.h
index 80e6e1adb4f..63443f485f7 100644
--- a/usr.bin/telnet/externs.h
+++ b/usr.bin/telnet/externs.h
@@ -1,4 +1,4 @@
-/* $NetBSD: externs.h,v 1.29 2003/07/14 16:06:47 itojun Exp $ */
+/* $NetBSD: externs.h,v 1.30 2003/08/07 11:16:09 agc Exp $ */
/*
* Copyright (c) 1988, 1990, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/telnet/general.h b/usr.bin/telnet/general.h
index 738a939e372..27cf458652a 100644
--- a/usr.bin/telnet/general.h
+++ b/usr.bin/telnet/general.h
@@ -1,4 +1,4 @@
-/* $NetBSD: general.h,v 1.5 1996/02/28 21:04:02 thorpej Exp $ */
+/* $NetBSD: general.h,v 1.6 2003/08/07 11:16:09 agc Exp $ */
/*
* Copyright (c) 1988, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/telnet/main.c b/usr.bin/telnet/main.c
index 273d125a1ab..16d0e7b02eb 100644
--- a/usr.bin/telnet/main.c
+++ b/usr.bin/telnet/main.c
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.20 2003/07/14 15:56:29 itojun Exp $ */
+/* $NetBSD: main.c,v 1.21 2003/08/07 11:16:09 agc Exp $ */
/*
* Copyright (c) 1988, 1990, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -43,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1988, 1990, 1993\n\
#if 0
static char sccsid[] = "@(#)main.c 8.3 (Berkeley) 5/30/95";
#else
-__RCSID("$NetBSD: main.c,v 1.20 2003/07/14 15:56:29 itojun Exp $");
+__RCSID("$NetBSD: main.c,v 1.21 2003/08/07 11:16:09 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/telnet/network.c b/usr.bin/telnet/network.c
index 1bad2504f08..1a0cdaf952d 100644
--- a/usr.bin/telnet/network.c
+++ b/usr.bin/telnet/network.c
@@ -1,4 +1,4 @@
-/* $NetBSD: network.c,v 1.15 2003/07/14 16:06:48 itojun Exp $ */
+/* $NetBSD: network.c,v 1.16 2003/08/07 11:16:10 agc Exp $ */
/*
* Copyright (c) 1988, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)network.c 8.2 (Berkeley) 12/15/93";
#else
-__RCSID("$NetBSD: network.c,v 1.15 2003/07/14 16:06:48 itojun Exp $");
+__RCSID("$NetBSD: network.c,v 1.16 2003/08/07 11:16:10 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/telnet/ring.c b/usr.bin/telnet/ring.c
index 1dd8fec4f5b..71d5b51dcd7 100644
--- a/usr.bin/telnet/ring.c
+++ b/usr.bin/telnet/ring.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ring.c,v 1.12 2003/07/14 15:56:29 itojun Exp $ */
+/* $NetBSD: ring.c,v 1.13 2003/08/07 11:16:10 agc Exp $ */
/*
* Copyright (c) 1988, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)ring.c 8.2 (Berkeley) 5/30/95";
#else
-__RCSID("$NetBSD: ring.c,v 1.12 2003/07/14 15:56:29 itojun Exp $");
+__RCSID("$NetBSD: ring.c,v 1.13 2003/08/07 11:16:10 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/telnet/ring.h b/usr.bin/telnet/ring.h
index bdff4e1bf9b..86f03cc5226 100644
--- a/usr.bin/telnet/ring.h
+++ b/usr.bin/telnet/ring.h
@@ -1,4 +1,4 @@
-/* $NetBSD: ring.h,v 1.9 2002/06/14 00:30:57 wiz Exp $ */
+/* $NetBSD: ring.h,v 1.10 2003/08/07 11:16:10 agc Exp $ */
/*
* Copyright (c) 1988, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/telnet/sys_bsd.c b/usr.bin/telnet/sys_bsd.c
index 838616ce5bd..8a88bb273cd 100644
--- a/usr.bin/telnet/sys_bsd.c
+++ b/usr.bin/telnet/sys_bsd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: sys_bsd.c,v 1.28 2003/08/07 07:01:09 jdolecek Exp $ */
+/* $NetBSD: sys_bsd.c,v 1.29 2003/08/07 11:16:10 agc Exp $ */
/*
* Copyright (c) 1988, 1990, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -38,7 +34,7 @@
#if 0
from: static char sccsid[] = "@(#)sys_bsd.c 8.4 (Berkeley) 5/30/95";
#else
-__RCSID("$NetBSD: sys_bsd.c,v 1.28 2003/08/07 07:01:09 jdolecek Exp $");
+__RCSID("$NetBSD: sys_bsd.c,v 1.29 2003/08/07 11:16:10 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/telnet/telnet.1 b/usr.bin/telnet/telnet.1
index 9611a750347..679580116d3 100644
--- a/usr.bin/telnet/telnet.1
+++ b/usr.bin/telnet/telnet.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: telnet.1,v 1.26 2003/02/25 10:35:57 wiz Exp $
+.\" $NetBSD: telnet.1,v 1.27 2003/08/07 11:16:10 agc Exp $
.\"
.\" Copyright (c) 1983, 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -11,11 +11,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/telnet/telnet.c b/usr.bin/telnet/telnet.c
index b16e5a7d2e1..e858c329719 100644
--- a/usr.bin/telnet/telnet.c
+++ b/usr.bin/telnet/telnet.c
@@ -1,4 +1,4 @@
-/* $NetBSD: telnet.c,v 1.25 2003/07/14 16:06:49 itojun Exp $ */
+/* $NetBSD: telnet.c,v 1.26 2003/08/07 11:16:11 agc Exp $ */
/*
* Copyright (c) 1988, 1990, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)telnet.c 8.4 (Berkeley) 5/30/95";
#else
-__RCSID("$NetBSD: telnet.c,v 1.25 2003/07/14 16:06:49 itojun Exp $");
+__RCSID("$NetBSD: telnet.c,v 1.26 2003/08/07 11:16:11 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/telnet/terminal.c b/usr.bin/telnet/terminal.c
index 47ca11cfecf..0e985d71a1a 100644
--- a/usr.bin/telnet/terminal.c
+++ b/usr.bin/telnet/terminal.c
@@ -1,4 +1,4 @@
-/* $NetBSD: terminal.c,v 1.12 2003/07/14 16:06:49 itojun Exp $ */
+/* $NetBSD: terminal.c,v 1.13 2003/08/07 11:16:11 agc Exp $ */
/*
* Copyright (c) 1988, 1990, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)terminal.c 8.2 (Berkeley) 2/16/95";
#else
-__RCSID("$NetBSD: terminal.c,v 1.12 2003/07/14 16:06:49 itojun Exp $");
+__RCSID("$NetBSD: terminal.c,v 1.13 2003/08/07 11:16:11 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/telnet/tn3270.c b/usr.bin/telnet/tn3270.c
index fae3fe3218b..7fec884cc09 100644
--- a/usr.bin/telnet/tn3270.c
+++ b/usr.bin/telnet/tn3270.c
@@ -1,4 +1,4 @@
-/* $NetBSD: tn3270.c,v 1.20 2003/07/16 15:14:19 itojun Exp $ */
+/* $NetBSD: tn3270.c,v 1.21 2003/08/07 11:16:12 agc Exp $ */
/*
* Copyright (c) 1988, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)tn3270.c 8.2 (Berkeley) 5/30/95";
#else
-__RCSID("$NetBSD: tn3270.c,v 1.20 2003/07/16 15:14:19 itojun Exp $");
+__RCSID("$NetBSD: tn3270.c,v 1.21 2003/08/07 11:16:12 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/telnet/types.h b/usr.bin/telnet/types.h
index b89ce552bb8..d85ae2eccf4 100644
--- a/usr.bin/telnet/types.h
+++ b/usr.bin/telnet/types.h
@@ -1,4 +1,4 @@
-/* $NetBSD: types.h,v 1.5 1996/02/28 21:04:20 thorpej Exp $ */
+/* $NetBSD: types.h,v 1.6 2003/08/07 11:16:12 agc Exp $ */
/*
* Copyright (c) 1988, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/telnet/utilities.c b/usr.bin/telnet/utilities.c
index 69d068dedd2..aac45fc3ced 100644
--- a/usr.bin/telnet/utilities.c
+++ b/usr.bin/telnet/utilities.c
@@ -1,4 +1,4 @@
-/* $NetBSD: utilities.c,v 1.18 2003/07/14 16:06:49 itojun Exp $ */
+/* $NetBSD: utilities.c,v 1.19 2003/08/07 11:16:12 agc Exp $ */
/*
* Copyright (c) 1988, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)utilities.c 8.3 (Berkeley) 5/30/95";
#else
-__RCSID("$NetBSD: utilities.c,v 1.18 2003/07/14 16:06:49 itojun Exp $");
+__RCSID("$NetBSD: utilities.c,v 1.19 2003/08/07 11:16:12 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/tftp/extern.h b/usr.bin/tftp/extern.h
index 7c4e679f87c..6cdac3d3ec3 100644
--- a/usr.bin/tftp/extern.h
+++ b/usr.bin/tftp/extern.h
@@ -1,4 +1,4 @@
-/* $NetBSD: extern.h,v 1.2 1994/12/08 09:51:24 jtc Exp $ */
+/* $NetBSD: extern.h,v 1.3 2003/08/07 11:16:13 agc Exp $ */
/*
* Copyright (c) 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/tftp/main.c b/usr.bin/tftp/main.c
index dfa6f19ee3d..53e2bb93957 100644
--- a/usr.bin/tftp/main.c
+++ b/usr.bin/tftp/main.c
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.16 2003/07/12 13:38:10 itojun Exp $ */
+/* $NetBSD: main.c,v 1.17 2003/08/07 11:16:13 agc Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -40,7 +36,7 @@ __COPYRIGHT("@(#) Copyright (c) 1983, 1993\n\
#if 0
static char sccsid[] = "@(#)main.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: main.c,v 1.16 2003/07/12 13:38:10 itojun Exp $");
+__RCSID("$NetBSD: main.c,v 1.17 2003/08/07 11:16:13 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/tftp/tftp.1 b/usr.bin/tftp/tftp.1
index ceb55d3c853..604609d9acd 100644
--- a/usr.bin/tftp/tftp.1
+++ b/usr.bin/tftp/tftp.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: tftp.1,v 1.17 2003/07/04 12:13:29 wiz Exp $
+.\" $NetBSD: tftp.1,v 1.18 2003/08/07 11:16:14 agc Exp $
.\"
.\" Copyright (c) 1990, 1993, 1994
.\" The Regents of the University of California. All rights reserved.
@@ -11,11 +11,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/tftp/tftp.c b/usr.bin/tftp/tftp.c
index 2feedeb1ad9..9b0554f8992 100644
--- a/usr.bin/tftp/tftp.c
+++ b/usr.bin/tftp/tftp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: tftp.c,v 1.17 2003/06/11 01:44:32 briggs Exp $ */
+/* $NetBSD: tftp.c,v 1.18 2003/08/07 11:16:14 agc Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)tftp.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: tftp.c,v 1.17 2003/06/11 01:44:32 briggs Exp $");
+__RCSID("$NetBSD: tftp.c,v 1.18 2003/08/07 11:16:14 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/tftp/tftpsubs.c b/usr.bin/tftp/tftpsubs.c
index 374eecb72fe..907d4c5a176 100644
--- a/usr.bin/tftp/tftpsubs.c
+++ b/usr.bin/tftp/tftpsubs.c
@@ -1,4 +1,4 @@
-/* $NetBSD: tftpsubs.c,v 1.7 2003/06/11 01:44:32 briggs Exp $ */
+/* $NetBSD: tftpsubs.c,v 1.8 2003/08/07 11:16:14 agc Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)tftpsubs.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: tftpsubs.c,v 1.7 2003/06/11 01:44:32 briggs Exp $");
+__RCSID("$NetBSD: tftpsubs.c,v 1.8 2003/08/07 11:16:14 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/tftp/tftpsubs.h b/usr.bin/tftp/tftpsubs.h
index d7902fe7320..409b53c767c 100644
--- a/usr.bin/tftp/tftpsubs.h
+++ b/usr.bin/tftp/tftpsubs.h
@@ -1,4 +1,4 @@
-/* $NetBSD: tftpsubs.h,v 1.3 2003/06/11 01:44:32 briggs Exp $ */
+/* $NetBSD: tftpsubs.h,v 1.4 2003/08/07 11:16:14 agc Exp $ */
/*
* Copyright (c) 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/time/time.1 b/usr.bin/time/time.1
index 3323a91663e..f587d383d47 100644
--- a/usr.bin/time/time.1
+++ b/usr.bin/time/time.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: time.1,v 1.17 2003/06/27 09:40:17 wiz Exp $
+.\" $NetBSD: time.1,v 1.18 2003/08/07 11:16:15 agc Exp $
.\"
.\" Copyright (c) 1980, 1991, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -11,11 +11,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/time/time.c b/usr.bin/time/time.c
index 57b608a73c2..f7c546ca8ca 100644
--- a/usr.bin/time/time.c
+++ b/usr.bin/time/time.c
@@ -1,4 +1,4 @@
-/* $NetBSD: time.c,v 1.12 2002/07/16 15:41:57 christos Exp $ */
+/* $NetBSD: time.c,v 1.13 2003/08/07 11:16:15 agc Exp $ */
/*
* Copyright (c) 1987, 1988, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -43,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1987, 1988, 1993\n\
#if 0
static char sccsid[] = "@(#)time.c 8.1 (Berkeley) 6/6/93";
#endif
-__RCSID("$NetBSD: time.c,v 1.12 2002/07/16 15:41:57 christos Exp $");
+__RCSID("$NetBSD: time.c,v 1.13 2003/08/07 11:16:15 agc Exp $");
#endif /* not lint */
#include <sys/types.h>
diff --git a/usr.bin/tip/acu.c b/usr.bin/tip/acu.c
index 0df5f07217a..e94d6d7e12e 100644
--- a/usr.bin/tip/acu.c
+++ b/usr.bin/tip/acu.c
@@ -1,4 +1,4 @@
-/* $NetBSD: acu.c,v 1.7 1998/07/12 09:59:29 mrg Exp $ */
+/* $NetBSD: acu.c,v 1.8 2003/08/07 11:16:16 agc Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)acu.c 8.1 (Berkeley) 6/6/93";
#endif
-__RCSID("$NetBSD: acu.c,v 1.7 1998/07/12 09:59:29 mrg Exp $");
+__RCSID("$NetBSD: acu.c,v 1.8 2003/08/07 11:16:16 agc Exp $");
#endif /* not lint */
#include "tip.h"
diff --git a/usr.bin/tip/aculib/biz22.c b/usr.bin/tip/aculib/biz22.c
index c778919628f..1270206cf55 100644
--- a/usr.bin/tip/aculib/biz22.c
+++ b/usr.bin/tip/aculib/biz22.c
@@ -1,4 +1,4 @@
-/* $NetBSD: biz22.c,v 1.7 1997/11/22 07:28:52 lukem Exp $ */
+/* $NetBSD: biz22.c,v 1.8 2003/08/07 11:16:21 agc Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)biz22.c 8.1 (Berkeley) 6/6/93";
#endif
-__RCSID("$NetBSD: biz22.c,v 1.7 1997/11/22 07:28:52 lukem Exp $");
+__RCSID("$NetBSD: biz22.c,v 1.8 2003/08/07 11:16:21 agc Exp $");
#endif /* not lint */
#include "tip.h"
diff --git a/usr.bin/tip/aculib/biz31.c b/usr.bin/tip/aculib/biz31.c
index 7a08de46e96..7cbf69ff9ba 100644
--- a/usr.bin/tip/aculib/biz31.c
+++ b/usr.bin/tip/aculib/biz31.c
@@ -1,4 +1,4 @@
-/* $NetBSD: biz31.c,v 1.7 1998/07/12 09:14:19 mrg Exp $ */
+/* $NetBSD: biz31.c,v 1.8 2003/08/07 11:16:21 agc Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)biz31.c 8.1 (Berkeley) 6/6/93";
#endif
-__RCSID("$NetBSD: biz31.c,v 1.7 1998/07/12 09:14:19 mrg Exp $");
+__RCSID("$NetBSD: biz31.c,v 1.8 2003/08/07 11:16:21 agc Exp $");
#endif /* not lint */
#include "tip.h"
diff --git a/usr.bin/tip/aculib/courier.c b/usr.bin/tip/aculib/courier.c
index 2eb825d1939..f351b47a738 100644
--- a/usr.bin/tip/aculib/courier.c
+++ b/usr.bin/tip/aculib/courier.c
@@ -1,4 +1,4 @@
-/* $NetBSD: courier.c,v 1.11 1998/12/19 23:02:02 christos Exp $ */
+/* $NetBSD: courier.c,v 1.12 2003/08/07 11:16:21 agc Exp $ */
/*
* Copyright (c) 1986, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)courier.c 8.1 (Berkeley) 6/6/93";
#endif
-__RCSID("$NetBSD: courier.c,v 1.11 1998/12/19 23:02:02 christos Exp $");
+__RCSID("$NetBSD: courier.c,v 1.12 2003/08/07 11:16:21 agc Exp $");
#endif /* not lint */
/*
diff --git a/usr.bin/tip/aculib/df.c b/usr.bin/tip/aculib/df.c
index 3d256657ae5..ff1b5a89569 100644
--- a/usr.bin/tip/aculib/df.c
+++ b/usr.bin/tip/aculib/df.c
@@ -1,4 +1,4 @@
-/* $NetBSD: df.c,v 1.5 1997/11/22 07:28:54 lukem Exp $ */
+/* $NetBSD: df.c,v 1.6 2003/08/07 11:16:22 agc Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)df.c 8.1 (Berkeley) 6/6/93";
#endif
-__RCSID("$NetBSD: df.c,v 1.5 1997/11/22 07:28:54 lukem Exp $");
+__RCSID("$NetBSD: df.c,v 1.6 2003/08/07 11:16:22 agc Exp $");
#endif /* not lint */
/*
diff --git a/usr.bin/tip/aculib/dn11.c b/usr.bin/tip/aculib/dn11.c
index 8af26d367b6..5bea1822f89 100644
--- a/usr.bin/tip/aculib/dn11.c
+++ b/usr.bin/tip/aculib/dn11.c
@@ -1,4 +1,4 @@
-/* $NetBSD: dn11.c,v 1.6 1998/07/12 09:14:20 mrg Exp $ */
+/* $NetBSD: dn11.c,v 1.7 2003/08/07 11:16:22 agc Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)dn11.c 8.1 (Berkeley) 6/6/93";
#endif
-__RCSID("$NetBSD: dn11.c,v 1.6 1998/07/12 09:14:20 mrg Exp $");
+__RCSID("$NetBSD: dn11.c,v 1.7 2003/08/07 11:16:22 agc Exp $");
#endif /* not lint */
/*
diff --git a/usr.bin/tip/aculib/hayes.c b/usr.bin/tip/aculib/hayes.c
index f7d919c926c..2281438b212 100644
--- a/usr.bin/tip/aculib/hayes.c
+++ b/usr.bin/tip/aculib/hayes.c
@@ -1,4 +1,4 @@
-/* $NetBSD: hayes.c,v 1.8 1998/07/12 09:14:20 mrg Exp $ */
+/* $NetBSD: hayes.c,v 1.9 2003/08/07 11:16:22 agc Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)hayes.c 8.1 (Berkeley) 6/6/93";
#endif
-__RCSID("$NetBSD: hayes.c,v 1.8 1998/07/12 09:14:20 mrg Exp $");
+__RCSID("$NetBSD: hayes.c,v 1.9 2003/08/07 11:16:22 agc Exp $");
#endif /* not lint */
/*
diff --git a/usr.bin/tip/aculib/t3000.c b/usr.bin/tip/aculib/t3000.c
index 778eb02a896..7e899f417d7 100644
--- a/usr.bin/tip/aculib/t3000.c
+++ b/usr.bin/tip/aculib/t3000.c
@@ -1,4 +1,4 @@
-/* $NetBSD: t3000.c,v 1.9 1998/12/19 23:02:02 christos Exp $ */
+/* $NetBSD: t3000.c,v 1.10 2003/08/07 11:16:22 agc Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)t3000.c 8.1 (Berkeley) 6/6/93";
#endif
-__RCSID("$NetBSD: t3000.c,v 1.9 1998/12/19 23:02:02 christos Exp $");
+__RCSID("$NetBSD: t3000.c,v 1.10 2003/08/07 11:16:22 agc Exp $");
#endif /* not lint */
/*
diff --git a/usr.bin/tip/aculib/v3451.c b/usr.bin/tip/aculib/v3451.c
index 189fc7aa310..cbb4c0d4314 100644
--- a/usr.bin/tip/aculib/v3451.c
+++ b/usr.bin/tip/aculib/v3451.c
@@ -1,4 +1,4 @@
-/* $NetBSD: v3451.c,v 1.8 1998/07/12 09:14:20 mrg Exp $ */
+/* $NetBSD: v3451.c,v 1.9 2003/08/07 11:16:22 agc Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)v3451.c 8.1 (Berkeley) 6/6/93";
#endif
-__RCSID("$NetBSD: v3451.c,v 1.8 1998/07/12 09:14:20 mrg Exp $");
+__RCSID("$NetBSD: v3451.c,v 1.9 2003/08/07 11:16:22 agc Exp $");
#endif /* not lint */
/*
diff --git a/usr.bin/tip/aculib/v831.c b/usr.bin/tip/aculib/v831.c
index 9c5d172945b..c10b0424948 100644
--- a/usr.bin/tip/aculib/v831.c
+++ b/usr.bin/tip/aculib/v831.c
@@ -1,4 +1,4 @@
-/* $NetBSD: v831.c,v 1.8 1998/12/19 23:02:21 christos Exp $ */
+/* $NetBSD: v831.c,v 1.9 2003/08/07 11:16:23 agc Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)v831.c 8.1 (Berkeley) 6/6/93";
#endif
-__RCSID("$NetBSD: v831.c,v 1.8 1998/12/19 23:02:21 christos Exp $");
+__RCSID("$NetBSD: v831.c,v 1.9 2003/08/07 11:16:23 agc Exp $");
#endif /* not lint */
/*
diff --git a/usr.bin/tip/aculib/ventel.c b/usr.bin/tip/aculib/ventel.c
index a445368bc1a..d28f9a02f28 100644
--- a/usr.bin/tip/aculib/ventel.c
+++ b/usr.bin/tip/aculib/ventel.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ventel.c,v 1.9 1998/12/19 23:02:21 christos Exp $ */
+/* $NetBSD: ventel.c,v 1.10 2003/08/07 11:16:23 agc Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)ventel.c 8.1 (Berkeley) 6/6/93";
#endif
-__RCSID("$NetBSD: ventel.c,v 1.9 1998/12/19 23:02:21 christos Exp $");
+__RCSID("$NetBSD: ventel.c,v 1.10 2003/08/07 11:16:23 agc Exp $");
#endif /* not lint */
/*
diff --git a/usr.bin/tip/acutab.c b/usr.bin/tip/acutab.c
index 92e12a131f7..d8a27d1f937 100644
--- a/usr.bin/tip/acutab.c
+++ b/usr.bin/tip/acutab.c
@@ -1,4 +1,4 @@
-/* $NetBSD: acutab.c,v 1.4 1997/11/22 07:28:40 lukem Exp $ */
+/* $NetBSD: acutab.c,v 1.5 2003/08/07 11:16:16 agc Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)acutab.c 8.1 (Berkeley) 6/6/93";
#endif
-__RCSID("$NetBSD: acutab.c,v 1.4 1997/11/22 07:28:40 lukem Exp $");
+__RCSID("$NetBSD: acutab.c,v 1.5 2003/08/07 11:16:16 agc Exp $");
#endif /* not lint */
#include "tip.h"
diff --git a/usr.bin/tip/cmds.c b/usr.bin/tip/cmds.c
index dbce407a1d5..2a7affed2f4 100644
--- a/usr.bin/tip/cmds.c
+++ b/usr.bin/tip/cmds.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cmds.c,v 1.13 1998/12/19 22:59:21 christos Exp $ */
+/* $NetBSD: cmds.c,v 1.14 2003/08/07 11:16:16 agc Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)cmds.c 8.1 (Berkeley) 6/6/93";
#endif
-__RCSID("$NetBSD: cmds.c,v 1.13 1998/12/19 22:59:21 christos Exp $");
+__RCSID("$NetBSD: cmds.c,v 1.14 2003/08/07 11:16:16 agc Exp $");
#endif /* not lint */
#include "tip.h"
diff --git a/usr.bin/tip/cmdtab.c b/usr.bin/tip/cmdtab.c
index 0d27d59e66a..aa6c42ea39d 100644
--- a/usr.bin/tip/cmdtab.c
+++ b/usr.bin/tip/cmdtab.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cmdtab.c,v 1.4 1997/11/22 07:28:42 lukem Exp $ */
+/* $NetBSD: cmdtab.c,v 1.5 2003/08/07 11:16:17 agc Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)cmdtab.c 8.1 (Berkeley) 6/6/93";
#endif
-__RCSID("$NetBSD: cmdtab.c,v 1.4 1997/11/22 07:28:42 lukem Exp $");
+__RCSID("$NetBSD: cmdtab.c,v 1.5 2003/08/07 11:16:17 agc Exp $");
#endif /* not lint */
#include "tip.h"
diff --git a/usr.bin/tip/cu.c b/usr.bin/tip/cu.c
index f96bad2b17e..0f417a71284 100644
--- a/usr.bin/tip/cu.c
+++ b/usr.bin/tip/cu.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cu.c,v 1.6 1997/11/22 07:28:42 lukem Exp $ */
+/* $NetBSD: cu.c,v 1.7 2003/08/07 11:16:17 agc Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)cu.c 8.1 (Berkeley) 6/6/93";
#endif
-__RCSID("$NetBSD: cu.c,v 1.6 1997/11/22 07:28:42 lukem Exp $");
+__RCSID("$NetBSD: cu.c,v 1.7 2003/08/07 11:16:17 agc Exp $");
#endif /* not lint */
#include "tip.h"
diff --git a/usr.bin/tip/hunt.c b/usr.bin/tip/hunt.c
index 25187000028..9af10b5b72e 100644
--- a/usr.bin/tip/hunt.c
+++ b/usr.bin/tip/hunt.c
@@ -1,4 +1,4 @@
-/* $NetBSD: hunt.c,v 1.9 1998/07/12 09:59:30 mrg Exp $ */
+/* $NetBSD: hunt.c,v 1.10 2003/08/07 11:16:17 agc Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)hunt.c 8.1 (Berkeley) 6/6/93";
#endif
-__RCSID("$NetBSD: hunt.c,v 1.9 1998/07/12 09:59:30 mrg Exp $");
+__RCSID("$NetBSD: hunt.c,v 1.10 2003/08/07 11:16:17 agc Exp $");
#endif /* not lint */
#include "tip.h"
diff --git a/usr.bin/tip/log.c b/usr.bin/tip/log.c
index 14cc86a3555..1db7ca1976e 100644
--- a/usr.bin/tip/log.c
+++ b/usr.bin/tip/log.c
@@ -1,4 +1,4 @@
-/* $NetBSD: log.c,v 1.8 1998/08/25 20:59:41 ross Exp $ */
+/* $NetBSD: log.c,v 1.9 2003/08/07 11:16:17 agc Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)log.c 8.1 (Berkeley) 6/6/93";
#endif
-__RCSID("$NetBSD: log.c,v 1.8 1998/08/25 20:59:41 ross Exp $");
+__RCSID("$NetBSD: log.c,v 1.9 2003/08/07 11:16:17 agc Exp $");
#endif /* not lint */
#include "tip.h"
diff --git a/usr.bin/tip/partab.c b/usr.bin/tip/partab.c
index c3030b69c37..c917ada6ffd 100644
--- a/usr.bin/tip/partab.c
+++ b/usr.bin/tip/partab.c
@@ -1,4 +1,4 @@
-/* $NetBSD: partab.c,v 1.5 1997/11/22 07:28:44 lukem Exp $ */
+/* $NetBSD: partab.c,v 1.6 2003/08/07 11:16:18 agc Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)partab.c 8.1 (Berkeley) 6/6/93";
#endif
-__RCSID("$NetBSD: partab.c,v 1.5 1997/11/22 07:28:44 lukem Exp $");
+__RCSID("$NetBSD: partab.c,v 1.6 2003/08/07 11:16:18 agc Exp $");
#endif /* not lint */
/*
diff --git a/usr.bin/tip/pathnames.h b/usr.bin/tip/pathnames.h
index 00b126d3694..133f6efbbab 100644
--- a/usr.bin/tip/pathnames.h
+++ b/usr.bin/tip/pathnames.h
@@ -1,4 +1,4 @@
-/* $NetBSD: pathnames.h,v 1.3 1994/12/08 09:30:59 jtc Exp $ */
+/* $NetBSD: pathnames.h,v 1.4 2003/08/07 11:16:18 agc Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/tip/remote.c b/usr.bin/tip/remote.c
index 85f3f901403..cf5baa6a77f 100644
--- a/usr.bin/tip/remote.c
+++ b/usr.bin/tip/remote.c
@@ -1,4 +1,4 @@
-/* $NetBSD: remote.c,v 1.8 1998/08/25 20:59:41 ross Exp $ */
+/* $NetBSD: remote.c,v 1.9 2003/08/07 11:16:18 agc Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -13,11 +13,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -44,7 +40,7 @@ __COPYRIGHT("@(#) Copyright (c) 1992, 1993\n\
#if 0
static char sccsid[] = "@(#)remote.c 8.1 (Berkeley) 6/6/93";
#endif
-__RCSID("$NetBSD: remote.c,v 1.8 1998/08/25 20:59:41 ross Exp $");
+__RCSID("$NetBSD: remote.c,v 1.9 2003/08/07 11:16:18 agc Exp $");
#endif /* not lint */
#include "pathnames.h"
diff --git a/usr.bin/tip/tip.1 b/usr.bin/tip/tip.1
index ea90842ca44..27dd10fa703 100644
--- a/usr.bin/tip/tip.1
+++ b/usr.bin/tip/tip.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: tip.1,v 1.18 2003/02/25 10:35:58 wiz Exp $
+.\" $NetBSD: tip.1,v 1.19 2003/08/07 11:16:18 agc Exp $
.\"
.\" Copyright (c) 1980, 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -11,11 +11,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/tip/tip.c b/usr.bin/tip/tip.c
index 3da081eb779..a556e901689 100644
--- a/usr.bin/tip/tip.c
+++ b/usr.bin/tip/tip.c
@@ -1,4 +1,4 @@
-/* $NetBSD: tip.c,v 1.23 2000/10/11 14:46:19 is Exp $ */
+/* $NetBSD: tip.c,v 1.24 2003/08/07 11:16:19 agc Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -43,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1983, 1993\n\
#if 0
static char sccsid[] = "@(#)tip.c 8.1 (Berkeley) 6/6/93";
#endif
-__RCSID("$NetBSD: tip.c,v 1.23 2000/10/11 14:46:19 is Exp $");
+__RCSID("$NetBSD: tip.c,v 1.24 2003/08/07 11:16:19 agc Exp $");
#endif /* not lint */
/*
diff --git a/usr.bin/tip/tip.h b/usr.bin/tip/tip.h
index 5b6e8dd92d6..f4801d5d6bd 100644
--- a/usr.bin/tip/tip.h
+++ b/usr.bin/tip/tip.h
@@ -1,4 +1,4 @@
-/* $NetBSD: tip.h,v 1.14 2001/07/08 17:41:14 wiz Exp $ */
+/* $NetBSD: tip.h,v 1.15 2003/08/07 11:16:19 agc Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -13,11 +13,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/tip/tipout.c b/usr.bin/tip/tipout.c
index add90352481..6b6f41d502c 100644
--- a/usr.bin/tip/tipout.c
+++ b/usr.bin/tip/tipout.c
@@ -1,4 +1,4 @@
-/* $NetBSD: tipout.c,v 1.7 1998/07/12 09:59:30 mrg Exp $ */
+/* $NetBSD: tipout.c,v 1.8 2003/08/07 11:16:20 agc Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)tipout.c 8.1 (Berkeley) 6/6/93";
#endif
-__RCSID("$NetBSD: tipout.c,v 1.7 1998/07/12 09:59:30 mrg Exp $");
+__RCSID("$NetBSD: tipout.c,v 1.8 2003/08/07 11:16:20 agc Exp $");
#endif /* not lint */
#include "tip.h"
diff --git a/usr.bin/tip/uucplock.c b/usr.bin/tip/uucplock.c
index eeee1785e43..06d244dfd66 100644
--- a/usr.bin/tip/uucplock.c
+++ b/usr.bin/tip/uucplock.c
@@ -1,4 +1,4 @@
-/* $NetBSD: uucplock.c,v 1.10 1998/07/12 09:59:30 mrg Exp $ */
+/* $NetBSD: uucplock.c,v 1.11 2003/08/07 11:16:20 agc Exp $ */
/*
* Copyright (c) 1988, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)uucplock.c 8.1 (Berkeley) 6/6/93";
#endif
-__RCSID("$NetBSD: uucplock.c,v 1.10 1998/07/12 09:59:30 mrg Exp $");
+__RCSID("$NetBSD: uucplock.c,v 1.11 2003/08/07 11:16:20 agc Exp $");
#endif /* not lint */
#include "pathnames.h"
diff --git a/usr.bin/tip/value.c b/usr.bin/tip/value.c
index a913be62968..8a7f984feac 100644
--- a/usr.bin/tip/value.c
+++ b/usr.bin/tip/value.c
@@ -1,4 +1,4 @@
-/* $NetBSD: value.c,v 1.9 1998/07/12 09:59:30 mrg Exp $ */
+/* $NetBSD: value.c,v 1.10 2003/08/07 11:16:20 agc Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)value.c 8.1 (Berkeley) 6/6/93";
#endif
-__RCSID("$NetBSD: value.c,v 1.9 1998/07/12 09:59:30 mrg Exp $");
+__RCSID("$NetBSD: value.c,v 1.10 2003/08/07 11:16:20 agc Exp $");
#endif /* not lint */
#include "tip.h"
diff --git a/usr.bin/tip/vars.c b/usr.bin/tip/vars.c
index 4fb33a29aaa..820c341c4a5 100644
--- a/usr.bin/tip/vars.c
+++ b/usr.bin/tip/vars.c
@@ -1,4 +1,4 @@
-/* $NetBSD: vars.c,v 1.5 1997/11/22 07:28:51 lukem Exp $ */
+/* $NetBSD: vars.c,v 1.6 2003/08/07 11:16:20 agc Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)vars.c 8.1 (Berkeley) 6/6/93";
#endif
-__RCSID("$NetBSD: vars.c,v 1.5 1997/11/22 07:28:51 lukem Exp $");
+__RCSID("$NetBSD: vars.c,v 1.6 2003/08/07 11:16:20 agc Exp $");
#endif /* not lint */
#include "tip.h"
diff --git a/usr.bin/tn3270/api/api_bsd.c b/usr.bin/tn3270/api/api_bsd.c
index 1121dcbe80a..af85b912361 100644
--- a/usr.bin/tn3270/api/api_bsd.c
+++ b/usr.bin/tn3270/api/api_bsd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: api_bsd.c,v 1.10 2003/05/17 14:58:53 itojun Exp $ */
+/* $NetBSD: api_bsd.c,v 1.11 2003/08/07 11:16:24 agc Exp $ */
/*-
* Copyright (c) 1988 The Regents of the University of California.
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)api_bsd.c 4.2 (Berkeley) 4/26/91";
#else
-__RCSID("$NetBSD: api_bsd.c,v 1.10 2003/05/17 14:58:53 itojun Exp $");
+__RCSID("$NetBSD: api_bsd.c,v 1.11 2003/08/07 11:16:24 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/tn3270/api/api_exch.c b/usr.bin/tn3270/api/api_exch.c
index fa3c62490fc..d004a17cfb1 100644
--- a/usr.bin/tn3270/api/api_exch.c
+++ b/usr.bin/tn3270/api/api_exch.c
@@ -1,4 +1,4 @@
-/* $NetBSD: api_exch.c,v 1.7 2002/06/13 23:41:16 wiz Exp $ */
+/* $NetBSD: api_exch.c,v 1.8 2003/08/07 11:16:24 agc Exp $ */
/*-
* Copyright (c) 1988 The Regents of the University of California.
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)api_exch.c 4.2 (Berkeley) 4/26/91";
#else
-__RCSID("$NetBSD: api_exch.c,v 1.7 2002/06/13 23:41:16 wiz Exp $");
+__RCSID("$NetBSD: api_exch.c,v 1.8 2003/08/07 11:16:24 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/tn3270/api/api_exch.h b/usr.bin/tn3270/api/api_exch.h
index 9447a322857..3c747d078d6 100644
--- a/usr.bin/tn3270/api/api_exch.h
+++ b/usr.bin/tn3270/api/api_exch.h
@@ -1,4 +1,4 @@
-/* $NetBSD: api_exch.h,v 1.6 2002/06/13 23:41:16 wiz Exp $ */
+/* $NetBSD: api_exch.h,v 1.7 2003/08/07 11:16:24 agc Exp $ */
/*-
* Copyright (c) 1988 The Regents of the University of California.
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/tn3270/api/apilib.c b/usr.bin/tn3270/api/apilib.c
index 20f94c1c28c..7a09a5b844c 100644
--- a/usr.bin/tn3270/api/apilib.c
+++ b/usr.bin/tn3270/api/apilib.c
@@ -1,4 +1,4 @@
-/* $NetBSD: apilib.c,v 1.6 2002/06/13 23:41:16 wiz Exp $ */
+/* $NetBSD: apilib.c,v 1.7 2003/08/07 11:16:24 agc Exp $ */
/*-
* Copyright (c) 1988 The Regents of the University of California.
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)apilib.c 4.2 (Berkeley) 4/26/91";
#else
-__RCSID("$NetBSD: apilib.c,v 1.6 2002/06/13 23:41:16 wiz Exp $");
+__RCSID("$NetBSD: apilib.c,v 1.7 2003/08/07 11:16:24 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/tn3270/api/apilib.h b/usr.bin/tn3270/api/apilib.h
index d8008b14bb0..8324eca3cca 100644
--- a/usr.bin/tn3270/api/apilib.h
+++ b/usr.bin/tn3270/api/apilib.h
@@ -1,4 +1,4 @@
-/* $NetBSD: apilib.h,v 1.5 2002/06/13 23:41:16 wiz Exp $ */
+/* $NetBSD: apilib.h,v 1.6 2003/08/07 11:16:24 agc Exp $ */
/*-
* Copyright (c) 1988 The Regents of the University of California.
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/tn3270/api/asc_ebc.c b/usr.bin/tn3270/api/asc_ebc.c
index fb3ba423d6d..c084f9a9f30 100644
--- a/usr.bin/tn3270/api/asc_ebc.c
+++ b/usr.bin/tn3270/api/asc_ebc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: asc_ebc.c,v 1.6 2002/09/15 01:27:44 thorpej Exp $ */
+/* $NetBSD: asc_ebc.c,v 1.7 2003/08/07 11:16:25 agc Exp $ */
/*-
* Copyright (c) 1988 The Regents of the University of California.
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -39,7 +35,7 @@
#if 0
static char sccsid[] = "@(#)asc_ebc.c 4.2 (Berkeley) 4/26/91";
#else
-__RCSID("$NetBSD: asc_ebc.c,v 1.6 2002/09/15 01:27:44 thorpej Exp $");
+__RCSID("$NetBSD: asc_ebc.c,v 1.7 2003/08/07 11:16:25 agc Exp $");
#endif
#endif /* not lint */
#endif /* ! HOST_TOOL */
diff --git a/usr.bin/tn3270/api/asc_ebc.h b/usr.bin/tn3270/api/asc_ebc.h
index cd640d86aea..df96b665427 100644
--- a/usr.bin/tn3270/api/asc_ebc.h
+++ b/usr.bin/tn3270/api/asc_ebc.h
@@ -1,4 +1,4 @@
-/* $NetBSD: asc_ebc.h,v 1.4 1998/03/04 13:16:05 christos Exp $ */
+/* $NetBSD: asc_ebc.h,v 1.5 2003/08/07 11:16:25 agc Exp $ */
/*-
* Copyright (c) 1988 The Regents of the University of California.
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/tn3270/api/astosc.c b/usr.bin/tn3270/api/astosc.c
index 30887a78e21..47f1eee3ea7 100644
--- a/usr.bin/tn3270/api/astosc.c
+++ b/usr.bin/tn3270/api/astosc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: astosc.c,v 1.6 2002/06/13 23:41:17 wiz Exp $ */
+/* $NetBSD: astosc.c,v 1.7 2003/08/07 11:16:25 agc Exp $ */
/*-
* Copyright (c) 1988 The Regents of the University of California.
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)astosc.c 4.2 (Berkeley) 4/26/91";
#else
-__RCSID("$NetBSD: astosc.c,v 1.6 2002/06/13 23:41:17 wiz Exp $");
+__RCSID("$NetBSD: astosc.c,v 1.7 2003/08/07 11:16:25 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/tn3270/api/astosc.h b/usr.bin/tn3270/api/astosc.h
index 910f2d7f5d9..cfc95f9ab4c 100644
--- a/usr.bin/tn3270/api/astosc.h
+++ b/usr.bin/tn3270/api/astosc.h
@@ -1,4 +1,4 @@
-/* $NetBSD: astosc.h,v 1.5 2002/06/13 23:41:17 wiz Exp $ */
+/* $NetBSD: astosc.h,v 1.6 2003/08/07 11:16:25 agc Exp $ */
/*-
* Copyright (c) 1988 The Regents of the University of California.
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/tn3270/api/dctype.c b/usr.bin/tn3270/api/dctype.c
index bbe87f6f6d4..6e3f83913a6 100644
--- a/usr.bin/tn3270/api/dctype.c
+++ b/usr.bin/tn3270/api/dctype.c
@@ -1,4 +1,4 @@
-/* $NetBSD: dctype.c,v 1.5 2002/01/31 19:36:50 tv Exp $ */
+/* $NetBSD: dctype.c,v 1.6 2003/08/07 11:16:25 agc Exp $ */
/*-
* Copyright (c) 1988 The Regents of the University of California.
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)dctype.c 4.2 (Berkeley) 4/26/91";
#else
-__RCSID("$NetBSD: dctype.c,v 1.5 2002/01/31 19:36:50 tv Exp $");
+__RCSID("$NetBSD: dctype.c,v 1.6 2003/08/07 11:16:25 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/tn3270/api/dctype.h b/usr.bin/tn3270/api/dctype.h
index 8c72cc33ab3..e55d3e9e49f 100644
--- a/usr.bin/tn3270/api/dctype.h
+++ b/usr.bin/tn3270/api/dctype.h
@@ -1,4 +1,4 @@
-/* $NetBSD: dctype.h,v 1.4 1998/03/04 13:16:05 christos Exp $ */
+/* $NetBSD: dctype.h,v 1.5 2003/08/07 11:16:26 agc Exp $ */
/*-
* Copyright (c) 1988 The Regents of the University of California.
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/tn3270/api/disp_asc.c b/usr.bin/tn3270/api/disp_asc.c
index ef209421bda..354ba1e3087 100644
--- a/usr.bin/tn3270/api/disp_asc.c
+++ b/usr.bin/tn3270/api/disp_asc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: disp_asc.c,v 1.5 2002/01/31 19:36:50 tv Exp $ */
+/* $NetBSD: disp_asc.c,v 1.6 2003/08/07 11:16:26 agc Exp $ */
/*-
* Copyright (c) 1988 The Regents of the University of California.
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)disp_asc.c 4.2 (Berkeley) 4/26/91";
#else
-__RCSID("$NetBSD: disp_asc.c,v 1.5 2002/01/31 19:36:50 tv Exp $");
+__RCSID("$NetBSD: disp_asc.c,v 1.6 2003/08/07 11:16:26 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/tn3270/api/disp_asc.h b/usr.bin/tn3270/api/disp_asc.h
index fd61dd35ea0..9e46a202b95 100644
--- a/usr.bin/tn3270/api/disp_asc.h
+++ b/usr.bin/tn3270/api/disp_asc.h
@@ -1,4 +1,4 @@
-/* $NetBSD: disp_asc.h,v 1.4 1998/03/04 13:16:05 christos Exp $ */
+/* $NetBSD: disp_asc.h,v 1.5 2003/08/07 11:16:26 agc Exp $ */
/*-
* Copyright (c) 1988 The Regents of the University of California.
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/tn3270/api/ebc_disp.c b/usr.bin/tn3270/api/ebc_disp.c
index cf20f15c6c0..cb9e5c749e3 100644
--- a/usr.bin/tn3270/api/ebc_disp.c
+++ b/usr.bin/tn3270/api/ebc_disp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ebc_disp.c,v 1.6 2002/09/15 01:27:44 thorpej Exp $ */
+/* $NetBSD: ebc_disp.c,v 1.7 2003/08/07 11:16:26 agc Exp $ */
/*-
* Copyright (c) 1988 The Regents of the University of California.
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -39,7 +35,7 @@
#if 0
static char sccsid[] = "@(#)ebc_disp.c 4.2 (Berkeley) 4/26/91";
#else
-__RCSID("$NetBSD: ebc_disp.c,v 1.6 2002/09/15 01:27:44 thorpej Exp $");
+__RCSID("$NetBSD: ebc_disp.c,v 1.7 2003/08/07 11:16:26 agc Exp $");
#endif
#endif /* not lint */
#endif /* ! HOST_TOOL */
diff --git a/usr.bin/tn3270/api/ebc_disp.h b/usr.bin/tn3270/api/ebc_disp.h
index 8b5cf8e27f5..d20b5c49013 100644
--- a/usr.bin/tn3270/api/ebc_disp.h
+++ b/usr.bin/tn3270/api/ebc_disp.h
@@ -1,4 +1,4 @@
-/* $NetBSD: ebc_disp.h,v 1.4 1998/03/04 13:16:05 christos Exp $ */
+/* $NetBSD: ebc_disp.h,v 1.5 2003/08/07 11:16:26 agc Exp $ */
/*-
* Copyright (c) 1988 The Regents of the University of California.
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/tn3270/ascii/default.map b/usr.bin/tn3270/ascii/default.map
index 94141ab65df..57d8611badb 100644
--- a/usr.bin/tn3270/ascii/default.map
+++ b/usr.bin/tn3270/ascii/default.map
@@ -10,11 +10,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/tn3270/ascii/map3270.c b/usr.bin/tn3270/ascii/map3270.c
index 98ee2088b62..e740410575a 100644
--- a/usr.bin/tn3270/ascii/map3270.c
+++ b/usr.bin/tn3270/ascii/map3270.c
@@ -1,4 +1,4 @@
-/* $NetBSD: map3270.c,v 1.9 2002/06/13 23:41:18 wiz Exp $ */
+/* $NetBSD: map3270.c,v 1.10 2003/08/07 11:16:27 agc Exp $ */
/*-
* Copyright (c) 1988 The Regents of the University of California.
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)map3270.c 4.2 (Berkeley) 4/26/91";
#else
-__RCSID("$NetBSD: map3270.c,v 1.9 2002/06/13 23:41:18 wiz Exp $");
+__RCSID("$NetBSD: map3270.c,v 1.10 2003/08/07 11:16:27 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/tn3270/ascii/map3270.h b/usr.bin/tn3270/ascii/map3270.h
index 270df4d4be3..1c581039c6e 100644
--- a/usr.bin/tn3270/ascii/map3270.h
+++ b/usr.bin/tn3270/ascii/map3270.h
@@ -1,4 +1,4 @@
-/* $NetBSD: map3270.h,v 1.5 2002/06/13 23:41:18 wiz Exp $ */
+/* $NetBSD: map3270.h,v 1.6 2003/08/07 11:16:28 agc Exp $ */
/*-
* Copyright (c) 1988 The Regents of the University of California.
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/tn3270/ascii/mset.c b/usr.bin/tn3270/ascii/mset.c
index 8d5578168b3..bc394d23a72 100644
--- a/usr.bin/tn3270/ascii/mset.c
+++ b/usr.bin/tn3270/ascii/mset.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mset.c,v 1.6 2002/06/13 23:41:18 wiz Exp $ */
+/* $NetBSD: mset.c,v 1.7 2003/08/07 11:16:28 agc Exp $ */
/*-
* Copyright (c) 1988 The Regents of the University of California.
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -44,7 +40,7 @@ __COPYRIGHT(
#if 0
static char sccsid[] = "@(#)mset.c 4.2 (Berkeley) 4/26/91";
#else
-__RCSID("$NetBSD: mset.c,v 1.6 2002/06/13 23:41:18 wiz Exp $");
+__RCSID("$NetBSD: mset.c,v 1.7 2003/08/07 11:16:28 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/tn3270/ascii/state.h b/usr.bin/tn3270/ascii/state.h
index 387e22a36cf..c7c2c9d24d5 100644
--- a/usr.bin/tn3270/ascii/state.h
+++ b/usr.bin/tn3270/ascii/state.h
@@ -1,4 +1,4 @@
-/* $NetBSD: state.h,v 1.5 2002/06/13 23:41:18 wiz Exp $ */
+/* $NetBSD: state.h,v 1.6 2003/08/07 11:16:28 agc Exp $ */
/*-
* Copyright (c) 1988 The Regents of the University of California.
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/tn3270/ascii/termin.c b/usr.bin/tn3270/ascii/termin.c
index 8f0f4812e8b..c2d2092f3e3 100644
--- a/usr.bin/tn3270/ascii/termin.c
+++ b/usr.bin/tn3270/ascii/termin.c
@@ -1,4 +1,4 @@
-/* $NetBSD: termin.c,v 1.7 2002/06/13 23:41:18 wiz Exp $ */
+/* $NetBSD: termin.c,v 1.8 2003/08/07 11:16:28 agc Exp $ */
/*-
* Copyright (c) 1988 The Regents of the University of California.
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)termin.c 4.2 (Berkeley) 4/26/91";
#else
-__RCSID("$NetBSD: termin.c,v 1.7 2002/06/13 23:41:18 wiz Exp $");
+__RCSID("$NetBSD: termin.c,v 1.8 2003/08/07 11:16:28 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/tn3270/ctlr/3180.kbd b/usr.bin/tn3270/ctlr/3180.kbd
index a912e4453f5..635fb9ac0f5 100644
--- a/usr.bin/tn3270/ctlr/3180.kbd
+++ b/usr.bin/tn3270/ctlr/3180.kbd
@@ -10,11 +10,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/tn3270/ctlr/3270pc.kbd b/usr.bin/tn3270/ctlr/3270pc.kbd
index 161010347fb..d84fa3597ad 100644
--- a/usr.bin/tn3270/ctlr/3270pc.kbd
+++ b/usr.bin/tn3270/ctlr/3270pc.kbd
@@ -10,11 +10,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/tn3270/ctlr/api.c b/usr.bin/tn3270/ctlr/api.c
index d64b8b317c1..9ffc48073e0 100644
--- a/usr.bin/tn3270/ctlr/api.c
+++ b/usr.bin/tn3270/ctlr/api.c
@@ -1,4 +1,4 @@
-/* $NetBSD: api.c,v 1.6 2002/06/13 23:41:19 wiz Exp $ */
+/* $NetBSD: api.c,v 1.7 2003/08/07 11:16:29 agc Exp $ */
/*-
* Copyright (c) 1988 The Regents of the University of California.
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)api.c 4.5 (Berkeley) 4/26/91";
#else
-__RCSID("$NetBSD: api.c,v 1.6 2002/06/13 23:41:19 wiz Exp $");
+__RCSID("$NetBSD: api.c,v 1.7 2003/08/07 11:16:29 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/tn3270/ctlr/api.h b/usr.bin/tn3270/ctlr/api.h
index 485da280174..5fa583c37c5 100644
--- a/usr.bin/tn3270/ctlr/api.h
+++ b/usr.bin/tn3270/ctlr/api.h
@@ -1,4 +1,4 @@
-/* $NetBSD: api.h,v 1.6 2002/06/13 23:41:19 wiz Exp $ */
+/* $NetBSD: api.h,v 1.7 2003/08/07 11:16:30 agc Exp $ */
/*-
* Copyright (c) 1988 The Regents of the University of California.
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/tn3270/ctlr/declare.h b/usr.bin/tn3270/ctlr/declare.h
index 18721ace173..0146ba360f8 100644
--- a/usr.bin/tn3270/ctlr/declare.h
+++ b/usr.bin/tn3270/ctlr/declare.h
@@ -1,4 +1,4 @@
-/* $NetBSD: declare.h,v 1.5 2002/06/13 23:41:19 wiz Exp $ */
+/* $NetBSD: declare.h,v 1.6 2003/08/07 11:16:30 agc Exp $ */
/*-
* Copyright (c) 1988 The Regents of the University of California.
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/tn3270/ctlr/function.c b/usr.bin/tn3270/ctlr/function.c
index 33b068e5bd4..1b5359be4ea 100644
--- a/usr.bin/tn3270/ctlr/function.c
+++ b/usr.bin/tn3270/ctlr/function.c
@@ -1,4 +1,4 @@
-/* $NetBSD: function.c,v 1.4 1998/03/04 13:16:07 christos Exp $ */
+/* $NetBSD: function.c,v 1.5 2003/08/07 11:16:30 agc Exp $ */
/*-
* Copyright (c) 1988 The Regents of the University of California.
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)function.c 4.2 (Berkeley) 4/26/91";
#else
-__RCSID("$NetBSD: function.c,v 1.4 1998/03/04 13:16:07 christos Exp $");
+__RCSID("$NetBSD: function.c,v 1.5 2003/08/07 11:16:30 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/tn3270/ctlr/function.h b/usr.bin/tn3270/ctlr/function.h
index 9b60de6938d..05ab572c497 100644
--- a/usr.bin/tn3270/ctlr/function.h
+++ b/usr.bin/tn3270/ctlr/function.h
@@ -1,4 +1,4 @@
-/* $NetBSD: function.h,v 1.4 1998/03/04 13:16:07 christos Exp $ */
+/* $NetBSD: function.h,v 1.5 2003/08/07 11:16:30 agc Exp $ */
/*-
* Copyright (c) 1988 The Regents of the University of California.
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/tn3270/ctlr/hostctlr.h b/usr.bin/tn3270/ctlr/hostctlr.h
index e3dd4995271..a27e4070ef3 100644
--- a/usr.bin/tn3270/ctlr/hostctlr.h
+++ b/usr.bin/tn3270/ctlr/hostctlr.h
@@ -1,4 +1,4 @@
-/* $NetBSD: hostctlr.h,v 1.4 1998/03/04 13:16:07 christos Exp $ */
+/* $NetBSD: hostctlr.h,v 1.5 2003/08/07 11:16:31 agc Exp $ */
/*-
* Copyright (c) 1988 The Regents of the University of California.
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/tn3270/ctlr/inbound.c b/usr.bin/tn3270/ctlr/inbound.c
index c1cee7cd6e0..5b121f552c6 100644
--- a/usr.bin/tn3270/ctlr/inbound.c
+++ b/usr.bin/tn3270/ctlr/inbound.c
@@ -1,4 +1,4 @@
-/* $NetBSD: inbound.c,v 1.6 2002/06/13 23:41:19 wiz Exp $ */
+/* $NetBSD: inbound.c,v 1.7 2003/08/07 11:16:31 agc Exp $ */
/*-
* Copyright (c) 1988 The Regents of the University of California.
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)inbound.c 4.3 (Berkeley) 4/26/91";
#else
-__RCSID("$NetBSD: inbound.c,v 1.6 2002/06/13 23:41:19 wiz Exp $");
+__RCSID("$NetBSD: inbound.c,v 1.7 2003/08/07 11:16:31 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/tn3270/ctlr/oia.c b/usr.bin/tn3270/ctlr/oia.c
index b0b2b6e4b46..de66cdb11de 100644
--- a/usr.bin/tn3270/ctlr/oia.c
+++ b/usr.bin/tn3270/ctlr/oia.c
@@ -1,4 +1,4 @@
-/* $NetBSD: oia.c,v 1.4 1998/03/04 13:16:07 christos Exp $ */
+/* $NetBSD: oia.c,v 1.5 2003/08/07 11:16:31 agc Exp $ */
/*-
* Copyright (c) 1988 The Regents of the University of California.
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)oia.c 4.2 (Berkeley) 4/26/91";
#else
-__RCSID("$NetBSD: oia.c,v 1.4 1998/03/04 13:16:07 christos Exp $");
+__RCSID("$NetBSD: oia.c,v 1.5 2003/08/07 11:16:31 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/tn3270/ctlr/oia.h b/usr.bin/tn3270/ctlr/oia.h
index 5b5f3037acd..58e3f53015e 100644
--- a/usr.bin/tn3270/ctlr/oia.h
+++ b/usr.bin/tn3270/ctlr/oia.h
@@ -1,4 +1,4 @@
-/* $NetBSD: oia.h,v 1.5 2002/06/13 23:41:19 wiz Exp $ */
+/* $NetBSD: oia.h,v 1.6 2003/08/07 11:16:32 agc Exp $ */
/*-
* Copyright (c) 1988 The Regents of the University of California.
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/tn3270/ctlr/options.c b/usr.bin/tn3270/ctlr/options.c
index dedb0f339bb..db1b1f2f5fc 100644
--- a/usr.bin/tn3270/ctlr/options.c
+++ b/usr.bin/tn3270/ctlr/options.c
@@ -1,4 +1,4 @@
-/* $NetBSD: options.c,v 1.4 1998/03/04 13:16:08 christos Exp $ */
+/* $NetBSD: options.c,v 1.5 2003/08/07 11:16:32 agc Exp $ */
/*-
* Copyright (c) 1988 The Regents of the University of California.
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)options.c 4.2 (Berkeley) 4/26/91";
#else
-__RCSID("$NetBSD: options.c,v 1.4 1998/03/04 13:16:08 christos Exp $");
+__RCSID("$NetBSD: options.c,v 1.5 2003/08/07 11:16:32 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/tn3270/ctlr/options.h b/usr.bin/tn3270/ctlr/options.h
index ef98cdb90cf..45276150806 100644
--- a/usr.bin/tn3270/ctlr/options.h
+++ b/usr.bin/tn3270/ctlr/options.h
@@ -1,4 +1,4 @@
-/* $NetBSD: options.h,v 1.5 2002/06/13 23:41:19 wiz Exp $ */
+/* $NetBSD: options.h,v 1.6 2003/08/07 11:16:32 agc Exp $ */
/*-
* Copyright (c) 1988 The Regents of the University of California.
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/tn3270/ctlr/outbound.c b/usr.bin/tn3270/ctlr/outbound.c
index c0451c6f1bf..3afbcfec784 100644
--- a/usr.bin/tn3270/ctlr/outbound.c
+++ b/usr.bin/tn3270/ctlr/outbound.c
@@ -1,4 +1,4 @@
-/* $NetBSD: outbound.c,v 1.4 1998/03/04 13:16:08 christos Exp $ */
+/* $NetBSD: outbound.c,v 1.5 2003/08/07 11:16:32 agc Exp $ */
/*-
* Copyright (c) 1988 The Regents of the University of California.
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)outbound.c 4.3 (Berkeley) 4/26/91";
#else
-__RCSID("$NetBSD: outbound.c,v 1.4 1998/03/04 13:16:08 christos Exp $");
+__RCSID("$NetBSD: outbound.c,v 1.5 2003/08/07 11:16:32 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/tn3270/ctlr/screen.h b/usr.bin/tn3270/ctlr/screen.h
index a0796511f8e..c514cbd52eb 100644
--- a/usr.bin/tn3270/ctlr/screen.h
+++ b/usr.bin/tn3270/ctlr/screen.h
@@ -1,4 +1,4 @@
-/* $NetBSD: screen.h,v 1.4 1998/03/04 13:16:08 christos Exp $ */
+/* $NetBSD: screen.h,v 1.5 2003/08/07 11:16:32 agc Exp $ */
/*-
* Copyright (c) 1988 The Regents of the University of California.
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/tn3270/ctlr/scrnctlr.h b/usr.bin/tn3270/ctlr/scrnctlr.h
index 6f1427be348..3ee1b1965ff 100644
--- a/usr.bin/tn3270/ctlr/scrnctlr.h
+++ b/usr.bin/tn3270/ctlr/scrnctlr.h
@@ -1,4 +1,4 @@
-/* $NetBSD: scrnctlr.h,v 1.4 1998/03/04 13:16:08 christos Exp $ */
+/* $NetBSD: scrnctlr.h,v 1.5 2003/08/07 11:16:33 agc Exp $ */
/*-
* Copyright (c) 1988 The Regents of the University of California.
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/tn3270/ctlr/unix.kbd b/usr.bin/tn3270/ctlr/unix.kbd
index e0e30db06cc..5d532ee26c6 100644
--- a/usr.bin/tn3270/ctlr/unix.kbd
+++ b/usr.bin/tn3270/ctlr/unix.kbd
@@ -10,11 +10,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/tn3270/general/genbsubs.c b/usr.bin/tn3270/general/genbsubs.c
index 6b55de918c8..bcf9fda2931 100644
--- a/usr.bin/tn3270/general/genbsubs.c
+++ b/usr.bin/tn3270/general/genbsubs.c
@@ -1,4 +1,4 @@
-/* $NetBSD: genbsubs.c,v 1.5 1998/03/11 16:49:19 thorpej Exp $ */
+/* $NetBSD: genbsubs.c,v 1.6 2003/08/07 11:16:33 agc Exp $ */
/*-
* Copyright (c) 1988 The Regents of the University of California.
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)genbsubs.c 4.2 (Berkeley) 4/26/91";
#else
-__RCSID("$NetBSD: genbsubs.c,v 1.5 1998/03/11 16:49:19 thorpej Exp $");
+__RCSID("$NetBSD: genbsubs.c,v 1.6 2003/08/07 11:16:33 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/tn3270/general/general.h b/usr.bin/tn3270/general/general.h
index a644fb7bdc4..969a92dddc5 100644
--- a/usr.bin/tn3270/general/general.h
+++ b/usr.bin/tn3270/general/general.h
@@ -1,4 +1,4 @@
-/* $NetBSD: general.h,v 1.9 2002/06/13 23:41:20 wiz Exp $ */
+/* $NetBSD: general.h,v 1.10 2003/08/07 11:16:34 agc Exp $ */
/*-
* Copyright (c) 1988 The Regents of the University of California.
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/tn3270/general/globals.c b/usr.bin/tn3270/general/globals.c
index 8cf12b48084..0f29e0568f7 100644
--- a/usr.bin/tn3270/general/globals.c
+++ b/usr.bin/tn3270/general/globals.c
@@ -1,4 +1,4 @@
-/* $NetBSD: globals.c,v 1.4 1998/03/04 13:16:09 christos Exp $ */
+/* $NetBSD: globals.c,v 1.5 2003/08/07 11:16:34 agc Exp $ */
/*-
* Copyright (c) 1988 The Regents of the University of California.
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)globals.c 4.2 (Berkeley) 4/26/91";
#else
-__RCSID("$NetBSD: globals.c,v 1.4 1998/03/04 13:16:09 christos Exp $");
+__RCSID("$NetBSD: globals.c,v 1.5 2003/08/07 11:16:34 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/tn3270/general/globals.h b/usr.bin/tn3270/general/globals.h
index d628dc3eafe..0a2cdd17d60 100644
--- a/usr.bin/tn3270/general/globals.h
+++ b/usr.bin/tn3270/general/globals.h
@@ -1,4 +1,4 @@
-/* $NetBSD: globals.h,v 1.5 2002/06/13 23:41:20 wiz Exp $ */
+/* $NetBSD: globals.h,v 1.6 2003/08/07 11:16:34 agc Exp $ */
/*-
* Copyright (c) 1988 The Regents of the University of California.
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/tn3270/general/vaxbsubs.s b/usr.bin/tn3270/general/vaxbsubs.s
index d1a2852e295..9d8d0e38c93 100644
--- a/usr.bin/tn3270/general/vaxbsubs.s
+++ b/usr.bin/tn3270/general/vaxbsubs.s
@@ -1,4 +1,4 @@
-/* $NetBSD: vaxbsubs.s,v 1.3 1997/01/09 20:22:23 tls Exp $ */
+/* $NetBSD: vaxbsubs.s,v 1.4 2003/08/07 11:16:34 agc Exp $ */
/*-
* Copyright (c) 1988 The Regents of the University of California.
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -33,7 +29,7 @@
* SUCH DAMAGE.
*
* from: @(#)vaxbsubs.s 4.2 (Berkeley) 4/26/91
- * $NetBSD: vaxbsubs.s,v 1.3 1997/01/09 20:22:23 tls Exp $
+ * $NetBSD: vaxbsubs.s,v 1.4 2003/08/07 11:16:34 agc Exp $
*/
/* This is taken from bcmp.s from 4.2.
diff --git a/usr.bin/tn3270/mset/map3270.5 b/usr.bin/tn3270/mset/map3270.5
index f1bb32e0cee..32b891341a1 100644
--- a/usr.bin/tn3270/mset/map3270.5
+++ b/usr.bin/tn3270/mset/map3270.5
@@ -1,4 +1,4 @@
-.\" $NetBSD: map3270.5,v 1.11 2002/10/02 11:17:41 wiz Exp $
+.\" $NetBSD: map3270.5,v 1.12 2003/08/07 11:16:35 agc Exp $
.\"
.\" Copyright (c) 1986 The Regents of the University of California.
.\" All rights reserved.
@@ -11,11 +11,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
@@ -32,7 +28,7 @@
.\" SUCH DAMAGE.
.\"
.\" from: @(#)map3270.5 4.5 (Berkeley) 7/31/91
-.\" $NetBSD: map3270.5,v 1.11 2002/10/02 11:17:41 wiz Exp $
+.\" $NetBSD: map3270.5,v 1.12 2003/08/07 11:16:35 agc 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 c4b650c02ed..09607cdb2b6 100644
--- a/usr.bin/tn3270/mset/mset.1
+++ b/usr.bin/tn3270/mset/mset.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: mset.1,v 1.10 2002/02/08 01:36:35 ross Exp $
+.\" $NetBSD: mset.1,v 1.11 2003/08/07 11:16:36 agc Exp $
.\"
.\" Copyright (c) 1986, 1990 The Regents of the University of California.
.\" All rights reserved.
@@ -11,11 +11,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
@@ -32,7 +28,7 @@
.\" SUCH DAMAGE.
.\"
.\" from: @(#)mset.1 4.6 (Berkeley) 7/27/91
-.\" $NetBSD: mset.1,v 1.10 2002/02/08 01:36:35 ross Exp $
+.\" $NetBSD: mset.1,v 1.11 2003/08/07 11:16:36 agc 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 4dd660a0ccd..971d56effe6 100644
--- a/usr.bin/tn3270/sys_curses/system.c
+++ b/usr.bin/tn3270/sys_curses/system.c
@@ -1,4 +1,4 @@
-/* $NetBSD: system.c,v 1.16 2002/09/18 19:54:25 mycroft Exp $ */
+/* $NetBSD: system.c,v 1.17 2003/08/07 11:16:36 agc Exp $ */
/*-
* Copyright (c) 1988 The Regents of the University of California.
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)system.c 4.5 (Berkeley) 4/26/91";
#else
-__RCSID("$NetBSD: system.c,v 1.16 2002/09/18 19:54:25 mycroft Exp $");
+__RCSID("$NetBSD: system.c,v 1.17 2003/08/07 11:16:36 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/tn3270/sys_curses/telextrn.h b/usr.bin/tn3270/sys_curses/telextrn.h
index 3ac05b35a9f..48230f6b27a 100644
--- a/usr.bin/tn3270/sys_curses/telextrn.h
+++ b/usr.bin/tn3270/sys_curses/telextrn.h
@@ -1,4 +1,4 @@
-/* $NetBSD: telextrn.h,v 1.6 2002/06/13 23:41:20 wiz Exp $ */
+/* $NetBSD: telextrn.h,v 1.7 2003/08/07 11:16:37 agc Exp $ */
/*-
* Copyright (c) 1988 The Regents of the University of California.
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/tn3270/sys_curses/terminal.h b/usr.bin/tn3270/sys_curses/terminal.h
index a0b6e3d9f8b..08e2517c46d 100644
--- a/usr.bin/tn3270/sys_curses/terminal.h
+++ b/usr.bin/tn3270/sys_curses/terminal.h
@@ -1,4 +1,4 @@
-/* $NetBSD: terminal.h,v 1.4 1998/03/04 13:16:09 christos Exp $ */
+/* $NetBSD: terminal.h,v 1.5 2003/08/07 11:16:37 agc Exp $ */
/*-
* Copyright (c) 1988 The Regents of the University of California.
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/tn3270/sys_curses/termout.c b/usr.bin/tn3270/sys_curses/termout.c
index 0ce08b66bb0..946ea63bab4 100644
--- a/usr.bin/tn3270/sys_curses/termout.c
+++ b/usr.bin/tn3270/sys_curses/termout.c
@@ -1,4 +1,4 @@
-/* $NetBSD: termout.c,v 1.13 2002/06/13 23:41:20 wiz Exp $ */
+/* $NetBSD: termout.c,v 1.14 2003/08/07 11:16:37 agc Exp $ */
/*-
* Copyright (c) 1988 The Regents of the University of California.
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)termout.c 4.3 (Berkeley) 4/26/91";
#else
-__RCSID("$NetBSD: termout.c,v 1.13 2002/06/13 23:41:20 wiz Exp $");
+__RCSID("$NetBSD: termout.c,v 1.14 2003/08/07 11:16:37 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/tn3270/tn3270/tn3270.1 b/usr.bin/tn3270/tn3270/tn3270.1
index 21438766636..4aaf675c5ae 100644
--- a/usr.bin/tn3270/tn3270/tn3270.1
+++ b/usr.bin/tn3270/tn3270/tn3270.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: tn3270.1,v 1.12 2003/04/06 19:39:47 wiz Exp $
+.\" $NetBSD: tn3270.1,v 1.13 2003/08/07 11:16:38 agc Exp $
.\"
.\" Copyright (c) 1986, 1990 The Regents of the University of California.
.\" All rights reserved.
@@ -11,11 +11,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
@@ -32,7 +28,7 @@
.\" SUCH DAMAGE.
.\"
.\" from: @(#)tn3270.1 4.6 (Berkeley) 7/27/91
-.\" $NetBSD: tn3270.1,v 1.12 2003/04/06 19:39:47 wiz Exp $
+.\" $NetBSD: tn3270.1,v 1.13 2003/08/07 11:16:38 agc 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 7d6441e8cd6..ca49b5c252d 100644
--- a/usr.bin/tn3270/tools/mkastods/mkastods.c
+++ b/usr.bin/tn3270/tools/mkastods/mkastods.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mkastods.c,v 1.8 2002/09/15 01:27:45 thorpej Exp $ */
+/* $NetBSD: mkastods.c,v 1.9 2003/08/07 11:16:39 agc Exp $ */
/*-
* Copyright (c) 1988 The Regents of the University of California.
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -47,7 +43,7 @@ __COPYRIGHT(
#if 0
static char sccsid[] = "@(#)mkastods.c 4.2 (Berkeley) 4/26/91";
#else
-__RCSID("$NetBSD: mkastods.c,v 1.8 2002/09/15 01:27:45 thorpej Exp $");
+__RCSID("$NetBSD: mkastods.c,v 1.9 2003/08/07 11:16:39 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/tn3270/tools/mkastosc/mkastosc.c b/usr.bin/tn3270/tools/mkastosc/mkastosc.c
index 73031e5ee03..d75973b11e5 100644
--- a/usr.bin/tn3270/tools/mkastosc/mkastosc.c
+++ b/usr.bin/tn3270/tools/mkastosc/mkastosc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mkastosc.c,v 1.10 2002/09/15 01:27:46 thorpej Exp $ */
+/* $NetBSD: mkastosc.c,v 1.11 2003/08/07 11:16:40 agc Exp $ */
/*-
* Copyright (c) 1988 The Regents of the University of California.
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -47,7 +43,7 @@ __COPYRIGHT(
#if 0
static char sccsid[] = "@(#)mkastosc.c 4.2 (Berkeley) 4/26/91";
#else
-__RCSID("$NetBSD: mkastosc.c,v 1.10 2002/09/15 01:27:46 thorpej Exp $");
+__RCSID("$NetBSD: mkastosc.c,v 1.11 2003/08/07 11:16:40 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/tn3270/tools/mkdctype/ectype.c b/usr.bin/tn3270/tools/mkdctype/ectype.c
index 50a4a053c9c..db1d4cae07b 100644
--- a/usr.bin/tn3270/tools/mkdctype/ectype.c
+++ b/usr.bin/tn3270/tools/mkdctype/ectype.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ectype.c,v 1.5 2002/01/31 19:36:51 tv Exp $ */
+/* $NetBSD: ectype.c,v 1.6 2003/08/07 11:16:40 agc Exp $ */
/*-
* Copyright (c) 1988 The Regents of the University of California.
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "from: @(#)ectype.c 4.2 (Berkeley) 4/26/91";*/
#else
-__RCSID("$NetBSD: ectype.c,v 1.5 2002/01/31 19:36:51 tv Exp $");
+__RCSID("$NetBSD: ectype.c,v 1.6 2003/08/07 11:16:40 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/tn3270/tools/mkdctype/ectype.h b/usr.bin/tn3270/tools/mkdctype/ectype.h
index d1816aafc77..56681427bc0 100644
--- a/usr.bin/tn3270/tools/mkdctype/ectype.h
+++ b/usr.bin/tn3270/tools/mkdctype/ectype.h
@@ -1,4 +1,4 @@
-/* $NetBSD: ectype.h,v 1.4 1998/03/04 13:16:13 christos Exp $ */
+/* $NetBSD: ectype.h,v 1.5 2003/08/07 11:16:40 agc Exp $ */
/*-
* Copyright (c) 1988 The Regents of the University of California.
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/tn3270/tools/mkdctype/mkdctype.c b/usr.bin/tn3270/tools/mkdctype/mkdctype.c
index 8b7a32127ae..c9d51d8f25b 100644
--- a/usr.bin/tn3270/tools/mkdctype/mkdctype.c
+++ b/usr.bin/tn3270/tools/mkdctype/mkdctype.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mkdctype.c,v 1.6 2002/06/13 23:41:22 wiz Exp $ */
+/* $NetBSD: mkdctype.c,v 1.7 2003/08/07 11:16:41 agc Exp $ */
/*-
* Copyright (c) 1988 The Regents of the University of California.
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -44,7 +40,7 @@ __COPYRIGHT(
#if 0
static char sccsid[] = "@(#)mkdctype.c 4.2 (Berkeley) 4/26/91";
#else
-__RCSID("$NetBSD: mkdctype.c,v 1.6 2002/06/13 23:41:22 wiz Exp $");
+__RCSID("$NetBSD: mkdctype.c,v 1.7 2003/08/07 11:16:41 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/tn3270/tools/mkdstoas/mkdstoas.c b/usr.bin/tn3270/tools/mkdstoas/mkdstoas.c
index e7451425c5d..6419ae7f929 100644
--- a/usr.bin/tn3270/tools/mkdstoas/mkdstoas.c
+++ b/usr.bin/tn3270/tools/mkdstoas/mkdstoas.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mkdstoas.c,v 1.8 2002/09/15 01:27:47 thorpej Exp $ */
+/* $NetBSD: mkdstoas.c,v 1.9 2003/08/07 11:16:41 agc Exp $ */
/*-
* Copyright (c) 1988 The Regents of the University of California.
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -47,7 +43,7 @@ __COPYRIGHT(
#if 0
static char sccsid[] = "@(#)mkdstoas.c 4.2 (Berkeley) 4/26/91";
#else
-__RCSID("$NetBSD: mkdstoas.c,v 1.8 2002/09/15 01:27:47 thorpej Exp $");
+__RCSID("$NetBSD: mkdstoas.c,v 1.9 2003/08/07 11:16:41 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/tn3270/tools/mkhits/dohits.c b/usr.bin/tn3270/tools/mkhits/dohits.c
index f28ad1b567d..0a19fcf3bcf 100644
--- a/usr.bin/tn3270/tools/mkhits/dohits.c
+++ b/usr.bin/tn3270/tools/mkhits/dohits.c
@@ -1,4 +1,4 @@
-/* $NetBSD: dohits.c,v 1.12 2002/09/15 01:27:48 thorpej Exp $ */
+/* $NetBSD: dohits.c,v 1.13 2003/08/07 11:16:42 agc Exp $ */
/*-
* Copyright (c) 1988 The Regents of the University of California.
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -43,7 +39,7 @@
#if 0
static char sccsid[] = "@(#)dohits.c 4.2 (Berkeley) 4/26/91";
#else
-__RCSID("$NetBSD: dohits.c,v 1.12 2002/09/15 01:27:48 thorpej Exp $");
+__RCSID("$NetBSD: dohits.c,v 1.13 2003/08/07 11:16:42 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/tn3270/tools/mkhits/dohits.h b/usr.bin/tn3270/tools/mkhits/dohits.h
index 2ad4f2fe040..dd2ca9fa483 100644
--- a/usr.bin/tn3270/tools/mkhits/dohits.h
+++ b/usr.bin/tn3270/tools/mkhits/dohits.h
@@ -1,4 +1,4 @@
-/* $NetBSD: dohits.h,v 1.6 2002/06/13 23:41:22 wiz Exp $ */
+/* $NetBSD: dohits.h,v 1.7 2003/08/07 11:16:42 agc Exp $ */
/*-
* Copyright (c) 1988 The Regents of the University of California.
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/tn3270/tools/mkhits/mkhits.c b/usr.bin/tn3270/tools/mkhits/mkhits.c
index 4c2ee36882c..5718e086e1e 100644
--- a/usr.bin/tn3270/tools/mkhits/mkhits.c
+++ b/usr.bin/tn3270/tools/mkhits/mkhits.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mkhits.c,v 1.8 2002/09/15 01:27:48 thorpej Exp $ */
+/* $NetBSD: mkhits.c,v 1.9 2003/08/07 11:16:42 agc Exp $ */
/*-
* Copyright (c) 1988 The Regents of the University of California.
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -47,7 +43,7 @@ __COPYRIGHT(
#if 0
static char sccsid[] = "@(#)mkhits.c 4.2 (Berkeley) 4/26/91";
#else
-__RCSID("$NetBSD: mkhits.c,v 1.8 2002/09/15 01:27:48 thorpej Exp $");
+__RCSID("$NetBSD: mkhits.c,v 1.9 2003/08/07 11:16:42 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/tn3270/tools/mkmake/mkmake.y b/usr.bin/tn3270/tools/mkmake/mkmake.y
index b6f2bdfe62c..9579453ced3 100644
--- a/usr.bin/tn3270/tools/mkmake/mkmake.y
+++ b/usr.bin/tn3270/tools/mkmake/mkmake.y
@@ -1,5 +1,5 @@
%{
-/* $NetBSD: mkmake.y,v 1.10 2002/06/13 23:41:23 wiz Exp $ */
+/* $NetBSD: mkmake.y,v 1.11 2003/08/07 11:16:43 agc Exp $ */
/*-
* Copyright (c) 1988 The Regents of the University of California.
* All rights reserved.
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)mkmake.y 4.2 (Berkeley) 4/26/91";
#else
-__RCSID("$NetBSD: mkmake.y,v 1.10 2002/06/13 23:41:23 wiz Exp $");
+__RCSID("$NetBSD: mkmake.y,v 1.11 2003/08/07 11:16:43 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/tn3270/tools/prt3270/prt3270.c b/usr.bin/tn3270/tools/prt3270/prt3270.c
index f8afeec6941..64463b07aaf 100644
--- a/usr.bin/tn3270/tools/prt3270/prt3270.c
+++ b/usr.bin/tn3270/tools/prt3270/prt3270.c
@@ -1,4 +1,4 @@
-/* $NetBSD: prt3270.c,v 1.7 2002/06/13 23:41:23 wiz Exp $ */
+/* $NetBSD: prt3270.c,v 1.8 2003/08/07 11:16:44 agc Exp $ */
/*-
* Copyright (c) 1988 The Regents of the University of California.
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -44,7 +40,7 @@ __COPYRIGHT(
#if 0
static char sccsid[] = "@(#)prt3270.c 4.2 (Berkeley) 4/26/91";
#else
-__RCSID("$NetBSD: prt3270.c,v 1.7 2002/06/13 23:41:23 wiz Exp $");
+__RCSID("$NetBSD: prt3270.c,v 1.8 2003/08/07 11:16:44 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/touch/touch.1 b/usr.bin/touch/touch.1
index f3cf847119d..89bbd7f4433 100644
--- a/usr.bin/touch/touch.1
+++ b/usr.bin/touch/touch.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: touch.1,v 1.15 2003/02/25 10:35:58 wiz Exp $
+.\" $NetBSD: touch.1,v 1.16 2003/08/07 11:16:44 agc Exp $
.\"
.\" Copyright (c) 1991, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -14,11 +14,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/touch/touch.c b/usr.bin/touch/touch.c
index f221d043a2b..3f0ead50cb7 100644
--- a/usr.bin/touch/touch.c
+++ b/usr.bin/touch/touch.c
@@ -1,4 +1,4 @@
-/* $NetBSD: touch.c,v 1.23 1999/11/05 04:54:10 mycroft Exp $ */
+/* $NetBSD: touch.c,v 1.24 2003/08/07 11:16:45 agc Exp $ */
/*
* Copyright (c) 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -43,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1993\n\
#if 0
static char sccsid[] = "@(#)touch.c 8.2 (Berkeley) 4/28/95";
#endif
-__RCSID("$NetBSD: touch.c,v 1.23 1999/11/05 04:54:10 mycroft Exp $");
+__RCSID("$NetBSD: touch.c,v 1.24 2003/08/07 11:16:45 agc Exp $");
#endif /* not lint */
#include <sys/types.h>
diff --git a/usr.bin/tput/tput.1 b/usr.bin/tput/tput.1
index 7de488d6496..033ebb7c76c 100644
--- a/usr.bin/tput/tput.1
+++ b/usr.bin/tput/tput.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: tput.1,v 1.11 2001/12/08 19:19:05 wiz Exp $
+.\" $NetBSD: tput.1,v 1.12 2003/08/07 11:16:45 agc Exp $
.\"
.\" Copyright (c) 1989, 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -11,11 +11,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/tput/tput.c b/usr.bin/tput/tput.c
index d3e1546cb27..840a44c3e2b 100644
--- a/usr.bin/tput/tput.c
+++ b/usr.bin/tput/tput.c
@@ -1,4 +1,4 @@
-/* $NetBSD: tput.c,v 1.14 2000/10/11 14:46:20 is Exp $ */
+/* $NetBSD: tput.c,v 1.15 2003/08/07 11:16:46 agc Exp $ */
/*-
* Copyright (c) 1980, 1988, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -43,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 1988, 1993\n\
#if 0
static char sccsid[] = "@(#)tput.c 8.3 (Berkeley) 4/28/95";
#endif
-__RCSID("$NetBSD: tput.c,v 1.14 2000/10/11 14:46:20 is Exp $");
+__RCSID("$NetBSD: tput.c,v 1.15 2003/08/07 11:16:46 agc Exp $");
#endif /* not lint */
#include <termios.h>
diff --git a/usr.bin/tr/extern.h b/usr.bin/tr/extern.h
index 6e5f2c45c58..b0bd04e43d4 100644
--- a/usr.bin/tr/extern.h
+++ b/usr.bin/tr/extern.h
@@ -1,4 +1,4 @@
-/* $NetBSD: extern.h,v 1.5 1997/10/20 00:56:04 lukem Exp $ */
+/* $NetBSD: extern.h,v 1.6 2003/08/07 11:16:46 agc Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/tr/str.c b/usr.bin/tr/str.c
index eda9806c3eb..e755ea2d80e 100644
--- a/usr.bin/tr/str.c
+++ b/usr.bin/tr/str.c
@@ -1,4 +1,4 @@
-/* $NetBSD: str.c,v 1.9 1999/03/16 14:57:48 kleink Exp $ */
+/* $NetBSD: str.c,v 1.10 2003/08/07 11:16:46 agc Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)str.c 8.2 (Berkeley) 4/28/95";
#endif
-__RCSID("$NetBSD: str.c,v 1.9 1999/03/16 14:57:48 kleink Exp $");
+__RCSID("$NetBSD: str.c,v 1.10 2003/08/07 11:16:46 agc Exp $");
#endif /* not lint */
#include <sys/cdefs.h>
diff --git a/usr.bin/tr/tr.1 b/usr.bin/tr/tr.1
index 6be5555f259..f3cc87ca5a3 100644
--- a/usr.bin/tr/tr.1
+++ b/usr.bin/tr/tr.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: tr.1,v 1.12 2003/07/20 14:20:34 jmmv Exp $
+.\" $NetBSD: tr.1,v 1.13 2003/08/07 11:16:47 agc Exp $
.\"
.\" Copyright (c) 1991, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -14,11 +14,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/tr/tr.c b/usr.bin/tr/tr.c
index ed546a05b2c..d1141daf581 100644
--- a/usr.bin/tr/tr.c
+++ b/usr.bin/tr/tr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: tr.c,v 1.6 1997/10/20 00:56:06 lukem Exp $ */
+/* $NetBSD: tr.c,v 1.7 2003/08/07 11:16:47 agc Exp $ */
/*
* Copyright (c) 1988, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -43,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1988, 1993\n\
#if 0
static char sccsid[] = "@(#)tr.c 8.2 (Berkeley) 5/4/95";
#endif
-__RCSID("$NetBSD: tr.c,v 1.6 1997/10/20 00:56:06 lukem Exp $");
+__RCSID("$NetBSD: tr.c,v 1.7 2003/08/07 11:16:47 agc Exp $");
#endif /* not lint */
#include <sys/types.h>
diff --git a/usr.bin/true/true.1 b/usr.bin/true/true.1
index 219f7eda160..58295600ea6 100644
--- a/usr.bin/true/true.1
+++ b/usr.bin/true/true.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: true.1,v 1.6 2001/06/05 12:01:33 wiz Exp $
+.\" $NetBSD: true.1,v 1.7 2003/08/07 11:16:48 agc Exp $
.\"
.\" Copyright (c) 1983, 1985, 1990 The Regents of the University of California.
.\" All rights reserved.
@@ -14,11 +14,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
@@ -35,7 +31,7 @@
.\" SUCH DAMAGE.
.\"
.\" from: @(#)true.1 6.4 (Berkeley) 6/27/91
-.\" $NetBSD: true.1,v 1.6 2001/06/05 12:01:33 wiz Exp $
+.\" $NetBSD: true.1,v 1.7 2003/08/07 11:16:48 agc Exp $
.\"
.Dd June 27, 1991
.Dt TRUE 1
diff --git a/usr.bin/tset/extern.h b/usr.bin/tset/extern.h
index 362f2ba77d7..59dbc2ddc6e 100644
--- a/usr.bin/tset/extern.h
+++ b/usr.bin/tset/extern.h
@@ -1,4 +1,4 @@
-/* $NetBSD: extern.h,v 1.8 2000/05/31 05:50:05 blymn Exp $ */
+/* $NetBSD: extern.h,v 1.9 2003/08/07 11:16:48 agc Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/tset/map.c b/usr.bin/tset/map.c
index f19fb2dfc94..4a6bd9ef56c 100644
--- a/usr.bin/tset/map.c
+++ b/usr.bin/tset/map.c
@@ -1,4 +1,4 @@
-/* $NetBSD: map.c,v 1.9 1998/07/26 23:09:50 mycroft Exp $ */
+/* $NetBSD: map.c,v 1.10 2003/08/07 11:16:48 agc Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)map.c 8.1 (Berkeley) 6/9/93";
#endif
-__RCSID("$NetBSD: map.c,v 1.9 1998/07/26 23:09:50 mycroft Exp $");
+__RCSID("$NetBSD: map.c,v 1.10 2003/08/07 11:16:48 agc Exp $");
#endif /* not lint */
#include <sys/types.h>
diff --git a/usr.bin/tset/misc.c b/usr.bin/tset/misc.c
index 35f4cbfe0ce..11997f9c3af 100644
--- a/usr.bin/tset/misc.c
+++ b/usr.bin/tset/misc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: misc.c,v 1.6 1999/10/04 23:33:25 lukem Exp $ */
+/* $NetBSD: misc.c,v 1.7 2003/08/07 11:16:48 agc Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)misc.c 8.1 (Berkeley) 6/9/93";
#endif
-__RCSID("$NetBSD: misc.c,v 1.6 1999/10/04 23:33:25 lukem Exp $");
+__RCSID("$NetBSD: misc.c,v 1.7 2003/08/07 11:16:48 agc Exp $");
#endif /* not lint */
#include <err.h>
diff --git a/usr.bin/tset/set.c b/usr.bin/tset/set.c
index 971a378d3bd..90abcfae40f 100644
--- a/usr.bin/tset/set.c
+++ b/usr.bin/tset/set.c
@@ -1,4 +1,4 @@
-/* $NetBSD: set.c,v 1.8 2000/06/07 13:21:43 simonb Exp $ */
+/* $NetBSD: set.c,v 1.9 2003/08/07 11:16:49 agc Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)set.c 8.2 (Berkeley) 2/28/94";
#endif
-__RCSID("$NetBSD: set.c,v 1.8 2000/06/07 13:21:43 simonb Exp $");
+__RCSID("$NetBSD: set.c,v 1.9 2003/08/07 11:16:49 agc Exp $");
#endif /* not lint */
#include <stdio.h>
diff --git a/usr.bin/tset/term.c b/usr.bin/tset/term.c
index b46e595c60e..49819e713a1 100644
--- a/usr.bin/tset/term.c
+++ b/usr.bin/tset/term.c
@@ -1,4 +1,4 @@
-/* $NetBSD: term.c,v 1.14 2000/05/31 05:50:06 blymn Exp $ */
+/* $NetBSD: term.c,v 1.15 2003/08/07 11:16:49 agc Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)term.c 8.1 (Berkeley) 6/9/93";
#endif
-__RCSID("$NetBSD: term.c,v 1.14 2000/05/31 05:50:06 blymn Exp $");
+__RCSID("$NetBSD: term.c,v 1.15 2003/08/07 11:16:49 agc Exp $");
#endif /* not lint */
#include <sys/types.h>
diff --git a/usr.bin/tset/tset.1 b/usr.bin/tset/tset.1
index 7192586713c..48b7f07d9b6 100644
--- a/usr.bin/tset/tset.1
+++ b/usr.bin/tset/tset.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: tset.1,v 1.13 2003/02/04 23:07:36 perry Exp $
+.\" $NetBSD: tset.1,v 1.14 2003/08/07 11:16:49 agc Exp $
.\"
.\" Copyright (c) 1985, 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -11,11 +11,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/tset/tset.c b/usr.bin/tset/tset.c
index 61ffaf44900..2da860da00f 100644
--- a/usr.bin/tset/tset.c
+++ b/usr.bin/tset/tset.c
@@ -1,4 +1,4 @@
-/* $NetBSD: tset.c,v 1.12 2000/10/11 14:46:21 is Exp $ */
+/* $NetBSD: tset.c,v 1.13 2003/08/07 11:16:49 agc Exp $ */
/*-
* Copyright (c) 1980, 1991, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -43,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 1991, 1993\n\
#if 0
static char sccsid[] = "@(#)tset.c 8.1 (Berkeley) 6/9/93";
#endif
-__RCSID("$NetBSD: tset.c,v 1.12 2000/10/11 14:46:21 is Exp $");
+__RCSID("$NetBSD: tset.c,v 1.13 2003/08/07 11:16:49 agc Exp $");
#endif /* not lint */
#include <sys/types.h>
diff --git a/usr.bin/tset/wrterm.c b/usr.bin/tset/wrterm.c
index f585ee532f6..faaabef5804 100644
--- a/usr.bin/tset/wrterm.c
+++ b/usr.bin/tset/wrterm.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wrterm.c,v 1.6 1997/10/20 01:07:55 lukem Exp $ */
+/* $NetBSD: wrterm.c,v 1.7 2003/08/07 11:16:50 agc Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)wrterm.c 8.1 (Berkeley) 6/9/93";
#endif
-__RCSID("$NetBSD: wrterm.c,v 1.6 1997/10/20 01:07:55 lukem Exp $");
+__RCSID("$NetBSD: wrterm.c,v 1.7 2003/08/07 11:16:50 agc Exp $");
#endif /* not lint */
#include <sys/types.h>
diff --git a/usr.bin/tsort/tsort.1 b/usr.bin/tsort/tsort.1
index 39238793748..061824b7b37 100644
--- a/usr.bin/tsort/tsort.1
+++ b/usr.bin/tsort/tsort.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: tsort.1,v 1.9 2002/09/30 11:09:14 grant Exp $
+.\" $NetBSD: tsort.1,v 1.10 2003/08/07 11:16:50 agc Exp $
.\"
.\" Copyright (c) 1990, 1993, 1994
.\" The Regents of the University of California. All rights reserved.
@@ -14,11 +14,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/tsort/tsort.c b/usr.bin/tsort/tsort.c
index bf5946eeaca..2ff12407776 100644
--- a/usr.bin/tsort/tsort.c
+++ b/usr.bin/tsort/tsort.c
@@ -1,4 +1,4 @@
-/* $NetBSD: tsort.c,v 1.17 2002/01/31 22:43:58 tv Exp $ */
+/* $NetBSD: tsort.c,v 1.18 2003/08/07 11:16:50 agc Exp $ */
/*
* Copyright (c) 1989, 1993, 1994
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -46,7 +42,7 @@ __COPYRIGHT("@(#) Copyright (c) 1989, 1993, 1994\n\
#if 0
static char sccsid[] = "@(#)tsort.c 8.3 (Berkeley) 5/4/95";
#endif
-__RCSID("$NetBSD: tsort.c,v 1.17 2002/01/31 22:43:58 tv Exp $");
+__RCSID("$NetBSD: tsort.c,v 1.18 2003/08/07 11:16:50 agc Exp $");
#endif /* not lint */
#if HAVE_CONFIG_H
diff --git a/usr.bin/tty/tty.1 b/usr.bin/tty/tty.1
index db7b7b6bde7..4f12dfd0950 100644
--- a/usr.bin/tty/tty.1
+++ b/usr.bin/tty/tty.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: tty.1,v 1.7 2002/02/08 01:36:36 ross Exp $
+.\" $NetBSD: tty.1,v 1.8 2003/08/07 11:16:51 agc Exp $
.\"
.\" Copyright (c) 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -14,11 +14,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/tty/tty.c b/usr.bin/tty/tty.c
index 343364f33c6..6648497fce2 100644
--- a/usr.bin/tty/tty.c
+++ b/usr.bin/tty/tty.c
@@ -1,4 +1,4 @@
-/* $NetBSD: tty.c,v 1.5 1997/10/20 01:10:39 lukem Exp $ */
+/* $NetBSD: tty.c,v 1.6 2003/08/07 11:16:51 agc Exp $ */
/*
* Copyright (c) 1988, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -43,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1988, 1993\n\
#if 0
static char sccsid[] = "@(#)tty.c 8.1 (Berkeley) 6/6/93";
#endif
-__RCSID("$NetBSD: tty.c,v 1.5 1997/10/20 01:10:39 lukem Exp $");
+__RCSID("$NetBSD: tty.c,v 1.6 2003/08/07 11:16:51 agc Exp $");
#endif /* not lint */
#include <stdio.h>
diff --git a/usr.bin/ul/ul.1 b/usr.bin/ul/ul.1
index 2e3a26e8c98..3f79f348b48 100644
--- a/usr.bin/ul/ul.1
+++ b/usr.bin/ul/ul.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: ul.1,v 1.8 2001/12/08 19:19:41 wiz Exp $
+.\" $NetBSD: ul.1,v 1.9 2003/08/07 11:16:52 agc Exp $
.\"
.\" Copyright (c) 1980, 1991, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -11,11 +11,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/ul/ul.c b/usr.bin/ul/ul.c
index bb842536cd3..fc43a8dfab2 100644
--- a/usr.bin/ul/ul.c
+++ b/usr.bin/ul/ul.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ul.c,v 1.11 2001/11/02 18:27:01 christos Exp $ */
+/* $NetBSD: ul.c,v 1.12 2003/08/07 11:16:52 agc Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -43,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 1993\n\
#if 0
static char sccsid[] = "@(#)ul.c 8.1 (Berkeley) 6/6/93";
#endif
-__RCSID("$NetBSD: ul.c,v 1.11 2001/11/02 18:27:01 christos Exp $");
+__RCSID("$NetBSD: ul.c,v 1.12 2003/08/07 11:16:52 agc Exp $");
#endif /* not lint */
#include <stdio.h>
diff --git a/usr.bin/uname/uname.1 b/usr.bin/uname/uname.1
index 0df47285d29..70a3eafdc55 100644
--- a/usr.bin/uname/uname.1
+++ b/usr.bin/uname/uname.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: uname.1,v 1.10 2001/12/01 16:43:26 wiz Exp $
+.\" $NetBSD: uname.1,v 1.11 2003/08/07 11:16:53 agc Exp $
.\"
.\" Copyright (c) 1990 The Regents of the University of California.
.\" All rights reserved.
@@ -11,11 +11,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
@@ -32,7 +28,7 @@
.\" SUCH DAMAGE.
.\"
.\" from: @(#)du.1 6.13 (Berkeley) 6/20/91
-.\" $NetBSD: uname.1,v 1.10 2001/12/01 16:43:26 wiz Exp $
+.\" $NetBSD: uname.1,v 1.11 2003/08/07 11:16:53 agc Exp $
.\"
.Dd November 9, 1998
.Dt UNAME 1
diff --git a/usr.bin/unexpand/unexpand.c b/usr.bin/unexpand/unexpand.c
index 468ffe91f01..30396d44a6b 100644
--- a/usr.bin/unexpand/unexpand.c
+++ b/usr.bin/unexpand/unexpand.c
@@ -1,4 +1,4 @@
-/* $NetBSD: unexpand.c,v 1.11 2003/07/14 09:24:00 itojun Exp $ */
+/* $NetBSD: unexpand.c,v 1.12 2003/08/07 11:16:54 agc Exp $ */
/*-
* Copyright (c) 1980, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -43,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 1993\n\
#if 0
static char sccsid[] = "@(#)unexpand.c 8.1 (Berkeley) 6/6/93";
#endif
-__RCSID("$NetBSD: unexpand.c,v 1.11 2003/07/14 09:24:00 itojun Exp $");
+__RCSID("$NetBSD: unexpand.c,v 1.12 2003/08/07 11:16:54 agc Exp $");
#endif /* not lint */
/*
diff --git a/usr.bin/unifdef/unifdef.1 b/usr.bin/unifdef/unifdef.1
index 649e667ea13..de6301ccb58 100644
--- a/usr.bin/unifdef/unifdef.1
+++ b/usr.bin/unifdef/unifdef.1
@@ -1,10 +1,37 @@
-.\" $NetBSD: unifdef.1,v 1.8 2003/07/30 08:21:47 itojun Exp $
+.\" $NetBSD: unifdef.1,v 1.9 2003/08/07 11:16:54 agc Exp $
.\"
.\" Copyright (c) 1985, 1991, 1993
.\" The Regents of the University of California. All rights reserved.
.\"
.\" This code is derived from software contributed to Berkeley by
-.\" Dave Yost. Support for #if and #elif was added by Tony Finch.
+.\" Dave Yost.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\" 1. Redistributions of source code must retain the above copyright
+.\" notice, this list of conditions and the following disclaimer.
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\" notice, this list of conditions and the following disclaimer in the
+.\" documentation and/or other materials provided with the distribution.
+.\" 3. Neither the name of the University nor the names of its contributors
+.\" may be used to endorse or promote products derived from this software
+.\" without specific prior written permission.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.\" Portions of this code (support for #if and #elif) are Copyright (c)
+.\" 2002, 2003 Tony Finch.
.\"
.\" Redistribution and use in source and binary forms, with or without
.\" modification, are permitted provided that the following conditions
@@ -38,7 +65,7 @@
.\" $dotat: things/unifdef.1,v 1.45 2003/01/20 14:37:08 fanf2 Exp $
.\" $FreeBSD: src/usr.bin/unifdef/unifdef.1,v 1.19 2003/01/20 12:41:41 fanf Exp $
.\"
-.Dd September 24, 2002
+ .Dd September 24, 2002
.Dt UNIFDEF 1
.Os
.Sh NAME
diff --git a/usr.bin/unifdef/unifdef.c b/usr.bin/unifdef/unifdef.c
index 9efd45add05..b4208418107 100644
--- a/usr.bin/unifdef/unifdef.c
+++ b/usr.bin/unifdef/unifdef.c
@@ -1,7 +1,6 @@
-/* $NetBSD: unifdef.c,v 1.11 2003/07/30 08:21:47 itojun Exp $ */
+/* $NetBSD: unifdef.c,v 1.12 2003/08/07 11:16:55 agc Exp $ */
/*
- * Copyright (c) 2002, 2003 Tony Finch <dot@dotat.at>
* Copyright (c) 1985, 1993
* The Regents of the University of California. All rights reserved.
*
@@ -16,6 +15,37 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+/*
+ * Copyright (c) 2002, 2003 Tony Finch <dot@dotat.at>
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Dave Yost. It was rewritten to support ANSI C by Tony Finch.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* This product includes software developed by the University of
@@ -47,7 +77,7 @@ static const char copyright[] =
#endif
#ifdef __IDSTRING
__IDSTRING(Berkeley, "@(#)unifdef.c 8.1 (Berkeley) 6/6/93");
-__IDSTRING(NetBSD, "$NetBSD: unifdef.c,v 1.11 2003/07/30 08:21:47 itojun Exp $");
+__IDSTRING(NetBSD, "$NetBSD: unifdef.c,v 1.12 2003/08/07 11:16:55 agc Exp $");
__IDSTRING(dotat, "$dotat: things/unifdef.c,v 1.161 2003/07/01 15:32:48 fanf2 Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/uniq/uniq.1 b/usr.bin/uniq/uniq.1
index 6bf409fa736..9034e5e6b99 100644
--- a/usr.bin/uniq/uniq.1
+++ b/usr.bin/uniq/uniq.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: uniq.1,v 1.7 2002/02/08 01:36:36 ross Exp $
+.\" $NetBSD: uniq.1,v 1.8 2003/08/07 11:16:55 agc Exp $
.\"
.\" Copyright (c) 1991, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -14,11 +14,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/uniq/uniq.c b/usr.bin/uniq/uniq.c
index 25222cd4e39..7bc44a52675 100644
--- a/usr.bin/uniq/uniq.c
+++ b/usr.bin/uniq/uniq.c
@@ -1,4 +1,4 @@
-/* $NetBSD: uniq.c,v 1.10 2003/07/14 09:29:21 itojun Exp $ */
+/* $NetBSD: uniq.c,v 1.11 2003/08/07 11:16:56 agc Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -46,7 +42,7 @@ __COPYRIGHT("@(#) Copyright (c) 1989, 1993\n\
#if 0
static char sccsid[] = "@(#)uniq.c 8.3 (Berkeley) 5/4/95";
#endif
-__RCSID("$NetBSD: uniq.c,v 1.10 2003/07/14 09:29:21 itojun Exp $");
+__RCSID("$NetBSD: uniq.c,v 1.11 2003/08/07 11:16:56 agc Exp $");
#endif /* not lint */
#include <err.h>
diff --git a/usr.bin/unvis/unvis.1 b/usr.bin/unvis/unvis.1
index db1229e4ab0..88c8e8b0d65 100644
--- a/usr.bin/unvis/unvis.1
+++ b/usr.bin/unvis/unvis.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: unvis.1,v 1.5 1999/03/22 18:16:45 garbled Exp $
+.\" $NetBSD: unvis.1,v 1.6 2003/08/07 11:16:56 agc Exp $
.\"
.\" Copyright (c) 1989, 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -11,11 +11,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/unvis/unvis.c b/usr.bin/unvis/unvis.c
index fbf17b62323..fa414e0c1c7 100644
--- a/usr.bin/unvis/unvis.c
+++ b/usr.bin/unvis/unvis.c
@@ -1,4 +1,4 @@
-/* $NetBSD: unvis.c,v 1.8 1998/10/13 17:02:53 wsanchez Exp $ */
+/* $NetBSD: unvis.c,v 1.9 2003/08/07 11:16:56 agc Exp $ */
/*-
* Copyright (c) 1989, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -43,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1989, 1993\n\
#if 0
static char sccsid[] = "@(#)unvis.c 8.1 (Berkeley) 6/6/93";
#endif
-__RCSID("$NetBSD: unvis.c,v 1.8 1998/10/13 17:02:53 wsanchez Exp $");
+__RCSID("$NetBSD: unvis.c,v 1.9 2003/08/07 11:16:56 agc Exp $");
#endif /* not lint */
#include <err.h>
diff --git a/usr.bin/users/users.1 b/usr.bin/users/users.1
index 15836dc8a16..9c279cdb4b9 100644
--- a/usr.bin/users/users.1
+++ b/usr.bin/users/users.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: users.1,v 1.6 1999/03/22 18:16:45 garbled Exp $
+.\" $NetBSD: users.1,v 1.7 2003/08/07 11:16:57 agc Exp $
.\"
.\" Copyright (c) 1980, 1990, 1991, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -11,11 +11,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/users/users.c b/usr.bin/users/users.c
index 0818fc12021..bafbbcb8672 100644
--- a/usr.bin/users/users.c
+++ b/usr.bin/users/users.c
@@ -1,4 +1,4 @@
-/* $NetBSD: users.c,v 1.11 2003/04/27 10:38:42 jdolecek Exp $ */
+/* $NetBSD: users.c,v 1.12 2003/08/07 11:16:57 agc Exp $ */
/*
* Copyright (c) 1980, 1987, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -43,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 1987, 1993\n\
#if 0
static char sccsid[] = "@(#)users.c 8.1 (Berkeley) 6/6/93";
#endif
-__RCSID("$NetBSD: users.c,v 1.11 2003/04/27 10:38:42 jdolecek Exp $");
+__RCSID("$NetBSD: users.c,v 1.12 2003/08/07 11:16:57 agc Exp $");
#endif /* not lint */
#include <sys/types.h>
diff --git a/usr.bin/uudecode/uudecode.c b/usr.bin/uudecode/uudecode.c
index 212f236b3d3..cdcb8743889 100644
--- a/usr.bin/uudecode/uudecode.c
+++ b/usr.bin/uudecode/uudecode.c
@@ -1,4 +1,4 @@
-/* $NetBSD: uudecode.c,v 1.16 2002/06/29 17:58:50 itojun Exp $ */
+/* $NetBSD: uudecode.c,v 1.17 2003/08/07 11:16:58 agc Exp $ */
/*-
* Copyright (c) 1983, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -43,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1983, 1993\n\
#if 0
static char sccsid[] = "@(#)uudecode.c 8.2 (Berkeley) 4/2/94";
#endif
-__RCSID("$NetBSD: uudecode.c,v 1.16 2002/06/29 17:58:50 itojun Exp $");
+__RCSID("$NetBSD: uudecode.c,v 1.17 2003/08/07 11:16:58 agc Exp $");
#endif /* not lint */
#if HAVE_CONFIG_H
diff --git a/usr.bin/uuencode/uuencode.1 b/usr.bin/uuencode/uuencode.1
index 3b4e4458bb8..0eeb1d071d5 100644
--- a/usr.bin/uuencode/uuencode.1
+++ b/usr.bin/uuencode/uuencode.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: uuencode.1,v 1.13 2002/02/08 01:36:36 ross Exp $
+.\" $NetBSD: uuencode.1,v 1.14 2003/08/07 11:16:58 agc Exp $
.\"
.\" Copyright (c) 1980, 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -11,11 +11,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/uuencode/uuencode.5 b/usr.bin/uuencode/uuencode.5
index 9b50f7dc080..49dbe650d15 100644
--- a/usr.bin/uuencode/uuencode.5
+++ b/usr.bin/uuencode/uuencode.5
@@ -1,4 +1,4 @@
-.\" $NetBSD: uuencode.5,v 1.8 2002/09/30 11:09:15 grant Exp $
+.\" $NetBSD: uuencode.5,v 1.9 2003/08/07 11:16:59 agc Exp $
.\"
.\" Copyright (c) 1989, 1991, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -11,11 +11,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/uuencode/uuencode.c b/usr.bin/uuencode/uuencode.c
index 7eb3ef854ed..1226895b9c7 100644
--- a/usr.bin/uuencode/uuencode.c
+++ b/usr.bin/uuencode/uuencode.c
@@ -1,4 +1,4 @@
-/* $NetBSD: uuencode.c,v 1.8 1997/10/20 02:51:01 lukem Exp $ */
+/* $NetBSD: uuencode.c,v 1.9 2003/08/07 11:16:59 agc Exp $ */
/*-
* Copyright (c) 1983, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -43,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1983, 1993\n\
#if 0
static char sccsid[] = "@(#)uuencode.c 8.2 (Berkeley) 4/2/94";
#else
-__RCSID("$NetBSD: uuencode.c,v 1.8 1997/10/20 02:51:01 lukem Exp $");
+__RCSID("$NetBSD: uuencode.c,v 1.9 2003/08/07 11:16:59 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/vacation/vacation.1 b/usr.bin/vacation/vacation.1
index df47ce0516f..4ec9f129227 100644
--- a/usr.bin/vacation/vacation.1
+++ b/usr.bin/vacation/vacation.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: vacation.1,v 1.20 2003/04/24 12:11:17 wiz Exp $
+.\" $NetBSD: vacation.1,v 1.21 2003/08/07 11:16:59 agc Exp $
.\"
.\" Copyright (c) 1985, 1987, 1990, 1991, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -11,11 +11,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/vacation/vacation.c b/usr.bin/vacation/vacation.c
index 120dabf2b02..f5af34aa1c5 100644
--- a/usr.bin/vacation/vacation.c
+++ b/usr.bin/vacation/vacation.c
@@ -1,4 +1,4 @@
-/* $NetBSD: vacation.c,v 1.23 2003/07/14 09:24:31 itojun Exp $ */
+/* $NetBSD: vacation.c,v 1.24 2003/08/07 11:16:59 agc Exp $ */
/*
* Copyright (c) 1983, 1987, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -44,7 +40,7 @@ __COPYRIGHT("@(#) Copyright (c) 1983, 1987, 1993\n\
#if 0
static char sccsid[] = "@(#)vacation.c 8.2 (Berkeley) 1/26/94";
#endif
-__RCSID("$NetBSD: vacation.c,v 1.23 2003/07/14 09:24:31 itojun Exp $");
+__RCSID("$NetBSD: vacation.c,v 1.24 2003/08/07 11:16:59 agc Exp $");
#endif /* not lint */
/*
diff --git a/usr.bin/vgrind/RETEST/retest.c b/usr.bin/vgrind/RETEST/retest.c
index 565c4af7ca5..581c58c400a 100644
--- a/usr.bin/vgrind/RETEST/retest.c
+++ b/usr.bin/vgrind/RETEST/retest.c
@@ -1,4 +1,4 @@
-/* $NetBSD: retest.c,v 1.4 2003/05/17 14:58:19 itojun Exp $ */
+/* $NetBSD: retest.c,v 1.5 2003/08/07 11:17:02 agc Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -43,7 +39,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.4 2003/05/17 14:58:19 itojun Exp $";
+static char rcsid[] = "$NetBSD: retest.c,v 1.5 2003/08/07 11:17:02 agc Exp $";
#endif /* not lint */
#include <ctype.h>
diff --git a/usr.bin/vgrind/extern.h b/usr.bin/vgrind/extern.h
index a62c6a238da..e464944242c 100644
--- a/usr.bin/vgrind/extern.h
+++ b/usr.bin/vgrind/extern.h
@@ -1,4 +1,4 @@
-/* $NetBSD: extern.h,v 1.3 1998/12/19 23:41:53 christos Exp $ */
+/* $NetBSD: extern.h,v 1.4 2003/08/07 11:17:00 agc Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -13,11 +13,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/vgrind/pathnames.h b/usr.bin/vgrind/pathnames.h
index 2de2022d411..dc12d046032 100644
--- a/usr.bin/vgrind/pathnames.h
+++ b/usr.bin/vgrind/pathnames.h
@@ -1,4 +1,4 @@
-/* $NetBSD: pathnames.h,v 1.3 1994/11/17 08:28:01 jtc Exp $ */
+/* $NetBSD: pathnames.h,v 1.4 2003/08/07 11:17:00 agc Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/vgrind/regexp.c b/usr.bin/vgrind/regexp.c
index 60f6d5c98a4..71c2d309a63 100644
--- a/usr.bin/vgrind/regexp.c
+++ b/usr.bin/vgrind/regexp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: regexp.c,v 1.6 2003/07/12 13:37:15 itojun Exp $ */
+/* $NetBSD: regexp.c,v 1.7 2003/08/07 11:17:01 agc Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -13,11 +13,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -44,7 +40,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 1993\n\
#if 0
static char sccsid[] = "@(#)regexp.c 8.1 (Berkeley) 6/6/93";
#endif
-__RCSID("$NetBSD: regexp.c,v 1.6 2003/07/12 13:37:15 itojun Exp $");
+__RCSID("$NetBSD: regexp.c,v 1.7 2003/08/07 11:17:01 agc Exp $");
#endif /* not lint */
#include <ctype.h>
diff --git a/usr.bin/vgrind/vfontedpr.c b/usr.bin/vgrind/vfontedpr.c
index 30494218c4e..8640554be22 100644
--- a/usr.bin/vgrind/vfontedpr.c
+++ b/usr.bin/vgrind/vfontedpr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: vfontedpr.c,v 1.9 2003/07/12 13:37:15 itojun Exp $ */
+/* $NetBSD: vfontedpr.c,v 1.10 2003/08/07 11:17:01 agc Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -43,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 1993\n\
#if 0
static char sccsid[] = "@(#)vfontedpr.c 8.1 (Berkeley) 6/6/93";
#endif
-__RCSID("$NetBSD: vfontedpr.c,v 1.9 2003/07/12 13:37:15 itojun Exp $");
+__RCSID("$NetBSD: vfontedpr.c,v 1.10 2003/08/07 11:17:01 agc Exp $");
#endif /* not lint */
#include <sys/types.h>
diff --git a/usr.bin/vgrind/vgrind.1 b/usr.bin/vgrind/vgrind.1
index a577f7429e4..e23c4947095 100644
--- a/usr.bin/vgrind/vgrind.1
+++ b/usr.bin/vgrind/vgrind.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: vgrind.1,v 1.12 2003/02/25 10:36:00 wiz Exp $
+.\" $NetBSD: vgrind.1,v 1.13 2003/08/07 11:17:01 agc Exp $
.\"
.\" Copyright (c) 1980, 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -11,11 +11,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/vgrind/vgrindefs.5 b/usr.bin/vgrind/vgrindefs.5
index 9b817035438..239c6b55ce3 100644
--- a/usr.bin/vgrind/vgrindefs.5
+++ b/usr.bin/vgrind/vgrindefs.5
@@ -1,4 +1,4 @@
-.\" $NetBSD: vgrindefs.5,v 1.8 2002/09/30 11:09:16 grant Exp $
+.\" $NetBSD: vgrindefs.5,v 1.9 2003/08/07 11:17:02 agc Exp $
.\"
.\" Copyright (c) 1989, 1991, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -11,11 +11,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/vgrind/vgrindefs.c b/usr.bin/vgrind/vgrindefs.c
index 247477a03fc..42dc6ad0cf7 100644
--- a/usr.bin/vgrind/vgrindefs.c
+++ b/usr.bin/vgrind/vgrindefs.c
@@ -1,4 +1,4 @@
-/* $NetBSD: vgrindefs.c,v 1.9 2003/07/14 09:25:37 itojun Exp $ */
+/* $NetBSD: vgrindefs.c,v 1.10 2003/08/07 11:17:02 agc Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)vgrindefs.c 8.1 (Berkeley) 6/6/93";
#endif
-__RCSID("$NetBSD: vgrindefs.c,v 1.9 2003/07/14 09:25:37 itojun Exp $");
+__RCSID("$NetBSD: vgrindefs.c,v 1.10 2003/08/07 11:17:02 agc Exp $");
#endif /* not lint */
#define BUFSIZ 1024
diff --git a/usr.bin/vi/LICENSE b/usr.bin/vi/LICENSE
index 78e8f4a40e1..28c738fa1c1 100644
--- a/usr.bin/vi/LICENSE
+++ b/usr.bin/vi/LICENSE
@@ -7,6 +7,33 @@ to the authors would be appreciated.
/*-
* Copyright (c) 1991, 1992, 1993, 1994
* The Regents of the University of California. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+/*-
* Copyright (c) 1991, 1992, 1993, 1994, 1995, 1996
* Keith Bostic. All rights reserved.
*
diff --git a/usr.bin/vi/catalog/dump.c b/usr.bin/vi/catalog/dump.c
index dca98269a49..4c978e4b339 100644
--- a/usr.bin/vi/catalog/dump.c
+++ b/usr.bin/vi/catalog/dump.c
@@ -1,4 +1,4 @@
-/* $NetBSD: dump.c,v 1.2 1998/01/09 08:06:16 perry Exp $ */
+/* $NetBSD: dump.c,v 1.3 2003/08/07 11:17:04 agc Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/vi/docs/USD.doc/edit/edit.vindex b/usr.bin/vi/docs/USD.doc/edit/edit.vindex
index ecbd545566f..6198ac10009 100644
--- a/usr.bin/vi/docs/USD.doc/edit/edit.vindex
+++ b/usr.bin/vi/docs/USD.doc/edit/edit.vindex
@@ -1,4 +1,4 @@
-.\" $NetBSD: edit.vindex,v 1.4 1998/01/09 08:07:14 perry Exp $
+.\" $NetBSD: edit.vindex,v 1.5 2003/08/07 11:17:04 agc Exp $
.\"
.\" Copyright (c) 1980, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -11,11 +11,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/vi/docs/USD.doc/edit/edittut.ms b/usr.bin/vi/docs/USD.doc/edit/edittut.ms
index 2e9cfaeb243..c9968bdd1fd 100644
--- a/usr.bin/vi/docs/USD.doc/edit/edittut.ms
+++ b/usr.bin/vi/docs/USD.doc/edit/edittut.ms
@@ -1,4 +1,4 @@
-.\" $NetBSD: edittut.ms,v 1.6 2001/03/31 11:37:47 aymeric Exp $
+.\" $NetBSD: edittut.ms,v 1.7 2003/08/07 11:17:05 agc Exp $
.\"
.\" Copyright (c) 1980, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -11,11 +11,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/vi/docs/USD.doc/exref/ex.rm b/usr.bin/vi/docs/USD.doc/exref/ex.rm
index cbb365c0de1..61fea59a4f5 100644
--- a/usr.bin/vi/docs/USD.doc/exref/ex.rm
+++ b/usr.bin/vi/docs/USD.doc/exref/ex.rm
@@ -1,4 +1,4 @@
-.\" $NetBSD: ex.rm,v 1.5 2001/08/20 12:00:56 wiz Exp $
+.\" $NetBSD: ex.rm,v 1.6 2003/08/07 11:17:05 agc Exp $
.\"
.\" Copyright (c) 1980, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -11,11 +11,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/vi/docs/USD.doc/exref/ex.summary b/usr.bin/vi/docs/USD.doc/exref/ex.summary
index 8f1aef2abad..dcdceceb01c 100644
--- a/usr.bin/vi/docs/USD.doc/exref/ex.summary
+++ b/usr.bin/vi/docs/USD.doc/exref/ex.summary
@@ -1,4 +1,4 @@
-.\" $NetBSD: ex.summary,v 1.3 2001/03/31 11:37:47 aymeric Exp $
+.\" $NetBSD: ex.summary,v 1.4 2003/08/07 11:17:06 agc Exp $
.\"
.\" Copyright (c) 1980, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -11,11 +11,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/vi/docs/USD.doc/vitut/vi.apwh.ms b/usr.bin/vi/docs/USD.doc/vitut/vi.apwh.ms
index 20e560af9d1..d20b3f19664 100644
--- a/usr.bin/vi/docs/USD.doc/vitut/vi.apwh.ms
+++ b/usr.bin/vi/docs/USD.doc/vitut/vi.apwh.ms
@@ -1,4 +1,4 @@
-.\" $NetBSD: vi.apwh.ms,v 1.3 2001/03/31 11:37:49 aymeric Exp $
+.\" $NetBSD: vi.apwh.ms,v 1.4 2003/08/07 11:17:07 agc Exp $
.\"
.\" Copyright (c) 1980, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -11,11 +11,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/vi/docs/USD.doc/vitut/vi.chars b/usr.bin/vi/docs/USD.doc/vitut/vi.chars
index 9dc512b39eb..15dd1460429 100644
--- a/usr.bin/vi/docs/USD.doc/vitut/vi.chars
+++ b/usr.bin/vi/docs/USD.doc/vitut/vi.chars
@@ -1,4 +1,4 @@
-.\" $NetBSD: vi.chars,v 1.4 2001/08/20 12:00:57 wiz Exp $
+.\" $NetBSD: vi.chars,v 1.5 2003/08/07 11:17:07 agc Exp $
.\"
.\" Copyright (c) 1980, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -11,11 +11,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/vi/docs/USD.doc/vitut/vi.in b/usr.bin/vi/docs/USD.doc/vitut/vi.in
index 344f44a5cf1..65b07c9913d 100644
--- a/usr.bin/vi/docs/USD.doc/vitut/vi.in
+++ b/usr.bin/vi/docs/USD.doc/vitut/vi.in
@@ -1,4 +1,4 @@
-.\" $NetBSD: vi.in,v 1.4 2003/02/05 00:02:40 perry Exp $
+.\" $NetBSD: vi.in,v 1.5 2003/08/07 11:17:07 agc Exp $
.\"
.\" Copyright (c) 1980, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -11,11 +11,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/vi/docs/USD.doc/vitut/vi.summary b/usr.bin/vi/docs/USD.doc/vitut/vi.summary
index bb2b191a00f..eaa4fcd74d9 100644
--- a/usr.bin/vi/docs/USD.doc/vitut/vi.summary
+++ b/usr.bin/vi/docs/USD.doc/vitut/vi.summary
@@ -1,4 +1,4 @@
-.\" $NetBSD: vi.summary,v 1.3 2001/03/31 11:37:49 aymeric Exp $
+.\" $NetBSD: vi.summary,v 1.4 2003/08/07 11:17:08 agc Exp $
.\"
.\" Copyright (c) 1980, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -11,11 +11,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/vi/include/bitstring.h b/usr.bin/vi/include/bitstring.h
index 5cebe1ab0fb..43bd8433afd 100644
--- a/usr.bin/vi/include/bitstring.h
+++ b/usr.bin/vi/include/bitstring.h
@@ -1,4 +1,4 @@
-/* $NetBSD: bitstring.h,v 1.2 1998/01/09 08:08:16 perry Exp $ */
+/* $NetBSD: bitstring.h,v 1.3 2003/08/07 11:17:08 agc Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/vis/foldit.c b/usr.bin/vis/foldit.c
index 8ee11c197f2..748d0d29582 100644
--- a/usr.bin/vis/foldit.c
+++ b/usr.bin/vis/foldit.c
@@ -1,4 +1,4 @@
-/* $NetBSD: foldit.c,v 1.5 1997/10/20 03:06:47 lukem Exp $ */
+/* $NetBSD: foldit.c,v 1.6 2003/08/07 11:17:09 agc Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)foldit.c 8.1 (Berkeley) 6/6/93";
#endif
-__RCSID("$NetBSD: foldit.c,v 1.5 1997/10/20 03:06:47 lukem Exp $");
+__RCSID("$NetBSD: foldit.c,v 1.6 2003/08/07 11:17:09 agc Exp $");
#endif /* not lint */
#include <stdio.h>
diff --git a/usr.bin/vis/vis.1 b/usr.bin/vis/vis.1
index fb920ba4920..855b67b4123 100644
--- a/usr.bin/vis/vis.1
+++ b/usr.bin/vis/vis.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: vis.1,v 1.10 2002/12/23 01:45:54 lukem Exp $
+.\" $NetBSD: vis.1,v 1.11 2003/08/07 11:17:09 agc Exp $
.\"
.\" Copyright (c) 1989, 1991, 1993, 1994
.\" The Regents of the University of California. All rights reserved.
@@ -11,11 +11,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/vis/vis.c b/usr.bin/vis/vis.c
index 7bb5055ff79..35f05e053ae 100644
--- a/usr.bin/vis/vis.c
+++ b/usr.bin/vis/vis.c
@@ -1,4 +1,4 @@
-/* $NetBSD: vis.c,v 1.7 2002/12/23 01:45:54 lukem Exp $ */
+/* $NetBSD: vis.c,v 1.8 2003/08/07 11:17:09 agc Exp $ */
/*-
* Copyright (c) 1989, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -43,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1989, 1993\n\
#if 0
static char sccsid[] = "@(#)vis.c 8.1 (Berkeley) 6/6/93";
#endif
-__RCSID("$NetBSD: vis.c,v 1.7 2002/12/23 01:45:54 lukem Exp $");
+__RCSID("$NetBSD: vis.c,v 1.8 2003/08/07 11:17:09 agc Exp $");
#endif /* not lint */
#include <stdio.h>
diff --git a/usr.bin/vmstat/vmstat.1 b/usr.bin/vmstat/vmstat.1
index 3e5d80a6e09..0ef8e29ccd5 100644
--- a/usr.bin/vmstat/vmstat.1
+++ b/usr.bin/vmstat/vmstat.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: vmstat.1,v 1.10 2003/05/06 10:17:02 dsl Exp $
+.\" $NetBSD: vmstat.1,v 1.11 2003/08/07 11:17:11 agc Exp $
.\"
.\" Copyright (c) 2000 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -42,11 +42,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/vmstat/vmstat.c b/usr.bin/vmstat/vmstat.c
index 5ec69adb6b0..14ef541ef49 100644
--- a/usr.bin/vmstat/vmstat.c
+++ b/usr.bin/vmstat/vmstat.c
@@ -1,4 +1,4 @@
-/* $NetBSD: vmstat.c,v 1.116 2003/07/15 05:52:48 itojun Exp $ */
+/* $NetBSD: vmstat.c,v 1.117 2003/08/07 11:17:11 agc Exp $ */
/*-
* Copyright (c) 1998, 2000, 2001 The NetBSD Foundation, Inc.
@@ -50,11 +50,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -81,7 +77,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 1986, 1991, 1993\n\
#if 0
static char sccsid[] = "@(#)vmstat.c 8.2 (Berkeley) 3/1/95";
#else
-__RCSID("$NetBSD: vmstat.c,v 1.116 2003/07/15 05:52:48 itojun Exp $");
+__RCSID("$NetBSD: vmstat.c,v 1.117 2003/08/07 11:17:11 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/w/extern.h b/usr.bin/w/extern.h
index 987450e5fd1..2410083a06b 100644
--- a/usr.bin/w/extern.h
+++ b/usr.bin/w/extern.h
@@ -1,4 +1,4 @@
-/* $NetBSD: extern.h,v 1.5 2001/01/05 04:59:21 mjl Exp $ */
+/* $NetBSD: extern.h,v 1.6 2003/08/07 11:17:12 agc Exp $ */
/*-
* Copyright (c) 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/w/pr_time.c b/usr.bin/w/pr_time.c
index 98d09f9e7f5..301e5318deb 100644
--- a/usr.bin/w/pr_time.c
+++ b/usr.bin/w/pr_time.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pr_time.c,v 1.13 2002/10/21 10:18:23 enami Exp $ */
+/* $NetBSD: pr_time.c,v 1.14 2003/08/07 11:17:12 agc Exp $ */
/*-
* Copyright (c) 1990, 1993, 1994
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)pr_time.c 8.2 (Berkeley) 4/4/94";
#else
-__RCSID("$NetBSD: pr_time.c,v 1.13 2002/10/21 10:18:23 enami Exp $");
+__RCSID("$NetBSD: pr_time.c,v 1.14 2003/08/07 11:17:12 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/w/proc_compare.c b/usr.bin/w/proc_compare.c
index 544fc2bffad..e9c87f92cfd 100644
--- a/usr.bin/w/proc_compare.c
+++ b/usr.bin/w/proc_compare.c
@@ -1,4 +1,4 @@
-/* $NetBSD: proc_compare.c,v 1.11 2003/01/18 10:56:44 thorpej Exp $ */
+/* $NetBSD: proc_compare.c,v 1.12 2003/08/07 11:17:12 agc Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)proc_compare.c 8.2 (Berkeley) 9/23/93";
#else
-__RCSID("$NetBSD: proc_compare.c,v 1.11 2003/01/18 10:56:44 thorpej Exp $");
+__RCSID("$NetBSD: proc_compare.c,v 1.12 2003/08/07 11:17:12 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/w/uptime.1 b/usr.bin/w/uptime.1
index 4f095b650c2..230167416f0 100644
--- a/usr.bin/w/uptime.1
+++ b/usr.bin/w/uptime.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: uptime.1,v 1.9 2001/12/01 16:43:27 wiz Exp $
+.\" $NetBSD: uptime.1,v 1.10 2003/08/07 11:17:13 agc Exp $
.\"
.\" Copyright (c) 1980, 1990, 1993, 1994
.\" The Regents of the University of California. All rights reserved.
@@ -11,11 +11,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/w/w.1 b/usr.bin/w/w.1
index 291679c21ce..7ea76dbe366 100644
--- a/usr.bin/w/w.1
+++ b/usr.bin/w/w.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: w.1,v 1.12 2001/12/08 19:24:10 wiz Exp $
+.\" $NetBSD: w.1,v 1.13 2003/08/07 11:17:13 agc Exp $
.\"
.\" Copyright (c) 1980, 1990, 1991, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -11,11 +11,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/w/w.c b/usr.bin/w/w.c
index 0401ea1452a..c382ec8ca0c 100644
--- a/usr.bin/w/w.c
+++ b/usr.bin/w/w.c
@@ -1,4 +1,4 @@
-/* $NetBSD: w.c,v 1.59 2003/07/12 14:05:10 itojun Exp $ */
+/* $NetBSD: w.c,v 1.60 2003/08/07 11:17:13 agc Exp $ */
/*-
* Copyright (c) 1980, 1991, 1993, 1994
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -43,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 1991, 1993, 1994\n\
#if 0
static char sccsid[] = "@(#)w.c 8.6 (Berkeley) 6/30/94";
#else
-__RCSID("$NetBSD: w.c,v 1.59 2003/07/12 14:05:10 itojun Exp $");
+__RCSID("$NetBSD: w.c,v 1.60 2003/08/07 11:17:13 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/wall/wall.1 b/usr.bin/wall/wall.1
index 8753b73ee24..8a9d73557cf 100644
--- a/usr.bin/wall/wall.1
+++ b/usr.bin/wall/wall.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: wall.1,v 1.6 2003/03/27 13:16:19 lukem Exp $
+.\" $NetBSD: wall.1,v 1.7 2003/08/07 11:17:14 agc Exp $
.\"
.\" Copyright (c) 1989, 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -11,11 +11,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/wall/wall.c b/usr.bin/wall/wall.c
index d0d7e49a26d..d15731e1439 100644
--- a/usr.bin/wall/wall.c
+++ b/usr.bin/wall/wall.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wall.c,v 1.23 2003/04/21 00:05:30 christos Exp $ */
+/* $NetBSD: wall.c,v 1.24 2003/08/07 11:17:14 agc Exp $ */
/*
* Copyright (c) 1988, 1990, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -43,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1988, 1990, 1993\n\
#if 0
static char sccsid[] = "@(#)wall.c 8.2 (Berkeley) 11/16/93";
#endif
-__RCSID("$NetBSD: wall.c,v 1.23 2003/04/21 00:05:30 christos Exp $");
+__RCSID("$NetBSD: wall.c,v 1.24 2003/08/07 11:17:14 agc Exp $");
#endif /* not lint */
/*
diff --git a/usr.bin/wc/wc.1 b/usr.bin/wc/wc.1
index f83cdd23f24..6067bc38900 100644
--- a/usr.bin/wc/wc.1
+++ b/usr.bin/wc/wc.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: wc.1,v 1.12 2002/03/05 15:09:46 wiz Exp $
+.\" $NetBSD: wc.1,v 1.13 2003/08/07 11:17:15 agc Exp $
.\"
.\" Copyright (c) 1991, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -14,11 +14,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/wc/wc.c b/usr.bin/wc/wc.c
index 8768cfe659e..ee50a6a779e 100644
--- a/usr.bin/wc/wc.c
+++ b/usr.bin/wc/wc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wc.c,v 1.28 2002/05/02 13:07:13 wiz Exp $ */
+/* $NetBSD: wc.c,v 1.29 2003/08/07 11:17:15 agc Exp $ */
/*
* Copyright (c) 1980, 1987, 1991, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -43,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 1987, 1991, 1993\n\
#if 0
static char sccsid[] = "@(#)wc.c 8.2 (Berkeley) 5/2/95";
#else
-__RCSID("$NetBSD: wc.c,v 1.28 2002/05/02 13:07:13 wiz Exp $");
+__RCSID("$NetBSD: wc.c,v 1.29 2003/08/07 11:17:15 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/what/what.1 b/usr.bin/what/what.1
index 614cf6ca421..f29c2bdaec6 100644
--- a/usr.bin/what/what.1
+++ b/usr.bin/what/what.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: what.1,v 1.12 2002/10/02 10:07:05 wiz Exp $
+.\" $NetBSD: what.1,v 1.13 2003/08/07 11:17:15 agc Exp $
.\"
.\" Copyright (c) 1980, 1991, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -11,11 +11,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/what/what.c b/usr.bin/what/what.c
index 30c3d5a5098..529be992753 100644
--- a/usr.bin/what/what.c
+++ b/usr.bin/what/what.c
@@ -1,4 +1,4 @@
-/* $NetBSD: what.c,v 1.8 1999/12/22 14:39:18 kleink Exp $ */
+/* $NetBSD: what.c,v 1.9 2003/08/07 11:17:16 agc Exp $ */
/*
* Copyright (c) 1980, 1988, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -43,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 1988, 1993\n\
#if 0
static char sccsid[] = "@(#)what.c 8.1 (Berkeley) 6/6/93";
#endif
-__RCSID("$NetBSD: what.c,v 1.8 1999/12/22 14:39:18 kleink Exp $");
+__RCSID("$NetBSD: what.c,v 1.9 2003/08/07 11:17:16 agc Exp $");
#endif /* not lint */
#include <locale.h>
diff --git a/usr.bin/whatis/whatis.1 b/usr.bin/whatis/whatis.1
index 19963bf0fad..9d9028c48b5 100644
--- a/usr.bin/whatis/whatis.1
+++ b/usr.bin/whatis/whatis.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: whatis.1,v 1.7 2002/03/08 20:27:42 jdolecek Exp $
+.\" $NetBSD: whatis.1,v 1.8 2003/08/07 11:17:16 agc Exp $
.\"
.\" Copyright (c) 1989, 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -11,11 +11,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/whatis/whatis.c b/usr.bin/whatis/whatis.c
index c46a73575ce..2dc05293884 100644
--- a/usr.bin/whatis/whatis.c
+++ b/usr.bin/whatis/whatis.c
@@ -1,4 +1,4 @@
-/* $NetBSD: whatis.c,v 1.17 2002/09/19 11:29:55 lukem Exp $ */
+/* $NetBSD: whatis.c,v 1.18 2003/08/07 11:17:16 agc Exp $ */
/*
* Copyright (c) 1987, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -44,7 +40,7 @@ __COPYRIGHT("@(#) Copyright (c) 1987, 1993\n\
#if 0
static char sccsid[] = "@(#)whatis.c 8.5 (Berkeley) 1/2/94";
#else
-__RCSID("$NetBSD: whatis.c,v 1.17 2002/09/19 11:29:55 lukem Exp $");
+__RCSID("$NetBSD: whatis.c,v 1.18 2003/08/07 11:17:16 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/whereis/whereis.1 b/usr.bin/whereis/whereis.1
index 299e39156d5..ed7d0ae48f3 100644
--- a/usr.bin/whereis/whereis.1
+++ b/usr.bin/whereis/whereis.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: whereis.1,v 1.13 2003/04/03 18:16:45 perry Exp $
+.\" $NetBSD: whereis.1,v 1.14 2003/08/07 11:17:17 agc Exp $
.\"
.\" Copyright (c) 1993
.\" The Regents of the University of California. All rights reserved.
@@ -11,11 +11,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/whereis/whereis.c b/usr.bin/whereis/whereis.c
index 0c5849075aa..694fb448ccb 100644
--- a/usr.bin/whereis/whereis.c
+++ b/usr.bin/whereis/whereis.c
@@ -1,4 +1,4 @@
-/* $NetBSD: whereis.c,v 1.12 2003/04/03 18:16:45 perry Exp $ */
+/* $NetBSD: whereis.c,v 1.13 2003/08/07 11:17:17 agc Exp $ */
/*-
* Copyright (c) 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -43,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1993\n\
#if 0
static char sccsid[] = "@(#)whereis.c 8.3 (Berkeley) 5/4/95";
#endif
-__RCSID("$NetBSD: whereis.c,v 1.12 2003/04/03 18:16:45 perry Exp $");
+__RCSID("$NetBSD: whereis.c,v 1.13 2003/08/07 11:17:17 agc Exp $");
#endif /* not lint */
#include <sys/param.h>
diff --git a/usr.bin/which/which.1 b/usr.bin/which/which.1
index b4cbeb45c50..a63c03cedfb 100644
--- a/usr.bin/which/which.1
+++ b/usr.bin/which/which.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: which.1,v 1.8 2001/12/12 16:03:15 wiz Exp $
+.\" $NetBSD: which.1,v 1.9 2003/08/07 11:17:18 agc Exp $
.\"
.\" Copyright (c) 1980, 1991 Regents of the University of California.
.\" All rights reserved.
@@ -11,11 +11,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
@@ -32,7 +28,7 @@
.\" SUCH DAMAGE.
.\"
.\" from: @(#)which.1 6.3 (Berkeley) 4/23/91
-.\" $NetBSD: which.1,v 1.8 2001/12/12 16:03:15 wiz Exp $
+.\" $NetBSD: which.1,v 1.9 2003/08/07 11:17:18 agc Exp $
.\"
.Dd April 23, 1991
.Dt WHICH 1
diff --git a/usr.bin/who/who.1 b/usr.bin/who/who.1
index aaa81bb43c5..c056ad6c0bc 100644
--- a/usr.bin/who/who.1
+++ b/usr.bin/who/who.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: who.1,v 1.13 2003/06/27 09:42:24 wiz Exp $
+.\" $NetBSD: who.1,v 1.14 2003/08/07 11:17:18 agc Exp $
.\"
.\" Copyright (c) 1986, 1991, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -11,11 +11,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/who/who.c b/usr.bin/who/who.c
index d73e6d64ff5..c2556e50a98 100644
--- a/usr.bin/who/who.c
+++ b/usr.bin/who/who.c
@@ -1,4 +1,4 @@
-/* $NetBSD: who.c,v 1.11 2003/02/17 13:56:28 christos Exp $ */
+/* $NetBSD: who.c,v 1.12 2003/08/07 11:17:19 agc Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -47,7 +43,7 @@ __COPYRIGHT(
#if 0
static char sccsid[] = "@(#)who.c 8.1 (Berkeley) 6/6/93";
#endif
-__RCSID("$NetBSD: who.c,v 1.11 2003/02/17 13:56:28 christos Exp $");
+__RCSID("$NetBSD: who.c,v 1.12 2003/08/07 11:17:19 agc Exp $");
#endif /* not lint */
#include <sys/types.h>
diff --git a/usr.bin/whois/whois.1 b/usr.bin/whois/whois.1
index ba6a2a24e53..b05b4a35d6a 100644
--- a/usr.bin/whois/whois.1
+++ b/usr.bin/whois/whois.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: whois.1,v 1.19 2003/04/06 20:14:41 wiz Exp $
+.\" $NetBSD: whois.1,v 1.20 2003/08/07 11:17:19 agc Exp $
.\"
.\" Copyright (c) 1985, 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -11,11 +11,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/whois/whois.c b/usr.bin/whois/whois.c
index a8f063a6b1a..89c26b71b6e 100644
--- a/usr.bin/whois/whois.c
+++ b/usr.bin/whois/whois.c
@@ -1,4 +1,4 @@
-/* $NetBSD: whois.c,v 1.20 2003/07/14 09:21:03 itojun Exp $ */
+/* $NetBSD: whois.c,v 1.21 2003/08/07 11:17:20 agc Exp $ */
/*
* RIPE version marten@ripe.net
@@ -25,11 +25,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -58,7 +54,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 1993\n\
#if 0
static char sccsid[] = "@(#)whois.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: whois.c,v 1.20 2003/07/14 09:21:03 itojun Exp $");
+__RCSID("$NetBSD: whois.c,v 1.21 2003/08/07 11:17:20 agc Exp $");
#endif
#endif /* not lint */
#endif /* not RIPE */
@@ -69,7 +65,7 @@ char sccsid[] =
"@(#)whois.c 5.11 (Berkeley) 3/2/91 - RIPE 1.15 94/09/07 marten@ripe.net";
#endif /* not lint */
#ifndef lint
-__RCSID("$NetBSD: whois.c,v 1.20 2003/07/14 09:21:03 itojun Exp $");
+__RCSID("$NetBSD: whois.c,v 1.21 2003/08/07 11:17:20 agc Exp $");
#endif
#endif /* RIPE */
diff --git a/usr.bin/window/README b/usr.bin/window/README
index 42d45b368a3..a33422a1757 100644
--- a/usr.bin/window/README
+++ b/usr.bin/window/README
@@ -13,11 +13,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/window/alias.h b/usr.bin/window/alias.h
index 5bc04960e78..0be2a3a0ce2 100644
--- a/usr.bin/window/alias.h
+++ b/usr.bin/window/alias.h
@@ -1,4 +1,4 @@
-/* $NetBSD: alias.h,v 1.4 1998/10/14 00:58:46 wsanchez Exp $ */
+/* $NetBSD: alias.h,v 1.5 2003/08/07 11:17:21 agc Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/window/char.c b/usr.bin/window/char.c
index c7a43a345f0..56f94ed6fc0 100644
--- a/usr.bin/window/char.c
+++ b/usr.bin/window/char.c
@@ -1,4 +1,4 @@
-/* $NetBSD: char.c,v 1.4 1997/11/21 08:35:43 lukem Exp $ */
+/* $NetBSD: char.c,v 1.5 2003/08/07 11:17:21 agc Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)char.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: char.c,v 1.4 1997/11/21 08:35:43 lukem Exp $");
+__RCSID("$NetBSD: char.c,v 1.5 2003/08/07 11:17:21 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/window/char.h b/usr.bin/window/char.h
index bdfb438ee82..788a970b81e 100644
--- a/usr.bin/window/char.h
+++ b/usr.bin/window/char.h
@@ -1,4 +1,4 @@
-/* $NetBSD: char.h,v 1.3 1995/09/28 10:34:01 tls Exp $ */
+/* $NetBSD: char.h,v 1.4 2003/08/07 11:17:21 agc Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/window/cmd.c b/usr.bin/window/cmd.c
index 2451a9237b5..deec51dd0c5 100644
--- a/usr.bin/window/cmd.c
+++ b/usr.bin/window/cmd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cmd.c,v 1.7 2002/06/14 01:06:51 wiz Exp $ */
+/* $NetBSD: cmd.c,v 1.8 2003/08/07 11:17:21 agc Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)cmd.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: cmd.c,v 1.7 2002/06/14 01:06:51 wiz Exp $");
+__RCSID("$NetBSD: cmd.c,v 1.8 2003/08/07 11:17:21 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/window/cmd1.c b/usr.bin/window/cmd1.c
index 5d5a69e6faa..d31997e3e28 100644
--- a/usr.bin/window/cmd1.c
+++ b/usr.bin/window/cmd1.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cmd1.c,v 1.6 2002/06/14 01:06:51 wiz Exp $ */
+/* $NetBSD: cmd1.c,v 1.7 2003/08/07 11:17:22 agc Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)cmd1.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: cmd1.c,v 1.6 2002/06/14 01:06:51 wiz Exp $");
+__RCSID("$NetBSD: cmd1.c,v 1.7 2003/08/07 11:17:22 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/window/cmd2.c b/usr.bin/window/cmd2.c
index 9056a55c05b..e564545ef43 100644
--- a/usr.bin/window/cmd2.c
+++ b/usr.bin/window/cmd2.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cmd2.c,v 1.5 2002/06/14 01:06:51 wiz Exp $ */
+/* $NetBSD: cmd2.c,v 1.6 2003/08/07 11:17:22 agc Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)cmd2.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: cmd2.c,v 1.5 2002/06/14 01:06:51 wiz Exp $");
+__RCSID("$NetBSD: cmd2.c,v 1.6 2003/08/07 11:17:22 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/window/cmd3.c b/usr.bin/window/cmd3.c
index 67d6e32da1f..dd2d406732e 100644
--- a/usr.bin/window/cmd3.c
+++ b/usr.bin/window/cmd3.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cmd3.c,v 1.6 2002/06/14 01:06:51 wiz Exp $ */
+/* $NetBSD: cmd3.c,v 1.7 2003/08/07 11:17:22 agc Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)cmd3.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: cmd3.c,v 1.6 2002/06/14 01:06:51 wiz Exp $");
+__RCSID("$NetBSD: cmd3.c,v 1.7 2003/08/07 11:17:22 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/window/cmd4.c b/usr.bin/window/cmd4.c
index ffd1f6bcfaa..270ab4b090d 100644
--- a/usr.bin/window/cmd4.c
+++ b/usr.bin/window/cmd4.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cmd4.c,v 1.5 2002/06/14 01:06:51 wiz Exp $ */
+/* $NetBSD: cmd4.c,v 1.6 2003/08/07 11:17:22 agc Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)cmd4.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: cmd4.c,v 1.5 2002/06/14 01:06:51 wiz Exp $");
+__RCSID("$NetBSD: cmd4.c,v 1.6 2003/08/07 11:17:22 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/window/cmd5.c b/usr.bin/window/cmd5.c
index fdb2007fe19..1a648646277 100644
--- a/usr.bin/window/cmd5.c
+++ b/usr.bin/window/cmd5.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cmd5.c,v 1.6 2002/06/14 01:06:52 wiz Exp $ */
+/* $NetBSD: cmd5.c,v 1.7 2003/08/07 11:17:23 agc Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)cmd5.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: cmd5.c,v 1.6 2002/06/14 01:06:52 wiz Exp $");
+__RCSID("$NetBSD: cmd5.c,v 1.7 2003/08/07 11:17:23 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/window/cmd6.c b/usr.bin/window/cmd6.c
index 15e0ece3a71..a6c6d4de3ca 100644
--- a/usr.bin/window/cmd6.c
+++ b/usr.bin/window/cmd6.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cmd6.c,v 1.6 2002/06/14 01:06:52 wiz Exp $ */
+/* $NetBSD: cmd6.c,v 1.7 2003/08/07 11:17:23 agc Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)cmd6.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: cmd6.c,v 1.6 2002/06/14 01:06:52 wiz Exp $");
+__RCSID("$NetBSD: cmd6.c,v 1.7 2003/08/07 11:17:23 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/window/cmd7.c b/usr.bin/window/cmd7.c
index 984b970020e..79a11ea4655 100644
--- a/usr.bin/window/cmd7.c
+++ b/usr.bin/window/cmd7.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cmd7.c,v 1.6 2002/06/14 01:06:52 wiz Exp $ */
+/* $NetBSD: cmd7.c,v 1.7 2003/08/07 11:17:23 agc Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)cmd7.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: cmd7.c,v 1.6 2002/06/14 01:06:52 wiz Exp $");
+__RCSID("$NetBSD: cmd7.c,v 1.7 2003/08/07 11:17:23 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/window/compress.c b/usr.bin/window/compress.c
index 81387112f9c..f03e57b72c8 100644
--- a/usr.bin/window/compress.c
+++ b/usr.bin/window/compress.c
@@ -1,4 +1,4 @@
-/* $NetBSD: compress.c,v 1.5 2002/06/14 01:06:52 wiz Exp $ */
+/* $NetBSD: compress.c,v 1.6 2003/08/07 11:17:24 agc Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)compress.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: compress.c,v 1.5 2002/06/14 01:06:52 wiz Exp $");
+__RCSID("$NetBSD: compress.c,v 1.6 2003/08/07 11:17:24 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/window/context.c b/usr.bin/window/context.c
index 5edf904c0e6..6de15c0af9d 100644
--- a/usr.bin/window/context.c
+++ b/usr.bin/window/context.c
@@ -1,4 +1,4 @@
-/* $NetBSD: context.c,v 1.6 2002/06/14 01:06:52 wiz Exp $ */
+/* $NetBSD: context.c,v 1.7 2003/08/07 11:17:24 agc Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)context.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: context.c,v 1.6 2002/06/14 01:06:52 wiz Exp $");
+__RCSID("$NetBSD: context.c,v 1.7 2003/08/07 11:17:24 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/window/context.h b/usr.bin/window/context.h
index 7da479359fe..bddde1c2d39 100644
--- a/usr.bin/window/context.h
+++ b/usr.bin/window/context.h
@@ -1,4 +1,4 @@
-/* $NetBSD: context.h,v 1.4 1998/10/14 00:58:47 wsanchez Exp $ */
+/* $NetBSD: context.h,v 1.5 2003/08/07 11:17:25 agc Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/window/defs.h b/usr.bin/window/defs.h
index c00be6edb64..086f8d620cf 100644
--- a/usr.bin/window/defs.h
+++ b/usr.bin/window/defs.h
@@ -1,4 +1,4 @@
-/* $NetBSD: defs.h,v 1.6 2002/06/14 01:06:52 wiz Exp $ */
+/* $NetBSD: defs.h,v 1.7 2003/08/07 11:17:25 agc Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/window/error.c b/usr.bin/window/error.c
index f6dad5c8d37..40d84980f73 100644
--- a/usr.bin/window/error.c
+++ b/usr.bin/window/error.c
@@ -1,4 +1,4 @@
-/* $NetBSD: error.c,v 1.5 2002/06/14 01:06:52 wiz Exp $ */
+/* $NetBSD: error.c,v 1.6 2003/08/07 11:17:25 agc Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)error.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: error.c,v 1.5 2002/06/14 01:06:52 wiz Exp $");
+__RCSID("$NetBSD: error.c,v 1.6 2003/08/07 11:17:25 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/window/lcmd.c b/usr.bin/window/lcmd.c
index fb5f6b30af5..a095925eb87 100644
--- a/usr.bin/window/lcmd.c
+++ b/usr.bin/window/lcmd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: lcmd.c,v 1.6 2002/06/14 01:06:52 wiz Exp $ */
+/* $NetBSD: lcmd.c,v 1.7 2003/08/07 11:17:25 agc Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)lcmd.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: lcmd.c,v 1.6 2002/06/14 01:06:52 wiz Exp $");
+__RCSID("$NetBSD: lcmd.c,v 1.7 2003/08/07 11:17:25 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/window/lcmd.h b/usr.bin/window/lcmd.h
index 6edf0647f05..4c977b101e2 100644
--- a/usr.bin/window/lcmd.h
+++ b/usr.bin/window/lcmd.h
@@ -1,4 +1,4 @@
-/* $NetBSD: lcmd.h,v 1.5 2002/06/14 01:06:53 wiz Exp $ */
+/* $NetBSD: lcmd.h,v 1.6 2003/08/07 11:17:25 agc Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/window/lcmd1.c b/usr.bin/window/lcmd1.c
index d8e943c4054..e38145c933a 100644
--- a/usr.bin/window/lcmd1.c
+++ b/usr.bin/window/lcmd1.c
@@ -1,4 +1,4 @@
-/* $NetBSD: lcmd1.c,v 1.9 2002/06/14 01:06:53 wiz Exp $ */
+/* $NetBSD: lcmd1.c,v 1.10 2003/08/07 11:17:26 agc Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)lcmd1.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: lcmd1.c,v 1.9 2002/06/14 01:06:53 wiz Exp $");
+__RCSID("$NetBSD: lcmd1.c,v 1.10 2003/08/07 11:17:26 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/window/lcmd2.c b/usr.bin/window/lcmd2.c
index dcc16518bf5..66eb8ba85a6 100644
--- a/usr.bin/window/lcmd2.c
+++ b/usr.bin/window/lcmd2.c
@@ -1,4 +1,4 @@
-/* $NetBSD: lcmd2.c,v 1.12 2002/06/14 01:06:53 wiz Exp $ */
+/* $NetBSD: lcmd2.c,v 1.13 2003/08/07 11:17:26 agc Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)lcmd2.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: lcmd2.c,v 1.12 2002/06/14 01:06:53 wiz Exp $");
+__RCSID("$NetBSD: lcmd2.c,v 1.13 2003/08/07 11:17:26 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/window/local.h b/usr.bin/window/local.h
index 435b5facc1c..ce9f67da45d 100644
--- a/usr.bin/window/local.h
+++ b/usr.bin/window/local.h
@@ -1,4 +1,4 @@
-/* $NetBSD: local.h,v 1.3 1995/09/28 10:34:26 tls Exp $ */
+/* $NetBSD: local.h,v 1.4 2003/08/07 11:17:26 agc Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/window/main.c b/usr.bin/window/main.c
index d9f97903ded..1827fad500f 100644
--- a/usr.bin/window/main.c
+++ b/usr.bin/window/main.c
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.11 2002/06/14 01:06:53 wiz Exp $ */
+/* $NetBSD: main.c,v 1.12 2003/08/07 11:17:27 agc Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -46,7 +42,7 @@ __COPYRIGHT("@(#) Copyright (c) 1983, 1993\n\
#if 0
static char sccsid[] = "@(#)main.c 8.2 (Berkeley) 4/2/94";
#else
-__RCSID("$NetBSD: main.c,v 1.11 2002/06/14 01:06:53 wiz Exp $");
+__RCSID("$NetBSD: main.c,v 1.12 2003/08/07 11:17:27 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/window/mloop.c b/usr.bin/window/mloop.c
index 068788e31d2..89852155b18 100644
--- a/usr.bin/window/mloop.c
+++ b/usr.bin/window/mloop.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mloop.c,v 1.7 2002/06/14 01:06:53 wiz Exp $ */
+/* $NetBSD: mloop.c,v 1.8 2003/08/07 11:17:27 agc Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)mloop.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: mloop.c,v 1.7 2002/06/14 01:06:53 wiz Exp $");
+__RCSID("$NetBSD: mloop.c,v 1.8 2003/08/07 11:17:27 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/window/parser.h b/usr.bin/window/parser.h
index ea89774d782..91f06849ebc 100644
--- a/usr.bin/window/parser.h
+++ b/usr.bin/window/parser.h
@@ -1,4 +1,4 @@
-/* $NetBSD: parser.h,v 1.6 2002/06/14 01:06:53 wiz Exp $ */
+/* $NetBSD: parser.h,v 1.7 2003/08/07 11:17:27 agc Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/window/parser1.c b/usr.bin/window/parser1.c
index 7267f442d48..6586bc3439c 100644
--- a/usr.bin/window/parser1.c
+++ b/usr.bin/window/parser1.c
@@ -1,4 +1,4 @@
-/* $NetBSD: parser1.c,v 1.5 2002/06/14 01:06:53 wiz Exp $ */
+/* $NetBSD: parser1.c,v 1.6 2003/08/07 11:17:28 agc Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)parser1.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: parser1.c,v 1.5 2002/06/14 01:06:53 wiz Exp $");
+__RCSID("$NetBSD: parser1.c,v 1.6 2003/08/07 11:17:28 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/window/parser2.c b/usr.bin/window/parser2.c
index e5dfdb3df03..eae30bfe0d0 100644
--- a/usr.bin/window/parser2.c
+++ b/usr.bin/window/parser2.c
@@ -1,4 +1,4 @@
-/* $NetBSD: parser2.c,v 1.7 2002/06/14 01:06:53 wiz Exp $ */
+/* $NetBSD: parser2.c,v 1.8 2003/08/07 11:17:28 agc Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)parser2.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: parser2.c,v 1.7 2002/06/14 01:06:53 wiz Exp $");
+__RCSID("$NetBSD: parser2.c,v 1.8 2003/08/07 11:17:28 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/window/parser3.c b/usr.bin/window/parser3.c
index 8821399e462..a1bc0dfdc08 100644
--- a/usr.bin/window/parser3.c
+++ b/usr.bin/window/parser3.c
@@ -1,4 +1,4 @@
-/* $NetBSD: parser3.c,v 1.5 2002/06/14 01:06:54 wiz Exp $ */
+/* $NetBSD: parser3.c,v 1.6 2003/08/07 11:17:28 agc Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)parser3.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: parser3.c,v 1.5 2002/06/14 01:06:54 wiz Exp $");
+__RCSID("$NetBSD: parser3.c,v 1.6 2003/08/07 11:17:28 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/window/parser4.c b/usr.bin/window/parser4.c
index 06f22e15a21..1f1a05e15ba 100644
--- a/usr.bin/window/parser4.c
+++ b/usr.bin/window/parser4.c
@@ -1,4 +1,4 @@
-/* $NetBSD: parser4.c,v 1.7 2002/06/14 01:06:54 wiz Exp $ */
+/* $NetBSD: parser4.c,v 1.8 2003/08/07 11:17:28 agc Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)parser4.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: parser4.c,v 1.7 2002/06/14 01:06:54 wiz Exp $");
+__RCSID("$NetBSD: parser4.c,v 1.8 2003/08/07 11:17:28 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/window/parser5.c b/usr.bin/window/parser5.c
index bfc7c017e86..9a09c6d4017 100644
--- a/usr.bin/window/parser5.c
+++ b/usr.bin/window/parser5.c
@@ -1,4 +1,4 @@
-/* $NetBSD: parser5.c,v 1.5 2002/06/14 01:06:54 wiz Exp $ */
+/* $NetBSD: parser5.c,v 1.6 2003/08/07 11:17:29 agc Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)parser5.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: parser5.c,v 1.5 2002/06/14 01:06:54 wiz Exp $");
+__RCSID("$NetBSD: parser5.c,v 1.6 2003/08/07 11:17:29 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/window/scanner.c b/usr.bin/window/scanner.c
index 76fef0e83da..7cbfe4a5336 100644
--- a/usr.bin/window/scanner.c
+++ b/usr.bin/window/scanner.c
@@ -1,4 +1,4 @@
-/* $NetBSD: scanner.c,v 1.8 2002/06/14 01:06:54 wiz Exp $ */
+/* $NetBSD: scanner.c,v 1.9 2003/08/07 11:17:29 agc Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)scanner.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: scanner.c,v 1.8 2002/06/14 01:06:54 wiz Exp $");
+__RCSID("$NetBSD: scanner.c,v 1.9 2003/08/07 11:17:29 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/window/startup.c b/usr.bin/window/startup.c
index 117041d4613..04bd550a040 100644
--- a/usr.bin/window/startup.c
+++ b/usr.bin/window/startup.c
@@ -1,4 +1,4 @@
-/* $NetBSD: startup.c,v 1.6 2002/06/14 01:06:54 wiz Exp $ */
+/* $NetBSD: startup.c,v 1.7 2003/08/07 11:17:29 agc Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)startup.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: startup.c,v 1.6 2002/06/14 01:06:54 wiz Exp $");
+__RCSID("$NetBSD: startup.c,v 1.7 2003/08/07 11:17:29 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/window/string.c b/usr.bin/window/string.c
index 4f82e0cae4e..577bccf9a74 100644
--- a/usr.bin/window/string.c
+++ b/usr.bin/window/string.c
@@ -1,4 +1,4 @@
-/* $NetBSD: string.c,v 1.8 2002/06/14 01:06:54 wiz Exp $ */
+/* $NetBSD: string.c,v 1.9 2003/08/07 11:17:29 agc Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)string.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: string.c,v 1.8 2002/06/14 01:06:54 wiz Exp $");
+__RCSID("$NetBSD: string.c,v 1.9 2003/08/07 11:17:29 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/window/token.h b/usr.bin/window/token.h
index aa002230520..939f6e6a92e 100644
--- a/usr.bin/window/token.h
+++ b/usr.bin/window/token.h
@@ -1,4 +1,4 @@
-/* $NetBSD: token.h,v 1.3 1995/09/28 10:34:41 tls Exp $ */
+/* $NetBSD: token.h,v 1.4 2003/08/07 11:17:30 agc Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/window/tt.h b/usr.bin/window/tt.h
index e0d688724f3..768b22e55a3 100644
--- a/usr.bin/window/tt.h
+++ b/usr.bin/window/tt.h
@@ -1,4 +1,4 @@
-/* $NetBSD: tt.h,v 1.7 2002/06/14 01:06:54 wiz Exp $ */
+/* $NetBSD: tt.h,v 1.8 2003/08/07 11:17:30 agc Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/window/ttf100.c b/usr.bin/window/ttf100.c
index d4fdc52b67e..c8941ab7333 100644
--- a/usr.bin/window/ttf100.c
+++ b/usr.bin/window/ttf100.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ttf100.c,v 1.5 2002/06/14 01:06:54 wiz Exp $ */
+/* $NetBSD: ttf100.c,v 1.6 2003/08/07 11:17:30 agc Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)ttf100.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: ttf100.c,v 1.5 2002/06/14 01:06:54 wiz Exp $");
+__RCSID("$NetBSD: ttf100.c,v 1.6 2003/08/07 11:17:30 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/window/ttgeneric.c b/usr.bin/window/ttgeneric.c
index 58df2534a7c..518a233ee97 100644
--- a/usr.bin/window/ttgeneric.c
+++ b/usr.bin/window/ttgeneric.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ttgeneric.c,v 1.8 2003/02/28 05:48:25 matt Exp $ */
+/* $NetBSD: ttgeneric.c,v 1.9 2003/08/07 11:17:30 agc Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)ttgeneric.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: ttgeneric.c,v 1.8 2003/02/28 05:48:25 matt Exp $");
+__RCSID("$NetBSD: ttgeneric.c,v 1.9 2003/08/07 11:17:30 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/window/tth19.c b/usr.bin/window/tth19.c
index 0ff9415a162..c56083bce9f 100644
--- a/usr.bin/window/tth19.c
+++ b/usr.bin/window/tth19.c
@@ -1,4 +1,4 @@
-/* $NetBSD: tth19.c,v 1.5 2002/06/14 01:06:55 wiz Exp $ */
+/* $NetBSD: tth19.c,v 1.6 2003/08/07 11:17:31 agc Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)tth19.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: tth19.c,v 1.5 2002/06/14 01:06:55 wiz Exp $");
+__RCSID("$NetBSD: tth19.c,v 1.6 2003/08/07 11:17:31 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/window/tth29.c b/usr.bin/window/tth29.c
index 9a0b55a38ed..b230407c4aa 100644
--- a/usr.bin/window/tth29.c
+++ b/usr.bin/window/tth29.c
@@ -1,4 +1,4 @@
-/* $NetBSD: tth29.c,v 1.5 2002/06/14 01:06:55 wiz Exp $ */
+/* $NetBSD: tth29.c,v 1.6 2003/08/07 11:17:31 agc Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)tth29.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: tth29.c,v 1.5 2002/06/14 01:06:55 wiz Exp $");
+__RCSID("$NetBSD: tth29.c,v 1.6 2003/08/07 11:17:31 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/window/ttinit.c b/usr.bin/window/ttinit.c
index 940564c857e..b5ae6444273 100644
--- a/usr.bin/window/ttinit.c
+++ b/usr.bin/window/ttinit.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ttinit.c,v 1.6 2002/06/14 01:06:55 wiz Exp $ */
+/* $NetBSD: ttinit.c,v 1.7 2003/08/07 11:17:31 agc Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)ttinit.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: ttinit.c,v 1.6 2002/06/14 01:06:55 wiz Exp $");
+__RCSID("$NetBSD: ttinit.c,v 1.7 2003/08/07 11:17:31 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/window/ttoutput.c b/usr.bin/window/ttoutput.c
index e3f023203b2..1300368508f 100644
--- a/usr.bin/window/ttoutput.c
+++ b/usr.bin/window/ttoutput.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ttoutput.c,v 1.5 2002/06/14 01:06:55 wiz Exp $ */
+/* $NetBSD: ttoutput.c,v 1.6 2003/08/07 11:17:31 agc Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)ttoutput.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: ttoutput.c,v 1.5 2002/06/14 01:06:55 wiz Exp $");
+__RCSID("$NetBSD: ttoutput.c,v 1.6 2003/08/07 11:17:31 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/window/tttermcap.c b/usr.bin/window/tttermcap.c
index 3997d62c5c6..2dfa3784b28 100644
--- a/usr.bin/window/tttermcap.c
+++ b/usr.bin/window/tttermcap.c
@@ -1,4 +1,4 @@
-/* $NetBSD: tttermcap.c,v 1.7 2002/06/14 01:06:55 wiz Exp $ */
+/* $NetBSD: tttermcap.c,v 1.8 2003/08/07 11:17:32 agc Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)tttermcap.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: tttermcap.c,v 1.7 2002/06/14 01:06:55 wiz Exp $");
+__RCSID("$NetBSD: tttermcap.c,v 1.8 2003/08/07 11:17:32 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/window/tttvi925.c b/usr.bin/window/tttvi925.c
index 940a0e702cd..602f7be9f94 100644
--- a/usr.bin/window/tttvi925.c
+++ b/usr.bin/window/tttvi925.c
@@ -1,4 +1,4 @@
-/* $NetBSD: tttvi925.c,v 1.5 2002/06/14 01:06:55 wiz Exp $ */
+/* $NetBSD: tttvi925.c,v 1.6 2003/08/07 11:17:32 agc Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)tttvi925.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: tttvi925.c,v 1.5 2002/06/14 01:06:55 wiz Exp $");
+__RCSID("$NetBSD: tttvi925.c,v 1.6 2003/08/07 11:17:32 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/window/ttwyse60.c b/usr.bin/window/ttwyse60.c
index fd124aaf288..b818a6bceef 100644
--- a/usr.bin/window/ttwyse60.c
+++ b/usr.bin/window/ttwyse60.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ttwyse60.c,v 1.5 2002/06/14 01:06:56 wiz Exp $ */
+/* $NetBSD: ttwyse60.c,v 1.6 2003/08/07 11:17:32 agc Exp $ */
/*
* Copyright 1987 by David C. Elliott, MIPS Computer Systems.
@@ -22,11 +22,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -48,7 +44,7 @@
#if 0
static char sccsid[] = "@(#)ttwyse60.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: ttwyse60.c,v 1.5 2002/06/14 01:06:56 wiz Exp $");
+__RCSID("$NetBSD: ttwyse60.c,v 1.6 2003/08/07 11:17:32 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/window/ttwyse75.c b/usr.bin/window/ttwyse75.c
index a76e4aa24b9..d8037b6e7b9 100644
--- a/usr.bin/window/ttwyse75.c
+++ b/usr.bin/window/ttwyse75.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ttwyse75.c,v 1.5 2002/06/14 01:06:56 wiz Exp $ */
+/* $NetBSD: ttwyse75.c,v 1.6 2003/08/07 11:17:32 agc Exp $ */
/*
* Copyright 1987 by David C. Elliott, MIPS Computer Systems.
@@ -22,11 +22,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -48,7 +44,7 @@
#if 0
static char sccsid[] = "@(#)ttwyse75.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: ttwyse75.c,v 1.5 2002/06/14 01:06:56 wiz Exp $");
+__RCSID("$NetBSD: ttwyse75.c,v 1.6 2003/08/07 11:17:32 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/window/ttzapple.c b/usr.bin/window/ttzapple.c
index a3964319eb6..151538f557d 100644
--- a/usr.bin/window/ttzapple.c
+++ b/usr.bin/window/ttzapple.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ttzapple.c,v 1.6 2002/06/14 01:06:56 wiz Exp $ */
+/* $NetBSD: ttzapple.c,v 1.7 2003/08/07 11:17:33 agc Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)ttzapple.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: ttzapple.c,v 1.6 2002/06/14 01:06:56 wiz Exp $");
+__RCSID("$NetBSD: ttzapple.c,v 1.7 2003/08/07 11:17:33 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/window/ttzentec.c b/usr.bin/window/ttzentec.c
index 1b3542bd3f5..33d666d88b3 100644
--- a/usr.bin/window/ttzentec.c
+++ b/usr.bin/window/ttzentec.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ttzentec.c,v 1.5 2002/06/14 01:06:56 wiz Exp $ */
+/* $NetBSD: ttzentec.c,v 1.6 2003/08/07 11:17:33 agc Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)ttzentec.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: ttzentec.c,v 1.5 2002/06/14 01:06:56 wiz Exp $");
+__RCSID("$NetBSD: ttzentec.c,v 1.6 2003/08/07 11:17:33 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/window/value.h b/usr.bin/window/value.h
index d6b051f84b7..b65c311df81 100644
--- a/usr.bin/window/value.h
+++ b/usr.bin/window/value.h
@@ -1,4 +1,4 @@
-/* $NetBSD: value.h,v 1.3 1995/09/28 10:35:00 tls Exp $ */
+/* $NetBSD: value.h,v 1.4 2003/08/07 11:17:33 agc Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/window/var.c b/usr.bin/window/var.c
index 79747736234..6149f14ee6d 100644
--- a/usr.bin/window/var.c
+++ b/usr.bin/window/var.c
@@ -1,4 +1,4 @@
-/* $NetBSD: var.c,v 1.8 2002/06/14 01:06:56 wiz Exp $ */
+/* $NetBSD: var.c,v 1.9 2003/08/07 11:17:33 agc Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)var.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: var.c,v 1.8 2002/06/14 01:06:56 wiz Exp $");
+__RCSID("$NetBSD: var.c,v 1.9 2003/08/07 11:17:33 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/window/var.h b/usr.bin/window/var.h
index 03ee5e29952..4cff36dc519 100644
--- a/usr.bin/window/var.h
+++ b/usr.bin/window/var.h
@@ -1,4 +1,4 @@
-/* $NetBSD: var.h,v 1.6 2002/06/14 01:06:56 wiz Exp $ */
+/* $NetBSD: var.h,v 1.7 2003/08/07 11:17:34 agc Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/window/win.c b/usr.bin/window/win.c
index bca1add820c..5ef46fa70c0 100644
--- a/usr.bin/window/win.c
+++ b/usr.bin/window/win.c
@@ -1,4 +1,4 @@
-/* $NetBSD: win.c,v 1.12 2002/06/14 01:06:56 wiz Exp $ */
+/* $NetBSD: win.c,v 1.13 2003/08/07 11:17:34 agc Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)win.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: win.c,v 1.12 2002/06/14 01:06:56 wiz Exp $");
+__RCSID("$NetBSD: win.c,v 1.13 2003/08/07 11:17:34 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/window/window.1 b/usr.bin/window/window.1
index 3f9583d5232..684c1051ee9 100644
--- a/usr.bin/window/window.1
+++ b/usr.bin/window/window.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: window.1,v 1.14 2003/06/30 19:17:01 wiz Exp $
+.\" $NetBSD: window.1,v 1.15 2003/08/07 11:17:34 agc Exp $
.\"
.\" Copyright (c) 1985, 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -14,11 +14,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/window/window_string.h b/usr.bin/window/window_string.h
index 5293f19cfc3..4e4fa5e3042 100644
--- a/usr.bin/window/window_string.h
+++ b/usr.bin/window/window_string.h
@@ -1,4 +1,4 @@
-/* $NetBSD: window_string.h,v 1.6 2002/06/14 01:06:56 wiz Exp $ */
+/* $NetBSD: window_string.h,v 1.7 2003/08/07 11:17:35 agc Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/window/ww.h b/usr.bin/window/ww.h
index 5cb1cf48ebb..ea6e9208a54 100644
--- a/usr.bin/window/ww.h
+++ b/usr.bin/window/ww.h
@@ -1,4 +1,4 @@
-/* $NetBSD: ww.h,v 1.16 2002/06/14 01:06:57 wiz Exp $ */
+/* $NetBSD: ww.h,v 1.17 2003/08/07 11:17:35 agc Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/window/wwadd.c b/usr.bin/window/wwadd.c
index f7916f5b670..d505e7afd9e 100644
--- a/usr.bin/window/wwadd.c
+++ b/usr.bin/window/wwadd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wwadd.c,v 1.6 2002/06/14 01:06:57 wiz Exp $ */
+/* $NetBSD: wwadd.c,v 1.7 2003/08/07 11:17:35 agc Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)wwadd.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: wwadd.c,v 1.6 2002/06/14 01:06:57 wiz Exp $");
+__RCSID("$NetBSD: wwadd.c,v 1.7 2003/08/07 11:17:35 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/window/wwalloc.c b/usr.bin/window/wwalloc.c
index 68c23238d05..09637b92460 100644
--- a/usr.bin/window/wwalloc.c
+++ b/usr.bin/window/wwalloc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wwalloc.c,v 1.5 2002/06/14 01:06:57 wiz Exp $ */
+/* $NetBSD: wwalloc.c,v 1.6 2003/08/07 11:17:36 agc Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)wwalloc.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: wwalloc.c,v 1.5 2002/06/14 01:06:57 wiz Exp $");
+__RCSID("$NetBSD: wwalloc.c,v 1.6 2003/08/07 11:17:36 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/window/wwbox.c b/usr.bin/window/wwbox.c
index e1802c65a2d..40e7a79282e 100644
--- a/usr.bin/window/wwbox.c
+++ b/usr.bin/window/wwbox.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wwbox.c,v 1.5 2002/06/14 01:06:57 wiz Exp $ */
+/* $NetBSD: wwbox.c,v 1.6 2003/08/07 11:17:36 agc Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)wwbox.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: wwbox.c,v 1.5 2002/06/14 01:06:57 wiz Exp $");
+__RCSID("$NetBSD: wwbox.c,v 1.6 2003/08/07 11:17:36 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/window/wwchild.c b/usr.bin/window/wwchild.c
index dfb627aa516..59909b418bb 100644
--- a/usr.bin/window/wwchild.c
+++ b/usr.bin/window/wwchild.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wwchild.c,v 1.6 2002/06/14 01:06:57 wiz Exp $ */
+/* $NetBSD: wwchild.c,v 1.7 2003/08/07 11:17:36 agc Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)wwchild.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: wwchild.c,v 1.6 2002/06/14 01:06:57 wiz Exp $");
+__RCSID("$NetBSD: wwchild.c,v 1.7 2003/08/07 11:17:36 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/window/wwclose.c b/usr.bin/window/wwclose.c
index bb25ef75d4d..ac5f25da8e2 100644
--- a/usr.bin/window/wwclose.c
+++ b/usr.bin/window/wwclose.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wwclose.c,v 1.5 2002/06/14 01:06:57 wiz Exp $ */
+/* $NetBSD: wwclose.c,v 1.6 2003/08/07 11:17:36 agc Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)wwclose.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: wwclose.c,v 1.5 2002/06/14 01:06:57 wiz Exp $");
+__RCSID("$NetBSD: wwclose.c,v 1.6 2003/08/07 11:17:36 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/window/wwclreol.c b/usr.bin/window/wwclreol.c
index 0a81963ed3d..de6bdc33b62 100644
--- a/usr.bin/window/wwclreol.c
+++ b/usr.bin/window/wwclreol.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wwclreol.c,v 1.6 2002/06/14 01:06:57 wiz Exp $ */
+/* $NetBSD: wwclreol.c,v 1.7 2003/08/07 11:17:37 agc Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)wwclreol.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: wwclreol.c,v 1.6 2002/06/14 01:06:57 wiz Exp $");
+__RCSID("$NetBSD: wwclreol.c,v 1.7 2003/08/07 11:17:37 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/window/wwclreos.c b/usr.bin/window/wwclreos.c
index 470ecbe6fa4..c8cb430767a 100644
--- a/usr.bin/window/wwclreos.c
+++ b/usr.bin/window/wwclreos.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wwclreos.c,v 1.6 2002/06/14 01:06:57 wiz Exp $ */
+/* $NetBSD: wwclreos.c,v 1.7 2003/08/07 11:17:37 agc Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)wwclreos.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: wwclreos.c,v 1.6 2002/06/14 01:06:57 wiz Exp $");
+__RCSID("$NetBSD: wwclreos.c,v 1.7 2003/08/07 11:17:37 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/window/wwcursor.c b/usr.bin/window/wwcursor.c
index 0ae9d93292a..d68b1d06cd1 100644
--- a/usr.bin/window/wwcursor.c
+++ b/usr.bin/window/wwcursor.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wwcursor.c,v 1.6 2002/06/14 01:06:58 wiz Exp $ */
+/* $NetBSD: wwcursor.c,v 1.7 2003/08/07 11:17:37 agc Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)wwcursor.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: wwcursor.c,v 1.6 2002/06/14 01:06:58 wiz Exp $");
+__RCSID("$NetBSD: wwcursor.c,v 1.7 2003/08/07 11:17:37 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/window/wwdata.c b/usr.bin/window/wwdata.c
index 49b886a27c0..7a3054473f4 100644
--- a/usr.bin/window/wwdata.c
+++ b/usr.bin/window/wwdata.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wwdata.c,v 1.4 1997/11/21 08:37:08 lukem Exp $ */
+/* $NetBSD: wwdata.c,v 1.5 2003/08/07 11:17:37 agc Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,6 +37,6 @@
#if 0
static char sccsid[] = "@(#)wwdata.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: wwdata.c,v 1.4 1997/11/21 08:37:08 lukem Exp $");
+__RCSID("$NetBSD: wwdata.c,v 1.5 2003/08/07 11:17:37 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/window/wwdelchar.c b/usr.bin/window/wwdelchar.c
index 8aedc254235..ed70f9d0649 100644
--- a/usr.bin/window/wwdelchar.c
+++ b/usr.bin/window/wwdelchar.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wwdelchar.c,v 1.6 2002/06/14 01:06:58 wiz Exp $ */
+/* $NetBSD: wwdelchar.c,v 1.7 2003/08/07 11:17:38 agc Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)wwdelchar.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: wwdelchar.c,v 1.6 2002/06/14 01:06:58 wiz Exp $");
+__RCSID("$NetBSD: wwdelchar.c,v 1.7 2003/08/07 11:17:38 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/window/wwdelete.c b/usr.bin/window/wwdelete.c
index 9f1749a6f55..9bdfc5b38bf 100644
--- a/usr.bin/window/wwdelete.c
+++ b/usr.bin/window/wwdelete.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wwdelete.c,v 1.6 2002/06/14 01:06:58 wiz Exp $ */
+/* $NetBSD: wwdelete.c,v 1.7 2003/08/07 11:17:38 agc Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)wwdelete.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: wwdelete.c,v 1.6 2002/06/14 01:06:58 wiz Exp $");
+__RCSID("$NetBSD: wwdelete.c,v 1.7 2003/08/07 11:17:38 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/window/wwdelline.c b/usr.bin/window/wwdelline.c
index 8175d4e8280..604b0006108 100644
--- a/usr.bin/window/wwdelline.c
+++ b/usr.bin/window/wwdelline.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wwdelline.c,v 1.5 2002/06/14 01:06:58 wiz Exp $ */
+/* $NetBSD: wwdelline.c,v 1.6 2003/08/07 11:17:38 agc Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)wwdelline.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: wwdelline.c,v 1.5 2002/06/14 01:06:58 wiz Exp $");
+__RCSID("$NetBSD: wwdelline.c,v 1.6 2003/08/07 11:17:38 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/window/wwdump.c b/usr.bin/window/wwdump.c
index ee240c4f716..c83d5d69cc5 100644
--- a/usr.bin/window/wwdump.c
+++ b/usr.bin/window/wwdump.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wwdump.c,v 1.7 2002/06/14 01:06:58 wiz Exp $ */
+/* $NetBSD: wwdump.c,v 1.8 2003/08/07 11:17:38 agc Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)wwdump.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: wwdump.c,v 1.7 2002/06/14 01:06:58 wiz Exp $");
+__RCSID("$NetBSD: wwdump.c,v 1.8 2003/08/07 11:17:38 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/window/wwend.c b/usr.bin/window/wwend.c
index cad7ac0cecf..1c95ea1704c 100644
--- a/usr.bin/window/wwend.c
+++ b/usr.bin/window/wwend.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wwend.c,v 1.6 2002/06/14 01:06:58 wiz Exp $ */
+/* $NetBSD: wwend.c,v 1.7 2003/08/07 11:17:38 agc Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)wwend.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: wwend.c,v 1.6 2002/06/14 01:06:58 wiz Exp $");
+__RCSID("$NetBSD: wwend.c,v 1.7 2003/08/07 11:17:38 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/window/wwenviron.c b/usr.bin/window/wwenviron.c
index 5b09dff801b..18dceae0d6a 100644
--- a/usr.bin/window/wwenviron.c
+++ b/usr.bin/window/wwenviron.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wwenviron.c,v 1.8 2003/01/16 09:46:46 kleink Exp $ */
+/* $NetBSD: wwenviron.c,v 1.9 2003/08/07 11:17:39 agc Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)wwenviron.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: wwenviron.c,v 1.8 2003/01/16 09:46:46 kleink Exp $");
+__RCSID("$NetBSD: wwenviron.c,v 1.9 2003/08/07 11:17:39 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/window/wwerror.c b/usr.bin/window/wwerror.c
index 7cf6e77fdbb..fd505b74b67 100644
--- a/usr.bin/window/wwerror.c
+++ b/usr.bin/window/wwerror.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wwerror.c,v 1.6 2002/06/14 01:06:58 wiz Exp $ */
+/* $NetBSD: wwerror.c,v 1.7 2003/08/07 11:17:39 agc Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)wwerror.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: wwerror.c,v 1.6 2002/06/14 01:06:58 wiz Exp $");
+__RCSID("$NetBSD: wwerror.c,v 1.7 2003/08/07 11:17:39 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/window/wwflush.c b/usr.bin/window/wwflush.c
index 6226df77d30..3c1a41eff72 100644
--- a/usr.bin/window/wwflush.c
+++ b/usr.bin/window/wwflush.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wwflush.c,v 1.8 2003/01/16 09:46:47 kleink Exp $ */
+/* $NetBSD: wwflush.c,v 1.9 2003/08/07 11:17:39 agc Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)wwflush.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: wwflush.c,v 1.8 2003/01/16 09:46:47 kleink Exp $");
+__RCSID("$NetBSD: wwflush.c,v 1.9 2003/08/07 11:17:39 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/window/wwframe.c b/usr.bin/window/wwframe.c
index d85ec82e2b7..a67c71b47fc 100644
--- a/usr.bin/window/wwframe.c
+++ b/usr.bin/window/wwframe.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wwframe.c,v 1.6 2002/06/14 01:06:59 wiz Exp $ */
+/* $NetBSD: wwframe.c,v 1.7 2003/08/07 11:17:39 agc Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)wwframe.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: wwframe.c,v 1.6 2002/06/14 01:06:59 wiz Exp $");
+__RCSID("$NetBSD: wwframe.c,v 1.7 2003/08/07 11:17:39 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/window/wwgets.c b/usr.bin/window/wwgets.c
index 3fe962aa9df..f60e40212dd 100644
--- a/usr.bin/window/wwgets.c
+++ b/usr.bin/window/wwgets.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wwgets.c,v 1.8 2002/06/14 01:06:59 wiz Exp $ */
+/* $NetBSD: wwgets.c,v 1.9 2003/08/07 11:17:40 agc Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)wwgets.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: wwgets.c,v 1.8 2002/06/14 01:06:59 wiz Exp $");
+__RCSID("$NetBSD: wwgets.c,v 1.9 2003/08/07 11:17:40 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/window/wwinit.c b/usr.bin/window/wwinit.c
index 25509717781..79acec143b3 100644
--- a/usr.bin/window/wwinit.c
+++ b/usr.bin/window/wwinit.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wwinit.c,v 1.16 2003/01/16 09:46:48 kleink Exp $ */
+/* $NetBSD: wwinit.c,v 1.17 2003/08/07 11:17:40 agc Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)wwinit.c 8.2 (Berkeley) 4/28/95";
#else
-__RCSID("$NetBSD: wwinit.c,v 1.16 2003/01/16 09:46:48 kleink Exp $");
+__RCSID("$NetBSD: wwinit.c,v 1.17 2003/08/07 11:17:40 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/window/wwinschar.c b/usr.bin/window/wwinschar.c
index 68e093cd77e..aea243843da 100644
--- a/usr.bin/window/wwinschar.c
+++ b/usr.bin/window/wwinschar.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wwinschar.c,v 1.6 2002/06/14 01:06:59 wiz Exp $ */
+/* $NetBSD: wwinschar.c,v 1.7 2003/08/07 11:17:40 agc Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)wwinschar.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: wwinschar.c,v 1.6 2002/06/14 01:06:59 wiz Exp $");
+__RCSID("$NetBSD: wwinschar.c,v 1.7 2003/08/07 11:17:40 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/window/wwinsline.c b/usr.bin/window/wwinsline.c
index 9ca10b1b0de..17c97af8a04 100644
--- a/usr.bin/window/wwinsline.c
+++ b/usr.bin/window/wwinsline.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wwinsline.c,v 1.5 2002/06/14 01:06:59 wiz Exp $ */
+/* $NetBSD: wwinsline.c,v 1.6 2003/08/07 11:17:40 agc Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)wwinsline.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: wwinsline.c,v 1.5 2002/06/14 01:06:59 wiz Exp $");
+__RCSID("$NetBSD: wwinsline.c,v 1.6 2003/08/07 11:17:40 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/window/wwiomux.c b/usr.bin/window/wwiomux.c
index 934886af7eb..d9dc5d88e60 100644
--- a/usr.bin/window/wwiomux.c
+++ b/usr.bin/window/wwiomux.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wwiomux.c,v 1.8 2003/04/09 16:25:10 aymeric Exp $ */
+/* $NetBSD: wwiomux.c,v 1.9 2003/08/07 11:17:41 agc Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)wwiomux.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: wwiomux.c,v 1.8 2003/04/09 16:25:10 aymeric Exp $");
+__RCSID("$NetBSD: wwiomux.c,v 1.9 2003/08/07 11:17:41 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/window/wwlabel.c b/usr.bin/window/wwlabel.c
index 5a83de95364..83dc187c656 100644
--- a/usr.bin/window/wwlabel.c
+++ b/usr.bin/window/wwlabel.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wwlabel.c,v 1.6 2002/06/14 01:06:59 wiz Exp $ */
+/* $NetBSD: wwlabel.c,v 1.7 2003/08/07 11:17:41 agc Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)wwlabel.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: wwlabel.c,v 1.6 2002/06/14 01:06:59 wiz Exp $");
+__RCSID("$NetBSD: wwlabel.c,v 1.7 2003/08/07 11:17:41 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/window/wwmisc.c b/usr.bin/window/wwmisc.c
index 38f48117ab1..c48e04b10f1 100644
--- a/usr.bin/window/wwmisc.c
+++ b/usr.bin/window/wwmisc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wwmisc.c,v 1.6 2002/06/14 01:07:00 wiz Exp $ */
+/* $NetBSD: wwmisc.c,v 1.7 2003/08/07 11:17:41 agc Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)wwmisc.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: wwmisc.c,v 1.6 2002/06/14 01:07:00 wiz Exp $");
+__RCSID("$NetBSD: wwmisc.c,v 1.7 2003/08/07 11:17:41 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/window/wwmove.c b/usr.bin/window/wwmove.c
index 5be52f8b903..e6d17ed874f 100644
--- a/usr.bin/window/wwmove.c
+++ b/usr.bin/window/wwmove.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wwmove.c,v 1.6 2002/06/14 01:07:00 wiz Exp $ */
+/* $NetBSD: wwmove.c,v 1.7 2003/08/07 11:17:42 agc Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)wwmove.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: wwmove.c,v 1.6 2002/06/14 01:07:00 wiz Exp $");
+__RCSID("$NetBSD: wwmove.c,v 1.7 2003/08/07 11:17:42 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/window/wwopen.c b/usr.bin/window/wwopen.c
index 5408289d689..9825f9b533c 100644
--- a/usr.bin/window/wwopen.c
+++ b/usr.bin/window/wwopen.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wwopen.c,v 1.11 2002/08/12 02:44:18 itojun Exp $ */
+/* $NetBSD: wwopen.c,v 1.12 2003/08/07 11:17:42 agc Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)wwopen.c 8.2 (Berkeley) 4/28/95";
#else
-__RCSID("$NetBSD: wwopen.c,v 1.11 2002/08/12 02:44:18 itojun Exp $");
+__RCSID("$NetBSD: wwopen.c,v 1.12 2003/08/07 11:17:42 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/window/wwprintf.c b/usr.bin/window/wwprintf.c
index 6dc9b1c5a9a..27baeae821e 100644
--- a/usr.bin/window/wwprintf.c
+++ b/usr.bin/window/wwprintf.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wwprintf.c,v 1.5 2002/06/14 01:07:00 wiz Exp $ */
+/* $NetBSD: wwprintf.c,v 1.6 2003/08/07 11:17:42 agc Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)wwprintf.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: wwprintf.c,v 1.5 2002/06/14 01:07:00 wiz Exp $");
+__RCSID("$NetBSD: wwprintf.c,v 1.6 2003/08/07 11:17:42 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/window/wwpty.c b/usr.bin/window/wwpty.c
index e626762047d..7c44eaef61e 100644
--- a/usr.bin/window/wwpty.c
+++ b/usr.bin/window/wwpty.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wwpty.c,v 1.7 2002/06/14 01:07:00 wiz Exp $ */
+/* $NetBSD: wwpty.c,v 1.8 2003/08/07 11:17:42 agc Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)wwpty.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: wwpty.c,v 1.7 2002/06/14 01:07:00 wiz Exp $");
+__RCSID("$NetBSD: wwpty.c,v 1.8 2003/08/07 11:17:42 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/window/wwputc.c b/usr.bin/window/wwputc.c
index 44ad1ddb524..0d8619c4d06 100644
--- a/usr.bin/window/wwputc.c
+++ b/usr.bin/window/wwputc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wwputc.c,v 1.5 2002/06/14 01:07:00 wiz Exp $ */
+/* $NetBSD: wwputc.c,v 1.6 2003/08/07 11:17:43 agc Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)wwputc.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: wwputc.c,v 1.5 2002/06/14 01:07:00 wiz Exp $");
+__RCSID("$NetBSD: wwputc.c,v 1.6 2003/08/07 11:17:43 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/window/wwputs.c b/usr.bin/window/wwputs.c
index a0714129f59..67c5dea0a38 100644
--- a/usr.bin/window/wwputs.c
+++ b/usr.bin/window/wwputs.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wwputs.c,v 1.5 2002/06/14 01:07:00 wiz Exp $ */
+/* $NetBSD: wwputs.c,v 1.6 2003/08/07 11:17:43 agc Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)wwputs.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: wwputs.c,v 1.5 2002/06/14 01:07:00 wiz Exp $");
+__RCSID("$NetBSD: wwputs.c,v 1.6 2003/08/07 11:17:43 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/window/wwredraw.c b/usr.bin/window/wwredraw.c
index 4a517c11242..45e80d7853b 100644
--- a/usr.bin/window/wwredraw.c
+++ b/usr.bin/window/wwredraw.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wwredraw.c,v 1.5 2002/06/14 01:07:00 wiz Exp $ */
+/* $NetBSD: wwredraw.c,v 1.6 2003/08/07 11:17:43 agc Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)wwredraw.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: wwredraw.c,v 1.5 2002/06/14 01:07:00 wiz Exp $");
+__RCSID("$NetBSD: wwredraw.c,v 1.6 2003/08/07 11:17:43 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/window/wwredrawwin.c b/usr.bin/window/wwredrawwin.c
index 5f2af50816e..055f5235c39 100644
--- a/usr.bin/window/wwredrawwin.c
+++ b/usr.bin/window/wwredrawwin.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wwredrawwin.c,v 1.6 2002/06/14 01:07:01 wiz Exp $ */
+/* $NetBSD: wwredrawwin.c,v 1.7 2003/08/07 11:17:44 agc Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)wwredrawwin.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: wwredrawwin.c,v 1.6 2002/06/14 01:07:01 wiz Exp $");
+__RCSID("$NetBSD: wwredrawwin.c,v 1.7 2003/08/07 11:17:44 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/window/wwrint.c b/usr.bin/window/wwrint.c
index 52333f407d4..94266b1cd92 100644
--- a/usr.bin/window/wwrint.c
+++ b/usr.bin/window/wwrint.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wwrint.c,v 1.6 2002/06/14 01:07:01 wiz Exp $ */
+/* $NetBSD: wwrint.c,v 1.7 2003/08/07 11:17:44 agc Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)wwrint.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: wwrint.c,v 1.6 2002/06/14 01:07:01 wiz Exp $");
+__RCSID("$NetBSD: wwrint.c,v 1.7 2003/08/07 11:17:44 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/window/wwscroll.c b/usr.bin/window/wwscroll.c
index b621eee0789..bff11107ed5 100644
--- a/usr.bin/window/wwscroll.c
+++ b/usr.bin/window/wwscroll.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wwscroll.c,v 1.6 2002/06/14 01:07:01 wiz Exp $ */
+/* $NetBSD: wwscroll.c,v 1.7 2003/08/07 11:17:44 agc Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)wwscroll.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: wwscroll.c,v 1.6 2002/06/14 01:07:01 wiz Exp $");
+__RCSID("$NetBSD: wwscroll.c,v 1.7 2003/08/07 11:17:44 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/window/wwsize.c b/usr.bin/window/wwsize.c
index 21d0bd07f72..9136808ed91 100644
--- a/usr.bin/window/wwsize.c
+++ b/usr.bin/window/wwsize.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wwsize.c,v 1.7 2002/06/14 01:07:01 wiz Exp $ */
+/* $NetBSD: wwsize.c,v 1.8 2003/08/07 11:17:45 agc Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)wwsize.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: wwsize.c,v 1.7 2002/06/14 01:07:01 wiz Exp $");
+__RCSID("$NetBSD: wwsize.c,v 1.8 2003/08/07 11:17:45 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/window/wwspawn.c b/usr.bin/window/wwspawn.c
index 7caf7e4d27e..8badf6334aa 100644
--- a/usr.bin/window/wwspawn.c
+++ b/usr.bin/window/wwspawn.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wwspawn.c,v 1.8 2003/01/16 09:46:48 kleink Exp $ */
+/* $NetBSD: wwspawn.c,v 1.9 2003/08/07 11:17:45 agc Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)wwspawn.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: wwspawn.c,v 1.8 2003/01/16 09:46:48 kleink Exp $");
+__RCSID("$NetBSD: wwspawn.c,v 1.9 2003/08/07 11:17:45 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/window/wwsuspend.c b/usr.bin/window/wwsuspend.c
index ce7d97a82e3..96e30c559ea 100644
--- a/usr.bin/window/wwsuspend.c
+++ b/usr.bin/window/wwsuspend.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wwsuspend.c,v 1.5 2002/06/14 01:07:01 wiz Exp $ */
+/* $NetBSD: wwsuspend.c,v 1.6 2003/08/07 11:17:45 agc Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)wwsuspend.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: wwsuspend.c,v 1.5 2002/06/14 01:07:01 wiz Exp $");
+__RCSID("$NetBSD: wwsuspend.c,v 1.6 2003/08/07 11:17:45 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/window/wwterminfo.c b/usr.bin/window/wwterminfo.c
index f49d0e1cf1a..de38f13efb3 100644
--- a/usr.bin/window/wwterminfo.c
+++ b/usr.bin/window/wwterminfo.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wwterminfo.c,v 1.4 1999/04/20 13:52:36 mrg Exp $ */
+/* $NetBSD: wwterminfo.c,v 1.5 2003/08/07 11:17:45 agc Exp $ */
/*
* Copyright (c) 1982, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)wwterminfo.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: wwterminfo.c,v 1.4 1999/04/20 13:52:36 mrg Exp $");
+__RCSID("$NetBSD: wwterminfo.c,v 1.5 2003/08/07 11:17:45 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/window/wwtty.c b/usr.bin/window/wwtty.c
index a533da9f771..ef2475cc8fe 100644
--- a/usr.bin/window/wwtty.c
+++ b/usr.bin/window/wwtty.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wwtty.c,v 1.6 2002/06/14 01:07:02 wiz Exp $ */
+/* $NetBSD: wwtty.c,v 1.7 2003/08/07 11:17:46 agc Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)wwtty.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: wwtty.c,v 1.6 2002/06/14 01:07:02 wiz Exp $");
+__RCSID("$NetBSD: wwtty.c,v 1.7 2003/08/07 11:17:46 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/window/wwunframe.c b/usr.bin/window/wwunframe.c
index 394f2aab634..a241cbfc4fa 100644
--- a/usr.bin/window/wwunframe.c
+++ b/usr.bin/window/wwunframe.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wwunframe.c,v 1.6 2002/06/14 01:07:02 wiz Exp $ */
+/* $NetBSD: wwunframe.c,v 1.7 2003/08/07 11:17:46 agc Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)wwunframe.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: wwunframe.c,v 1.6 2002/06/14 01:07:02 wiz Exp $");
+__RCSID("$NetBSD: wwunframe.c,v 1.7 2003/08/07 11:17:46 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/window/wwupdate.c b/usr.bin/window/wwupdate.c
index 1adf4e0254a..f0759167a30 100644
--- a/usr.bin/window/wwupdate.c
+++ b/usr.bin/window/wwupdate.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wwupdate.c,v 1.5 2002/06/14 01:07:02 wiz Exp $ */
+/* $NetBSD: wwupdate.c,v 1.6 2003/08/07 11:17:46 agc Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)wwupdate.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: wwupdate.c,v 1.5 2002/06/14 01:07:02 wiz Exp $");
+__RCSID("$NetBSD: wwupdate.c,v 1.6 2003/08/07 11:17:46 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/window/wwwrite.c b/usr.bin/window/wwwrite.c
index 6756667391c..3ef4fe6a558 100644
--- a/usr.bin/window/wwwrite.c
+++ b/usr.bin/window/wwwrite.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wwwrite.c,v 1.7 2002/06/14 01:07:02 wiz Exp $ */
+/* $NetBSD: wwwrite.c,v 1.8 2003/08/07 11:17:46 agc Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)wwwrite.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: wwwrite.c,v 1.7 2002/06/14 01:07:02 wiz Exp $");
+__RCSID("$NetBSD: wwwrite.c,v 1.8 2003/08/07 11:17:46 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/window/xx.c b/usr.bin/window/xx.c
index 70337d02e0d..5e66e17e29f 100644
--- a/usr.bin/window/xx.c
+++ b/usr.bin/window/xx.c
@@ -1,4 +1,4 @@
-/* $NetBSD: xx.c,v 1.6 2002/06/14 01:07:03 wiz Exp $ */
+/* $NetBSD: xx.c,v 1.7 2003/08/07 11:17:46 agc Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)xx.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: xx.c,v 1.6 2002/06/14 01:07:03 wiz Exp $");
+__RCSID("$NetBSD: xx.c,v 1.7 2003/08/07 11:17:46 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/window/xx.h b/usr.bin/window/xx.h
index 97f60bfcf39..c4d9caf2e94 100644
--- a/usr.bin/window/xx.h
+++ b/usr.bin/window/xx.h
@@ -1,4 +1,4 @@
-/* $NetBSD: xx.h,v 1.6 2002/06/14 01:07:03 wiz Exp $ */
+/* $NetBSD: xx.h,v 1.7 2003/08/07 11:17:47 agc Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/window/xxflush.c b/usr.bin/window/xxflush.c
index c8c825ddfbb..71feef53a7e 100644
--- a/usr.bin/window/xxflush.c
+++ b/usr.bin/window/xxflush.c
@@ -1,4 +1,4 @@
-/* $NetBSD: xxflush.c,v 1.5 2002/06/14 01:07:03 wiz Exp $ */
+/* $NetBSD: xxflush.c,v 1.6 2003/08/07 11:17:47 agc Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)xxflush.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: xxflush.c,v 1.5 2002/06/14 01:07:03 wiz Exp $");
+__RCSID("$NetBSD: xxflush.c,v 1.6 2003/08/07 11:17:47 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/write/term_chk.c b/usr.bin/write/term_chk.c
index 9b5d58e7671..adee3d8b5ed 100644
--- a/usr.bin/write/term_chk.c
+++ b/usr.bin/write/term_chk.c
@@ -1,4 +1,4 @@
-/* $NetBSD: term_chk.c,v 1.3 2003/05/13 23:05:34 christos Exp $ */
+/* $NetBSD: term_chk.c,v 1.4 2003/08/07 11:17:48 agc Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -38,7 +34,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: term_chk.c,v 1.3 2003/05/13 23:05:34 christos Exp $");
+__RCSID("$NetBSD: term_chk.c,v 1.4 2003/08/07 11:17:48 agc Exp $");
#endif
#include <sys/types.h>
diff --git a/usr.bin/write/term_chk.h b/usr.bin/write/term_chk.h
index 1f56e0cedfc..aca45683800 100644
--- a/usr.bin/write/term_chk.h
+++ b/usr.bin/write/term_chk.h
@@ -1,4 +1,4 @@
-/* $NetBSD: term_chk.h,v 1.1 2003/04/20 23:53:04 christos Exp $ */
+/* $NetBSD: term_chk.h,v 1.2 2003/08/07 11:17:48 agc Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/write/write.1 b/usr.bin/write/write.1
index 4c71664e50e..28d614c3835 100644
--- a/usr.bin/write/write.1
+++ b/usr.bin/write/write.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: write.1,v 1.5 1997/10/19 14:35:28 mrg Exp $
+.\" $NetBSD: write.1,v 1.6 2003/08/07 11:17:48 agc Exp $
.\"
.\" Copyright (c) 1989, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -14,11 +14,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/write/write.c b/usr.bin/write/write.c
index 4072b56467e..723c8ce53bc 100644
--- a/usr.bin/write/write.c
+++ b/usr.bin/write/write.c
@@ -1,4 +1,4 @@
-/* $NetBSD: write.c,v 1.22 2003/04/20 23:53:05 christos Exp $ */
+/* $NetBSD: write.c,v 1.23 2003/08/07 11:17:48 agc Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -46,7 +42,7 @@ __COPYRIGHT("@(#) Copyright (c) 1989, 1993\n\
#if 0
static char sccsid[] = "@(#)write.c 8.2 (Berkeley) 4/27/95";
#else
-__RCSID("$NetBSD: write.c,v 1.22 2003/04/20 23:53:05 christos Exp $");
+__RCSID("$NetBSD: write.c,v 1.23 2003/08/07 11:17:48 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/xargs/pathnames.h b/usr.bin/xargs/pathnames.h
index ed4337b0c72..2190e64ab82 100644
--- a/usr.bin/xargs/pathnames.h
+++ b/usr.bin/xargs/pathnames.h
@@ -1,4 +1,4 @@
-/* $NetBSD: pathnames.h,v 1.4 1995/11/15 16:11:17 thorpej Exp $ */
+/* $NetBSD: pathnames.h,v 1.5 2003/08/07 11:17:49 agc Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/xargs/xargs.1 b/usr.bin/xargs/xargs.1
index 54526c30e30..e63e00df95b 100644
--- a/usr.bin/xargs/xargs.1
+++ b/usr.bin/xargs/xargs.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: xargs.1,v 1.16 2002/10/02 10:09:51 wiz Exp $
+.\" $NetBSD: xargs.1,v 1.17 2003/08/07 11:17:49 agc Exp $
.\"
.\" Copyright (c) 1990, 1991, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -15,11 +15,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/xargs/xargs.c b/usr.bin/xargs/xargs.c
index d8bfc6d8287..5c113fc7d92 100644
--- a/usr.bin/xargs/xargs.c
+++ b/usr.bin/xargs/xargs.c
@@ -1,4 +1,4 @@
-/* $NetBSD: xargs.c,v 1.13 2003/01/20 05:30:13 simonb Exp $ */
+/* $NetBSD: xargs.c,v 1.14 2003/08/07 11:17:49 agc Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -46,7 +42,7 @@ __COPYRIGHT("@(#) Copyright (c) 1990, 1993\n\
#if 0
static char sccsid[] = "@(#)xargs.c 8.1 (Berkeley) 6/6/93";
#endif
-__RCSID("$NetBSD: xargs.c,v 1.13 2003/01/20 05:30:13 simonb Exp $");
+__RCSID("$NetBSD: xargs.c,v 1.14 2003/08/07 11:17:49 agc Exp $");
#endif /* not lint */
#include <sys/types.h>
diff --git a/usr.bin/xinstall/install.1 b/usr.bin/xinstall/install.1
index 2b8dd63f811..46ddbc42acf 100644
--- a/usr.bin/xinstall/install.1
+++ b/usr.bin/xinstall/install.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: install.1,v 1.37 2003/05/24 18:24:28 jmmv Exp $
+.\" $NetBSD: install.1,v 1.38 2003/08/07 11:17:50 agc Exp $
.\"
.\" Copyright (c) 1987, 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -11,11 +11,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/xinstall/pathnames.h b/usr.bin/xinstall/pathnames.h
index 8f7eca63343..88ad1e25f77 100644
--- a/usr.bin/xinstall/pathnames.h
+++ b/usr.bin/xinstall/pathnames.h
@@ -1,4 +1,4 @@
-/* $NetBSD: pathnames.h,v 1.5 2000/09/04 02:45:33 hubertf Exp $ */
+/* $NetBSD: pathnames.h,v 1.6 2003/08/07 11:17:50 agc Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/xinstall/xinstall.c b/usr.bin/xinstall/xinstall.c
index 946cf34dc35..4533746b420 100644
--- a/usr.bin/xinstall/xinstall.c
+++ b/usr.bin/xinstall/xinstall.c
@@ -1,4 +1,4 @@
-/* $NetBSD: xinstall.c,v 1.78 2003/07/12 14:30:53 itojun Exp $ */
+/* $NetBSD: xinstall.c,v 1.79 2003/08/07 11:17:50 agc Exp $ */
/*
* Copyright (c) 1987, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -50,7 +46,7 @@ __COPYRIGHT("@(#) Copyright (c) 1987, 1993\n\
#if 0
static char sccsid[] = "@(#)xinstall.c 8.1 (Berkeley) 7/21/93";
#else
-__RCSID("$NetBSD: xinstall.c,v 1.78 2003/07/12 14:30:53 itojun Exp $");
+__RCSID("$NetBSD: xinstall.c,v 1.79 2003/08/07 11:17:50 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/xstr/pathnames.h b/usr.bin/xstr/pathnames.h
index 2a29b8c61e4..d58de95654a 100644
--- a/usr.bin/xstr/pathnames.h
+++ b/usr.bin/xstr/pathnames.h
@@ -1,4 +1,4 @@
-/* $NetBSD: pathnames.h,v 1.3 1994/11/14 04:56:22 jtc Exp $ */
+/* $NetBSD: pathnames.h,v 1.4 2003/08/07 11:17:51 agc Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -33,7 +29,7 @@
* SUCH DAMAGE.
*
* @(#)pathnames.h 8.1 (Berkeley) 6/9/93
- * $NetBSD: pathnames.h,v 1.3 1994/11/14 04:56:22 jtc Exp $
+ * $NetBSD: pathnames.h,v 1.4 2003/08/07 11:17:51 agc Exp $
*/
#define _PATH_TMP "/tmp/xstrXXXXXX"
diff --git a/usr.bin/xstr/xstr.1 b/usr.bin/xstr/xstr.1
index 257b94b8916..fb6f0278e92 100644
--- a/usr.bin/xstr/xstr.1
+++ b/usr.bin/xstr/xstr.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: xstr.1,v 1.10 2002/09/30 11:09:18 grant Exp $
+.\" $NetBSD: xstr.1,v 1.11 2003/08/07 11:17:51 agc Exp $
.\"
.\" Copyright (c) 1980, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -11,11 +11,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/xstr/xstr.c b/usr.bin/xstr/xstr.c
index f326ff830e6..7cff25b2cc1 100644
--- a/usr.bin/xstr/xstr.c
+++ b/usr.bin/xstr/xstr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: xstr.c,v 1.13 2002/01/12 02:13:12 aymeric Exp $ */
+/* $NetBSD: xstr.c,v 1.14 2003/08/07 11:17:51 agc Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -43,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 1993\n\
#if 0
static char sccsid[] = "@(#)xstr.c 8.1 (Berkeley) 6/9/93";
#else
-__RCSID("$NetBSD: xstr.c,v 1.13 2002/01/12 02:13:12 aymeric Exp $");
+__RCSID("$NetBSD: xstr.c,v 1.14 2003/08/07 11:17:51 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/yacc/closure.c b/usr.bin/yacc/closure.c
index ddcc5908f0a..f56029c96d8 100644
--- a/usr.bin/yacc/closure.c
+++ b/usr.bin/yacc/closure.c
@@ -1,4 +1,4 @@
-/* $NetBSD: closure.c,v 1.6 2002/01/30 20:38:49 tv Exp $ */
+/* $NetBSD: closure.c,v 1.7 2003/08/07 11:17:52 agc Exp $ */
/*
* Copyright (c) 1989 The Regents of the University of California.
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)closure.c 5.3 (Berkeley) 5/24/93";
#else
-__RCSID("$NetBSD: closure.c,v 1.6 2002/01/30 20:38:49 tv Exp $");
+__RCSID("$NetBSD: closure.c,v 1.7 2003/08/07 11:17:52 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/yacc/defs.h b/usr.bin/yacc/defs.h
index 15cf55592d5..1a8b5c1c10c 100644
--- a/usr.bin/yacc/defs.h
+++ b/usr.bin/yacc/defs.h
@@ -1,4 +1,4 @@
-/* $NetBSD: defs.h,v 1.11 2002/01/29 10:20:36 tv Exp $ */
+/* $NetBSD: defs.h,v 1.12 2003/08/07 11:17:52 agc Exp $ */
/*
* Copyright (c) 1989 The Regents of the University of California.
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/yacc/error.c b/usr.bin/yacc/error.c
index 5d49fffbf6a..1561349eae5 100644
--- a/usr.bin/yacc/error.c
+++ b/usr.bin/yacc/error.c
@@ -1,4 +1,4 @@
-/* $NetBSD: error.c,v 1.7 2002/01/30 20:38:49 tv Exp $ */
+/* $NetBSD: error.c,v 1.8 2003/08/07 11:17:52 agc Exp $ */
/*
* Copyright (c) 1989 The Regents of the University of California.
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)error.c 5.3 (Berkeley) 6/1/90";
#else
-__RCSID("$NetBSD: error.c,v 1.7 2002/01/30 20:38:49 tv Exp $");
+__RCSID("$NetBSD: error.c,v 1.8 2003/08/07 11:17:52 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/yacc/lalr.c b/usr.bin/yacc/lalr.c
index f17ad031030..c9ea8a34bae 100644
--- a/usr.bin/yacc/lalr.c
+++ b/usr.bin/yacc/lalr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: lalr.c,v 1.7 2002/01/30 20:38:49 tv Exp $ */
+/* $NetBSD: lalr.c,v 1.8 2003/08/07 11:17:53 agc Exp $ */
/*
* Copyright (c) 1989 The Regents of the University of California.
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)lalr.c 5.3 (Berkeley) 6/1/90";
#else
-__RCSID("$NetBSD: lalr.c,v 1.7 2002/01/30 20:38:49 tv Exp $");
+__RCSID("$NetBSD: lalr.c,v 1.8 2003/08/07 11:17:53 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/yacc/lr0.c b/usr.bin/yacc/lr0.c
index 924d4bdb9ce..f1612b42862 100644
--- a/usr.bin/yacc/lr0.c
+++ b/usr.bin/yacc/lr0.c
@@ -1,4 +1,4 @@
-/* $NetBSD: lr0.c,v 1.6 2002/01/30 20:38:49 tv Exp $ */
+/* $NetBSD: lr0.c,v 1.7 2003/08/07 11:17:53 agc Exp $ */
/*
* Copyright (c) 1989 The Regents of the University of California.
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)lr0.c 5.3 (Berkeley) 1/20/91";
#else
-__RCSID("$NetBSD: lr0.c,v 1.6 2002/01/30 20:38:49 tv Exp $");
+__RCSID("$NetBSD: lr0.c,v 1.7 2003/08/07 11:17:53 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/yacc/main.c b/usr.bin/yacc/main.c
index fe8fd790b78..39158715460 100644
--- a/usr.bin/yacc/main.c
+++ b/usr.bin/yacc/main.c
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.13 2003/07/14 11:45:18 itojun Exp $ */
+/* $NetBSD: main.c,v 1.14 2003/08/07 11:17:53 agc Exp $ */
/*
* Copyright (c) 1989 The Regents of the University of California.
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -46,7 +42,7 @@ __COPYRIGHT("@(#) Copyright (c) 1989 The Regents of the University of California
#if 0
static char sccsid[] = "@(#)main.c 5.5 (Berkeley) 5/24/93";
#else
-__RCSID("$NetBSD: main.c,v 1.13 2003/07/14 11:45:18 itojun Exp $");
+__RCSID("$NetBSD: main.c,v 1.14 2003/08/07 11:17:53 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/yacc/mkpar.c b/usr.bin/yacc/mkpar.c
index 4aacab308d2..dafd73b24e4 100644
--- a/usr.bin/yacc/mkpar.c
+++ b/usr.bin/yacc/mkpar.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mkpar.c,v 1.8 2002/01/30 20:38:50 tv Exp $ */
+/* $NetBSD: mkpar.c,v 1.9 2003/08/07 11:17:53 agc Exp $ */
/*
* Copyright (c) 1989 The Regents of the University of California.
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)mkpar.c 5.3 (Berkeley) 1/20/91";
#else
-__RCSID("$NetBSD: mkpar.c,v 1.8 2002/01/30 20:38:50 tv Exp $");
+__RCSID("$NetBSD: mkpar.c,v 1.9 2003/08/07 11:17:53 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/yacc/output.c b/usr.bin/yacc/output.c
index 46425587502..db172550f06 100644
--- a/usr.bin/yacc/output.c
+++ b/usr.bin/yacc/output.c
@@ -1,4 +1,4 @@
-/* $NetBSD: output.c,v 1.11 2002/01/30 20:38:50 tv Exp $ */
+/* $NetBSD: output.c,v 1.12 2003/08/07 11:17:53 agc Exp $ */
/*
* Copyright (c) 1989 The Regents of the University of California.
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)output.c 5.7 (Berkeley) 5/24/93";
#else
-__RCSID("$NetBSD: output.c,v 1.11 2002/01/30 20:38:50 tv Exp $");
+__RCSID("$NetBSD: output.c,v 1.12 2003/08/07 11:17:53 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/yacc/reader.c b/usr.bin/yacc/reader.c
index f6fdb90f8e4..c88d3b42278 100644
--- a/usr.bin/yacc/reader.c
+++ b/usr.bin/yacc/reader.c
@@ -1,4 +1,4 @@
-/* $NetBSD: reader.c,v 1.12 2003/07/14 11:45:18 itojun Exp $ */
+/* $NetBSD: reader.c,v 1.13 2003/08/07 11:17:54 agc Exp $ */
/*
* Copyright (c) 1989 The Regents of the University of California.
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)reader.c 5.7 (Berkeley) 1/20/91";
#else
-__RCSID("$NetBSD: reader.c,v 1.12 2003/07/14 11:45:18 itojun Exp $");
+__RCSID("$NetBSD: reader.c,v 1.13 2003/08/07 11:17:54 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/yacc/skeleton.c b/usr.bin/yacc/skeleton.c
index 6ff8239c22a..6e4b5f34511 100644
--- a/usr.bin/yacc/skeleton.c
+++ b/usr.bin/yacc/skeleton.c
@@ -1,4 +1,4 @@
-/* $NetBSD: skeleton.c,v 1.24 2003/01/05 21:38:50 kristerw Exp $ */
+/* $NetBSD: skeleton.c,v 1.25 2003/08/07 11:17:54 agc Exp $ */
/*
* Copyright (c) 1989 The Regents of the University of California.
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)skeleton.c 5.8 (Berkeley) 4/29/95";
#else
-__RCSID("$NetBSD: skeleton.c,v 1.24 2003/01/05 21:38:50 kristerw Exp $");
+__RCSID("$NetBSD: skeleton.c,v 1.25 2003/08/07 11:17:54 agc Exp $");
#endif /* 0 */
#endif /* not lint */
@@ -67,7 +63,7 @@ const char * const banner[] =
"static char yysccsid[] = \"@(#)yaccpar 1.9 (Berkeley) 02/21/93\";",
"#else",
"#if defined(__NetBSD__) && defined(__IDSTRING)",
- "__IDSTRING(yyrcsid, \"$NetBSD: skeleton.c,v 1.24 2003/01/05 21:38:50 kristerw Exp $\");",
+ "__IDSTRING(yyrcsid, \"$NetBSD: skeleton.c,v 1.25 2003/08/07 11:17:54 agc Exp $\");",
"#endif /* __NetBSD__ && __IDSTRING */",
"#endif /* 0 */",
"#endif /* lint */",
diff --git a/usr.bin/yacc/symtab.c b/usr.bin/yacc/symtab.c
index a4f7f236f6a..35d10a242be 100644
--- a/usr.bin/yacc/symtab.c
+++ b/usr.bin/yacc/symtab.c
@@ -1,4 +1,4 @@
-/* $NetBSD: symtab.c,v 1.8 2003/07/14 11:45:18 itojun Exp $ */
+/* $NetBSD: symtab.c,v 1.9 2003/08/07 11:17:54 agc Exp $ */
/*
* Copyright (c) 1989 The Regents of the University of California.
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)symtab.c 5.3 (Berkeley) 6/1/90";
#else
-__RCSID("$NetBSD: symtab.c,v 1.8 2003/07/14 11:45:18 itojun Exp $");
+__RCSID("$NetBSD: symtab.c,v 1.9 2003/08/07 11:17:54 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/yacc/verbose.c b/usr.bin/yacc/verbose.c
index 21e02eb098a..b3d287fbc4d 100644
--- a/usr.bin/yacc/verbose.c
+++ b/usr.bin/yacc/verbose.c
@@ -1,4 +1,4 @@
-/* $NetBSD: verbose.c,v 1.7 2002/01/30 20:38:50 tv Exp $ */
+/* $NetBSD: verbose.c,v 1.8 2003/08/07 11:17:55 agc Exp $ */
/*
* Copyright (c) 1989 The Regents of the University of California.
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)verbose.c 5.3 (Berkeley) 1/20/91";
#else
-__RCSID("$NetBSD: verbose.c,v 1.7 2002/01/30 20:38:50 tv Exp $");
+__RCSID("$NetBSD: verbose.c,v 1.8 2003/08/07 11:17:55 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/yacc/warshall.c b/usr.bin/yacc/warshall.c
index 39fccbdb94b..3f0b6fb7faa 100644
--- a/usr.bin/yacc/warshall.c
+++ b/usr.bin/yacc/warshall.c
@@ -1,4 +1,4 @@
-/* $NetBSD: warshall.c,v 1.6 2002/01/30 20:38:50 tv Exp $ */
+/* $NetBSD: warshall.c,v 1.7 2003/08/07 11:17:55 agc Exp $ */
/*
* Copyright (c) 1989 The Regents of the University of California.
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)warshall.c 5.4 (Berkeley) 5/24/93";
#else
-__RCSID("$NetBSD: warshall.c,v 1.6 2002/01/30 20:38:50 tv Exp $");
+__RCSID("$NetBSD: warshall.c,v 1.7 2003/08/07 11:17:55 agc Exp $");
#endif
#endif /* not lint */
diff --git a/usr.bin/yacc/yacc.1 b/usr.bin/yacc/yacc.1
index dfb6a42a285..fa317ee74ad 100644
--- a/usr.bin/yacc/yacc.1
+++ b/usr.bin/yacc/yacc.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: yacc.1,v 1.12 2003/02/25 10:36:03 wiz Exp $
+.\" $NetBSD: yacc.1,v 1.13 2003/08/07 11:17:55 agc Exp $
.\"
.\" Copyright (c) 1989, 1990 The Regents of the University of California.
.\" All rights reserved.
@@ -14,11 +14,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
@@ -35,7 +31,7 @@
.\" SUCH DAMAGE.
.\"
.\" from: @(#)yacc.1 5.7 (Berkeley) 7/30/91
-.\" $NetBSD: yacc.1,v 1.12 2003/02/25 10:36:03 wiz Exp $
+.\" $NetBSD: yacc.1,v 1.13 2003/08/07 11:17:55 agc Exp $
.\"
.Dd July 30, 1991
.Dt YACC 1
diff --git a/usr.bin/yes/yes.1 b/usr.bin/yes/yes.1
index 61f0d1248e1..f2cf100632b 100644
--- a/usr.bin/yes/yes.1
+++ b/usr.bin/yes/yes.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: yes.1,v 1.6 2000/08/02 15:39:17 jwise Exp $
+.\" $NetBSD: yes.1,v 1.7 2003/08/07 11:17:56 agc Exp $
.\"
.\" Copyright (c) 1980, 1991, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -11,11 +11,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/yes/yes.c b/usr.bin/yes/yes.c
index 863f36367cf..f845d098c7a 100644
--- a/usr.bin/yes/yes.c
+++ b/usr.bin/yes/yes.c
@@ -1,4 +1,4 @@
-/* $NetBSD: yes.c,v 1.5 1997/10/19 14:28:27 mrg Exp $ */
+/* $NetBSD: yes.c,v 1.6 2003/08/07 11:17:56 agc Exp $ */
/*
* Copyright (c) 1987, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -43,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1987, 1993\n\
#if 0
static char sccsid[] = "@(#)yes.c 8.1 (Berkeley) 6/6/93";
#endif
-__RCSID("$NetBSD: yes.c,v 1.5 1997/10/19 14:28:27 mrg Exp $");
+__RCSID("$NetBSD: yes.c,v 1.6 2003/08/07 11:17:56 agc Exp $");
#endif /* not lint */
#include <stdio.h>