copy in from cvs; cvs2svn fucked up big time

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

boggle/Makefile.bsd

@@ -1,25 +1,29 @@
-#	$NetBSD: Makefile,v 1.12 1997/10/11 09:34:16 mycroft Exp $
+#	$NetBSD: Makefile,v 1.19 2002/09/18 02:51:46 lukem Exp $
 #	@(#)Makefile	8.1 (Berkeley) 6/11/93
 
+.include <bsd.own.mk>
+
 SUBDIR=	boggle mkdict mkindex
 
-MKDICT!=cd $(.CURDIR)/mkdict; \
-	printf "xxx: .MAKE\n\t@echo \$${.OBJDIR}/mkdict\n" | ${MAKE} -s -f-
-MKINDEX!=cd $(.CURDIR)/mkindex; \
-	printf "xxx: .MAKE\n\t@echo \$${.OBJDIR}/mkindex\n" | ${MAKE} -s -f-
-WORDS=${.CURDIR}/../../share/dict/web2
-FILES=dictionary dictindex
+MKDICTDIR!= cd $(.CURDIR)/mkdict; ${PRINTOBJDIR}
+MKDICT=${MKDICTDIR}/mkdict
+MKINDEXDIR!= cd $(.CURDIR)/mkindex; ${PRINTOBJDIR}
+MKINDEX=${MKINDEXDIR}/mkindex
+WORDS=${NETBSDSRCDIR}/share/dict/web2
+DICTFILES=dictionary dictindex
+.if ${MKSHARE} != "no"
+FILES=${DICTFILES}
 FILESDIR=/usr/share/games/boggle
-CLEANFILES+=${FILES}
+.endif
+CLEANFILES+=${DICTFILES}
 
-all: ${FILES}
+realall: ${FILES}
 
 ${MKDICT}:
 	@cd ${.CURDIR}/mkdict && ${MAKE}
 
 ${MKINDEX}:
 	@cd ${.CURDIR}/mkindex && ${MAKE}
-	
 
 dictionary: ${WORDS} ${MKDICT}
 	rm -f ${.TARGET}

boggle/Makefrag

@@ -1,4 +1,30 @@
 # Makefrag - makefile fragment for boggle
+#
+# Copyright (c) 1998 Joseph Samuel Myers.
+# 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. 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.
 
 boggle_all:
 

boggle/mkdict/Makefile.bsd

@@ -1,21 +1,9 @@
-#	$NetBSD: Makefile,v 1.8 1998/04/13 14:14:39 lukem Exp $
+#	$NetBSD: Makefile,v 1.12 2002/09/18 06:16:40 lukem Exp $
 #	@(#)Makefile	8.1 (Berkeley) 6/11/93
 
-PROG=	mkdict
-HOST_CPPFLAGS+=-I${.CURDIR}/../boggle
-NOMAN=	noman
+NOMAN=		# defined
 
-# XXX for "make depend"
-CPPFLAGS+=-I${.CURDIR}/../boggle
+HOSTPROG=	mkdict
+HOST_CPPFLAGS+=	-I${.CURDIR}/../boggle
 
-# only needed during build
-proginstall::
-
-# Override these rules for cross-compilation
-.c.o:
-	${HOST_COMPILE.c} ${.IMPSRC}
-
-${PROG}: ${OBJS}
-	${HOST_LINK.c} -o ${.TARGET} ${OBJS}
-
-.include <bsd.prog.mk>
+.include <bsd.hostprog.mk>

boggle/mkdict/Makefrag

@@ -1,10 +1,36 @@
 # Makefrag - makefile fragment for boggle/mkdict
+#
+# Copyright (c) 1997, 1998, 1999 Joseph Samuel Myers.
+# 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. 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.
 
 boggle_mkdict_CLEANFILES := dictionary
 
 # boggle_mkdict_DICTSRC is the dictionary that will be used to construct the
 # word list used by boggle.
-boggle_mkdict_DICTSRC := hangman/words
+boggle_mkdict_DICTSRC := $(DICTIONARY_SRC)
 
 boggle_mkdict_DIRS := $(BOGGLE_DIR)
 boggle_mkdict_INCS := -Iboggle/boggle

boggle/mkdict/mkdict.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: mkdict.c,v 1.3 1997/10/11 02:12:21 lukem Exp $	*/
+/* $NetBSD: mkdict.c,v 1.8 2001/08/29 18:22:56 jsm Exp $ */
 
 /*-
  * Copyright (c) 1993
@@ -36,17 +36,15 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-#ifndef lint
-__COPYRIGHT("@(#) Copyright (c) 1993\n\
-	The Regents of the University of California.  All rights reserved.\n");
-#endif /* not lint */
-
 #ifndef lint
+static const char copyright[] __attribute__((__unused__)) =
+    "@(#) Copyright (c) 1993\n\
+	The Regents of the University of California.  All rights reserved.\n";
 #if 0
 static char sccsid[] = "@(#)mkdict.c	8.1 (Berkeley) 6/11/93";
 #else
-__RCSID("$NetBSD: mkdict.c,v 1.3 1997/10/11 02:12:21 lukem Exp $");
+static const char rcsid[] __attribute__((__unused__)) = 
+    "$NetBSD: mkdict.c,v 1.8 2001/08/29 18:22:56 jsm Exp $";
 #endif
 #endif /* not lint */
 
@@ -62,11 +60,10 @@ __RCSID("$NetBSD: mkdict.c,v 1.3 1997/10/11 02:12:21 lukem Exp $");
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <err.h>
 
 #include "bog.h"
 
-int main __P((int, char *[]));
+int main(int, char *[]);
 
 int
 main(argc, argv)
@@ -85,7 +82,7 @@ main(argc, argv)
 	for (nwords = 1;
 	    fgets(buf[current], MAXWORDLEN + 1, stdin) != NULL; ++nwords) {
 		if ((p = strchr(buf[current], '\n')) == NULL) {
-			warnx("word too long: %s", buf[current]);
+			fprintf(stderr, "word too long: %s\n", buf[current]);
 			while ((ch = getc(stdin)) != EOF && ch != '\n')
 				;
 			if (ch == EOF)
@@ -125,6 +122,11 @@ main(argc, argv)
 		prev = !prev;
 		current = !current;
 	}
-	warnx("%d words", nwords);
+	fprintf(stderr, "%d words\n", nwords);
+	fflush(stdout);
+	if (ferror(stdout)) {
+		perror("error writing standard output");
+		exit(1);
+	}
 	exit(0);
 }

boggle/mkindex/Makefile.bsd

@@ -1,21 +1,9 @@
-#	$NetBSD: Makefile,v 1.6 1998/04/13 14:14:39 lukem Exp $
+#	$NetBSD: Makefile,v 1.10 2002/09/18 06:16:40 lukem Exp $
 #	@(#)Makefile	8.1 (Berkeley) 6/11/93
 
-PROG=	mkindex
-HOST_CPPFLAGS+=-I${.CURDIR}/../boggle
-NOMAN=	noman
+NOMAN=		# defined
 
-# XXX for "make depend"
-CPPFLAGS+=-I${.CURDIR}/../boggle
+HOSTPROG=	mkindex
+HOST_CPPFLAGS+=	-I${.CURDIR}/../boggle
 
-# only needed during build
-proginstall::
-
-# Override these rules for cross-compilation
-.c.o:
-	${HOST_COMPILE.c} ${.IMPSRC}
-
-${PROG}: ${OBJS}
-	${HOST_LINK.c} -o ${.TARGET} ${OBJS}
-
-.include <bsd.prog.mk>
+.include <bsd.hostprog.mk>

boggle/mkindex/Makefrag

@@ -1,4 +1,30 @@
 # Makefrag - makefile fragment for boggle/mkindex
+#
+# Copyright (c) 1997, 1998 Joseph Samuel Myers.
+# 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. 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.
 
 boggle_mkindex_CLEANFILES := dictindex
 boggle_mkindex_DIRS := $(BOGGLE_DIR)

boggle/mkindex/mkindex.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: mkindex.c,v 1.4 1998/09/11 13:16:05 hubertf Exp $	*/
+/* $NetBSD: mkindex.c,v 1.8 2000/07/31 11:29:48 simonb Exp $ */
 
 /*-
  * Copyright (c) 1993
@@ -36,17 +36,15 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #ifndef lint
-__COPYRIGHT("@(#) Copyright (c) 1993\n\
-	The Regents of the University of California.  All rights reserved.\n");
-#endif /* not lint */
+static const char copyright[] __attribute__((__unused__)) = "@(#) Copyright (c) 1993\n\
+	The Regents of the University of California.  All rights reserved.\n";
 
-#ifndef lint
 #if 0
 static char sccsid[] = "@(#)mkindex.c	8.1 (Berkeley) 6/11/93";
 #else
-__RCSID("$NetBSD: mkindex.c,v 1.4 1998/09/11 13:16:05 hubertf Exp $");
+static const char rcsid[] __attribute__((__unused__)) =
+    "$NetBSD: mkindex.c,v 1.8 2000/07/31 11:29:48 simonb Exp $";
 #endif
 #endif /* not lint */
 
@@ -55,13 +53,13 @@ __RCSID("$NetBSD: mkindex.c,v 1.4 1998/09/11 13:16:05 hubertf Exp $");
 
 #include "bog.h"
 
-int main __P((void));
-char *nextword __P((FILE *, char *, int *, int *));
+int main(void);
+char *nextword(FILE *, char *, int *, int *);
 
 int
 main(void)
 {
-	int clen, rlen, prev;
+	int clen, rlen, prev, i;
 	long off, start;
 	char buf[MAXWORDLEN + 1];
 
@@ -69,14 +67,29 @@ main(void)
 	off = start = 0L;
 	while (nextword(stdin, buf, &clen, &rlen) != NULL) {
 		if (*buf != prev) {
+			/*
+			 * Boggle expects a full index even if the dictionary
+			 * had no words beginning with some letters.
+			 * So we write out entries for every letter from prev
+			 * to *buf.
+			 */
 			if (prev != '\0')
 				printf("%c %6ld %6ld\n", prev, start, off - 1);
+			for (i = (prev ? prev + 1 : 'a'); i < *buf; i++)
+				printf("%c %6ld %6ld\n", i, off, off - 1);
 			prev = *buf;
 			start = off;
 		}
 		off += clen + 1;
 	}
 	printf("%c %6ld %6ld\n", prev, start, off - 1);
+	for (i = prev + 1; i <= 'z'; i++)
+		printf("%c %6ld %6ld\n", i, off, off - 1);
+	fflush(stdout);
+	if (ferror(stdout)) {
+		perror("error writing standard output");
+		exit(1);
+	}
 	exit(0);
 }