svn commit: r367051 - in head: . usr.bin/calendar usr.bin/calendar/calendars usr.bin/calendar/calendars/de_AT.ISO_8859-15 usr.bin/calendar/calendars/de_DE.ISO8859-1 usr.bin/calendar/calendars/fr_FR...
Warner Losh
imp at FreeBSD.org
Mon Oct 26 03:26:20 UTC 2020
Author: imp
Date: Mon Oct 26 03:26:18 2020
New Revision: 367051
URL: https://svnweb.freebsd.org/changeset/base/367051
Log:
calendar: remove all datafiles except freebsd one
Move all the data files for the calendar(1) program, except
calendar.freebsd to the calendar-data package. When a file
can't be found, and /usr/local/share/calendar doesn't exist
provide a helpful hint to install this package.
Reviewed by: se@
Differential Revision: https://reviews.freebsd.org/D26926
Deleted:
head/usr.bin/calendar/calendars/calendar.all
head/usr.bin/calendar/calendars/calendar.australia
head/usr.bin/calendar/calendars/calendar.birthday
head/usr.bin/calendar/calendars/calendar.brazilian
head/usr.bin/calendar/calendars/calendar.christian
head/usr.bin/calendar/calendars/calendar.computer
head/usr.bin/calendar/calendars/calendar.croatian
head/usr.bin/calendar/calendars/calendar.dutch
head/usr.bin/calendar/calendars/calendar.french
head/usr.bin/calendar/calendars/calendar.german
head/usr.bin/calendar/calendars/calendar.history
head/usr.bin/calendar/calendars/calendar.holiday
head/usr.bin/calendar/calendars/calendar.hungarian
head/usr.bin/calendar/calendars/calendar.judaic
head/usr.bin/calendar/calendars/calendar.lotr
head/usr.bin/calendar/calendars/calendar.music
head/usr.bin/calendar/calendars/calendar.newzealand
head/usr.bin/calendar/calendars/calendar.russian
head/usr.bin/calendar/calendars/calendar.southafrica
head/usr.bin/calendar/calendars/calendar.ukrainian
head/usr.bin/calendar/calendars/calendar.usholiday
head/usr.bin/calendar/calendars/calendar.world
head/usr.bin/calendar/calendars/de_AT.ISO_8859-15/
head/usr.bin/calendar/calendars/de_DE.ISO8859-1/
head/usr.bin/calendar/calendars/fr_FR.ISO8859-1/
head/usr.bin/calendar/calendars/hr_HR.ISO8859-2/
head/usr.bin/calendar/calendars/hu_HU.ISO8859-2/
head/usr.bin/calendar/calendars/pt_BR.ISO8859-1/
head/usr.bin/calendar/calendars/pt_BR.UTF-8/
head/usr.bin/calendar/calendars/ru_RU.KOI8-R/
head/usr.bin/calendar/calendars/ru_RU.UTF-8/
head/usr.bin/calendar/calendars/uk_UA.KOI8-U/
Modified:
head/ObsoleteFiles.inc
head/UPDATING
head/usr.bin/calendar/Makefile
head/usr.bin/calendar/calendar.1
head/usr.bin/calendar/io.c
Modified: head/ObsoleteFiles.inc
==============================================================================
--- head/ObsoleteFiles.inc Mon Oct 26 01:23:14 2020 (r367050)
+++ head/ObsoleteFiles.inc Mon Oct 26 03:26:18 2020 (r367051)
@@ -36,6 +36,72 @@
# xargs -n1 | sort | uniq -d;
# done
+# 20201025: Remove cal data files
+OLD_FILES+=usr/share/calendar/calendar.all
+OLD_FILES+=usr/share/calendar/calendar.australia
+OLD_FILES+=usr/share/calendar/calendar.birthday
+OLD_FILES+=usr/share/calendar/calendar.brazilian
+OLD_FILES+=usr/share/calendar/calendar.christian
+OLD_FILES+=usr/share/calendar/calendar.computer
+OLD_FILES+=usr/share/calendar/calendar.croatian
+OLD_FILES+=usr/share/calendar/calendar.dutch
+OLD_FILES+=usr/share/calendar/calendar.french
+OLD_FILES+=usr/share/calendar/calendar.german
+OLD_FILES+=usr/share/calendar/calendar.history
+OLD_FILES+=usr/share/calendar/calendar.holiday
+OLD_FILES+=usr/share/calendar/calendar.hungarian
+OLD_FILES+=usr/share/calendar/calendar.judaic
+OLD_FILES+=usr/share/calendar/calendar.lotr
+OLD_FILES+=usr/share/calendar/calendar.music
+OLD_FILES+=usr/share/calendar/calendar.newzealand
+OLD_FILES+=usr/share/calendar/calendar.russian
+OLD_FILES+=usr/share/calendar/calendar.southafrica
+OLD_FILES+=usr/share/calendar/calendar.ukrainian
+OLD_FILES+=usr/share/calendar/calendar.usholiday
+OLD_FILES+=usr/share/calendar/calendar.world
+OLD_FILES+=usr/share/calendar/de_AT.ISO_8859-15/calendar.feiertag
+OLD_FILES+=usr/share/calendar/de_DE.ISO8859-1/calendar.all
+OLD_FILES+=usr/share/calendar/de_DE.ISO8859-1/calendar.feiertag
+OLD_FILES+=usr/share/calendar/de_DE.ISO8859-1/calendar.geschichte
+OLD_FILES+=usr/share/calendar/de_DE.ISO8859-1/calendar.kirche
+OLD_FILES+=usr/share/calendar/de_DE.ISO8859-1/calendar.literatur
+OLD_FILES+=usr/share/calendar/de_DE.ISO8859-1/calendar.musik
+OLD_FILES+=usr/share/calendar/de_DE.ISO8859-1/calendar.wissenschaft
+OLD_FILES+=usr/share/calendar/fr_FR.ISO8859-1/calendar.all
+OLD_FILES+=usr/share/calendar/fr_FR.ISO8859-1/calendar.fetes
+OLD_FILES+=usr/share/calendar/fr_FR.ISO8859-1/calendar.french
+OLD_FILES+=usr/share/calendar/fr_FR.ISO8859-1/calendar.jferies
+OLD_FILES+=usr/share/calendar/fr_FR.ISO8859-1/calendar.proverbes
+OLD_FILES+=usr/share/calendar/hr_HR.ISO8859-2/calendar.all
+OLD_FILES+=usr/share/calendar/hr_HR.ISO8859-2/calendar.praznici
+OLD_FILES+=usr/share/calendar/hu_HU.ISO8859-2/calendar.all
+OLD_FILES+=usr/share/calendar/hu_HU.ISO8859-2/calendar.nevnapok
+OLD_FILES+=usr/share/calendar/hu_HU.ISO8859-2/calendar.unnepek
+OLD_FILES+=usr/share/calendar/pt_BR.ISO8859-1/calendar.all
+OLD_FILES+=usr/share/calendar/pt_BR.ISO8859-1/calendar.commemorative
+OLD_FILES+=usr/share/calendar/pt_BR.ISO8859-1/calendar.holidays
+OLD_FILES+=usr/share/calendar/pt_BR.ISO8859-1/calendar.mcommemorative
+OLD_FILES+=usr/share/calendar/pt_BR.UTF-8/calendar.all
+OLD_FILES+=usr/share/calendar/pt_BR.UTF-8/calendar.commemorative
+OLD_FILES+=usr/share/calendar/pt_BR.UTF-8/calendar.holidays
+OLD_FILES+=usr/share/calendar/pt_BR.UTF-8/calendar.mcommemorative
+OLD_FILES+=usr/share/calendar/ru_RU.KOI8-R/calendar.all
+OLD_FILES+=usr/share/calendar/ru_RU.KOI8-R/calendar.common
+OLD_FILES+=usr/share/calendar/ru_RU.KOI8-R/calendar.holiday
+OLD_FILES+=usr/share/calendar/ru_RU.KOI8-R/calendar.military
+OLD_FILES+=usr/share/calendar/ru_RU.KOI8-R/calendar.orthodox
+OLD_FILES+=usr/share/calendar/ru_RU.KOI8-R/calendar.pagan
+OLD_FILES+=usr/share/calendar/ru_RU.UTF-8/calendar.all
+OLD_FILES+=usr/share/calendar/ru_RU.UTF-8/calendar.common
+OLD_FILES+=usr/share/calendar/ru_RU.UTF-8/calendar.holiday
+OLD_FILES+=usr/share/calendar/ru_RU.UTF-8/calendar.military
+OLD_FILES+=usr/share/calendar/ru_RU.UTF-8/calendar.orthodox
+OLD_FILES+=usr/share/calendar/ru_RU.UTF-8/calendar.pagan
+OLD_FILES+=usr/share/calendar/uk_UA.KOI8-U/calendar.all
+OLD_FILES+=usr/share/calendar/uk_UA.KOI8-U/calendar.holiday
+OLD_FILES+=usr/share/calendar/uk_UA.KOI8-U/calendar.misc
+OLD_FILES+=usr/share/calendar/uk_UA.KOI8-U/calendar.orthodox
+
# 20201004: logo files renamed to type-agnostic gfx-*.lua
OLD_FILES+=boot/lua/logo-beastie.lua
OLD_FILES+=boot/lua/logo-beastiebw.lua
Modified: head/UPDATING
==============================================================================
--- head/UPDATING Mon Oct 26 01:23:14 2020 (r367050)
+++ head/UPDATING Mon Oct 26 03:26:18 2020 (r367051)
@@ -26,6 +26,14 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 13.x IS SLOW:
world, or to merely disable the most expensive debugging functionality
at runtime, run "ln -s 'abort:false,junk:false' /etc/malloc.conf".)
+20101026:
+ All the data files for the calendar(1) program, except calendar.freebsd,
+ have been moved to the deskutils/calendar-data port, much like the
+ jewish calendar entries were moved to deskutils/hebcal years ago. After
+ make delete-old-files, you need to install it to retain full
+ functionality. calendar(1) will issue a reminder for files it can't
+ find.
+
20200923:
LINT files are no longer generated. We now include the relevant NOTES
files. Note: This may cause conflicts with updating in some cases.
Modified: head/usr.bin/calendar/Makefile
==============================================================================
--- head/usr.bin/calendar/Makefile Mon Oct 26 01:23:14 2020 (r367050)
+++ head/usr.bin/calendar/Makefile Mon Oct 26 03:26:18 2020 (r367051)
@@ -7,109 +7,14 @@ PROG= calendar
SRCS= calendar.c locale.c events.c dates.c parsedata.c io.c day.c \
ostern.c paskha.c pom.c sunpos.c
LIBADD= m util
-INTER= de_AT.ISO_8859-15 de_DE.ISO8859-1 fr_FR.ISO8859-1 \
- hr_HR.ISO8859-2 hu_HU.ISO8859-2 pt_BR.ISO8859-1 \
- pt_BR.UTF-8 ru_RU.KOI8-R ru_RU.UTF-8 uk_UA.KOI8-U
-DE_LINKS= de_DE.ISO8859-15
-FR_LINKS= fr_FR.ISO8859-15
.if ${MK_ICONV} == "yes"
CFLAGS+= -DWITH_ICONV
.endif
FILESGROUPS+= CALS
-CALS= calendars/calendar.all \
- calendars/calendar.australia \
- calendars/calendar.birthday \
- calendars/calendar.brazilian \
- calendars/calendar.christian \
- calendars/calendar.computer \
- calendars/calendar.croatian \
- calendars/calendar.dutch \
- calendars/calendar.freebsd \
- calendars/calendar.french \
- calendars/calendar.german \
- calendars/calendar.history \
- calendars/calendar.holiday \
- calendars/calendar.hungarian \
- calendars/calendar.judaic \
- calendars/calendar.lotr \
- calendars/calendar.music \
- calendars/calendar.newzealand \
- calendars/calendar.russian \
- calendars/calendar.southafrica \
- calendars/calendar.ukrainian \
- calendars/calendar.usholiday \
- calendars/calendar.world
+CALS= calendars/calendar.freebsd
CALSDIR= ${SHAREDIR}/calendar
-
-CAL_de_AT.ISO_8859-15= calendar.feiertag
-
-CAL_de_DE.ISO8859-1= calendar.all \
- calendar.feiertag \
- calendar.geschichte \
- calendar.kirche \
- calendar.literatur \
- calendar.musik \
- calendar.wissenschaft
-
-CAL_fr_FR.ISO8859-1= calendar.all \
- calendar.fetes \
- calendar.french \
- calendar.jferies \
- calendar.proverbes
-
-CAL_hr_HR.ISO8859-2= calendar.all \
- calendar.praznici
-
-CAL_hu_HU.ISO8859-2= calendar.all \
- calendar.nevnapok \
- calendar.unnepek
-
-CAL_pt_BR.ISO8859-1= calendar.all \
- calendar.commemorative \
- calendar.holidays \
- calendar.mcommemorative
-
-CAL_pt_BR.UTF-8= calendar.all \
- calendar.commemorative \
- calendar.holidays \
- calendar.mcommemorative
-
-CAL_ru_RU.KOI8-R= calendar.all \
- calendar.common \
- calendar.holiday \
- calendar.military \
- calendar.orthodox \
- calendar.pagan
-
-CAL_ru_RU.UTF-8= calendar.all \
- calendar.common \
- calendar.holiday \
- calendar.military \
- calendar.orthodox \
- calendar.pagan
-
-CAL_uk_UA.KOI8-U= calendar.all \
- calendar.holiday \
- calendar.misc \
- calendar.orthodox
-
-.for lang in ${INTER}
-FILESGROUPS+= CALS_${lang}
-CALS_${lang}DIR= ${SHAREDIR}/calendar/${lang}
-.for file in ${CAL_${lang}}
-CALS_${lang}+= ${file:S@^@calendars/${lang}/@}
-.endfor
-.endfor
-
-
-.for link in ${DE_LINKS}
-SYMLINKS+= de_DE.ISO8859-1 ${SHAREDIR}/calendar/${link}
-.endfor
-.for link in ${FR_LINKS}
-SYMLINKS+= fr_FR.ISO8859-1 ${SHAREDIR}/calendar/${link}
-.endfor
HAS_TESTS=
SUBDIR.${MK_TESTS}+= tests
Modified: head/usr.bin/calendar/calendar.1
==============================================================================
--- head/usr.bin/calendar/calendar.1 Mon Oct 26 01:23:14 2020 (r367050)
+++ head/usr.bin/calendar/calendar.1 Mon Oct 26 03:26:18 2020 (r367051)
@@ -28,7 +28,7 @@
.\" @(#)calendar.1 8.1 (Berkeley) 6/29/93
.\" $FreeBSD$
.\"
-.Dd October 23, 2020
+.Dd October 25, 2020
.Dt CALENDAR 1
.Os
.Sh NAME
@@ -255,8 +255,8 @@ The order of precedence in searches for a calendar fil
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 in
-.Pa /usr/share/calendar :
+The following default calendar files are provided by the
+deskutils/calendar-data port.
.Pp
.Bl -tag -width calendar.southafrica -compact
.It Pa calendar.all
@@ -291,8 +291,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.
Modified: head/usr.bin/calendar/io.c
==============================================================================
--- head/usr.bin/calendar/io.c Mon Oct 26 01:23:14 2020 (r367050)
+++ head/usr.bin/calendar/io.c Mon Oct 26 03:26:18 2020 (r367051)
@@ -109,6 +109,8 @@ cal_fopen(const char *file)
FILE *fp;
char *home = getenv("HOME");
unsigned int i;
+ struct stat sb;
+ static bool warned = false;
if (home == NULL || *home == '\0') {
warnx("Cannot get home directory");
@@ -129,6 +131,10 @@ cal_fopen(const char *file)
}
warnx("can't open calendar file \"%s\"", file);
+ if (!warned && stat(_PATH_INCLUDE_LOCAL, &sb) != 0) {
+ warnx("calendar data files now provided by calendar-data pkg.");
+ warned = true;
+ }
return (NULL);
}
More information about the svn-src-all
mailing list