Re: svn: head/usr.sbin/mergemaster

2009-01-01 Thread Maxim Sobolev
Doug Barton wrote: Maxim Sobolev wrote: Doug Barton wrote: Author: dougb Date: Thu Jan 1 10:55:26 2009 New Revision: 186677 URL: http://svn.freebsd.org/changeset/base/186677 Log: Revert 184781, 184804, and 184832 (automatic installation of files that differ only by VCS Id) for the followi

Re: svn commit: r186677 - head/usr.sbin/mergemaster

2009-01-01 Thread Doug Barton
Gavin Atkinson wrote: > On Thu, 1 Jan 2009, Doug Barton wrote: > >> Given that this is a situation that comes up very infrequently (usually >> only for a major version upgrade) > > This is no longer true: a side effect of having SVN exported to CVS is > that every time a branch is forked, the

Re: svn commit: r186678 - head/usr.sbin/mergemaster

2009-01-01 Thread Doug Barton
Sam Leffler wrote: > Doug Barton wrote: >> Sam Leffler wrote: >> >>> Doug Barton wrote: >>> 1. Switch to using the top level (e.g., /usr/src) Makefile, and specify that we should use the *.mk files from the source directory instead of the installed versions. [1]

svn commit: r186695 - head/usr.sbin/mergemaster

2009-01-01 Thread Doug Barton
Author: dougb Date: Fri Jan 2 07:25:30 2009 New Revision: 186695 URL: http://svn.freebsd.org/changeset/base/186695 Log: Simplify the code a little by moving the working part of ARCHSTRING into the new MM_MAKE variable. We only need to check for the presence of the target of $PAGER if t

Re: svn: head/usr.sbin/mergemaster

2009-01-01 Thread Ken Smith
On Thu, 2009-01-01 at 22:44 -0800, Maxim Sobolev wrote: > Doug Barton wrote: > > Given that this is a situation that comes up very infrequently (usually > > only for a major version upgrade) and can usually be handled simply > > enough on a one-off basis, I will once again point out that I th

Re: svn: head/usr.sbin/mergemaster

2009-01-01 Thread Doug Barton
Maxim Sobolev wrote: > Doug Barton wrote: >> Author: dougb >> Date: Thu Jan 1 10:55:26 2009 >> New Revision: 186677 >> URL: http://svn.freebsd.org/changeset/base/186677 >> >> Log: >> Revert 184781, 184804, and 184832 (automatic installation of files >> that differ only by VCS Id) for the follo

Re: svn: head/usr.sbin/mergemaster

2009-01-01 Thread Maxim Sobolev
Doug Barton wrote: Given that this is a situation that comes up very infrequently (usually only for a major version upgrade) and can usually be handled simply enough on a one-off basis, I will once again point out that I think this is a Bad Idea. I would be willing to consider a better im

Re: svn: head/usr.sbin/mergemaster

2009-01-01 Thread Maxim Sobolev
Doug Barton wrote: Author: dougb Date: Thu Jan 1 10:55:26 2009 New Revision: 186677 URL: http://svn.freebsd.org/changeset/base/186677 Log: Revert 184781, 184804, and 184832 (automatic installation of files that differ only by VCS Id) for the following reasons: 1. It was added without my c

svn commit: r186693 - head/lib/libmagic

2009-01-01 Thread David E. O'Brien
Author: obrien Date: Fri Jan 2 03:38:21 2009 New Revision: 186693 URL: http://svn.freebsd.org/changeset/base/186693 Log: Don't make the MIME magic any longer. Modified: head/lib/libmagic/Makefile Modified: head/lib/libmagic/Makefile ==

svn commit: r186692 - head/contrib/file

2009-01-01 Thread David E. O'Brien
Author: obrien Date: Fri Jan 2 03:31:45 2009 New Revision: 186692 URL: http://svn.freebsd.org/changeset/base/186692 Log: Add an additional COMPILE_ONLY check. Modified: head/contrib/file/apprentice.c Modified: head/contrib/file/apprentice.c ==

