Bug 26703

At Thu, 19 Apr 2001 05:54:25 -0700 (PDT),
sugimura@jp.FreeBSD.org wrote:
> There are something wrong with /usr/share/calendar/calendar.holiday.
> 
> Thanks for Shinya Esu <esu@yk.rim.or.jp>.
(snip)
> >Fix:
> Now Japanese holidays are following:
> 
> 01/01 : Beginning of the Year
> 2nd Monday of January : Adults Day
> 02/11 : National Foundation Day
> 03/20(or 21) : Vernal Equinox
> 04/29 : Day of Green
> 05/03 : Constitution Memorial Day
> 05/04 : National Holiday
> 05/05 : Children's Day
> 07/20 : Day of Sea
> 2nd Monday of September : Respect for the Aged Day
> 09/23 : Autumnal Equinox
> 2nd Monday of October : Health Sports Day
> 11/23 : Labor Thanksgiving Day
> 12/23 : Emperor's Birthday

Thanks, those entries should be fixed ASAP, however, it'd be nicer if
you submitted a patch instead of notes.

Note that calendar.* files are formatted as described in calendar(1)
manpage.  For example, the preferable entries for Vernal Equinox would
be as follows:

03/20*	Vernal Equinox in Japan
03/21*	Vernal Equinox in Japan

And the one for Health Sports Day would be like this:

11/MonSecond	Health Sports Day in Japan

Would you like to accomplish the task? :)

-- 
                     /
                    /__  __            Akinori.org / MUSHA.org
                   / )  )  ) )  /     FreeBSD.org / Ruby-lang.org
