Re: svn commit: r335599 - svnadmin/conf
On 24/06/2018 14:20, Andriy Gapon wrote: > On 24/06/2018 15:52, Matthew Seaman wrote: >> Log: >> Approved by: core > > That's terse even by my standards. > Damn. Sorry about that -- fat fingered it. I had originally intended to say: Reactivate Daichi Goto's commit bit at his request. Daichi will be mentored by gnn while he reacquaints himself with how it all works. but missed out the 'Approved by:' flag. And then failed to fix the commit message properly. Matthew signature.asc Description: OpenPGP digital signature
svn commit: r335599 - svnadmin/conf
Author: matthew (ports committer) Date: Sun Jun 24 12:52:38 2018 New Revision: 335599 URL: https://svnweb.freebsd.org/changeset/base/335599 Log: Approved by: core Modified: svnadmin/conf/access svnadmin/conf/mentors Modified: svnadmin/conf/access == --- svnadmin/conf/accessSun Jun 24 09:39:40 2018(r335598) +++ svnadmin/conf/accessSun Jun 24 12:52:38 2018(r335599) @@ -55,6 +55,7 @@ cracauer csjp cy dab +daichi davidcs dchagin def Modified: svnadmin/conf/mentors == --- svnadmin/conf/mentors Sun Jun 24 09:39:40 2018(r335598) +++ svnadmin/conf/mentors Sun Jun 24 12:52:38 2018(r335599) @@ -15,6 +15,7 @@ anish neelCo-mentor: grehan arichardsonjhb Co-mentor: brooks bcran eadler brdallanjude Co-mentor: bapt +daichi gnn defpjd eriae Co-mentor: thompsa eugene avg Co-mentor: mav ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r334992 - svnadmin/conf
Author: matthew (ports committer) Date: Tue Jun 12 08:18:56 2018 New Revision: 334992 URL: https://svnweb.freebsd.org/changeset/base/334992 Log: Take in Peter Grehan's commit bit for safe-keeping, at his own request. Approved by: core (implicit) Modified: svnadmin/conf/access Modified: svnadmin/conf/access == --- svnadmin/conf/accessTue Jun 12 07:51:03 2018(r334991) +++ svnadmin/conf/accessTue Jun 12 08:18:56 2018(r334992) @@ -88,7 +88,6 @@ glebius gnn gonzo gordon -grehan grog gshapiro freebsd-cvs-committ...@g.gshapiro.net harti ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r334608 - svnadmin/conf
Author: matthew (ports committer) Date: Mon Jun 4 05:55:40 2018 New Revision: 334608 URL: https://svnweb.freebsd.org/changeset/base/334608 Log: Restore kevlo's src commit bit after only 4 months and 3 weeks away. Since it's been such a short hiatus, there's no need for any period of re-mentoring. Approved by: core Modified: svnadmin/conf/access Modified: svnadmin/conf/access == --- svnadmin/conf/accessMon Jun 4 05:53:32 2018(r334607) +++ svnadmin/conf/accessMon Jun 4 05:55:40 2018(r334608) @@ -128,6 +128,7 @@ kan karels ken kevans +kevlo kib kibab kp ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r330134 - svnadmin/conf
Author: matthew (ports committer) Date: Thu Mar 1 00:05:14 2018 New Revision: 330134 URL: https://svnweb.freebsd.org/changeset/base/330134 Log: Take in remko's src commit bit for archiving, at his own request. Approved by: core Modified: svnadmin/conf/access Modified: svnadmin/conf/access == --- svnadmin/conf/accessWed Feb 28 22:39:47 2018(r330133) +++ svnadmin/conf/accessThu Mar 1 00:05:14 2018(r330134) @@ -175,7 +175,6 @@ pluknet pstef qingli ray -remko rgrimes rlibby rmacklem ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r327799 - svnadmin/conf
Author: matthew (ports committer) Date: Wed Jan 10 22:19:23 2018 New Revision: 327799 URL: https://svnweb.freebsd.org/changeset/base/327799 Log: Take in kevlo's commit bit, at his own request. Approved by: core (implicit) Modified: svnadmin/conf/access Modified: svnadmin/conf/access == --- svnadmin/conf/accessWed Jan 10 22:19:11 2018(r327798) +++ svnadmin/conf/accessWed Jan 10 22:19:23 2018(r327799) @@ -126,7 +126,6 @@ kan karels ken kevans -kevlo kib kibab kp ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r327104 - svnadmin/conf
Author: matthew (ports committer) Date: Sat Dec 23 12:44:24 2017 New Revision: 327104 URL: https://svnweb.freebsd.org/changeset/base/327104 Log: Restore Wolfram Schneider's commit bit at his request. Conrad Meyer will act as mentor until Wolfram gets back up to speed. Approved by: core Modified: svnadmin/conf/access svnadmin/conf/mentors Modified: svnadmin/conf/access == --- svnadmin/conf/accessSat Dec 23 07:02:45 2017(r327103) +++ svnadmin/conf/accessSat Dec 23 12:44:24 2017(r327104) @@ -220,6 +220,7 @@ vangyzen whu will wma +wosch wollman wulf yongari Modified: svnadmin/conf/mentors == --- svnadmin/conf/mentors Sat Dec 23 07:02:45 2017(r327103) +++ svnadmin/conf/mentors Sat Dec 23 12:44:24 2017(r327104) @@ -29,4 +29,5 @@ peterjjhb Co-mentor: grog rgrimesgrehan slmken Co-mentor: scottl, ambrisko stevek sjg +wosch cem wulf gonzo Co-mentor: bapt ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r325521 - svnadmin/conf
Author: matthew (ports committer) Date: Tue Nov 7 19:12:20 2017 New Revision: 325521 URL: https://svnweb.freebsd.org/changeset/base/325521 Log: Take in ngie's commit bit at their own request. Approved by: core (implicit) Modified: svnadmin/conf/access Modified: svnadmin/conf/access == --- svnadmin/conf/accessTue Nov 7 18:20:08 2017(r325520) +++ svnadmin/conf/accessTue Nov 7 19:12:20 2017(r325521) @@ -156,7 +156,6 @@ mw n_hibmadevnull neel netchild -ngie np nwhitehorn nyan ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r322707 - svnadmin/conf
Author: matthew (ports committer) Date: Sat Aug 19 21:17:53 2017 New Revision: 322707 URL: https://svnweb.freebsd.org/changeset/base/322707 Log: Take in Rui Paulo's comit bit at his own request. Approved by: core (implicit) Modified: svnadmin/conf/access Modified: svnadmin/conf/access == --- svnadmin/conf/accessSat Aug 19 21:00:02 2017(r322706) +++ svnadmin/conf/accessSat Aug 19 21:17:53 2017(r322707) @@ -178,7 +178,6 @@ rmacklem roberto rodrigc royger -rpaulo rpokala rrs rstone ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r322620 - svnadmin/conf
On 17/08/2017 21:20, Ngie Cooper (yaneurabeya) wrote: > >> On Aug 17, 2017, at 07:40, Matthew Seaman <matt...@freebsd.org> wrote: >> >> Author: matthew (ports committer) >> Date: Thu Aug 17 14:40:48 2017 >> New Revision: 322620 >> URL: https://svnweb.freebsd.org/changeset/base/322620 >> >> Log: >> Take in ache's commit bit. >> >> requiescat in pace >> >> Approved by:core (implicit) > > Hi Matthew, > ache’s death should be commemorated in > usr.bin/calendar/calendars/calendar.freebsd and in docs as well. I would do > it myself but I don’t know where he passed away :’(. > Thank you, > -Ngie > > PS RIP Andrey — you’ll be missed :(. > Absolutely. Unfortunately I don't know any of those details either. If anyone can let me know, it would be appreciated. Cheers, Matthew signature.asc Description: OpenPGP digital signature
svn commit: r322620 - svnadmin/conf
Author: matthew (ports committer) Date: Thu Aug 17 14:40:48 2017 New Revision: 322620 URL: https://svnweb.freebsd.org/changeset/base/322620 Log: Take in ache's commit bit. requiescat in pace Approved by: core (implicit) Modified: svnadmin/conf/access Modified: svnadmin/conf/access == --- svnadmin/conf/accessThu Aug 17 13:48:46 2017(r322619) +++ svnadmin/conf/accessThu Aug 17 14:40:48 2017(r322620) @@ -17,7 +17,6 @@ # Changes to email forwards can be made without core's approval. Please # use "Approved by: core (implicit)" to that type of commits. # -ache achim adrian ae ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r321855 - svnadmin/conf
Author: matthew (ports committer) Date: Tue Aug 1 09:07:26 2017 New Revision: 321855 URL: https://svnweb.freebsd.org/changeset/base/321855 Log: Reap edavis' commit bit with his approval Approved by: core (implicit) Modified: svnadmin/conf/access Modified: svnadmin/conf/access == --- svnadmin/conf/accessTue Aug 1 08:42:08 2017(r321854) +++ svnadmin/conf/accessTue Aug 1 09:07:26 2017(r321855) @@ -67,7 +67,6 @@ dumbbell dwmalone dwmalone=freebsd-committ...@maths.tcd.ie eadler ed -edavis emaste emax eri ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r318573 - svnadmin/conf
Author: matthew (ports committer) Date: Sat May 20 06:01:09 2017 New Revision: 318573 URL: https://svnweb.freebsd.org/changeset/base/318573 Log: Take in jkh's commit bit, at his own request Approved by: core (implicit) Modified: svnadmin/conf/access Modified: svnadmin/conf/access == --- svnadmin/conf/accessSat May 20 05:12:32 2017(r318572) +++ svnadmin/conf/accessSat May 20 06:01:09 2017(r318573) @@ -105,7 +105,6 @@ jhb jhibbits jilles jimharris -jkh jkim jlh jmallett ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r314660 - svnadmin/conf
Author: matthew (ports committer) Date: Sat Mar 4 11:45:18 2017 New Revision: 314660 URL: https://svnweb.freebsd.org/changeset/base/314660 Log: Restore edavis commit bit at his request. Approved by: core (implicit) Modified: svnadmin/conf/access Modified: svnadmin/conf/access == --- svnadmin/conf/accessSat Mar 4 11:38:03 2017(r314659) +++ svnadmin/conf/accessSat Mar 4 11:45:18 2017(r314660) @@ -67,6 +67,7 @@ dumbbell dwmalone dwmalone=freebsd-committ...@maths.tcd.ie eadler ed +edavis emaste emax eri ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r314588 - svnadmin/conf
Author: matthew (ports committer) Date: Fri Mar 3 08:13:45 2017 New Revision: 314588 URL: https://svnweb.freebsd.org/changeset/base/314588 Log: Restore rgrimes commit bit. Welcome back! Rod will be mentored by grehan since it has been some time since he was last active. Approved by: core Modified: svnadmin/conf/access svnadmin/conf/mentors Modified: svnadmin/conf/access == --- svnadmin/conf/accessFri Mar 3 06:31:47 2017(r314587) +++ svnadmin/conf/accessFri Mar 3 08:13:45 2017(r314588) @@ -170,6 +170,7 @@ pstef qingli ray remko +rgrimes rmacklem roberto rodrigc Modified: svnadmin/conf/mentors == --- svnadmin/conf/mentors Fri Mar 3 06:31:47 2017(r314587) +++ svnadmin/conf/mentors Fri Mar 3 08:13:45 2017(r314588) @@ -27,6 +27,7 @@ mahrens mckusick peterj jhb Co-mentor: grog phil theravenCo-mentor: sjg pstef pfg +rgrimesgrehan slmken Co-mentor: scottl, ambrisko stevek sjg tsoome allanjude Co-mentor: imp ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r313029 - svnadmin/conf
Author: matthew (ports committer) Date: Tue Jan 31 22:43:35 2017 New Revision: 313029 URL: https://svnweb.freebsd.org/changeset/base/313029 Log: The Grim Reaper calls. Take in the commit bits for the following people who have neither made a src commit for at least 18 months, nor have they responded to multiple emails about their status as committers. This is clearing up a backlog of about 3 years where the grim reaper process has not been happening. agc Alistair Crooks akiyama Shunsuke Akiyama andre Andre Oppermann charnier Philippe Charnier cherryCherry Mathew das David Schultz davidch David Christensen edavisEric Davis fjoe Max Khon iwasaki Mitsuru IWASAKI kuriyama Jun Kuriyama monthadar Monthadar Jaberi psPaul Saab rnoland Robert Noland sanpeiMIHIRA Yoshiro simon Simon Nielsen stefanf Stefan Farfeleder syuu Takuya ASADA torek Chris Torek venkatVenkat Duvvuru Core would like to thank all of these people for their contributions to the project, and wishes them well in any future endeavours. While here, tidy up the mentors file. In addition to certain of the above who were still technically under mentorship, remove entries for carl, miwi and snb who had previously given up their commit bits. Approved by: core (implicit) Modified: svnadmin/conf/access svnadmin/conf/mentors Modified: svnadmin/conf/access == --- svnadmin/conf/accessTue Jan 31 22:21:08 2017(r313028) +++ svnadmin/conf/accessTue Jan 31 22:43:35 2017(r313029) @@ -21,13 +21,10 @@ ache achim adrian ae -agc -akiyama allanjude alc alfred ambrisko -andre andreast andrew anish @@ -50,16 +47,12 @@ brueffer bryanv bz cem -charnier -cherry cognet cperciva cracauer csjp cy dab -das -davidch davidcs dchagin def @@ -74,14 +67,12 @@ dumbbell dwmalone dwmalone=freebsd-committ...@maths.tcd.ie eadler ed -edavis emaste emax eri erj fabient fanf -fjoe gabor gad gallatin @@ -102,7 +93,6 @@ hselasky ian imp ivadasz -iwasaki jah jamie jasone @@ -135,7 +125,6 @@ ken kevlo kib kp -kuriyama landonf lidl loos @@ -155,7 +144,6 @@ mizhka mjg mm mmel -monthadar mp mr n_hibmadevnull @@ -178,13 +166,11 @@ pho pjd pkelsey pluknet -ps pstef qingli ray remko rmacklem -rnoland roberto rodrigc royger @@ -194,7 +180,6 @@ rrs rstone ru rwatson bb+lists.freebsd.cvs-committ...@cyrus.watson.org -sanpei sbruno scf schweikh @@ -203,23 +188,19 @@ se sephe sgalabov silby -simon sjg skra slm smh sobomax stas -stefanf stevek syrinx -syuu takawata theraven thomas thompsa tijl -torek trasz truckman tsoome @@ -228,7 +209,6 @@ tychon ume uqs vangyzen -venkat whu will wma Modified: svnadmin/conf/mentors == --- svnadmin/conf/mentors Tue Jan 31 22:21:08 2017(r313028) +++ svnadmin/conf/mentors Tue Jan 31 22:43:35 2017(r313029) @@ -12,10 +12,7 @@ # Mentee Mentor Optional comment achim scottl Co-mentor: emaste anish neelCo-mentor: grehan -agcscottl Co-mentor: emax badger kib Co-mentor: vangyzen -carl jimharris -cherry gibbs dabvangyzen defpjd dexuan sephe @@ -27,14 +24,9 @@ jwd rmacklem kadesaiken Co-mentor: scottl, ambrisko karels gnn mahrensmckusick -miwi rwatson -monthadar adrian peterj jhb Co-mentor: grog phil theravenCo-mentor: sjg pstef pfg slmken Co-mentor: scottl, ambrisko -snbdwmalone stevek sjg -torek rpaulo tsoome allanjude Co-mentor: imp -venkat delphij Co-mentor: luigi, jhb ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r312955 - svnadmin/conf
Author: matthew (ports committer) Date: Sun Jan 29 19:54:34 2017 New Revision: 312955 URL: https://svnweb.freebsd.org/changeset/base/312955 Log: Take in the commit bits for the following people who have been inactive for more than 18 months and who have agreed that they are unlikely to begin contributing again in the near future: benlBen Laurie jhayJohn Hay raj Rafal Jaworowski ups Stephan Uphoff wkoszek Wojciech Koszek We wish them well in their future endeavours and hope to see them return to FreeBSD development sooner rather than later. Approved by: core (implicit) Modified: svnadmin/conf/access svnadmin/conf/mentors Modified: svnadmin/conf/access == --- svnadmin/conf/accessSun Jan 29 19:14:48 2017(r312954) +++ svnadmin/conf/accessSun Jan 29 19:54:34 2017(r312955) @@ -42,7 +42,6 @@ badger bapt bde bdrewery -benl benno bms br @@ -111,7 +110,6 @@ jceel jch jchandra jeff -jhay jhb jhibbits jilles @@ -183,7 +181,6 @@ pluknet ps pstef qingli -raj ray remko rmacklem @@ -229,13 +226,11 @@ tsoome tuexen tychon ume -upsups_...@stups.com uqs vangyzen venkat whu will -wkoszek wma wollman yongari Modified: svnadmin/conf/mentors == --- svnadmin/conf/mentors Sun Jan 29 19:14:48 2017(r312954) +++ svnadmin/conf/mentors Sun Jan 29 19:54:34 2017(r312955) @@ -14,7 +14,6 @@ achim scottl Co-mentor: emaste anish neelCo-mentor: grehan agcscottl Co-mentor: emax badger kib Co-mentor: vangyzen -benl philip Co-mentor: simon carl jimharris cherry gibbs dabvangyzen ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r312635 - svnadmin/conf
Author: matthew (ports committer) Date: Sun Jan 22 17:05:33 2017 New Revision: 312635 URL: https://svnweb.freebsd.org/changeset/base/312635 Log: Stephen McKay has approved having his commit bit taken in. Approved by: core (implicit) Modified: svnadmin/conf/access Modified: svnadmin/conf/access == --- svnadmin/conf/accessSun Jan 22 16:53:09 2017(r312634) +++ svnadmin/conf/accessSun Jan 22 17:05:33 2017(r312635) @@ -151,7 +151,6 @@ markj markm mav maxim -mckay mckusick melifaro mizhka ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r312595 - svnadmin/conf
Author: matthew (ports committer) Date: Sat Jan 21 13:25:57 2017 New Revision: 312595 URL: https://svnweb.freebsd.org/changeset/base/312595 Log: versus has given up his commit bit, so it makes no sense to have him under mentorship. Approved by: core (implicit) Modified: svnadmin/conf/mentors Modified: svnadmin/conf/mentors == --- svnadmin/conf/mentors Sat Jan 21 13:17:53 2017(r312594) +++ svnadmin/conf/mentors Sat Jan 21 13:25:57 2017(r312595) @@ -40,4 +40,3 @@ steveksjg torek rpaulo tsoome allanjude Co-mentor: imp venkat delphij Co-mentor: luigi, jhb -versus gavin Co-mentor: fjoe ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r312594 - svnadmin/conf
Author: matthew (ports committer) Date: Sat Jan 21 13:17:53 2017 New Revision: 312594 URL: https://svnweb.freebsd.org/changeset/base/312594 Log: Take in commit bits for the following nine people who have been inactive for more than 18 months and have agreed they are unlikely to begin contributing again in the near future. bschmidt Bernhard Schmidt dmarion Damjan Marion ghelmer Guy Helmer jfv Jack Vogel jh Jaakko Heinonen kensmith Ken Smith rmh Robert Millan trociny Mikolaj Golub versus Konrad Jankowski We wish them well in their future endeavors and hope to see them return to FreeBSD development in the future. Approved by: core (implicit) Modified: svnadmin/conf/access Modified: svnadmin/conf/access == --- svnadmin/conf/accessSat Jan 21 13:17:25 2017(r312593) +++ svnadmin/conf/accessSat Jan 21 13:17:53 2017(r312594) @@ -49,7 +49,6 @@ br brooks brueffer bryanv -bschmidt bz cem charnier @@ -71,7 +70,6 @@ des dexuan dfr dim -dmarion dteske dumbbell dwmalone dwmalone=freebsd-committ...@maths.tcd.ie @@ -90,7 +88,6 @@ gad gallatin ganbold gavin -ghelmer gibbs gjb glebius @@ -114,8 +111,6 @@ jceel jch jchandra jeff -jfv -jh jhay jhb jhibbits @@ -139,7 +134,6 @@ kaiw kan karels ken -kensmith kevlo kib kp @@ -194,7 +188,6 @@ raj ray remko rmacklem -rmh rnoland roberto rodrigc @@ -232,7 +225,6 @@ thompsa tijl torek trasz -trociny truckman tsoome tuexen @@ -242,7 +234,6 @@ ups ups_...@stups.com uqs vangyzen venkat -versus whu will wkoszek ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r312189 - svnadmin/conf
Author: matthew (ports committer) Date: Sat Jan 14 16:58:49 2017 New Revision: 312189 URL: https://svnweb.freebsd.org/changeset/base/312189 Log: Take in the commit bits for the following 8 people: brian gber gleb ivoras rdivacky trhodes vanhu zont All of these have not been active for at least 18 months and agree that they aren't likely to resume FreeBSD work soon, so have aquiesced to giving up their commit bits. We haven't had the Grim Reaper working for base commit bits for some time, so we've a backlog of bits to take in. More to come. Approved by: core (implicit) Modified: svnadmin/conf/access Modified: svnadmin/conf/access == --- svnadmin/conf/accessSat Jan 14 15:52:59 2017(r312188) +++ svnadmin/conf/accessSat Jan 14 16:58:49 2017(r312189) @@ -46,7 +46,6 @@ benl benno bms br -brian freebsd-committ...@awfulhak.org brooks brueffer bryanv @@ -91,11 +90,9 @@ gad gallatin ganbold gavin -gber ghelmer gibbs gjb -gleb glebius gnn gonzo @@ -109,7 +106,6 @@ hselasky ian imp ivadasz -ivoras iwasaki jah jamie @@ -196,7 +192,6 @@ pstef qingli raj ray -rdivacky remko rmacklem rmh @@ -237,7 +232,6 @@ thompsa tijl torek trasz -trhodes trociny truckman tsoome @@ -247,7 +241,6 @@ ume upsups_...@stups.com uqs vangyzen -vanhu venkat versus whu @@ -258,4 +251,3 @@ wollman yongari zbb zec -zont ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r310181 - in head: . release/scripts share/mk
Author: matthew (ports committer)
Date: Fri Dec 16 23:05:47 2016
New Revision: 310181
URL: https://svnweb.freebsd.org/changeset/base/310181
Log:
Revert r309339, thus re-instating r309314
The original problem with conflicting definitions of ${PKG_CMD} was
solved by r427523 in ports (see https://reviews.freebsd.org/D8677), so
this should be safe now.
Reviewed by: gjb
Approved by: gjb
Differential Revision:https://reviews.freebsd.org/D8120
Modified:
head/Makefile.inc1
head/release/scripts/make-pkg-package.sh
head/share/mk/bsd.own.mk
Modified: head/Makefile.inc1
==
--- head/Makefile.inc1 Fri Dec 16 22:39:30 2016(r310180)
+++ head/Makefile.inc1 Fri Dec 16 23:05:47 2016(r310181)
@@ -1379,7 +1379,8 @@ packages: .PHONY
package-pkg: .PHONY
rm -rf /tmp/ports.${TARGET} || :
env ${WMAKEENV:Q} SRCDIR=${.CURDIR} PORTSDIR=${PORTSDIR}
REVISION=${_REVISION} \
- PKG_VERSION=${PKG_VERSION} REPODIR=${REPODIR}
WSTAGEDIR=${WSTAGEDIR} \
+ PKG_CMD=${PKG_CMD} PKG_VERSION=${PKG_VERSION}
REPODIR=${REPODIR} \
+ WSTAGEDIR=${WSTAGEDIR} \
sh ${.CURDIR}/release/scripts/make-pkg-package.sh
real-packages: stage-packages create-packages sign-packages .PHONY
@@ -1417,11 +1418,11 @@ create-world-packages: _pkgbootstrap .PH
/^name/ { printf("===> Creating %s-", $$2); next } \
/^version/ { print $$2; next } \
' ${WSTAGEDIR}/$${pkgname}.ucl ; \
- pkg -o ABI_FILE=${WSTAGEDIR}/bin/sh -o ALLOW_BASE_SHLIBS=yes \
+ ${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/bin/sh -o
ALLOW_BASE_SHLIBS=yes \
create -M ${WSTAGEDIR}/$${pkgname}.ucl \
-p ${WSTAGEDIR}/$${pkgname}.plist \
-r ${WSTAGEDIR} \
- -o ${REPODIR}/$$(pkg -o ABI_FILE=${WSTAGEDIR}/bin/sh
config ABI)/${PKG_VERSION} ; \
+ -o ${REPODIR}/$$(${PKG_CMD} -o
ABI_FILE=${WSTAGEDIR}/bin/sh config ABI)/${PKG_VERSION} ; \
done
create-kernel-packages:_pkgbootstrap .PHONY
@@ -1445,11 +1446,11 @@ create-kernel-packages: _pkgbootstrap .P
/name/ { printf("===> Creating %s-", $$2); next } \
/version/ {print $$2; next } ' \
${KSTAGEDIR}/${DISTDIR}/kernel.${INSTALLKERNEL}${flavor}.ucl ; \
- pkg -o ABI_FILE=${WSTAGEDIR}/bin/sh -o ALLOW_BASE_SHLIBS=yes \
+ ${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/bin/sh -o ALLOW_BASE_SHLIBS=yes \
create -M
${KSTAGEDIR}/${DISTDIR}/kernel.${INSTALLKERNEL}${flavor}.ucl \
-p
${KSTAGEDIR}/${DISTDIR}/kernel.${INSTALLKERNEL}${flavor}.plist \
-r ${KSTAGEDIR}/${DISTDIR} \
- -o ${REPODIR}/$$(pkg -o ABI_FILE=${WSTAGEDIR}/bin/sh config
ABI)/${PKG_VERSION}
+ -o ${REPODIR}/$$(${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/bin/sh
config ABI)/${PKG_VERSION}
.endfor
.endif
.if ${BUILDKERNELS:[#]} > 1 && ${NO_INSTALLEXTRAKERNELS} != "yes"
@@ -1474,25 +1475,25 @@ create-kernel-packages: _pkgbootstrap .P
/name/ { printf("===> Creating %s-", $$2); next } \
/version/ {print $$2; next } ' \
${KSTAGEDIR}/kernel.${_kernel}/kernel.${_kernel}${flavor}.ucl ;
\
- pkg -o ABI_FILE=${WSTAGEDIR}/bin/sh -o ALLOW_BASE_SHLIBS=yes \
+ ${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/bin/sh -o ALLOW_BASE_SHLIBS=yes \
create -M
${KSTAGEDIR}/kernel.${_kernel}/kernel.${_kernel}${flavor}.ucl \
-p
${KSTAGEDIR}/kernel.${_kernel}/kernel.${_kernel}${flavor}.plist \
-r ${KSTAGEDIR}/kernel.${_kernel} \
- -o ${REPODIR}/$$(pkg -o ABI_FILE=${WSTAGEDIR}/bin/sh config
ABI)/${PKG_VERSION}
+ -o ${REPODIR}/$$(${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/bin/sh
config ABI)/${PKG_VERSION}
.endfor
.endif
.endfor
.endif
sign-packages: _pkgbootstrap .PHONY
- @[ -L "${REPODIR}/$$(pkg -o ABI_FILE=${WSTAGEDIR}/bin/sh config
ABI)/latest" ] && \
- unlink ${REPODIR}/$$(pkg -o ABI_FILE=${WSTAGEDIR}/bin/sh config
ABI)/latest ; \
- pkg -o ABI_FILE=${WSTAGEDIR}/bin/sh repo \
- -o ${REPODIR}/$$(pkg -o ABI_FILE=${WSTAGEDIR}/bin/sh config
ABI)/${PKG_VERSION} \
- ${REPODIR}/$$(pkg -o ABI_FILE=${WSTAGEDIR}/bin/sh config
ABI)/${PKG_VERSION} \
+ @[ -L "${REPODIR}/$$(${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/bin/sh config
ABI)/latest" ] && \
+ unlink ${REPODIR}/$$(${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/bin/sh
config ABI)/latest ; \
+ ${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/bin/sh repo \
+ -o ${REPODIR}/$$(${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/bin/sh
config ABI)/${PKG_VERSION} \
+ ${REPODIR}/$$(${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/bin/sh config
ABI)/${PKG_VERSION} \
svn commit: r309314 - in head: . release/scripts share/mk
Author: matthew (ports committer)
Date: Wed Nov 30 07:16:29 2016
New Revision: 309314
URL: https://svnweb.freebsd.org/changeset/base/309314
Log:
Allow a user-overridable setting 'PKG_CMD' to control the command used
to create a repo during 'make packages'
This would have been useful for a situation I found myself in where
pkg(8) had been upgraded to a version that wanted the FBSD_1.5 ABI
version but libc.so.7 had not been upgraded, and only provided
FBSD_1.4. I found I needed to update libc in order to run pkg, and I
also needed to use pkg to update libc... Which is why pkg-static
exists, but there's currently no way to tell the build system to use
pkg-static instead of pkg.
This creates a variable PKG_CMD, default value 'pkg', that can be
overridden from the command line.
Reviewed by: gjb
Approved by: gjb
Differential Revision:https://reviews.freebsd.org/D8120
Modified:
head/Makefile.inc1
head/release/scripts/make-pkg-package.sh
head/share/mk/bsd.own.mk
Modified: head/Makefile.inc1
==
--- head/Makefile.inc1 Wed Nov 30 06:26:37 2016(r309313)
+++ head/Makefile.inc1 Wed Nov 30 07:16:29 2016(r309314)
@@ -1379,7 +1379,8 @@ packages: .PHONY
package-pkg: .PHONY
rm -rf /tmp/ports.${TARGET} || :
env ${WMAKEENV:Q} SRCDIR=${.CURDIR} PORTSDIR=${PORTSDIR}
REVISION=${_REVISION} \
- PKG_VERSION=${PKG_VERSION} REPODIR=${REPODIR}
WSTAGEDIR=${WSTAGEDIR} \
+ PKG_CMD=${PKG_CMD} PKG_VERSION=${PKG_VERSION}
REPODIR=${REPODIR} \
+ WSTAGEDIR=${WSTAGEDIR} \
sh ${.CURDIR}/release/scripts/make-pkg-package.sh
real-packages: stage-packages create-packages sign-packages .PHONY
@@ -1417,11 +1418,11 @@ create-world-packages: _pkgbootstrap .PH
/^name/ { printf("===> Creating %s-", $$2); next } \
/^version/ { print $$2; next } \
' ${WSTAGEDIR}/$${pkgname}.ucl ; \
- pkg -o ABI_FILE=${WSTAGEDIR}/bin/sh -o ALLOW_BASE_SHLIBS=yes \
+ ${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/bin/sh -o
ALLOW_BASE_SHLIBS=yes \
create -M ${WSTAGEDIR}/$${pkgname}.ucl \
-p ${WSTAGEDIR}/$${pkgname}.plist \
-r ${WSTAGEDIR} \
- -o ${REPODIR}/$$(pkg -o ABI_FILE=${WSTAGEDIR}/bin/sh
config ABI)/${PKG_VERSION} ; \
+ -o ${REPODIR}/$$(${PKG_CMD} -o
ABI_FILE=${WSTAGEDIR}/bin/sh config ABI)/${PKG_VERSION} ; \
done
create-kernel-packages:_pkgbootstrap .PHONY
@@ -1445,11 +1446,11 @@ create-kernel-packages: _pkgbootstrap .P
/name/ { printf("===> Creating %s-", $$2); next } \
/version/ {print $$2; next } ' \
${KSTAGEDIR}/${DISTDIR}/kernel.${INSTALLKERNEL}${flavor}.ucl ; \
- pkg -o ABI_FILE=${WSTAGEDIR}/bin/sh -o ALLOW_BASE_SHLIBS=yes \
+ ${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/bin/sh -o ALLOW_BASE_SHLIBS=yes \
create -M
${KSTAGEDIR}/${DISTDIR}/kernel.${INSTALLKERNEL}${flavor}.ucl \
-p
${KSTAGEDIR}/${DISTDIR}/kernel.${INSTALLKERNEL}${flavor}.plist \
-r ${KSTAGEDIR}/${DISTDIR} \
- -o ${REPODIR}/$$(pkg -o ABI_FILE=${WSTAGEDIR}/bin/sh config
ABI)/${PKG_VERSION}
+ -o ${REPODIR}/$$(${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/bin/sh
config ABI)/${PKG_VERSION}
.endfor
.endif
.if ${BUILDKERNELS:[#]} > 1 && ${NO_INSTALLEXTRAKERNELS} != "yes"
@@ -1474,25 +1475,25 @@ create-kernel-packages: _pkgbootstrap .P
/name/ { printf("===> Creating %s-", $$2); next } \
/version/ {print $$2; next } ' \
${KSTAGEDIR}/kernel.${_kernel}/kernel.${_kernel}${flavor}.ucl ;
\
- pkg -o ABI_FILE=${WSTAGEDIR}/bin/sh -o ALLOW_BASE_SHLIBS=yes \
+ ${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/bin/sh -o ALLOW_BASE_SHLIBS=yes \
create -M
${KSTAGEDIR}/kernel.${_kernel}/kernel.${_kernel}${flavor}.ucl \
-p
${KSTAGEDIR}/kernel.${_kernel}/kernel.${_kernel}${flavor}.plist \
-r ${KSTAGEDIR}/kernel.${_kernel} \
- -o ${REPODIR}/$$(pkg -o ABI_FILE=${WSTAGEDIR}/bin/sh config
ABI)/${PKG_VERSION}
+ -o ${REPODIR}/$$(${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/bin/sh
config ABI)/${PKG_VERSION}
.endfor
.endif
.endfor
.endif
sign-packages: _pkgbootstrap .PHONY
- @[ -L "${REPODIR}/$$(pkg -o ABI_FILE=${WSTAGEDIR}/bin/sh config
ABI)/latest" ] && \
- unlink ${REPODIR}/$$(pkg -o ABI_FILE=${WSTAGEDIR}/bin/sh config
ABI)/latest ; \
- pkg -o ABI_FILE=${WSTAGEDIR}/bin/sh repo \
- -o ${REPODIR}/$$(pkg -o ABI_FILE=${WSTAGEDIR}/bin/sh config
ABI)/${PKG_VERSION} \
- ${REPODIR}/$$(pkg -o ABI_FILE=${WSTAGEDIR}/bin/sh config
ABI)/${PKG_VERSION} \
+ @[ -L
svn commit: r308740 - svnadmin/conf
Author: matthew (ports committer) Date: Wed Nov 16 22:28:46 2016 New Revision: 308740 URL: https://svnweb.freebsd.org/changeset/base/308740 Log: Take in edwin's commit bit for safe keeping, at his own request Approved by: core (implicit) Modified: svnadmin/conf/access Modified: svnadmin/conf/access == --- svnadmin/conf/accessWed Nov 16 18:39:26 2016(r308739) +++ svnadmin/conf/accessWed Nov 16 22:28:46 2016(r308740) @@ -79,7 +79,6 @@ dwmalone dwmalone=freebsd-committers@mat eadler ed edavis -edwin emaste emax eri ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r306227 - svnadmin/conf
Author: matthew (ports committer) Date: Fri Sep 23 07:06:39 2016 New Revision: 306227 URL: https://svnweb.freebsd.org/changeset/base/306227 Log: Take in erwin's commit bit at his own request Approved by: core (implicit) Modified: svnadmin/conf/access Modified: svnadmin/conf/access == --- svnadmin/conf/accessFri Sep 23 06:51:46 2016(r306226) +++ svnadmin/conf/accessFri Sep 23 07:06:39 2016(r306227) @@ -81,7 +81,6 @@ emaste emax eri erj -erwin fabient fanf fjoe ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r297511 - svnadmin/conf
Author: matthew (ports committer) Date: Sat Apr 2 12:03:08 2016 New Revision: 297511 URL: https://svnweb.freebsd.org/changeset/base/297511 Log: Take in davide's commit-bit for safe keeping, at his own request. Approved by: core (implicit) Modified: svnadmin/conf/access Modified: svnadmin/conf/access == --- svnadmin/conf/accessSat Apr 2 09:11:52 2016(r297510) +++ svnadmin/conf/accessSat Apr 2 12:03:08 2016(r297511) @@ -62,7 +62,6 @@ cy das davidch davidcs -davide dchagin deischen delphij ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r284902 - svnadmin/conf
Author: matthew (ports committer) Date: Sun Jun 28 07:44:07 2015 New Revision: 284902 URL: https://svnweb.freebsd.org/changeset/base/284902 Log: Take in Steve Kargl's commit bit at his own request. With het: core-secretary Approved by: core Modified: svnadmin/conf/access Modified: svnadmin/conf/access == --- svnadmin/conf/accessSun Jun 28 05:04:08 2015(r284901) +++ svnadmin/conf/accessSun Jun 28 07:44:07 2015(r284902) @@ -132,7 +132,6 @@ jwd kadesai kaiw kan -kargl ken kensmith kevlo ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r284903 - head/share/misc
Author: matthew (ports committer) Date: Sun Jun 28 09:03:26 2015 New Revision: 284903 URL: https://svnweb.freebsd.org/changeset/base/284903 Log: Steve KArgl's commit bit taken in at his own request With hat: core-secretary Approved by: core Modified: head/share/misc/committers-src.dot Modified: head/share/misc/committers-src.dot == --- head/share/misc/committers-src.dot Sun Jun 28 07:44:07 2015 (r284902) +++ head/share/misc/committers-src.dot Sun Jun 28 09:03:26 2015 (r284903) @@ -61,6 +61,7 @@ jkh [label=Jordan K. Hubbard\njkh@FreeB jlemon [label=Jonathan Lemon\njle...@freebsd.org\n1997/08/14\n2008/11/10] joe [label=Josef Karthauser\n...@freebsd.org\n1999/10/22\n2008/08/10] jtc [label=J.T. Conklin\n...@freebsd.org\n1993/06/12\n/??/??] +kargl [label=Steven G. Kargl\nka...@freebsd.org\n2011/01/17\n2015/06/28] kbyanc [label=Kelly Yancey\nkby...@freebsd.org\n2000/07/11\n2006/07/25] keichii [label=Michael Wu\nkeic...@freebsd.org\n2001/03/07\n2006/04/28] linimon [label=Mark Linimon\nlini...@freebsd.org\n2006/09/30\n2008/05/04] @@ -205,7 +206,6 @@ julian [label=Julian Elischer\njulian@F jwd [label=John De Boskey\n...@freebsd.org\n2000/05/19] kaiw [label=Kai Wang\nk...@freebsd.org\n2007/09/26] kan [label=Alexander Kabaev\n...@freebsd.org\n2002/07/21] -kargl [label=Steven G. Kargl\nka...@freebsd.org\n2011/01/17] ken [label=Ken Merry\n...@freebsd.org\n1998/09/08] kensmith [label=Ken Smith\nkensm...@freebsd.org\n2004/01/23] kevlo [label=Kevin Lo\nke...@freebsd.org\n2006/07/23] ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r277708 - svnadmin/conf
Author: matthew (ports committer) Date: Sun Jan 25 19:21:37 2015 New Revision: 277708 URL: https://svnweb.freebsd.org/changeset/base/277708 Log: Take in mdf's commit bit for safe keeping, at his own request. Approved by: core (implicit) Modified: svnadmin/conf/access Modified: svnadmin/conf/access == --- svnadmin/conf/accessSun Jan 25 16:35:03 2015(r277707) +++ svnadmin/conf/accessSun Jan 25 19:21:37 2015(r277708) @@ -148,7 +148,6 @@ mav maxim mckay mckusick -mdf melifaro mjg mm ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r276656 - svnadmin/conf
Author: matthew (ports committer) Date: Sun Jan 4 12:05:43 2015 New Revision: 276656 URL: https://svnweb.freebsd.org/changeset/base/276656 Log: Take attilio's bit in for safe keeping, at his own request. Approved by: core (implicit) Modified: svnadmin/conf/access Modified: svnadmin/conf/access == --- svnadmin/conf/accessSun Jan 4 10:40:23 2015(r276655) +++ svnadmin/conf/accessSun Jan 4 12:05:43 2015(r276656) @@ -31,7 +31,6 @@ andreast andrew antoine asomers -attilio avatar avg bapt ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r274647 - svnadmin/conf
Author: matthew (ports committer) Date: Tue Nov 18 09:18:35 2014 New Revision: 274647 URL: https://svnweb.freebsd.org/changeset/base/274647 Log: Take miwi's src commit bit into safekeeping, at his own request. Approved by: core (implicit) Modified: svnadmin/conf/access Modified: svnadmin/conf/access == --- svnadmin/conf/accessTue Nov 18 07:16:03 2014(r274646) +++ svnadmin/conf/accessTue Nov 18 09:18:35 2014(r274647) @@ -150,7 +150,6 @@ mckay mckusick mdf melifaro -miwi mjg mm monthadar ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r273846 - svnadmin/conf
Author: matthew (ports committer) Date: Thu Oct 30 08:03:26 2014 New Revision: 273846 URL: https://svnweb.freebsd.org/changeset/base/273846 Log: Take kientzle's commit bit in for safe keeping at his request. Approved by: core Modified: svnadmin/conf/access Modified: svnadmin/conf/access == --- svnadmin/conf/accessThu Oct 30 07:21:38 2014(r273845) +++ svnadmin/conf/accessThu Oct 30 08:03:26 2014(r273846) @@ -135,7 +135,6 @@ ken kensmith kevlo kib -kientzle kuriyama loos lstewart ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r244608 - head/usr.sbin/pkg
Author: matthew (ports committer)
Date: Sun Dec 23 11:22:18 2012
New Revision: 244608
URL: http://svnweb.freebsd.org/changeset/base/244608
Log:
Third time's the charm. pkg -N output needs to go to stderr.
Approved by: bapt
MFC after:2 weeks
Modified:
head/usr.sbin/pkg/pkg.c
Modified: head/usr.sbin/pkg/pkg.c
==
--- head/usr.sbin/pkg/pkg.c Sun Dec 23 10:21:01 2012(r244607)
+++ head/usr.sbin/pkg/pkg.c Sun Dec 23 11:22:18 2012(r244608)
@@ -457,10 +457,8 @@ main(__unused int argc, char *argv[])
* a system is configured to use pkg, don't bootstrap pkg
* when that argument is given as argv[1].
*/
- if ( argv[1] != NULL strcmp(argv[1], -N) == 0) {
- printf(%s, pkg is not installed\n);
- exit(EXIT_FAILURE);
- }
+ if ( argv[1] != NULL strcmp(argv[1], -N) == 0)
+ errx(EXIT_FAILURE, pkg is not installed\n);
/*
* Do not ask for confirmation if either of stdin or stdout is
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r244639 - head/usr.sbin/pkg
Author: matthew (ports committer) Date: Sun Dec 23 20:39:03 2012 New Revision: 244639 URL: http://svnweb.freebsd.org/changeset/base/244639 Log: Remove extraneous space and new-line. Submitted by: pjd, gcooper Approved by: bapt MFC after:2 weeks Modified: head/usr.sbin/pkg/pkg.c Modified: head/usr.sbin/pkg/pkg.c == --- head/usr.sbin/pkg/pkg.c Sun Dec 23 20:12:57 2012(r244638) +++ head/usr.sbin/pkg/pkg.c Sun Dec 23 20:39:03 2012(r244639) @@ -457,8 +457,8 @@ main(__unused int argc, char *argv[]) * a system is configured to use pkg, don't bootstrap pkg * when that argument is given as argv[1]. */ - if ( argv[1] != NULL strcmp(argv[1], -N) == 0) - errx(EXIT_FAILURE, pkg is not installed\n); + if (argv[1] != NULL strcmp(argv[1], -N) == 0) + errx(EXIT_FAILURE, pkg is not installed); /* * Do not ask for confirmation if either of stdin or stdout is ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r244594 - head/usr.sbin/pkg
Author: matthew (ports committer)
Date: Sat Dec 22 15:13:16 2012
New Revision: 244594
URL: http://svnweb.freebsd.org/changeset/base/244594
Log:
Switch from 'pkg -n' to 'pkg -N' as the test for pkgn activation
status. '-n' is already used extensively elsewhere in pkgng (to mean
'dry-run') and this reduces the potential confusion
Submitted by: eadler
Approved by: bapt
MFC after:2 weeks
Modified:
head/usr.sbin/pkg/pkg.c
Modified: head/usr.sbin/pkg/pkg.c
==
--- head/usr.sbin/pkg/pkg.c Sat Dec 22 15:01:29 2012(r244593)
+++ head/usr.sbin/pkg/pkg.c Sat Dec 22 15:13:16 2012(r244594)
@@ -453,11 +453,11 @@ main(__unused int argc, char *argv[])
if (access(pkgpath, X_OK) == -1) {
/*
-* To allow 'pkg -n' to be used as a reliable test for whether
+* To allow 'pkg -N' to be used as a reliable test for whether
* a system is configured to use pkg, don't bootstrap pkg
* when that argument is given as argv[1].
*/
- if ( argv[1] != NULL strcmp(argv[1], -n) == 0) {
+ if ( argv[1] != NULL strcmp(argv[1], -N) == 0) {
printf(%s, pkg is not installed\n);
exit(EXIT_FAILURE);
}
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r244553 - head/usr.sbin/pkg
Author: matthew (ports committer)
Date: Fri Dec 21 20:01:13 2012
New Revision: 244553
URL: http://svnweb.freebsd.org/changeset/base/244553
Log:
In preparation for making 'pkg -n' the one true method of determining
whether a system has been configured to use pkgng, cause /usr/sbin/pkg
recognise a -n option and exit with a failure code when the pkg port
is not installed.
Approved by: bapt
MFC after:2 weeks
Modified:
head/usr.sbin/pkg/pkg.c
Modified: head/usr.sbin/pkg/pkg.c
==
--- head/usr.sbin/pkg/pkg.c Fri Dec 21 19:36:08 2012(r244552)
+++ head/usr.sbin/pkg/pkg.c Fri Dec 21 20:01:13 2012(r244553)
@@ -452,6 +452,16 @@ main(__unused int argc, char *argv[])
getenv(LOCALBASE) ? getenv(LOCALBASE) : _LOCALBASE);
if (access(pkgpath, X_OK) == -1) {
+ /*
+* To allow 'pkg -n' to be used as a reliable test for whether
+* a system is configured to use pkg, don't bootstrap pkg
+* when that argument is given as argv[1].
+*/
+ if ( argv[1] != NULL strcmp(argv[1], -n) == 0) {
+ printf(%s, pkg is not installed\n);
+ exit(EXIT_FAILURE);
+ }
+
/*
* Do not ask for confirmation if either of stdin or stdout is
* not tty. Check the environment to see if user has answer
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r231274 - head/usr.bin/calendar/calendars
Author: matthew (ports committer) Date: Thu Feb 9 14:13:56 2012 New Revision: 231274 URL: http://svn.freebsd.org/changeset/base/231274 Log: Add myself as a new committer Approved by: shaun (mentor) Modified: head/usr.bin/calendar/calendars/calendar.freebsd Modified: head/usr.bin/calendar/calendars/calendar.freebsd == --- head/usr.bin/calendar/calendars/calendar.freebsdThu Feb 9 14:00:49 2012(r231273) +++ head/usr.bin/calendar/calendars/calendar.freebsdThu Feb 9 14:13:56 2012(r231274) @@ -274,6 +274,7 @@ 09/12 Weongyo Jeong weon...@freebsd.org born in Haman, Korea, 1980 09/12 Benedict Christopher Reuschling b...@freebsd.org born in Darmstadt, Germany, 1981 09/12 William C. Fumerola II bi...@freebsd.org born in Detroit, Michigan, United States, 1981 +09/14 Matthew Seaman matt...@freebsd.org born in Bristol, United Kingdom, 1965 09/15 Aleksandr Rybalko r...@freebsd.org born in Odessa, Ukraine, 1977 09/15 Dima Panov flu...@freebsd.org born in Khabarovsk, Russian Federation, 1978 09/17 Maxim Bolotin m...@freebsd.org born in Rostov-on-Don, Russian Federation, 1976 ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r231275 - head/share/misc
Author: matthew (ports committer) Date: Thu Feb 9 14:15:20 2012 New Revision: 231275 URL: http://svn.freebsd.org/changeset/base/231275 Log: Adding myself as a new committer Approved by: shaun (mentor) Modified: head/share/misc/committers-ports.dot Modified: head/share/misc/committers-ports.dot == --- head/share/misc/committers-ports.dotThu Feb 9 14:13:56 2012 (r231274) +++ head/share/misc/committers-ports.dotThu Feb 9 14:15:20 2012 (r231275) @@ -134,6 +134,7 @@ marcus [label=Joe Marcus Clarke\nmarcus markus [label=Markus Brueffer\nmar...@freebsd.org\n2004/02/21] martymac [label=Ganael Laplanche\nmarty...@freebsd.org\n2010/09/24] mat [label=Mathieu Arnold\n...@freebsd.org\n2003/08/15] +matthew [label=Matthew Seaman\nmatt...@freebsd.org\n2012/02/07] mezz [label=Jeremy Messenger\nm...@freebsd.org\n2004/04/30] miwi [label=Martin Wilke\nm...@freebsd.org\n2006/06/04] mm [label=Martin Matuska\n...@freebsd.org\n2007/04/04] @@ -413,6 +414,7 @@ sem - delphij sem - stas shaun - timur +shaun - matthew sobomax - demon sobomax - glewis ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