svn commit: r186691 - in head/contrib/file: . Magdir tests

2009-01-01 Thread David E. O'Brien
Author: obrien Date: Fri Jan 2 03:10:55 2009 New Revision: 186691 URL: http://svn.freebsd.org/changeset/base/186691 Log: Record that base/vendor/file/d...@186675 was merged. Merge base/vendor/file/d...@186675@186690, bringing FILE 4.26 to 8-CURRENT. Added: head/contrib/file/AUTHORS -

svn commit: r186690 - in vendor/file/dist: . Magdir tests

2009-01-01 Thread David E. O'Brien
Author: obrien Date: Fri Jan 2 02:57:16 2009 New Revision: 186690 URL: http://svn.freebsd.org/changeset/base/186690 Log: Virgin import of Christos Zoulas's FILE 4.26. Added: vendor/file/dist/AUTHORS vendor/file/dist/COPYING vendor/file/dist/INSTALL vendor/file/dist/Magdir/clarion ven

Re: svn commit: r186678 - head/usr.sbin/mergemaster

2009-01-01 Thread Doug Barton
Steve Kargl wrote: > On Thu, Jan 01, 2009 at 11:41:13AM +, Doug Barton wrote: >> Author: dougb >> Date: Thu Jan 1 11:41:13 2009 >> New Revision: 186678 >> URL: http://svn.freebsd.org/changeset/base/186678 >> >> Log: >> Maintenance and updates >> === >> 1. Various impr

Re: svn commit: r186678 - head/usr.sbin/mergemaster

2009-01-01 Thread Steve Kargl
On Thu, Jan 01, 2009 at 11:41:13AM +, Doug Barton wrote: > Author: dougb > Date: Thu Jan 1 11:41:13 2009 > New Revision: 186678 > URL: http://svn.freebsd.org/changeset/base/186678 > > Log: > Maintenance and updates > === > 1. Various improvements to the mtree (-U) fe

Re: svn commit: r186678 - head/usr.sbin/mergemaster

