From p@i609a.hadiko.de  Sat Sep 21 12:22:03 2002
Return-Path: <p@i609a.hadiko.de>
Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id F0BEA37B401
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 21 Sep 2002 12:22:03 -0700 (PDT)
Received: from mailgate.rz.uni-karlsruhe.de (mailgate.rz.uni-karlsruhe.de [129.13.64.97])
	by mx1.FreeBSD.org (Postfix) with ESMTP id DDD9F43E4A
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 21 Sep 2002 12:22:02 -0700 (PDT)
	(envelope-from p@i609a.hadiko.de)
Received: from nce2.hadiko.de (root@hadince2.hadiko.uni-karlsruhe.de [172.20.32.2])
	by mailgate.rz.uni-karlsruhe.de with esmtp (Exim 3.36 #1)
	id 17sppJ-0001nx-00; Sat, 21 Sep 2002 21:22:01 +0200
Received: from i609a.hadiko.de (hadii609a.hadiko.uni-karlsruhe.de [172.20.49.159])
	by nce2.hadiko.de (8.12.3/8.12.3/Debian -4) with ESMTP id g8LJM0wb016600
	(version=TLSv1/SSLv3 cipher=EDH-RSA-DES-CBC3-SHA bits=168 verify=NO)
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 21 Sep 2002 21:22:01 +0200
Received: from i609a.hadiko.de (localhost [127.0.0.1])
	by i609a.hadiko.de (8.12.6/8.12.5) with ESMTP id g8LJM06o014203
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 21 Sep 2002 21:22:00 +0200 (CEST)
	(envelope-from p@i609a.hadiko.de)
Received: (from p@localhost)
	by i609a.hadiko.de (8.12.6/8.12.6/Submit) id g8LJM0Hs014202;
	Sat, 21 Sep 2002 21:22:00 +0200 (CEST)
Message-Id: <200209211922.g8LJM0Hs014202@i609a.hadiko.de>
Date: Sat, 21 Sep 2002 21:22:00 +0200 (CEST)
From: Philipp Mergenthaler <philipp.mergenthaler@stud.uni-karlsruhe.de>
Reply-To: Philipp Mergenthaler <philipp.mergenthaler@stud.uni-karlsruhe.de>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: Updates and additions to src/games/quiz/datfiles/pres
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         43177
>Category:       ports
>Synopsis:       Updates and additions to src/games/quiz/datfiles/pres
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    markm
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Sep 21 12:30:02 PDT 2002
>Closed-Date:    Wed Dec 22 14:53:54 GMT 2004
>Last-Modified:  Wed Dec 22 14:53:54 GMT 2004
>Originator:     Philipp Mergenthaler
>Release:        FreeBSD 5.0-CURRENT i386
>Organization:
University of Karlsruhe
>Environment:
System: FreeBSD i609a.hadiko.de 5.0-CURRENT FreeBSD 5.0-CURRENT #586: Tue Sep 17 14:54:33 CEST 2002 p@i609a.hadiko.de:/usr/src/sys/i386/compile/I609 i386


	
>Description:

Apparently the list of US presidents for quiz(6) hasn't been updated
for 25 years. :-)

The first patch is taken from OpenBSD (and the last entry from NetBSD).
It corrects some small mistakes, adds entries from 1977 to today and
adds the category "vice president".

My second patch adds the colloquial forms "Jimmy Carter", "Bill Clinton",
"Al Gore" and "Dick Cheney" since, according to Google, they're much
more frequently used than the full names.


>How-To-Repeat:
	
>Fix:

Index: index
===================================================================
RCS file: /ncvs/src/games/quiz/datfiles/index,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 index
--- index	4 Sep 1994 04:03:09 -0000	1.1.1.1
+++ index	20 Sep 2002 23:49:50 -0000
@@ -21,7 +21,7 @@
 /usr/share/games/quiz.db/murders:victim:killer
 /usr/share/games/quiz.db/poetry:poem{-}line:next:poem:author
 /usr/share/games/quiz.db/posneg:pos{itive}:neg{ative}
-/usr/share/games/quiz.db/pres:pres{ident}:term:succ{essor}
+/usr/share/games/quiz.db/pres:pres{ident}:term:vice:succ{essor}
 /usr/share/games/quiz.db/province:province:cap{ital}
 /usr/share/games/quiz.db/seq-easy:easy{-}{seq{uence}}:next:name
 /usr/share/games/quiz.db/seq-hard:hard{-}{seq{uence}}:next:name
Index: pres
===================================================================
RCS file: /ncvs/src/games/quiz/datfiles/pres,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 pres
--- pres	4 Sep 1994 04:03:10 -0000	1.1.1.1
+++ pres	20 Sep 2002 23:38:18 -0000
@@ -1,38 +1,83 @@
-{G{eorge} }Washington:1789-{17}97:{J{ohn} }Adams
-{J{ohn} }Adams:1797-1801:{T{homas} }Jefferson
-{T{homas} }Jefferson:1801-{{18}0}9:{J{ames} }Madison
-{J{ames} }Madison:1809-{18}17:{J{ames} }Monroe
-{J{ames} }Monroe:1817-1825:{J{ohn} }{Q{uincy} }Adams
-{J{ohn} }{Q{uincy} }Adams:1825-{{18}2}9:{A{ndrew} }Jackson
-{A{ndrew} }Jackson:1829-{18}37:{M{artin} }Van Buren
-{M{artin} }Van Buren:1837-{18}41:{W{illiam|m} }{H{enry} }Harrison
-{W{illiam|m} }{H{enry} }Harrison:1841:{J{ohn} }Tyler
-{J{ohn} }Tyler:1841-{{18}4}5:{J{ames} }{K{nox} }Polk
-{J{ames} }{K{nox} }Polk:1845-{{18}4}9:{Z{achary} }Taylor
-{Z{achary} }Taylor:1849-{18}50:{M{illard} }Fillmore
-{M{illard} }Fillmore:1850-{{18}5}3:{F{ranklin} }Pierce
-{F{ranklin} }Pierce:1853-{{18}5}7:{J{ames} }Buchanan
-{J{ames} }Buchanan:1857-{18}61:{A{braham|be} }Lincoln
-{A{braham|be} }Lincoln:1861-{{18}6}5:{A{ndrew} }Johnson
-{A{ndrew} }Johnson:1865-{{18}6}9:{U{lysses} }{S{impson} }Grant
-{U{lysses} }{S{impson} }Grant:1869-{18}77:{R{utherford} }{B{irchard} }Hayes
-{R{utherford} }{B{irchard} }Hayes:1877-{18}81:{J{ames} }{A{bram} }Garfield
-{J{ames} }{A{bram} }Garfield:1881:{C{hester} }{A{lan} }Arthur
-{C{hester} }{A{lan} }Arthur:1881-{{18}8}5:{G{rover} }Cleveland{ (1st term)}
-{G{rover} }Cleveland{ (1st term)}:1885-{{18}8}9:{B{enjamin} }Harrison
-{B{enjamin} }Harrison:1889-{18}93:{G{rover} }Cleveland{ (2nd term)}
-{G{rover} }Cleveland{ (2nd term)}:1893-{18}97:{W{illiam|m} }McKinley
-{W{illiam|m} }McKinley:1897-1901:{T{heodore|eddy} }Roosevelt|TR
-{T{heodore|eddy} }Roosevelt|TR:1901-{{19}0}9:{W{illiam|m} }{H{oward} }Taft
-{W{illiam|m} }{H{oward} }Taft:1909-{19}13:{W{oodrow} }Wilson
-{W{oodrow} }Wilson:1913-{19}21:{W{arren} }{G{amaliel} }Harding
-{W{arren} }{G{amaliel} }Harding:1921-{{19}2}3:{C{alvin} }Coolidge
-{C{alvin} }Coolidge:1923-{{19}2}9:{H{erbert} }Hoover
-{H{erbert} }Hoover:1929-{19}33:{F{ranklin} }{D{elano} }Roosevelt|FDR
-{F{ranklin} }{D{elano} }Roosevelt|FDR:1933-{19}45:{H{arry} }{S }Truman
-{H{arry} }{S }Truman:1945-{19}53:{D{wight} }{D{avid} }Eisenhower
-{D{wight} }{D{avid} }Eisenhower:1953-{19}61:{J{ohn} }{F{itzgerald} }Kennedy|JFK
-{J{ohn} }{F{itzgerald} }Kennedy|JFK:1961-{{19}6}3:{L{yndon} }{B{aines} }Johnson|LBJ
-{L{yndon} }{B{aines} }Johnson|LBJ:1963-{{19}6}9:{R{ichard} }{M{ilhouse} }Nixon
-{R{ichard} }{M{ilhouse} }Nixon:1969-{19}74:{G{erald} }{R{obert} }Ford
-{G{erald} }{R{obert} }Ford:1974-:
+{G{eorge} }Washington:1789-{17}97:{J{ohn} }Adams:{J{ohn} }Adams
+{J{ohn} }Adams:1797-1801:{T{homas} }Jefferson:{T{homas} }Jefferson
+{T{homas} }Jefferson:1801-{{18}0}9:{A{aron} }Burr|{G{eorge} }Clinton:\
+{J{ames} }Madison
+{J{ames} }Madison:1809-{18}17:{G{eorge} }Clinton|{E{lbridge} }Gerry:\
+{J{ames} }Monroe
+{J{ames} }Monroe:1817-1825:\
+{D{aniel} }{D{.} }Tompkins:{J{ohn} }{Q{uincy} }Adams
+{J{ohn} }{Q{uincy} }Adams:1825-{{18}2}9:{J{ohn} }{C{aldwell} }Calhoun:\
+{A{ndrew} }Jackson
+{A{ndrew} }Jackson:1829-{18}37:\
+{J{ohn} }{C{aldwell} }Calhoun|{M{artin} }Van Buren:{M{artin} }Van Buren
+{M{artin} }Van Buren:1837-{18}41:\
+{R{ichard} }{M{entor} }Johnson:{W{illiam|m} }{H{enry} }Harrison
+{W{illiam|m} }{H{enry} }Harrison:1841:{J{ohn} }Tyler:{J{ohn} }Tyler
+{J{ohn} }Tyler:1841-{{18}4}5:[N|n]one{ (1841-5)}:{J{ames} }{K{nox} }Polk
+{J{ames} }{K{nox} }Polk:1845-{{18}4}9:\
+{G{eorge} }{M{ifflin} }Dallas:{Z{achary} }Taylor
+{Z{achary} }Taylor:1849-{18}50:{M{illard} }Fillmore:{M{illard} }Fillmore
+{M{illard} }Fillmore:1850-{{18}5}3:[N|n]one{ (1850-3)}:{F{ranklin} }Pierce
+{F{ranklin} }Pierce:1853-{{18}5}7:\
+{W{illiam|m} }{R{ufus} }{de Vane }King:{J{ames} }Buchanan
+{J{ames} }Buchanan:1857-{18}61:\
+{J{ohn} }{C{abell} }Breckinridge:{A{braham|be} }Lincoln
+{A{braham|be} }Lincoln:1861-{{18}6}5:\
+{H{annibal} }Hamlin|{A{ndrew} }Johnson:{A{ndrew} }Johnson
+{A{ndrew} }Johnson:1865-{{18}6}9:[N|n]one{ (1865-9)}:\
+{U{lysses} }{S{impson} }Grant
+{U{lysses} }{S{impson} }Grant:1869-{18}77:\
+{S{chuyler} }Colfax|{H{enry} }Wilson:{R{utherford} }{B{irchard} }Hayes
+{R{utherford} }{B{irchard} }Hayes:1877-{18}81:\
+{W{illiam|m} }{A{lmon} }Wheeler:{J{ames} }{A{bram} }Garfield
+{J{ames} }{A{bram} }Garfield:1881:\
+{C{hester} }{A{lan} }Arthur:{C{hester} }{A{lan} }Arthur
+{C{hester} }{A{lan} }Arthur:1881-{{18}8}5:[N|n]one{ (1881-5)}:\
+{G{rover} }Cleveland{ (1st term)}
+{G{rover} }Cleveland{ (1st term)}:1885-{{18}8}9:\
+{T{homas} }{A{ndrews} }Hendricks:{B{enjamin} }Harrison
+{B{enjamin} }Harrison:1889-{18}93:\
+{L{evi} }{P{arsons} }Morton:{G{rover} }Cleveland{ (2nd term)}
+{G{rover} }Cleveland{ (2nd term)}:1893-{18}97:\
+{A{dlai} }{E{wing} }Stevenson:{W{illiam|m} }McKinley
+{W{illiam|m} }McKinley:1897-1901:\
+{G{arret} }{A{ugustus} }Hobart|{T{heodore|eddy} }Roosevelt|TR:\
+{T{heodore|eddy} }Roosevelt|TR
+{T{heodore|eddy} }Roosevelt|TR:1901-{{19}0}9:\
+{C{harles} }{W{arren} }Fairbanks:{W{illiam|m} }{H{oward} }Taft
+{W{illiam|m} }{H{oward} }Taft:1909-{19}13:\
+{J{ames} }{S{choolcraft} }Sherman:{W{oodrow} }Wilson
+{W{oodrow} }Wilson:1913-{19}21:\
+{T{homas} }{R{iley} }Marshall:{W{arren} }{G{amaliel} }Harding
+{W{arren} }{G{amaliel} }Harding:1921-{{19}2}3:{C{alvin} }Coolidge:\
+{C{alvin} }Coolidge
+{C{alvin} }Coolidge:1923-{{19}2}9:\
+{C{harles} }{G{ates} }Dawes:{H{erbert} }{C{lark} }Hoover
+{H{erbert} }{C{lark} }Hoover:1929-{19}33:\
+{C{harles} }Curtis:{F{ranklin} }{D{elano} }Roosevelt|FDR
+{F{ranklin} }{D{elano} }Roosevelt|FDR:1933-{19}45:\
+{J{ohn} }{N{ance} }Garner|{H{enry} }{A{gard} }Wallace|{H{arry} }{S }Truman:\
+{H{arry} }{S }Truman
+{H{arry} }{S }Truman:1945-{19}53:\
+{A{lben} }{W{illiam} }Barkley:{D{wight} }{D{avid} }Eisenhower
+{D{wight} }{D{avid} }Eisenhower:1953-{19}61:\
+{R{ichard} }{M{ilhous} }Nixon:{J{ohn} }{F{itzgerald} }Kennedy|JFK
+{J{ohn} }{F{itzgerald} }Kennedy|JFK:1961-{{19}6}3:\
+{L{yndon} }{B{aines} }Johnson|LBJ:{L{yndon} }{B{aines} }Johnson|LBJ
+{L{yndon} }{B{aines} }Johnson|LBJ:1963-{{19}6}9:\
+{H{ubert} }{H{oratio} }Humphrey:{R{ichard} }{M{ilhous} }Nixon
+{R{ichard} }{M{ilhous} }Nixon:1969-{19}74:\
+{S{piro} }{T{heodore} }Agnew|{G{erald} }{R{udolph} }Ford:\
+{G{erald} }{R{udolph} }Ford
+{G{erald} }{R{udolph} }Ford:1974-{{19}7}7:\
+{N{elson} }{A{ldrich} }Rockefeller:{J{ames} }{E{arl} }Carter{{,} J{unio}r}
+{J{ames} }{E{arl} }Carter{{,} J{unio}r}:1977-{19}81:\
+{W{alter} }{F{rederick} }Mondale:{R{onald} }{W{ilson} }Reagan
+{R{onald} }{W{ilson} }Reagan:1981-{{19}8}9:\
+{G{eorge} }{H{erbert} }{W{alker} }Bush:{G{eorge} }{H{erbert} }{W{alker} }Bush
+{G{eorge} }{H{erbert} }{W{alker} }Bush:1989-{19}93:\
+{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:




--- pres	Sat Sep 21 01:38:18 2002
+++ pres.new	Sat Sep 21 20:55:47 2002
@@ -70,14 +70,17 @@
 {S{piro} }{T{heodore} }Agnew|{G{erald} }{R{udolph} }Ford:\
 {G{erald} }{R{udolph} }Ford
 {G{erald} }{R{udolph} }Ford:1974-{{19}7}7:\
-{N{elson} }{A{ldrich} }Rockefeller:{J{ames} }{E{arl} }Carter{{,} J{unio}r}
-{J{ames} }{E{arl} }Carter{{,} J{unio}r}:1977-{19}81:\
+{N{elson} }{A{ldrich} }Rockefeller:\
+{J{ames} }{E{arl} }{(Jimmy) }Carter{{,} J{unio}r}|Jimmy Carter
+{J{ames} }{E{arl} }{(Jimmy) }Carter{{,} J{unio}r}|Jimmy Carter:1977-{19}81:\
 {W{alter} }{F{rederick} }Mondale:{R{onald} }{W{ilson} }Reagan
 {R{onald} }{W{ilson} }Reagan:1981-{{19}8}9:\
 {G{eorge} }{H{erbert} }{W{alker} }Bush:{G{eorge} }{H{erbert} }{W{alker} }Bush
 {G{eorge} }{H{erbert} }{W{alker} }Bush:1989-{19}93:\
-{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}
+{J{ames} }{D{anforth|an} }Quayle:\
+{W{illiam|m} }{J{efferson} }{(Bill) }Clinton|Bill Clinton
+{W{illiam|m} }{J{efferson} }{(Bill) }Clinton|Bill Clinton:1993-2001:\
+{A{l{bert}} }{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:
+{R{ichard} }{B{ruce} }{(Dick) }Cheney|Dick Cheney:
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-bugs->markm 
Responsible-Changed-By: arved 
Responsible-Changed-When: Thu Oct 24 01:57:23 PDT 2002 
Responsible-Changed-Why:  
markm is currently working on portifying this game 

http://www.freebsd.org/cgi/query-pr.cgi?pr=43177 

Adding to audit trail:

The affected code was long ago moved into a port, games/freebsd-games.
State-Changed-From-To: open->closed 
State-Changed-By: vs 
State-Changed-When: Wed Dec 22 14:53:03 GMT 2004 
State-Changed-Why:  
Committed to port games/freebsd-games, thanks for your submission! 
(It's not that it was urgent after missing 25y of history anyway) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=43177 
>Unformatted:
