* 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

phantasia/Makefile.bsd

@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.26 2002/03/05 21:31:23 thorpej Exp $
+#	$NetBSD: Makefile,v 1.32 2003/11/16 14:14:18 lukem Exp $
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
 
 .include <bsd.own.mk>
@@ -21,7 +21,7 @@ ALLFILES=gold lastdead mess monsters void motd characs scoreboard
 FILES=gold lastdead mess monsters void motd
 # don't overwrite existing characters or scorefile
 .for file in characs scoreboard
-.if !exists(${DESTDIR}/${FILESDIR}/${file})
+.if !exists(${DESTDIR}${FILESDIR}/${file})
 FILES+=${file}
 .endif
 .endfor
@@ -30,17 +30,16 @@ CLEANFILES+=map setup setup.lo host_phantglobs.lo ${ALLFILES}
 
 realall: ${FILES}
 
-${FILES}: setup
+${FILES}: setup monsters.asc
+	${_MKMSG_CREATE} ${FILES}
 	./setup -m ${.CURDIR}/monsters.asc
 
-setup: host_phantglobs.lo setup.lo monsters.asc ${LIBM} 
-	${HOST_LINK.c} host_phantglobs.lo setup.lo -o ${.TARGET} -lm
+setup: host_phantglobs.lo setup.lo ${LIBM} 
+	${_MKTARGET_LINK}
+	${HOST_LINK.c} -o ${.TARGET} ${.ALLSRC:M*.lo} -lm
 
-host_phantglobs.lo: ${.CURDIR}/phantglobs.c
-	${HOST_COMPILE.c} -o host_phantglobs.lo ${.CURDIR}/phantglobs.c
-
-setup.lo: ${.CURDIR}/setup.c
-	${HOST_COMPILE.c} -o setup.lo ${.CURDIR}/setup.c
+BUILDSYMLINKS+=	phantglobs.c host_phantglobs.c
+HOST_CPPFLAGS+=	-I${.CURDIR}
 
 # Make Phantasia map.  Change the map commands reflect your installation.
 # PLOTDEVICE is used for plotting the map.  Change as appropriate.

phantasia/main.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: main.c,v 1.10 2001/12/06 12:15:37 blymn Exp $	*/
+/*	$NetBSD: main.c,v 1.11 2003/05/08 13:03:49 wiz Exp $	*/
 
 /*
  * Phantasia 3.3.2 -- Interterminal fantasy game
@@ -58,7 +58,7 @@
 
 #include "include.h"
 
-int	main __P((int, char **));
+int	main(int, char **);
 
 int
 main(argc, argv)

phantasia/misc.c

@@ -1,11 +1,11 @@
-/*	$NetBSD: misc.c,v 1.8 2003/01/20 05:29:55 simonb Exp $	*/
+/*	$NetBSD: misc.c,v 1.9 2003/05/08 13:03:49 wiz Exp $	*/
 
 /*
  * misc.c  Phantasia miscellaneous support routines
  */
 
 #include "include.h"
-#include <string.h>
+
 
 void
 movelevel()
