|
Michael Thomas |
cc5a4cd |
--- bsdgames-2.17.orig/fish/Makefrag
|
|
Michael Thomas |
cc5a4cd |
+++ bsdgames-2.17/fish/Makefrag
|
|
Michael Thomas |
cc5a4cd |
@@ -31,7 +31,9 @@
|
|
Michael Thomas |
cc5a4cd |
fish_all: fish/fish fish/fish.instr fish/fish.6
|
|
Michael Thomas |
cc5a4cd |
|
|
Michael Thomas |
cc5a4cd |
fish_install: fish_all
|
|
Michael Thomas |
cc5a4cd |
- $(INSTALL_BINARY) fish/fish $(INSTALL_PREFIX)$(GAMESDIR)/fish
|
|
Michael Thomas |
cc5a4cd |
- $(HIDE_GAME) fish
|
|
Michael Thomas |
cc5a4cd |
+ $(INSTALL_BINARY) fish/fish $(INSTALL_PREFIX)$(GAMESDIR)/go-fish
|
|
Michael Thomas |
cc5a4cd |
+ $(HIDE_GAME) go-fish
|
|
Michael Thomas |
cc5a4cd |
$(INSTALL_DATA) fish/fish.instr $(INSTALL_PREFIX)$(FISH_INSTRFILE)
|
|
Michael Thomas |
cc5a4cd |
- $(INSTALL_MANUAL) fish/fish.6
|
|
Michael Thomas |
cc5a4cd |
+ ln -sf fish.6 fish/go-fish.6 # hack for rename
|
|
Michael Thomas |
cc5a4cd |
+ $(INSTALL_MANUAL) fish/go-fish.6
|
|
Michael Thomas |
cc5a4cd |
+ rm -f fish/go-fish.6
|
|
Michael Thomas |
cc5a4cd |
--- bsdgames-2.17.orig/fish/fish.6
|
|
Michael Thomas |
cc5a4cd |
+++ bsdgames-2.17/fish/fish.6
|
|
Michael Thomas |
cc5a4cd |
@@ -30,10 +30,10 @@
|
|
Michael Thomas |
cc5a4cd |
.\" @(#)fish.6 8.1 (Berkeley) 5/31/93
|
|
Michael Thomas |
cc5a4cd |
.\"
|
|
Michael Thomas |
cc5a4cd |
.Dd May 31, 1993
|
|
Michael Thomas |
cc5a4cd |
-.Dt FISH 6
|
|
Michael Thomas |
cc5a4cd |
+.Dt GO-FISH 6
|
|
Michael Thomas |
cc5a4cd |
.Os
|
|
Michael Thomas |
cc5a4cd |
.Sh NAME
|
|
Michael Thomas |
cc5a4cd |
-.Nm fish
|
|
Michael Thomas |
cc5a4cd |
+.Nm go-fish
|
|
Michael Thomas |
cc5a4cd |
.Nd play
|
|
Michael Thomas |
cc5a4cd |
.Dq Go Fish
|
|
Michael Thomas |
cc5a4cd |
.Sh SYNOPSIS
|
|
Michael Thomas |
cc5a4cd |
--- bsdgames-2.17.orig/gomoku/gomoku.6
|
|
Michael Thomas |
cc5a4cd |
+++ bsdgames-2.17/gomoku/gomoku.6
|
|
Michael Thomas |
cc5a4cd |
@@ -45,7 +45,7 @@
|
|
Michael Thomas |
cc5a4cd |
.Op Ar inputfile
|
|
Michael Thomas |
cc5a4cd |
.Sh DESCRIPTION
|
|
Michael Thomas |
cc5a4cd |
.Nm
|
|
Michael Thomas |
cc5a4cd |
-is a two player game were the object is to get 5 in a row horizontally,
|
|
Michael Thomas |
cc5a4cd |
+is a two player game where the object is to get 5 in a row horizontally,
|
|
Michael Thomas |
cc5a4cd |
vertically or diagonally on a 19 by 19 grid.
|
|
Michael Thomas |
cc5a4cd |
By convention, black always moves first.
|
|
Michael Thomas |
cc5a4cd |
With no arguments,
|
|
Michael Thomas |
cc5a4cd |
--- bsdgames-2.17.orig/hack/Makefrag
|
|
Michael Thomas |
cc5a4cd |
+++ bsdgames-2.17/hack/Makefrag
|
|
Michael Thomas |
cc5a4cd |
@@ -56,7 +56,8 @@
|
|
Michael Thomas |
cc5a4cd |
$(INSTALL_SCORE_GAME) hack/hack $(INSTALL_PREFIX)$(GAMESDIR)/hack
|
|
Michael Thomas |
cc5a4cd |
$(HIDE_GAME) hack
|
|
Michael Thomas |
cc5a4cd |
$(INSTALL_HACK_DIR) $(INSTALL_PREFIX)$(HACK_DIR)
|
|
Michael Thomas |
cc5a4cd |
- set -e; for f in data help hh rumors; do $(INSTALL_DATA) hack/$$f $(INSTALL_PREFIX)$(HACK_DIR)/$$f; done
|
|
Michael Thomas |
cc5a4cd |
+ install -d $(INSTALL_PREFIX)/usr/share/bsd-games/hack
|
|
Michael Thomas |
cc5a4cd |
+ set -e; for f in data help hh rumors; do $(INSTALL_DATA) hack/$$f $(INSTALL_PREFIX)/usr/share/bsd-games/hack/$$f; done
|
|
Michael Thomas |
cc5a4cd |
$(INSTALL_SCORE_FILE) $(HACK_DIR)/perm
|
|
Michael Thomas |
cc5a4cd |
$(INSTALL_SCORE_FILE) $(HACK_DIR)/record
|
|
Michael Thomas |
cc5a4cd |
$(INSTALL_MANUAL) hack/hack.6
|
|
Michael Thomas |
cc5a4cd |
--- bsdgames-2.17.orig/hack/config.h
|
|
Michael Thomas |
cc5a4cd |
+++ bsdgames-2.17/hack/config.h
|
|
Michael Thomas |
cc5a4cd |
@@ -88,13 +88,18 @@
|
|
Michael Thomas |
cc5a4cd |
/* #define PYRAMID_BUG */ /* avoid a bug on the Pyramid */
|
|
Michael Thomas |
cc5a4cd |
/* #define NOWAITINCLUDE */ /* neither <wait.h> nor <sys/wait.h> exists */
|
|
Michael Thomas |
cc5a4cd |
|
|
Michael Thomas |
cc5a4cd |
-#define WIZARD "bruno" /* the person allowed to use the -D option */
|
|
Michael Thomas |
cc5a4cd |
+/*
|
|
Michael Thomas |
cc5a4cd |
+ * Debian mods: use root for WIZARD, and move files that are static to
|
|
Michael Thomas |
cc5a4cd |
+ * /usr/share/ -- JEH
|
|
Michael Thomas |
cc5a4cd |
+ */
|
|
Michael Thomas |
cc5a4cd |
+#define WIZARD "root" /* the person allowed to use the -D option */
|
|
Michael Thomas |
cc5a4cd |
+#define SHAREDIR "/usr/share/bsd-games/hack/"
|
|
Michael Thomas |
cc5a4cd |
#define RECORD "record"/* the file containing the list of topscorers */
|
|
Michael Thomas |
cc5a4cd |
#define NEWS "news" /* the file containing the latest hack news */
|
|
Michael Thomas |
cc5a4cd |
-#define HELP "help" /* the file containing a description of the commands */
|
|
Michael Thomas |
cc5a4cd |
-#define SHELP "hh" /* abbreviated form of the same */
|
|
Michael Thomas |
cc5a4cd |
-#define RUMORFILE "rumors" /* a file with fortune cookies */
|
|
Michael Thomas |
cc5a4cd |
-#define DATAFILE "data" /* a file giving the meaning of symbols used */
|
|
Michael Thomas |
cc5a4cd |
+#define HELP SHAREDIR "help" /* the file containing a description of the commands */
|
|
Michael Thomas |
cc5a4cd |
+#define SHELP SHAREDIR "hh" /* abbreviated form of the same */
|
|
Michael Thomas |
cc5a4cd |
+#define RUMORFILE SHAREDIR "rumors" /* a file with fortune cookies */
|
|
Michael Thomas |
cc5a4cd |
+#define DATAFILE SHAREDIR "data" /* a file giving the meaning of symbols used */
|
|
Michael Thomas |
cc5a4cd |
#define FMASK 0660 /* file creation mask */
|
|
Michael Thomas |
cc5a4cd |
#define HLOCK "perm" /* an empty file used for locking purposes */
|
|
Michael Thomas |
cc5a4cd |
#define LLOCK "safelock" /* link to previous */
|
|
Michael Thomas |
cc5a4cd |
--- bsdgames-2.17.orig/hunt/hunt/hunt.c
|
|
Michael Thomas |
cc5a4cd |
+++ bsdgames-2.17/hunt/hunt/hunt.c
|
|
Michael Thomas |
cc5a4cd |
@@ -394,7 +394,8 @@
|
|
Michael Thomas |
cc5a4cd |
|
|
Michael Thomas |
cc5a4cd |
vec_cnt = 0;
|
|
Michael Thomas |
cc5a4cd |
for (ip = ifp; ip; ip = ip->ifa_next)
|
|
Michael Thomas |
cc5a4cd |
- if ((ip->ifa_addr->sa_family == AF_INET) &&
|
|
Michael Thomas |
cc5a4cd |
+ if (ip->ifa_addr &&
|
|
Michael Thomas |
cc5a4cd |
+ (ip->ifa_addr->sa_family == AF_INET) &&
|
|
Michael Thomas |
cc5a4cd |
(ip->ifa_flags & IFF_BROADCAST))
|
|
Michael Thomas |
cc5a4cd |
vec_cnt++;
|
|
Michael Thomas |
cc5a4cd |
|
|
Michael Thomas |
cc5a4cd |
@@ -405,7 +406,8 @@
|
|
Michael Thomas |
cc5a4cd |
|
|
Michael Thomas |
cc5a4cd |
vec_cnt = 0;
|
|
Michael Thomas |
cc5a4cd |
for (ip = ifp; ip; ip = ip->ifa_next)
|
|
Michael Thomas |
cc5a4cd |
- if ((ip->ifa_addr->sa_family == AF_INET) &&
|
|
Michael Thomas |
cc5a4cd |
+ if (ip->ifa_addr &&
|
|
Michael Thomas |
cc5a4cd |
+ (ip->ifa_addr->sa_family == AF_INET) &&
|
|
Michael Thomas |
cc5a4cd |
(ip->ifa_flags & IFF_BROADCAST))
|
|
Michael Thomas |
cc5a4cd |
memcpy(&(*vector)[vec_cnt++], ip->ifa_broadaddr,
|
|
Michael Thomas |
cc5a4cd |
sizeof(struct sockaddr_in));
|
|
Michael Thomas |
cc5a4cd |
--- bsdgames-2.17.orig/sail/pl_main.c
|
|
Michael Thomas |
cc5a4cd |
+++ bsdgames-2.17/sail/pl_main.c
|
|
Michael Thomas |
cc5a4cd |
@@ -219,7 +219,7 @@
|
|
Michael Thomas |
cc5a4cd |
printf("\nInitial broadside %s (grape, chain, round, double): ",
|
|
Michael Thomas |
cc5a4cd |
n ? "right" : "left");
|
|
Michael Thomas |
cc5a4cd |
fflush(stdout);
|
|
Michael Thomas |
cc5a4cd |
- scanf("%s", buf);
|
|
Michael Thomas |
cc5a4cd |
+ scanf("%9s", buf);
|
|
Michael Thomas |
cc5a4cd |
switch (*buf) {
|
|
Michael Thomas |
cc5a4cd |
case 'g':
|
|
Michael Thomas |
cc5a4cd |
load = L_GRAPE;
|
|
Michael Thomas |
cc5a4cd |
--- bsdgames-2.17.orig/tetris/scores.c
|
|
Michael Thomas |
cc5a4cd |
+++ bsdgames-2.17/tetris/scores.c
|
|
Michael Thomas |
cc5a4cd |
@@ -335,7 +335,8 @@
|
|
Michael Thomas |
cc5a4cd |
continue;
|
|
Michael Thomas |
cc5a4cd |
}
|
|
Michael Thomas |
cc5a4cd |
}
|
|
Michael Thomas |
cc5a4cd |
- levelfound[sp->hs_level] = 1;
|
|
Michael Thomas |
cc5a4cd |
+ if (sp->hs_level < NLEVELS && sp->hs_level >= 0)
|
|
Michael Thomas |
cc5a4cd |
+ levelfound[sp->hs_level] = 1;
|
|
Michael Thomas |
cc5a4cd |
i++, sp++;
|
|
Michael Thomas |
cc5a4cd |
}
|
|
Michael Thomas |
cc5a4cd |
return (num > MAXHISCORES ? MAXHISCORES : num);
|
|
Michael Thomas |
cc5a4cd |
@@ -374,12 +375,14 @@
|
|
Michael Thomas |
cc5a4cd |
for (i = MINLEVEL; i < NLEVELS; i++)
|
|
Michael Thomas |
cc5a4cd |
levelfound[i] = 0;
|
|
Michael Thomas |
cc5a4cd |
for (i = 0, sp = scores; i < nscores; i++, sp++) {
|
|
Michael Thomas |
cc5a4cd |
- if (levelfound[sp->hs_level])
|
|
Michael Thomas |
cc5a4cd |
- sp->hs_time = 0;
|
|
Michael Thomas |
cc5a4cd |
- else {
|
|
Michael Thomas |
cc5a4cd |
- sp->hs_time = 1;
|
|
Michael Thomas |
cc5a4cd |
- levelfound[sp->hs_level] = 1;
|
|
Michael Thomas |
cc5a4cd |
- }
|
|
Michael Thomas |
cc5a4cd |
+ if (sp->hs_level < NLEVELS && sp->hs_level >= 0) {
|
|
Michael Thomas |
cc5a4cd |
+ if (levelfound[sp->hs_level])
|
|
Michael Thomas |
cc5a4cd |
+ sp->hs_time = 0;
|
|
Michael Thomas |
cc5a4cd |
+ else {
|
|
Michael Thomas |
cc5a4cd |
+ sp->hs_time = 1;
|
|
Michael Thomas |
cc5a4cd |
+ levelfound[sp->hs_level] = 1;
|
|
Michael Thomas |
cc5a4cd |
+ }
|
|
Michael Thomas |
cc5a4cd |
+ }
|
|
Michael Thomas |
cc5a4cd |
}
|
|
Michael Thomas |
cc5a4cd |
|
|
Michael Thomas |
cc5a4cd |
/*
|
|
Michael Thomas |
cc5a4cd |
@@ -433,7 +436,7 @@
|
|
Michael Thomas |
cc5a4cd |
continue;
|
|
Michael Thomas |
cc5a4cd |
}
|
|
Michael Thomas |
cc5a4cd |
sp = &hs[item];
|
|
Michael Thomas |
cc5a4cd |
- (void)sprintf(buf,
|
|
Michael Thomas |
cc5a4cd |
+ (void)snprintf(buf, sizeof(buf),
|
|
Michael Thomas |
cc5a4cd |
"%3d%c %6d %-11s (%6d on %d)",
|
|
Michael Thomas |
cc5a4cd |
item + offset, sp->hs_time ? '*' : ' ',
|
|
Michael Thomas |
cc5a4cd |
sp->hs_score * sp->hs_level,
|