summaryrefslogtreecommitdiff
blob: f40e1ff691d8b2ac428d9681fdc3fd4fd51f1c65 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
--- bsdgames-2.13.orig/atc/atc.6.in
+++ bsdgames-2.13/atc/atc.6.in
@@ -175,7 +175,7 @@
 to be a command and is therefore not displayed.  The following are
 some possible information lines:
 .Pp
-.Bd -literal -unfilled -offset indent
+.Bd -literal -offset indent
 B4*A0: Circle @ b1
 g7 E4: 225
 .Ed
@@ -438,7 +438,7 @@
 .Em exactly
 diagonal.
 .Ss "FIELD FILE EXAMPLE"
-.Bd -literal -unfilled
+.Bd -literal
 # This is the default game.
 
 update = 5;
--- bsdgames-2.13.orig/bcd/bcd.6
+++ bsdgames-2.13/bcd/bcd.6
@@ -50,7 +50,7 @@
 .Op Fl ds Ar string ...
 .Sh DESCRIPTION
 The
-.Nm "" ,
+.Nm bcd ,
 .Nm ppt
 and
 .Nm morse
--- bsdgames-2.13.orig/boggle/boggle/boggle.6
+++ bsdgames-2.13/boggle/boggle/boggle.6
@@ -99,7 +99,7 @@
 .El
 .Pp
 Help is available during play by typing
