new upstream

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

COPYING

@@ -102,11 +102,11 @@ 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
-NetBSD Foundation:
+"dm/utmpentry.c", "dm/utmpentry.h", "hack/extern.h", "robots/auto.c",
+"sail/display.h", "sail/restart.h" and the game "dab" have a similar
+licence, but copyright is held by the NetBSD Foundation:
 
-   Copyright (c) 1997, 1998, 1999, 2001 The NetBSD Foundation, Inc.
+   Copyright (c) 1997, 1998, 1999, 2001, 2002, 2003 The NetBSD Foundation, Inc.
    All rights reserved.
 
    Redistribution and use in source and binary forms, with or without
@@ -137,6 +137,32 @@ NetBSD Foundation:
    ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
    POSSIBILITY OF SUCH DAMAGE.
 
+In the case of "dab/dab.6", the copyright is held by Thomas Klausner:
+
+   Copyright (c) 2003 Thomas Klausner.
+
+   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. The name of the author may not be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+   THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+
 In the case of "adventure/extern.h" the copyright is held by Christos
 Zoulas:
 
@@ -361,7 +387,7 @@ insofar as they get compiled into the games; note that the include
 files are probably irrelevant for this purpose as it is unlikely they
 are significant enough to make any binary a derived work).
 
-   Copyright (c) 1997, 1998, 1999, 2000, 2001, 2002, 2003 Joseph Samuel Myers.
+   Copyright (c) 1997-2004 Joseph Samuel Myers.
    All rights reserved.
 
    Redistribution and use in source and binary forms, with or without
@@ -400,16 +426,15 @@ qualify for copyright; but if not, then the terms given above apply
 (and, of course, running the test command gives an identical output
 file to which you could apply your own copyright).
 
-The files "bsd-games.lsm", "ChangeLog.0", "THANKS", "INSTALL",
-"README", "TODO", "boggle/README.linux", "fortune/README.linux", and
-"hunt/README.linux" are still significantly derived from files in the
-original bsd-games package for Linux by Curt Olson and Andy Tefft.  It
-is expected that the following terms will apply to these files, and to
+The files "bsd-games.lsm", "ChangeLog.0", "THANKS", "INSTALL" and
+"README" are still significantly derived from files in the original
+bsd-games package for Linux by Curt Olson and Andy Tefft.  It is
+expected that the following terms will apply to these files, and to
 the compilation copyright on the package as a whole; ***this has yet
 to be confirmed with Andy Tefft***:
 
    Copyright (c) 1993 Curt Olson, Andy Tefft.
-   Copyright (c) 1997, 1998, 1999, 2000, 2001, 2002, 2003 Joseph Samuel Myers.
+   Copyright (c) 1997-2004 Joseph Samuel Myers.
    All rights reserved.
 
    Redistribution and use in source and binary forms, with or without

ChangeLog