2009-01-01 Thread Sam Leffler
Doug Barton wrote: Sam Leffler wrote: Doug Barton wrote: 1. Switch to using the top level (e.g., /usr/src) Makefile, and specify that we should use the *.mk files from the source directory instead of the installed versions. [1][2] This allows easier cross builds and simplifies (

Re: svn commit: r186678 - head/usr.sbin/mergemaster

2009-01-01 Thread Doug Barton
Sam Leffler wrote: > Doug Barton wrote: >> 1. Switch to using the top level (e.g., /usr/src) Makefile, and specify >> that we should use the *.mk files from the source directory instead of >> the installed versions. [1][2] This allows easier cross builds and >> simplifies (or in some cases

Re: svn commit: r186678 - head/usr.sbin/mergemaster

2009-01-01 Thread Doug Barton
Sam Leffler wrote: > Doug Barton wrote: >> 2. Check for the deprecated 'nodev' option in /etc/fstab [3] >> > > mergemaster now prints: > > grep: /data/freebsd/roots/gateworks/etc/fstab: No such file or directory Fixed, thanks. > I suspect it's the above change. Unfortunately you committed

svn commit: r186689 - head/usr.sbin/mergemaster

2009-01-01 Thread Doug Barton
Author: dougb Date: Fri Jan 2 00:37:59 2009 New Revision: 186689 URL: http://svn.freebsd.org/changeset/base/186689 Log: Only check for 'nodev' in fstab if that file exists Submitted by: sam Modified: head/usr.sbin/mergemaster/mergemaster.sh Modified: head/usr.sbin/mergemaster/mergemast

Re: svn commit: r186678 - head/usr.sbin/mergemaster

2009-01-01 Thread Roman Kurakin
Sam Leffler wrote: Doug Barton wrote: 2. Check for the deprecated 'nodev' option in /etc/fstab [3] mergemaster now prints: grep: /data/freebsd/roots/gateworks/etc/fstab: No such file or directory I suspect it's the above change. Unfortunately you committed a bunch of unrelated changes

Re: svn commit: r186678 - head/usr.sbin/mergemaster

2009-01-01 Thread Sam Leffler
Doug Barton wrote: 1. Switch to using the top level (e.g., /usr/src) Makefile, and specify that we should use the *.mk files from the source directory instead of the installed versions. [1][2] This allows easier cross builds and simplifies (or in some cases permits) upgrading. I beli

Re: svn commit: r186678 - head/usr.sbin/mergemaster

2009-01-01 Thread Sam Leffler
Doug Barton wrote: 2. Check for the deprecated 'nodev' option in /etc/fstab [3] mergemaster now prints: grep: /data/freebsd/roots/gateworks/etc/fstab: No such file or directory I suspect it's the above change. Unfortunately you committed a bunch of unrelated changes en masse so I am gu

svn commit: r186688 - head/usr.sbin/mergemaster

2009-01-01 Thread Doug Barton
Author: dougb Date: Fri Jan 2 00:02:14 2009 New Revision: 186688 URL: http://svn.freebsd.org/changeset/base/186688 Log: For IGNORE_FILES delete the version in the TEMPROOT, not the base. Submitted by: clemens fischer Modified: head/usr.sbin/mergemaster/mergemaster.sh Modified: head/us

svn commit: r186687 - head/sys/dev/syscons/teken

2009-01-01 Thread Ed Schouten
Author: ed Date: Thu Jan 1 23:22:01 2009 New Revision: 186687 URL: http://svn.freebsd.org/changeset/base/186687 Log: Remove an unneeded assertion in libteken. The cursor is only inside the scrolling region when we are in origin mode. In that case, it should use originreg instead of scrol

Re: svn commit: r186677 - head/usr.sbin/mergemaster

2009-01-01 Thread Gavin Atkinson
On Thu, 1 Jan 2009, Doug Barton wrote: Given that this is a situation that comes up very infrequently (usually only for a major version upgrade) This is no longer true: a side effect of having SVN exported to CVS is that every time a branch is forked, the CVS ID is bumped, and as a result

svn commit: r186684 - head/sys/kern

2009-01-01 Thread Robert Watson
Author: rwatson Date: Thu Jan 1 20:03:22 2009 New Revision: 186684 URL: http://svn.freebsd.org/changeset/base/186684 Log: White space and comment tweaks. MFC after:3 weeks Modified: head/sys/kern/uipc_usrreq.c Modified: head/sys/kern/uipc_usrreq.c ==

svn commit: r186683 - head/sys/kern

2009-01-01 Thread Robert Watson
Author: rwatson Date: Thu Jan 1 20:03:01 2009 New Revision: 186683 URL: http://svn.freebsd.org/changeset/base/186683 Log: Temporary workaround for the limitations of the mbuf flowid field: zero the field in the mbuf constructors, since otherwise we have no way to tell if they are valid. In

svn commit: r186682 - in head/sys/sparc64: include sparc64

2009-01-01 Thread Marius Strobl
Author: marius Date: Thu Jan 1 14:01:21 2009 New Revision: 186682 URL: http://svn.freebsd.org/changeset/base/186682 Log: - Currently the PMAP code is laid out to let the kernel TSB cover the whole KVA space using one locked 4MB dTLB entry per GB of physical memory. On Cheetah-class mach

Re: svn commit: r186520 - head/sys/dev/puc

2009-01-01 Thread Roman Kurakin
Hi Bruce, Bruce Evans wrote: On Thu, 1 Jan 2009, M. Warner Losh wrote: In message: <495b406f.2040...@localhost.inse.ru> Roman Kurakin writes: : Probably we need to implement AUTODETECT_RCLK. I've had the patch, : but it worked only for modules, cause there was no working timers wh

Re: svn commit: r186520 - head/sys/dev/puc

2009-01-01 Thread Roman Kurakin
M. Warner Losh wrote: In message: <495b406f.2040...@localhost.inse.ru> Roman Kurakin writes: : M. Warner Losh wrote: : > In message: <200812271522.mbrfmmhy074...@svn.freebsd.org> : > Roman Kurakin writes: : > : Author: rik : > : Date: Sat Dec 27 15:22:22 2008 : > : New R

svn commit: r186681 - in head/sys: conf dev/syscons dev/syscons/teken pc98/cbus

2009-01-01 Thread Ed Schouten
Author: ed Date: Thu Jan 1 13:26:53 2009 New Revision: 186681 URL: http://svn.freebsd.org/changeset/base/186681 Log: Replace syscons terminal renderer by a new renderer that uses libteken. Some time ago I started working on a library called libteken, which is terminal emulator. It does n

Re: svn commit: r186520 - head/sys/dev/puc

2009-01-01 Thread Bruce Evans
On Thu, 1 Jan 2009, M. Warner Losh wrote: In message: <495b406f.2040...@localhost.inse.ru> Roman Kurakin writes: : Probably we need to implement AUTODETECT_RCLK. I've had the patch, : but it worked only for modules, cause there was no working timers while the : cards probe time if th

svn commit: r186680 - head/sys/sys

2009-01-01 Thread Bjoern A. Zeeb
Author: bz Date: Thu Jan 1 12:14:39 2009 New Revision: 186680 URL: http://svn.freebsd.org/changeset/base/186680 Log: Back out a non-style(9) change from r186668 to unbreak the kernels. Modified: head/sys/sys/imgact_elf.h Modified: head/sys/sys/imgact_elf.h ==

svn commit: r186679 - head/usr.sbin/mergemaster

2009-01-01 Thread Doug Barton
Author: dougb Date: Thu Jan 1 12:09:57 2009 New Revision: 186679 URL: http://svn.freebsd.org/changeset/base/186679 Log: General Improvements 1. List the command line options in a more standard way 2. Improve the explanations of some of the arguments (-A, -D) 3. Add

svn commit: r186678 - head/usr.sbin/mergemaster

2009-01-01 Thread Doug Barton
Author: dougb Date: Thu Jan 1 11:41:13 2009 New Revision: 186678 URL: http://svn.freebsd.org/changeset/base/186678 Log: Maintenance and updates === 1. Various improvements to the mtree (-U) feature: a. Seperate the notion of directory and file (user can override db pat

Re: svn commit: r186677 - head/usr.sbin/mergemaster

2009-01-01 Thread Doug Barton
I neglected to mention that there is already the -U option that will handle this situation nicely (as was discussed on -current the last time this came up). Doug Doug Barton wrote: > Author: dougb > Date: Thu Jan 1 10:55:26 2009 > New Revision: 186677 > URL: http://svn.freebsd.org/changeset/base

svn commit: r186677 - head/usr.sbin/mergemaster

2009-01-01 Thread Doug Barton
Author: dougb Date: Thu Jan 1 10:55:26 2009 New Revision: 186677 URL: http://svn.freebsd.org/changeset/base/186677 Log: Revert 184781, 184804, and 184832 (automatic installation of files that differ only by VCS Id) for the following reasons: 1. It was added without my consent, review, or ev

Re: svn commit: r186529 - head/sys/dev/acpi_support

2009-01-01 Thread Christoph Mallon
Joerg Sonnenberger schrieb: On Sun, Dec 28, 2008 at 10:00:37PM +0100, Dimitry Andric wrote: On 2008-12-28 20:30, Stanislav Sedov wrote: - ACPI_OBJECT acpiarg[0]; + ACPI_OBJECT acpiarg[1]; I wonder how does gcc allowed this. It emits warnings only in pedantic