summaryrefslogtreecommitdiffstats
path: root/usr.bin
diff options
context:
space:
mode:
authordwmalone <dwmalone@FreeBSD.org>2002-04-28 23:22:13 +0000
committerdwmalone <dwmalone@FreeBSD.org>2002-04-28 23:22:13 +0000
commit4af9569b92b7f2a591fbfe889cb6e42f76ce07e6 (patch)
tree48ba51d2bafdc2d31a5a61f1b087906c2e4c948e /usr.bin
parent50524fd0df75e3fa875c2099f09e84259b5c28c1 (diff)
downloadFreeBSD-src-4af9569b92b7f2a591fbfe889cb6e42f76ce07e6.zip
FreeBSD-src-4af9569b92b7f2a591fbfe889cb6e42f76ce07e6.tar.gz
Add a French calendar.
PR: 32265 Submitted by: Thierry Thomas <thierry@pompo.net> MFC after: 1 week
Diffstat (limited to 'usr.bin')
-rw-r--r--usr.bin/calendar/Makefile3
-rw-r--r--usr.bin/calendar/calendar.12
-rw-r--r--usr.bin/calendar/calendars/calendar.all5
-rw-r--r--usr.bin/calendar/calendars/calendar.french12
4 files changed, 19 insertions, 3 deletions
diff --git a/usr.bin/calendar/Makefile b/usr.bin/calendar/Makefile
index 588b37d..638eb88 100644
--- a/usr.bin/calendar/Makefile
+++ b/usr.bin/calendar/Makefile
@@ -3,7 +3,8 @@
PROG= calendar
SRCS= calendar.c io.c day.c ostern.c paskha.c
-INTER= de_DE.ISO8859-1 hr_HR.ISO8859-2 ru_RU.KOI8-R
+NO_WERROR= yes
+INTER= de_DE.ISO8859-1 fr_FR.ISO_8859-1 hr_HR.ISO8859-2 ru_RU.KOI8-R
DE_LINKS= de_DE.ISO_8859-1 de_DE.ISO8859-15 de_DE.ISO_8859-15
HR_LINKS= hr_HR.ISO_8859-2
TEXTMODE?= 444
diff --git a/usr.bin/calendar/calendar.1 b/usr.bin/calendar/calendar.1
index df618e4..ade4f0f 100644
--- a/usr.bin/calendar/calendar.1
+++ b/usr.bin/calendar/calendar.1
@@ -208,6 +208,8 @@ Strongly oriented toward rock 'n' roll.
U.S. holidays.
This calendar should be updated yearly by the local system administrator
so that roving holidays are set correctly for the current year.
+.It Pa calendar.french
+French calendar.
.It Pa calendar.german
German calendar.
.It Pa calendar.russian
diff --git a/usr.bin/calendar/calendars/calendar.all b/usr.bin/calendar/calendars/calendar.all
index 652829e..9836ade 100644
--- a/usr.bin/calendar/calendars/calendar.all
+++ b/usr.bin/calendar/calendars/calendar.all
@@ -8,9 +8,10 @@
#define _calendar_all_
#include <calendar.world>
-#include <calendar.german>
-#include <calendar.usholiday>
#include <calendar.croatian>
+#include <calendar.french>
+#include <calendar.german>
#include <calendar.russian>
+#include <calendar.usholiday>
#endif /* !_calendar_all_ */
diff --git a/usr.bin/calendar/calendars/calendar.french b/usr.bin/calendar/calendars/calendar.french
new file mode 100644
index 0000000..e1c862d
--- /dev/null
+++ b/usr.bin/calendar/calendars/calendar.french
@@ -0,0 +1,12 @@
+/*
+ * French calendar file(s)
+ *
+ * $FreeBSD$
+ */
+
+#ifndef _calendar_french_
+#define _calendar_french_
+
+#include <fr_FR.ISO_8859-1/calendar.all>
+
+#endif /* !_calendar_french_ */
OpenPOWER on IntegriCloud