@@ -1,3 +1,248 @@
+2004-02-13  Joseph S. Myers  <[email protected]>
+
+	* NEWS, bsd-games.lsm, bsd-games-non-free.lsm: Update.
+
+	* morse/morse.c: Update from NetBSD CVS.
+
+	* morse/morse.c: Encode and decode more characters.  Don't put
+	commas after every character.  Don't encode whitespace as "...".
+	Don't fail decoding across a 1024-byte boundary.  Mark end of
+	message appropriately.  From OpenBSD but with punctuation taken
+	from ITU-T Recommendation F.1 (03/98).
+	* tests/morse.testsent, tests/morse.testsentd: New tests.
+	* tests/morse.SOS, tests/morse.foo, tests/morse.sos: Update.
+	* tests/morse.test: Update.
+
+2004-02-11  Joseph S. Myers  <[email protected]>
+
+	* tests/pom.2003fm1, tests/pom.2003fm2, tests/pom.2003fq1,
+	tests/pom.2003fq2, tests/pom.2003lq1, tests/pom.2003lq2,
+	tests/pom.2003nm1, tests/pom.2003nm2, tests/pom.2003ph1,
+	tests/pom.2003ph2, tests/pom.2003ph3, tests/pom.2003ph4,
+	tests/pom.2003ph5, tests/pom.2003ph6, tests/pom.2003ph7,
+	tests/pom.2003ph8: New tests.
+	* tests/pom.test: Update.
+
+2004-02-10  Joseph S. Myers  <[email protected]>
+
+	* primes/primes.6: Update from NetBSD CVS.
+
+2004-02-09  Joseph S. Myers  <[email protected]>
+
+	* configure: Ask for a documentation directory if building trek or
+	rogue.
+	* Makeconfig.in (DOCDIR): Define.
+	* substfiles2: Add trek/trek.6.
+	* trek/trek.6: Rename to trek/trek.6.in.
+	* trek/trek.6.in: Mark documentation directory for substitution.
+	* rogue/Makefrag, trek/Makefrag: Install USD documents.
+	* INSTALL, PACKAGING, README: Update.
+
+2004-02-08  Joseph S. Myers  <[email protected]>
+
+	* backgammon/backgammon/main.c, backgammon/teachgammon/teach.c,
+	cribbage/cribbage.h, dm/dm.c, fortune/unstr/unstr.c,
+	hunt/hunt/hunt.c, hunt/hunt/otto.c, hunt/huntd/faketalk.c,
+	hunt/huntd/hunt.h, phantasia/Makefile.bsd, rain/rain.c,
+	worms/worms.c: Update from NetBSD CVS.
+
+	* rain/rain.c, worms/worms.c: Hide the cursor with curs_set(0).
+	From OpenBSD.
+
+	* tests/factor.8675309, tests/factor.6172538568: New tests (from
+	NetBSD src/regress).
+	* tests/factor.test: Update.
+
+	* boggle/README.linux, dm/README.linux, fortune/README.linux,
+	hunt/README.linux, trek/README.linux: Remove.
+	* README: Move information from those files to here.
+	* INSTALL: Update.
+	* COPYING: Update.
+
+	* factor/Makefile.bsd, factor/factor.6, factor/factor.c,
+	primes/Makefile.bsd, primes/primes.6: Update from NetBSD CVS.
+
+	* TODO: Update.
+
+	* substscr: Explicitly set execute permissions from those of
+	source file.
+
+	* primes/primes.6: Separate manpage from that of factor.
+	* primes/Makefrag: Update.
+	* factor/factor.6: Change to be a manpage for factor only.
+
+	* factor/factor.c: Only use Pollard p-1 if remaining factor isn't
+	prime.  Correct comment.  Increase base if p-1 algorithm reaches
+	1.
+	* tests/factor.2147483647111311, tests/factor.99999999999991: New
+	tests.
+	* tests/factor.test: Update.
+	Bugs reported by David A Bagley <[email protected]>.
+
+	* countmail/countmail.6, phantasia/fight.c, phantasia/io.c,
+	sail/extern.h, sail/misc.c, snake/snake/snake.c: Update from
+	NetBSD CVS.
+
+2004-01-27  Joseph S. Myers  <[email protected]>
+
+	* dab/.cvsignore: New file.
+
+	* Makeconfig.in: Add STRLCPY_DEFS and GETPROGNAME_DEFS.
+	* arithmetic/Makefrag, fortune/fortune/Makefrag, rogue/Makefrag:
+	Use them.
+
+	* dm/utmpentry.c, dm/utmpentry.h: New from NetBSD CVS of
+	usr.bin/who.
+	* COPYING: Update.
+	* dm/dm.c: Follow NetBSD in use of this utmp handling.
+	* dm/Makefrag: Update.
+	* exec.objs: Update.
+
+	* lib/getprogname.c: New file.
+	* include/stdlib.h: Update.
+	* configure: Check for getprogname.
+	* arithmetic/arithmetic.c, fortune/fortune/fortune.c: Follow
+	NetBSD in use of getprogname().
+	* exec.objs: Update.
+
+	* adventure/extern.h, adventure/main.c, arithmetic/arithmetic.c,
+	atc/extern.h, atc/input.c, backgammon/backgammon/backlocal.h,
+	backgammon/backgammon/move.c, backgammon/common_source/back.h,
+	backgammon/teachgammon/tutor.h, banner/banner.c,
+	battlestar/battlestar.c, battlestar/extern.h, battlestar/fly.c,
+	battlestar/init.c, battlestar/parse.c, bcd/bcd.c,
+	boggle/boggle/bog.c, boggle/boggle/extern.h, boggle/boggle/mach.c,
+	boggle/boggle/prtable.c, boggle/boggle/timer.c, caesar/caesar.c,
+	canfield/canfield/canfield.c, canfield/cfscores/cfscores.c,
+	cribbage/crib.c, cribbage/cribbage.h, dm/dm.c, fish/fish.c,
+	fortune/fortune/fortune.c, fortune/unstr/unstr.c, gomoku/gomoku.h,
+	gomoku/main.c, gomoku/pickmove.c, hack/def.func_tab.h,
+	hack/extern.h, hack/hack.apply.c, hack/hack.do.c, hack/hack.h,
+	hack/hack.invent.c, hack/hack.main.c, hack/hack.shk.c,
+	hack/hack.vault.c, hack/hack.zap.c, hangman/hangman.h,
+	hunt/hunt/hunt.c, hunt/hunt/otto.c, hunt/hunt/playit.c,
+	hunt/huntd/driver.c, hunt/huntd/execute.c, hunt/huntd/expl.c,
+	hunt/huntd/faketalk.c, hunt/huntd/hunt.h, hunt/huntd/makemaze.c,
+	hunt/huntd/shots.c, hunt/huntd/talk_ctl.h, mille/mille.h,
+	mille/table.c, mille/varpush.c, monop/cards.c, monop/execute.c,
+	monop/getinp.c, monop/houses.c, monop/malloc.c, monop/monop.c,
+	monop/monop.def, monop/monop.ext, monop/monop.h, monop/morg.c,
+	monop/print.c, monop/prop.c, monop/trade.c, morse/morse.c,
+	number/number.c, pig/pig.c, pom/pom.c, ppt/ppt.c, primes/primes.c,
+	quiz/quiz.c, quiz/quiz.h, quiz/rxp.c, rain/rain.c,
+	random/random.c, robots/auto.c, robots/main.c, robots/robots.h,
+	robots/score.c, rogue/main.c, rogue/rogue.h, sail/extern.h,
+	sail/pl_1.c, sail/sync.c, snake/snake/snake.c,
+	snake/snscore/snscore.c, tetris/input.h, tetris/scores.c,
+	tetris/scores.h, tetris/screen.c, tetris/screen.h,
+	tetris/tetris.c, tetris/tetris.h, trek/compkl.c, trek/computer.c,
+	trek/dumpgame.c, trek/getpar.c, trek/getpar.h, trek/main.c,
+	trek/torped.c, trek/trek.h, worm/worm.c, worms/worms.c,
+	wump/wump.c: Update from NetBSD CVS.
+
+	* adventure/extern.h, adventure/main.c, arithmetic/arithmetic.c,
+	atc/extern.h, atc/input.c, backgammon/backgammon/backlocal.h,
+	backgammon/backgammon/move.c, backgammon/common_source/back.h,
+	backgammon/teachgammon/tutor.h, banner/banner.c,
+	battlestar/battlestar.c, battlestar/extern.h, battlestar/fly.c,
+	battlestar/init.c, battlestar/parse.c, bcd/bcd.c,
+	boggle/boggle/bog.c, boggle/boggle/extern.h, boggle/boggle/mach.c,
+	boggle/boggle/prtable.c, boggle/boggle/timer.c, caesar/caesar.c,
+	canfield/canfield/canfield.c, canfield/cfscores/cfscores.c,
+	cribbage/crib.c, cribbage/cribbage.h, dm/dm.c, fish/fish.c,
+	fortune/fortune/fortune.c, fortune/unstr/unstr.c, gomoku/gomoku.h,
+	gomoku/main.c, hack/def.func_tab.h, hack/extern.h,
+	hack/hack.apply.c, hack/hack.do.c, hack/hack.h,
+	hack/hack.invent.c, hack/hack.main.c, hack/hack.shk.c,
+	hack/hack.vault.c, hack/hack.zap.c, hangman/hangman.h,
+	hunt/hunt/hunt.c, hunt/hunt/otto.c, hunt/hunt/playit.c,
+	hunt/huntd/driver.c, hunt/huntd/execute.c, hunt/huntd/expl.c,
+	hunt/huntd/faketalk.c, hunt/huntd/hunt.h, hunt/huntd/makemaze.c,
+	hunt/huntd/shots.c, hunt/huntd/talk_ctl.h, mille/mille.h,
+	mille/table.c, mille/varpush.c, monop/cards.c, monop/execute.c,
+	monop/getinp.c, monop/houses.c, monop/monop.c, monop/monop.def,
+	monop/monop.ext, monop/monop.h, monop/morg.c, monop/print.c,
+	monop/prop.c, monop/trade.c, monop/malloc.c, morse/morse.c,
+	number/number.c, pig/pig.c, pom/pom.c, ppt/ppt.c, primes/primes.c,
+	quiz/quiz.c, quiz/quiz.h, quiz/rxp.c, rain/rain.c,
+	random/random.c, robots/auto.c, robots/main.c, robots/robots.h,
+	robots/score.c, rogue/main.c, rogue/rogue.h, snake/snake/snake.c,
+	snake/snscore/snscore.c, tetris/input.h, tetris/scores.c,
+	tetris/scores.h, tetris/screen.c, tetris/screen.h,
+	tetris/tetris.c, tetris/tetris.h, trek/compkl.c, trek/computer.c,
+	trek/dumpgame.c, trek/getpar.c, trek/getpar.h, trek/main.c,
+	trek/torped.c, trek/trek.h, worm/worm.c, worms/worms.c,
+	wump/wump.c: Remove uses of __P.
+
+	* THANKS: Mention David A Bagley.
+
+	* sail/pl_1.c (child): Use int for wait status.
+
+	* gomoku/gomoku.h, robots/robots.h, sail/extern.h, sail/misc.c,
+	sail/sync.c: Adjust system header includes.
+
+	* fortune/fortune/fortune.6.in: Update substitution for path to
+	fortunes directory.
+
+	* cribbage/crib.c, cribbage/cribbage.h, cribbage/io.c,
+	dab/Makefile.bsd, monop/misc.c, monop/monop.def, monop/monop.ext:
+	Update from NetBSD CVS.
+
+2004-01-26  Joseph S. Myers  <[email protected]>
+
+	* sail/main.c: Reorder includes to match NetBSD.
+
+	* cribbage/cribbage.h, cribbage/crib.c, cribbage/io.c: Rename
+	receive_int to receive_intr.
+
+	* hack/hack.pri.c: Fix typo in merge from NetBSD.
+
+	* configure: Consistently use balanced parentheses in case
+	statements.
+
+2004-01-25  Joseph S. Myers  <[email protected]>
+
+	* monop/misc.c, monop/monop.def, monop/monop.ext: Rename yn to
+	yncoms.
+
+	* cribbage/cribbage.h, cribbage/crib.c, cribbage/io.c: Rename rint
+	to receive_int.
+
+	* fortune/fortune/fortune.c: Add test for __CYGWIN__.
+	* configure: Test for sig_t.
+	* include/signal.h: Use it.
+	Cygwin issues reported by David A Bagley <[email protected]>.
+
+2004-01-16  Joseph S. Myers  <[email protected]>
+
+	* wtf/acronyms, wtf/acronyms.comp: Update from NetBSD CVS.
+
+2004-01-14  Joseph S. Myers  <[email protected]>
+
+	* wtf/acronyms, wtf/acronyms.comp: Update from NetBSD CVS.
+
+2004-01-04  Joseph S. Myers  <[email protected]>
+
+	* COPYING: Note that TODO no longer contains anything from the
+	original bsd-games 1.3.
+
+	* phantasia/phantasia.6, wtf/acronyms, wtf/acronyms.comp: Update
+	from NetBSD CVS.
+
+2004-01-02  Joseph S. Myers  <[email protected]>
+
+	* atc/atc.6.in, backgammon/backgammon/main.c,
+	backgammon/teachgammon/data.c, caesar/caesar.c,
+	fortune/datfiles/fortunes, fortune/datfiles/fortunes2,
+	fortune/fortune/fortune.c, hack/hack.options.c, phantasia/main.c,
+	phantasia/misc.c, rogue/Makefile.bsd, rogue/rogue.h,
+	wargames/wargames.6, worm/worm.6, wtf/acronyms: Update from NetBSD
+	CVS.
+	* dab: New directory from NetBSD CVS.
+	* COPYING, INSTALL, README, bsd-games.lsm, Makeconfig.in,
+	configure, exec.libs, exec.objs: Update.
+	* dab/Makefrag: New file.
+
 2003-12-18  Joseph S. Myers  <[email protected]>
 
 	* Version 2.15.

