new upstream

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

boggle/README.linux

@@ -1,36 +0,0 @@
-README.linux for boggle
-=======================
-
-I grabbed this game from comp.sources.games/volume4.  This game is now
-merged with the NetBSD version.
-
-If you wish to use a different dictionary, you can set
-boggle_mkdict_DICTSRC in mkdict/Makefrag.
-
-
-By default, this game compiles with certain Linux improvements; if you
-want the original BSD behaviour, remove -DNEW_STYLE from the
-boggle_boggle_DEFS in boggle/Makefrag.  Defining NEW_STYLE will
-provide a more intuitive way of quitting or playing a new game after
-time has run out.
-
-NOTE: You may wish to remove -DNEW_STYLE if you plan on using the post
-game word lookup feature.  Press <ESC>, type a word, and bog will
-display where it is located.  If NEW_STYLE is defined, it might be
-easy to accidently start typing the word with out pressing <ESC>
-first.  This would start a new game, and you would never be able to
-know where that word was located. :(
-
-Thanks to Andrew Kuchling.  (See ../Credits for his email address.)
-
-Curt Olson
-curt@sledge.mn.org
-
-Boggle is under the BSD licence, thanks to Paul Janzen for checking
-this with the original author.
-
-
-
-Local Variables:
-mode: text
-End:

boggle/boggle/bog.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: bog.c,v 1.17 2003/08/07 09:37:05 agc Exp $	*/
+/*	$NetBSD: bog.c,v 1.18 2004/01/27 20:30:29 jsm Exp $	*/
 
 /*-
  * Copyright (c) 1993
@@ -42,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.17 2003/08/07 09:37:05 agc Exp $");
+__RCSID("$NetBSD: bog.c,v 1.18 2004/01/27 20:30:29 jsm Exp $");
 #endif
 #endif /* not lint */
 
@@ -57,8 +57,8 @@ __RCSID("$NetBSD: bog.c,v 1.17 2003/08/07 09:37:05 agc Exp $");
 #include "bog.h"
 #include "extern.h"
 
-static	int	compar __P((const void *, const void *));
-	int	main __P((int, char *[]));
+static	int	compar(const void *, const void *);
+	int	main(int, char *[]);
 
 struct dictindex dictindex[26];
 

boggle/boggle/extern.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: extern.h,v 1.7 2003/08/07 09:37:05 agc Exp $	*/
+/*	$NetBSD: extern.h,v 1.8 2004/01/27 20:30:29 jsm Exp $	*/
 
 /*-
  * Copyright (c) 1993
@@ -33,39 +33,39 @@
 
 #include <time.h>
 
-void	 addword __P((const char *));
-void	 badword __P((void));
-char	*batchword __P((FILE *));
-void	 checkdict __P((void));
-int	 checkword __P((const char *, int, int *));
-void	 cleanup __P((void));
-void	 delay __P((int));
-long	 dictseek __P((FILE *, long, int));
-void	 findword __P((void));
-void	 flushin __P((FILE *));
-char	*getline __P((char *));
-void	 getword __P((char *));
-int	 help __P((void));
-int	 inputch __P((void));
-int	 loaddict __P((FILE *));
-int	 loadindex __P((const char *));
-void	 newgame __P((const char *));
-char	*nextword __P((FILE *));
-FILE	*opendict __P((const char *));
-void	 playgame __P((void));
-void	 prompt __P((const char *));
-void	 prtable __P((const char *const [],
-	    int, int, int, void (*)(const char *const [], int), int (*)(const char *const [], int)));
-void	 putstr __P((const char *));
-void	 redraw __P((void));
-void	 results __P((void));
-int	 setup __P((int, time_t));
-void	 showboard __P((const char *));
-void	 showstr __P((const char *, int));
-void	 showword __P((int));
-void	 starttime __P((void));
-void	 startwords __P((void));
-void	 stoptime __P((void));
-int	 timerch __P((void));
-void	 usage __P((void)) __attribute__((__noreturn__));
-int	 validword __P((const char *));
+void	 addword(const char *);
+void	 badword(void);
+char	*batchword(FILE *);
+void	 checkdict(void);
+int	 checkword(const char *, int, int *);
+void	 cleanup(void);
+void	 delay(int);
+long	 dictseek(FILE *, long, int);
+void	 findword(void);
+void	 flushin(FILE *);
+char	*getline(char *);
+void	 getword(char *);
+int	 help(void);
+int	 inputch(void);
+int	 loaddict(FILE *);
+int	 loadindex(const char *);
+void	 newgame(const char *);
+char	*nextword(FILE *);
+FILE	*opendict(const char *);
+void	 playgame(void);
+void	 prompt(const char *);
+void	 prtable(const char *const [],
+	    int, int, int, void (*)(const char *const [], int), int (*)(const char *const [], int));
+void	 putstr(const char *);
+void	 redraw(void);
+void	 results(void);
+int	 setup(int, time_t);
+void	 showboard(const char *);
+void	 showstr(const char *, int);
+void	 showword(int);
+void	 starttime(void);
+void	 startwords(void);
+void	 stoptime(void);
+int	 timerch(void);
+void	 usage(void) __attribute__((__noreturn__));
+int	 validword(const char *);

boggle/boggle/mach.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: mach.c,v 1.12 2003/08/07 09:37:05 agc Exp $	*/
+/*	$NetBSD: mach.c,v 1.13 2004/01/27 20:30:29 jsm Exp $	*/
 
 /*-
  * Copyright (c) 1993
@@ -37,7 +37,7 @@
 #if 0
 static char sccsid[] = "@(#)mach.c	8.1 (Berkeley) 6/11/93";
 #else
-__RCSID("$NetBSD: mach.c,v 1.12 2003/08/07 09:37:05 agc Exp $");
+__RCSID("$NetBSD: mach.c,v 1.13 2004/01/27 20:30:29 jsm Exp $");
 #endif
 #endif /* not lint */
 
@@ -73,14 +73,14 @@ extern int usedbits, wordpath[];
 extern time_t start_t;
 extern int debug;
 
-static void	cont_catcher __P((int));
-static int	prwidth __P((const char *const [], int));
-static void	prword __P((const char *const [], int));
-static void	stop_catcher __P((int));
-static void	tty_cleanup __P((void));
-static int	tty_setup __P((void));
-static void	tty_showboard __P((const char *));
-static void	winch_catcher __P((int));
+static void	cont_catcher(int);
+static int	prwidth(const char *const [], int);
+static void	prword(const char *const [], int);
+static void	stop_catcher(int);
+static void	tty_cleanup(void);
+static int	tty_setup(void);
+static void	tty_showboard(const char *);
+static void	winch_catcher(int);
 
 /*
  * Do system dependent initialization

boggle/boggle/prtable.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: prtable.c,v 1.7 2003/08/07 09:37:05 agc Exp $	*/
+/*	$NetBSD: prtable.c,v 1.8 2004/01/27 20:30:29 jsm Exp $	*/
 
 /*-
  * Copyright (c) 1993
@@ -36,7 +36,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: prtable.c,v 1.7 2003/08/07 09:37:05 agc Exp $");
+__RCSID("$NetBSD: prtable.c,v 1.8 2004/01/27 20:30:29 jsm Exp $");
 #endif /* not lint */
 
 #include <curses.h>
@@ -45,7 +45,7 @@ __RCSID("$NetBSD: prtable.c,v 1.7 2003/08/07 09:37:05 agc Exp $");
 
 #define NCOLS	5
 
-static int	get_maxlen __P((const char *const [], int, int (*)(const char *const *, int)));
+static int	get_maxlen(const char *const [], int, int (*)(const char *const *, int));
 
 /*
  * Routine to print a table
@@ -66,8 +66,8 @@ void
 prtable(base, num, d_cols, width, prentry, length)
 	const char *const base[];
 	int num, d_cols, width;
-	void (*prentry) __P((const char *const [], int));
-	int (*length) __P((const char *const [], int));
+	void (*prentry)(const char *const [], int);
+	int (*length)(const char *const [], int);
 {
         int c, j;
         int a, b, cols, loc, maxlen, nrows, z;
@@ -117,7 +117,7 @@ static int
 get_maxlen(base, num, length)
 	const char *const base[];
 	int num;
-	int (*length) __P((const char *const *, int));
+	int (*length)(const char *const *, int);
 {
 	int i, len, max;
 

boggle/boggle/timer.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: timer.c,v 1.8 2003/08/07 09:37:06 agc Exp $	*/
+/*	$NetBSD: timer.c,v 1.9 2004/01/27 20:30:29 jsm Exp $	*/
 
 /*-
  * Copyright (c) 1993
@@ -37,7 +37,7 @@
 #if 0
 static char sccsid[] = "@(#)timer.c	8.2 (Berkeley) 2/22/94";
 #else
-__RCSID("$NetBSD: timer.c,v 1.8 2003/08/07 09:37:06 agc Exp $");
+__RCSID("$NetBSD: timer.c,v 1.9 2004/01/27 20:30:29 jsm Exp $");
 #endif
 #endif /* not lint */
 
@@ -54,7 +54,7 @@ __RCSID("$NetBSD: timer.c,v 1.8 2003/08/07 09:37:06 agc Exp $");
 #include "bog.h"
 #include "extern.h"
 
-static int waitch __P((int));
+static int waitch(int);
 
 extern int tlimit;
 extern time_t start_t;