From 1f93b1027c4be9f27f3a4b8dabb2ae3132e1cb6a Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Tue, 7 Jul 2020 23:13:10 +0200 Subject: cvs update --- src/usr.bin/calendar/calendars/calendar.birthday | 12 ++++++------ src/usr.bin/calendar/calendars/calendar.fictional | 4 ++-- src/usr.bin/calendar/calendars/calendar.history | 14 +++++++------- src/usr.bin/calendar/calendars/calendar.music | 8 +++++--- src/usr.bin/what/what.c | 4 ++-- 5 files changed, 22 insertions(+), 20 deletions(-) diff --git a/src/usr.bin/calendar/calendars/calendar.birthday b/src/usr.bin/calendar/calendars/calendar.birthday index 1ce3f7b..58d2d1a 100644 --- a/src/usr.bin/calendar/calendars/calendar.birthday +++ b/src/usr.bin/calendar/calendars/calendar.birthday @@ -1,7 +1,7 @@ /* * Birthday * - * $OpenBSD: calendar.birthday,v 1.65 2020/04/13 13:28:26 jmc Exp $ + * $OpenBSD: calendar.birthday,v 1.66 2020/04/19 21:08:39 jmc Exp $ */ #ifndef _calendar_birthday_ @@ -99,7 +99,7 @@ 03/05 Joseph Stalin dies in Moscow, 1953 03/05 John Belushi dies in Los Angeles, 1982 03/06 Michelangelo Buonarroti born in Caprese, Italy, 1475 -03/07 Aristotle died, 322BC +03/07 Aristotle died, 322 BC 03/07 Sir John Frederick William Herschel born, 1792, astronomer 03/08 Alvan Clark born, 1804, astronomer & lens manufacturer 03/09 Howard Aiken born, 1900 @@ -113,7 +113,7 @@ 03/14 Giovanni Virginio Schiaparelli born, 1835, astronomer; named Mars "canals" 03/14 Karl Marx died, 1883 -03/15 Julius Caesar assassinated by Brutus; Ides of March, 44BC +03/15 Julius Caesar assassinated by Brutus; Ides of March, 44 BC 03/15 J.J. Robert's Birthday in Liberia 03/16 George Clymer born, 1739 03/16 James Madison born, 1751 @@ -178,7 +178,7 @@ 05/13 Arthur S. Sullivan born, 1842 05/15 Mike Oldfield is born in Essex, England, 1953 05/19 Ho Chi Minh born, 1890 -05/21 Plato (Aristocles) born in Athens(?), 427BC +05/21 Plato (Aristocles) born in Athens(?), 427 BC 05/24 Robert A. Moog born in New York City, 1934 05/27 Hubert H. Humphrey born, 1911 05/28 Dionne quintuplets born, 1934 @@ -280,7 +280,7 @@ 09/26 Johnny Appleseed born, 1774 09/26 T.S. (Thomas Stearns) Eliot born in St. Louis, 1888 09/27 Thomas Nast born, 1840 -09/28 Pompey (Gnaeus Pompeius Magnus) born in Rome, 106BC +09/28 Pompey (Gnaeus Pompeius Magnus) born in Rome, 106 BC 09/28 Seymour Cray born, 1925 09/29 Gene Autry born, 1907 10/01 Jimmy Carter born, 1924 @@ -339,7 +339,7 @@ 12/04 Tommy Bolin dies of a heroin overdose in Miami, 1976 12/05 Walt (Walter Elias) Disney born in Chicago, 1901 12/06 Samich Laus brewing -12/08 Horace (Quintus Horatius Flaccus) born in Venosa (Italy), 65BC +12/08 Horace (Quintus Horatius Flaccus) born in Venosa (Italy), 65 BC 12/08 James (Grover) Thurber born in Columbus, Ohio, 1894 12/10 Emily Dickinson born, 1830 12/10 Joe Ossanna born, 1928 diff --git a/src/usr.bin/calendar/calendars/calendar.fictional b/src/usr.bin/calendar/calendars/calendar.fictional index 5e28a3b..c19f3a8 100644 --- a/src/usr.bin/calendar/calendars/calendar.fictional +++ b/src/usr.bin/calendar/calendars/calendar.fictional @@ -1,7 +1,7 @@ /* * Fictional events * - * $OpenBSD: calendar.fictional,v 1.4 2007/06/10 17:34:04 simon Exp $ + * $OpenBSD: calendar.fictional,v 1.5 2020/04/19 21:08:39 jmc Exp $ */ #ifndef _calendar_fictional_ @@ -52,6 +52,6 @@ 05/25 Oral Roberts sees 900 foot tall Jesus Christ, Tulsa OK, 1980 /* Not really a fictional event, just a fictional time */ 05/08 Beginning of ostrich mating season -10/23 Earth created at 6:30 AM, 4004BC. +10/23 Earth created at 6:30 AM, 4004 BC. #endif /* !_calendar_fictional_ */ diff --git a/src/usr.bin/calendar/calendars/calendar.history b/src/usr.bin/calendar/calendars/calendar.history index a91bc9a..131ee68 100644 --- a/src/usr.bin/calendar/calendars/calendar.history +++ b/src/usr.bin/calendar/calendars/calendar.history @@ -1,7 +1,7 @@ /* * History * - * $OpenBSD: calendar.history,v 1.81 2019/01/30 07:24:53 bentley Exp $ + * $OpenBSD: calendar.history,v 1.82 2020/04/19 21:08:39 jmc Exp $ */ #ifndef _calendar_history_ @@ -105,7 +105,7 @@ 03/14 The kingdom of Cyprus is sold by the ruling Queen to Venice, 1489 03/15 France assumes protectorate over Vietnam, 1874 03/15 Julius Caesar, Dictator of the Roman Republic, is stabbed to death by - several senators, 44BC + several senators, 44 BC 03/16 Largest coordinated worldwide vigil against the Iraq War, 2003 03/17 Invention of the rubber band, 1845 03/17 Ukrainian Nationalist Republic declared, 1917 @@ -145,14 +145,14 @@ 04/19 Landing of the "33" in Uruguay 04/19 Warsaw Ghetto uprising, 1943 04/20 In Bulgaria, the April Uprising takes place, 1876 -04/21 Rome is founded by Romulus and Remus, 753BC +04/21 Rome is founded by Romulus and Remus, 753 BC 04/22 Portuguese navigator Pedro Alvares Cabral becomes the first European to sight Brazil, 1500 04/22 The first Earth Day is celebrated, 1970 04/23 Bavarian co-rulers Duke Wilhelm IV and Duke Ludwig X proclaimed the weighty and consequential Bavarian Beer Purity Law (later Reinheitsgebot), 1516 -04/24 The Greek enter Troy with the Trojan Horse, 1184BC +04/24 The Greek enter Troy with the Trojan Horse, 1184 BC 04/25 Integrated circuit patented by Robert Noyce, 1961 04/26 William Shakespeare baptized in Stratford-on-Avon, England, 1564, birthdate less certain @@ -211,7 +211,7 @@ 06/08 The Canadian Parliament meets for the first time in Ottawa, 1866 06/09 The Roman Emperor Nero commits suicide, 68 06/11 Death of Alexander the Great, 323 BC -06/11 Greeks seize Troy, 1184BC +06/11 Greeks seize Troy, 1184 BC 06/12 Nelson Mandela is sentenced to life in prison, 1964 06/13 Much of Vancouver, British Columbia, is devastated by a fire, 1886 06/14 Sandpaper invented by I. Fischer, Jr., 1834 @@ -298,7 +298,7 @@ Scotland Yard, 2006 08/11 Dog days end 08/11 France Ends War in Indochina, 1954 -08/12 Cleopatra commits suicide, 30BC +08/12 Cleopatra commits suicide, 30 BC 08/13 Berlin wall erected, 1961 08/13 Li'l Abner debut, 1934 08/14 France introduces motor vehicle registration, 1893 @@ -366,7 +366,7 @@ 09/27 The first passenger was hauled in a locomotive in England, 1825 09/28 "Pilgrim's Progress" published, 1678 09/28 A Greek soldier runs 26+ miles after the Persian defeat at Marathon, - 490BC + 490 BC 09/30 Red Jack kills 2, Elizabeth Stride (#3) and Catherine Eddowes (#4), 1888 09/30 The first tooth is extracted under anesthesia in Charleston, Mass, 1846 diff --git a/src/usr.bin/calendar/calendars/calendar.music b/src/usr.bin/calendar/calendars/calendar.music index e05c1b0..d89e0fe 100644 --- a/src/usr.bin/calendar/calendars/calendar.music +++ b/src/usr.bin/calendar/calendars/calendar.music @@ -1,7 +1,7 @@ /* * Music * - * $OpenBSD: calendar.music,v 1.36 2019/03/31 19:43:41 sthen Exp $ + * $OpenBSD: calendar.music,v 1.39 2020/06/22 13:38:43 jmc Exp $ */ #ifndef _calendar_music_ @@ -15,7 +15,8 @@ 01/06 Max Bruch is born in Germany, 1838 01/06 Alexander Scriabin is born in Moscow, 1872 01/07 Francis Jean Poulenc is born in Paris, 1899 -01/08 Elvis Presley born in East Tupelo, Mississippi, 1935 +01/07 Neil Peart dies in Santa Monica, California, 2020 +01/08 Elvis Presley born in Tupelo, Mississippi, 1935 01/08 David Bowie (then David Robert Jones) is born in London, 1947 01/08 Arcangelo Corelli dies in Italy, 1713 01/09 James Patrick Page (Led Zeppelin) is born in Middlesex, England, 1945 @@ -199,7 +200,7 @@ 05/11 Max Reger dies in Leipzig, Germany, 1916 05/12 Pink Floyd performs the first quadrophonic concert, 1977 05/12 Jules Emile Frederic Massenet is born, 1842 -05/12 Berdrich Smetana dies, 1884 +05/12 Bedrich Smetana dies, 1884 05/14 Lou Harrison is born in Portland, Oregon, 1917 05/17 Erik Satie is born in Honfleur, France, 1866 05/17 Paul Dukas dies in Paris, France, 1935 @@ -367,6 +368,7 @@ 09/08 Nicolas de Grigny is baptized, 1672 09/11 Francois Couperin dies, 1733 09/12 John-Philippe Rameau dies, 1764 +09/12 Neil Peart is born in Hamilton, Ontario, 1952 09/13 Arnold Schoenberg is born in Vienna, Austria, 1874 09/14 Francis Scott Key writes words to "Star Spangled Banner", 1814 09/15 Anton Webern is shot dead by a drunk US soldier in Austria, 1945 diff --git a/src/usr.bin/what/what.c b/src/usr.bin/what/what.c index d22d673..54917ff 100644 --- a/src/usr.bin/what/what.c +++ b/src/usr.bin/what/what.c @@ -1,4 +1,4 @@ -/* $OpenBSD: what.c,v 1.15 2015/10/09 01:37:09 deraadt Exp $ */ +/* $OpenBSD: what.c,v 1.16 2020/04/18 15:10:06 martijn Exp $ */ /* $NetBSD: what.c,v 1.4 1994/12/20 16:01:03 jtc Exp $ */ /* @@ -85,7 +85,7 @@ main(int argc, char *argv[]) perror(*argv); exit(matches ? 0 : 1); } - printf("%s\n", *argv); + printf("%s:\n", *argv); search(match); } while(*++argv); exit(matches ? 0 : 1); -- cgit 1.4.1