[src/netbsd-7]: src/usr.bin/calendar/calendars Pull up following revision(s) ...

[riz <riz%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/4bdcb2458d82
branches:  netbsd-7
changeset: 799652:4bdcb2458d82
user:      riz <riz%NetBSD.org@localhost>
date:      Fri Nov 06 00:52:36 2015 +0000

description:
Pull up following revision(s) (requested by jnemeth in ticket #988):
        usr.bin/calendar/calendars/calendar.birthday: revision 1.25
        usr.bin/calendar/calendars/calendar.christian: revision 1.5
        usr.bin/calendar/calendars/calendar.netbsd: revision 1.33
        usr.bin/calendar/calendars/calendar.netbsd: revision 1.34
        usr.bin/calendar/calendars/calendar.netbsd: revision 1.35
        usr.bin/calendar/calendars/calendar.usholiday: revision 1.6
        usr.bin/calendar/calendars/calendar.holiday: revision 1.24
        usr.bin/calendar/calendars/calendar.holiday: revision 1.25
        usr.bin/calendar/calendars/calendar.judaic: revision 1.5
        usr.bin/calendar/calendars/calendar.history: revision 1.31
        usr.bin/calendar/calendars/calendar.history: revision 1.32
note birth and death of Douglas Adams
Fix year of Hawaiian Admission Day. From Henning Petersen in PR 49123.
- sort
- add a bunch of missing release
If we're going to note the USSR shooting down civilian airliners,
we should be fair and pick on the USA as well.
Add pkgsrc/Bitrig
Switch from a mixture of tabs & 3 spaces to a single style, 3 spaces
Pretty difficult for a TV show (Star Trek) to have a first airing
on two different dates.  Dump the erroneous one.
Adjust dates for floating holidays.  Use 2015 for things happening from
mid-October onwards, and 2016 for things happening earlier.

diffstat:

 usr.bin/calendar/calendars/calendar.birthday  |   2 +
 usr.bin/calendar/calendars/calendar.christian |  28 ++++++++--------
 usr.bin/calendar/calendars/calendar.history   |   2 +-
 usr.bin/calendar/calendars/calendar.holiday   |  44 +++++++++++++-------------
 usr.bin/calendar/calendars/calendar.judaic    |  44 +++++++++++++-------------
 usr.bin/calendar/calendars/calendar.netbsd    |  33 ++++++++++++-------
 usr.bin/calendar/calendars/calendar.usholiday |  24 +++++++-------
 7 files changed, 93 insertions(+), 84 deletions(-)

diffs (truncated from 435 to 300 lines):

diff -r 5cf30277b70a -r 4bdcb2458d82 usr.bin/calendar/calendars/calendar.birthday
--- a/usr.bin/calendar/calendars/calendar.birthday      Fri Nov 06 00:50:52 2015 +0000
+++ b/usr.bin/calendar/calendars/calendar.birthday      Fri Nov 06 00:52:36 2015 +0000
@@ -76,6 +76,7 @@
 03/08  Howard Aiken born, 1900
 03/11  Robert Treat Paine born, 1737
 03/11  Vannevar Bush born, 1890
+03/11  Douglas Adams born, 1952
 03/12  Gustav Robert Kirchhoff born, 1824, physicist
 03/14  Albert Einstein born, 1879
 03/14  Casey Jones born, 1864
@@ -122,6 +123,7 @@
 05/09  Pinza died, 1957
 05/10  Fred Astaire (Frederick Austerlitz) born in Omaha, Nebraska, 1899
 05/11  Johnny Appleseed born, 1768
+05/11  Douglas Adams died, 2001
 05/12  Florence Nightingale born in Florence, Italy, 1820
 05/13  Arthur S. Sullivan born, 1842
 05/15  Mike Oldfield born in Essex, England, 1953
diff -r 5cf30277b70a -r 4bdcb2458d82 usr.bin/calendar/calendars/calendar.christian
--- a/usr.bin/calendar/calendars/calendar.christian     Fri Nov 06 00:50:52 2015 +0000
+++ b/usr.bin/calendar/calendars/calendar.christian     Fri Nov 06 00:52:36 2015 +0000
@@ -1,17 +1,17 @@
-01/18* Epiphany
-02/12* Shrove Tuesday / Mardi Gras (day before Ash Wednesday)
-02/13* Ash Wednesday (First day of Lent)
-03/24* Palm Sunday (7 days before Easter)
-03/28* Maundy Thursday (3 days before Easter)
-03/29* Good Friday (2 days before Easter)
-03/31* Easter Sunday
-05/05* Rogation Sunday
-05/09* Ascension Day (10 days before Pentecost)
-05/19* Pentecost (Whitsunday)
-05/20* Whitmonday
-05/26* Trinity Sunday (7 days after Pentecost)
-05/30* Corpus Christi (11 days after Pentecost)
+01/06* Epiphany
+02/09* Shrove Tuesday / Mardi Gras (day before Ash Wednesday)
+02/10* Ash Wednesday (First day of Lent)
+03/20* Palm Sunday (7 days before Easter)
+03/24* Maundy Thursday (3 days before Easter)
+03/25* Good Friday (2 days before Easter)
+03/27* Easter Sunday
+05/01* Rogation Sunday
+05/05* Ascension Day (10 days before Pentecost)
+05/15* Pentecost (Whitsunday)
+05/16* Whitmonday
+05/22* Trinity Sunday (7 days after Pentecost)
+05/26* Corpus Christi (11 days after Pentecost)
 10/18  Feast Day of St. Luke
-12/01* First Sunday of Advent (4th Sunday before Christmas)
+11/29* First Sunday of Advent (4th Sunday before Christmas)
 12/06  St. Nicholas' Day
 12/25  Feast of the Nativity (Christmas)
diff -r 5cf30277b70a -r 4bdcb2458d82 usr.bin/calendar/calendars/calendar.history
--- a/usr.bin/calendar/calendars/calendar.history       Fri Nov 06 00:50:52 2015 +0000
+++ b/usr.bin/calendar/calendars/calendar.history       Fri Nov 06 00:52:36 2015 +0000
@@ -294,6 +294,7 @@
 06/30  China and Soviet Union announce split over ideology, 1960
 
 07/01  Battle of Gettysburg begins, 1863
+07/03  290 people killed after Iran Airlines A300 shot down by USA, 1988
 07/04  Battles of Vicksburg and Gettysburg won by Union forces, 1863
 07/04  Cloudy, 76 degrees, Philadelphia PA, 1776
 07/04  New York abstains on Declaration of Independence vote, 1776
@@ -373,7 +374,6 @@
 09/02  Japan signs unconditional surrender on US battleship `Missouri', 1945
 09/05  The first Continental Congress was convened in Philadelphia, 1774
 09/06  149 Pilgrims set forth from England aboard the Mayflower, 1620
-09/06  First Star Trek episode (The Man Trap) aired 1966
 09/06  Pres. McKinley shot, 1901
 09/08  "Star Trek" debuts on NBC (1966)
 09/08  Jack the Ripper kills again, Annie Chapman is second victim, 1888
diff -r 5cf30277b70a -r 4bdcb2458d82 usr.bin/calendar/calendars/calendar.holiday
--- a/usr.bin/calendar/calendars/calendar.holiday       Fri Nov 06 00:50:52 2015 +0000
+++ b/usr.bin/calendar/calendars/calendar.holiday       Fri Nov 06 00:52:36 2015 +0000
@@ -24,9 +24,9 @@
 01/19  Nameday of Archbishop Makarios in Cyprus
 01/20  Army Day in Mali 
 01/20  National Heroes Day in Guinea-Bissau
-01/20* Martin Luther King Day in New York (3rd Sunday)
-01/21* Lee-Jackson Day in Virginia (3rd Monday)
-01/21* Robert E. Lee's Birthday in Alabama & Mississippi (3rd Monday)
+01/17* Martin Luther King Day in New York (3rd Sunday)
+01/18* Lee-Jackson Day in Virginia (3rd Monday)
+01/18* Robert E. Lee's Birthday in Alabama & Mississippi (3rd Monday)
 01/21  Our Lady of Altagracia in Dominican Republic
 01/23  Feast of St. Ildefonsus
 01/23  National Handwriting Day
@@ -59,7 +59,7 @@
 03/04  Vermont Admission Day (admitted as 14th state in 1791)
 03/05  Independence Day in Equatorial Guinea
 03/06  Lantern Day, Bejing
-02/23* Purim - Feast of Lots 
+03/23* Purim - Feast of Lots 
 03/08  First Annual International Women's Day, 1909
 03/08  International Women's Day in U.S.S.R.
 03/08  Syrian National Day in Libyan Arab Republic
@@ -91,7 +91,7 @@
 03/25  Lady Day (a.k.a. the Feast of the Annunciation)
 03/25  Maryland Day in Maryland
 03/25  National Holiday in Greece
-03/25* Seward's Day in Alaska (last Monday)
+03/28* Seward's Day in Alaska (last Monday)
 03/26  Independence Day in Bangladesh
 03/26  Prince Jonah Kuhio Kalanianaole Day in Hawaii
 03/27  Armed Forces Day in Burma
@@ -114,7 +114,7 @@
 04/13  Songkran Day in Thailand
 04/14  Day of the Americas in Honduras
 04/15  Bengali New Year in Bangladesh
-04/22* Patriot's Day in Maine & Massachusetts (3rd Monday)
+04/18* Patriot's Day in Maine & Massachusetts (3rd Monday)
 04/16  De Diego's Birthday (celebrated in Puerto Rico)
 04/16  Holy Week (5 days) in Venezuela
 04/16  Tourist Week (5 days) in Uruguay
@@ -126,15 +126,15 @@
 04/22  Arbor Day in Nebraska & Delaware
 04/22  Oklahoma Day in Oklahoma
 04/24  Victory Day in Togo
-03/25* Pesach - First Day of Passover - Festival of Freedom
+03/23* Pesach - First Day of Passover - Festival of Freedom
 04/25  Anzac Day in Australia, New Zealand, Tonga, Western Samoa
 04/25  Liberation Day in Italy 
 04/25  National Flag Day in Swaziland
 04/26  Confederate Memorial Day in Florida & Georgia
 04/26  Union Day in Tanzania
 04/27  Independence Day in Togo
-04/29* Arbor Day in Wyoming (last Monday)
-04/29* Confederate Memorial Day in Alabama & Mississippi (last Monday)
+04/25* Arbor Day in Wyoming (last Monday)
+04/25* Confederate Memorial Day in Alabama & Mississippi (last Monday)
 04/30  The Workers Day in Uruguay
 05/01  Labor Day in many places
 05/01  Law Day (decl. by Eisenhower)
@@ -145,7 +145,7 @@
 05/05  Coronation Day in Thailand
 05/05  Liberation Day in Netherlands
 05/06  Bataan Day in Philippines
-05/06* Bank Holiday in UK (first Monday in May)
+05/02* Bank Holiday in UK (first Monday in May)
 05/07  May Day in United Kingdom
 05/08  Truman Day in Missouri
 05/09  Liberation Day in Czechoslovakia
@@ -166,8 +166,8 @@
 05/19  Youth and Sports Day in Turkey
 05/20  Mecklenburg Independence Day in North Carolina
 05/20  National Day in Cameroon
-05/20* Memorial Day in Michigan (3rd Monday)
-05/20* Victoria Day in Canada
+05/16* Memorial Day in Michigan (3rd Monday)
+05/16* Victoria Day in Canada
 05/22  National Heroes Day in Sri Lanka
 05/23  Commonwealth Day in Jamaica, Belize
 05/23  National Labor Day in Jamaica
@@ -178,8 +178,8 @@
 05/25  Independence Day in Jordan
 05/25  Memorial Day in New Mexico & Puerto Rico
 05/25  Towel Day, a tribute to Douglas Adams
-05/29* First Day of Shavuot 
-05/27* Bank Holiday in UK (last Monday in May)
+06/11* First Day of Shavuot 
+05/30* Bank Holiday in UK (last Monday in May)
 05/28  Mothers Day in Central African Republic
 05/31  Pya Martyrs Day in Togo
 05/31  Republic Day in South Africa
@@ -188,7 +188,7 @@
 06/01  Victory Day in Tunisia
 06/03  Confederate Memorial Day in Kentucky & Louisiana
 06/03  Labor Day in Bahamas
-06/03* Bank Holiday in Rep. of Ireland (first Monday in June)
+06/06* Bank Holiday in Rep. of Ireland (first Monday in June)
 06/04  Emancipation Day in Tonga
 06/05  Constitution Day in Denmark
 06/05  Liberation Day in Seychelles
@@ -270,8 +270,8 @@
 08/03  Independence Day in Jamaica, Niger
 08/03  Memorial Day of Archbishop Makarios in Cyprus
 08/04  Freedom Day in Guyana
-08/05* Bank Holiday in Scotland and Northern Ireland (first Monday in August)
-08/05* Bank Holiday in Australia, British Columbia, Fiji, Iceland, Ireland,
+08/01* Bank Holiday in Scotland and Northern Ireland (first Monday in August)
+08/01* Bank Holiday in Australia, British Columbia, Fiji, Iceland, Ireland,
        Ontario (first Monday in August)
 08/06  Emancipation Day in Bahamas
 08/06  Independence Day in Bolivia
@@ -285,7 +285,7 @@
 08/15  Independence Day in India
 08/15  Liberation Day in South Korea
 08/15  National Day in Congo
-08/16* Admission Day in Hawaii, 1984 (3rd Friday)
+08/19* Admission Day in Hawaii, 1959 (3rd Friday)
 08/16  Bennington Battle Day in Vermont
 08/16  Independence Days (3 days) in Gabon
 08/16  Restoration Day in Dominican Republic
@@ -297,7 +297,7 @@
 08/25  Constitution Day in Paraguay
 08/25  Independence Day in Uruguay
 08/26  Susan B. Anthony Day in Massachusetts
-08/26* Bank Holiday in England and Wales (last Monday in August)
+08/29* Bank Holiday in England and Wales (last Monday in August)
 08/27  Liberation Day in Hong Kong
 08/28  Heroes Day in Philippines
 08/30  Huey P. Long Day in Louisiana
@@ -368,7 +368,7 @@
 10/13  St. Edward's Day - Patron saint of England
 10/14  National Day in Yemen Arab Republic
 10/14  Young People's Day in Zaire
-10/14* Thanksgiving Day in Canada
+10/12* Thanksgiving Day in Canada
 10/15  Evacuation Day in Tunisia
 10/16  National Boss Day
 10/17  Heroes Day in Jamaica
@@ -387,7 +387,7 @@
 10/26  National Day in Austria
 10/28  National Holiday in Greece
 10/28  OHI Day in Cyprus
-10/28* Bank Holiday in Rep. of Ireland (last Monday in October)
+10/26* Bank Holiday in Rep. of Ireland (last Monday in October)
 10/29  Republic Day in Turkey
 10/31  Nevada Day in Nevada
 11/01  All Saints Day
@@ -487,6 +487,7 @@
 06/22  Midsummer Eve in Finland, Sweden
 06/24  Battle of Carabobob in Venezuela
 07/01  Union of the Somalia Republic in Somalia
+07/06* Eid-ul-Fitr (2 days) in Muslim countries
 07/07  Anniversary of the P.U.N. in Equatorial Guinea
 07/12  Battle of Boyne celebrated in Northern Ireland
 07/12  The Twelfth in Northern Ireland
@@ -528,7 +529,6 @@
 10/05  Anniversary of Proclamation of the Republic in Portugal
 10/08  Battle of Agamos in Peru
 10/09  Independence of Guayaquil in Ecuador
-09/19* Eid-ul-Fitr (2 days) in Muslim countries
 10/17  Dessaline's Death Anniversary in Haiti
 10/20  Anniversary of the 1944 Revolution in Guatemala
 11/01  Feast of All Saints in Portugal
diff -r 5cf30277b70a -r 4bdcb2458d82 usr.bin/calendar/calendars/calendar.judaic
--- a/usr.bin/calendar/calendars/calendar.judaic        Fri Nov 06 00:50:52 2015 +0000
+++ b/usr.bin/calendar/calendars/calendar.judaic        Fri Nov 06 00:52:36 2015 +0000
@@ -1,27 +1,27 @@
-01/26*  Tu B'Shvat (Feast of Trees)
-02/22* Fast of Esther (Battle of Purim; 1 day before Purim; fast day)
-02/23* Purim (Feast of Lots; 30 days before Pesach)
-03/25* Pesach (First Day of Passover; sabbatical)
-03/26* Pesach (sabbatical)
-03/27* Pesach (sabbatical)
-03/28* Pesach (Last Day of Passover; 8th day of Pesach; sabbatical)
-04/16* Yom HaAtzma'ut (Israel Independence Day)
-05/12* Lag B'Omer (Commemoration of the Great Rebellion)
-05/22* Yom Yerushalayim (Reunification of Jerusalem)
-05/29* Shavuos (Festival of Weeks; 50 days after Pesach; sabbatical)
-07/09* Fast of Shiv'a Asar B'Tammuz (Tzom Tammuz) (Romans breach Wall of Jerusalem;
+01/25*  Tu B'Shvat (Feast of Trees)
+03/23* Fast of Esther (Battle of Purim; 1 day before Purim; fast day)
+03/24* Purim (Feast of Lots; 30 days before Pesach)
+04/23* Pesach (First Day of Passover; sabbatical)
+04/24* Pesach (sabbatical)
+04/25* Pesach (sabbatical)
+04/26* Pesach (Last Day of Passover; 8th day of Pesach; sabbatical)
+05/12* Yom HaAtzma'ut (Israel Independence Day)
+05/26* Lag B'Omer (Commemoration of the Great Rebellion)
+06/04* Yom Yerushalayim (Reunification of Jerusalem)
+06/12* Shavuos (Festival of Weeks; 50 days after Pesach; sabbatical)
+07/24* Fast of Shiv'a Asar B'Tammuz (Tzom Tammuz) (Romans breach Wall of Jerusalem;
        fast day)
-07/30* Fast of Tish'a B'Av (Babylon/Rome destroys Holy Temple; fast day)
-09/19* First Day of Rosh Hashanah (Jewish Lunar New Year; 5767 == 2006;
+08/14* Fast of Tish'a B'Av (Babylon/Rome destroys Holy Temple; fast day)
+10/03* First Day of Rosh Hashanah (Jewish Lunar New Year; 5767 == 2006;
        sabbatical)
-09/04* Rosh Hashanah (sabbatical)
-09/05* Fast of Gedalya (Murder of Gedalya and subsequent Exile; 1 day
+10/03* Rosh Hashanah (sabbatical)
+10/04* Fast of Gedalya (Murder of Gedalya and subsequent Exile; 1 day
        after Rosh Hashanah; fast day)
-09/13* Yom Kippur (Day of Atonement; 9 days after Rosh Hashanah;
+10/12* Yom Kippur (Day of Atonement; 9 days after Rosh Hashanah;
        sabbatical, fast day)
-09/28* Succos (Festival of Tabernacles; 14 days after Rosh Hashanah;
+10/17* Succos (Festival of Tabernacles; 14 days after Rosh Hashanah;
        sabbatical)
-10/04* Hoshanah Rabba (7th day of Succos)
-10/15* Shmini Atzeres (8th Day of Gathering; 1 day after Succos; sabbatical)
-12/12* First Day of Chanukah
-12/27* Fast of Asara B'Tevet (Babylonians put siege on Jerusalem; fast day)
+10/23* Hoshanah Rabba (7th day of Succos)
+10/24* Shmini Atzeres (8th Day of Gathering; 1 day after Succos; sabbatical)
+12/06* First Day of Chanukah
+12/22* Fast of Asara B'Tevet (Babylonians put siege on Jerusalem; fast day)
diff -r 5cf30277b70a -r 4bdcb2458d82 usr.bin/calendar/calendars/calendar.netbsd
--- a/usr.bin/calendar/calendars/calendar.netbsd        Fri Nov 06 00:50:52 2015 +0000
+++ b/usr.bin/calendar/calendars/calendar.netbsd        Fri Nov 06 00:52:36 2015 +0000
@@ -8,13 +8,14 @@
 01/27   NetBSD 6.0.4 released, 2014
 01/27   NetBSD 6.1.3 released, 2014
 01/31   NetBSD/shark port started, 1996
-02/02  NetBSD 5.1.2 released, 2012
+02/02   NetBSD 5.1.2 released, 2012