Source Mage code commit list

[Robin Cook <scm AT sourcemage.org>]

GIT changes to master games grimoire by Robin Cook <rcook AT wyrms.net>:

 games-terminal/bsd-games/HISTORY                    |    4 
 games-terminal/bsd-games/PRE_BUILD                  |   14 
 games-terminal/bsd-games/add-acronyms.diff          |  134 ++++
 games-terminal/bsd-games/anne-boleyn.diff           |   11 
 games-terminal/bsd-games/capitals.diff              |  290 ++++++++++
 games-terminal/bsd-games/debian-changes-2.17-19     |  570 
++++++++++++++++++++
 games-terminal/bsd-games/define-dead.diff           |   10 
 games-terminal/bsd-games/quiz-presidents.diff       |   12 
 games-terminal/bsd-games/refresh-robots-screen.diff |   10 
 games-terminal/bsd-games/replace-getline.diff       |  185 ++++++
 games-terminal/bsd-games/sort-acronyms.comp.diff    |   80 ++
 games-terminal/bsd-games/wump-update.diff           |  521 ++++++++++++++++++
 12 files changed, 1840 insertions(+), 1 deletion(-)

New commits:
commit d609b3ac891247df1d575eef79cf01780cc36dc1
Author: Robin Cook <rcook AT wyrms.net>
Commit: Robin Cook <rcook AT wyrms.net>

    bsd-games: added newest debian patches and copy dict files that boggle 
needs

diff --git a/games-terminal/bsd-games/HISTORY 
b/games-terminal/bsd-games/HISTORY
index 319dbd6..bd0dc4a 100644
--- a/games-terminal/bsd-games/HISTORY
+++ b/games-terminal/bsd-games/HISTORY
@@ -1,3 +1,7 @@
+2010-08-09 Robin Cook <rcook AT wyms.net> 
+       * PRE_BUILD: added newest debian patches
+         make directory and copy files needed by boggle
+
 2008-05-02 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
        * PRE_BUILD: fixing bug #14505 thanks to Javier
        * bds-games-2.17.patch: added patch from debian thanks to Javier
diff --git a/games-terminal/bsd-games/PRE_BUILD 
b/games-terminal/bsd-games/PRE_BUILD
index ce47f33..cbd89b5 100755
--- a/games-terminal/bsd-games/PRE_BUILD
+++ b/games-terminal/bsd-games/PRE_BUILD
@@ -2,5 +2,17 @@ default_pre_build                           &&
 cd $SOURCE_DIRECTORY/include                &&
 patch -p0 < $SPELL_DIRECTORY/stdio.h.patch  &&
 cd $SOURCE_DIRECTORY                        &&
-patch -p1 < "$SPELL_DIRECTORY/bsd-games-2.17.patch"
+patch -p1 < "$SPELL_DIRECTORY/replace-getline.diff"         &&
+patch -p1 < "$SPELL_DIRECTORY/quiz-presidents.diff"         &&
+patch -p1 < "$SPELL_DIRECTORY/add-acronyms.diff"            &&
+patch -p1 < "$SPELL_DIRECTORY/sort-acronyms.comp.diff"      &&
+patch -p1 < "$SPELL_DIRECTORY/refresh-robots-screen.diff"   &&
+patch -p1 < "$SPELL_DIRECTORY/anne-boleyn.diff"             &&
+patch -p1 < "$SPELL_DIRECTORY/capitals.diff"                &&
+patch -p1 < "$SPELL_DIRECTORY/define-dead.diff"             &&
+patch -p1 < "$SPELL_DIRECTORY/wump-update.diff"             &&
+patch -p1 < "$SPELL_DIRECTORY/debian-changes-2.17-19"       &&
 
