* New upstream release.

- Fix backgammon scoring bug related to peices on the bar and gammons.
       Closes: #185101
     - Fix backgammon tutorial text. Closes: #212478
     - Advertising clause is gone from most, but not all licenses.
     - Apparently better fix for boggle man page.
     - Incorporates nearly all changes in Debian diff.

git-svn-id: file:///srv/svn/joey/trunk/src/packages/bsdgames@9782 a4a2c43b-8ac3-0310-8836-e0e880c912e2

COPYING

@@ -8,6 +8,36 @@ Most games are under the standard BSD terms:
    Copyright (c) 1980, 1982, 1983, 1985-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.
+
+The files "caesar/rot13.in" and "wargames/wargames" have a similar
+licence but with an additional advertising clause:
+
+   Copyright (c) 1985, 1992, 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:
@@ -36,6 +66,41 @@ Most games are under the standard BSD terms:
    OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
    SUCH DAMAGE.
 
+The game "hunt" has a similar licence, mentioning the University of
+California, San Francisco:
+
+   Copyright (c) 1983-2003, 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:
+
+   + Redistributions of source code must retain the above copyright 
+     notice, this list of conditions and the following disclaimer.
+   + Redistributions in binary form must reproduce the above copyright 
+     notice, this list of conditions and the following disclaimer in the 
+     documentation and/or other materials provided with the distribution.
+   + Neither the name of the University of California, San Francisco 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 COPYRIGHT HOLDERS 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 COPYRIGHT 
+   OWNER 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.
+
+These terms also apply to "hunt/Makeconfig", which is derived from the
+hunt "Makefile.inc" distributed by NetBSD.
+
 The files "backgammon/backgammon/backlocal.h", "countmail/countmail",
 "hack/extern.h", "robots/auto.c", "sail/display.h" and
 "sail/restart.h" have a similar licence, but copyright is held by the
@@ -202,24 +267,6 @@ Brachman, but he confirmed that he had assigned his copyright to the
 University of California and the continued inclusion of the old
 copyright notice was an omission on their part.
 
-The game "hunt" appears to be copyrighted by its authors and the
-University of California:
-
-   Copyright (c) 1985 Conrad C. Huang, Gregory S. Couch, Kenneth C.R.C. Arnold
-   San Francisco, California
-
-   Copyright (c) 1983, 1985 Regents of the University of California.
-   All rights reserved.  The Berkeley software License Agreement
-   specifies the terms and conditions for redistribution.
-
-   Hunt is part of the user-contributed software distributed by
-   Berkeley in 4BSD.  The sources are copyrighted by the authors
-   and the University of California.  You may redistribute freely
-   as long as the copyright notices are retained.
-
-These terms also apply to "hunt/Makeconfig", which is derived from the
-hunt "Makefile.inc" distributed by NetBSD.
-
 The game "phantasia" is not copyright (except for
 "phantasia/pathnames.h.in" to which the BSD copyright and licence
 apply); the notice in "phantasia/COPYRIGHT" applies to it.

ChangeLog

