Load /tmp/.../bsdgames-nonfree-2.17 intoupstream/2.17upstream

branches/upstream/current.

13 files changed, 230 insertions, 45 deletions

diff --git a/.cvsignore b/.cvsignore
deleted file mode 100644
index 86692f3..0000000
--- a/.cvsignore
+++ /dev/null
@@ -1,12 +0,0 @@
-Makeconfig
-hide-game
-install-man
-install-score
-subst.sed
-subst.rules
-test.out
-GNUmakefile
-conftest.c
-exec.libs.tmp
-exec.objs.tmp
-a.out
diff --git a/COPYING b/COPYING
index d3baec4..8e108fa 100644
--- a/COPYING
+++ b/COPYING
@@ -387,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-2004 Joseph Samuel Myers.
+   Copyright (c) 1997-2005 Joseph Samuel Myers.
    All rights reserved.
 
    Redistribution and use in source and binary forms, with or without
@@ -434,7 +434,7 @@ 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-2004 Joseph Samuel Myers.
+   Copyright (c) 1997-2005 Joseph Samuel Myers.
    All rights reserved.
 
    Redistribution and use in source and binary forms, with or without
diff --git a/ChangeLog b/ChangeLog
index 3fb7c1b..47084ee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,207 @@
+2005-02-18  Joseph S. Myers  <jsm@polyomino.org.uk>
+
+	* Version 2.17.
+
+	* NEWS, bsd-games.lsm, bsd-games-non-free.lsm: Update.
+
+	* wtf/acronyms, wtf/acronyms.comp: Update from NetBSD CVS.
+
+2005-02-16  Joseph S. Myers  <jsm@polyomino.org.uk>
+
+	* atc/input.c, backgammon/backgammon/main.c,
+	backgammon/teachgammon/teach.c, cribbage/instr.c, fish/fish.c,
+	phantasia/gamesupport.c, phantasia/interplayer.c, phantasia/io.c,
+	phantasia/misc.c, phantasia/phantstruct.h, rogue/machdep.c,
+	rogue/rogue.h, trek/getpar.h, trek/trek.h, wump/wump.c: Update
+	from NetBSD CVS.
+
+2005-02-14  Joseph S. Myers  <jsm@polyomino.org.uk>
+
+	* hack/hack.termcap.c: Remove "static" from some variables.  Fix
+	from Andreas Jochens <aj@andaco.de> in Debian bug 284750.
+	* exec.objs: Include lib/strlcpy.o for atc and sail.
+	* atc/input.c, backgammon/backgammon/main.c,
+	backgammon/teachgammon/teach.c, cribbage/instr.c, fish/fish.c,
+	phantasia/misc.c, rogue/machdep.c, wump/wump.c: Cast last argument
+	of execl to char *.
+	* rogue/rogue.h: Avoid arrays of incomplete types.
+	* trek/trek.h: Likewise.  Don't declare Skitab and Lentab here.
+	* trek/getpar.h: Declare Skitab and Lentab here.
+	* phantasia/phantstruct.h: Define phbool.
+	* phantasia/gamesupport.c, phantasia/interplayer.c,
+	phantasia/io.c, phantasia/misc.c: Use phbool where necessary.
+
+	* .cvsignore, adventure/.cvsignore, arithmetic/.cvsignore,
+	atc/.cvsignore, backgammon/backgammon/.cvsignore,
+	backgammon/common_source/.cvsignore,
+	backgammon/teachgammon/.cvsignore, banner/.cvsignore,
+	battlestar/.cvsignore, bcd/.cvsignore, boggle/boggle/.cvsignore,
+	boggle/mkdict/.cvsignore, boggle/mkindex/.cvsignore,
+	caesar/.cvsignore, canfield/canfield/.cvsignore,
+	canfield/cfscores/.cvsignore, cribbage/.cvsignore, dab/.cvsignore,
+	dm/.cvsignore, factor/.cvsignore, fish/.cvsignore,
+	fortune/datfiles/.cvsignore, fortune/fortune/.cvsignore,
+	fortune/strfile/.cvsignore, fortune/unstr/.cvsignore,
+	gomoku/.cvsignore, hack/.cvsignore, hangman/.cvsignore,
+	hunt/hunt/.cvsignore, hunt/huntd/.cvsignore, include/.cvsignore,
+	lib/.cvsignore, mille/.cvsignore, monop/.cvsignore,
+	morse/.cvsignore, number/.cvsignore, phantasia/.cvsignore,
+	pig/.cvsignore, pom/.cvsignore, ppt/.cvsignore, primes/.cvsignore,
+	quiz/.cvsignore, quiz/datfiles/.cvsignore, rain/.cvsignore,
+	random/.cvsignore, robots/.cvsignore, rogue/.cvsignore,
+	sail/.cvsignore, snake/snake/.cvsignore, snake/snscore/.cvsignore,
+	tetris/.cvsignore, trek/.cvsignore, worm/.cvsignore,
+	worms/.cvsignore, wtf/.cvsignore, wump/.cvsignore: Remove as no
+	longer needed after move to Subversion.
+
+2005-01-30  Joseph S. Myers  <jsm@polyomino.org.uk>
+
+	* fortune/datfiles/fortunes2: Update from NetBSD CVS.
+
+2005-01-30  Joseph S. Myers  <jsm@polyomino.org.uk>
+
+	* wtf/acronyms, wtf/acronyms.comp: Update from NetBSD CVS.
+	* COPYING: Update copyright dates.
+
+2004-12-23  Joseph S. Myers  <jsm@polyomino.org.uk>
+
+	* monop/malloc.c, phantasia/main.c, phantasia/setup.c: Update from
+	NetBSD CVS.
+
+2004-12-07  Joseph S. Myers  <jsm@polyomino.org.uk>
+
+	* arithmetic/arithmetic.c, battlestar/getcom.c,
+	boggle/boggle/bog.c, boggle/boggle/mach.c,
+	canfield/canfield/canfield.c, cribbage/io.c, dm/dm.c,
+	fortune/fortune/fortune.c, gomoku/stoc.c, hack/hack.u_init.c,
+	hangman/getword.c, hunt/hunt/hunt.c, hunt/hunt/otto.c,
+	hunt/huntd/answer.c, mille/move.c, monop/getinp.c, monop/misc.c,
+	number/number.c, pig/pig.c, robots/main.c, sail/dr_1.c,
+	sail/misc.c, sail/pl_4.c, sail/pl_5.c, worms/Makefile.bsd,
+	wtf/acronyms, wtf/acronyms.comp: Update from NetBSD CVS.
+
+2004-10-31  Joseph S. Myers  <jsm@polyomino.org.uk>
+
+	* lib/fgetln.c: Handle case of line just fitting in buffer
+	correctly.
+
+2004-10-23  Joseph S. Myers  <jsm@polyomino.org.uk>
+
+	* dm/utmpentry.c: Update from NetBSD CVS.
+
+2004-09-15  Joseph S. Myers  <jsm@polyomino.org.uk>
+
+	* fortune/fortune/fortune.6.in, fortune/strfile/strfile.8,
+	worms/worms.c: Update from NetBSD CVS.
+
+2004-09-08  Joseph S. Myers  <jsm@polyomino.org.uk>
+
+	* atc/log.c, sail/dr_1.c, sail/sync.c: Update from NetBSD CVS.
+
+2004-09-04  Joseph S. Myers  <jsm@polyomino.org.uk>
+
+	* wtf/acronyms: Update from NetBSD CVS.
+
+2004-09-02  Joseph S. Myers  <jsm@polyomino.org.uk>
+
+	* robots/auto.c, robots/move.c: Update from NetBSD CVS.
+
+2004-08-23  Joseph S. Myers  <jsm@polyomino.org.uk>
+
+	* fortune/datfiles/fortunes: Update from NetBSD CVS.
+
+2004-07-16  Joseph S. Myers  <jsm@polyomino.org.uk>
+
+	* wtf/acronyms.comp: Update from NetBSD CVS.
+
+2004-07-05  Joseph S. Myers  <jsm@polyomino.org.uk>
+
+	* wtf/acronyms: Update from NetBSD CVS.
+
+2004-06-07  Joseph S. Myers  <jsm@polyomino.org.uk>
+
+	* wtf/acronyms.comp: Update from NetBSD CVS.
+
+2004-06-02  Joseph S. Myers  <jsm@polyomino.org.uk>
+
+	* hack/hack.6.in: Update from NetBSD CVS.
+
+2004-05-24  Joseph S. Myers  <jsm@polyomino.org.uk>
+
+	* fortune/datfiles/fortunes: Update from NetBSD CVS.
+
+2004-05-20  Joseph S. Myers  <jsm@polyomino.org.uk>
+
+	* wtf/acronyms.comp: Update from NetBSD CVS.
+
+2004-05-02  Joseph S. Myers  <jsm@polyomino.org.uk>
+
+	* rain/rain.c: Update from NetBSD CVS.
+	* exec.objs: Update.
+
+2004-04-30  Joseph S. Myers  <jsm@polyomino.org.uk>
+
+	* wtf/acronyms.comp: Update from NetBSD CVS.
+
+2004-04-24  Joseph S. Myers  <jsm@polyomino.org.uk>
+
+	* backgammon/common_source/fancy.c, fortune/datfiles/farber:
+	Update from NetBSD CVS.
+
+2004-04-12  Joseph S. Myers  <jsm@polyomino.org.uk>
+
+	* phantasia/fight.c, phantasia/gamesupport.c,
+	phantasia/interplayer.c, phantasia/io.c, phantasia/main.c,
+	phantasia/misc.c: Update from NetBSD CVS.
+
+2004-04-08  Joseph S. Myers  <jsm@polyomino.org.uk>
+
+	* mille/move.c, phantasia/fight.c, phantasia/gamesupport.c,
+	phantasia/include.h, phantasia/interplayer.c, phantasia/io.c,
+	phantasia/main.c, phantasia/misc.c, phantasia/phantstruct.h,
+	phantasia/setup.c, worms/worms.c, wtf/acronyms, wtf/acronyms.comp:
+	Update from NetBSD CVS.
+
+2004-03-29  Joseph S. Myers  <jsm@polyomino.org.uk>
+
+	* fortune/datfiles/fortunes2, fortune/datfiles/fortunes2-o.real,
+	hack/data, hack/rumors: Update from NetBSD CVS.
+
+2004-03-27  Joseph S. Myers  <jsm@polyomino.org.uk>
+
+	* wtf/acronyms, wtf/acronyms.comp: Update from NetBSD CVS.
+
+2004-03-12  Joseph S. Myers  <jsm@polyomino.org.uk>
+
+	* wtf/acronyms, wtf/acronyms.comp: Update from NetBSD CVS.
+
+2004-03-05  Joseph S. Myers  <jsm@polyomino.org.uk>
+
+	* wtf/acronyms: Update from NetBSD CVS.
+
+2004-03-04  Joseph S. Myers  <jsm@polyomino.org.uk>
+
+	* wtf/acronyms.comp: Update from NetBSD CVS.
+
+2004-02-28  Joseph S. Myers  <jsm@polyomino.org.uk>
+
+	* fortune/datfiles/fortunes2: Update from NetBSD CVS.
+
+2004-02-18  Joseph S. Myers  <jsm@polyomino.org.uk>
+
+	* wtf/acronyms: Update from NetBSD CVS.
+
+2004-02-14  Joseph S. Myers  <jsm@polyomino.org.uk>
+
+	* fortune/datfiles/fortunes, fortune/datfiles/fortunes.sp.ok,
+	rogue/USD.doc/rogue.me: Update from NetBSD CVS.
+	* NEWS: Fix typo.
+	* ChangeLog: Mark properly for 2.16 release.
+
 2004-02-13  Joseph S. Myers  <jsm@polyomino.org.uk>
 
