From a0ee2a58d230975fe820b1e74caa29bea37a8f63 Mon Sep 17 00:00:00 2001 From: joey Date: Wed, 19 Apr 2000 21:33:04 +0000 Subject: [PATCH] New upstream source git-svn-id: file:///srv/svn/joey/bsdgames-trunk@5126 a4a2c43b-8ac3-0310-8836-e0e880c912e2 --- AUTHORS | 3 +++ NEWS | 10 ++++++++++ configure | 39 ++++++++++++++++++++++++++------------- debian/changelog | 6 ++++++ hunt/hunt/hunt.c | 8 +++----- quiz/datfiles/asia | 2 +- robots/score.c | 8 ++++---- 7 files changed, 53 insertions(+), 23 deletions(-) diff --git a/AUTHORS b/AUTHORS index 97f7285..4dc12b4 100644 --- a/AUTHORS +++ b/AUTHORS @@ -38,6 +38,9 @@ factor: Landon Curt Noll fish: Muffy Barkocy fortune: Ken Arnold (fortunes from many sources) gomoku: Ralph Campbell (with acknowledgement to Peter Langston) +hack: Originally Jay Fenlason, with help from Kenny + Woodland, Mike Thome and Jon Payne; this version + almost entirely rewritten by Andries Brouwer . hangman: Ken Arnold hunt: Conrad Huang , Greg Couch diff --git a/NEWS b/NEWS index df85351..b7f828b 100644 --- a/NEWS +++ b/NEWS @@ -11,6 +11,16 @@ changes in installation instructions. Packagers should also reread the PACKAGING file each version (or do a diff between the old and new versions of the package and read that). +Version 2.11 (2000-04-19) +============ + +* bsd-games-non-free now includes hack 1.0.3 by Andries Brouwer; this +may be of interest to nethack players wishing to play an ancestral +game. + +* Various minor changes and bugfixes; current with NetBSD CVS of +2000-04-19. + Version 2.10 (2000-02-12) ============ diff --git a/configure b/configure index f90a91d..f9497b0 100755 --- a/configure +++ b/configure @@ -1,7 +1,7 @@ #!/bin/sh # configure - home-grown configuration script for bsd-games. # -# Copyright (c) 1997, 1998, 1999 Joseph Samuel Myers. +# Copyright (c) 1997, 1998, 1999, 2000 Joseph Samuel Myers. # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -446,6 +446,19 @@ game_ask dm "Configuration file for dm" dm_configfile /etc/dm.conf game_ask dm "File to disable games playing" dm_nogamesfile /etc/nogames game_ask dm "Log file for dm" dm_logfile "$varlibdir/games.log" game_ask fish "File for fish instructions" fish_instrfile "$sharedir/fish.instr" +game_ask hack "Directory for hack variable data" hack_dir "$varlibdir/hack" + +if building_in hack; then + echo + echo "This directory will need to be writable by hack at runtime." + echo "Note that with the default permissions given here this will" + echo "not work: you may want to choose permissions appropriate to the" + echo "security policy you are using (e.g. 2775 root.games for setgid" + echo "games)." + askperms "Hack directory" hack_dir root root 0755 + install_hack_dir=`echo "$install_hack_dir" |sed 's/install -c/install -d/'` +fi + game_ask hangman "Words file for hangman (CHECK ANSWER)" hangman_wordsfile /usr/share/dict/words # Hunt has some other configuration game_ask monop "File for monop cards" monop_cardsfile "$sharedir/monop-cards.pck" @@ -528,16 +541,16 @@ prog_to_exec () { fi } -slash_to_under () { - echo "$1" |sed 's:/:_:g' +slashdot_to_under () { + echo "$1" |sed 's:/:_:g' |sed 's:\.:_:g' } exec_to_libs () { - eval echo \$$(slash_to_under $1)_libs + eval echo \$$(slashdot_to_under $1)_libs } exec_to_objs () { - eval echo \$$(slash_to_under $1)_objs + eval echo \$$(slashdot_to_under $1)_objs } make_dirs_tmp="$(find $build_dirs -depth -type d) lib" @@ -553,7 +566,7 @@ done all_dependencies= for dir in $make_dirs; do - udir=$(slash_to_under $dir) + udir=$(slashdot_to_under $dir) all_dependencies="$all_dependencies ${udir}_all" done @@ -575,7 +588,7 @@ include subst.rules EOF for dir in $make_dirs; do - udir=$(slash_to_under $dir) + udir=$(slashdot_to_under $dir) eval clean_$udir= cat >>GNUmakefile < Wed, 19 Apr 2000 14:30:22 -0700 + bsdgames (2.10-3) unstable; urgency=low * Modified asian capitals quiz with some corrections. Closes: #62078 diff --git a/hunt/hunt/hunt.c b/hunt/hunt/hunt.c index dc0e130..8cdde51 100644 --- a/hunt/hunt/hunt.c +++ b/hunt/hunt/hunt.c @@ -1,4 +1,4 @@ -/* $NetBSD: hunt.c,v 1.9 2000/01/21 17:08:33 mycroft Exp $ */ +/* $NetBSD: hunt.c,v 1.11 2000/04/14 05:58:03 simonb Exp $ */ /* * Hunt * Copyright (c) 1985 Conrad C. Huang, Gregory S. Couch, Kenneth C.R.C. Arnold @@ -7,9 +7,10 @@ #include #ifndef lint -__RCSID("$NetBSD: hunt.c,v 1.9 2000/01/21 17:08:33 mycroft Exp $"); +__RCSID("$NetBSD: hunt.c,v 1.11 2000/04/14 05:58:03 simonb Exp $"); #endif /* not lint */ +# include # include # include # include @@ -23,7 +24,6 @@ __RCSID("$NetBSD: hunt.c,v 1.9 2000/01/21 17:08:33 mycroft Exp $"); # include static struct termios saved_tty; # endif -# include # include # include "hunt.h" @@ -106,8 +106,6 @@ main(ac, av) char *term; int c; extern int Otto_mode; - extern int optind; - extern char *optarg; long enter_status; /* Revoke setgid privileges */ diff --git a/quiz/datfiles/asia b/quiz/datfiles/asia index 019462e..b9449f4 100644 --- a/quiz/datfiles/asia +++ b/quiz/datfiles/asia @@ -4,6 +4,7 @@ Bahrein:Manama Bangladesh:Dacca Bhutan:Thimbu Burma:Rangoon +Cambodia|Khmer:P{h}nom Penh China:Peking Cyprus:Nicosia India:New Delhi @@ -13,7 +14,6 @@ Iraq:Baghdad Israel:Jerusalem Japan:Tokyo Jordan:Amman -Cambodia|Khmer:P{h}nom Penh Kuwait:Al-kuwait Laos:Vientiane Lebanon:Beirut diff --git a/robots/score.c b/robots/score.c index cd6542a..2ef05ee 100644 --- a/robots/score.c +++ b/robots/score.c @@ -1,4 +1,4 @@ -/* $NetBSD: score.c,v 1.12 2000/01/20 13:24:11 jsm Exp $ */ +/* $NetBSD: score.c,v 1.13 2000/04/09 23:02:52 mycroft Exp $ */ /* * Copyright (c) 1980, 1993 @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)score.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: score.c,v 1.12 2000/01/20 13:24:11 jsm Exp $"); +__RCSID("$NetBSD: score.c,v 1.13 2000/04/09 23:02:52 mycroft Exp $"); #endif #endif /* not lint */ @@ -175,7 +175,7 @@ score(score_wfd) move((scp - Top) + 2, 15); if (!done_show && scp->s_uid == uid && scp->s_score == Score) standout(); - printw("%5.5d %5.5d %-8.8s %-9.9s %5.5d", + printw("%5d %5d %-8.8s %-9.9s %5d", (scp - Top) + 1, scp->s_score, scp->s_name, scp->s_auto ? "(autobot)" : "", scp->s_level); if (!done_show && scp->s_uid == uid && scp->s_score == Score) { @@ -237,7 +237,7 @@ show_score() " ", "Level"); for (scp = Top; scp < &Top[MAXSCORES]; scp++) if (scp->s_score > 0) - printf("%5.5d %5.5d %-8.8s %-9.9s %5.5d\n", + printf("%5d %5d %-8.8s %-9.9s %5d\n", inf++, scp->s_score, scp->s_name, scp->s_auto ? "(autobot)" : "", scp->s_level); }