Re: svn commit: r227797 - head/share/mk

2011-11-23 Thread Dag-Erling Smørgrav
Rui Paulo rpa...@freebsd.org writes: Dag-Erling Smørgrav d...@des.no writes: Sorry, my mind reader is broken at the moment, so you'll have to provide more information than that. If I had more information, I would have provided it. I'm still diagnosing the problem someone else created. I

Re: svn commit: r227797 - head/share/mk

2011-11-23 Thread Dag-Erling Smørgrav
Peter Wemm pe...@wemm.org writes: However.. the first thing I noticed was this commit *adds* a .c.o: rule in bsd.lib.mk, which replaces the default in sys.mk. The one in sys.mk has ctfconvert rules and the new one does not. At face value, this alone looks suspicious. Ah, that's a mismerge.

Re: svn commit: r227797 - head/share/mk

2011-11-22 Thread Rui Paulo
With this change, I can no longer update a FreeBSD 9.0-current system from June 2010 to FreeBSD 10.0. I suspect I'm not the only one. On 2011/11/21, at 16:35, Dag-Erling Smorgrav wrote: Author: des Date: Mon Nov 21 16:35:57 2011 New Revision: 227797 URL:

Re: svn commit: r227797 - head/share/mk

2011-11-22 Thread Dag-Erling Smørgrav
Rui Paulo rpa...@freebsd.org writes: With this change, I can no longer update a FreeBSD 9.0-current system from June 2010 to FreeBSD 10.0. I suspect I'm not the only one. Sorry, my mind reader is broken at the moment, so you'll have to provide more information than that. DES -- Dag-Erling

Re: svn commit: r227797 - head/share/mk

2011-11-22 Thread Rui Paulo
On 2011/11/22, at 21:33, Dag-Erling Smørgrav wrote: Rui Paulo rpa...@freebsd.org writes: With this change, I can no longer update a FreeBSD 9.0-current system from June 2010 to FreeBSD 10.0. I suspect I'm not the only one. Sorry, my mind reader is broken at the moment, so you'll have to

Re: svn commit: r227797 - head/share/mk

2011-11-22 Thread Ben Kaduk
2011/11/22 Rui Paulo rpa...@freebsd.org: On 2011/11/22, at 21:33, Dag-Erling Smørgrav wrote: Rui Paulo rpa...@freebsd.org writes: With this change, I can no longer update a FreeBSD 9.0-current system from June 2010 to FreeBSD 10.0. I suspect I'm not the only one. Sorry, my mind reader is

Re: svn commit: r227797 - head/share/mk

2011-11-22 Thread Doug Barton
On 11/22/2011 2:26 PM, Ben Kaduk wrote: 2011/11/22 Rui Paulo rpa...@freebsd.org: On 2011/11/22, at 21:33, Dag-Erling Smørgrav wrote: Rui Paulo rpa...@freebsd.org writes: With this change, I can no longer update a FreeBSD 9.0-current system from June 2010 to FreeBSD 10.0. I suspect I'm not

Re: svn commit: r227797 - head/share/mk

2011-11-22 Thread Peter Wemm
On Tue, Nov 22, 2011 at 3:15 PM, Doug Barton do...@freebsd.org wrote: On 11/22/2011 2:26 PM, Ben Kaduk wrote: 2011/11/22 Rui Paulo rpa...@freebsd.org: On 2011/11/22, at 21:33, Dag-Erling Smørgrav wrote: Rui Paulo rpa...@freebsd.org writes: With this change, I can no longer update a FreeBSD