On Mon, Jan 18, 2016 at 10:49:08PM +0000, Craig Skinner wrote: > G'day, > > Similar to the recent British calendar file, here's a New Zealand file. >
committed, thanks. jmc > I've nuked a few NZ items from calendar.holiday due to them being spelt > wrongly, rigid dates, and are in the new file anyway. > > Like some holidays, there's a bit of historical controversy & emotion > surrounding a couple, so I reckon this is a reasonable solution. > > > Here are the main references I used: > http://employment.govt.nz/er/holidaysandleave/publicholidays/publicholidaydates/current.asp > http://en.wikipedia.org/wiki/Public_holidays_in_New_Zealand > http://www.anzac.govt.nz/today/ > http://en.wikipedia.org/wiki/ANZAC > http://en.wikipedia.org/wiki/Anzac_Day > http://en.wikipedia.org/wiki/New_Zealand_Day > http://en.wikipedia.org/wiki/Dominion_Day > > Despite what is on a lot of web pages ANZAC is all upper case, due to it > being an acronym for 'Australian and New Zealand Army Corps' - a > remembrance day. Various Pacific islands celebrate it too, but the list > changes, along with places of battle, and other parts of the Empire > where lots of Aussies & Kiwis are currently living, such as London. > > 2 provincial anniversary days fall on the same day, and those 2 > provinces are geographical neighbours, so put 1 entry for those days. > > The only problem was with the provincial Marlborough Anniversary Day, > which is observed on the first Monday after Labour Day. I couldn't find > any other entries for MonFith or if it would roll over to the first > Monday of the next month when needed, so I left it on the *date. > > The 5 summer anniversary days from January flop about to the nearest > Monday, forwards & backwards..... so they are *dates. > > > This began in a misc@ discussion: > http://openbsd-archive.7691.n7.nabble.com/DIFF-New-Year-s-calendar-td286907.html > > Cheers! > > > > Index: calendar.1 > =================================================================== > RCS file: /cvs/src/usr.bin/calendar/calendar.1,v > retrieving revision 1.41 > diff -u -p -r1.41 calendar.1 > --- calendar.1 14 Jan 2016 20:08:01 -0000 1.41 > +++ calendar.1 18 Jan 2016 21:47:34 -0000 > @@ -228,6 +228,8 @@ Jewish holidays (should be updated yearl > so that roving holidays are set correctly for the current year). > .It Pa calendar.music > Musical events, births, and deaths (strongly oriented toward rock n' roll). > +.It Pa calendar.nz > +New Zealand calendar. > .It Pa calendar.openbsd > .Ox > related events. > Index: calendars/calendar.all > =================================================================== > RCS file: /cvs/src/usr.bin/calendar/calendars/calendar.all,v > retrieving revision 1.6 > diff -u -p -r1.6 calendar.all > --- calendars/calendar.all 14 Jan 2016 20:08:01 -0000 1.6 > +++ calendars/calendar.all 18 Jan 2016 21:47:34 -0000 > @@ -18,5 +18,6 @@ > #include <calendar.space> > #include <calendar.canada> > #include <calendar.uk> > +#include <calendar.nz> > > #endif /* !_calendar_all_ */ > Index: calendars/calendar.holiday > =================================================================== > RCS file: /cvs/src/usr.bin/calendar/calendars/calendar.holiday,v > retrieving revision 1.34 > diff -u -p -r1.34 calendar.holiday > --- calendars/calendar.holiday 14 Jan 2016 20:08:01 -0000 1.34 > +++ calendars/calendar.holiday 18 Jan 2016 21:47:34 -0000 > @@ -44,7 +44,6 @@ > 02/02 Candlemas > 02/04 Independence Commemoration Day in Sri Lanka > 02/05 Constitution Day in Mexico > -02/06 New Zealand Day > 02/07 Independence Day in Grenada > 02/08 Preseren Day (Cultural Holiday) in Slovenia > 02/09 St. Maron's Day in Lebanon > @@ -137,7 +136,7 @@ > 04/22 Oklahoma Day in Oklahoma > 04/24 Victory Day in Togo > 04/24* Pesach - First Day of Passover - Festival of Freedom > -04/25 Anzac Day in Australia, New Zealand, Tonga, Western Samoa > +04/25* ANZAC Day in Australia, New Zealand, and various other > influenced places > 04/25 Liberation Day in Italy > 04/25 National Flag Day in Swaziland > 04/26 Confederate Memorial Day in Florida & Georgia > @@ -391,7 +390,6 @@ > 10/23 Chulalongkron's Day in Thailand > 10/24 Independence Day in Zambia > 10/24 United Nations Day > -10/25 Labor Day in New Zealand > 10/25 Taiwan Restoration Day in Taiwan > 10/26 Agam Day in Nauru > 10/26 Armed Forces Day in Benin, Rwanda > @@ -488,7 +486,6 @@ > 06/02 Corpus Christi in Paraguay > 06/MonFirst Jefferson Davis's Birthday in Alabama & Mississippi (1st Monday) > 06/MonFirst Jefferson Davis's Birthday in Florida, Georgia, & S. Carolina > -06/04 Queen's Birthday in New Zealand > 06/06 His Majesty, Yang Di-Pertuan Agong's Birthday in Malaysia > 06/11 Queen's Birthday > 06/12 Peace with Bolivia in Paraguay > --- /dev/null Mon Jan 18 21:47:42 2016 > +++ calendars/calendar.nz Mon Jan 18 21:46:43 2016 > @@ -0,0 +1,48 @@ > +/* > + * New Zealand holiday > + * > + * $OpenBSD$ > + */ > + > +#ifndef _calendar_nz_ > +#define _calendar_nz_ > + > +01/01 New Year's Day > +01/02 Day after New Year's Day (public holiday) > +02/06* New Zealand/Waitangi Day (public holiday) > +02/14 Saint Valentine's Day > +04/01 April Fools' Day > +04/SunFirst Daylight Saving Time ends; clocks move back (first Sunday of > April) > +05/SunSecond Mother's Day (2nd Sunday in May) > +06/MonFirst Queen's Birthday (public holiday, ski season begins) > +09/SunFirst Father's Day (1st Sunday of September) > +09/26 Dominion Day > +09/SunLast Daylight Saving Time starts; clocks move forward (last Sunday > in September) > +10/MonFourth Labour Day (public holiday) > +10/31 Halloween > +11/05 Guy Fawkes' Night > +12/25 Christmas Day > +12/26 Boxing Day > +12/31 New Year's Eve > + > +/* Provincial anniversary days */ > +01/22* Wellington Anniversary Day > +01/29* Auckland and Northland Anniversary Days > +02/01* Nelson Anniversary Day > +03/23* Otago Anniversary Day > +03/MonSecond New Plymouth Anniversary Day > +Easter+2 Southland Anniversary Day > +09/MonFourth South Canterbury Anniversary Day > +09/FriThird Hawke's Bay Anniversary Day > +11/01* Marlborough Anniversary Day > +11/30* Chatham Islands Anniversary Day > +12/01* Westland Anniversary Day > +12/16* South Canterbury Anniversary Day > + > +/* Seasonal days */ > +03/20* Autumnal Equinox > +06/21* Winter Solstice > +09/22* Vernal Equinox > +12/21* Summer Solstice > + > +#endif /* !_calendar_nz_ */ >