Akinori MUSHA aka / (_ /  ( (__(  @ iDaemons.org / and.or.jp

"Freeze this moment a little bit longer, make each impression
  a little bit stronger..  Experience slips away -- Time stand still"

Hello knu,

>Thanks, those entries should be fixed ASAP, however, it'd be nicer if
>you submitted a patch instead of notes.
>

Oh, you are right.


>Note that calendar.* files are formatted as described in calendar(1)
>manpage.  For example, the preferable entries for Vernal Equinox would
>be as follows:
>
>03/20*	Vernal Equinox in Japan
>03/21*	Vernal Equinox in Japan
>
>And the one for Health Sports Day would be like this:
>
>11/MonSecond	Health Sports Day in Japan
>
>Would you like to accomplish the task? :)
>

Thank you, but I have little time to make a patch today.
Parhaps I make it after tomorrow(20th) 20:00 JST..

---
SUGIMURA Takashi <sugimura@jp.FreeBSD.org>

Comment 3 Akinori MUSHA 2001-04-20 14:44:48 UTC

State Changed
From-To: open->closed

Committed on CURRENT.  It will be MFC'd later. 

Thanks for the patch!

----Next_Part(Fri_Apr_20_22:45:07_2001_809)--
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit

Dear knu and all,

I've just made a patch to
/usr/src/usr.bin/calendar/calendars/calendar.holiday.

Please check and try it.

Thank you,

---
SUGIMURA Takashi <sugimura@jp.FreeBSD.org>


----Next_Part(Fri_Apr_20_22:45:07_2001_809)--
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename="calendar.holiday.diff"

--- calendar.holiday.orig	Fri Apr 20 22:32:40 2001
+++ calendar.holiday	Fri Apr 20 22:40:53 2001
@@ -9,6 +9,7 @@
 
 01/01	Independence Day in Haiti, Sudan
 01/01	Universal Fraternity Day in Mozambique
+01/01	Beginning of the Year in Japan
 01/02	Ancestry Day in Haiti
 01/02	St. Berchtold's Day in Switzerland
 01/03	New Year's Holiday in Scotland
@@ -23,7 +24,7 @@
 01/11	Armed Forces Day in Liberia
 01/12	Zanzibar Revolution Day in Tanzania
 01/13	National Liberation Day in Togo
-01/15	Adults Day in Japan
+01/MonSecond	Adults Day in Japan
 01/15	Arbor Day in Jordan
 01/16	Martyrs Day in Benin
 01/18	Revolution Day in Tunisia
@@ -63,7 +64,6 @@
 03/02	Peasants Day in Burma
 03/02	Texas Independence day
 03/02	Victory of Adowa in Ethiopia
-03/03	Girl's Day in Japan
 03/03	Throne Day in Morocco
 03/04	Vermont Admission Day (admitted as 14th state in 1791)
 03/05	Independence Day in Equatorial Guinea
@@ -91,6 +91,8 @@
 03/19	Tree Planting Day in Lestho
 03/20	Independence Day in Tunisia
 03/20	Youth Day in Oklahoma
+03/20*	Vernal Equinox in Japan
+03/21*	Vernal Equinox in Japan
 03/21	Afghan New Year in Afghanistan
 03/21	Juarez' Birthday in Mexico
 03/22	Abolition Day in Puerto Rico
@@ -142,14 +144,16 @@
 04/26	Confederate Memorial Day in Florida & Georgia
 04/26	Union Day in Tanzania
 04/27	Independence Day in Togo
+04/29	Day of Green in Japan
 04/MonLast	Arbor Day in Wyoming (last Monday)
 04/MonLast	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)
 05/01	May Day in many places
-05/02	Constitution Day in Japan
+05/03	Constitution Memorial Day in Japan
 05/04	Rhode Island Independence Day
+05/04	National Holiday in Japan
 05/05	Children's Day in Japan, South Korea
 05/05	Coronation Day in Thailand
 05/05	Liberation Day in Netherlands
@@ -255,6 +259,7 @@
 07/18	Liberation Day in Nicaragua
 07/19	Martyrs Day in Burma
 07/20	Independence Day in Colombia
+07/20	Day of Sea in Japan
 07/21	National Holiday in Belgium
 07/22	National Day in Poland
 07/23	Egyptian National Day in Syrian Arab Republic
@@ -327,7 +332,7 @@
 09/12	Defender's Day in Maryland
 09/12	Revolution Day in Ethiopia
 09/13	Barry Day commemorates the death of Commodore John Barry
-09/15	Respect for the Aged Day in Japan
+09/MonSecond	Respect for the Aged Day in Japan
 09/16	Cherokee Strip Day in Oklahoma
 09/16	Independence Day in Mexico, Papua, New Guinea
 09/17	National Heroes Day in Angola
@@ -336,6 +341,8 @@
 09/21	Independence Day in Belize
 09/22	Independence Day in Mali
 09/22	National Sovereignty Day in Haiti
+09/22*	Autumnal Equinox in Japan
+09/23*	Autumnal Equinox in Japan
 09/24	Independence Day in Guinea-Bissau
 09/24	National Day in Saudi Arabia
 09/24	Republic Day in Trinidad, Tobago
@@ -364,8 +371,8 @@
 10/09	Korean Alphabet Day in South Korea
 10/09	Leif Erikson Day commemorates the discovery of North America in AD 1000
 10/09	Republic Day in Khmer Republic
+10/MonSecond	Health Sports Day in Japan
 10/10	Fiji Day in Fiji
-10/10	Health-Sports Day in Japan
 10/10	National Day in Taiwan
 10/10	Oklahoma Historical Day in Oklahoma
 10/11	Day of the Revolution in Panama
@@ -455,6 +462,7 @@
 12/17	National Day in Bhutan
 12/18	Republic Day in Niger
 12/23	Victory Day in Egypt
+12/23	Emperor's Birthday in Japan
 12/25	Children's Day in Congo
 12/26	Bank Holiday in Canada, Rep. of Ireland, and UK
 12/26	Boxing Day
@@ -470,9 +478,7 @@
 
 04/21	Tiradentes in Brazil
 04/25	Anniversary of the Revolution in Portugal
-04/29	Emperor's Birthday in Japan
 04/30	Queen's Birthday in Netherlands, Netherlands Antilles
-05/01	Boy's day in Japan
 05/02	King's Birthday in Lesotho
 05/05	Battle of Puebla in Mexico
 05/08	Buddha's Birthday in South Korea

----Next_Part(Fri_Apr_20_22:45:07_2001_809)----