+mkdir temp-dictionary  &&
+cd temp-dictionary     &&
+cp /usr/share/dict/words ./ 
diff --git a/games-terminal/bsd-games/add-acronyms.diff 
b/games-terminal/bsd-games/add-acronyms.diff
new file mode 100644
index 0000000..368f47b
--- /dev/null
+++ b/games-terminal/bsd-games/add-acronyms.diff
@@ -0,0 +1,134 @@
+--- a/wtf/acronyms
++++ b/wtf/acronyms
+@@ -87,6 +87,7 @@
+ HICA  here it comes again
+ HTH   hope this helps
+ IAC   in any case
++IANADD        I am not a Debian developer
+ IANAL I am not a lawyer
+ IC    I see
+ ICBW  I could be wrong
+@@ -139,6 +140,8 @@
+ NFI   no fucking idea
+ NFW   no fucking way
+ NIH   not invented here
++NIMB  not in my backyard
++NIMBY not in my backyard
+ NMF   not my fault
+ NMP   not my problem
+ NOYB  none of your business
+@@ -146,6 +149,7 @@
+ NP    no problem
+ NRFPT not ready for prime time
+ NRN   no reply necessary
++NSFW  not safe for work
+ OIC   oh, I see
+ OMG   oh, my god
+ OT    off topic
+@@ -187,6 +191,7 @@
+ SFA   sweet fuck all
+ SHID  slaps head in disgust
+ SIMCA sitting in my chair amused
++SIYH  sooner if you help
+ SMLSFB        so many losers, so few bullets
+ SMOP  simple matter of programming
+ SNAFU situation normal, all fucked up
+@@ -212,7 +217,9 @@
+ THNX  thanks
+ THX   thanks
+ TIA   thanks in advance
++TINASOTODP    this is not a statement of the official Debian position
+ TINC  there is no cabal
++TINLA this is not legal advice
+ TLA   three letter acronym
+ TLB   translation lookaside buffer
+ TMA   too many abbreviations
+@@ -237,6 +244,7 @@
+ WFM   works for me
+ WIBNI wouldn't it be nice if
+ WIP   work in progress
++WIR   when it's ready
+ WOFTAM        waste of fucking time and money
+ WOMBAT        waste of money, brain, and time
+ WRT   with respect to
+--- a/wtf/acronyms.comp
++++ b/wtf/acronyms.comp
+@@ -62,7 +62,9 @@
+ DCE   data control equipment
+ DCE   distributed computing environment
+ DCT   discrete cosine transform
++DD    Debian developer
+ DDC   display data channel
++DDPO  Debian developer's package overview 
(http://qa.debian.org/developer.php)
+ DDR   double data rate
+ DDWG  digital display working group
+ DER   distinguished encoding rules
+@@ -108,12 +110,14 @@
+ FM    frequency modulation
+ FPM   fast page mode
+ FQDN  fully qualified domain name
++FTBFS fails to build from source
+ FTP   file transfer protocol
+ GC    garbage collector
+ GCR   group-coded recording
+ GIF   graphics interchange format
+-GNU   gnu's not unix
+-GPL   gnu/general public license
++GIYF  google is your friend
++GNU   GNU's not unix
++GPL   GNU general public license
+ GPU   graphics processing unit
+ GRE   generic routing encapsulation
+ GUI   graphics user interface
+@@ -160,6 +164,7 @@
+ LCP   link control protocol
+ LDAP  lightweight directory access protocol
+ LED   light emitting diode
++LGPL  GNU lesser general public license
+ LIR   local internet registry
+ LLC   logical link control
+ LRC   longitudinal redundancy check
+@@ -174,7 +179,9 @@
+ MIME  multipurpose internet mail extensions
+ MIPS  million instructions per second
+ MMU   memory management unit
++MOTU  masters of the universe (Ubuntu developer)
+ MPEG  moving picture experts group
++MPL   Mozilla public license
+ MSB   most significant bit [or: byte]
+ MSF   minutes seconds frames
+ MSS   maximum segment size
+@@ -236,6 +243,7 @@
+ RAM   random access memory
+ RCS   revision control system
+ RFC   request for comments
++RFS   request for sponsorship
+ RGB   red green blue
+ RIP   routing information protocol
+ RIR   regional internet registry
+@@ -246,6 +254,9 @@
+ RPM   revolutions per minute
+ RTF   rich text format
+ RTS   request to send
++RTSL  read the source, Luke (open source programming)
++RTSL  real-time systems laboratory
++RTSL  real-time shading language (Stanford University)
+ RTT   round time trip
+ S/PDIF        sony/phillips digital interface
+ SACD  super audio compact disc
+@@ -265,6 +276,7 @@
+ SNMP  simple network management protocol
+ SPD   serial presence detect
+ SRAM  static random access memory
++SRU   stable release update
+ SSFDC solid state floppy disc card
+ SSH   secure shell
+ SSL   secure sockets layer
+@@ -296,6 +308,7 @@
+ USB   universal serial bus
+ USWC  uncacheable speculative write combining
+ UTP   unshielded twisted pair
++UTSL  use the source, Luke (open source programming)
+ UUCP  unix-to-unix copy protocol
+ VAX   virtual address extension
+ VCM   virtual channel memory
diff --git a/games-terminal/bsd-games/anne-boleyn.diff 
b/games-terminal/bsd-games/anne-boleyn.diff
new file mode 100644
index 0000000..fe7d79e
--- /dev/null
+++ b/games-terminal/bsd-games/anne-boleyn.diff
@@ -0,0 +1,11 @@
+--- a/quiz/datfiles/murders
++++ b/quiz/datfiles/murders
+@@ -19,7 +19,7 @@
+ {Yukio }Mishima:{Yukio }Mishima
+ {Alexander }Hamilton:{Aaron }Burr
+ Cleopatra:{the |an }asp
+-[Ann Boleyn|Catharine Howard]:Henry{ VIII}
++[Anne Boleyn|Catharine Howard]:Henry{ VIII}
+ vaudeville:{the }movies|film
+ {the }movies|film:TV|television
+ {the }VA patients:{the }nurses
diff --git a/games-terminal/bsd-games/capitals.diff 
b/games-terminal/bsd-games/capitals.diff
new file mode 100644
index 0000000..d437efc
--- /dev/null
+++ b/games-terminal/bsd-games/capitals.diff
@@ -0,0 +1,290 @@
+--- a/quiz/datfiles/africa
++++ b/quiz/datfiles/africa
+@@ -1,43 +1,56 @@
+-Algeria:Alg[iers|er]
+-Botswana:Gaberones
++Algeria:Algiers
++Angola:Luanda
++Benin:Porto-Novo
++Botswana:Gaborone
++Burkina Faso:Ouagadougou
+ Burundi:Bujumbura
+-Cameroun:Yaound['e|e'|e]
++C[^o|o^|o]te d'Ivoire:Yamoussoukro
++Cameroon:Yaound['e|e'|e]
++Cape Verde:Praia
+ Central Africa{n Rep{ublic}}:Bangui
+-Chad:Ndjamena
+-Congo:Brazzaville
+-Dahomey:Porto Novo
++Chad:N'Djamena|Ndjamena
++Comoros:Moroni
++Djibouti:Djibouti
++Egypt:Cairo
++Equatorial Guinea:Malabo
++Eritrea:Asmara
+ Ethiopia:Addis Ababa
+ Gabon:Libreville
+ Ghana:Accra
+ Guinea-Bissau:Bissau
+ Guinea:Conakry
+-Ivory Coast:Abidjan
+ Kenya:Nairobi
+ Lesotho:Maseru
+ Liberia:Monrovia
+-Libya:Al Bayda{'}
+-Malagasy{ Rep{ublic}}|Madagascar:Tananarive
+-Malawi:Zomba
++Libya:Tripoli
++Malagasy{ Rep{ublic}}|Madagascar:Antananarivo
++Malawi:Lilongwe
+ Mali:Bamako
+ Mauritania:Nouakchott
++Mauritius:Port Louis
++Mayotte:Mamoudzou
++Mo[z|,c|c,|c]ambique:Maputo
+ Morocco:Rabat
+-Mo[z|,c|c,|c]ambique:Louren[,c|c,|c]o Marques
++Namibia:Windhoek
+ Niger:Niamey
+-Nigeria:Lagos
+-Rhodesia:Salisbury
++Nigeria:Abuja
++R['e|e'|e]union:Saint-Denis
++Rep. Congo:Brazzaville
+ Rwanda:Kigali
++S[~a|a~|a]o Tom['e|e'|e] and Pr['i|i'|i]ncipe:S[~a|a~|a]o 
Tom['e|e'|e]
++Saint Helena:Jamestown
+ Senegal:Dakar
++Seychelles:Victoria
+ Sierra Leone:Freetown
+-Somali{ Rep{ublic}}:Mogadis[cio|hu]
++Somalia:Mogadishu
+ Sudan:Khartoum
+ Swaziland:Mbabane
+-Tanzania:Dar es Salaam
++Tanzania:Dodoma
+ Togo:Lom['e|e'|e]
+ Tunisia:Tunis
+ Uganda:Kampala
+-United Arab Rep{ublic}|Egypt:Cairo
+-Upper Volta:Ouagadougou
+ Zambia:Lusaka
+-Za["i|i"|i]re:Kinshasha
++Zimbabwe:Harare
++{DR |Democratic Republic of the }Congo:Kinshasa
+ {Rep{ublic} of }South Africa:Pretoria
+-{The }Gambia:Bathurst
++{The }Gambia:Banjul|Bathurst
+--- a/quiz/datfiles/america
++++ b/quiz/datfiles/america
+@@ -1,27 +1,54 @@
++Anguilla:The Valley
++Antigua and Barbuda:St. John's
+ Argentina:Buenos Aires
+-Bahamas:Nassau
++Aruba:Oranjestad
+ Barbados:Bridgetown
++Belize:Belmopan
++Bermuda:Hamilton
+ Bolivia:La Paz|Sucre
+-Bra[z|s]il:Brasilia
++Bra[z|s]il:Bras['i|i'|i]lia
++British Virgin Islands:Road Town
+ Canada:Ottawa
++Cayman Islands:George Town
+ Chile:Santiago
+ Colombia:Bogot['a|a'|a]
+-Costa Rica:San Jose
++Costa Rica:San Jos['e|e'|e]
+ Cuba:Ha[v|b]ana
++Dominica:Roseau
+ Dominican Republic:Santo Domingo
+ Ecuador:Quito
+ El Salvador:San Salvador
+-Guatemala:Guatemala
++Falkland Islands:Stanley
++French Guiana:Cayenne
++Greenland:Nuuk
++Grenada:St. George's
++Guadeloupe:Basse-Terre
++Guatemala:Guatemala City
+ Guyana:Georgetown
+-Haiti:Port au Prince
++Haiti:Port[-| ]au[-| ]Prince
+ Honduras:Tegucigalpa
+ Jamaica:Kingston
+-Mexico:Mexico
++Martinique:Fort-de-France
++Mexico:Mexico City
++Montserrat:Plymouth|Brades
++Netherlands Antilles:Willemstad
+ Nicaragua:Managua
+-Panama:Panama
++Panama:Panama City
+ Paraguay:Asunci['o|o'|o]n
+ Peru:Lima
+-Trinidad[ and Tobago|]:Port of Spain
+-United States|US{A}:Washington
++Puerto Rico:San Juan
++SGSSI|South Georgia and the South Sandwich Islands:Grytviken|King Edward 
Point
++Saint Barth['e|e'|e]lemy:Gustavia
++Saint Kitts and Nevis:Basseterre
++Saint Lucia:Castries
++Saint Martin:Marigot
++Saint Pierre and Miquelon:Saint-Pierre
++Saint Vincent and the Grenadines:Kingstown
++Suriname:Paramaribo
++Trinidad{ and Tobago}:Port of Spain
++Turks and Caicos Islands:Cockburn Town
++United States Virgin Islands:Charlotte Amalie
++United States|US{A}:Washington{ DC}
+ Uruguay:Montevideo
+ Venezuela:Caracas
++{The }Bahamas:Nassau
+--- a/quiz/datfiles/asia
++++ b/quiz/datfiles/asia
+@@ -1,12 +1,16 @@
+ Afghanistan:Kabul
++Armenia:Yerevan
+ Australia:Canberra
+-Bahrein:Manama
+-Bangladesh:Dacca
+-Bhutan:Thimbu
+-Burma:Rangoon
+-Cambodia|Khmer:P{h}nom Penh
+-China:Peking
++Azerbaijan:Baku
++Bahr[a|e]in:Manama
++Bangladesh:Dhaka
++Bhutan:Thimphu
++Burma:Naypyidaw
++Cambodia:Phnom Penh
+ Cyprus:Nicosia
++East Timor:Dili
++Egypt:Cairo
++Georgia:Tbilisi
+ India:New Delhi
+ Indonesia:Jakarta|Djakarta
+ Iran:Tehran
+@@ -14,28 +18,34 @@
+ Israel:Jerusalem
+ Japan:Tokyo
+ Jordan:Amman
+-Kuwait:Al-kuwait
++Kazakhstan:Astana
++Kuwait:Kuwait City
++Kyrgyzstan:Bishkek
+ Laos:Vientiane
+ Lebanon:Beirut
+ Malaysia:Kuala Lumpur
+-Maldive Islands:Male
++Maldives:Mal['e|e'|e]
+ Mongolia:Ulan Bator
+-Nepal:Katmandu
++Nepal:Kathmandu
+ North Korea:P{'}yongyang
+-North Yemen:San{'}a
+ Oman:Muscat
+ Pakistan:Islamabad
+-Papua[-| ]New Guinea:Port Moresby
++Papua New Guinea:Port Moresby
+ Philippines:Manila
+ Qatar:Doha
+-Saudi Arabia:Riyadh|J{ei}ddah
++Russia:Moscow
++Saudi Arabia:Riyadh
+ Singapore:Singapore
+ South Korea:Seoul
+-South Yemen:Aden
+-Sri Lanka:Colombo
++Sri Lanka:Kotte
+ Syria:Damascus
+ Taiwan:Taipei
++Tajikistan:Dushanbe
+ Thailand:Bangkok
+ Turkey:Ankara
+-United Arab Emirates:Abu Dhabi
++Turkmenistan:Ashgabat
++United Arab Emirates|UAE:Abu Dhabi
++Uzbekistan:Tashkent
+ Vietnam:Hanoi
++{Republic of }Yemen:Sana'a
++{{People's }Republic of }China:Beijing|Peking
+--- a/quiz/datfiles/europe
++++ b/quiz/datfiles/europe
+@@ -1,44 +1,60 @@
+-Albania:Tirana|Tirane"
++Abkhazia:Sukhumi
++Albania:Tirana
+ Andorra:Andorra la V[ell|iej]a
++Armenia:Yerevan
+ Austria:Vienna|Wien
+-Belarus|Byelorussia:M[i|e]nsk
+-Belgium:Brussel[s|]|Bruxelles
+-Bosnia[-Herzegovina|]:Sarajevo
+-Bulgaria:Sofi[a|ya]
++Azerbaijan:Baku
++Belarus:Minsk
++Belgium:Brussel{s}|Bruxelles
++Bosnia and Herzegovina:Sarajevo
++Bulgaria:Sofia
+ Croatia:Zagreb
++Cyprus:Nicosia
+ Czech Republic:Prague|Praha
+-Denmark:Copenhagen|K[o|o/]benhavn
+-United Kingdom|England|Great Britain|UK:London
++Denmark:Copenhagen|K[o|o/|/o]benhavn
+ Estonia:Tallinn
++Faroe Islands:T['o|o'|o]rshavn
+ Finland:Helsinki
+ France:Paris
+ Georgia:Tbilisi
+ Germany:Berlin
++Gibraltar:Gibraltar
+ Greece:Athens
++Guernsey:Saint Peter Port
+ Hungary:Budapest
+-Iceland:Reykjavik
++Iceland:Reykjav['i|i'|i]k
+ Ireland|Eire:Dublin
++Isle of Man:Douglas
+ Italy:Rom[e|a]
++Jersey:Saint Helier
++Kazakhstan:Astana
++Kosovo:Pristina
+ Latvia:Riga
+ Liechtenstein:Vaduz
+ Lithuania:Vilnius
+ Luxembourg:Luxembourg
+-[|Former Yugoslav Republic Of ]Macedonia:Skop[|l]je
++Macedonia:Skopje
+ Malta:Valletta
+-Moldova:Chisinau|Kishinev
++Moldova:Chi[,s|s,|s]inau|Kishinev
+ Monaco:Monaco
+-Netherlands|Holland:Amsterdam
++Montenegro:Podgorica
++Netherlands:Amsterdam
+ Norway:Oslo
+ Poland:Wars[aw|zawa]
+ Portugal:Lisbo[n|a]
+-R[u|o]mania:Bucharest|Bucuresti
++Romania:Bucharest
+ Russia:Mos[cow|kva]
+ San Marino:San Marino
+-Serbia and Montenegro:Belgrade|Beograd
+-Slovakia|Slovak Republic:Bratislava
++Serbia:Belgrade
++Slovakia:Bratislava
+ Slovenia:Ljubljana
++South Ossetia:Tskhinvali
+ Spain:Madrid
++Svalbard:Longyearbyen
+ Sweden:Stockholm
+ Switzerland:Bern{e}
+ Turkey:Ankara
+ Ukraine:Kiev|Kyiv
++United Kingdom|England|Great Britain|UK:London
++Vatican City:Vatican City
++[°A|A°|A]land Islands:Mariehamn
diff --git a/games-terminal/bsd-games/debian-changes-2.17-19 
b/games-terminal/bsd-games/debian-changes-2.17-19
new file mode 100644
index 0000000..fdcd87b
--- /dev/null
+++ b/games-terminal/bsd-games/debian-changes-2.17-19
@@ -0,0 +1,570 @@
+Description: Upstream changes introduced in version 2.17-19
+ This patch has been created by dpkg-source during the package build.
+ Here's the last changelog entry, hopefully it gives details on why
+ those changes were made:
+ .
+ bsdgames (2.17-19) unstable; urgency=low
+ .
+   * debian/patches/define-dead.diff:
+     - Define __dead in include/sys/cdefs.h
+   * debian/patches/wump-update.diff:
+     - Update wump sources to NetBSD CVS as of 2010-01-14. This fixes
+       several bugs, including the over-crowded cave. Thanks to
+       Jörg Neulist for the bug report and patch. Closes: #564891
+ .
+ The person named in the Author field signed this changelog entry.
+Author: Tobias Quathamer <toddy AT debian.org>
+Bug-Debian: http://bugs.debian.org/564891
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: http://bugs.debian.org/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+--- /dev/null
++++ bsdgames-2.17/config.params
+@@ -0,0 +1,42 @@
++# 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
++
++bsd_games_cfg_docdir=/usr/share/doc/bsdgames
+--- bsdgames-2.17.orig/arithmetic/arithmetic.6
++++ bsdgames-2.17/arithmetic/arithmetic.6
+@@ -79,7 +79,7 @@ divide by or subtract will be between 0 
+ .Nm
+ will not ask you to divide by 0.)
+ The default
+-.I range
++.It range
+ is 10.
+ .El
+ .Pp
+--- bsdgames-2.17.orig/dm/dm.c
++++ bsdgames-2.17/dm/dm.c
+@@ -134,19 +134,19 @@ read_config()
+       while (fgets(lbuf, sizeof(lbuf), cfp))
+               switch (*lbuf) {
+               case 'b':               /* badtty */
+-                      if (sscanf(lbuf, "%s%s", f1, f2) != 2 ||
++                      if (sscanf(lbuf, "%39s%39s", f1, f2) != 2 ||
+                           strcasecmp(f1, "badtty"))
+                               break;
+                       c_tty(f2);
+                       break;
+               case 'g':               /* game */
+-                      if (sscanf(lbuf, "%s%s%s%s%s",
++                      if (sscanf(lbuf, "%39s%39s%39s%39s%39s",
+                           f1, f2, f3, f4, f5) != 5 || strcasecmp(f1, 
"game"))
+                               break;
+                       c_game(f2, f3, f4, f5);
+                       break;
+               case 't':               /* time */
+-                      if (sscanf(lbuf, "%s%s%s%s", f1, f2, f3, f4) != 4 ||
++                      if (sscanf(lbuf, "%39s%39s%39s%39s", f1, f2, f3, f4) 
!= 4 ||
+                           strcasecmp(f1, "time"))
+                               break;
+                       c_day(f2, f3, f4);
+--- bsdgames-2.17.orig/dab/gamescreen.h
++++ bsdgames-2.17/dab/gamescreen.h
+@@ -70,9 +70,9 @@ class GAMESCREEN {
+     virtual void redraw(void) = 0;                    // Refresh
+     virtual int getinput(void) = 0;                   // Get user input
+     virtual void bell(void) = 0;                      // Beep
+-    virtual void score(size_t p, const PLAYER& p) = 0;        // Post 
current score
+-    virtual void games(size_t p, const PLAYER& p) = 0;        // Post games 
won
+-    virtual void total(size_t p, const PLAYER& p) = 0;        // Post total 
score
++    virtual void score(size_t s, const PLAYER& p) = 0;        // Post 
current score
++    virtual void games(size_t s, const PLAYER& p) = 0;        // Post games 
won
++    virtual void total(size_t s, const PLAYER& p) = 0;        // Post total 
score
+     virtual void ties(const PLAYER& p) = 0;           // Post tie games
+ };
+ 
+--- bsdgames-2.17.orig/adventure/crc.c
++++ bsdgames-2.17/adventure/crc.c
+@@ -42,6 +42,8 @@ __RCSID("$NetBSD: crc.c,v 1.8 2003/08/07
+ #endif
+ #endif /* not lint */
+ 
++#include <limits.h>
++
+ #include "extern.h"
+ 
+ const unsigned long crctab[] = {
+@@ -125,7 +127,7 @@ crc(ptr, nr)               /* Process nr bytes at a t
+ 
+       while (nr > 0)
+               for (p = ptr; nr--; ++p) {
+-                      if (!(i = crcval >> 24 ^ *p)) {
++                      if (!(i = crcval >> (sizeof(crcval) * CHAR_BIT - 8) ^ 
*p)) {
+                               i = step++;
+                               if (step >= sizeof(crctab) / 
sizeof(crctab[0]))
+                                       step = 0;
+--- bsdgames-2.17.orig/number/number.c
++++ bsdgames-2.17/number/number.c
+@@ -78,9 +78,9 @@ static const char    *const name1[] = {
+ 
+ void  convert(char *);
+ int   main(int, char *[]);
+-int   number(const char *, int);
+-void  pfract(int);
+-int   unit(int, const char *);
++int   number(const char *, int, int *);
++void  pfract(int, int);
++int   unit(int, const char *, int *);
+ void  usage(void) __attribute__((__noreturn__));
+ 
+ int lflag;
+@@ -131,7 +131,7 @@ void
+ convert(line)
+       char *line;
+ {
+-      int flen, len, rval;
++      int flen, len, rval, singular;
+       char *p, *fraction;
+ 
+       flen = 0;
+@@ -174,7 +174,7 @@ badnum:                    errx(1, "illegal number: %s", 
+               --len;
+       }
+ 
+-      rval = len > 0 ? unit(len, line) : 0;
++      rval = len > 0 ? unit(len, line, &singular) : 0;
+       if (fraction != NULL && flen != 0)
+               for (p = fraction; *p != '\0'; ++p)
+                       if (*p != '0') {
+@@ -182,10 +182,10 @@ badnum:                  errx(1, "illegal number: %s", 
+                                       (void)printf("%sand%s",
+                                           lflag ? " " : "",
+                                           lflag ? " " : "\n");
+-                              if (unit(flen, fraction)) {
++                              if (unit(flen, fraction, &singular)) {
+                                       if (lflag)
+                                               (void)printf(" ");
+-                                      pfract(flen);
++                                      pfract(flen, singular);
+                                       rval = 1;
+                               }
+                               break;
+@@ -197,9 +197,10 @@ badnum:                   errx(1, "illegal number: %s", 
+ }
+ 
+ int
+-unit(len, p)
++unit(len, p, singular)
+       int len;
+       const char *p;
++      int *singular;
+ {
+       int off, rval;
+ 
+@@ -208,7 +209,7 @@ unit(len, p)
+               if (len % 3) {
+                       off = len % 3;
+                       len -= off;
+-                      if (number(p, off)) {
++                      if (number(p, off, singular)) {
+                               rval = 1;
+                               (void)printf(" %s%s",
+                                   name3[len / 3], lflag ? " " : ".\n");
+@@ -217,14 +218,16 @@ unit(len, p)
+               }
+               for (; len > 3; p += 3) {
+                       len -= 3;
+-                      if (number(p, 3)) {
++                      if (number(p, 3, singular)) {
+                               rval = 1;
+                               (void)printf(" %s%s",
+                                   name3[len / 3], lflag ? " " : ".\n");
+                       }
+               }
+       }
+-      if (number(p, len)) {
++      if (number(p, len, singular)) {
++              if (rval)
++                      *singular = 0;
+               if (!lflag)
+                       (void)printf(".\n");
+               rval = 1;
+@@ -233,17 +236,20 @@ unit(len, p)
+ }
+ 
+ int
+-number(p, len)
++number(p, len, singular)
+       const char *p;
+       int len;
++      int *singular;
+ {
+       int val, rval;
+ 
+       rval = 0;
++      *singular = 1;
+       switch (len) {
+       case 3:
+               if (*p != '0') {
+                       rval = 1;
++                      *singular = 0;
+                       (void)printf("%s hundred", name1[*p - '0']);
+               }
+               ++p;
+@@ -262,33 +268,42 @@ number(p, len)
+                       }
+                       rval = 1;
+               }
++              if (val != 1)
++                      *singular = 0;
+               break;
+       case 1:
+               if (*p != '0') {
+                       rval = 1;
+                       (void)printf("%s", name1[*p - '0']);
+               }
++              if (*p != '1')
++                      *singular = 0;
+       }
+       return (rval);
+ }
+ 
+ void
+-pfract(len)
++pfract(len, singular)
+       int len;
++      int singular;
+ {
+       static const char *const pref[] = { "", "ten-", "hundred-" };
+ 
+       switch(len) {
+       case 1:
+-              (void)printf("tenths.\n");
++              (void)printf("tenth");
+               break;
+       case 2:
+-              (void)printf("hundredths.\n");
++              (void)printf("hundredth");
+               break;
+       default:
+-              (void)printf("%s%sths.\n", pref[len % 3], name3[len / 3]);
++              (void)printf("%s%sth", pref[len % 3], name3[len / 3]);
+               break;
+       }
++      if (!singular) {
++              printf("s");
++      }
++      printf(".\n");
+ }
+ 
+ void
+--- bsdgames-2.17.orig/backgammon/teachgammon/ttext1.c
++++ bsdgames-2.17/backgammon/teachgammon/ttext1.c
+@@ -94,7 +94,7 @@ const char   *const intro2[] = {
+       "\n   Although not indicated on the board, the players' homes are",
+       "located just to the right of the board.  A player's men are placed",
+       "there when they are removed from the board.  The board you just",
+-      "saw was in it's initial position.  All games start with the board",
++      "saw was in its initial position.  All games start with the board",
+       "looking like this.  Notice that red's pieces are represented by the",
+       "letter 'r' and white's pieces are represented by the letter 'w'.",
+       "Also, a position may have zero or more pieces on it, e.g.  posi-",
+--- bsdgames-2.17.orig/backgammon/teachgammon/ttext2.c
++++ bsdgames-2.17/backgammon/teachgammon/ttext2.c
+@@ -65,7 +65,7 @@ const char   *const stragy[] = {
+       "points in a row) are difficult to form, many points nestled close-",
+       "ly together produce a formidable barrier.  Also, while it is good",
+       "to move back men forward, doing so lessens the opportunity for you",
+-      "to hit men.  Finally, remember that once the two player's have",
++      "to hit men.  Finally, remember that once the two players have",
+       "passed each other on the board, there is no chance of either team",
+       "being hit, so the game reduces to a race off the board.  Addi-",
+       "tional hints on strategy are presented in the practice game.",
+--- bsdgames-2.17.orig/backgammon/backgammon/move.c
++++ bsdgames-2.17/backgammon/backgammon/move.c
+@@ -152,6 +152,9 @@ move(okay)
+       trymove(0, 0);
+       pickmove();
+ 
++      if (d0)
++              swap;
++
+       /* print move */
+       writel(" and moves ");
+       for (i = 0; i < mvlim; i++) {
+--- bsdgames-2.17.orig/backgammon/common_source/allow.c
++++ bsdgames-2.17/backgammon/common_source/allow.c
+@@ -83,8 +83,10 @@ movallow()
+                               p[i--] = bar;
+                               if (p[i] != bar)
+                                       continue;
+-                              else
++                              else if (d0)
+                                       break;
++                              swap;
++                              continue;
+                       }
+                       if (d0 || m == 4)
+                               break;
+--- bsdgames-2.17.orig/quiz/datfiles/poetry
++++ bsdgames-2.17/quiz/datfiles/poetry
+@@ -64,7 +64,7 @@ Drink deep{,} or taste not the Pierian s
+ {Alexander }Pope
+ The curfew tolls the knell of parting day{,}:\
+ The lowing herd wind slowly o'er the lea:\
+-Elegy{ Written in a Country Church{-| }Yard:\
++Elegy{ Written in a Country Church{-| }Yard}:\
+ {Thomas }Gray
+ The best laid schemes o' mice an' men gang aft a-gley{,}:\
+ An{'|d} lea{'|v}e us nought but grief an{'|d} pain for promised joy{.}:\
+--- bsdgames-2.17.orig/gomoku/gomoku.6
++++ bsdgames-2.17/gomoku/gomoku.6
+@@ -45,7 +45,7 @@
+ .Op Ar inputfile
+ .Sh DESCRIPTION
+ .Nm
+-is a two player game were the object is to get 5 in a row horizontally,
++is a two player game where the object is to get 5 in a row horizontally,
+ vertically or diagonally on a 19 by 19 grid.
+ By convention, black always moves first.
+ With no arguments,
+--- bsdgames-2.17.orig/trek/setup.c
++++ bsdgames-2.17/trek/setup.c
+@@ -234,11 +234,14 @@ setup()
+       for (i = 0; i < NQUADS; i++)
+               for (j = 0; j < NQUADS; j++)
+               {
++                      signed char tmp;
+                       q = &Quad[i][j];
+                       q->klings = q->bases = 0;
+                       q->scanned = -1;
+                       q->stars = ranf(9) + 1;
+-                      q->holes = ranf(3) - q->stars / 5;
++                      tmp = ranf(3) - q->stars / 5;
++                      tmp = tmp < 0 ? 0 : tmp;
++                      q->holes = tmp;
+                       q->qsystemname = 0;
+               }
+ 
+--- bsdgames-2.17.orig/fish/Makefrag
++++ bsdgames-2.17/fish/Makefrag
+@@ -31,7 +31,9 @@ fish_DIRS := $(GAMESDIR) $(MAN6DIR) $(sh
+ fish_all:     fish/fish fish/fish.instr fish/fish.6
+ 
+ fish_install: fish_all
+-      $(INSTALL_BINARY) fish/fish $(INSTALL_PREFIX)$(GAMESDIR)/fish
+-      $(HIDE_GAME) fish
++      $(INSTALL_BINARY) fish/fish $(INSTALL_PREFIX)$(GAMESDIR)/go-fish
++      $(HIDE_GAME) go-fish
+       $(INSTALL_DATA) fish/fish.instr $(INSTALL_PREFIX)$(FISH_INSTRFILE)
+-      $(INSTALL_MANUAL) fish/fish.6
++      ln -sf fish.6 fish/go-fish.6 # hack for rename
++      $(INSTALL_MANUAL) fish/go-fish.6
++      rm -f fish/go-fish.6
+--- bsdgames-2.17.orig/fish/fish.6
++++ bsdgames-2.17/fish/fish.6
+@@ -30,10 +30,10 @@
+ .\"   @(#)fish.6      8.1 (Berkeley) 5/31/93
+ .\"
+ .Dd May 31, 1993
+-.Dt FISH 6
++.Dt GO-FISH 6
+ .Os
+ .Sh NAME
+-.Nm fish
++.Nm go-fish
+ .Nd play
+ .Dq Go Fish
+ .Sh SYNOPSIS
+--- bsdgames-2.17.orig/hunt/hunt/hunt.c
++++ bsdgames-2.17/hunt/hunt/hunt.c
+@@ -394,7 +394,8 @@ broadcast_vec(s, vector)
+ 
+       vec_cnt = 0;
+       for (ip = ifp; ip; ip = ip->ifa_next)
+-              if ((ip->ifa_addr->sa_family == AF_INET) &&
++              if (ip->ifa_addr &&
++                  (ip->ifa_addr->sa_family == AF_INET) &&
+                   (ip->ifa_flags & IFF_BROADCAST))
+                       vec_cnt++;
+ 
+@@ -405,7 +406,8 @@ broadcast_vec(s, vector)
+ 
+       vec_cnt = 0;
+       for (ip = ifp; ip; ip = ip->ifa_next)
+-              if ((ip->ifa_addr->sa_family == AF_INET) &&
++              if (ip->ifa_addr &&
++                  (ip->ifa_addr->sa_family == AF_INET) &&
+                   (ip->ifa_flags & IFF_BROADCAST))
+                       memcpy(&(*vector)[vec_cnt++], ip->ifa_broadaddr,
+                              sizeof(struct sockaddr_in));
+--- bsdgames-2.17.orig/hunt/hunt/hunt.6.in
++++ bsdgames-2.17/hunt/hunt/hunt.6.in
+@@ -387,7 +387,7 @@ how many of player's shots were ducked
+ how many slime kills player had
+ .It enemy
+ how many enemies were killed
+-.tI friend
++.It friend
+ how many friends were killed (self and same team)
+ .It deaths
+ how many times player died
+--- bsdgames-2.17.orig/hunt/hunt/playit.c
++++ bsdgames-2.17/hunt/hunt/playit.c
+@@ -114,7 +114,7 @@ playit()
+               bad_con();
+               /* NOTREACHED */
+       }
+-      if (ntohl(version) != (unsigned long)HUNT_VERSION) {
++      if (ntohl(version) != (uint32_t)HUNT_VERSION) {
+               bad_ver();
+               /* NOTREACHED */
+       }
+@@ -649,7 +649,7 @@ do_message()
+               bad_con();
+               /* NOTREACHED */
+       }
+-      if (ntohl(version) != (unsigned long)HUNT_VERSION) {
++      if (ntohl(version) != (uint32_t)HUNT_VERSION) {
+               bad_ver();
+               /* NOTREACHED */
+       }
+--- bsdgames-2.17.orig/tetris/scores.c
++++ bsdgames-2.17/tetris/scores.c
+@@ -335,7 +335,8 @@ checkscores(hs, num)
+                               continue;
+                       }
+               }
+-              levelfound[sp->hs_level] = 1;
++        if (sp->hs_level < NLEVELS && sp->hs_level >= 0)
++              levelfound[sp->hs_level] = 1;
+               i++, sp++;
+       }
+       return (num > MAXHISCORES ? MAXHISCORES : num);
+@@ -374,12 +375,14 @@ showscores(level)
+       for (i = MINLEVEL; i < NLEVELS; i++)
+               levelfound[i] = 0;
+       for (i = 0, sp = scores; i < nscores; i++, sp++) {
+-              if (levelfound[sp->hs_level])
+-                      sp->hs_time = 0;
+-              else {
+-                      sp->hs_time = 1;
+-                      levelfound[sp->hs_level] = 1;
+-              }
++        if (sp->hs_level < NLEVELS && sp->hs_level >= 0) {
++              if (levelfound[sp->hs_level])
++                      sp->hs_time = 0;
++                  else {
++                          sp->hs_time = 1;
++                      levelfound[sp->hs_level] = 1;
++                  }
++        }
+       }
+ 
+       /*
+@@ -433,7 +436,7 @@ printem(level, offset, hs, n, me)
+                               continue;
+                       }
+                       sp = &hs[item];
+-                      (void)sprintf(buf,
++                      (void)snprintf(buf, sizeof(buf),
+                           "%3d%c %6d  %-11s (%6d on %d)",
+                           item + offset, sp->hs_time ? '*' : ' ',
+                           sp->hs_score * sp->hs_level,
+--- bsdgames-2.17.orig/hack/Makefrag
++++ bsdgames-2.17/hack/Makefrag
+@@ -56,7 +56,8 @@ hack_install:        hack_all
+       $(INSTALL_SCORE_GAME) hack/hack $(INSTALL_PREFIX)$(GAMESDIR)/hack
+       $(HIDE_GAME) hack
+       $(INSTALL_HACK_DIR) $(INSTALL_PREFIX)$(HACK_DIR)
+-      set -e; for f in data help hh rumors; do $(INSTALL_DATA) hack/$$f 
$(INSTALL_PREFIX)$(HACK_DIR)/$$f; done
++      install -d $(INSTALL_PREFIX)/usr/share/games/bsdgames/hack
++      set -e; for f in data help hh rumors; do $(INSTALL_DATA) hack/$$f 
$(INSTALL_PREFIX)/usr/share/games/bsdgames/hack/$$f; done
+       $(INSTALL_SCORE_FILE) $(HACK_DIR)/perm
+       $(INSTALL_SCORE_FILE) $(HACK_DIR)/record
+       $(INSTALL_MANUAL) hack/hack.6
+--- bsdgames-2.17.orig/hack/config.h
++++ bsdgames-2.17/hack/config.h
+@@ -88,13 +88,18 @@
+ /* #define PYRAMID_BUG */     /* avoid a bug on the Pyramid */
+ /* #define NOWAITINCLUDE */   /* neither <wait.h> nor <sys/wait.h> exists */
+ 
+-#define WIZARD  "bruno"       /* the person allowed to use the -D option */
++/*
++ * Debian mods: use root for WIZARD, and move files that are static to
++ * /usr/share/ -- JEH
++ */
++#define WIZARD  "root"        /* the person allowed to use the -D option */
++#define SHAREDIR "/usr/share/games/bsdgames/hack/"
+ #define RECORD        "record"/* the file containing the list of topscorers 
*/
+ #define       NEWS    "news"  /* the file containing the latest hack news */
+-#define       HELP    "help"  /* the file containing a description of the 
commands */
+-#define       SHELP   "hh"    /* abbreviated form of the same */
+-#define       RUMORFILE       "rumors"        /* a file with fortune 
cookies */
+-#define       DATAFILE        "data"  /* a file giving the meaning of 
symbols used */
++#define       HELP    SHAREDIR "help" /* the file containing a description 
of the commands */
++#define       SHELP   SHAREDIR "hh"   /* abbreviated form of the same */
++#define       RUMORFILE       SHAREDIR "rumors"       /* a file with 
fortune cookies */
++#define       DATAFILE        SHAREDIR "data" /* a file giving the meaning 
of symbols used */
+ #define       FMASK   0660    /* file creation mask */
+ #define       HLOCK   "perm"  /* an empty file used for locking purposes */
+ #define LLOCK "safelock"      /* link to previous */
+--- bsdgames-2.17.orig/sail/pl_main.c
++++ bsdgames-2.17/sail/pl_main.c
+@@ -219,7 +219,7 @@ reprint:
+               printf("\nInitial broadside %s (grape, chain, round, double): 
",
+                       n ? "right" : "left");
+               fflush(stdout);
+-              scanf("%s", buf);
++              scanf("%9s", buf);
+               switch (*buf) {
+               case 'g':
+                       load = L_GRAPE;
+--- bsdgames-2.17.orig/tests/number.-0.1
++++ bsdgames-2.17/tests/number.-0.1
+@@ -1,3 +1,3 @@
+ minus
+ one.
+-tenths.
++tenth.
diff --git a/games-terminal/bsd-games/define-dead.diff 
b/games-terminal/bsd-games/define-dead.diff
new file mode 100644
index 0000000..3cbbc34
--- /dev/null
+++ b/games-terminal/bsd-games/define-dead.diff
@@ -0,0 +1,10 @@
+--- a/include/sys/cdefs.h
++++ b/include/sys/cdefs.h
+@@ -40,3 +40,7 @@
+ #ifndef __COPYRIGHT
+ #define __COPYRIGHT(arg)      static const char copyright[] 
__attribute__((__unused__)) = arg
+ #endif
++
++#ifndef __dead
++#define       __dead  __attribute__((__noreturn__))
++#endif
diff --git a/games-terminal/bsd-games/quiz-presidents.diff 
b/games-terminal/bsd-games/quiz-presidents.diff
new file mode 100644
index 0000000..6be0461
--- /dev/null
+++ b/games-terminal/bsd-games/quiz-presidents.diff
@@ -0,0 +1,12 @@
+--- a/quiz/datfiles/pres
++++ b/quiz/datfiles/pres
+@@ -79,5 +79,7 @@
+ {J{ames} }{D{anforth|an} }Quayle:{W{illiam|m} }{J{efferson} }Clinton
+ {W{illiam|m} }{J{efferson} }Clinton:1993-2001:\
+ {A{lbert} }{A{rnold} }Gore{{,} J{unio}r}:{G{eorge} }{W{alker} }Bush{{,} 
J{unio}r}
+-{G{eorge} }{W{alker} }Bush{{,} J{unio}r}:2001-:\
+-{R{ichard} }{B{ruce} }Cheney:
++{G{eorge} }{W{alker} }Bush{{,} J{unio}r}:2001-{{20}0}9:\
++{R{ichard} }{B{ruce} }Cheney:{B{arack} }{H{ussein} }Obama{ II}
++{B{arack} }{H{ussein} }Obama{ II}:2009-:\
++{J{oe{seph}} }{R{obinette} }{Biden}{{,} J{unio}r}:
diff --git a/games-terminal/bsd-games/refresh-robots-screen.diff 
b/games-terminal/bsd-games/refresh-robots-screen.diff
new file mode 100644
index 0000000..02a2867
--- /dev/null
+++ b/games-terminal/bsd-games/refresh-robots-screen.diff
@@ -0,0 +1,10 @@
+--- a/robots/move.c
++++ b/robots/move.c
+@@ -185,6 +185,7 @@
+                       flush_in();
+                       goto ret;
+                 case CTRL('L'):
++                      redrawwin(curscr);
+                       refresh();
+                       break;
+                 case EOF:
diff --git a/games-terminal/bsd-games/replace-getline.diff 
b/games-terminal/bsd-games/replace-getline.diff
new file mode 100644
index 0000000..99d7651
--- /dev/null
+++ b/games-terminal/bsd-games/replace-getline.diff
@@ -0,0 +1,185 @@
+--- a/boggle/boggle/bog.c
++++ b/boggle/boggle/bog.c
+@@ -336,7 +336,7 @@
+       }
+ 
+       while (1) {
+-              if (getline(buf) == NULL) {
++              if (get_line(buf) == NULL) {
+                       if (feof(stdin))
+                               clearerr(stdin);
+                       break;
+--- a/boggle/boggle/extern.h
++++ b/boggle/boggle/extern.h
+@@ -43,7 +43,7 @@
+ long   dictseek(FILE *, long, int);
+ void   findword(void);
+ void   flushin(FILE *);
+-char  *getline(char *);
++char  *get_line(char *);
+ void   getword(char *);
+ int    help(void);
+ int    inputch(void);
+--- a/boggle/boggle/mach.c
++++ b/boggle/boggle/mach.c
+@@ -168,7 +168,7 @@
+  * - doesn't accept words longer than MAXWORDLEN or containing caps
+  */
+ char *
+-getline(q)
++get_line(q)
+       char *q;
+ {
+       int ch, done;
+--- a/cribbage/crib.c
++++ b/cribbage/crib.c
+@@ -221,7 +221,7 @@
+                       if (!rflag) {                   /* player cuts deck */
+                               msg(quiet ? "Cut for crib? " :
+                           "Cut to see whose crib it is -- low card wins? ");
+-                              getline();
++                              get_line();
+                       }
+                       i = (rand() >> 4) % CARDS;      /* random cut */
+                       do {    /* comp cuts deck */
+@@ -397,7 +397,7 @@
+               if (!rflag) {   /* random cut */
+                       msg(quiet ? "Cut the deck? " :
+                   "How many cards down do you wish to cut the deck? ");
+-                      getline();
++                      get_line();
+               }
+               i = (rand() >> 4) % (CARDS - pos);
+               turnover = deck[i + pos];
+--- a/cribbage/cribbage.h
++++ b/cribbage/cribbage.h
+@@ -77,7 +77,7 @@
+ int    fifteens(const CARD [], int);
+ void   game(void);
+ void   gamescore(void);
+-char  *getline(void);
++char  *get_line(void);
+ int    getuchar(void);
+ int    incard(CARD *);
+ int    infrom(const CARD [], int, const char *);
+--- a/cribbage/io.c
++++ b/cribbage/io.c
+@@ -245,7 +245,7 @@
+ 
+       retval = FALSE;
+       rnk = sut = EMPTY;
+-      if (!(line = getline()))
++      if (!(line = get_line()))
+               goto gotit;
+       p = p1 = line;
+       while (*p1 != ' ' && *p1 != '\0')
+@@ -346,7 +346,7 @@
+ 
+       for (sum = 0;;) {
+               msg(prompt);
+-              if (!(p = getline()) || *p == '\0') {
++              if (!(p = get_line()) || *p == '\0') {
+                       msg(quiet ? "Not a number" :
+                           "That doesn't look like a number");
+                       continue;
+@@ -528,12 +528,12 @@
+ }
+ 
+ /*
+- * getline:
++ * get_line:
+  *      Reads the next line up to '\n' or EOF.  Multiple spaces are
+  *    compressed to one space; a space is inserted before a ','
+  */
+ char *
+-getline()
++get_line()
+ {
+       char *sp;
+       int c, oy, ox;
+--- a/gomoku/bdisp.c
++++ b/gomoku/bdisp.c
+@@ -241,7 +241,7 @@
+ }
+ 
+ int
+-getline(buf, size)
++get_line(buf, size)
+       char *buf;
+       int size;
+ {
+--- a/gomoku/gomoku.h
++++ b/gomoku/gomoku.h
+@@ -263,7 +263,7 @@
+ 
+ void  bdinit(struct spotstr *);
+ void  init_overlap(void);
+-int   getline(char *, int);
++int   get_line(char *, int);
+ void  ask(const char *);
+ void  dislog(const char *);
+ void  bdump(FILE *);
+--- a/gomoku/main.c
++++ b/gomoku/main.c
+@@ -155,7 +155,7 @@
+               if (inputfp == NULL && test == 0) {
+                       for (;;) {
+                               ask("black or white? ");
+-                              getline(buf, sizeof(buf));
++                              get_line(buf, sizeof(buf));
+                               if (buf[0] == 'b' || buf[0] == 'B') {
+                                       color = BLACK;
+                                       break;
+@@ -172,7 +172,7 @@
+               }
+       } else {
+               setbuf(stdout, 0);
+-              getline(buf, sizeof(buf));
++              get_line(buf, sizeof(buf));
+               if (strcmp(buf, "black") == 0)
+                       color = BLACK;
+               else if (strcmp(buf, "white") == 0)
+@@ -244,7 +244,7 @@
+               getinput:
+                       if (interactive)
+                               ask("move? ");
+-                      if (!getline(buf, sizeof(buf))) {
++                      if (!get_line(buf, sizeof(buf))) {
+                               curmove = RESIGN;
+                               break;
+                       }
+@@ -256,7 +256,7 @@
+                                       FILE *fp;
+ 
+                                       ask("save file name? ");
+-                                      (void)getline(buf, sizeof(buf));
++                                      (void)get_line(buf, sizeof(buf));
+                                       if ((fp = fopen(buf, "w")) == NULL) {
+                                               glog("cannot create save 
file");
+                                               goto getinput;
+@@ -309,14 +309,14 @@
+               if (i != RESIGN) {
+               replay:
+                       ask("replay? ");
+-                      if (getline(buf, sizeof(buf)) &&
++                      if (get_line(buf, sizeof(buf)) &&
+                           (buf[0] == 'y' || buf[0] == 'Y'))
+                               goto again;
+                       if (strcmp(buf, "save") == 0) {
+                               FILE *fp;
+ 
+                               ask("save file name? ");
+-                              (void)getline(buf, sizeof(buf));
++                              (void)get_line(buf, sizeof(buf));
+                               if ((fp = fopen(buf, "w")) == NULL) {
+                                       glog("cannot create save file");
+                                       goto replay;
+@@ -367,7 +367,7 @@
+               quit();
+ top:
+       ask("cmd? ");
+-      if (!getline(fmtbuf, sizeof(fmtbuf)))
++      if (!get_line(fmtbuf, sizeof(fmtbuf)))
+               quit();
+       switch (*fmtbuf) {
+       case '\0':
diff --git a/games-terminal/bsd-games/sort-acronyms.comp.diff 
b/games-terminal/bsd-games/sort-acronyms.comp.diff
new file mode 100644
index 0000000..c4f5350
--- /dev/null
+++ b/games-terminal/bsd-games/sort-acronyms.comp.diff
@@ -0,0 +1,80 @@
+--- a/wtf/acronyms.comp
++++ b/wtf/acronyms.comp
+@@ -17,8 +17,8 @@
+ ARP   address resolution protocol
+ ARQ   automatic repeat request
+ AS    autonomous system
+-ASN   autonomous system number
+ ASCII american standard code for information interchange
++ASN   autonomous system number
+ AT    advanced technology
+ ATA   advanced technology attachment
+ ATAPI advanced technology attachment packet interface
+@@ -85,6 +85,7 @@
+ DTE   dumb terminal emulator
+ DVD   digital versatile disc
+ DVI   digital visual interface
++E-XER extended XML encoding rules
+ ECP   enhanced capability port
+ EDID  extended display identification data
+ EDO   extended data out
+@@ -98,7 +99,6 @@
+ EPRML extended partial response, maximum likelihood
+ EPROM erasable programmable read only memory
+ ESDRAM        enhanced synchronous dynamic random access memory
+-E-XER extended XML encoding rules
+ FAT   file allocation table
+ FBRAM frame buffer random access memory
+ FCS   frame check sequence
+@@ -139,10 +139,10 @@
+ IKE   internet key exchange
+ IMAP  internet mail access protocol
+ INCITS        international committee on information technology standards
+-IPC   interprocess communication
+ IO    input/output
+ IOCTL input/output control
+ IP    internet protocol
++IPC   interprocess communication
+ IPNG  internet protocol, next generation
+ IPSEC internet protocol security
+ IRC   internet relay chat
+@@ -156,6 +156,7 @@
+ ISO   international standards organization
+ ISOC  internet society
+ ISP   internet service provider
++JFGI  just fucking google it
+ JPEG  joint photographic experts group
+ KVA   kernel virtual address
+ LAN   local area network
+@@ -212,8 +213,8 @@
+ PCI   peripheral component interconnect
+ PCM   pulse code modulation
+ PCMCIA        personal computer memory card international association
+-PDU   protocol data unit
+ PDP   page descriptor page
++PDU   protocol data unit
+ PER   packed encoding rules
+ PERL  practical extraction [and] report language
+ PGP   pretty good privacy
+@@ -233,10 +234,10 @@
+ PPPOE point-to-point protocol over ethernet
+ PRML  partial response, maximum likelihood
+ PROM  programmable read only memory
++PSTN  public switched telephone network
+ PTE   page table entry
+ PTLA  pseudo top level aggregator
+ PTP   page table page
+-PSTN  public switched telephone network
+ PWM   pulse width modulation
+ QOS   quality of service
+ RAID  redundant array of inexpensive disks
+@@ -255,8 +256,8 @@
+ RTF   rich text format
+ RTS   request to send
+ RTSL  read the source, Luke (open source programming)
+-RTSL  real-time systems laboratory
+ RTSL  real-time shading language (Stanford University)
++RTSL  real-time systems laboratory
+ RTT   round time trip
+ S/PDIF        sony/phillips digital interface
+ SACD  super audio compact disc
diff --git a/games-terminal/bsd-games/wump-update.diff 
b/games-terminal/bsd-games/wump-update.diff
new file mode 100644
index 0000000..d405f6a
--- /dev/null
+++ b/games-terminal/bsd-games/wump-update.diff
@@ -0,0 +1,521 @@
+Update wump directory to NetBSD CVS as of 2010-01-14
+This fixes Debian bug #564891
+--- a/wump/Makefile.bsd
++++ b/wump/Makefile.bsd
+@@ -1,4 +1,4 @@
+-#     $NetBSD: Makefile,v 1.8 1999/02/13 02:54:22 lukem Exp $
++#     $NetBSD: Makefile,v 1.10 2008/01/28 07:04:00 dholland Exp $
+ #     @(#)Makefile    8.1 (Berkeley) 5/31/93
+ 
+ .include <bsd.own.mk>
+--- a/wump/wump.6
++++ b/wump/wump.6
+@@ -1,4 +1,4 @@
+-.\"   $NetBSD: wump.6,v 1.6 2003/08/07 09:37:57 agc Exp $
++.\"   $NetBSD: wump.6,v 1.8 2006/01/22 21:22:30 wiz Exp $
+ .\"
+ .\" Copyright (c) 1989, 1993
+ .\"   The Regents of the University of California.  All rights reserved.
+@@ -32,7 +32,7 @@
+ .\"
+ .\"   @(#)wump.6      8.1 (Berkeley) 5/31/93
+ .\"
+-.Dd May 31, 1993
++.Dd January 19, 2006
+ .Dt WUMP 6
+ .Os
+ .Sh NAME
+@@ -74,7 +74,7 @@
+ The default is three.
+ .It Fl r
+ Specifies the number of rooms in the cave.
+-The default cave size is twenty-five rooms.
++The default cave size is twenty rooms.
+ .It Fl t
+ Specifies the number of tunnels connecting each room in the cave to
+ another room.
+--- a/wump/wump.c
++++ b/wump/wump.c
+@@ -1,4 +1,4 @@
+-/*    $NetBSD: wump.c,v 1.17 2005/02/15 12:56:20 jsm Exp $    */
++/*    $NetBSD: wump.c,v 1.25 2009/08/27 00:19:52 dholland Exp $       */
+ 
+ /*
+  * Copyright (c) 1989, 1993
+@@ -35,15 +35,15 @@
+ 
+ #include <sys/cdefs.h>
+ #ifndef lint
+-__COPYRIGHT("@(#) Copyright (c) 1989, 1993\n\
+-      The Regents of the University of California.  All rights 
reserved.\n");
++__COPYRIGHT("@(#) Copyright (c) 1989, 1993\
++ The Regents of the University of California.  All rights reserved.");
+ #endif /* not lint */
+ 
+ #ifndef lint
+ #if 0
+ static char sccsid[] = "@(#)wump.c    8.1 (Berkeley) 5/31/93";
+ #else
+-__RCSID("$NetBSD: wump.c,v 1.17 2005/02/15 12:56:20 jsm Exp $");
++__RCSID("$NetBSD: wump.c,v 1.25 2009/08/27 00:19:52 dholland Exp $");
+ #endif
+ #endif /* not lint */
+ 
+@@ -86,7 +86,7 @@
+ #define       plural(n)       (n == 1 ? "" : "s")
+ 
+ /* simple cave data structure; +1 so we can index from '1' not '0' */
+-struct room_record {
++static struct room_record {
+       int tunnel[MAX_LINKS_IN_ROOM];
+       int has_a_pit, has_a_bat;
+ } cave[MAX_ROOMS_IN_CAVE+1];
+@@ -95,57 +95,57 @@
+  * global variables so we can keep track of where the player is, how
+  * many arrows they still have, where el wumpo is, and so on...
+  */
+-int player_loc = -1;                  /* player location */
+-int wumpus_loc = -1;                  /* The Bad Guy location */
+-int level = EASY;                     /* level of play */
+-int arrows_left;                      /* arrows unshot */
++static int player_loc = -1;           /* player location */
++static int wumpus_loc = -1;           /* The Bad Guy location */
++static int level = EASY;              /* level of play */
++static int arrows_left;                       /* arrows unshot */
+ 
+ #ifdef DEBUG
+-int debug = 0;
++static int debug = 0;
+ #endif
+ 
+-int pit_num = PIT_COUNT;              /* # pits in cave */
+-int bat_num = BAT_COUNT;              /* # bats */
+-int room_num = ROOMS_IN_CAVE;         /* # rooms in cave */
+-int link_num = LINKS_IN_ROOM;         /* links per room  */
+-int arrow_num = NUMBER_OF_ARROWS;     /* arrow inventory */
+-
+-char answer[20];                      /* user input */
+-
+-int   bats_nearby(void);
+-void  cave_init(void);
+-void  clear_things_in_cave(void);
+-void  display_room_stats(void);
+-int   gcd(int, int);
+-int   getans(const char *);
+-void  initialize_things_in_cave(void);
+-void  instructions(void);
+-int   int_compare(const void *, const void *);
+-void  jump(int);
+-void  kill_wump(void);
++static int pit_num = PIT_COUNT;               /* # pits in cave */
++static int bat_num = BAT_COUNT;               /* # bats */
++static int room_num = ROOMS_IN_CAVE;  /* # rooms in cave */
++static int link_num = LINKS_IN_ROOM;  /* links per room  */
++static int arrow_num = NUMBER_OF_ARROWS;/* arrow inventory */
++
++static char answer[20];                       /* user input */
++
+ int   main(int, char **);
+-int   move_to(const char *);
+-void  move_wump(void);
+-void  no_arrows(void);
+-void  pit_kill(void);
+-int   pit_nearby(void);
+-void  pit_survive(void);
+-int   shoot(char *);
+-void  shoot_self(void);
+-int   take_action(void);
+-void  usage(void) __attribute__((__noreturn__));
+-void  wump_kill(void);
+-int   wump_nearby(void);
++static int bats_nearby(void);
++static void cave_init(void);
++static void clear_things_in_cave(void);
++static void display_room_stats(void);
++static int gcd(int, int);
++static int getans(const char *);
++static void initialize_things_in_cave(void);
++static void instructions(void);
++static int int_compare(const void *, const void *);
++static void jump(int);
++static void kill_wump(void);
++static int move_to(const char *);
++static void move_wump(void);
++static void no_arrows(void);
++static void pit_kill(void);
++static int pit_nearby(void);
++static void pit_survive(void);
++static int shoot(char *);
++static void shoot_self(void);
++static int take_action(void);
++static void usage(void) __dead;
++static void wump_kill(void);
++static int wump_nearby(void);
+ 
+ int
+ main(argc, argv)
+       int argc;
+       char **argv;
+ {
+-      int c;
++      int c, e=0;
+ 
+       /* Revoke setgid privileges */
+-      setregid(getgid(), getgid());
++      setgid(getgid());
+ 
+ #ifdef DEBUG
+       while ((c = getopt(argc, argv, "a:b:hp:r:t:d")) != -1)
+@@ -232,28 +232,29 @@
+           plural(pit_num), arrow_num);
+ 
+       for (;;) {
++              clear_things_in_cave();
+               initialize_things_in_cave();
+               arrows_left = arrow_num;
+               do {
+                       display_room_stats();
+                       (void)printf("Move or shoot? (m-s) ");
+                       (void)fflush(stdout);
+-                      if (!fgets(answer, sizeof(answer), stdin))
++                      if (!fgets(answer, sizeof(answer), stdin)) {
++                              e=2;
+                               break;
+-              } while (!take_action());
++                      }
++              } while (!(e = take_action()));
+ 
+-              if (!getans("\nCare to play another game? (y-n) "))
++              if (e == 2 || !getans("\nCare to play another game? (y-n) "))
+                       exit(0);
+-              if (getans("In the same cave? (y-n) "))
+-                      clear_things_in_cave();
+-              else
++              if (getans("In the same cave? (y-n) ") == 0)
+                       cave_init();
+       }
+       /* NOTREACHED */
+       return (0);
+ }
+ 
+-void
++static void
+ display_room_stats()
+ {
+       int i;
+@@ -283,7 +284,7 @@
+       (void)printf("and %d.\n", cave[player_loc].tunnel[link_num - 1]);
+ }
+ 
+-int
++static int
+ take_action()
+ {
+       /*
+@@ -312,7 +313,7 @@
+       return(0);
+ }
+ 
+-int
++static int
+ move_to(room_number)
+       const char *room_number;
+ {
+@@ -404,12 +405,12 @@
+       return(0);
+ }
+ 
+-int
++static int
+ shoot(room_list)
+       char *room_list;
+ {
+       int chance, next, roomcnt;
+-      int j, arrow_location, link, ok;
++      int j, arrow_location, lnk, ok;
+       char *p;
+ 
+       /*
+@@ -450,24 +451,24 @@
+                       } else
+                               arrow_location = next;
+               } else {
+-                      link = (random() % link_num);
+-                      if (link == player_loc)
++                      lnk = (random() % link_num);
++                      if (lnk == player_loc)
+                               (void)printf(
+ "*thunk*  The arrow can't find a way from %d to %d and flys back into\n\
+ your room!\n",
+                                   arrow_location, next);
+-                      else if (cave[arrow_location].tunnel[link] > room_num)
++                      else if (cave[arrow_location].tunnel[lnk] > room_num)
+                               (void)printf(
+ "*thunk*  The arrow flys randomly into a magic tunnel, thence into\n\
+ room %d!\n",
+-                                  cave[arrow_location].tunnel[link]);
++                                  cave[arrow_location].tunnel[lnk]);
+                       else
+                               (void)printf(
+ "*thunk*  The arrow can't find a way from %d to %d and flys randomly\n\
+ into room %d!\n",
+                                   arrow_location, next,
+-                                  cave[arrow_location].tunnel[link]);
+-                      arrow_location = cave[arrow_location].tunnel[link];
++                                  cave[arrow_location].tunnel[lnk]);
++                      arrow_location = cave[arrow_location].tunnel[lnk];
+                       break;
+               }
+               chance = random() % 10;
+@@ -506,7 +507,7 @@
+               /* each time you shoot, it's more likely the wumpus moves */
+               static int lastchance = 2;
+ 
+-              if (random() % level == EASY ? 12 : 9 < (lastchance += 2)) {
++              if (random() % (level == EASY ? 12 : 9) < (lastchance += 2)) {
+                       move_wump();
+                       if (wumpus_loc == player_loc)
+                               wump_kill();
+@@ -517,7 +518,7 @@
+       return(0);
+ }
+ 
+-int
++static int
+ gcd(a, b)
+       int a, b;
+ {
+@@ -529,10 +530,10 @@
+       return (gcd(b, r));
+ }
+ 
+-void
++static void
+ cave_init()
+ {
+-      int i, j, k, link;
++      int i, j, k, lnk;
+       int delta;
+ 
+       /*
+@@ -561,31 +562,31 @@
+       } while (gcd(room_num, delta + 1) != 1);
+ 
+       for (i = 1; i <= room_num; ++i) {
+-              link = ((i + delta) % room_num) + 1;    /* connection */
+-              cave[i].tunnel[0] = link;               /* forw link */
+-              cave[link].tunnel[1] = i;               /* back link */
++              lnk = ((i + delta) % room_num) + 1;     /* connection */
++              cave[i].tunnel[0] = lnk;                /* forw link */
++              cave[lnk].tunnel[1] = i;                /* back link */
+       }
+       /* now fill in the rest of the cave with random connections */
+       for (i = 1; i <= room_num; i++)
+               for (j = 2; j < link_num ; j++) {
+                       if (cave[i].tunnel[j] != -1)
+                               continue;
+-try_again:            link = (random() % room_num) + 1;
++try_again:            lnk = (random() % room_num) + 1;
+                       /* skip duplicates */
+                       for (k = 0; k < j; k++)
+-                              if (cave[i].tunnel[k] == link)
++                              if (cave[i].tunnel[k] == lnk)
+                                       goto try_again;
+-                      cave[i].tunnel[j] = link;
++                      cave[i].tunnel[j] = lnk;
+                       if (random() % 2 == 1)
+                               continue;
+                       for (k = 0; k < link_num; ++k) {
+                               /* if duplicate, skip it */
+-                              if (cave[link].tunnel[k] == i)
++                              if (cave[lnk].tunnel[k] == i)
+                                       k = link_num;
+ 
+                               /* if open link, use it, force exit */
+-                              if (cave[link].tunnel[k] == -1) {
+-                                      cave[link].tunnel[k] = i;
++                              if (cave[lnk].tunnel[k] == -1) {
++                                      cave[lnk].tunnel[k] = i;
+                                       k = link_num;
+                               }
+                       }
+@@ -595,7 +596,7 @@
+        * make it easier on the intrepid adventurer.
+        */
+       for (i = 1; i <= room_num; ++i)
+-              qsort(cave[i].tunnel, (u_int)link_num,
++              qsort(cave[i].tunnel, link_num,
+                   sizeof(cave[i].tunnel[0]), int_compare);
+ 
+ #ifdef DEBUG
+@@ -609,7 +610,7 @@
+ #endif
+ }
+ 
+-void
++static void
+ clear_things_in_cave()
+ {
+       int i;
+@@ -622,7 +623,7 @@
+               cave[i].has_a_bat = cave[i].has_a_pit = 0;
+ }
+ 
+-void
++static void
+ initialize_things_in_cave()
+ {
+       int i, loc;
+@@ -642,7 +643,7 @@
+       for (i = 0; i < pit_num; ++i) {
+               do {
+                       loc = (random() % room_num) + 1;
+-              } while (cave[loc].has_a_pit && cave[loc].has_a_bat);
++              } while (cave[loc].has_a_pit || cave[loc].has_a_bat);
+               cave[loc].has_a_pit = 1;
+ #ifdef DEBUG
+               if (debug)
+@@ -656,13 +657,17 @@
+               (void)printf("<wumpus in room %d>\n", loc);
+ #endif
+ 
++      i = 0;
+       do {
+               player_loc = (random() % room_num) + 1;
+-      } while (player_loc == wumpus_loc || (level == HARD ?
+-          (link_num / room_num < 0.4 ? wump_nearby() : 0) : 0));
++              i++;
++      } while (player_loc == wumpus_loc || cave[player_loc].has_a_pit ||
++          cave[player_loc].has_a_bat || (level == HARD ?
++              (link_num / room_num < 0.4 ? wump_nearby() : 0) : 0) ||
++          (i > 100 && player_loc != wumpus_loc));
+ }
+ 
+-int
++static int
+ getans(prompt)
+       const char *prompt;
+ {
+@@ -688,7 +693,7 @@
+       /* NOTREACHED */
+ }
+ 
+-int
++static int
+ bats_nearby()
+ { 
+       int i;
+@@ -700,7 +705,7 @@
+       return(0);
+ }
+ 
+-int
++static int
+ pit_nearby()
+ { 
+       int i;
+@@ -712,7 +717,7 @@
+       return(0);
+ }
+ 
+-int
++static int
+ wump_nearby()
+ {
+       int i, j;
+@@ -729,20 +734,20 @@
+       return(0);
+ }
+ 
+-void
++static void
+ move_wump()
+ {
+       wumpus_loc = cave[wumpus_loc].tunnel[random() % link_num];
+ }
+ 
+-int
++static int
+ int_compare(a, b)
+       const void *a, *b;
+ {
+       return(*(const int *)a < *(const int *)b ? -1 : 1);
+ }
+ 
+-void
++static void
+ instructions()
+ {
+       const char *pager;
+@@ -786,7 +791,7 @@
+       }
+ }
+ 
+-void
++static void
+ usage()
+ {
+       (void)fprintf(stderr,
+@@ -796,7 +801,7 @@
+ 
+ /* messages */
+ 
+-void
++static void
+ wump_kill()
+ {
+       (void)printf(
+@@ -808,7 +813,7 @@
+ passed out from the stench!\n");
+ }
+ 
+-void
++static void
+ kill_wump()
+ {
+       (void)printf(
+@@ -820,7 +825,7 @@
+ mightiest adventurer at a single whiff!!\n");
+ }
+ 
+-void
++static void
+ no_arrows()
+ {
+       (void)printf(
+@@ -830,7 +835,7 @@
+ you, and with a mighty *ROAR* eats you alive!\n");
+ }
+ 
+-void
++static void
+ shoot_self()
+ {
+       (void)printf(
+@@ -841,7 +846,7 @@
+ (*CHOMP*)\n");
+ }
+ 
+-void
++static void
+ jump(where)
+       int where;
+ {
+@@ -851,7 +856,7 @@
+ a very curious, warm sensation and find yourself in room %d!!\n", where);
+ }
+ 
+-void
++static void
+ pit_kill()
+ {
+       (void)printf(
+@@ -863,7 +868,7 @@
+ you can at least find out if Jules Verne was right...\n");
+ }
+ 
+-void
++static void
+ pit_survive()
+ {
+       (void)printf(