INSTALL

@@ -23,17 +23,15 @@ the bsd-games-non-free package unpacks conventionally into a directory
 of its own.  It can be built separately from bsd-games, or in the same
 source directory: to do the latter, move those files and directories
 that are in bsd-games-non-free but not bsd-games into the
-bsd-games-VERSION directory before building.  If you are building
-bsd-games, cd to boggle and decide if you want -DNEW_STYLE or not --
-see boggle/README.linux for more information.  If you are in a hurry,
-don't worry about it ... it really is more of an aesthetic thing.
+bsd-games-VERSION directory before building.
 
 Prerequisites
 =============
 
 You need the following to build this distribution:
 
-* GCC (the C compiler only - other languages not needed).
+* GCC (the C and C++ compilers only - other languages not needed; C++
+  only needed for dab).
 
 * glibc 2.3 or later.  Older versions will not work (at least for
   hunt) since they lack the <ifaddrs.h> header.
@@ -161,13 +159,7 @@ Building and installation
     this or a later version, and a new one created with the correct
     permissions.
 
-10. You may wish to do something with the BSD Users' Supplementary
-    Documents for trek and rogue, in trek/USD.doc/trek.me and
-    rogue/USD.doc/rogue.me.  You can look at them on a text terminal
-    with "nroff -me" (piped to your pager), or format in PostScript
-    for printing with "groff -me -Tps".
-
-11. "make distclean" will restore the source directory to the original
+10. "make distclean" will restore the source directory to the original
     unpacked state.  The automatically generated dependency files
     include paths to system headers, including those in gcc's internal
     header directory: if you have changed your compiler or library
@@ -180,10 +172,6 @@ Building and installation
 Further information
 ===================
 
-Some subdirectories have README.linux files.  If you are still having
-trouble with a program, check this file first -- it may contain some
-helpful hints, or information about further configuration options.
-
 See TODO for information on what needs to be improved in this package;
 you may want to volunteer for some of the things in there.