+	* Version 2.16.
+
 	* NEWS, bsd-games.lsm, bsd-games-non-free.lsm: Update.
 
 	* morse/morse.c: Update from NetBSD CVS.
diff --git a/NEWS b/NEWS
index bcf5347..141948b 100644
--- a/NEWS
+++ b/NEWS
@@ -11,10 +11,18 @@ 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.17 (2005-02-18)
+============
+
+* Updated from NetBSD CVS of 2005-02-18.
+
+* Some bugs fixed (in particular, should now build with current GCC 4
+CVS), some backlogged.
+
 Version 2.16 (2004-02-13)
 ============
 
-* Updated from NetBSD CVS of 2004-02-12.  Includes a new game, dab
+* Updated from NetBSD CVS of 2004-02-13.  Includes a new game, dab
 (Dots and Boxes), written in C++.
 
 * Supplementary documentation for trek and rogue now installed
diff --git a/bsd-games-non-free.lsm b/bsd-games-non-free.lsm
index 25921b1..d28aafc 100644
--- a/bsd-games-non-free.lsm
+++ b/bsd-games-non-free.lsm
@@ -1,13 +1,13 @@
 Begin4
 Title:		bsd-games-non-free
-Version:	2.16
-Entered-date:	2004-02-13
+Version:	2.17
+Entered-date:	2005-02-18
 Description:	Games from NetBSD with restrictive licences
 	(not DFSG/OSD-free).  Includes: rogue.
 Keywords:	games, NetBSD
 Maintained-by:	jsm@polyomino.org.uk (Joseph S. Myers)
 Primary-site:	ibiblio.org /pub/Linux/games
