add a calendar file for the uk;

this is the work of craig skinner - many thanks, craig.
i've tweaked it a bit. craig has also fixed a currently
incorrect date and moved a couple entries to the uk file/

some outstanding issues (what to do with dups) but it'll be
eaiser to work on once in tree

4 files changed, 52 insertions, 6 deletions

diff --git a/usr.bin/calendar/calendar.1 b/usr.bin/calendar/calendar.1
index b795f4c65bf..d891b61672b 100644
--- a/usr.bin/calendar/calendar.1
+++ b/usr.bin/calendar/calendar.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: calendar.1,v 1.40 2015/12/07 18:46:35 espie Exp $
+.\"	$OpenBSD: calendar.1,v 1.41 2016/01/14 20:08:01 jmc Exp $
 .\"
 .\" Copyright (c) 1989, 1990, 1993
 .\"     The Regents of the University of California.  All rights reserved.
@@ -29,7 +29,7 @@
 .\"
 .\"     @(#)calendar.1  8.1 (Berkeley) 6/29/93
 .\"
-.Dd $Mdocdate: December 7 2015 $
+.Dd $Mdocdate: January 14 2016 $
 .Dt CALENDAR 1
 .Os
 .Sh NAME
@@ -237,6 +237,8 @@ Pagan holidays, celebrations and festivals.
 Russian calendar.
 .It Pa calendar.space
 Cosmic history.
+.It Pa calendar.uk
+UK calendar.
 .It Pa calendar.ushistory
 U.S. history.
 .It Pa calendar.usholiday
diff --git a/usr.bin/calendar/calendars/calendar.all b/usr.bin/calendar/calendars/calendar.all
index 172357dfe7a..8a1fb3a7c00 100644
--- a/usr.bin/calendar/calendars/calendar.all
+++ b/usr.bin/calendar/calendars/calendar.all
@@ -1,7 +1,7 @@
 /*
  * International and national calendar files
  *
- * $OpenBSD: calendar.all,v 1.5 2013/03/15 08:37:10 jmc Exp $
+ * $OpenBSD: calendar.all,v 1.6 2016/01/14 20:08:01 jmc Exp $
  */
 
 #ifndef _calendar_all_
@@ -17,5 +17,6 @@
 #include <calendar.ushistory>
 #include <calendar.space>
 #include <calendar.canada>
+#include <calendar.uk>
 
 #endif /* !_calendar_all_ */
diff --git a/usr.bin/calendar/calendars/calendar.holiday b/usr.bin/calendar/calendars/calendar.holiday
index 224b33c1463..a9bd4418a9d 100644
--- a/usr.bin/calendar/calendars/calendar.holiday
+++ b/usr.bin/calendar/calendars/calendar.holiday
@@ -1,7 +1,7 @@
 /*
  * Holiday
  *
- * $OpenBSD: calendar.holiday,v 1.33 2016/01/05 08:28:02 jmc Exp $
+ * $OpenBSD: calendar.holiday,v 1.34 2016/01/14 20:08:01 jmc Exp $
  */
 
 #ifndef _calendar_holiday_
@@ -284,7 +284,6 @@
 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
 08/06	Bank Holiday in Australia, British Columbia, Fiji, Iceland, Ireland,
 	Ontario
 08/06	Emancipation Day in Bahamas
@@ -434,7 +433,7 @@
 11/30	Independence Day in Barbados, People's Democratic Yemen Republic
 11/30	National Day in Benin
 11/30	National Heroes Day in Philippines
-11/30	St. Andrew's Day
+11/30	Saint Andrew's Day (also a bank holiday in Scotland)
 12/01	Independence Day in Central African Republic
 12/01	World AIDS Day
 12/01	National Day in Romania
diff --git a/usr.bin/calendar/calendars/calendar.uk b/usr.bin/calendar/calendars/calendar.uk
new file mode 100644
index 00000000000..4a362950259
--- /dev/null
+++ b/usr.bin/calendar/calendars/calendar.uk
@@ -0,0 +1,44 @@
+/*
+ * United Kingdom (UK) calendar
+ *
+ * $OpenBSD: calendar.uk,v 1.1 2016/01/14 20:08:01 jmc Exp $
+ */
+
+#ifndef _calendar_uk_
+#define _calendar_uk_
+
+01/01	New Year's Day
+01/02	Bank holiday in Scotland
+01/25	Burns' Night in Scotland
+02/14	Saint Valentine's Day
+03/01	Saint David's Day in Wales
+03/17	Saint Patrick's Day (also a bank holiday across Ireland)
+03/20*	Vernal Equinox
+03/SunLast	Daylight Saving Time begins; clocks move forward (last Sunday of March)
+04/01	April Fools' Day
+04/23	Saint George's Day in England
+Easter-21	Mothering Sunday (Sunday 3 weeks before Easter Sunday)
+Easter-2	Good Friday (bank holiday)
+Easter+1	Easter Monday (bank holiday - except Scotland)
+05/MonFirst	Early May bank holiday
+05/MonThird*	Victoria Day in Scotland (Monday on or immediately before 24th May)
+05/MonLast	Spring Bank Holiday
+06/SunThird	Father's Day (3rd Sunday of June)
+06/21*	Summer Solstice
+07/11	Eleventh Night in Northern Ireland
+07/12	Battle of the Boyne/Orangemen's Day/The Twelfth - a bank holiday in Northern Ireland
+08/MonFirst	Summer bank holiday in Scotland
+08/MonLast	Summer bank holiday in England, Wales and Northern Ireland
+09/22*	Autumnal Equinox
+10/SunLast	Daylight Saving Time ends; clocks move back (last Sunday in October)
+10/31	Halloween
+11/05	Guy Fawkes Night
+11/11	Remembrance Day
+11/SunSecond	Remembrance Sunday
+12/21*	Winter Solstice
+12/24	Christmas Eve
+12/25	Christmas Day
+12/26	Boxing Day
+12/31	Hogmanay/New Year's Eve
+
+#endif /* !_calendar_uk_ */