@@ -937,7 +937,7 @@ void
 error(whichfile)
 	const char   *whichfile;
 {
-	int     (*funcp) __P((const char *,...));
+	int     (*funcp)(const char *,...);
 
 	if (Windows) {
 		funcp = printw;

phantasia/pathnames.h.in

@@ -1,4 +1,4 @@
-/*	$NetBSD: pathnames.h,v 1.2 1995/03/24 03:59:17 cgd Exp $	*/
+/*	$NetBSD: pathnames.h,v 1.3 2003/08/07 09:37:31 agc Exp $	*/
 
 /*-
  * Copyright (c) 1989, 1993
@@ -12,11 +12,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

phantasia/phantasia.6

@@ -1,4 +1,4 @@
-.\"	$NetBSD: phantasia.6,v 1.9 2002/09/26 18:32:03 wiz Exp $
+.\"	$NetBSD: phantasia.6,v 1.10 2003/05/18 09:30:08 wiz Exp $
 .\"
 .Dd April 1, 2001
 .Dt PHANTASIA 6
@@ -54,7 +54,7 @@ Only characters above
 zero are saved.
 Characters unused for awhile will be purged.
 Characters are only placed on the scoreboard when they die.
-.Sh AUTHOR
+.Sh AUTHORS
 .An Edward Estes ,
 AT\*[Am]T Information Systems, Skokie, IL
 .Sh PARTICULARS
@@ -300,6 +300,7 @@ The progression as characters increase in
 is summarized in the following table.
 .Pp
 .TS
+nokeep ;
 l c c c c c
 l n n n n n.
 Type	Strength	Mana	Energy	Brains	Magic

phantasia/phantglobs.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: phantglobs.h,v 1.8 2001/02/05 01:01:27 christos Exp $	*/
+/*	$NetBSD: phantglobs.h,v 1.9 2003/05/08 13:03:49 wiz Exp $	*/
 
 /*
  * phantglobs.h - global declarations for Phantasia
@@ -60,71 +60,71 @@ extern const	char	Nobetter[];
 
 /* functions which we need to know about */
 
-const char	*descrlocation __P((struct player *, bool));
-const char	*descrstatus __P((struct player *));
-const char	*descrtype __P((struct player *, bool));
-void	activelist __P((void));
-void	adjuststats __P((void));
-long	allocrecord __P((void));
-long	allocvoid __P((void));
-void	allstatslist __P((void));
-void	altercoordinates __P((double, double, int));
-void	awardtreasure __P((void));
-void	battleplayer __P((long));
-void	callmonster __P((int));
-void	cancelmonster __P((void));
-void	catchalarm __P((int)) __attribute__((__noreturn__));
-void	changestats __P((bool));
-void	checkbattle __P((void));
-void	checktampered __P((void));
-void	cleanup __P((int));
-void	collecttaxes __P((double, double));
-void	cursedtreasure __P((void));
-void	death __P((const char *));
-void	displaystats __P((void));
-double	distance __P((double, double, double, double));
-void	dotampered __P((void));
-double	drandom __P((void));
-void	encounter __P((int));
-void	enterscore __P((void));
-void	error __P((const char *));
-double	explevel __P((double));
-long	findname __P((const char *, struct player *));
-void	freerecord __P((struct player *, long));
-void	genchar __P((int));
-int	getanswer __P((const char *, bool));
-void	getstring __P((char *, int));
-void	hitmonster __P((double));
-void	ill_sig __P((int));
-double	infloat __P((void));
-void	initialstate __P((void));
-void	initplayer __P((struct player *));
-int	inputoption __P((void));
-void	interrupt __P((void));
-void	leavegame __P((void));
-void	monsthits __P((void));
-void	monstlist __P((void));
-void	more __P((int));
-void	movelevel __P((void));
-void	myturn __P((void));
-void	neatstuff __P((void));
-int	pickmonster __P((void));
-void	playerhits __P((void));
-void	playinit __P((void));
-void	procmain __P((void));
-void	purgeoldplayers __P((void));
-void	readmessage __P((void));
-void	readrecord __P((struct player *, long));
-long	recallplayer __P((void));
-long	rollnewplayer __P((void));
-void	scorelist __P((void));
-void	scramblestats __P((void));
-void	tampered __P((int, double, double));
-void	throneroom __P((void));
-void	throwspell __P((void));
-void	titlelist __P((void));
-void	tradingpost __P((void));
-void	truncstring __P((char *));
-void	userlist __P((bool));
-void	writerecord __P((struct player *, long));
-void	writevoid __P((struct energyvoid *, long));
+const char	*descrlocation(struct player *, bool);
+const char	*descrstatus(struct player *);
+const char	*descrtype(struct player *, bool);
+void	activelist(void);
+void	adjuststats(void);
+long	allocrecord(void);
+long	allocvoid(void);
+void	allstatslist(void);
+void	altercoordinates(double, double, int);
+void	awardtreasure(void);
+void	battleplayer(long);
+void	callmonster(int);
+void	cancelmonster(void);
+void	catchalarm(int) __attribute__((__noreturn__));
+void	changestats(bool);
+void	checkbattle(void);
+void	checktampered(void);
+void	cleanup(int);
+void	collecttaxes(double, double);
+void	cursedtreasure(void);
+void	death(const char *);
+void	displaystats(void);
+double	distance(double, double, double, double);
+void	dotampered(void);
+double	drandom(void);
+void	encounter(int);
+void	enterscore(void);
+void	error(const char *);
+double	explevel(double);
+long	findname(const char *, struct player *);
+void	freerecord(struct player *, long);
+void	genchar(int);
+int	getanswer(const char *, bool);
+void	getstring(char *, int);
+void	hitmonster(double);
+void	ill_sig(int);
+double	infloat(void);
+void	initialstate(void);
+void	initplayer(struct player *);
+int	inputoption(void);
+void	interrupt(void);
+void	leavegame(void);
+void	monsthits(void);
+void	monstlist(void);
+void	more(int);
+void	movelevel(void);
+void	myturn(void);
+void	neatstuff(void);
+int	pickmonster(void);
+void	playerhits(void);
+void	playinit(void);
+void	procmain(void);
+void	purgeoldplayers(void);
+void	readmessage(void);
+void	readrecord(struct player *, long);
+long	recallplayer(void);
+long	rollnewplayer(void);
+void	scorelist(void);
+void	scramblestats(void);
+void	tampered(int, double, double);
+void	throneroom(void);
+void	throwspell(void);
+void	titlelist(void);
+void	tradingpost(void);
+void	truncstring(char *);
+void	userlist(bool);
+void	writerecord(struct player *, long);
+void	writevoid(struct energyvoid *, long);

phantasia/setup.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: setup.c,v 1.11 2001/03/27 02:23:28 simonb Exp $	*/
+/*	$NetBSD: setup.c,v 1.12 2003/05/08 13:03:49 wiz Exp $	*/
 
 /*
  * setup.c - set up all files for Phantasia
@@ -8,9 +8,9 @@
 #include <fcntl.h>
 #include "include.h"
 
-int main __P((int, char *[]));
-void Error __P((const char *, const char *)) __attribute__((__noreturn__));
-double drandom __P((void));
+int main(int, char *[]);
+void Error(const char *, const char *) __attribute__((__noreturn__));
+double drandom(void);
 
 /**/
 /************************************************************************