-		bsd-games-non-free-2.16.tar.gz
+		bsd-games-non-free-2.17.tar.gz
 Platforms:	Requires ncurses (curses/termcap may also work but are no
 	longer tested/supported)
 Copying-policy:	restricted
diff --git a/exec.objs b/exec.objs
index 9ca6ffa..f081d60 100644
--- a/exec.objs
+++ b/exec.objs
@@ -1,7 +1,7 @@
 # exec.objs - details of objects that go into bsd-games programs.
 # This file is used for automatic makefile generation.
 #
-# Copyright (c) 1998, 1999, 2000, 2001, 2003, 2004 Joseph Samuel Myers.
+# Copyright (c) 1998, 1999, 2000, 2001, 2003, 2004, 2005 Joseph Samuel Myers.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -32,7 +32,7 @@ adventure		crc.o data.o done.o init.o io.o main.o save.o subr.o \
 adventure/setup		setup.o
 arithmetic		arithmetic.o lib/getprogname.o
 atc			extern.o grammar.o graphics.o input.o lex.o list.o \
-	log.o main.o tunable.o update.o
+	log.o main.o tunable.o update.o lib/strlcpy.o
 backgammon/backgammon/backgammon	extra.o main.o move.o text.o \
 	version.o backgammon/common_source/allow.o \
 	backgammon/common_source/board.o backgammon/common_source/check.o \