@@ -1,3 +1,247 @@
+2003-12-18  Joseph S. Myers  <jsm@polyomino.org.uk>
+
+	* Version 2.15.
+
+	* NEWS, bsd-games.lsm, bsd-games-non-free.lsm: Update.
+
+	* README: Update.
+
+2003-12-17  Joseph S. Myers  <jsm@polyomino.org.uk>
+
+	* backgammon/backgammon/main.c (main): Only score as a Gammon or a
+	Backgammon if the opponent hasn't removed any pieces, not if the
+	opponent has removed pieces but has had a piece knocked back to
+	the bar afterwards.  Fixes Debian bug 185101 from Konstantin
+	Seiler <list@kseiler.de>.
+
+	* fortune/fortune/fortune.c (fortlen): Return proper fortune
+	length for fortune files without STR_RANDOM or STR_ORDERED rather
+	than comparing it to SLEN.  Bug reported by Simon Williams
+	<simon@no-dns-yet.org.uk>.
+
+	* fortune/fortune/fortune.c (init_prob): Show residual probability
+	rather than non-residual in "No place to put residual probability"
+	error message.  Distribute residual probability correctly rather
+	than all to one file.  Patch from Mike Castle
+	<dalgoda@ix.netcom.com>.
+
+	* configure, Makeconfig.in, fortune/fortune/pathnames.h.in,
+	fortune/datfiles/Makefrag: Make fortune directory configurable;
+	default to NetBSD default.
+
+	* rogue/Makefrag: Don't use -fwritable-strings.
+	* rogue/rogue.h (struct id): Add const.
+	* TODO: Update.
+
+	* backgammon/teachgammon/data.c: Make tutorial text match actual
+	moves.  From FreeBSD via OpenBSD.  Fixes Debian bug 212478 from
+	Jim W. Jaszewski <grok@sprint.ca>.
+
+	* adventure/glorkz: Fix capitalisation of compass directions.
+
+	* phantasia/main.c (cleanup): Only close files that have been
+	opened successfully.
+	* phantasic/misc.c (error): Give error text rather than errno
+	number.
+	Patch from Joey Hess <joey@kitenet.net> for Debian bug 187251 from
+	Mikael Hedin <micce@debian.org>.
+
+	* wtf/acronyms: Add two acronyms suggested by Pavel Machek
+	<pavel@ucw.cz>.
+
+	* wargames/wargames.6: Fix typo.  Patch from Joey Hess
+	<joeyh@debian.org>.
+
+	* hack/hack.options.c (parseoptions): Refer to 'O' rather than 'o'
+	as command to set options.  Bug reported by Christian Garbs
+	<debian@cgarbs.de> in Debian bug 191452.
+
+	* caesar/caesar.c (main): Make dot and winnerdot of type double.
+	Patch from Jan Vornberger <jan@uos.de> in Debian bug 197816.
+	* tests/caesar.197816in, tests/caesar.197816out: New tests.
+	* tests/caesar.test: Update.
+
+	* worm/worm.6: Score is in upper right corner, not upper left
+	corner.  Patch from Robert Hunter <roh@cryptocracy.hn.org> in
+	Debian bug 209034.
+
+	* atc/atc.6.in: Document that pressing return allows you to "fast
+	forward" the game clock.  Patch from Peter Maydell
+	<pmaydell@chiark.greenend.org.uk> in Debian bug 216980.
+
+	* PACKAGING: Remove some old version references.
+
+	* INSTALL: Simplify and remove some obsolete information.
+
+	* adventure/Makefile.bsd, adventure/adventure.6, adventure/crc.c,
+	adventure/done.c, adventure/hdr.h, adventure/init.c,
+	adventure/io.c, adventure/main.c, adventure/save.c,
+	adventure/setup.c, adventure/subr.c, adventure/vocab.c,
+	adventure/wizard.c, arithmetic/arithmetic.6,
+	arithmetic/arithmetic.c, atc/Makefile.bsd, atc/atc.6.in,
+	atc/def.h, atc/extern.c, atc/extern.h, atc/grammar.y,
+	atc/graphics.c, atc/include.h, atc/input.c, atc/lex.l, atc/list.c,
+	atc/log.c, atc/main.c, atc/pathnames.h.in, atc/struct.h,
+	atc/tunable.c, atc/tunable.h, atc/update.c,
+	backgammon/backgammon/backgammon.6.in,
+	backgammon/backgammon/extra.c, backgammon/backgammon/main.c,
+	backgammon/backgammon/move.c, backgammon/backgammon/text.c,
+	backgammon/backgammon/version.c, backgammon/common_source/allow.c,
+	backgammon/common_source/back.h, backgammon/common_source/board.c,
+	backgammon/common_source/check.c,
+	backgammon/common_source/fancy.c, backgammon/common_source/init.c,
+	backgammon/common_source/odds.c, backgammon/common_source/one.c,
+	backgammon/common_source/save.c, backgammon/common_source/subs.c,
+	backgammon/common_source/table.c, backgammon/teachgammon/data.c,
+	backgammon/teachgammon/teach.c, backgammon/teachgammon/ttext1.c,
+	backgammon/teachgammon/ttext2.c, backgammon/teachgammon/tutor.c,
+	backgammon/teachgammon/tutor.h, banner/banner.6, banner/banner.c,
+	battlestar/battlestar.6, battlestar/battlestar.c,
+	battlestar/command1.c, battlestar/command2.c,
+	battlestar/command3.c, battlestar/command4.c,
+	battlestar/command5.c, battlestar/command6.c,
+	battlestar/command7.c, battlestar/cypher.c, battlestar/dayfile.c,
+	battlestar/dayobjs.c, battlestar/extern.h, battlestar/fly.c,
+	battlestar/getcom.c, battlestar/globals.c, battlestar/init.c,
+	battlestar/misc.c, battlestar/nightfile.c, battlestar/nightobjs.c,
+	battlestar/parse.c, battlestar/pathnames.h.in, battlestar/room.c,
+	battlestar/save.c, battlestar/words.c, bcd/bcd.6, bcd/bcd.c,
+	boggle/Makefile.bsd, boggle/boggle/bog.c, boggle/boggle/bog.h.in,
+	boggle/boggle/boggle.6, boggle/boggle/extern.h,
+	boggle/boggle/help.c, boggle/boggle/mach.c,
+	boggle/boggle/prtable.c, boggle/boggle/timer.c,
+	boggle/boggle/word.c, boggle/mkdict/mkdict.c,
+	boggle/mkindex/mkindex.c, caesar/caesar.6, caesar/caesar.c,
+	canfield/canfield/canfield.6.in, canfield/canfield/canfield.c,
+	canfield/canfield/pathnames.h.in, canfield/cfscores/cfscores.c,
+	countmail/countmail.6, cribbage/cards.c, cribbage/crib.c,
+	cribbage/cribbage.6.in, cribbage/cribbage.h, cribbage/cribcur.h,
+	cribbage/deck.h, cribbage/extern.c, cribbage/instr.c,
+	cribbage/io.c, cribbage/pathnames.h.in, cribbage/score.c,
+	cribbage/support.c, dm/dm.8.in, dm/dm.c, dm/dm.conf.5.in,
+	dm/pathnames.h.in, factor/factor.6, factor/factor.c, fish/fish.6,
+	fish/fish.c, fish/pathnames.h.in, fortune/datfiles/Makefile.bsd,
+	fortune/datfiles/farber, fortune/datfiles/fortunes,
+	fortune/datfiles/fortunes-o.real, fortune/datfiles/fortunes2,
+	fortune/datfiles/fortunes2-o.real, fortune/datfiles/limerick,
+	fortune/datfiles/limerick-o.real, fortune/datfiles/netbsd,
+	fortune/datfiles/netbsd-o.real, fortune/datfiles/startrek,
+	fortune/datfiles/startrek.sp.ok, fortune/datfiles/zippy,
+	fortune/datfiles/zippy.sp.ok, fortune/fortune/fortune.6.in,
+	fortune/fortune/fortune.c, fortune/fortune/pathnames.h.in,
+	fortune/strfile/strfile.8, fortune/strfile/strfile.c,
+	fortune/strfile/strfile.h, fortune/unstr/unstr.c, gomoku/bdinit.c,
+	gomoku/bdisp.c, gomoku/gomoku.6, gomoku/gomoku.h, gomoku/main.c,
+	gomoku/makemove.c, gomoku/pickmove.c, gomoku/stoc.c,
+	hack/COPYRIGHT, hack/COPYRIGHT-JF, hack/Makefile.bsd,
+	hack/alloc.c, hack/config.h, hack/date.h, hack/def.edog.h,
+	hack/def.eshk.h, hack/def.flag.h, hack/def.func_tab.h,
+	hack/def.gen.h, hack/def.gold.h, hack/def.mkroom.h,
+	hack/def.monst.h, hack/def.obj.h, hack/def.objclass.h,
+	hack/def.objects.h, hack/def.permonst.h, hack/def.rm.h,
+	hack/def.trap.h, hack/def.wseg.h, hack/hack.6.in,
+	hack/hack.Decl.c, hack/hack.apply.c, hack/hack.bones.c,
+	hack/hack.c, hack/hack.cmd.c, hack/hack.do.c, hack/hack.do_name.c,
+	hack/hack.do_wear.c, hack/hack.dog.c, hack/hack.eat.c,
+	hack/hack.end.c, hack/hack.engrave.c, hack/hack.fight.c,
+	hack/hack.h, hack/hack.invent.c, hack/hack.ioctl.c,
+	hack/hack.lev.c, hack/hack.main.c, hack/hack.makemon.c,
+	hack/hack.mfndpos.h, hack/hack.mhitu.c, hack/hack.mklev.c,
+	hack/hack.mkmaze.c, hack/hack.mkobj.c, hack/hack.mkshop.c,
+	hack/hack.mon.c, hack/hack.monst.c, hack/hack.o_init.c,
+	hack/hack.objnam.c, hack/hack.options.c, hack/hack.pager.c,
+	hack/hack.potion.c, hack/hack.pri.c, hack/hack.read.c,
+	hack/hack.rip.c, hack/hack.rumors.c, hack/hack.save.c,
+	hack/hack.search.c, hack/hack.sh, hack/hack.shk.c,
+	hack/hack.shknam.c, hack/hack.steal.c, hack/hack.termcap.c,
+	hack/hack.timeout.c, hack/hack.topl.c, hack/hack.track.c,
+	hack/hack.trap.c, hack/hack.tty.c, hack/hack.u_init.c,
+	hack/hack.unix.c, hack/hack.vault.c, hack/hack.version.c,
+	hack/hack.wield.c, hack/hack.wizard.c, hack/hack.worm.c,
+	hack/hack.worn.c, hack/hack.zap.c, hack/makedefs.c,
+	hack/pathnames.h.in, hack/rnd.c, hangman/endgame.c,
+	hangman/extern.c, hangman/getguess.c, hangman/getword.c,
+	hangman/hangman.6.in, hangman/hangman.h, hangman/main.c,
+	hangman/pathnames.h.in, hangman/playgame.c, hangman/prdata.c,
+	hangman/prman.c, hangman/prword.c, hangman/setup.c,
+	hunt/Makefile.inc.bsd, hunt/hunt/connect.c, hunt/hunt/hunt.6.in,
+	hunt/hunt/hunt.c, hunt/hunt/otto.c, hunt/hunt/playit.c,
+	hunt/huntd/answer.c, hunt/huntd/bsd.h, hunt/huntd/ctl.c,
+	hunt/huntd/ctl_transact.c, hunt/huntd/draw.c, hunt/huntd/driver.c,
+	hunt/huntd/execute.c, hunt/huntd/expl.c, hunt/huntd/extern.c,
+	hunt/huntd/faketalk.c, hunt/huntd/get_names.c, hunt/huntd/hunt.h,
+	hunt/huntd/huntd.6.in, hunt/huntd/makemaze.c,
+	hunt/huntd/pathname.c, hunt/huntd/shots.c, hunt/huntd/talk_ctl.h,
+	hunt/huntd/terminal.c, mille/comp.c, mille/end.c, mille/extern.c,
+	mille/init.c, mille/mille.6, mille/mille.c, mille/mille.h,
+	mille/misc.c, mille/move.c, mille/print.c, mille/roll.c,
+	mille/save.c, mille/table.c, mille/types.c, mille/varpush.c,
+	monop/Makefile.bsd, monop/brd.dat, monop/cards.c, monop/deck.h,
+	monop/execute.c, monop/getinp.c, monop/houses.c, monop/initdeck.c,
+	monop/jail.c, monop/malloc.c, monop/misc.c, monop/mon.dat,
+	monop/monop.6.in, monop/monop.c, monop/monop.def, monop/monop.ext,
+	monop/monop.h, monop/morg.c, monop/pathnames.h.in, monop/print.c,
+	monop/prop.c, monop/prop.dat, monop/rent.c, monop/roll.c,
+	monop/spec.c, monop/trade.c, morse/morse.c, number/number.6,
+	number/number.c, phantasia/Makefile.bsd, phantasia/main.c,
+	phantasia/misc.c, phantasia/pathnames.h.in, phantasia/phantasia.6,
+	phantasia/phantglobs.h, phantasia/setup.c, pig/pig.6, pig/pig.c,
+	pom/pom.6, pom/pom.c, ppt/ppt.c, primes/pattern.c,
+	primes/pr_tbl.c, primes/primes.c, primes/primes.h,
+	quiz/pathnames.h.in, quiz/quiz.6.in, quiz/quiz.c, quiz/quiz.h,
+	quiz/rxp.c, rain/rain.6, rain/rain.c, random/random.6,
+	random/random.c, robots/extern.c, robots/flush_in.c,
+	robots/init_field.c, robots/main.c, robots/make_level.c,
+	robots/move.c, robots/move_robs.c, robots/pathnames.h.in,
+	robots/play_level.c, robots/query.c, robots/rnd_pos.c,
+	robots/robots.6.in, robots/robots.h, robots/score.c,
+	rogue/USD.doc/Makefile.bsd, rogue/USD.doc/rogue.me, rogue/hit.c,
+	rogue/init.c, rogue/inventory.c, rogue/level.c, rogue/machdep.c,
+	rogue/main.c, rogue/message.c, rogue/monster.c, rogue/move.c,
+	rogue/object.c, rogue/pack.c, rogue/pathnames.h.in, rogue/play.c,
+	rogue/random.c, rogue/ring.c, rogue/rogue.6.in, rogue/rogue.h,
+	rogue/room.c, rogue/save.c, rogue/score.c, rogue/spec_hit.c,
+	rogue/throw.c, rogue/trap.c, rogue/use.c, rogue/zap.c,
+	sail/assorted.c, sail/dr_1.c, sail/dr_2.c, sail/dr_3.c,
+	sail/dr_4.c, sail/dr_5.c, sail/dr_main.c, sail/driver.h,
+	sail/extern.h, sail/game.c, sail/globals.c, sail/lo_main.c,
+	sail/machdep.h, sail/main.c, sail/misc.c, sail/parties.c,
+	sail/pathnames.h.in, sail/pl_1.c, sail/pl_2.c, sail/pl_3.c,
+	sail/pl_4.c, sail/pl_5.c, sail/pl_6.c, sail/pl_7.c,
+	sail/pl_main.c, sail/player.h, sail/sail.6, sail/sync.c,
+	sail/version.c, snake/snake/pathnames.h.in,
+	snake/snake/snake.6.in, snake/snake/snake.c,
+	snake/snscore/snscore.c, tetris/input.c, tetris/input.h,
+	tetris/pathnames.h.in, tetris/scores.c, tetris/scores.h,
+	tetris/screen.c, tetris/screen.h, tetris/shapes.c,
+	tetris/tetris.6.in, tetris/tetris.c, tetris/tetris.h,
+	trek/USD.doc/Makefile.bsd, trek/USD.doc/trek.me, trek/abandon.c,
+	trek/attack.c, trek/autover.c, trek/capture.c, trek/cgetc.c,
+	trek/check_out.c, trek/checkcond.c, trek/compkl.c,
+	trek/computer.c, trek/damage.c, trek/damaged.c, trek/dcrept.c,
+	trek/destruct.c, trek/dock.c, trek/dumpgame.c, trek/dumpme.c,
+	trek/dumpssradio.c, trek/events.c, trek/externs.c, trek/getcodi.c,
+	trek/getpar.c, trek/getpar.h, trek/help.c, trek/impulse.c,
+	trek/initquad.c, trek/kill.c, trek/klmove.c, trek/lose.c,
+	trek/lrscan.c, trek/main.c, trek/move.c, trek/nova.c, trek/out.c,
+	trek/phaser.c, trek/play.c, trek/ram.c, trek/ranf.c, trek/rest.c,
+	trek/schedule.c, trek/score.c, trek/setup.c, trek/setwarp.c,
+	trek/shield.c, trek/snova.c, trek/srscan.c, trek/systemname.c,
+	trek/torped.c, trek/trek.6, trek/trek.h, trek/visual.c,
+	trek/warp.c, trek/win.c, worm/worm.6, worm/worm.c, worms/worms.6,
+	worms/worms.c, wtf/wtf.in, wtf/wtf.6.in, wump/pathnames.h.in,
+	wump/wump.6, wump/wump.c: Update from NetBSD CVS.
+	* wtf/acronyms: Update from NetBSD CVS.
+	* wtf/acronyms.comp: New file from NetBSD CVS.
+	* wtf/Makefrag: Update.
+	* COPYING: Update.
+	* INSTALL: Note that glibc 2.3 now required at least for hunt (for
+	<ifaddrs.h>).
+
+2003-11-08  Joseph S. Myers  <jsm@polyomino.org.uk>
+
+	* THANKS: Update Malcolm Parsons's email address.
+
 2003-04-01  Joseph S. Myers  <jsm@polyomino.org.uk>
 
 	* Version 2.14.

INSTALL

@@ -31,22 +31,24 @@ don't worry about it ... it really is more of an aesthetic thing.
 Prerequisites
 =============
 
