Date: Wed, 28 Oct 2020 21:14:09 +0000 (UTC) From: =?UTF-8?Q?Stefan_E=c3=9fer?= <se@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r553565 - head/deskutils/calendar/files Message-ID: <202010282114.09SLE9sd043303@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: se Date: Wed Oct 28 21:14:08 2020 New Revision: 553565 URL: https://svnweb.freebsd.org/changeset/ports/553565 Log: Update man-page to cover newly introduced features. Added: head/deskutils/calendar/files/patch-calendar.1 (contents, props changed) Added: head/deskutils/calendar/files/patch-calendar.1 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/deskutils/calendar/files/patch-calendar.1 Wed Oct 28 21:14:08 2020 (r553565) @@ -0,0 +1,77 @@ +--- calendar.1.orig 2020-10-18 03:01:26 UTC ++++ calendar.1 +@@ -28,7 +28,7 @@ + .\" @(#)calendar.1 8.1 (Berkeley) 6/29/93 + .\" $FreeBSD$ + .\" +-.Dd September 29, 2020 ++.Dd October 28, 2020 + .Dt CALENDAR 1 + .Os + .Sh NAME +@@ -198,7 +198,13 @@ file is preprocessed by a limited subset of + .Xr cpp 1 + internally, allowing the inclusion of shared files such as + lists of company holidays or meetings. +-This limited subset consists of \fB#include #ifndef #endif\fR and \fB#define\fR. ++This limited subset consists of \fB#include #ifdef #ifndef #else ++#endif\fR and \fB#define\fR. Conditions can be nested, but not check ++for matching begin and end directives is performed. ++Included files are parsed in their own scope. ++They have no read or write access to condition variables defined in ++an outer scope and open conditional blocks are implicitly closed. ++.Pp + If the shared file is not referenced by a full pathname, + .Nm + searches in the current (or home) directory first, and then in the +@@ -245,11 +251,19 @@ A chdir is done into this directory if it exists. + calendar file to use if no calendar file exists in the current directory. + .It Pa ~/.calendar/nomail + do not send mail if this file exists. ++.It Pa /usr/share/calendar ++system wide location of calendar files provided as part of the base system. ++.It Pa /usr/local/share/calendar ++system wide location for calendar files provided by a port or package. + .El + .Pp +-The following default calendar files are provided in +-.Pa /usr/share/calendar : ++The order of precedence in searches for a calendar file is: ++current directory, ~/.calendar, /usr/local/share/calendar, /usr/share/calendar. ++Files of similar names are ignored in lower precedence locations. + .Pp ++The following default calendar files are provided by the ++deskutils/calendar-data port. ++.Pp + .Bl -tag -width calendar.southafrica -compact + .It Pa calendar.all + File which includes all the default files. +@@ -283,8 +297,8 @@ Other holidays, including the not-well-known, obscure, + obscure. + .It Pa calendar.judaic + Jewish holidays. +-The entries for this calendar have been obtained from the port +-deskutils/hebcal. ++The entries for this calendar have been obtained from the ++deskutils/hebcal port. + .It Pa calendar.music + Musical events, births, and deaths. + Strongly oriented toward rock 'n' roll. +@@ -338,11 +352,12 @@ double-check the start and end time of solar and lunar + .Sh BUGS + The + .Nm +-internal cpp does not correctly do #ifndef and will discard the rest +-of the file if a #ifndef is triggered. +-It also has a maximum of 50 include file and/or 100 #defines +-and only recognises #include, #define and +-#ifndef. ++does only recognise the cpp directives #include, #define, #ifdef, ++#ifndef and #else. ++It supports nested conditions, but does not perform any validation ++on the correct use and nesting of conditions. ++#endif without prior #ifdef or #define is ignored and #else outside ++a conditional section skips input lines up to the next #endif. + .Pp + There is no possibility to properly specify the local position + needed for solar and lunar calculations.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202010282114.09SLE9sd043303>