svn commit: r358561 - in head: . share/man/man5 share/man/man7 tools/build/options tools/tools/nanobsd/dhcpd tools/tools/nanobsd/embedded usr.bin usr.bin/calendar usr.bin/calendar/calendars usr.bin...

Tue Mar 3 03:38:39 UTC 2020

On 02/03/2020 18:37, Conrad Meyer wrote:
> Author: cem
> Date: Mon Mar  2 23:37:47 2020
> New Revision: 358561
> URL: https://svnweb.freebsd.org/changeset/base/358561
>
> Log:
>    Fix typo in r278616
>    
>    FreeBSD isn't an encyclopedia.

Wow, that was weird ... thank you for reverting.

Pedro.

> Deleted:
>    head/tools/build/options/WITHOUT_CALENDAR
>    head/usr.bin/calendar/Makefile
>    head/usr.bin/calendar/Makefile.depend
>    head/usr.bin/calendar/calendar.1
>    head/usr.bin/calendar/calendar.c
>    head/usr.bin/calendar/calendar.h
>    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/
>    head/usr.bin/calendar/dates.c
>    head/usr.bin/calendar/day.c
>    head/usr.bin/calendar/events.c
>    head/usr.bin/calendar/io.c
>    head/usr.bin/calendar/locale.c
>    head/usr.bin/calendar/ostern.c
>    head/usr.bin/calendar/parsedata.c
>    head/usr.bin/calendar/paskha.c
>    head/usr.bin/calendar/pathnames.h
>    head/usr.bin/calendar/pom.c
>    head/usr.bin/calendar/sunpos.c
>    head/usr.bin/calendar/tests/
>    head/usr.sbin/periodic/etc/daily/300.calendar
> Modified:
>    head/ObsoleteFiles.inc
>    head/share/man/man5/periodic.conf.5
>    head/share/man/man5/src.conf.5
>    head/share/man/man7/hier.7
>    head/tools/tools/nanobsd/dhcpd/common
>    head/tools/tools/nanobsd/embedded/common
>    head/usr.bin/Makefile
>    head/usr.bin/leave/leave.1
>    head/usr.sbin/periodic/etc/daily/Makefile
>    head/usr.sbin/periodic/periodic.conf
>
> Modified: head/ObsoleteFiles.inc
> ==============================================================================
> --- head/ObsoleteFiles.inc	Mon Mar  2 23:25:02 2020	(r358560)
> +++ head/ObsoleteFiles.inc	Mon Mar  2 23:37:47 2020	(r358561)
> @@ -36,6 +36,11 @@
>   #   xargs -n1 | sort | uniq -d;
>   # done
>   
> +# 20200302: calendar(1) removed
> +OLD_DIRS+=usr/share/calendar
> +OLD_FILES+=usr/bin/calendar
> +OLD_FILES+=usr/share/man/man1/calendar.1.gz
> +
>   # 20200301: bktr removed
>   OLD_DIRS+=usr/include/dev/bktr
>   OLD_FILES+=usr/include/dev/bktr/ioctl_bktr.h
>
> Modified: head/share/man/man5/periodic.conf.5
> ==============================================================================
> --- head/share/man/man5/periodic.conf.5	Mon Mar  2 23:25:02 2020	(r358560)
> +++ head/share/man/man5/periodic.conf.5	Mon Mar  2 23:37:47 2020	(r358561)
> @@ -273,13 +273,6 @@ Set to
>   if you want the
>   .Pa /etc/mail/aliases
>   file backed up and modifications to be displayed in your daily output.
> -.It Va daily_calendar_enable
> -.Pq Vt bool
> -Set to
> -.Dq Li YES
> -if you want to run
> -.Nm calendar Fl a
> -daily.
>   .It Va daily_accounting_enable
>   .Pq Vt bool
>   Set to
> @@ -970,7 +963,6 @@ is shared or distributed.
>   .El
>   .Sh SEE ALSO
>   .Xr apropos 1 ,
> -.Xr calendar 1 ,
>   .Xr df 1 ,
>   .Xr diff 1 ,
>   .Xr gzip 1 ,
>
> Modified: head/share/man/man5/src.conf.5
> ==============================================================================
> --- head/share/man/man5/src.conf.5	Mon Mar  2 23:25:02 2020	(r358560)
> +++ head/share/man/man5/src.conf.5	Mon Mar  2 23:37:47 2020	(r358561)
> @@ -271,9 +271,6 @@ is set explicitly)
>   .El
>   .It Va WITHOUT_BZIP2_SUPPORT
>   Set to build some programs without optional bzip2 support.
> -.It Va WITHOUT_CALENDAR
> -Set to not build
> -.Xr calendar 1 .
>   .It Va WITHOUT_CAPSICUM
>   Set to not build Capsicum support into system programs.
>   When set, it enforces these options:
>
> Modified: head/share/man/man7/hier.7
> ==============================================================================
> --- head/share/man/man7/hier.7	Mon Mar  2 23:25:02 2020	(r358560)
> +++ head/share/man/man7/hier.7	Mon Mar  2 23:37:47 2020	(r358561)
> @@ -442,10 +442,6 @@ system daemons & system utilities (executed by users)
>   architecture-independent files
>   .Pp
>   .Bl -tag -width Fl -compact
> -.It Pa calendar/
> -a variety of pre-fab calendar files;
> -see
> -.Xr calendar 1
>   .It Pa dict/
>   word lists;
>   see
>
> Modified: head/tools/tools/nanobsd/dhcpd/common
> ==============================================================================
> --- head/tools/tools/nanobsd/dhcpd/common	Mon Mar  2 23:25:02 2020	(r358560)
> +++ head/tools/tools/nanobsd/dhcpd/common	Mon Mar  2 23:37:47 2020	(r358561)
> @@ -104,7 +104,6 @@ WITHOUT_ACPI=true
>   WITHOUT_ATM=true
>   WITHOUT_AUDIT=true
>   WITHOUT_BLUETOOTH=true
> -WITHOUT_CALENDAR=true
>   WITHOUT_DICT=true
>   WITHOUT_EXAMPLES=true
>   WITHOUT_GAMES=true
>
> Modified: head/tools/tools/nanobsd/embedded/common
> ==============================================================================
> --- head/tools/tools/nanobsd/embedded/common	Mon Mar  2 23:25:02 2020	(r358560)
> +++ head/tools/tools/nanobsd/embedded/common	Mon Mar  2 23:37:47 2020	(r358561)
> @@ -135,7 +135,6 @@ WITHOUT_ACPI=true
>   WITHOUT_ATM=true
>   WITHOUT_AUDIT=true
>   WITHOUT_BLUETOOTH=true
> -WITHOUT_CALENDAR=true
>   WITHOUT_DICT=true
>   WITHOUT_EXAMPLES=true
>   WITHOUT_GAMES=true
>
> Modified: head/usr.bin/Makefile
> ==============================================================================
> --- head/usr.bin/Makefile	Mon Mar  2 23:25:02 2020	(r358560)
> +++ head/usr.bin/Makefile	Mon Mar  2 23:37:47 2020	(r358561)
> @@ -195,7 +195,6 @@ SUBDIR.${MK_AT}+=	at
>   SUBDIR.${MK_ATM}+=	atm
>   SUBDIR.${MK_BLUETOOTH}+=	bluetooth
>   SUBDIR.${MK_BSD_CPIO}+=	cpio
> -SUBDIR.${MK_CALENDAR}+=	calendar
>   SUBDIR.${MK_CLANG}+=	clang
>   SUBDIR.${MK_DIALOG}+=	dpv
>   SUBDIR.${MK_EE}+=	ee
>
> Modified: head/usr.bin/leave/leave.1
> ==============================================================================
> --- head/usr.bin/leave/leave.1	Mon Mar  2 23:25:02 2020	(r358560)
> +++ head/usr.bin/leave/leave.1	Mon Mar  2 23:37:47 2020	(r358561)
> @@ -87,8 +87,6 @@ To get rid of
>   you should either log off or use
>   .Ql kill \-s KILL
>   giving its process id.
> -.Sh SEE ALSO
> -.Xr calendar 1
>   .Sh HISTORY
>   The
>   .Nm
>
> Modified: head/usr.sbin/periodic/etc/daily/Makefile
> ==============================================================================
> --- head/usr.sbin/periodic/etc/daily/Makefile	Mon Mar  2 23:25:02 2020	(r358560)
> +++ head/usr.sbin/periodic/etc/daily/Makefile	Mon Mar  2 23:37:47 2020	(r358561)
> @@ -33,10 +33,6 @@ ACCTMODE=	${BINMODE}
>   ACCTPACKAGE=	acct
>   .endif
>   
> -.if ${MK_CALENDAR} != "no"
> -CONFS+=	300.calendar
> -.endif
> -
>   .if ${MK_MAIL} != "no"
>   CONFS+=	130.clean-msgs
>   .endif
>
> Modified: head/usr.sbin/periodic/periodic.conf
> ==============================================================================
> --- head/usr.sbin/periodic/periodic.conf	Mon Mar  2 23:25:02 2020	(r358560)
> +++ head/usr.sbin/periodic/periodic.conf	Mon Mar  2 23:37:47 2020	(r358561)
> @@ -77,9 +77,6 @@ daily_backup_passwd_enable="YES"			# Backup passwd & g
>   # 210.backup-aliases
>   daily_backup_aliases_enable="YES"			# Backup mail aliases
>   
> -# 300.calendar
> -daily_calendar_enable="NO"				# Run calendar -a
> -
>   # 310.accounting
>   daily_accounting_enable="YES"				# Rotate acct files
>   daily_accounting_compress="NO"				# Gzip rotated files