Page MenuHomeFreeBSD
Differential D23581

calendar(1): Updates and corrections for calendar files
ClosedPublic
Actions

Authored by gbe on Feb 8 2020, 11:21 AM.
Tags
None
Referenced Files
Unknown Object (File)
Mon, Apr 21, 4:03 AM
Unknown Object (File)
Sat, Apr 12, 1:38 AM
Unknown Object (File)
Mar 11 2025, 7:56 PM
Unknown Object (File)
Mar 5 2025, 12:11 AM
Unknown Object (File)
Feb 26 2025, 12:52 PM
Unknown Object (File)
Feb 21 2025, 4:02 AM
Unknown Object (File)
Feb 21 2025, 3:42 AM
Unknown Object (File)
Feb 21 2025, 3:09 AM
View All 65 Files
Subscribers
cem
imp

Details

Reviewers
emaste
imp
pfg
cem
gbe
Group Reviewers
manpages
Commits
rS359005: calendar(1): Updates and corrections for some calendar files.
Summary

The calendar(1) files are outdated and sometimes incorrect. I updated
those files by comparing FreeBSDs calendar files across all major BSDs. For the
date corrections I cross-checked wikipedia to see if these corrections are
valid.

PR: 242909, 242918

Test Plan

none, these updates should work as-is.

Diff Detail

Repository
rS FreeBSD src repository - subversion
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

gbe created this revision.Feb 8 2020, 11:21 AM
Harbormaster completed remote builds in B29239: Diff 67975.Feb 8 2020, 11:21 AM
imp accepted this revision.Mar 4 2020, 4:12 PM
imp added a subscriber: imp.

Questions only on two items. Well done! Lincoln's birthday is likely important. Fillmore was in there because he had a funny name, I suspect, and could be omitted if that's not a good enough reason :)