-.Ic Sq ? .
+.Ic `?' .
 More detailed information on the game is given there.
 .Sh BUGS
 If there are a great many words in the cube the final display of the words
--- bsdgames-2.13.orig/factor/factor.6
+++ bsdgames-2.13/factor/factor.6
@@ -1,4 +1,4 @@
-.\"	$NetBSD: factor.6,v 1.6 2001/04/02 22:42:38 wiz Exp $
+.\"	$NetBSD: factor.6,v 1.5 1997/10/10 12:51:27 lukem Exp $
 .\"
 .\" Copyright (c) 1989, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -42,13 +42,12 @@
 .\"   chongo <for a good prime call: 391581 * 2^216193 - 1> /\oo/\
 .\"
 .Dd May 31, 1993
-.Dt FACTOR 6
+.Dt PRIMES 6
 .Os
 .Sh NAME
-.Nm factor ,
 .Nm primes
 .Nd
-factor a number, generate primes
+generate primes
 .Sh SYNOPSIS
 .Nm
 .Op Ar number ...
@@ -57,32 +56,6 @@
 .Op Ar start Op Ar stop
 .Sh DESCRIPTION
 The
-.Nm
-utility will factor integers between -2147483648 and 2147483647 inclusive.
-When a number is factored, it is printed, followed by a
-.Dq \: ,
-and the list of factors on a single line.
-Factors are listed in ascending order, and are preceded by a space.
-If a factor divides a value more than once, it will be printed
-more than once.
-.Pp
-When
-.Nm
-is invoked with one or more arguments,
-each argument will be factored.
-.Pp
-When
-.Nm
-is invoked with no arguments,
-.Nm
-reads numbers, one per line, from standard input, until end of file or error.
-Leading white-space and empty lines are ignored.
-Numbers may be preceded by a single - or +.
-Numbers are terminated by a non-digit character (such as a newline).
-After a number is read, it is factored.
-Input lines must not be longer than 255 characters.
-.Pp
-The
 .Nm primes
 utility prints primes in ascending order, one per line, starting at or above
 .Ar start
@@ -113,14 +86,6 @@
 .Ar start
 value is terminated by a non-digit character (such as a newline).
 The input line must not be longer than 255 characters.
-.Sh DIAGNOSTICS
-Out of range or invalid input results in
-.Sq ouch
-being written to standard error.
 .Sh BUGS
-.Nm
-cannot handle the
-.Dq 10 most wanted
-factor list,
 .Nm primes
 won't get you a world record.
--- bsdgames-2.13.orig/hangman/extern.c
+++ bsdgames-2.13/hangman/extern.c
@@ -61,6 +61,7 @@
 };
 
 int     Errors, Wordnum = 0;
+unsigned int Minlen = MINLEN;
 
 double  Average = 0.0;
 
--- bsdgames-2.13.orig/hangman/getword.c
+++ bsdgames-2.13/hangman/getword.c
@@ -64,7 +64,7 @@
 		if (fgets(Word, BUFSIZ, inf) == NULL)
 			continue;
 		Word[strlen(Word) - 1] = '\0';
-		if (strlen(Word) < MINLEN)
+		if (strlen(Word) < Minlen)
 			continue;
 		for (wp = Word; *wp; wp++)
 			if (!islower(*wp))
--- bsdgames-2.13.orig/hangman/hangman.6.in
+++ bsdgames-2.13/hangman/hangman.6.in
@@ -42,6 +42,7 @@
 .Sh SYNOPSIS
 .Nm
 .Op Fl d Ar wordlist
+.Op Fl m Ar minlen
 .Sh DESCRIPTION
 In
 .Nm "" ,
@@ -55,6 +56,8 @@
 Use the specified
 .Ar wordlist
 instead of the default one named below.
+.It Fl m
+Set the minimum word length to use. The default is 6 letters.
 .El
 .Sh FILES
 .Bl -tag -width @hangman_wordsfile@ -compact
--- bsdgames-2.13.orig/hangman/hangman.h
+++ bsdgames-2.13/hangman/hangman.h
@@ -73,6 +73,7 @@
 extern const char *const Noose_pict[];
 
 extern int Errors, Wordnum;
+extern unsigned int Minlen;
 
 extern double Average;
 
--- bsdgames-2.13.orig/hangman/main.c
+++ bsdgames-2.13/hangman/main.c
@@ -62,14 +62,21 @@
 	/* Revoke setgid privileges */
 	setregid(getgid(), getgid());
 
-	while ((ch = getopt(argc, argv, "d:")) != -1) {
+	while ((ch = getopt(argc, argv, "m:d:")) != -1) {
 		switch (ch) {
 		case 'd':
 			Dict_name = optarg;
 			break;
+		case 'm':
+			Minlen = atoi(optarg);
+			if (Minlen < 2) {
+				fprintf(stderr, "minlen too short\n");
+				exit(1);
+			}
+			break;
 		case '?':
 		default:
-			(void)fprintf(stderr, "usage: hangman [-d wordlist]\n");
+			(void)fprintf(stderr, "usage: hangman [-d wordlist] [-m minlen]\n");
 			exit(1);
 		}
 	}
--- bsdgames-2.13.orig/hunt/hunt/hunt.6.in
+++ bsdgames-2.13/hunt/hunt/hunt.6.in
@@ -164,13 +164,13 @@
 .It Ic @
 Throw biggest bomb (Takes 441 charges)
 .It Ic o
-Throw small slime (Takes 15 charges)
+Throw small slime (Takes 5 charges)
 .It Ic O
-Throw big slime (Takes 30 charges)
+Throw big slime (Takes 10 charges)
 .It Ic p
-Throw bigger slime (Takes 45 charges)
+Throw bigger slime (Takes 15 charges)
 .It Ic P
-Throw biggest slime (Takes 60 charges)
+Throw biggest slime (Takes 20 charges)
 .It Ic s
 Scan (show where other players are) (Takes 1 charge)
 .It Ic c
--- bsdgames-2.13.orig/phantasia/Makefrag
+++ bsdgames-2.13/phantasia/Makefrag
@@ -41,11 +41,11 @@
 	$(INSTALL_SCORE_GAME) phantasia/phantasia $(INSTALL_PREFIX)$(GAMESDIR)/phantasia
 	$(HIDE_GAME) phantasia
 	(set -e; for f in $(phantasia_VFILES1); do \
-	    cp phantasia/$$f $(PHANTASIA_DIR)/$$f; \
+	    cp phantasia/$$f $(INSTALL_PREFIX)$(PHANTASIA_DIR)/$$f; \
 	    $(INSTALL_SCORE_FILE) $(PHANTASIA_DIR)/$$f; done)
 	(set -e; for f in $(phantasia_VFILES2); do \
 	    if [ ! -e $(PHANTASIA_DIR)/$$f ]; then \
-		cp phantasia/$$f $(PHANTASIA_DIR)/$$f; fi; done; \
+		cp phantasia/$$f $(INSTALL_PREFIX)$(PHANTASIA_DIR)/$$f; fi; done; \
 	    $(INSTALL_SCORE_FILE) $(PHANTASIA_DIR)/scoreboard; \
 	    $(INSTALL_SCORE_FILE) -p $(PHANTASIA_DIR)/characs)
 	$(INSTALL_MANUAL) phantasia/phantasia.6
--- bsdgames-2.13.orig/tetris/screen.c
+++ bsdgames-2.13/tetris/screen.c
@@ -292,6 +292,8 @@
 	newtt = oldtt;
 	newtt.c_lflag &= ~(ICANON|ECHO);
 	newtt.c_oflag &= ~OXTABS;
+	newtt.c_cc[VMIN] = 1; /* don't lag behind 3 keystrokes on sun */
+	newtt.c_cc[VTIME] = 0; /* systems -- JEH */
 	if (tcsetattr(0, TCSADRAIN, &newtt) < 0)
 		stop("tcsetattr() fails");
 	ospeed = cfgetospeed(&newtt);
--- bsdgames-2.13.orig/trek/trek.6.in
+++ bsdgames-2.13/trek/trek.6.in
@@ -81,7 +81,7 @@
 .Sh AUTHOR
 Eric Allman
 .Sh SEE ALSO
-.Pa /usr/share/doc/usd/31.trek
+.Pa /usr/share/doc/bsdgames/trek.me.gz
 .Sh COMMAND SUMMARY
 .Bl -item -compact
 .It
--- bsdgames-2.13.orig/wargames/wargames.6
+++ bsdgames-2.13/wargames/wargames.6
@@ -44,6 +44,6 @@
 resulting is much smaller....
 .Sh SEE ALSO
 .Sy Wargames ,
-the movie (an MGM production, PGP 13, directed by John Badham, 1983).
+the movie (an MGM production, PG 13, directed by John Badham, 1983).
 .Sh AUTHOR
 This manual page was written by Joey Hess <joeyh@kitenet.net>.
--- bsdgames-2.13.orig/AUTHORS
+++ bsdgames-2.13/AUTHORS
@@ -8,7 +8,7 @@
 1997; I divided it into bsd-games and bsd-games-non-free according to
 the established (DFSG/OSD) definition, following the division used for
 the Debian package of 1.3.  Much of the packaging has been written or
-extensively modified by myself.  Joey Hess <joeyh@master.debian.org>
+extensively modified by myself.  Joey Hess <joeyh@debian.org>
 wrote the manpages for wargames and paranoia.
 
 Based on the source and manpages, here are the details of the people
--- bsdgames-2.13.orig/THANKS
+++ bsdgames-2.13/THANKS
@@ -12,7 +12,7 @@
 
 For recent work (since 1.3), thanks to:
 
-Joey Hess <joeyh@master.debian.org>
+Joey Hess <joeyh@debian.org>
 
   For the Debian patches, which covered what was needed to make the games
   compile with current libraries, provided many bug fixes and showed
--- bsdgames-2.13.orig/config.params
+++ bsdgames-2.13/config.params
@@ -0,0 +1,40 @@
+# This file is read by configure and is used during the build of the
+# Debian package.
+
+# Don't run configure interactively.
+bsd_games_cfg_non_interactive=y
+
+# Install into here for building the package.
+bsd_games_cfg_install_prefix=`pwd`/debian/bsdgames
+
+# Do not build or install these games:
+bsd_games_cfg_no_build_dirs="dm banner fortune factor"
+
+# Keep huntd in /usr/sbin as it was in the past. I may 
+# change this later.
+bsd_games_cfg_sbindir=/usr/sbin
+
+# Debian doesn't like cluttering up the /usr/*/games/ dirs too much,
+# use a subdir. /var too.
+bsd_games_cfg_usrlibdir=/usr/lib/games/bsdgames
+bsd_games_cfg_sharedir=/usr/share/games/bsdgames
+bsd_games_cfg_varlibdir=/var/games/bsdgames
+
+# Do not do chown now, we arn't running as root.
+bsd_games_cfg_do_chown=n
+
+# Debian perfers symlinks for manpages.
+bsd_games_cfg_use_dot_so=symlinks
+
+# I'll handle manpage compressing.
+bsd_games_cfg_gzip_manpages=n
+
+# Policy says to use /usr/bin/pager by default.
+bsd_games_cfg_pager=/usr/bin/pager
+
+# Always use the same wordlist for boggle, and don't use web2, it's too
+# big. Instead, use the union of the wenglish and wbritish wordlists.
+bsd_games_cfg_dictionary_src=`pwd`/temp-dictionary
+
+# Put it in /usr/share/games with the rest of the games data.
+bsd_games_cfg_wtf_acronymfile=/usr/share/games/bsdgames/acronyms