-You need gcc (the C compiler only - other languages not needed), libc5
+You need the following to build this distribution:
-(version 5.4.5 or later) or libc6, and ncurses (any reasonably recent
+
-version).  Older versions of ncurses may work (but are much more
+* GCC (the C compiler only - other languages not needed).
-buggy), and BSD curses / termcap just might work (but is obsolete),
+
-but these are completely unsupported; even with recent ncurses
+* glibc 2.3 or later.  Older versions will not work (at least for
-versions you could run into problems with some games dependent on the
+  hunt) since they lack the <ifaddrs.h> header.
-version of ncurses; if so, get a debugging version of ncurses
+
-(libncurses_g.a), link with -lncurses_g instead of -lncurses, and good
+* ncurses; other curses / termcap implementations might work, but are
-luck bug-hunting.  If the display gets confused in ordinary use (as
+  unsupported.
-opposed for example to after resizing the window), this might be a bug
+
-in the game, but is probably a bug in ncurses.  You also need some
+* lex and yacc; by default this package will use flex and bison, but
-sort of lex and yacc; by default this package will use flex and bison,
+  byacc will probably work as well.
-but byacc will probably work as well.  Libc5 versions before 5.4.5, or
+
-libc4, will not work since they don't have the BSD <err.h> error
+* GNU make.
-reporting functions.  libcrypto from OpenSSL can optionally be used by
+
-factor.
+* A POSIX shell, such as bash, in /bin/sh.
+
+libcrypto from OpenSSL can optionally be used by factor.
 
 You now need a word list for boggle and hangman; bsd-games no longer
 provides one itself.  The GNU miscfiles package contains one, for
@@ -54,25 +56,6 @@ example.  The path can be specified at configure time (default:
 /usr/share/dict/words).  The file used by hangman can also be
 specified at run time with the "-d" option.
 