usr.bin/calendar/calendars/calendar.history
18 ↗(On Diff #67975)

why remove Fillmore's birthday?
Can you move it to birthdays?

55 ↗(On Diff #67975)

why remove Lincoln's birthday?
Can you move it to .birthdays?

This revision is now accepted and ready to land.Mar 4 2020, 4:12 PM
cem added a subscriber: cem.Mar 4 2020, 5:09 PM

I appreciate that you spent a lot of time on this, I'm just not sure why it should be shipped by FreeBSD base. Collecting lists of dates is something better suited to online resources like Wikipedia.

imp added a comment.Mar 4 2020, 9:16 PM
In D23581#526581, @cem wrote:

I appreciate that you spent a lot of time on this, I'm just not sure why it should be shipped by FreeBSD base. Collecting lists of dates is something better suited to online resources like Wikipedia.

This is not the forum to litigate that battle.

pfg accepted this revision.Mar 4 2020, 9:20 PM
cem requested changes to this revision.Mar 4 2020, 10:19 PM

I'll just register my token disagreement with the premise and move on.

This revision now requires changes to proceed.Mar 4 2020, 10:19 PM
gbe updated this revision to Diff 69256.Mar 6 2020, 8:36 AM
  • Add back Millard Fillmore birthday
Harbormaster completed remote builds in B29821: Diff 69256.Mar 6 2020, 8:36 AM
gbe marked 2 inline comments as done.Mar 6 2020, 8:38 AM

@imp I added Millard Fillmore birthday to the respective calendar file. Lincoln's birthday was moved from history to the birthday file.

gbe accepted this revision.Mar 9 2020, 9:45 PM

I made the requested changes for @imp and set this differential to accepted because of the acceptance from @imp and @pfg in the first place.

imp accepted this revision.Mar 9 2020, 11:40 PM

If we're keeping this in the tree, then we should land this.

pfg accepted this revision.Mar 10 2020, 3:08 AM

I thought cem would want to do the commit.
I've been a bit sick, but I'll commit it this week if no one else does.

This revision was not accepted when it landed; it landed in state Needs Review.Mar 15 2020, 12:49 AM
Closed by commit rS359005: calendar(1): Updates and corrections for some calendar files. (authored by pfg). · Explain Why
This revision was automatically updated to reflect the committed changes.
pfg added a commit: rS359005: calendar(1): Updates and corrections for some calendar files..

Revision Contents
Changeset List

PathSize
head/
usr.bin/
calendar/
calendars/
291 lines
72 lines
403 lines

Diff 69536

View Options

head/usr.bin/calendar/calendars/calendar.history

Show First 20 Lines • Show All 4,327 Lines • ▼ Show 20 Lines for dir in $$(${ALL-DEPENDS-LIST}); do \
_p=$$(cd $$dir; ${MAKE} -VPKGNAME); \ _p=$$(cd $$dir; ${MAKE} -VPKGNAME); \
if ! $$(${ECHO_CMD} $${_packages} | ${GREP} -q $${_p}); then \ if ! $$(${ECHO_CMD} $${_packages} | ${GREP} -q $${_p}); then \
${ECHO_CMD} $${_p}; \ ${ECHO_CMD} $${_p}; \
fi; \ fi; \
done done
# Install missing dependencies from package # Install missing dependencies from package
install-missing-packages: install-missing-packages:
@_dirs=$$(${MISSING-DEPENDS-LIST}); \ @_dirs=$$(${MISSING-DEPENDS-LIST}); \
if [ -n "$${_dirs}" ]; then \ ${ECHO_CMD} "$${_dirs}" | ${SED} "s%${PORTSDIR}/%%g" | ${SU_CMD} "${XARGS} -o ${PKG_BIN} install -A"
matUnsubmitted
Done
Inline Actions

I would use | ${XARGS} which will take care of that.

mat: I would use `| ${XARGS}` which will take care of that.
0mpAuthorUnsubmitted
Done
Inline Actions

Hmm, sure, although I think that tr is more explicit.

0mp: Hmm, sure, although I think that tr is more explicit.
tobikUnsubmitted
Done
Inline Actions

This should be

${SU_CMD} "${ECHO_CMD} \"$${_dirs}\" | ${SED} 's%${PORTSDIR}/%%g' | ${XARGS} ${PKG_BIN} install -A"

or even better push the su outwards as much as possible

${ECHO_CMD} "$${_dirs}" | ${SED} "s%${PORTSDIR}/%%g" | ${SU_CMD} "${XARGS} ${PKG_BIN} install -A"

tobik: This should be `${SU_CMD} "${ECHO_CMD} \"$${_dirs}\" | ${SED} 's%${PORTSDIR}/%%g' | ${XARGS}…
0mpAuthorUnsubmitted
Done
Inline Actions

We've tried that approach, @tobik.

The problem is that then you cannot have interactive prompts from pkg (stdin is taken by xargs).

0mp: We've tried that approach, @tobik. The problem is that then you cannot have interactive…
tobikUnsubmitted
Done
Inline Actions

I see. Luckily there seems to be an xargs(1) flag for exactly that, -o:

${ECHO_CMD} "$${_dirs}" | ${SED} "s%${PORTSDIR}/%%g" | ${SU_CMD} "${XARGS} -o ${PKG_BIN} install -A"
tobik: I see. Luckily there seems to be an xargs(1) flag for exactly that, `-o`: ``` ${ECHO_CMD}…
0mpAuthorUnsubmitted
Done
Inline Actions

Ha! I didn't know about this one! Thanks.

0mp: Ha! I didn't know about this one! Thanks.
${SU_CMD} "${PKG_BIN} install -A $$(${ECHO_CMD} "$${_dirs}" | ${SED} "s%${PORTSDIR}/%%g")"; \
fi
################################################################ ################################################################
# Everything after here are internal targets and really # Everything after here are internal targets and really
# shouldn't be touched by anybody but the release engineers. # shouldn't be touched by anybody but the release engineers.
################################################################ ################################################################
# This target generates an index entry suitable for aggregation into # This target generates an index entry suitable for aggregation into
# a large index. Format is: # a large index. Format is:
▲ Show 20 Lines • Show All 1,058 Lines • Show Last 20 Lines
View Options

head/usr.bin/calendar/calendars/calendar.birthday

Show First 20 Lines • Show All 4,327 Lines • ▼ Show 20 Lines for dir in $$(${ALL-DEPENDS-LIST}); do \
_p=$$(cd $$dir; ${MAKE} -VPKGNAME); \ _p=$$(cd $$dir; ${MAKE} -VPKGNAME); \
if ! $$(${ECHO_CMD} $${_packages} | ${GREP} -q $${_p}); then \ if ! $$(${ECHO_CMD} $${_packages} | ${GREP} -q $${_p}); then \
${ECHO_CMD} $${_p}; \ ${ECHO_CMD} $${_p}; \
fi; \ fi; \
done done
# Install missing dependencies from package # Install missing dependencies from package
install-missing-packages: install-missing-packages:
@_dirs=$$(${MISSING-DEPENDS-LIST}); \ @_dirs=$$(${MISSING-DEPENDS-LIST}); \
if [ -n "$${_dirs}" ]; then \ ${ECHO_CMD} "$${_dirs}" | ${SED} "s%${PORTSDIR}/%%g" | ${SU_CMD} "${XARGS} -o ${PKG_BIN} install -A"
matUnsubmitted
Done
Inline Actions

I would use | ${XARGS} which will take care of that.

mat: I would use `| ${XARGS}` which will take care of that.
0mpAuthorUnsubmitted
Done
Inline Actions

Hmm, sure, although I think that tr is more explicit.

0mp: Hmm, sure, although I think that tr is more explicit.
tobikUnsubmitted
Done
Inline Actions

This should be

${SU_CMD} "${ECHO_CMD} \"$${_dirs}\" | ${SED} 's%${PORTSDIR}/%%g' | ${XARGS} ${PKG_BIN} install -A"

or even better push the su outwards as much as possible

${ECHO_CMD} "$${_dirs}" | ${SED} "s%${PORTSDIR}/%%g" | ${SU_CMD} "${XARGS} ${PKG_BIN} install -A"

tobik: This should be `${SU_CMD} "${ECHO_CMD} \"$${_dirs}\" | ${SED} 's%${PORTSDIR}/%%g' | ${XARGS}…
0mpAuthorUnsubmitted
Done
Inline Actions

We've tried that approach, @tobik.

The problem is that then you cannot have interactive prompts from pkg (stdin is taken by xargs).

0mp: We've tried that approach, @tobik. The problem is that then you cannot have interactive…
tobikUnsubmitted
Done
Inline Actions

I see. Luckily there seems to be an xargs(1) flag for exactly that, -o:

${ECHO_CMD} "$${_dirs}" | ${SED} "s%${PORTSDIR}/%%g" | ${SU_CMD} "${XARGS} -o ${PKG_BIN} install -A"
tobik: I see. Luckily there seems to be an xargs(1) flag for exactly that, `-o`: ``` ${ECHO_CMD}…
0mpAuthorUnsubmitted
Done
Inline Actions

Ha! I didn't know about this one! Thanks.

0mp: Ha! I didn't know about this one! Thanks.
${SU_CMD} "${PKG_BIN} install -A $$(${ECHO_CMD} "$${_dirs}" | ${SED} "s%${PORTSDIR}/%%g")"; \
fi
################################################################ ################################################################
# Everything after here are internal targets and really # Everything after here are internal targets and really
# shouldn't be touched by anybody but the release engineers. # shouldn't be touched by anybody but the release engineers.
################################################################ ################################################################
# This target generates an index entry suitable for aggregation into # This target generates an index entry suitable for aggregation into
# a large index. Format is: # a large index. Format is:
▲ Show 20 Lines • Show All 1,058 Lines • Show Last 20 Lines
View Options

head/usr.bin/calendar/calendars/calendar.music

Show First 20 Lines • Show All 4,327 Lines • ▼ Show 20 Lines for dir in $$(${ALL-DEPENDS-LIST}); do \
_p=$$(cd $$dir; ${MAKE} -VPKGNAME); \ _p=$$(cd $$dir; ${MAKE} -VPKGNAME); \
if ! $$(${ECHO_CMD} $${_packages} | ${GREP} -q $${_p}); then \ if ! $$(${ECHO_CMD} $${_packages} | ${GREP} -q $${_p}); then \
${ECHO_CMD} $${_p}; \ ${ECHO_CMD} $${_p}; \
fi; \ fi; \
done done
# Install missing dependencies from package # Install missing dependencies from package
install-missing-packages: install-missing-packages:
@_dirs=$$(${MISSING-DEPENDS-LIST}); \ @_dirs=$$(${MISSING-DEPENDS-LIST}); \
if [ -n "$${_dirs}" ]; then \ ${ECHO_CMD} "$${_dirs}" | ${SED} "s%${PORTSDIR}/%%g" | ${SU_CMD} "${XARGS} -o ${PKG_BIN} install -A"
matUnsubmitted
Done
Inline Actions

I would use | ${XARGS} which will take care of that.

mat: I would use `| ${XARGS}` which will take care of that.
0mpAuthorUnsubmitted
Done
Inline Actions

Hmm, sure, although I think that tr is more explicit.

0mp: Hmm, sure, although I think that tr is more explicit.
tobikUnsubmitted
Done
Inline Actions

This should be

${SU_CMD} "${ECHO_CMD} \"$${_dirs}\" | ${SED} 's%${PORTSDIR}/%%g' | ${XARGS} ${PKG_BIN} install -A"

or even better push the su outwards as much as possible

${ECHO_CMD} "$${_dirs}" | ${SED} "s%${PORTSDIR}/%%g" | ${SU_CMD} "${XARGS} ${PKG_BIN} install -A"

tobik: This should be `${SU_CMD} "${ECHO_CMD} \"$${_dirs}\" | ${SED} 's%${PORTSDIR}/%%g' | ${XARGS}…
0mpAuthorUnsubmitted
Done
Inline Actions

We've tried that approach, @tobik.

The problem is that then you cannot have interactive prompts from pkg (stdin is taken by xargs).

0mp: We've tried that approach, @tobik. The problem is that then you cannot have interactive…
tobikUnsubmitted
Done
Inline Actions

I see. Luckily there seems to be an xargs(1) flag for exactly that, -o:

${ECHO_CMD} "$${_dirs}" | ${SED} "s%${PORTSDIR}/%%g" | ${SU_CMD} "${XARGS} -o ${PKG_BIN} install -A"
tobik: I see. Luckily there seems to be an xargs(1) flag for exactly that, `-o`: ``` ${ECHO_CMD}…
0mpAuthorUnsubmitted
Done
Inline Actions

Ha! I didn't know about this one! Thanks.

0mp: Ha! I didn't know about this one! Thanks.
${SU_CMD} "${PKG_BIN} install -A $$(${ECHO_CMD} "$${_dirs}" | ${SED} "s%${PORTSDIR}/%%g")"; \
fi
################################################################ ################################################################
# Everything after here are internal targets and really # Everything after here are internal targets and really
# shouldn't be touched by anybody but the release engineers. # shouldn't be touched by anybody but the release engineers.
################################################################ ################################################################
# This target generates an index entry suitable for aggregation into # This target generates an index entry suitable for aggregation into
# a large index. Format is: # a large index. Format is:
▲ Show 20 Lines • Show All 1,058 Lines • Show Last 20 Lines