@@ -102,7 +102,7 @@ pom			pom.o
 ppt			ppt.o
 primes			pattern.o pr_tbl.o primes.o
 quiz			quiz.o rxp.o lib/fgetln.o
-rain			rain.o
+rain			rain.o lib/getprogname.o
 random			random.o
 robots			auto.o extern.o flush_in.o init_field.o main.o \
 	make_level.o move.o move_robs.o play_level.o query.o rnd_pos.o score.o
@@ -112,7 +112,8 @@ rogue			hit.o init.o inventory.o level.o machdep.o main.o \
 	lib/strlcpy.o
 sail			assorted.o game.o globals.o dr_1.o dr_2.o dr_3.o \
 	dr_4.o dr_5.o dr_main.o lo_main.o main.o misc.o parties.o pl_1.o \
-	pl_2.o pl_3.o pl_4.o pl_5.o pl_6.o pl_7.o pl_main.o sync.o version.o
+	pl_2.o pl_3.o pl_4.o pl_5.o pl_6.o pl_7.o pl_main.o sync.o version.o \
+	lib/strlcpy.o
 snake/snake/snake	snake.o
 snake/snscore/snscore	snscore.o
 tetris			input.o scores.o screen.o shapes.o tetris.o
diff --git a/include/.cvsignore b/include/.cvsignore
deleted file mode 100644
index 37ddc18..0000000
--- a/include/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-bsd-games.h
diff --git a/lib/.cvsignore b/lib/.cvsignore
deleted file mode 100644
index 84a962b..0000000
--- a/lib/.cvsignore
+++ /dev/null
@@ -1,5 +0,0 @@
-a.out
-*.d
-*.i
-*.s
-*.d.tmp
diff --git a/lib/fgetln.c b/lib/fgetln.c
index fb5e061..d05c416 100644
--- a/lib/fgetln.c
+++ b/lib/fgetln.c
@@ -1,6 +1,6 @@
 /* lib/fgetln.c - bsd-games implementation of fgetln.
  *
- * Copyright (c) 1997, 1998, 1999, 2000 Joseph Samuel Myers.
+ * Copyright (c) 1997, 1998, 1999, 2000, 2004 Joseph Samuel Myers.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -49,7 +49,7 @@ fgetln(FILE *stream, size_t *len)
   res = fgets(buf, buflen, stream);
   if (res == NULL)
     return NULL;
-  while (buf[buflen - 1] == 0) { /* long line */
+  while (buf[buflen - 1] == 0 && buf[buflen - 2] != '\n') { /* long line */
     nbuf = realloc(buf, buflen * 2);
     if (nbuf == NULL)
       return NULL;
diff --git a/rogue/.cvsignore b/rogue/.cvsignore
deleted file mode 100644
index 989f4b5..0000000
--- a/rogue/.cvsignore
+++ /dev/null
@@ -1,8 +0,0 @@
-a.out
-*.d
-*.i
-*.s
-*.d.tmp
-rogue
-pathnames.h
-rogue.6
diff --git a/rogue/USD.doc/rogue.me b/rogue/USD.doc/rogue.me
index 5bcc2ca..b1592dd 100644
--- a/rogue/USD.doc/rogue.me
+++ b/rogue/USD.doc/rogue.me
@@ -1,4 +1,4 @@
-.\"	$NetBSD: rogue.me,v 1.5 2003/08/07 09:37:41 agc Exp $
+.\"	$NetBSD: rogue.me,v 1.6 2004/02/13 11:36:08 wiz Exp $
 .\"
 .\" Copyright (c) 1986, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -744,7 +744,7 @@ input over forty characters will be ignored.
 If this option is set,
 running moves will not be displayed
 until you reach the end of the move.
-This saves considerable cpu and display time.
+This saves considerable CPU and display time.
 This option defaults to
 .i jump
 if you are using a slow terminal.
diff --git a/rogue/machdep.c b/rogue/machdep.c
index 3549e36..afd69dd 100644
--- a/rogue/machdep.c
+++ b/rogue/machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.12 2003/08/07 09:37:38 agc Exp $	*/
+/*	$NetBSD: machdep.c,v 1.13 2005/02/15 12:56:20 jsm Exp $	*/
 
 /*
  * Copyright (c) 1988, 1993
@@ -37,7 +37,7 @@
 #if 0
 static char sccsid[] = "@(#)machdep.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: machdep.c,v 1.12 2003/08/07 09:37:38 agc Exp $");
+__RCSID("$NetBSD: machdep.c,v 1.13 2005/02/15 12:56:20 jsm Exp $");
 #endif
 #endif /* not lint */
 
@@ -485,7 +485,7 @@ md_shell(shell)
 	int w;
 
 	if (!fork()) {
-		execl(shell, shell, 0);
+		execl(shell, shell, (char *) 0);
 	}
 	wait(&w);
 }
diff --git a/rogue/rogue.h b/rogue/rogue.h
index 6aa47c5..d8a6096 100644
--- a/rogue/rogue.h
+++ b/rogue/rogue.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: rogue.h,v 1.16 2004/01/27 20:30:30 jsm Exp $	*/
+/*	$NetBSD: rogue.h,v 1.17 2005/02/15 12:54:50 jsm Exp $	*/
 
 /*
  * Copyright (c) 1988, 1993
@@ -561,7 +561,7 @@ void	idntfy(void);
 boolean	imitating(int, int);
 int	init(int, char **);
 void	init_str(char **, const char *);
-void	insert_score(char [][], char [][], const char *, short, short, const object *, int);
+void	insert_score(char [][82], char [][30], const char *, short, short, const object *, int);
 void	inv_armor_weapon(boolean);
 void	inv_rings(void);
 void	inventory(const object *, unsigned short);