-The makefiles require GNU make; if you have a strange system on which
-"make" is not GNU make you can use it under some other name since
-$(MAKE) is used where appropriate.  The configure script assumes that
-/bin/sh is a POSIX.2 shell (bash is known to work; current versions of
-ksh and ash should be OK but I haven't tested them); it can be run
-manually with "bash configure" or similar if /bin/sh is not a POSIX.2
-shell.  It uses the POSIX.2 printf utility (in GNU sh-utils, and a
-builtin in bash 2.02) to avoid depending on echo -n.
-
-I am not aware of any dependence on the version of gcc used, although
-it would be advisable to use gcc 2.7.2.1 or later (or use
--fno-strength-reduce).  EGCS releases 1.1.x may produce spurious
-warnings about uninitialized variables because of limitations in the
-code to detect this, but this does not affect the correctness of the
-compiled code; this seems to be fixed in GCC 2.95.  Some glibc
-versions may produce many warnings in the system headers; these
-generally represent bugs in the headers whose only impact is cosmetic,
-and can be ignored.
-
 Security
 ========
 

Makeconfig.in

@@ -112,6 +112,7 @@ CANFIELD_SCOREFILE := @canfield_scorefile@
 CRIBBAGE_INSTRFILE := @cribbage_instrfile@
 CRIBBAGE_SCOREFILE := @cribbage_scorefile@
 FISH_INSTRFILE := @fish_instrfile@
+FORTUNE_DIR := @fortune_dir@
 FORTUNE_TYPE := @fortune_type@
 HACK_DIR := @hack_dir@
 MONOP_CARDSFILE := @monop_cardsfile@

NEWS

@@ -11,6 +11,23 @@ changes in installation instructions.  Packagers should also reread
 the PACKAGING file each version (or do a diff between the old and new
 versions of the package and read that).
 
+Version 2.15 (2003-12-18)
+============
+
+* Updated from NetBSD CVS of 2003-12-17.  This includes:
+
+  + Advertising clause removed from licence of almost all
+  UCB-copyright code.
+
+  + Hunt licence clarified.
+
+* Various bugs fixed, though some bug reports are still backlogged.
+
+* Glibc 2.3 or later now required, at least for hunt.
+
+* Directory for fortune files individually configurable, and default
+has changed to match that used in NetBSD.
+
 Version 2.14 (2003-04-01)
 ============
 

PACKAGING

@@ -89,12 +89,9 @@ users.
 long as they apply without error, even though they may no longer be
 needed or even be harmful.
 
-If you have patches that are needed for the package to build (in a
+If you have patches that are needed for the package to build or to fix
-supported environment: libc 5.3.12 (or any Linux libc before 5.4.5)
+bugs (in a supported environment, not with old versions of libraries
-and glibc 1.99 (or other old snapshots) are not supported although the
+and tools) or that provide enhancements other than conforming to
-latter may work; nor is BSD curses/libtermcap or ncurses before 1.9.9e
-(== 3.0 shared library version)) or to fix bugs (again in a supported
-environment) or that provide enhancements other than conforming to
 distribution-specific policy, please send them to me (unidiffs
 preferred; see notes on bug reporting and sending patches at the end
 of README).  Do not assume that old patches should be applied to new

README

@@ -20,16 +20,9 @@ has been removed because of the lack of a clear licence.
 The games are mostly not enhanced from the NetBSD versions, but many
 bugs are fixed.
 
-The games should work with ncurses (any reasonably recent version).
+For installation instructions and details of prerequisites, see the
-They might also work with BSD curses/termcap, but this is not tested
+file "INSTALL".  Some games have "README.linux" files you may wish to
-by me.  They should work with both libc5 (version 5.4.5 or later -
+read.
-earlier versions won't work) and libc6 (glibc 2).  Note however that I
-don't test all possible combinations of libraries for each release, so
-tell me if some versions don't work.  For details of prerequisites,
-see INSTALL.
-
-For installation instructions, see the file "INSTALL".  Some games
-have "README.linux" files you may wish to read.
 
 The statement of year 2000 issues associated with bsd-games and
 bsd-games-non-free is in the file "YEAR2000".

THANKS

@@ -46,7 +46,7 @@ Stuart Lamble <sjl@debian.lib.monash.edu.au>
   For a bug report and analysis (with patch) about scoring in
   backgammon.
 
-Malcolm Parsons <malcolm@bits.bris.ac.uk>
+Malcolm Parsons <malcolm.parsons@virgin.net>
 
   For several bug reports and fixes.
 

TODO

@@ -34,12 +34,6 @@ those.  The issues listed there are not included in this list.
 
 1998-07-28 - Support building in a directory other than the source directory.
 
-1998-08-18 - Fix whatever makes rogue need -fwritable-strings.  This
-             seem to be various arrays of struct id being initialised
-             with constant strings, but then being modified in the
-             course of saving and restoring.  Only object.c needs to
-             be compiled with -fwritable-strings.
-
 1998-08-27 - Convert the games that use termcap to use curses.
              Currently these are backgammon, hack and tetris; rain,
              snake and worms have been done.  If it becomes possible

adventure/Makefile.bsd

@@ -1,16 +1,19 @@
-#	$NetBSD: Makefile,v 1.9 2002/03/05 21:28:12 thorpej Exp $
+#	$NetBSD: Makefile,v 1.13 2003/11/16 14:14:18 lukem Exp $
 #	@(#)Makefile	8.1 (Berkeley) 6/12/93
 
 PROG=	adventure
 SRCS=	main.c init.c done.c save.c subr.c vocab.c wizard.c io.c data.c crc.c
 MAN=	adventure.6
 HIDEGAME=hidegame
-CLEANFILES+=setup data.c
+CLEANFILES+=setup setup.lo data.c
 
 data.c: glorkz setup
+	${_MKTARGET_CREATE}
 	./setup ${.CURDIR}/glorkz > data.c
 
-setup: setup.c hdr.h
+setup.lo: hdr.h
-	${HOST_LINK.c} -o setup ${.CURDIR}/setup.c
+setup: setup.lo
+	${_MKTARGET_LINK}
+	${HOST_LINK.c} -o ${.TARGET} ${.ALLSRC}
 
 .include <bsd.prog.mk>

adventure/adventure.6

@@ -1,4 +1,4 @@
-.\"	$NetBSD: adventure.6,v 1.3 1997/10/10 11:59:33 lukem Exp $
+.\"	$NetBSD: adventure.6,v 1.4 2003/08/07 09:36:50 agc Exp $
 .\"
 .\" Copyright (c) 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -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
+.\" 3. Neither the name of the University nor the names of its contributors
-.\"    must display the following acknowledgement:
-.\"	This product includes software developed by the University of
-.\"	California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
 .\"    may be used to endorse or promote products derived from this software
 .\"    without specific prior written permission.
 .\"

adventure/crc.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: crc.c,v 1.7 1999/02/10 00:29:21 hubertf Exp $	*/
+/*	$NetBSD: crc.c,v 1.8 2003/08/07 09:36:50 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
+ * 3. Neither the name of the University nor the names of its contributors
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the 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 @@
 static char sccsid[] = "@(#)crc.c	8.1 (Berkeley) 5/31/93";
 static char ORIGINAL_sccsid[] = "@(#)crc.c	5.2 (Berkeley) 4/4/91";
 #else
-__RCSID("$NetBSD: crc.c,v 1.7 1999/02/10 00:29:21 hubertf Exp $");
+__RCSID("$NetBSD: crc.c,v 1.8 2003/08/07 09:36:50 agc Exp $");
 #endif
 #endif /* not lint */
 

adventure/done.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: done.c,v 1.7 2000/07/03 03:57:39 matt Exp $	*/
+/*	$NetBSD: done.c,v 1.8 2003/08/07 09:36:50 agc Exp $	*/
 
 /*-
  * Copyright (c) 1991, 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
+ * 3. Neither the name of the University nor the names of its contributors
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the 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[] = "@(#)done.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: done.c,v 1.7 2000/07/03 03:57:39 matt Exp $");
+__RCSID("$NetBSD: done.c,v 1.8 2003/08/07 09:36:50 agc Exp $");
 #endif
 #endif /* not lint */
 

adventure/glorkz

@@ -135,7 +135,7 @@
 71	combined.
 72      You are in a large low room.  Crawls lead north, SE, and SW.
 73	Dead end crawl.
-74	You are in a secret canyon which here runs e/w.  It crosses over a
+74	You are in a secret canyon which here runs E/W.  It crosses over a
 74	very tight canyon 15 feet below.  If you go down you may not be able
 74	to get back up.
 75      You are at a wide place in a very tight N/S canyon.
@@ -182,7 +182,7 @@
 99	distance.  An extremely tight tunnel leads east.  It looks like a very
 99	tight squeeze.  An eerie light can be seen at the other end.
 100	You're in a small chamber lit by an eerie green light.  An extremely
-100	narrow tunnel exits to the west.  A dark corridor leads ne.
+100	narrow tunnel exits to the west.  A dark corridor leads NE.
 101     You're in the Dark-Room.  A corridor leading south is the only exit.
 102	You are in an arched hall.  A coral passage once continued up and east
 102	from here, but is now blocked by debris.  The air smells of sea water.
@@ -249,7 +249,7 @@
 119	You are in a secret canyon which exits to the north and east.
 120	You are in a secret canyon which exits to the north and east.
 121	You are in a secret canyon which exits to the north and east.
-122	You are on the far side of the chasm.  A ne path leads away from the
+122	You are on the far side of the chasm.  A NE path leads away from the
 122	chasm on this side.
 123	You're in a long east/west corridor.  A faint rumbling noise can be
 123	heard in the distance.

adventure/hdr.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: hdr.h,v 1.9 2001/02/05 00:20:05 christos Exp $	*/
+/*	$NetBSD: hdr.h,v 1.10 2003/08/07 09:36:50 agc Exp $	*/
 
 /*-
  * Copyright (c) 1991, 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
+ * 3. Neither the name of the University nor the names of its contributors
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

adventure/init.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: init.c,v 1.13 2001/02/05 00:20:05 christos Exp $	*/
+/*	$NetBSD: init.c,v 1.14 2003/08/07 09:36:50 agc Exp $	*/
 
 /*-
  * Copyright (c) 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
+ * 3. Neither the name of the University nor the names of its contributors
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the 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[] = "@(#)init.c	8.1 (Berkeley) 6/2/93";
 #else
-__RCSID("$NetBSD: init.c,v 1.13 2001/02/05 00:20:05 christos Exp $");
+__RCSID("$NetBSD: init.c,v 1.14 2003/08/07 09:36:50 agc Exp $");
 #endif
 #endif /* not lint */
 

adventure/io.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: io.c,v 1.12 2000/01/09 17:17:19 jsm Exp $	*/
+/*	$NetBSD: io.c,v 1.15 2003/09/19 10:01:53 itojun Exp $	*/
 
 /*-
  * Copyright (c) 1991, 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
+ * 3. Neither the name of the University nor the names of its contributors
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the 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[] = "@(#)io.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: io.c,v 1.12 2000/01/09 17:17:19 jsm Exp $");
+__RCSID("$NetBSD: io.c,v 1.15 2003/09/19 10:01:53 itojun Exp $");
 #endif
 #endif /* not lint */
 
@@ -306,7 +302,7 @@ rdesc(sect)			/* read description-format msgs */
 				ptext[oldloc].txtlen = maystart - seekstart;
 				break;
 			case 6:/* random messages              */
-				if (oldloc > RTXSIZ) 
+				if (oldloc >= RTXSIZ) 
 					errx(1,"Too many random msgs");
 				rtext[oldloc].seekadr = seekhere;
 				rtext[oldloc].txtlen = maystart - seekstart;
@@ -317,7 +313,7 @@ rdesc(sect)			/* read description-format msgs */
 				cval[clsses++] = oldloc;
 				break;
 			case 12:	/* magic messages               */
-				if (oldloc > MAGSIZ)
+				if (oldloc >= MAGSIZ)
 					errx(1,"Too many magic msgs");
 				mtext[oldloc].seekadr = seekhere;
 				mtext[oldloc].txtlen = maystart - seekstart;

adventure/main.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: main.c,v 1.16 2000/07/03 03:57:39 matt Exp $	*/
+/*	$NetBSD: main.c,v 1.17 2003/08/07 09:36:51 agc Exp $	*/
 
 /*-
  * Copyright (c) 1991, 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
+ * 3. Neither the name of the University nor the names of its contributors
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the 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("@(#) Copyright (c) 1991, 1993\n\
 #if 0
 static char sccsid[] = "@(#)main.c	8.1 (Berkeley) 6/2/93";
 #else
-__RCSID("$NetBSD: main.c,v 1.16 2000/07/03 03:57:39 matt Exp $");
+__RCSID("$NetBSD: main.c,v 1.17 2003/08/07 09:36:51 agc Exp $");
 #endif
 #endif /* not lint */
 

adventure/save.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: save.c,v 1.7 1999/07/17 20:02:48 hubertf Exp $	*/
+/*	$NetBSD: save.c,v 1.8 2003/08/07 09:36:51 agc Exp $	*/
 
 /*-
  * Copyright (c) 1991, 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
+ * 3. Neither the name of the University nor the names of its contributors
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the 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[] = "@(#)save.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: save.c,v 1.7 1999/07/17 20:02:48 hubertf Exp $");
+__RCSID("$NetBSD: save.c,v 1.8 2003/08/07 09:36:51 agc Exp $");
 #endif
 #endif				/* not lint */
 

adventure/setup.c

@@ -1,4 +1,4 @@
-/* $NetBSD: setup.c,v 1.9 2001/08/29 18:22:56 jsm Exp $ */
+/* $NetBSD: setup.c,v 1.10 2003/08/07 09:36:51 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
+ * 3. Neither the name of the University nor the names of its contributors
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the 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 const char copyright[] __attribute__((__unused__)) = "@(#) Copyright (c)
 #if 0
 static char sccsid[] = "@(#)setup.c	8.1 (Berkeley) 5/31/93";
 #else
-static const char rcsid[] __attribute__((__unused__)) = "$NetBSD: setup.c,v 1.9 2001/08/29 18:22:56 jsm Exp $";
+static const char rcsid[] __attribute__((__unused__)) = "$NetBSD: setup.c,v 1.10 2003/08/07 09:36:51 agc Exp $";
 #endif
 #endif				/* not lint */
 

adventure/subr.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: subr.c,v 1.9 2000/07/03 03:57:39 matt Exp $	*/
+/*	$NetBSD: subr.c,v 1.10 2003/08/07 09:36:51 agc Exp $	*/
 
 /*-
  * Copyright (c) 1991, 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
+ * 3. Neither the name of the University nor the names of its contributors
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the 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[] = "@(#)subr.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: subr.c,v 1.9 2000/07/03 03:57:39 matt Exp $");
+__RCSID("$NetBSD: subr.c,v 1.10 2003/08/07 09:36:51 agc Exp $");
 #endif
 #endif				/* not lint */
 

adventure/vocab.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: vocab.c,v 1.10 2000/01/09 17:17:19 jsm Exp $	*/
+/*	$NetBSD: vocab.c,v 1.11 2003/08/07 09:36:51 agc Exp $	*/
 
 /*-
  * Copyright (c) 1991, 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
+ * 3. Neither the name of the University nor the names of its contributors
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the 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[] = "@(#)vocab.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: vocab.c,v 1.10 2000/01/09 17:17:19 jsm Exp $");
+__RCSID("$NetBSD: vocab.c,v 1.11 2003/08/07 09:36:51 agc Exp $");
 #endif
 #endif				/* not lint */
 

adventure/wizard.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: wizard.c,v 1.10 1999/07/16 01:38:20 hubertf Exp $	*/
+/*	$NetBSD: wizard.c,v 1.11 2003/08/07 09:36:51 agc Exp $	*/
 
 /*-
  * Copyright (c) 1991, 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
+ * 3. Neither the name of the University nor the names of its contributors
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the 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[] = "@(#)wizard.c	8.1 (Berkeley) 6/2/93";
 #else
-__RCSID("$NetBSD: wizard.c,v 1.10 1999/07/16 01:38:20 hubertf Exp $");
+__RCSID("$NetBSD: wizard.c,v 1.11 2003/08/07 09:36:51 agc Exp $");
 #endif
 #endif				/* not lint */
 

arithmetic/arithmetic.6

@@ -1,4 +1,4 @@
-.\"	$NetBSD: arithmetic.6,v 1.9 2002/09/26 18:31:58 wiz Exp $
+.\"	$NetBSD: arithmetic.6,v 1.11 2003/08/07 09:36:52 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
+.\" 3. Neither the name of the University nor the names of its contributors
-.\"    must display the following acknowledgement:
-.\"	This product includes software developed by the University of
-.\"	California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
 .\"    may be used to endorse or promote products derived from this software
 .\"    without specific prior written permission.
 .\"
@@ -102,7 +98,9 @@ if you get a question wrong.
 .Dq Right!
 if you get it right.
 .Dq Please type a number.
-if arithmetic doesn't understand what you typed.
+if
+.Nm
+doesn't understand what you typed.
 .Sh SEE ALSO
 .Xr bc 1 ,
 .Xr dc 1

arithmetic/arithmetic.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: arithmetic.c,v 1.18 2002/03/31 04:07:22 hubertf Exp $	*/
+/*	$NetBSD: arithmetic.c,v 1.19 2003/08/07 09:36:52 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
+ * 3. Neither the name of the University nor the names of its contributors
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the 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[] = "@(#)arithmetic.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: arithmetic.c,v 1.18 2002/03/31 04:07:22 hubertf Exp $");
+__RCSID("$NetBSD: arithmetic.c,v 1.19 2003/08/07 09:36:52 agc Exp $");
 #endif
 #endif /* not lint */
 

atc/Makefile.bsd

@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.22 1999/07/17 19:57:03 hubertf Exp $
+#	$NetBSD: Makefile,v 1.23 2003/08/01 17:03:42 lukem Exp $
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
 
 .include <bsd.own.mk>
@@ -22,6 +22,4 @@ FILESDIR=/usr/share/games/atc
 FILESMODE=444
 .endif
 
-lex.o:	grammar.h
-
 .include <bsd.prog.mk>

atc/atc.6.in

@@ -1,4 +1,4 @@
-.\"	$NetBSD: atc.6,v 1.16 2003/02/25 10:34:44 wiz Exp $
+.\"	$NetBSD: atc.6,v 1.19 2003/08/07 09:36:53 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
+.\" 3. Neither the name of the University nor the names of its contributors
-.\"    must display the following acknowledgement:
-.\"	This product includes software developed by the University of
-.\"	California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
 .\"    may be used to endorse or promote products derived from this software
 .\"    without specific prior written permission.
 .\"
@@ -122,7 +118,7 @@ Depending on the terminal you run
 on, the screen will be divided into 4 areas.
 It should be stressed that the terminal driver portion of the
 game was designed to be reconfigurable, so the display format can vary
-depending the version you are playing.
+depending on the version you are playing.
 The descriptions here are based on the ascii version of the game.
 The game rules and input format, however, should remain consistent.
 Control-L redraws the screen, should it become muddled.
@@ -377,7 +373,7 @@ Plane X: ignore
 .It
 Jets move every update; prop planes move every other update.
 .It
-All planes turn a most 90 degrees per movement.
+All planes turn at most 90 degrees per movement.
 .It
 Planes enter at 7000 feet and leave at 9000 feet.
 .It
@@ -386,7 +382,8 @@ Planes flying at an altitude of 0 crash if they are not over an airport.
 Planes waiting at airports can only be told to take off (climb in altitude).
 .It
 Pressing return (that is, entering an empty command) will perform the
-next update immediately. This allows you to ``fast forward''
+next update immediately.
+This allows you to ``fast forward''
 the game clock if nothing interesting is happening.
 .El
 .Sh NEW GAMES
@@ -434,8 +431,8 @@ For beacons, a simple x, y coordinate pair is used (enclosed in parenthesis).
 Airports and exits require a third value, which is one of the directions
 .Em wedcxzaq .
 For airports, this is the direction that planes must be going to take
-off and land, and for exits, this is the direction that planes will going
+off and land, and for exits, this is the direction that planes will be
-when they
+going when they
 .Em enter
 the arena.
 This may not seem intuitive, but as there is no restriction on

atc/def.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: def.h,v 1.5 1999/09/30 18:01:31 jsm Exp $	*/
+/*	$NetBSD: def.h,v 1.6 2003/08/07 09:36:53 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
+ * 3. Neither the name of the University nor the names of its contributors
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

atc/extern.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: extern.c,v 1.6 1998/11/10 13:43:30 hubertf Exp $	*/
+/*	$NetBSD: extern.c,v 1.7 2003/08/07 09:36:53 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
+ * 3. Neither the name of the University nor the names of its contributors
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the 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 @@
 #if 0
 static char sccsid[] = "@(#)extern.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: extern.c,v 1.6 1998/11/10 13:43:30 hubertf Exp $");
+__RCSID("$NetBSD: extern.c,v 1.7 2003/08/07 09:36:53 agc Exp $");
 #endif
 #endif /* not lint */
 

atc/extern.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: extern.h,v 1.9 2001/02/05 00:22:52 christos Exp $	*/
+/*	$NetBSD: extern.h,v 1.10 2003/08/07 09:36:53 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
+ * 3. Neither the name of the University nor the names of its contributors
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

atc/grammar.y

@@ -1,4 +1,4 @@
-/*	$NetBSD: grammar.y,v 1.7 1999/07/26 21:14:21 hubertf Exp $	*/
+/*	$NetBSD: grammar.y,v 1.8 2003/08/07 09:36:54 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
+ * 3. Neither the name of the University nor the names of its contributors
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the 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[] = "@(#)grammar.y	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: grammar.y,v 1.7 1999/07/26 21:14:21 hubertf Exp $");
+__RCSID("$NetBSD: grammar.y,v 1.8 2003/08/07 09:36:54 agc Exp $");
 #endif
 #endif /* not lint */
 

atc/graphics.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: graphics.c,v 1.9 1999/09/10 00:16:43 jsm Exp $	*/
+/*	$NetBSD: graphics.c,v 1.10 2003/08/07 09:36:54 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
+ * 3. Neither the name of the University nor the names of its contributors
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the 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 @@
 #if 0
 static char sccsid[] = "@(#)graphics.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: graphics.c,v 1.9 1999/09/10 00:16:43 jsm Exp $");
+__RCSID("$NetBSD: graphics.c,v 1.10 2003/08/07 09:36:54 agc Exp $");
 #endif
 #endif /* not lint */
 

atc/include.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: include.h,v 1.7 2001/08/29 18:23:44 jsm Exp $	*/
+/*	$NetBSD: include.h,v 1.8 2003/08/07 09:36:54 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
+ * 3. Neither the name of the University nor the names of its contributors
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

atc/input.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: input.c,v 1.14 2001/01/16 02:50:28 cgd Exp $	*/
+/*	$NetBSD: input.c,v 1.15 2003/08/07 09:36:54 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
+ * 3. Neither the name of the University nor the names of its contributors
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the 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 @@
 #if 0
 static char sccsid[] = "@(#)input.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: input.c,v 1.14 2001/01/16 02:50:28 cgd Exp $");
+__RCSID("$NetBSD: input.c,v 1.15 2003/08/07 09:36:54 agc Exp $");
 #endif
 #endif /* not lint */
 

atc/lex.l

@@ -1,5 +1,5 @@
 %{
-/*	$NetBSD: lex.l,v 1.6 1998/04/09 00:32:32 tv Exp $	*/
+/*	$NetBSD: lex.l,v 1.7 2003/08/07 09:36:54 agc Exp $	*/
 
 /*-
  * Copyright (c) 1990, 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
+ * 3. Neither the name of the University nor the names of its contributors
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the 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 @@
 #if 0
 static char sccsid[] = "@(#)lex.l	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: lex.l,v 1.6 1998/04/09 00:32:32 tv Exp $");
+__RCSID("$NetBSD: lex.l,v 1.7 2003/08/07 09:36:54 agc Exp $");
 #endif
 #endif /* not lint */
 

atc/list.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: list.c,v 1.5 2001/06/19 13:42:08 wiz Exp $	*/
+/*	$NetBSD: list.c,v 1.6 2003/08/07 09:36:54 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
+ * 3. Neither the name of the University nor the names of its contributors
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the 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 @@
 #if 0
 static char sccsid[] = "@(#)list.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: list.c,v 1.5 2001/06/19 13:42:08 wiz Exp $");
+__RCSID("$NetBSD: list.c,v 1.6 2003/08/07 09:36:54 agc Exp $");
 #endif
 #endif /* not lint */
 

atc/log.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: log.c,v 1.11 2001/01/16 02:50:28 cgd Exp $	*/
+/*	$NetBSD: log.c,v 1.12 2003/08/07 09:36:54 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
+ * 3. Neither the name of the University nor the names of its contributors
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the 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 @@
 #if 0
 static char sccsid[] = "@(#)log.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: log.c,v 1.11 2001/01/16 02:50:28 cgd Exp $");
+__RCSID("$NetBSD: log.c,v 1.12 2003/08/07 09:36:54 agc Exp $");
 #endif
 #endif /* not lint */
 

atc/main.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: main.c,v 1.12 2001/02/05 00:22:52 christos Exp $	*/
+/*	$NetBSD: main.c,v 1.13 2003/08/07 09:36:54 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
+ * 3. Neither the name of the University nor the names of its contributors
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the 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 @@ __COPYRIGHT("@(#) Copyright (c) 1990, 1993\n\
 #if 0
 static char sccsid[] = "@(#)main.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: main.c,v 1.12 2001/02/05 00:22:52 christos Exp $");
+__RCSID("$NetBSD: main.c,v 1.13 2003/08/07 09:36:54 agc Exp $");
 #endif
 #endif /* not lint */
 

atc/pathnames.h.in

@@ -1,4 +1,4 @@
-/*	$NetBSD: pathnames.h,v 1.3 1995/03/21 15:04:28 cgd Exp $	*/
+/*	$NetBSD: pathnames.h,v 1.4 2003/08/07 09:36:54 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
+ * 3. Neither the name of the University nor the names of its contributors
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

atc/struct.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: struct.h,v 1.4 1999/07/17 19:57:03 hubertf Exp $	*/
+/*	$NetBSD: struct.h,v 1.5 2003/08/07 09:36:54 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
+ * 3. Neither the name of the University nor the names of its contributors
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

atc/tunable.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: tunable.c,v 1.4 1997/10/10 02:07:32 lukem Exp $	*/
+/*	$NetBSD: tunable.c,v 1.5 2003/08/07 09:36:55 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
+ * 3. Neither the name of the University nor the names of its contributors
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the 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 @@
 #if 0
 static char sccsid[] = "@(#)tunable.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: tunable.c,v 1.4 1997/10/10 02:07:32 lukem Exp $");
+__RCSID("$NetBSD: tunable.c,v 1.5 2003/08/07 09:36:55 agc Exp $");
 #endif
 #endif /* not lint */
 

atc/tunable.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: tunable.h,v 1.3 1995/03/21 15:04:35 cgd Exp $	*/
+/*	$NetBSD: tunable.h,v 1.4 2003/08/07 09:36:55 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
+ * 3. Neither the name of the University nor the names of its contributors
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

atc/update.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: update.c,v 1.11 2001/01/16 02:50:28 cgd Exp $	*/
+/*	$NetBSD: update.c,v 1.12 2003/08/07 09:36:55 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
+ * 3. Neither the name of the University nor the names of its contributors
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the 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 @@
 #if 0
 static char sccsid[] = "@(#)update.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: update.c,v 1.11 2001/01/16 02:50:28 cgd Exp $");
+__RCSID("$NetBSD: update.c,v 1.12 2003/08/07 09:36:55 agc Exp $");
 #endif
 #endif /* not lint */
 

backgammon/backgammon/backgammon.6.in

@@ -1,4 +1,4 @@
-.\"	$NetBSD: backgammon.6,v 1.9 2002/09/26 18:31:58 wiz Exp $
+.\"	$NetBSD: backgammon.6,v 1.11 2003/08/07 09:36:55 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
+.\" 3. Neither the name of the University nor the names of its contributors
-.\"    must display the following acknowledgement:
-.\"	This product includes software developed by the University of
-.\"	California, Berkeley and its contributors.
-.\" 4. Neither the name of the 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,13 +52,13 @@
 .Sh DESCRIPTION
 This program lets you play backgammon against the computer
 or against a "friend".
-All commands only are one letter, so you don't need to type a carriage return,
+All commands are only one letter, so you don't need to type a carriage return,
 except at the end of a move.
-The program is mostly self documenting,
+The program is mostly self-explanatory,
 so that a question mark (?) will usually get some help.
 If you answer `y' when the program asks if you want the rules,
 you will get text explaining the rules of the game, some hints on strategy,
-instruction on how to use the program,
+instructions on how to use the program,
 and a tutorial consisting of a practice game against the computer.
 A description of how to use the program can be
 obtained by answering `y' when it asks if you want instructions.
@@ -92,7 +88,7 @@ uses
 .Pa /usr/share/misc/termcap
 .It Fl s Ar file
 recover previously saved game from
-.Ar file .
+.Ar file
 .El
 .Pp
 .\"

backgammon/backgammon/extra.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: extra.c,v 1.4 1997/10/10 08:59:36 lukem Exp $	*/
+/*	$NetBSD: extra.c,v 1.5 2003/08/07 09:36:55 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
+ * 3. Neither the name of the University nor the names of its contributors
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the 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[] = "@(#)extra.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: extra.c,v 1.4 1997/10/10 08:59:36 lukem Exp $");
+__RCSID("$NetBSD: extra.c,v 1.5 2003/08/07 09:36:55 agc Exp $");
 #endif
 #endif /* not lint */
 

backgammon/backgammon/main.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: main.c,v 1.17 2001/09/18 18:15:49 wiz Exp $	*/
+/*	$NetBSD: main.c,v 1.18 2003/08/07 09:36:56 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
+ * 3. Neither the name of the University nor the names of its contributors
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the 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) 5/31/93";
 #else
-__RCSID("$NetBSD: main.c,v 1.17 2001/09/18 18:15:49 wiz Exp $");
+__RCSID("$NetBSD: main.c,v 1.18 2003/08/07 09:36:56 agc Exp $");
 #endif
 #endif				/* not lint */
 
@@ -478,7 +474,7 @@ main(argc, argv)
 		/* compute game value */
 		if (tflag)
 			curmove(20, 0);
-		if (*offopp == 15 && *offptr <= 0) {
+		if (*offopp == 15 && (*offptr == 0 || *offptr == -15)) {
 			if (mflag) {
 				writel(bgammon);
 				gvalue *= 3;

backgammon/backgammon/move.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: move.c,v 1.6 1997/10/10 08:59:37 lukem Exp $	*/
+/*	$NetBSD: move.c,v 1.7 2003/08/07 09:36:56 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
+ * 3. Neither the name of the University nor the names of its contributors
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the 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[] = "@(#)move.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: move.c,v 1.6 1997/10/10 08:59:37 lukem Exp $");
+__RCSID("$NetBSD: move.c,v 1.7 2003/08/07 09:36:56 agc Exp $");
 #endif
 #endif /* not lint */
 

backgammon/backgammon/text.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: text.c,v 1.6 1999/02/10 12:29:47 hubertf Exp $	*/
+/*	$NetBSD: text.c,v 1.7 2003/08/07 09:36:56 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
+ * 3. Neither the name of the University nor the names of its contributors
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the 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[] = "@(#)text.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: text.c,v 1.6 1999/02/10 12:29:47 hubertf Exp $");
+__RCSID("$NetBSD: text.c,v 1.7 2003/08/07 09:36:56 agc Exp $");
 #endif
 #endif /* not lint */
 

backgammon/backgammon/version.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: version.c,v 1.5 1999/02/10 12:29:47 hubertf Exp $	*/
+/*	$NetBSD: version.c,v 1.6 2003/08/07 09:36:56 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
+ * 3. Neither the name of the University nor the names of its contributors
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the 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) 5/31/93";
 #else
-__RCSID("$NetBSD: version.c,v 1.5 1999/02/10 12:29:47 hubertf Exp $");
+__RCSID("$NetBSD: version.c,v 1.6 2003/08/07 09:36:56 agc Exp $");
 #endif
 #endif /* not lint */
 

backgammon/common_source/allow.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: allow.c,v 1.4 1997/10/10 08:59:41 lukem Exp $	*/
+/*	$NetBSD: allow.c,v 1.5 2003/08/07 09:36:56 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
+ * 3. Neither the name of the University nor the names of its contributors
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the 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[] = "@(#)allow.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: allow.c,v 1.4 1997/10/10 08:59:41 lukem Exp $");
+__RCSID("$NetBSD: allow.c,v 1.5 2003/08/07 09:36:56 agc Exp $");
 #endif
 #endif /* not lint */
 

backgammon/common_source/back.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: back.h,v 1.12 1999/10/04 23:26:59 lukem Exp $	*/
+/*	$NetBSD: back.h,v 1.13 2003/08/07 09:36:56 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
+ * 3. Neither the name of the University nor the names of its contributors
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

backgammon/common_source/board.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: board.c,v 1.6 1999/02/10 12:29:47 hubertf Exp $	*/
+/*	$NetBSD: board.c,v 1.7 2003/08/07 09:36:57 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
+ * 3. Neither the name of the University nor the names of its contributors
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the 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[] = "@(#)board.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: board.c,v 1.6 1999/02/10 12:29:47 hubertf Exp $");
+__RCSID("$NetBSD: board.c,v 1.7 2003/08/07 09:36:57 agc Exp $");
 #endif
 #endif /* not lint */
 

backgammon/common_source/check.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: check.c,v 1.4 1997/10/10 08:59:44 lukem Exp $	*/
+/*	$NetBSD: check.c,v 1.5 2003/08/07 09:36:57 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
+ * 3. Neither the name of the University nor the names of its contributors
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the 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[] = "@(#)check.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: check.c,v 1.4 1997/10/10 08:59:44 lukem Exp $");
+__RCSID("$NetBSD: check.c,v 1.5 2003/08/07 09:36:57 agc Exp $");
 #endif
 #endif /* not lint */
 

backgammon/common_source/fancy.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: fancy.c,v 1.10 1999/07/26 18:39:06 hubertf Exp $	*/
+/*	$NetBSD: fancy.c,v 1.11 2003/08/07 09:36:57 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
+ * 3. Neither the name of the University nor the names of its contributors
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the 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[] = "@(#)fancy.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: fancy.c,v 1.10 1999/07/26 18:39:06 hubertf Exp $");
+__RCSID("$NetBSD: fancy.c,v 1.11 2003/08/07 09:36:57 agc Exp $");
 #endif
 #endif /* not lint */
 

backgammon/common_source/init.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: init.c,v 1.7 1999/02/10 12:29:48 hubertf Exp $	*/
+/*	$NetBSD: init.c,v 1.8 2003/08/07 09:36:57 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
+ * 3. Neither the name of the University nor the names of its contributors
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the 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.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: init.c,v 1.7 1999/02/10 12:29:48 hubertf Exp $");
+__RCSID("$NetBSD: init.c,v 1.8 2003/08/07 09:36:57 agc Exp $");
 #endif
 #endif /* not lint */
 

backgammon/common_source/odds.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: odds.c,v 1.4 1997/10/10 08:59:46 lukem Exp $	*/
+/*	$NetBSD: odds.c,v 1.5 2003/08/07 09:36:57 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
+ * 3. Neither the name of the University nor the names of its contributors
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the 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[] = "@(#)odds.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: odds.c,v 1.4 1997/10/10 08:59:46 lukem Exp $");
+__RCSID("$NetBSD: odds.c,v 1.5 2003/08/07 09:36:57 agc Exp $");
 #endif
 #endif /* not lint */
 

backgammon/common_source/one.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: one.c,v 1.4 1997/10/10 08:59:47 lukem Exp $	*/
+/*	$NetBSD: one.c,v 1.5 2003/08/07 09:36:57 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
+ * 3. Neither the name of the University nor the names of its contributors
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the 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[] = "@(#)one.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: one.c,v 1.4 1997/10/10 08:59:47 lukem Exp $");
+__RCSID("$NetBSD: one.c,v 1.5 2003/08/07 09:36:57 agc Exp $");
 #endif
 #endif /* not lint */
 

backgammon/common_source/save.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: save.c,v 1.9 1999/07/28 02:07:39 hubertf Exp $	*/
+/*	$NetBSD: save.c,v 1.10 2003/08/07 09:36:57 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
+ * 3. Neither the name of the University nor the names of its contributors
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the 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[] = "@(#)save.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: save.c,v 1.9 1999/07/28 02:07:39 hubertf Exp $");
+__RCSID("$NetBSD: save.c,v 1.10 2003/08/07 09:36:57 agc Exp $");
 #endif
 #endif /* not lint */
 

backgammon/common_source/subs.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: subs.c,v 1.13 1999/10/04 23:26:59 lukem Exp $	*/
+/*	$NetBSD: subs.c,v 1.14 2003/08/07 09:36:57 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
+ * 3. Neither the name of the University nor the names of its contributors
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the 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[] = "@(#)subs.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: subs.c,v 1.13 1999/10/04 23:26:59 lukem Exp $");
+__RCSID("$NetBSD: subs.c,v 1.14 2003/08/07 09:36:57 agc Exp $");
 #endif
 #endif /* not lint */
 

backgammon/common_source/table.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: table.c,v 1.6 1999/02/10 12:29:48 hubertf Exp $	*/
+/*	$NetBSD: table.c,v 1.7 2003/08/07 09:36:57 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
+ * 3. Neither the name of the University nor the names of its contributors
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the 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.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: table.c,v 1.6 1999/02/10 12:29:48 hubertf Exp $");
+__RCSID("$NetBSD: table.c,v 1.7 2003/08/07 09:36:57 agc Exp $");
 #endif
 #endif /* not lint */
 

backgammon/teachgammon/data.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: data.c,v 1.5 1999/02/10 12:29:48 hubertf Exp $	*/
+/*	$NetBSD: data.c,v 1.6 2003/08/07 09:36:58 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
+ * 3. Neither the name of the University nor the names of its contributors
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the 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[] = "@(#)data.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: data.c,v 1.5 1999/02/10 12:29:48 hubertf Exp $");
+__RCSID("$NetBSD: data.c,v 1.6 2003/08/07 09:36:58 agc Exp $");
 #endif
 #endif				/* not lint */
 
@@ -92,7 +88,7 @@ const char   *const text4[] = {
 
 const char   *const text5[] = {
 	"Not a spectacular move, but a safe one.  I follow by rolling 6 1.",
-	"I decide to use this roll to move 22-16,16-17.  It leaves me with",
+	"I decide to use this roll to move 22-16,16-15.  It leaves me with",
 	"one man still open, but the blot is farther back on the board, and",
 	"would suffer less of a loss by being hit.",
 	0
@@ -123,7 +119,7 @@ const char   *const text8[] = {
 
 const char   *const text9[] = {
 	"My venture off the bar did not last long.  However, I got lucky",
-	"and rolled double 1's, allowing me to move 0-1,1-2,15-14,15-14.",
+	"and rolled double 1's, allowing me to move 25-24,24-23,15-14,15-14.",
 	0
 };
 

backgammon/teachgammon/teach.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: teach.c,v 1.13 2001/04/06 11:13:52 wiz Exp $	*/
+/*	$NetBSD: teach.c,v 1.14 2003/08/07 09:36:58 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
+ * 3. Neither the name of the University nor the names of its contributors
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the 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[] = "@(#)teach.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: teach.c,v 1.13 2001/04/06 11:13:52 wiz Exp $");
+__RCSID("$NetBSD: teach.c,v 1.14 2003/08/07 09:36:58 agc Exp $");
 #endif
 #endif				/* not lint */
 

backgammon/teachgammon/ttext1.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: ttext1.c,v 1.6 1999/07/25 00:06:13 hubertf Exp $	*/
+/*	$NetBSD: ttext1.c,v 1.7 2003/08/07 09:36:58 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
+ * 3. Neither the name of the University nor the names of its contributors
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the 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[] = "@(#)ttext1.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: ttext1.c,v 1.6 1999/07/25 00:06:13 hubertf Exp $");
+__RCSID("$NetBSD: ttext1.c,v 1.7 2003/08/07 09:36:58 agc Exp $");
 #endif
 #endif				/* not lint */
 

backgammon/teachgammon/ttext2.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: ttext2.c,v 1.6 1999/02/10 12:29:48 hubertf Exp $	*/
+/*	$NetBSD: ttext2.c,v 1.7 2003/08/07 09:36:58 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
+ * 3. Neither the name of the University nor the names of its contributors
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the 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[] = "@(#)ttext2.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: ttext2.c,v 1.6 1999/02/10 12:29:48 hubertf Exp $");
+__RCSID("$NetBSD: ttext2.c,v 1.7 2003/08/07 09:36:58 agc Exp $");
 #endif
 #endif				/* not lint */
 

backgammon/teachgammon/tutor.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: tutor.c,v 1.5 1999/02/10 12:29:48 hubertf Exp $	*/
+/*	$NetBSD: tutor.c,v 1.6 2003/08/07 09:36:58 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
+ * 3. Neither the name of the University nor the names of its contributors
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the 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[] = "@(#)tutor.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: tutor.c,v 1.5 1999/02/10 12:29:48 hubertf Exp $");
+__RCSID("$NetBSD: tutor.c,v 1.6 2003/08/07 09:36:58 agc Exp $");
 #endif
 #endif				/* not lint */
 

backgammon/teachgammon/tutor.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: tutor.h,v 1.6 1999/02/10 12:29:48 hubertf Exp $	*/
+/*	$NetBSD: tutor.h,v 1.7 2003/08/07 09:36:59 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
+ * 3. Neither the name of the University nor the names of its contributors
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

banner/banner.6

@@ -1,4 +1,4 @@
-.\"	$NetBSD: banner.6,v 1.12 2002/09/26 18:31:59 wiz Exp $
+.\"	$NetBSD: banner.6,v 1.13 2003/08/07 09:36:59 agc Exp $
 .\"
 .\" Copyright (c) 1980, 1993, 1995
 .\"	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
+.\" 3. Neither the name of the University nor the names of its contributors
-.\"    must display the following acknowledgement:
-.\"	This product includes software developed by the University of
-.\"	California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
 .\"    may be used to endorse or promote products derived from this software
 .\"    without specific prior written permission.
 .\"

banner/banner.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: banner.c,v 1.10 1999/07/19 19:07:17 hubertf Exp $	*/
+/*	$NetBSD: banner.c,v 1.11 2003/08/07 09:36:59 agc Exp $	*/
 
 /*
  * Copyright (c) 1980, 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
+ * 3. Neither the name of the University nor the names of its contributors
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the 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, 1994\n\
 #if 0
 static char sccsid[] = "@(#)banner.c	8.4 (Berkeley) 4/29/95";
 #else
-__RCSID("$NetBSD: banner.c,v 1.10 1999/07/19 19:07:17 hubertf Exp $");
+__RCSID("$NetBSD: banner.c,v 1.11 2003/08/07 09:36:59 agc Exp $");
 #endif
 #endif /* not lint */
 

battlestar/battlestar.6

@@ -1,4 +1,4 @@
-.\"	$NetBSD: battlestar.6,v 1.12 2002/09/26 18:31:59 wiz Exp $
+.\"	$NetBSD: battlestar.6,v 1.14 2003/08/07 09:37:00 agc Exp $
 .\"
 .\" Copyright (c) 1983, 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
+.\" 3. Neither the name of the University nor the names of its contributors
-.\"    must display the following acknowledgement:
-.\"	This product includes software developed by the University of
-.\"	California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
 .\"    may be used to endorse or promote products derived from this software
 .\"    without specific prior written permission.
 .\"
@@ -64,7 +60,7 @@ They could take any object from thin air, and, uttering the word
 .Sq su
 could disappear.
 .Pp
-In those times men were known for their lust of gold and desire to
+In those times men were known for their lust for gold and desire to
 wear fine weapons.
 Swords and coats of mail were fashioned that could withstand a laser blast.
 .Pp

battlestar/battlestar.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: battlestar.c,v 1.12 2000/09/21 17:44:34 jsm Exp $	*/
+/*	$NetBSD: battlestar.c,v 1.13 2003/08/07 09:37:00 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
+ * 3. Neither the name of the University nor the names of its contributors
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the 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[] = "@(#)battlestar.c	8.2 (Berkeley) 4/28/95";
 #else
-__RCSID("$NetBSD: battlestar.c,v 1.12 2000/09/21 17:44:34 jsm Exp $");
+__RCSID("$NetBSD: battlestar.c,v 1.13 2003/08/07 09:37:00 agc Exp $");
 #endif
 #endif				/* not lint */
 

battlestar/command1.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: command1.c,v 1.1 2001/10/19 03:06:11 tv Exp $	*/
+/*	$NetBSD: command1.c,v 1.2 2003/08/07 09:37:00 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
+ * 3. Neither the name of the University nor the names of its contributors
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the 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[] = "@(#)com1.c	8.2 (Berkeley) 4/28/95";
 #else
-__RCSID("$NetBSD: command1.c,v 1.1 2001/10/19 03:06:11 tv Exp $");
+__RCSID("$NetBSD: command1.c,v 1.2 2003/08/07 09:37:00 agc Exp $");
 #endif
 #endif				/* not lint */
 

battlestar/command2.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: command2.c,v 1.1 2001/10/19 03:06:11 tv Exp $	*/
+/*	$NetBSD: command2.c,v 1.2 2003/08/07 09:37:00 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
+ * 3. Neither the name of the University nor the names of its contributors
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the 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[] = "@(#)com2.c	8.2 (Berkeley) 4/28/95";
 #else
-__RCSID("$NetBSD: command2.c,v 1.1 2001/10/19 03:06:11 tv Exp $");
+__RCSID("$NetBSD: command2.c,v 1.2 2003/08/07 09:37:00 agc Exp $");
 #endif
 #endif				/* not lint */
 

battlestar/command3.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: command3.c,v 1.1 2001/10/19 03:06:11 tv Exp $	*/
+/*	$NetBSD: command3.c,v 1.2 2003/08/07 09:37:00 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
+ * 3. Neither the name of the University nor the names of its contributors
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the 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[] = "@(#)com3.c	8.2 (Berkeley) 4/28/95";
 #else
-__RCSID("$NetBSD: command3.c,v 1.1 2001/10/19 03:06:11 tv Exp $");
+__RCSID("$NetBSD: command3.c,v 1.2 2003/08/07 09:37:00 agc Exp $");
 #endif
 #endif				/* not lint */
 

battlestar/command4.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: command4.c,v 1.1 2001/10/19 03:06:11 tv Exp $	*/
+/*	$NetBSD: command4.c,v 1.2 2003/08/07 09:37:00 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
+ * 3. Neither the name of the University nor the names of its contributors
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the 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[] = "@(#)com4.c	8.2 (Berkeley) 4/28/95";
 #else
-__RCSID("$NetBSD: command4.c,v 1.1 2001/10/19 03:06:11 tv Exp $");
+__RCSID("$NetBSD: command4.c,v 1.2 2003/08/07 09:37:00 agc Exp $");
 #endif
 #endif				/* not lint */
 

battlestar/command5.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: command5.c,v 1.1 2001/10/19 03:06:11 tv Exp $	*/
+/*	$NetBSD: command5.c,v 1.2 2003/08/07 09:37:00 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
+ * 3. Neither the name of the University nor the names of its contributors
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the 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[] = "@(#)com5.c	8.2 (Berkeley) 4/28/95";
 #else
-__RCSID("$NetBSD: command5.c,v 1.1 2001/10/19 03:06:11 tv Exp $");
+__RCSID("$NetBSD: command5.c,v 1.2 2003/08/07 09:37:00 agc Exp $");
 #endif
 #endif				/* not lint */
 

battlestar/command6.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: command6.c,v 1.1 2001/10/19 03:06:11 tv Exp $	*/
+/*	$NetBSD: command6.c,v 1.2 2003/08/07 09:37:01 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
+ * 3. Neither the name of the University nor the names of its contributors
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the 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[] = "@(#)com6.c	8.2 (Berkeley) 4/28/95";
 #else
-__RCSID("$NetBSD: command6.c,v 1.1 2001/10/19 03:06:11 tv Exp $");
+__RCSID("$NetBSD: command6.c,v 1.2 2003/08/07 09:37:01 agc Exp $");
 #endif
 #endif				/* not lint */
 

battlestar/command7.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: command7.c,v 1.1 2001/10/19 03:06:11 tv Exp $	*/
+/*	$NetBSD: command7.c,v 1.2 2003/08/07 09:37:01 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
+ * 3. Neither the name of the University nor the names of its contributors
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the 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[] = "@(#)com7.c	8.2 (Berkeley) 4/28/95";
 #else
-__RCSID("$NetBSD: command7.c,v 1.1 2001/10/19 03:06:11 tv Exp $");
+__RCSID("$NetBSD: command7.c,v 1.2 2003/08/07 09:37:01 agc Exp $");
 #endif
 #endif				/* not lint */
 

battlestar/cypher.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: cypher.c,v 1.21 2000/09/25 19:37:58 jsm Exp $	*/
+/*	$NetBSD: cypher.c,v 1.22 2003/08/07 09:37:01 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
+ * 3. Neither the name of the University nor the names of its contributors
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the 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[] = "@(#)cypher.c	8.2 (Berkeley) 4/28/95";
 #else
-__RCSID("$NetBSD: cypher.c,v 1.21 2000/09/25 19:37:58 jsm Exp $");
+__RCSID("$NetBSD: cypher.c,v 1.22 2003/08/07 09:37:01 agc Exp $");
 #endif
 #endif				/* not lint */
 

battlestar/dayfile.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: dayfile.c,v 1.11 2000/09/18 06:14:31 jsm Exp $	*/
+/*	$NetBSD: dayfile.c,v 1.12 2003/08/07 09:37:01 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
+ * 3. Neither the name of the University nor the names of its contributors
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the 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[] = "@(#)dayfile.c	8.2 (Berkeley) 4/28/95";
 #else
-__RCSID("$NetBSD: dayfile.c,v 1.11 2000/09/18 06:14:31 jsm Exp $");
+__RCSID("$NetBSD: dayfile.c,v 1.12 2003/08/07 09:37:01 agc Exp $");
 #endif
 #endif				/* not lint */
 

battlestar/dayobjs.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: dayobjs.c,v 1.8 1999/09/18 16:42:29 jsm Exp $	*/
+/*	$NetBSD: dayobjs.c,v 1.9 2003/08/07 09:37:01 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
+ * 3. Neither the name of the University nor the names of its contributors
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the 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[] = "@(#)dayobjs.c	8.2 (Berkeley) 4/28/95";
 #else
-__RCSID("$NetBSD: dayobjs.c,v 1.8 1999/09/18 16:42:29 jsm Exp $");
+__RCSID("$NetBSD: dayobjs.c,v 1.9 2003/08/07 09:37:01 agc Exp $");
 #endif
 #endif				/* not lint */
 

battlestar/extern.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: extern.h,v 1.28 2000/09/25 19:37:59 jsm Exp $ */
+/*	$NetBSD: extern.h,v 1.29 2003/08/07 09:37:02 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
+ * 3. Neither the name of the University nor the names of its contributors
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

battlestar/fly.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: fly.c,v 1.10 2001/12/04 13:00:24 blymn Exp $	*/
+/*	$NetBSD: fly.c,v 1.11 2003/08/07 09:37:02 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
+ * 3. Neither the name of the University nor the names of its contributors
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the 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[] = "@(#)fly.c	8.2 (Berkeley) 4/28/95";
 #else
-__RCSID("$NetBSD: fly.c,v 1.10 2001/12/04 13:00:24 blymn Exp $");
+__RCSID("$NetBSD: fly.c,v 1.11 2003/08/07 09:37:02 agc Exp $");
 #endif
 #endif				/* not lint */
 

battlestar/getcom.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: getcom.c,v 1.10 2000/09/24 15:51:40 jsm Exp $	*/
+/*	$NetBSD: getcom.c,v 1.11 2003/08/07 09:37:02 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
+ * 3. Neither the name of the University nor the names of its contributors
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the 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[] = "@(#)getcom.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: getcom.c,v 1.10 2000/09/24 15:51:40 jsm Exp $");
+__RCSID("$NetBSD: getcom.c,v 1.11 2003/08/07 09:37:02 agc Exp $");
 #endif
 #endif				/* not lint */
 

battlestar/globals.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: globals.c,v 1.18 2000/09/25 14:45:01 jsm Exp $	*/
+/*	$NetBSD: globals.c,v 1.19 2003/08/07 09:37:02 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
+ * 3. Neither the name of the University nor the names of its contributors
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the 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	8.2 (Berkeley) 4/28/95";
 #else
-__RCSID("$NetBSD: globals.c,v 1.18 2000/09/25 14:45:01 jsm Exp $");
+__RCSID("$NetBSD: globals.c,v 1.19 2003/08/07 09:37:02 agc Exp $");
 #endif
 #endif				/* not lint */
 

battlestar/init.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: init.c,v 1.12 2000/09/09 09:37:58 jsm Exp $	*/
+/*	$NetBSD: init.c,v 1.13 2003/08/07 09:37:02 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
+ * 3. Neither the name of the University nor the names of its contributors
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the 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.c	8.4 (Berkeley) 4/30/95";
 #else
-__RCSID("$NetBSD: init.c,v 1.12 2000/09/09 09:37:58 jsm Exp $");
+__RCSID("$NetBSD: init.c,v 1.13 2003/08/07 09:37:02 agc Exp $");
 #endif
 #endif				/* not lint */
 

battlestar/misc.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: misc.c,v 1.7 1999/02/10 01:36:50 hubertf Exp $	*/
+/*	$NetBSD: misc.c,v 1.8 2003/08/07 09:37:02 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
+ * 3. Neither the name of the University nor the names of its contributors
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the 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.2 (Berkeley) 4/28/95";
 #else
-__RCSID("$NetBSD: misc.c,v 1.7 1999/02/10 01:36:50 hubertf Exp $");
+__RCSID("$NetBSD: misc.c,v 1.8 2003/08/07 09:37:02 agc Exp $");
 #endif
 #endif				/* not lint */
 

battlestar/nightfile.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: nightfile.c,v 1.11 2000/09/18 06:14:32 jsm Exp $	*/
+/*	$NetBSD: nightfile.c,v 1.12 2003/08/07 09:37:02 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
+ * 3. Neither the name of the University nor the names of its contributors
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the 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[] = "@(#)nightfile.c	8.2 (Berkeley) 4/28/95";
 #else
-__RCSID("$NetBSD: nightfile.c,v 1.11 2000/09/18 06:14:32 jsm Exp $");
+__RCSID("$NetBSD: nightfile.c,v 1.12 2003/08/07 09:37:02 agc Exp $");
 #endif
 #endif				/* not lint */
 

battlestar/nightobjs.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: nightobjs.c,v 1.8 1999/09/18 16:42:29 jsm Exp $	*/
+/*	$NetBSD: nightobjs.c,v 1.9 2003/08/07 09:37: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
+ * 3. Neither the name of the University nor the names of its contributors
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the 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[] = "@(#)nightobjs.c	8.2 (Berkeley) 4/28/95";
 #else
-__RCSID("$NetBSD: nightobjs.c,v 1.8 1999/09/18 16:42:29 jsm Exp $");
+__RCSID("$NetBSD: nightobjs.c,v 1.9 2003/08/07 09:37:03 agc Exp $");
 #endif
 #endif				/* not lint */
 

battlestar/parse.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: parse.c,v 1.12 2001/06/19 13:42:09 wiz Exp $	*/
+/*	$NetBSD: parse.c,v 1.13 2003/08/07 09:37: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
+ * 3. Neither the name of the University nor the names of its contributors
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the 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.2 (Berkeley) 4/28/95";
 #else
-__RCSID("$NetBSD: parse.c,v 1.12 2001/06/19 13:42:09 wiz Exp $");
+__RCSID("$NetBSD: parse.c,v 1.13 2003/08/07 09:37:03 agc Exp $");
 #endif
 #endif				/* not lint */
 

battlestar/pathnames.h.in

@@ -1,4 +1,4 @@
-/*	$NetBSD: pathnames.h,v 1.3 1995/03/21 15:07:51 cgd Exp $	*/
+/*	$NetBSD: pathnames.h,v 1.4 2003/08/07 09:37:03 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
+ * 3. Neither the name of the University nor the names of its contributors
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

battlestar/room.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: room.c,v 1.10 2000/09/17 23:03:43 jsm Exp $	*/
+/*	$NetBSD: room.c,v 1.11 2003/08/07 09:37: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
+ * 3. Neither the name of the University nor the names of its contributors
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the 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[] = "@(#)room.c	8.2 (Berkeley) 4/28/95";
 #else
-__RCSID("$NetBSD: room.c,v 1.10 2000/09/17 23:03:43 jsm Exp $");
+__RCSID("$NetBSD: room.c,v 1.11 2003/08/07 09:37:03 agc Exp $");
 #endif
 #endif				/* not lint */
 

battlestar/save.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: save.c,v 1.10 2000/01/09 17:17:20 jsm Exp $	*/
+/*	$NetBSD: save.c,v 1.11 2003/08/07 09:37: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
+ * 3. Neither the name of the University nor the names of its contributors
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the 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[] = "@(#)save.c	8.2 (Berkeley) 4/28/95";
 #else
-__RCSID("$NetBSD: save.c,v 1.10 2000/01/09 17:17:20 jsm Exp $");
+__RCSID("$NetBSD: save.c,v 1.11 2003/08/07 09:37:03 agc Exp $");
 #endif
 #endif				/* not lint */
 

battlestar/words.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: words.c,v 1.10 2000/09/25 19:37:59 jsm Exp $	*/
+/*	$NetBSD: words.c,v 1.11 2003/08/07 09:37: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
+ * 3. Neither the name of the University nor the names of its contributors
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the 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[] = "@(#)words.c	8.2 (Berkeley) 4/28/95";
 #else
-__RCSID("$NetBSD: words.c,v 1.10 2000/09/25 19:37:59 jsm Exp $");
+__RCSID("$NetBSD: words.c,v 1.11 2003/08/07 09:37:03 agc Exp $");
 #endif
 #endif				/* not lint */
 

bcd/bcd.6

@@ -1,4 +1,4 @@
-.\"	$NetBSD: bcd.6,v 1.15 2003/02/25 10:34:45 wiz Exp $
+.\"	$NetBSD: bcd.6,v 1.16 2003/08/07 09:37:04 agc Exp $
 .\"
 .\" Copyright (c) 1988, 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
+.\" 3. Neither the name of the University nor the names of its contributors
-.\"    must display the following acknowledgement:
-.\"	This product includes software developed by the University of
-.\"	California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
 .\"    may be used to endorse or promote products derived from this software
 .\"    without specific prior written permission.
 .\"

bcd/bcd.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: bcd.c,v 1.11 2000/07/03 03:57:40 matt Exp $	*/
+/*	$NetBSD: bcd.c,v 1.12 2003/08/07 09:37:04 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
+ * 3. Neither the name of the University nor the names of its contributors
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the 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[] = "@(#)bcd.c	8.2 (Berkeley) 3/20/94";
 #else
-__RCSID("$NetBSD: bcd.c,v 1.11 2000/07/03 03:57:40 matt Exp $");
+__RCSID("$NetBSD: bcd.c,v 1.12 2003/08/07 09:37:04 agc Exp $");
 #endif
 #endif /* not lint */
 

boggle/Makefile.bsd

@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.19 2002/09/18 02:51:46 lukem Exp $
+#	$NetBSD: Makefile,v 1.22 2003/10/21 10:01:19 lukem Exp $
 #	@(#)Makefile	8.1 (Berkeley) 6/11/93
 
 .include <bsd.own.mk>
@@ -26,10 +26,12 @@ ${MKINDEX}:
 	@cd ${.CURDIR}/mkindex && ${MAKE}
 
 dictionary: ${WORDS} ${MKDICT}
+	${_MKTARGET_CREATE}
 	rm -f ${.TARGET}
 	${MKDICT} < ${WORDS} > ${.TARGET}
 
 dictindex: dictionary ${MKINDEX}
+	${_MKTARGET_CREATE}
 	rm -f ${.TARGET}
 	${MKINDEX} < dictionary > ${.TARGET}
 

boggle/boggle/bog.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: bog.c,v 1.16 2000/05/08 07:56:02 mycroft Exp $	*/
+/*	$NetBSD: bog.c,v 1.17 2003/08/07 09:37:05 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
+ * 3. Neither the name of the University nor the names of its contributors
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the 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) 1993\n\
 #if 0
 static char sccsid[] = "@(#)bog.c	8.2 (Berkeley) 5/4/95";
 #else
-__RCSID("$NetBSD: bog.c,v 1.16 2000/05/08 07:56:02 mycroft Exp $");
+__RCSID("$NetBSD: bog.c,v 1.17 2003/08/07 09:37:05 agc Exp $");
 #endif
 #endif /* not lint */
 

boggle/boggle/bog.h.in

@@ -1,4 +1,4 @@
-/*	$NetBSD: bog.h,v 1.2 1995/03/21 12:14:32 cgd Exp $	*/
+/*	$NetBSD: bog.h,v 1.3 2003/08/07 09:37:05 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
+ * 3. Neither the name of the University nor the names of its contributors
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

boggle/boggle/boggle.6

@@ -1,4 +1,4 @@
-.\"	$NetBSD: boggle.6,v 1.5 2002/09/26 18:31:59 wiz Exp $
+.\"	$NetBSD: boggle.6,v 1.7 2003/08/07 09:37:05 agc Exp $
 .\"
 .\" Copyright (c) 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
+.\" 3. Neither the name of the University nor the names of its contributors
-.\"    must display the following acknowledgement:
-.\"	This product includes software developed by the University of
-.\"	California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
 .\"    may be used to endorse or promote products derived from this software
 .\"    without specific prior written permission.
 .\"
@@ -99,7 +95,7 @@ listing the board left to right and top to bottom.
 .El
 .Pp
 Help is available during play by typing
-.Ic `?' .
+.Sq Ic \&? .
 More detailed information on the game is given there.
 .Sh BUGS
 If there are a great many words in the cube the final display of the words

boggle/boggle/extern.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: extern.h,v 1.6 1999/09/09 17:30:18 jsm Exp $	*/
+/*	$NetBSD: extern.h,v 1.7 2003/08/07 09:37:05 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
+ * 3. Neither the name of the University nor the names of its contributors
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *