- Update US presidents for quiz(6) after 25 years

  (gosh, and we really need yet another update I think!)
- Bump PORTREV accordingly

PR:		ports/43177
Submitted by:	Philipp Mergenthaler
Approved by:	maintainer silence

4 files changed, 356 insertions, 6 deletions

diff --git a/games/bsdgames/Makefile b/games/bsdgames/Makefile
index 8b650b141e37..a8446dba81b6 100644
--- a/games/bsdgames/Makefile
+++ b/games/bsdgames/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	freebsd-games
 PORTVERSION=	5.1.1
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=markm
@@ -64,9 +64,9 @@ post-patch:
 	@${FIND} ${WRKSRC} -name '*.c' -or -name '*.h' -or -name '*.6' -or \
 		-name 'index' | ${XARGS} ${REINPLACE_CMD} -e \
 		's|share/games|local/share/games|g'
-	@for file in ${PATHNAME_FILES}; do \
+	@for f in ${PATHNAME_FILES}; do \
 		${REINPLACE_CMD} -e 's|/usr/local/local/local|${PREFIX}|g' \
-			${WRKSRC}/$${file}; \
+			${WRKSRC}/$${f}; \
 	done
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' \
 		"${WRKSRC}/hack/hack.unix.c"
diff --git a/games/bsdgames/files/patch-quiz b/games/bsdgames/files/patch-quiz
new file mode 100644
index 000000000000..9f4832ba2ae0
--- /dev/null
+++ b/games/bsdgames/files/patch-quiz
@@ -0,0 +1,175 @@
+Index: index
+===================================================================
+RCS file: /ncvs/src/games/quiz/datfiles/index,v
+retrieving revision 1.1.1.1
+diff -u -r1.1.1.1 index
+--- quiz/datfiles/index	4 Sep 1994 04:03:09 -0000	1.1.1.1
++++ quiz/datfiles/index	20 Sep 2002 23:49:50 -0000
+@@ -21,7 +21,7 @@
+ /usr/local/local/share/games/quiz.db/murders:victim:killer
+ /usr/local/local/share/games/quiz.db/poetry:poem{-}line:next:poem:author
+ /usr/local/local/share/games/quiz.db/posneg:pos{itive}:neg{ative}
+-/usr/local/local/share/games/quiz.db/pres:pres{ident}:term:succ{essor}
++/usr/local/local/share/games/quiz.db/pres:pres{ident}:term:vice:succ{essor}
+ /usr/local/local/share/games/quiz.db/province:province:cap{ital}
+ /usr/local/local/share/games/quiz.db/seq-easy:easy{-}{seq{uence}}:next:name
+ /usr/local/local/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
+--- quiz/datfiles/pres	4 Sep 1994 04:03:10 -0000	1.1.1.1
++++ quiz/datfiles/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:
+
+
+
+
+--- quiz/datfiles/pres	Sat Sep 21 01:38:18 2002
++++ quiz/datfiles/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:
diff --git a/games/freebsd-games/Makefile b/games/freebsd-games/Makefile
index 8b650b141e37..a8446dba81b6 100644
--- a/games/freebsd-games/Makefile
+++ b/games/freebsd-games/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	freebsd-games
 PORTVERSION=	5.1.1
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=markm
@@ -64,9 +64,9 @@ post-patch:
 	@${FIND} ${WRKSRC} -name '*.c' -or -name '*.h' -or -name '*.6' -or \
 		-name 'index' | ${XARGS} ${REINPLACE_CMD} -e \
 		's|share/games|local/share/games|g'
-	@for file in ${PATHNAME_FILES}; do \
+	@for f in ${PATHNAME_FILES}; do \
 		${REINPLACE_CMD} -e 's|/usr/local/local/local|${PREFIX}|g' \
-			${WRKSRC}/$${file}; \
+			${WRKSRC}/$${f}; \
 	done
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' \
 		"${WRKSRC}/hack/hack.unix.c"
diff --git a/games/freebsd-games/files/patch-quiz b/games/freebsd-games/files/patch-quiz
new file mode 100644
index 000000000000..9f4832ba2ae0
--- /dev/null
+++ b/games/freebsd-games/files/patch-quiz
@@ -0,0 +1,175 @@
+Index: index
+===================================================================
+RCS file: /ncvs/src/games/quiz/datfiles/index,v
+retrieving revision 1.1.1.1
+diff -u -r1.1.1.1 index
+--- quiz/datfiles/index	4 Sep 1994 04:03:09 -0000	1.1.1.1
++++ quiz/datfiles/index	20 Sep 2002 23:49:50 -0000
+@@ -21,7 +21,7 @@
+ /usr/local/local/share/games/quiz.db/murders:victim:killer
+ /usr/local/local/share/games/quiz.db/poetry:poem{-}line:next:poem:author
+ /usr/local/local/share/games/quiz.db/posneg:pos{itive}:neg{ative}
+-/usr/local/local/share/games/quiz.db/pres:pres{ident}:term:succ{essor}
++/usr/local/local/share/games/quiz.db/pres:pres{ident}:term:vice:succ{essor}
+ /usr/local/local/share/games/quiz.db/province:province:cap{ital}
+ /usr/local/local/share/games/quiz.db/seq-easy:easy{-}{seq{uence}}:next:name
+ /usr/local/local/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
+--- quiz/datfiles/pres	4 Sep 1994 04:03:10 -0000	1.1.1.1
++++ quiz/datfiles/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:
+
+
+
+
+--- quiz/datfiles/pres	Sat Sep 21 01:38:18 2002
++++ quiz/datfiles/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: