CVS commit: src/distrib/notes/common

2009-10-21 Thread Soren Jacobsen
Module Name:src
Committed By:   snj
Date:   Thu Oct 22 01:38:53 UTC 2009

Modified Files:
src/distrib/notes/common: legal.common

Log Message:
Remove Todd C. Miller's acknowledgement.


To generate a diff of this commit:
cvs rdiff -u -r1.67 -r1.68 src/distrib/notes/common/legal.common

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/distrib/notes/common/legal.common
diff -u src/distrib/notes/common/legal.common:1.67 src/distrib/notes/common/legal.common:1.68
--- src/distrib/notes/common/legal.common:1.67	Wed Oct 21 22:10:45 2009
+++ src/distrib/notes/common/legal.common	Thu Oct 22 01:38:53 2009
@@ -1,4 +1,4 @@
-.\"	$NetBSD: legal.common,v 1.67 2009/10/21 22:10:45 snj Exp $
+.\"	$NetBSD: legal.common,v 1.68 2009/10/22 01:38:53 snj Exp $
 .\"
 .\" Copyright (c) 1999-2004 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -438,8 +438,6 @@
 .It
 This product includes software developed by Tobias Weingartner.
 .It
-This product includes software developed by Todd C. Miller.
-.It
 This product includes software developed by TooLs GmbH.
 .It
 This product includes software developed by Trimble Navigation, Ltd.



CVS commit: src/lib/libc/hash/sha1

2009-10-21 Thread Soren Jacobsen
Module Name:src
Committed By:   snj
Date:   Thu Oct 22 01:38:19 UTC 2009

Modified Files:
src/lib/libc/hash/sha1: sha1.3

Log Message:
Pull in revisions 1.24 and 1.25 from upstream, which change this file's
license to ISC-style.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/lib/libc/hash/sha1/sha1.3

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/lib/libc/hash/sha1/sha1.3
diff -u src/lib/libc/hash/sha1/sha1.3:1.3 src/lib/libc/hash/sha1/sha1.3:1.4
--- src/lib/libc/hash/sha1/sha1.3:1.3	Tue Mar 10 13:21:52 2009
+++ src/lib/libc/hash/sha1/sha1.3	Thu Oct 22 01:38:18 2009
@@ -1,33 +1,19 @@
-.\"	$NetBSD: sha1.3,v 1.3 2009/03/10 13:21:52 joerg Exp $
+.\"	$NetBSD: sha1.3,v 1.4 2009/10/22 01:38:18 snj Exp $
 .\"	$OpenBSD: sha1.3,v 1.9 1998/03/07 22:18:12 millert Exp $
 .\"
-.\" Copyright (c) 1997 Todd C. Miller 
-.\" All rights reserved.
+.\" Copyright (c) 1997, 2004 Todd C. Miller 
 .\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"notice, this list of conditions and the following disclaimer in the
-.\"documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\"must display the following acknowledgement:
-.\"	This product includes software developed by Todd C. Miller.
-.\" 4. The name of the author may not be used to endorse or promote products
-.\"derived from this software without specific prior written permission.
+.\" Permission to use, copy, modify, and distribute this software for any
+.\" purpose with or without fee is hereby granted, provided that the above
+.\" copyright notice and this permission notice appear in all copies.
 .\"
-.\" THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
-.\" INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
-.\" AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL
-.\" THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-.\" EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-.\" PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-.\" OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-.\" WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-.\" OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-.\" ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+.\" THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+.\" WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+.\" MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+.\" ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+.\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
 .\" See http://csrc.nist.gov/fips/fip180-1.txt for the detailed standard
 .\"



CVS commit: src/sys

2009-10-21 Thread Soren Jacobsen
Module Name:src
Committed By:   snj
Date:   Wed Oct 21 23:53:38 UTC 2009

Modified Files:
src/sys/arch/amiga/dev: bzivsc.c bzivscvar.h bzscvar.h bztzscvar.h
cbiisc.c cbiiscvar.h cbsc.c cbscvar.h flscvar.h if_es.c if_esreg.h
siop2_script.ss siop_script.ss
src/sys/arch/amiga/stand/loadbsd: loadbsd.c
src/sys/dev/microcode/siop: ncr53cxxx.c osiop.ss

Log Message:
Drop 3rd and 4th clauses (except on files where copyright is shared
with UC, in which case only the ad clause has been removed). Approved
by mhitch@ (copyright holder).


To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/amiga/dev/bzivsc.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/amiga/dev/bzivscvar.h \
src/sys/arch/amiga/dev/cbiiscvar.h src/sys/arch/amiga/dev/cbscvar.h
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/amiga/dev/bzscvar.h
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/amiga/dev/bztzscvar.h \
src/sys/arch/amiga/dev/siop_script.ss
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/amiga/dev/cbiisc.c
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/amiga/dev/cbsc.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/amiga/dev/flscvar.h \
src/sys/arch/amiga/dev/if_esreg.h src/sys/arch/amiga/dev/siop2_script.ss
cvs rdiff -u -r1.46 -r1.47 src/sys/arch/amiga/dev/if_es.c
cvs rdiff -u -r1.33 -r1.34 src/sys/arch/amiga/stand/loadbsd/loadbsd.c
cvs rdiff -u -r1.15 -r1.16 src/sys/dev/microcode/siop/ncr53cxxx.c
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/microcode/siop/osiop.ss

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/amiga/dev/bzivsc.c
diff -u src/sys/arch/amiga/dev/bzivsc.c:1.26 src/sys/arch/amiga/dev/bzivsc.c:1.27
--- src/sys/arch/amiga/dev/bzivsc.c:1.26	Sun Apr 13 04:55:52 2008
+++ src/sys/arch/amiga/dev/bzivsc.c	Wed Oct 21 23:53:38 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: bzivsc.c,v 1.26 2008/04/13 04:55:52 tsutsui Exp $ */
+/*	$NetBSD: bzivsc.c,v 1.27 2009/10/21 23:53:38 snj Exp $ */
 
 /*
  * Copyright (c) 1997 Michael L. Hitch
@@ -13,11 +13,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *notice, this list of conditions and the following disclaimer in the
  *documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *must display the following acknowledgement:
- *	This product contains software written by Michael L. Hitch for
- *	the NetBSD project.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *may be used to endorse or promote products derived from this software
  *without specific prior written permission.
  *
@@ -36,7 +32,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: bzivsc.c,v 1.26 2008/04/13 04:55:52 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bzivsc.c,v 1.27 2009/10/21 23:53:38 snj Exp $");
 
 #include 
 #include 

Index: src/sys/arch/amiga/dev/bzivscvar.h
diff -u src/sys/arch/amiga/dev/bzivscvar.h:1.3 src/sys/arch/amiga/dev/bzivscvar.h:1.4
--- src/sys/arch/amiga/dev/bzivscvar.h:1.3	Sun Apr 13 04:55:52 2008
+++ src/sys/arch/amiga/dev/bzivscvar.h	Wed Oct 21 23:53:38 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: bzivscvar.h,v 1.3 2008/04/13 04:55:52 tsutsui Exp $	*/
+/*	$NetBSD: bzivscvar.h,v 1.4 2009/10/21 23:53:38 snj Exp $	*/
 
 /*
  * Copyright (c) 1997 Michael L. Hitch.
@@ -12,12 +12,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *notice, this list of conditions and the following disclaimer in the
  *documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *must display the following acknowledgement:
- *	This product includes software developed for the NetBSD Project
- *	by Michael L. Hitch.
- * 4. The name of the author may not be used to endorse or promote products
- *derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
Index: src/sys/arch/amiga/dev/cbiiscvar.h
diff -u src/sys/arch/amiga/dev/cbiiscvar.h:1.3 src/sys/arch/amiga/dev/cbiiscvar.h:1.4
--- src/sys/arch/amiga/dev/cbiiscvar.h:1.3	Sun Apr 13 04:55:52 2008
+++ src/sys/arch/amiga/dev/cbiiscvar.h	Wed Oct 21 23:53:38 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: cbiiscvar.h,v 1.3 2008/04/13 04:55:52 tsutsui Exp $	*/
+/*	$NetBSD: cbiiscvar.h,v 1.4 2009/10/21 23:53:38 snj Exp $	*/
 
 /*
  * Copyright (c) 1997 Michael L. Hitch.
@@ -12,12 +12,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *notice, this list of conditions and the following disclaimer in the
  *documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning feat

CVS commit: src/share/man/man9

2009-10-21 Thread Mindaugas Rasiukevicius
Module Name:src
Committed By:   rmind
Date:   Wed Oct 21 23:33:32 UTC 2009

Modified Files:
src/share/man/man9: pmap.9

Log Message:
pmap(9): G/C pmap_collect, bump date.


To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 src/share/man/man9/pmap.9

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/share/man/man9/pmap.9
diff -u src/share/man/man9/pmap.9:1.38 src/share/man/man9/pmap.9:1.39
--- src/share/man/man9/pmap.9:1.38	Mon Aug  3 22:08:57 2009
+++ src/share/man/man9/pmap.9	Wed Oct 21 23:33:32 2009
@@ -1,4 +1,4 @@
-.\"	$NetBSD: pmap.9,v 1.38 2009/08/03 22:08:57 pooka Exp $
+.\"	$NetBSD: pmap.9,v 1.39 2009/10/21 23:33:32 rmind Exp $
 .\"
 .\" Copyright (c) 2000, 2001, 2002 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -27,7 +27,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd August 3, 2009
+.Dd October 22, 2009
 .Dt PMAP 9
 .Os
 .Sh NAME
@@ -79,8 +79,6 @@
 .Fn "pmap_copy" "pmap_t dst_map" "pmap_t src_map" "vaddr_t dst_addr" \
"vsize_t len" "vaddr_t src_addr"
 .Ft void
-.Fn "pmap_collect" "pmap_t pmap"
-.Ft void
 .Fn "pmap_update" "pmap_t pmap"
 .Ft void
 .Fn "pmap_activate" "struct lwp *l"
@@ -677,29 +675,6 @@
 path to
 .Dq pre-fault
 the child's address space).
-.It void Fn "pmap_collect" "pmap_t pmap"
-This function is called just before a process is swapped out to
-allow the
-.Nm
-module to release resources used to map the process's address space.
-The implementation may choose to remove physical mappings in order
-to free for example page tables back to the system.
-Note, however, that wired mappings must
-.Em not
-be removed when
-.Fn pmap_collect
-is called.
-.Pp
-Note that while this function is required to be provided by a
-.Nm
-implementation, it is not actually required to do anything.
-.Fn pmap_collect
-is merely advisory.
-It is recommended, however, that
-.Fn pmap_collect
-be fully implemented by a
-.Nm
-implementation.
 .It void Fn "pmap_update" "pmap_t pmap"
 This function is used to inform the
 .Nm



CVS commit: src/sys/rump/librump/rumpkern

2009-10-21 Thread Mindaugas Rasiukevicius
Module Name:src
Committed By:   rmind
Date:   Wed Oct 21 23:13:53 UTC 2009

Modified Files:
src/sys/rump/librump/rumpkern: emul.c sleepq.c vm.c

Log Message:
Sync rump with kernel changes.


To generate a diff of this commit:
cvs rdiff -u -r1.103 -r1.104 src/sys/rump/librump/rumpkern/emul.c
cvs rdiff -u -r1.4 -r1.5 src/sys/rump/librump/rumpkern/sleepq.c
cvs rdiff -u -r1.64 -r1.65 src/sys/rump/librump/rumpkern/vm.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/rump/librump/rumpkern/emul.c
diff -u src/sys/rump/librump/rumpkern/emul.c:1.103 src/sys/rump/librump/rumpkern/emul.c:1.104
--- src/sys/rump/librump/rumpkern/emul.c:1.103	Fri Oct 16 00:14:53 2009
+++ src/sys/rump/librump/rumpkern/emul.c	Wed Oct 21 23:13:53 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: emul.c,v 1.103 2009/10/16 00:14:53 pooka Exp $	*/
+/*	$NetBSD: emul.c,v 1.104 2009/10/21 23:13:53 rmind Exp $	*/
 
 /*
  * Copyright (c) 2007 Antti Kantee.  All Rights Reserved.
@@ -28,7 +28,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: emul.c,v 1.103 2009/10/16 00:14:53 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: emul.c,v 1.104 2009/10/21 23:13:53 rmind Exp $");
 
 #include 
 #include 
@@ -555,13 +555,13 @@
 	/* we don't control scheduling currently, can't do anything now */
 }
 
-u_int
+void
 lwp_unsleep(lwp_t *l, bool cleanup)
 {
 
 	KASSERT(mutex_owned(l->l_mutex));
 
-	return (*l->l_syncobj->sobj_unsleep)(l, cleanup);
+	(*l->l_syncobj->sobj_unsleep)(l, cleanup);
 }
 
 vaddr_t

Index: src/sys/rump/librump/rumpkern/sleepq.c
diff -u src/sys/rump/librump/rumpkern/sleepq.c:1.4 src/sys/rump/librump/rumpkern/sleepq.c:1.5
--- src/sys/rump/librump/rumpkern/sleepq.c:1.4	Fri Oct 16 02:13:54 2009
+++ src/sys/rump/librump/rumpkern/sleepq.c	Wed Oct 21 23:13:53 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: sleepq.c,v 1.4 2009/10/16 02:13:54 pooka Exp $	*/
+/*	$NetBSD: sleepq.c,v 1.5 2009/10/21 23:13:53 rmind Exp $	*/
 
 /*
  * Copyright (c) 2008 Antti Kantee.  All Rights Reserved.
@@ -26,7 +26,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: sleepq.c,v 1.4 2009/10/16 02:13:54 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sleepq.c,v 1.5 2009/10/21 23:13:53 rmind Exp $");
 
 #include 
 #include 
@@ -111,7 +111,7 @@
 	return NULL;
 }
 
-u_int
+void
 sleepq_unsleep(struct lwp *l, bool cleanup)
 {
 
@@ -122,8 +122,6 @@
 	if (cleanup) {
 		mutex_spin_exit(l->l_mutex);
 	}
-
-	return 0;
 }
 
 /*

Index: src/sys/rump/librump/rumpkern/vm.c
diff -u src/sys/rump/librump/rumpkern/vm.c:1.64 src/sys/rump/librump/rumpkern/vm.c:1.65
--- src/sys/rump/librump/rumpkern/vm.c:1.64	Wed Oct 21 21:12:06 2009
+++ src/sys/rump/librump/rumpkern/vm.c	Wed Oct 21 23:13:53 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: vm.c,v 1.64 2009/10/21 21:12:06 rmind Exp $	*/
+/*	$NetBSD: vm.c,v 1.65 2009/10/21 23:13:53 rmind Exp $	*/
 
 /*
  * Copyright (c) 2007 Antti Kantee.  All Rights Reserved.
@@ -42,7 +42,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: vm.c,v 1.64 2009/10/21 21:12:06 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vm.c,v 1.65 2009/10/21 23:13:53 rmind Exp $");
 
 #include 
 #include 
@@ -692,10 +692,3 @@
 
 	/* nada */
 }
-
-void
-uvm_kick_scheduler(void)
-{
-
-	/* ouch */
-}



CVS commit: src

2009-10-21 Thread Soren Jacobsen
Module Name:src
Committed By:   snj
Date:   Wed Oct 21 23:12:10 UTC 2009

Modified Files:
src/distrib/utils/ssh: ssh.c
src/distrib/utils/tls: tls.c
src/sbin/edlabel: edlabel.c
src/sys/arch/alpha/stand/netboot: dev_net.c
src/sys/arch/hp300/stand/common: netio.c rawfs.c
src/sys/arch/i386/stand/lib/netif: netif_small.c netif_small.h
src/sys/arch/mvme68k/stand/bootst: rawfs.c
src/sys/arch/mvme68k/stand/libsa: SRT0.S
src/sys/arch/newsmips/stand/boot: net.c netif_news.c
src/sys/arch/sbmips/stand/netboot: dev_net.c
src/sys/arch/sparc/stand/common: dvma.c net.c netif_sun.c
src/sys/arch/sun68k/stand/tapeboot: rawfs.c
src/sys/arch/vax/boot/boot: netio.c
src/sys/dev: md.h
src/sys/dev/sun: kbd_tables.c kbd_tables.h
src/sys/lib/libsa: bootparam.c
src/usr.sbin/mdconfig: mdconfig.c

Log Message:
Drop 3rd and 4th clauses.  Approved by gwr@ (copyright holder).


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/distrib/utils/ssh/ssh.c
cvs rdiff -u -r1.2 -r1.3 src/distrib/utils/tls/tls.c
cvs rdiff -u -r1.16 -r1.17 src/sbin/edlabel/edlabel.c
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/alpha/stand/netboot/dev_net.c
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/hp300/stand/common/netio.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/hp300/stand/common/rawfs.c
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/i386/stand/lib/netif/netif_small.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/i386/stand/lib/netif/netif_small.h
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/mvme68k/stand/bootst/rawfs.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/mvme68k/stand/libsa/SRT0.S
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/newsmips/stand/boot/net.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/newsmips/stand/boot/netif_news.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/sbmips/stand/netboot/dev_net.c
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/sparc/stand/common/dvma.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/sparc/stand/common/net.c
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/sparc/stand/common/netif_sun.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/sun68k/stand/tapeboot/rawfs.c
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/vax/boot/boot/netio.c
cvs rdiff -u -r1.9 -r1.10 src/sys/dev/md.h
cvs rdiff -u -r1.9 -r1.10 src/sys/dev/sun/kbd_tables.c
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/sun/kbd_tables.h
cvs rdiff -u -r1.18 -r1.19 src/sys/lib/libsa/bootparam.c
cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/mdconfig/mdconfig.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/distrib/utils/ssh/ssh.c
diff -u src/distrib/utils/ssh/ssh.c:1.2 src/distrib/utils/ssh/ssh.c:1.3
--- src/distrib/utils/ssh/ssh.c:1.2	Sun May 26 00:09:09 2002
+++ src/distrib/utils/ssh/ssh.c	Wed Oct 21 23:12:09 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: ssh.c,v 1.2 2002/05/26 00:09:09 wiz Exp $	*/
+/*	$NetBSD: ssh.c,v 1.3 2009/10/21 23:12:09 snj Exp $	*/
 
 /*
  * Copyright (c) 1995 Gordon W. Ross
@@ -12,11 +12,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *notice, this list of conditions and the following disclaimer in the
  *documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *derived from this software without specific prior written permission.
- * 4. All advertising materials mentioning features or use of this software
- *must display the following acknowledgement:
- *  This product includes software developed by Gordon W. Ross
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES

Index: src/distrib/utils/tls/tls.c
diff -u src/distrib/utils/tls/tls.c:1.2 src/distrib/utils/tls/tls.c:1.3
--- src/distrib/utils/tls/tls.c:1.2	Sat Jun 24 05:12:13 2006
+++ src/distrib/utils/tls/tls.c	Wed Oct 21 23:12:09 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: tls.c,v 1.2 2006/06/24 05:12:13 mrg Exp $	*/
+/*	$NetBSD: tls.c,v 1.3 2009/10/21 23:12:09 snj Exp $	*/
 
 /*
  * Copyright (c) 1995 Gordon W. Ross
@@ -12,11 +12,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *notice, this list of conditions and the following disclaimer in the
  *documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *derived from this software without specific prior written permission.
- * 4. All advertising materials mentioning features or use of this software
- *must display the following acknowledgement:
- *  This product includes software developed by Gordon W. Ross
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES

Index: src/sbin/edlabel/edlabel.c
diff -u src/sbin/edlabel/edlabel.c:1.16 src/sbin/

CVS commit: src

2009-10-21 Thread Joerg Sonnenberger
Module Name:src
Committed By:   joerg
Date:   Wed Oct 21 22:59:07 UTC 2009

Modified Files:
src/distrib/sets/lists/comp: mi
src/distrib/sets/lists/man: mi
src/distrib/sets/lists/text: mi
src/external/bsd: Makefile

Log Message:
Hook up mdocml.


To generate a diff of this commit:
cvs rdiff -u -r1.1331 -r1.1332 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.1165 -r1.1166 src/distrib/sets/lists/man/mi
cvs rdiff -u -r1.32 -r1.33 src/distrib/sets/lists/text/mi
cvs rdiff -u -r1.12 -r1.13 src/external/bsd/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/distrib/sets/lists/comp/mi
diff -u src/distrib/sets/lists/comp/mi:1.1331 src/distrib/sets/lists/comp/mi:1.1332
--- src/distrib/sets/lists/comp/mi:1.1331	Tue Oct 20 04:44:33 2009
+++ src/distrib/sets/lists/comp/mi	Wed Oct 21 22:59:06 2009
@@ -1,4 +1,4 @@
-#	$NetBSD: mi,v 1.1331 2009/10/20 04:44:33 jnemeth Exp $
+#	$NetBSD: mi,v 1.1332 2009/10/21 22:59:06 joerg Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -3015,6 +3015,7 @@
 ./usr/libdata/debug/usr/bin/make.debug		comp-util-debug		debug
 ./usr/libdata/debug/usr/bin/makeinfo.debug	comp-texinfo-debug	debug
 ./usr/libdata/debug/usr/bin/man.debug		comp-man-debug		debug
+./usr/libdata/debug/usr/bin/mandoc.debug	comp-mdocml-debug	debug
 ./usr/libdata/debug/usr/bin/menuc.debug		comp-c-debug		debug
 ./usr/libdata/debug/usr/bin/merge.debug		comp-util-debug		debug
 ./usr/libdata/debug/usr/bin/mesg.debug		comp-util-debug		debug
@@ -6782,6 +6783,7 @@
 ./usr/share/man/cat3/magic_setflags.0		comp-c-catman		.cat
 ./usr/share/man/cat3/makecontext.0		comp-c-catman		.cat
 ./usr/share/man/cat3/malloc.0			comp-c-catman		.cat
+./usr/share/man/cat3/man.0			comp-mdocml-catman	.cat
 ./usr/share/man/cat3/math.0			comp-c-catman		.cat
 ./usr/share/man/cat3/mblen.0			comp-c-catman		.cat
 ./usr/share/man/cat3/mbrlen.0			comp-c-catman		.cat
@@ -6794,6 +6796,7 @@
 ./usr/share/man/cat3/md4.0			comp-c-catman		.cat
 ./usr/share/man/cat3/md5.0			comp-c-catman		.cat
 ./usr/share/man/cat3/mdc2.0			comp-obsolete		obsolete
+./usr/share/man/cat3/mdoc.0			comp-mdocml-catman	.cat
 ./usr/share/man/cat3/membar_consumer.0		comp-c-catman		.cat
 ./usr/share/man/cat3/membar_enter.0		comp-c-catman		.cat
 ./usr/share/man/cat3/membar_exit.0		comp-c-catman		.cat
@@ -12289,6 +12292,7 @@
 ./usr/share/man/html3/magic_setflags.html	comp-c-htmlman		html
 ./usr/share/man/html3/makecontext.html		comp-c-htmlman		html
 ./usr/share/man/html3/malloc.html		comp-c-htmlman		html
+./usr/share/man/html3/man.html			comp-mdocml-htmlman	html
 ./usr/share/man/html3/math.html			comp-c-htmlman		html
 ./usr/share/man/html3/mblen.html		comp-c-htmlman		html
 ./usr/share/man/html3/mbrlen.html		comp-c-htmlman		html
@@ -12300,6 +12304,7 @@
 ./usr/share/man/html3/md2.html			comp-c-htmlman		html
 ./usr/share/man/html3/md4.html			comp-c-htmlman		html
 ./usr/share/man/html3/md5.html			comp-c-htmlman		html
+./usr/share/man/html3/mdoc.html			comp-mdocml-htmlman	html
 ./usr/share/man/html3/membar_consumer.html	comp-c-htmlman		html
 ./usr/share/man/html3/membar_enter.html		comp-c-htmlman		html
 ./usr/share/man/html3/membar_exit.html		comp-c-htmlman		html
@@ -17782,6 +17787,7 @@
 ./usr/share/man/man3/magic_setflags.3		comp-c-man		.man
 ./usr/share/man/man3/makecontext.3		comp-c-man		.man
 ./usr/share/man/man3/malloc.3			comp-c-man		.man
+./usr/share/man/man3/man.3			comp-mdocml-man		.man
 ./usr/share/man/man3/math.3			comp-c-man		.man
 ./usr/share/man/man3/mblen.3			comp-c-man		.man
 ./usr/share/man/man3/mbrlen.3			comp-c-man		.man
@@ -17794,6 +17800,7 @@
 ./usr/share/man/man3/md4.3			comp-c-man		.man
 ./usr/share/man/man3/md5.3			comp-c-man		.man
 ./usr/share/man/man3/mdc2.3			comp-obsolete		obsolete
+./usr/share/man/man3/mdoc.3			comp-mdocml-man		.man
 ./usr/share/man/man3/membar_consumer.3		comp-c-man		.man
 ./usr/share/man/man3/membar_enter.3		comp-c-man		.man
 ./usr/share/man/man3/membar_exit.3		comp-c-man		.man

Index: src/distrib/sets/lists/man/mi
diff -u src/distrib/sets/lists/man/mi:1.1165 src/distrib/sets/lists/man/mi:1.1166
--- src/distrib/sets/lists/man/mi:1.1165	Sun Oct 11 12:47:38 2009
+++ src/distrib/sets/lists/man/mi	Wed Oct 21 22:59:06 2009
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1165 2009/10/11 12:47:38 nakayama Exp $
+# $NetBSD: mi,v 1.1166 2009/10/21 22:59:06 joerg Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -265,6 +265,7 @@
 ./usr/share/man/cat1/make.0			man-util-catman		.cat
 ./usr/share/man/cat1/makeinfo.0			man-texinfo-catman	.cat
 ./usr/share/man/cat1/man.0			man-man-catman		.cat
+./usr/share/man/cat1/mandoc.0			man-mdocml-catman	.cat
 ./usr/share/man/cat1/md2.0			man-util-catman		.cat
 ./usr/share/man/cat1/md4.0			man-util-catman		.cat
 ./usr/share/man/cat1/md5.0			man-util-catman		.cat
@@ -2956,6 +2957,7 @@
 ./usr/share/man/html1/make.html			man-ut

CVS commit: src/dist/tcpdump

2009-10-21 Thread Joerg Sonnenberger
Module Name:src
Committed By:   joerg
Date:   Wed Oct 21 22:56:56 UTC 2009

Modified Files:
src/dist/tcpdump: tcpdump.8

Log Message:
Use actual comments to comment blocks and don't leave empty lines in the
output.


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/dist/tcpdump/tcpdump.8

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/dist/tcpdump/tcpdump.8
diff -u src/dist/tcpdump/tcpdump.8:1.17 src/dist/tcpdump/tcpdump.8:1.18
--- src/dist/tcpdump/tcpdump.8:1.17	Thu Sep 10 15:02:49 2009
+++ src/dist/tcpdump/tcpdump.8	Wed Oct 21 22:56:56 2009
@@ -1,7 +1,7 @@
-.\"	$NetBSD: tcpdump.8,v 1.17 2009/09/10 15:02:49 wiz Exp $
+.\"	$NetBSD: tcpdump.8,v 1.18 2009/10/21 22:56:56 joerg Exp $
 .\" @(#) Header: /tcpdump/master/tcpdump/tcpdump.1,v 1.167.2.11 2007/06/15 20:13:49 guy Exp (LBL)
 .\"
-.\"	$NetBSD: tcpdump.8,v 1.17 2009/09/10 15:02:49 wiz Exp $
+.\"	$NetBSD: tcpdump.8,v 1.18 2009/10/21 22:56:56 joerg Exp $
 .\"
 .\" Copyright (c) 1987, 1988, 1989, 1990, 1991, 1992, 1994, 1995, 1996, 1997
 .\"	The Regents of the University of California.  All rights reserved.
@@ -175,78 +175,78 @@
 .LP
 Reading packets from a network interface may require that you have
 special privileges:
-\" .TP
-\" .B Under SunOS 3.x or 4.x with NIT or BPF:
-\" You must have read access to
-\" .I /dev/nit
-\" or
-\" .IR /dev/bpf* .
-\" .TP
-\" .B Under Solaris with DLPI:
-\" You must have read/write access to the network pseudo device, e.g.
-\" .IR /dev/le .
-\" On at least some versions of Solaris, however, this is not sufficient to
-\" allow
-\" .I tcpdump
-\" to capture in promiscuous mode; on those versions of Solaris, you must
-\" be root, or
-\" .I tcpdump
-\" must be installed setuid to root, in order to capture in promiscuous
-\" mode.  Note that, on many (perhaps all) interfaces, if you don't capture
-\" in promiscuous mode, you will not see any outgoing packets, so a capture
-\" not done in promiscuous mode may not be very useful.
-\" .TP
-\" .B Under HP-UX with DLPI:
-\" You must be root or
-\" .I tcpdump
-\" must be installed setuid to root.
-\" .TP
-\" .B Under IRIX with snoop:
-\" You must be root or
-\" .I tcpdump
-\" must be installed setuid to root.
-\" .TP
-\" .B Under Linux:
-\" You must be root or
-\" .I tcpdump
-\" must be installed setuid to root (unless your distribution has a kernel
-\" that supports capability bits such as CAP_NET_RAW and code to allow
-\" those capability bits to be given to particular accounts and to cause
-\" those bits to be set on a user's initial processes when they log in, in
-\" which case you  must have CAP_NET_RAW in order to capture and
-\" CAP_NET_ADMIN to enumerate network devices with, for example, the
-\" .B \-D
-\" flag).
-\" .TP
-\" .B Under ULTRIX and Digital UNIX/Tru64 UNIX:
-\" Any user may capture network traffic with
-\" .IR tcpdump .
-\" However, no user (not even the super-user) can capture in promiscuous
-\" mode on an interface unless the super-user has enabled promiscuous-mode
-\" operation on that interface using
-\" .IR pfconfig (8),
-\" and no user (not even the super-user) can capture unicast traffic
-\" received by or sent by the machine on an interface unless the super-user
-\" has enabled copy-all-mode operation on that interface using
-\" .IR pfconfig ,
-\" so
-\" .I useful
-\" packet capture on an interface probably requires that either
-\" promiscuous-mode or copy-all-mode operation, or both modes of
-\" operation, be enabled on that interface.
-\" .TP
-\" .B Under BSD (this includes Mac OS X):
+.\" .TP
+.\" .B Under SunOS 3.x or 4.x with NIT or BPF:
+.\" You must have read access to
+.\" .I /dev/nit
+.\" or
+.\" .IR /dev/bpf* .
+.\" .TP
+.\" .B Under Solaris with DLPI:
+.\" You must have read/write access to the network pseudo device, e.g.
+.\" .IR /dev/le .
+.\" On at least some versions of Solaris, however, this is not sufficient to
+.\" allow
+.\" .I tcpdump
+.\" to capture in promiscuous mode; on those versions of Solaris, you must
+.\" be root, or
+.\" .I tcpdump
+.\" must be installed setuid to root, in order to capture in promiscuous
+.\" mode.  Note that, on many (perhaps all) interfaces, if you don't capture
+.\" in promiscuous mode, you will not see any outgoing packets, so a capture
+.\" not done in promiscuous mode may not be very useful.
+.\" .TP
+.\" .B Under HP-UX with DLPI:
+.\" You must be root or
+.\" .I tcpdump
+.\" must be installed setuid to root.
+.\" .TP
+.\" .B Under IRIX with snoop:
+.\" You must be root or
+.\" .I tcpdump
+.\" must be installed setuid to root.
+.\" .TP
+.\" .B Under Linux:
+.\" You must be root or
+.\" .I tcpdump
+.\" must be installed setuid to root (unless your distribution has a kernel
+.\" that supports capability bits such as CAP_NET_RAW and code to allow
+.\" those capability bits to be given to particular accounts and to cause
+.\" those bits to be set on a user's initial processes whe

CVS commit: src/share/mk

2009-10-21 Thread Joerg Sonnenberger
Module Name:src
Committed By:   joerg
Date:   Wed Oct 21 22:36:29 UTC 2009

Modified Files:
src/share/mk: bsd.own.mk

Log Message:
Add tool definition for mandoc in ascii (plain text), html and lint
mode.


To generate a diff of this commit:
cvs rdiff -u -r1.587 -r1.588 src/share/mk/bsd.own.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.587 src/share/mk/bsd.own.mk:1.588
--- src/share/mk/bsd.own.mk:1.587	Sat Oct 10 19:05:29 2009
+++ src/share/mk/bsd.own.mk	Wed Oct 21 22:36:28 2009
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.own.mk,v 1.587 2009/10/10 19:05:29 apb Exp $
+#	$NetBSD: bsd.own.mk,v 1.588 2009/10/21 22:36:28 joerg Exp $
 
 .if !defined(_BSD_OWN_MK_)
 _BSD_OWN_MK_=1
@@ -267,6 +267,9 @@
 TOOL_MAKEFS=		${TOOLDIR}/bin/${_TOOL_PREFIX}makefs
 TOOL_MAKEINFO=		${TOOLDIR}/bin/${_TOOL_PREFIX}makeinfo
 TOOL_MAKEWHATIS=	${TOOLDIR}/bin/${_TOOL_PREFIX}makewhatis
+TOOL_MANDOC_ASCII=	${TOOLDIR}/bin/${_TOOL_PREFIX}mandoc -Tascii
+TOOL_MANDOC_HTML=	${TOOLDIR}/bin/${_TOOL_PREFIX}mandoc -Thtml
+TOOL_MANDOC_LINT=	${TOOLDIR}/bin/${_TOOL_PREFIX}mandoc -Tlint
 TOOL_MDSETIMAGE=	${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-mdsetimage
 TOOL_MENUC=		MENUDEF=${TOOLDIR}/share/misc ${TOOLDIR}/bin/${_TOOL_PREFIX}menuc
 TOOL_MIPSELF2ECOFF=	${TOOLDIR}/bin/${_TOOL_PREFIX}mips-elf2ecoff



CVS commit: src/external/bsd/mdocml/bin

2009-10-21 Thread Joerg Sonnenberger
Module Name:src
Committed By:   joerg
Date:   Wed Oct 21 22:33:12 UTC 2009

Modified Files:
src/external/bsd/mdocml/bin: Makefile.inc

Log Message:
Need to provide BINDIR explicitly.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/mdocml/bin/Makefile.inc

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/mdocml/bin/Makefile.inc
diff -u src/external/bsd/mdocml/bin/Makefile.inc:1.1 src/external/bsd/mdocml/bin/Makefile.inc:1.2
--- src/external/bsd/mdocml/bin/Makefile.inc:1.1	Wed Oct 21 18:04:52 2009
+++ src/external/bsd/mdocml/bin/Makefile.inc	Wed Oct 21 22:33:12 2009
@@ -1,3 +1,5 @@
-# $NetBSD: Makefile.inc,v 1.1 2009/10/21 18:04:52 joerg Exp $
+# $NetBSD: Makefile.inc,v 1.2 2009/10/21 22:33:12 joerg Exp $
+
+BINDIR?=	/usr/bin
 
 .include "${.PARSEDIR}/../Makefile.inc"



CVS commit: src/external/cddl/osnet/sbin/zpool

2009-10-21 Thread Joerg Sonnenberger
Module Name:src
Committed By:   joerg
Date:   Wed Oct 21 22:32:20 UTC 2009

Modified Files:
src/external/cddl/osnet/sbin/zpool: Makefile

Log Message:
zpool(8) uses tbl.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/cddl/osnet/sbin/zpool/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/cddl/osnet/sbin/zpool/Makefile
diff -u src/external/cddl/osnet/sbin/zpool/Makefile:1.1 src/external/cddl/osnet/sbin/zpool/Makefile:1.2
--- src/external/cddl/osnet/sbin/zpool/Makefile:1.1	Fri Aug  7 20:57:56 2009
+++ src/external/cddl/osnet/sbin/zpool/Makefile	Wed Oct 21 22:32:20 2009
@@ -1,9 +1,10 @@
-#	$NetBSD: Makefile,v 1.1 2009/08/07 20:57:56 haad Exp $
+#	$NetBSD: Makefile,v 1.2 2009/10/21 22:32:20 joerg Exp $
 
 .include "../../Makefile.zfs"
 
 PROG=	zpool
 MAN=	zpool.8
+USETBL=	yes
 SRCS=	zpool_main.c zpool_iter.c zpool_util.c zpool_vdev.c
 
 DPADD=	${LIBAVL} ${LIBZFS} ${LIBM} ${LIBNVPAIR} ${LIBUUTIL} ${LIBUTIL}



CVS commit: src/doc

2009-10-21 Thread Thomas Klausner
Module Name:src
Committed By:   wiz
Date:   Wed Oct 21 22:32:11 UTC 2009

Modified Files:
src/doc: 3RDPARTY

Log Message:
Add entry for mdocml with joerg as responsible person.


To generate a diff of this commit:
cvs rdiff -u -r1.722 -r1.723 src/doc/3RDPARTY

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/doc/3RDPARTY
diff -u src/doc/3RDPARTY:1.722 src/doc/3RDPARTY:1.723
--- src/doc/3RDPARTY:1.722	Sun Oct 18 13:42:17 2009
+++ src/doc/3RDPARTY	Wed Oct 21 22:32:11 2009
@@ -1,4 +1,4 @@
-#	$NetBSD: 3RDPARTY,v 1.722 2009/10/18 13:42:17 wiz Exp $
+#	$NetBSD: 3RDPARTY,v 1.723 2009/10/21 22:32:11 wiz Exp $
 #
 # This file contains a list of the software that has been integrated into
 # NetBSD where we are not the primary maintainer.
@@ -622,6 +622,17 @@
 Notes:
 The sources were integrated into src/sys/external/apache2/mDNSResponder/dist.
 
+Package:	mdocml
+Version:	1.9.9
+Current Vers:	1.9.9
+Maintainer:	Kristaps Džonsons
+Archive Site:	http://mdocml.bsd.lv/snapshots/
+Home Page:	http://mdocml.bsd.lv/
+Mailing List:	
+Responsible:	joerg
+License:	BSD (2-clause)
+Notes:
+
 Package:	mesa-drm
 Version:	git 85b9f737db0d2a845e4d7e2bbf9ad12ff9e2227c
 Current Vers:



CVS commit: src/external/cddl/osnet/sbin/zfs

2009-10-21 Thread Joerg Sonnenberger
Module Name:src
Committed By:   joerg
Date:   Wed Oct 21 22:31:20 UTC 2009

Modified Files:
src/external/cddl/osnet/sbin/zfs: Makefile

Log Message:
zfs(8) uses tbl.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/cddl/osnet/sbin/zfs/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/cddl/osnet/sbin/zfs/Makefile
diff -u src/external/cddl/osnet/sbin/zfs/Makefile:1.1 src/external/cddl/osnet/sbin/zfs/Makefile:1.2
--- src/external/cddl/osnet/sbin/zfs/Makefile:1.1	Fri Aug  7 20:57:56 2009
+++ src/external/cddl/osnet/sbin/zfs/Makefile	Wed Oct 21 22:31:19 2009
@@ -1,9 +1,10 @@
-#	$NetBSD: Makefile,v 1.1 2009/08/07 20:57:56 haad Exp $
+#	$NetBSD: Makefile,v 1.2 2009/10/21 22:31:19 joerg Exp $
 
 .include "../../Makefile.zfs"
 
 PROG=	zfs
 MAN=	zfs.8
+USETBL=	yes
 SRCS=	zfs_main.c zfs_iter.c
 
 DPADD=	${LIBZFS} ${LIBM} ${LIBNVPAIR} ${LIBUUTIL} ${LIBUTIL}



CVS commit: src/external/cddl/osnet/usr.sbin/zdb

2009-10-21 Thread Joerg Sonnenberger
Module Name:src
Committed By:   joerg
Date:   Wed Oct 21 22:29:54 UTC 2009

Modified Files:
src/external/cddl/osnet/usr.sbin/zdb: Makefile

Log Message:
zdb(8) uses tbl


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/cddl/osnet/usr.sbin/zdb/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/cddl/osnet/usr.sbin/zdb/Makefile
diff -u src/external/cddl/osnet/usr.sbin/zdb/Makefile:1.1 src/external/cddl/osnet/usr.sbin/zdb/Makefile:1.2
--- src/external/cddl/osnet/usr.sbin/zdb/Makefile:1.1	Fri Aug  7 20:57:59 2009
+++ src/external/cddl/osnet/usr.sbin/zdb/Makefile	Wed Oct 21 22:29:54 2009
@@ -1,9 +1,10 @@
-#	$NetBSD: Makefile,v 1.1 2009/08/07 20:57:59 haad Exp $
+#	$NetBSD: Makefile,v 1.2 2009/10/21 22:29:54 joerg Exp $
 
 .include "../../Makefile.zfs"
 
 PROG=	zdb
 MAN=	zdb.8
+USETBL=	yes
 SRCS=	zdb.c zdb_il.c
 
 DPADD+=	${LIBM} ${LIBPTHREAD}



CVS commit: src

2009-10-21 Thread Thomas Klausner
Module Name:src
Committed By:   wiz
Date:   Wed Oct 21 22:18:37 UTC 2009

Modified Files:
src/bin/ps: ps.1
src/share/man/man9: uvm.9
src/usr.bin/systat: systat.1
src/usr.bin/vmstat: vmstat.1

Log Message:
Bump date for uarea swap-out removal.


To generate a diff of this commit:
cvs rdiff -u -r1.90 -r1.91 src/bin/ps/ps.1
cvs rdiff -u -r1.99 -r1.100 src/share/man/man9/uvm.9
cvs rdiff -u -r1.39 -r1.40 src/usr.bin/systat/systat.1
cvs rdiff -u -r1.19 -r1.20 src/usr.bin/vmstat/vmstat.1

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/bin/ps/ps.1
diff -u src/bin/ps/ps.1:1.90 src/bin/ps/ps.1:1.91
--- src/bin/ps/ps.1:1.90	Wed Oct 21 21:11:57 2009
+++ src/bin/ps/ps.1	Wed Oct 21 22:18:37 2009
@@ -1,4 +1,4 @@
-.\"	$NetBSD: ps.1,v 1.90 2009/10/21 21:11:57 rmind Exp $
+.\"	$NetBSD: ps.1,v 1.91 2009/10/21 22:18:37 wiz Exp $
 .\"
 .\" Copyright (c) 1980, 1990, 1991, 1993, 1994
 .\"	The Regents of the University of California.  All rights reserved.
@@ -29,7 +29,7 @@
 .\"
 .\" @(#)ps.1	8.3 (Berkeley) 4/18/94
 .\"
-.Dd August 4, 2009
+.Dd October 22, 2009
 .Dt PS 1
 .Os
 .Sh NAME

Index: src/share/man/man9/uvm.9
diff -u src/share/man/man9/uvm.9:1.99 src/share/man/man9/uvm.9:1.100
--- src/share/man/man9/uvm.9:1.99	Wed Oct 21 21:11:58 2009
+++ src/share/man/man9/uvm.9	Wed Oct 21 22:18:37 2009
@@ -1,4 +1,4 @@
-.\"	$NetBSD: uvm.9,v 1.99 2009/10/21 21:11:58 rmind Exp $
+.\"	$NetBSD: uvm.9,v 1.100 2009/10/21 22:18:37 wiz Exp $
 .\"
 .\" Copyright (c) 1998 Matthew R. Green
 .\" All rights reserved.
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd August 3, 2009
+.Dd October 22, 2009
 .Dt UVM 9
 .Os
 .Sh NAME

Index: src/usr.bin/systat/systat.1
diff -u src/usr.bin/systat/systat.1:1.39 src/usr.bin/systat/systat.1:1.40
--- src/usr.bin/systat/systat.1:1.39	Wed Oct 21 21:12:07 2009
+++ src/usr.bin/systat/systat.1	Wed Oct 21 22:18:37 2009
@@ -1,4 +1,4 @@
-.\"	$NetBSD: systat.1,v 1.39 2009/10/21 21:12:07 rmind Exp $
+.\"	$NetBSD: systat.1,v 1.40 2009/10/21 22:18:37 wiz Exp $
 .\"
 .\" Copyright (c) 1985, 1990, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -29,7 +29,7 @@
 .\"
 .\"	@(#)systat.1	8.2 (Berkeley) 12/30/93
 .\"
-.Dd February 18, 2007
+.Dd October 22, 2009
 .Dt SYSTAT 1
 .Os
 .Sh NAME

Index: src/usr.bin/vmstat/vmstat.1
diff -u src/usr.bin/vmstat/vmstat.1:1.19 src/usr.bin/vmstat/vmstat.1:1.20
--- src/usr.bin/vmstat/vmstat.1:1.19	Wed Oct 21 21:12:07 2009
+++ src/usr.bin/vmstat/vmstat.1	Wed Oct 21 22:18:37 2009
@@ -1,4 +1,4 @@
-.\"	$NetBSD: vmstat.1,v 1.19 2009/10/21 21:12:07 rmind Exp $
+.\"	$NetBSD: vmstat.1,v 1.20 2009/10/21 22:18:37 wiz Exp $
 .\"
 .\" Copyright (c) 2000, 2007 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -53,7 +53,7 @@
 .\"
 .\"	@(#)vmstat.8	8.1 (Berkeley) 6/6/93
 .\"
-.Dd November 6, 2007
+.Dd October 22, 2009
 .Dt VMSTAT 1
 .Os
 .Sh NAME



CVS commit: src/distrib/notes/common

2009-10-21 Thread Soren Jacobsen
Module Name:src
Committed By:   snj
Date:   Wed Oct 21 22:10:45 UTC 2009

Modified Files:
src/distrib/notes/common: legal.common

Log Message:
Remove acknowledgements for leo@ and tho...@.


To generate a diff of this commit:
cvs rdiff -u -r1.66 -r1.67 src/distrib/notes/common/legal.common

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/distrib/notes/common/legal.common
diff -u src/distrib/notes/common/legal.common:1.66 src/distrib/notes/common/legal.common:1.67
--- src/distrib/notes/common/legal.common:1.66	Wed Oct 21 16:13:36 2009
+++ src/distrib/notes/common/legal.common	Wed Oct 21 22:10:45 2009
@@ -1,4 +1,4 @@
-.\"	$NetBSD: legal.common,v 1.66 2009/10/21 16:13:36 snj Exp $
+.\"	$NetBSD: legal.common,v 1.67 2009/10/21 22:10:45 snj Exp $
 .\"
 .\" Copyright (c) 1999-2004 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -324,11 +324,6 @@
 This product includes software developed by LAN Media Corporation
 and its contributors.
 .It
-This product includes software developed by Leo Weppelman for the
-NetBSD Project.
-.It
-This product includes software developed by Leo Weppelman.
-.It
 This product includes software developed by Lloyd Parkes.
 .It
 This product includes software developed by Lutz Vieweg.
@@ -441,8 +436,6 @@
 .It
 This product includes software developed by Tetsuya Isaki.
 .It
-This product includes software developed by Thomas Gerner
-.It
 This product includes software developed by Tobias Weingartner.
 .It
 This product includes software developed by Todd C. Miller.



CVS commit: src/sys/arch

2009-10-21 Thread Soren Jacobsen
Module Name:src
Committed By:   snj
Date:   Wed Oct 21 21:57:40 UTC 2009

Modified Files:
src/sys/arch/arm/footbridge/isa: isapnp_machdep.c
src/sys/arch/atari/dev: grfabs_fal.h
src/sys/arch/atari/isa: isapnp_machdep.c
src/sys/arch/atari/stand/msconfig: msconfig.c
src/sys/arch/powerpc/isa: isapnp_machdep.c

Log Message:
Drop 3rd and 4th clauses.  Approved by thomas@ (copyright holder).


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/footbridge/isa/isapnp_machdep.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/atari/dev/grfabs_fal.h
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/atari/isa/isapnp_machdep.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/atari/stand/msconfig/msconfig.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/powerpc/isa/isapnp_machdep.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/arm/footbridge/isa/isapnp_machdep.c
diff -u src/sys/arch/arm/footbridge/isa/isapnp_machdep.c:1.4 src/sys/arch/arm/footbridge/isa/isapnp_machdep.c:1.5
--- src/sys/arch/arm/footbridge/isa/isapnp_machdep.c:1.4	Sat Mar 14 15:36:02 2009
+++ src/sys/arch/arm/footbridge/isa/isapnp_machdep.c	Wed Oct 21 21:57:39 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: isapnp_machdep.c,v 1.4 2009/03/14 15:36:02 dsl Exp $	*/
+/*	$NetBSD: isapnp_machdep.c,v 1.5 2009/10/21 21:57:39 snj Exp $	*/
 
 /*-
  * Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@@ -41,11 +41,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *notice, this list of conditions and the following disclaimer in the
  *documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *must display the following acknowledgement:
- *	This product includes software developed by Christos Zoulas.
- * 4. The name of the author may not be used to endorse or promote products
- *derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -78,7 +73,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: isapnp_machdep.c,v 1.4 2009/03/14 15:36:02 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isapnp_machdep.c,v 1.5 2009/10/21 21:57:39 snj Exp $");
 
 #include 
 #include 

Index: src/sys/arch/atari/dev/grfabs_fal.h
diff -u src/sys/arch/atari/dev/grfabs_fal.h:1.4 src/sys/arch/atari/dev/grfabs_fal.h:1.5
--- src/sys/arch/atari/dev/grfabs_fal.h:1.4	Sat Mar 14 14:45:56 2009
+++ src/sys/arch/atari/dev/grfabs_fal.h	Wed Oct 21 21:57:39 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: grfabs_fal.h,v 1.4 2009/03/14 14:45:56 dsl Exp $	*/
+/*	$NetBSD: grfabs_fal.h,v 1.5 2009/10/21 21:57:39 snj Exp $	*/
 
 /*
  * Copyright (c) 1995 Thomas Gerner.
@@ -12,11 +12,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *notice, this list of conditions and the following disclaimer in the
  *documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *must display the following acknowledgement:
- *  This product includes software developed by Thomas Gerner
- * 4. The name of the author may not be used to endorse or promote products
- *derived from this software without specific prior written permission
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES

Index: src/sys/arch/atari/isa/isapnp_machdep.c
diff -u src/sys/arch/atari/isa/isapnp_machdep.c:1.8 src/sys/arch/atari/isa/isapnp_machdep.c:1.9
--- src/sys/arch/atari/isa/isapnp_machdep.c:1.8	Sat Mar 14 15:36:03 2009
+++ src/sys/arch/atari/isa/isapnp_machdep.c	Wed Oct 21 21:57:39 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: isapnp_machdep.c,v 1.8 2009/03/14 15:36:03 dsl Exp $	*/
+/*	$NetBSD: isapnp_machdep.c,v 1.9 2009/10/21 21:57:39 snj Exp $	*/
 
 /*-
  * Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@@ -41,11 +41,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *notice, this list of conditions and the following disclaimer in the
  *documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *must display the following acknowledgement:
- *	This product includes software developed by Christos Zoulas.
- * 4. The name of the author may not be used to endorse or promote products
- *derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -79,7 +74,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: isapnp_machdep.c

CVS commit: src/sys/arch/atari/dev

2009-10-21 Thread Soren Jacobsen
Module Name:src
Committed By:   snj
Date:   Wed Oct 21 21:50:15 UTC 2009

Modified Files:
src/sys/arch/atari/dev: grfabs_fal.c

Log Message:
Drop 3rd and 4th clause.  Approved by leo@ and thomas@ (copyright holders).


To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/atari/dev/grfabs_fal.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/atari/dev/grfabs_fal.c
diff -u src/sys/arch/atari/dev/grfabs_fal.c:1.25 src/sys/arch/atari/dev/grfabs_fal.c:1.26
--- src/sys/arch/atari/dev/grfabs_fal.c:1.25	Sun Jul 19 05:43:22 2009
+++ src/sys/arch/atari/dev/grfabs_fal.c	Wed Oct 21 21:50:14 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: grfabs_fal.c,v 1.25 2009/07/19 05:43:22 tsutsui Exp $	*/
+/*	$NetBSD: grfabs_fal.c,v 1.26 2009/10/21 21:50:14 snj Exp $	*/
 
 /*
  * Copyright (c) 1995 Thomas Gerner.
@@ -13,11 +13,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *notice, this list of conditions and the following disclaimer in the
  *documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *must display the following acknowledgement:
- *  This product includes software developed by Leo Weppelman.
- * 4. The name of the author may not be used to endorse or promote products
- *derived from this software without specific prior written permission
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -32,7 +27,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: grfabs_fal.c,v 1.25 2009/07/19 05:43:22 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: grfabs_fal.c,v 1.26 2009/10/21 21:50:14 snj Exp $");
 
 #ifdef FALCON_VIDEO
 /*



CVS commit: src

2009-10-21 Thread Mindaugas Rasiukevicius
Module Name:src
Committed By:   rmind
Date:   Wed Oct 21 21:28:36 UTC 2009

Modified Files:
src/doc: CHANGES
src/sys/sys: param.h

Log Message:
5.99.21: removed uarea swap-out functionality.


To generate a diff of this commit:
cvs rdiff -u -r1.1308 -r1.1309 src/doc/CHANGES
cvs rdiff -u -r1.355 -r1.356 src/sys/sys/param.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/doc/CHANGES
diff -u src/doc/CHANGES:1.1308 src/doc/CHANGES:1.1309
--- src/doc/CHANGES:1.1308	Sun Oct 18 12:13:49 2009
+++ src/doc/CHANGES	Wed Oct 21 21:28:36 2009
@@ -1,4 +1,4 @@
-# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.1308 $>
+# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.1309 $>
 #
 #
 # [Note: This file does not mention every change made to the NetBSD source tree.
@@ -424,3 +424,4 @@
 	dhcpcd(8): Import dhcpcd-5.1.2. [roy 20091016]
 	sysinst(8): Give the option to use tmpfs for /tmp in sysinst instead of
 		the older mfs on i386 and amd64. [ahoka 20091018]
+	kernel: Remove support for uarea swap-out. [rmind 20091021]

Index: src/sys/sys/param.h
diff -u src/sys/sys/param.h:1.355 src/sys/sys/param.h:1.356
--- src/sys/sys/param.h:1.355	Fri Oct  2 18:50:14 2009
+++ src/sys/sys/param.h	Wed Oct 21 21:28:36 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: param.h,v 1.355 2009/10/02 18:50:14 elad Exp $	*/
+/*	$NetBSD: param.h,v 1.356 2009/10/21 21:28:36 rmind Exp $	*/
 
 /*-
  * Copyright (c) 1982, 1986, 1989, 1993
@@ -63,7 +63,7 @@
  *	2.99.9		(299000900)
  */
 
-#define	__NetBSD_Version__	599002000	/* NetBSD 5.99.20 */
+#define	__NetBSD_Version__	599002100	/* NetBSD 5.99.21 */
 
 #define __NetBSD_Prereq__(M,m,p) (M) * 1) + \
 (m) * 100) + (p) * 100) <= __NetBSD_Version__)



CVS commit: src/lib/libc/arch/hppa

2009-10-21 Thread Nick Hudson
Module Name:src
Committed By:   skrll
Date:   Wed Oct 21 19:30:46 UTC 2009

Modified Files:
src/lib/libc/arch/hppa: Makefile.inc
Removed Files:
src/lib/libc/arch/hppa/string: bcopy.m4

Log Message:
G/C bcopy.m4 and references to it.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/lib/libc/arch/hppa/Makefile.inc
cvs rdiff -u -r1.1 -r0 src/lib/libc/arch/hppa/string/bcopy.m4

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/lib/libc/arch/hppa/Makefile.inc
diff -u src/lib/libc/arch/hppa/Makefile.inc:1.8 src/lib/libc/arch/hppa/Makefile.inc:1.9
--- src/lib/libc/arch/hppa/Makefile.inc:1.8	Sun Oct 26 07:43:07 2008
+++ src/lib/libc/arch/hppa/Makefile.inc	Wed Oct 21 19:30:46 2009
@@ -1,13 +1,7 @@
-#	$NetBSD: Makefile.inc,v 1.8 2008/10/26 07:43:07 mrg Exp $
+#	$NetBSD: Makefile.inc,v 1.9 2009/10/21 19:30:46 skrll Exp $
 
 #	$OpenBSD: Makefile.inc,v 1.3 1999/12/25 06:02:10 mickey Exp $
 
 SRCS+=	__sigaction14_sigtramp.c __sigtramp2.S
 
-#SRCS+=	memmove.S
-#CLEANFILES+=	memmove.S
 SRCS+= bcopy.c
-
-#memmove.S:	${LIBCDIR}/arch/hppa/string/bcopy.m4
-#	@echo 'building ${.TARGET} from ${.ALLSRC}'
-#	@m4 -DNAME=bcopy ${.ALLSRC} > ${.TARGET}



CVS commit: src

2009-10-21 Thread Joerg Sonnenberger
Module Name:src
Committed By:   joerg
Date:   Wed Oct 21 18:04:52 UTC 2009

Added Files:
src/external/bsd/mdocml: Makefile Makefile.inc prepare-import.sh
src/external/bsd/mdocml/bin: Makefile Makefile.inc
src/external/bsd/mdocml/bin/mandoc: Makefile
src/external/bsd/mdocml/lib: Makefile Makefile.inc
src/external/bsd/mdocml/lib/libman: Makefile
src/external/bsd/mdocml/lib/libmdoc: Makefile
src/external/bsd/mdocml/man: Makefile
src/tools/mandoc: Makefile

Log Message:
Build glue for mdocml and for mandoc as standalone tool.


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/external/bsd/mdocml/Makefile \
src/external/bsd/mdocml/Makefile.inc \
src/external/bsd/mdocml/prepare-import.sh
cvs rdiff -u -r0 -r1.1 src/external/bsd/mdocml/bin/Makefile \
src/external/bsd/mdocml/bin/Makefile.inc
cvs rdiff -u -r0 -r1.1 src/external/bsd/mdocml/bin/mandoc/Makefile
cvs rdiff -u -r0 -r1.1 src/external/bsd/mdocml/lib/Makefile \
src/external/bsd/mdocml/lib/Makefile.inc
cvs rdiff -u -r0 -r1.1 src/external/bsd/mdocml/lib/libman/Makefile
cvs rdiff -u -r0 -r1.1 src/external/bsd/mdocml/lib/libmdoc/Makefile
cvs rdiff -u -r0 -r1.1 src/external/bsd/mdocml/man/Makefile
cvs rdiff -u -r0 -r1.1 src/tools/mandoc/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Added files:

Index: src/external/bsd/mdocml/Makefile
diff -u /dev/null src/external/bsd/mdocml/Makefile:1.1
--- /dev/null	Wed Oct 21 18:04:52 2009
+++ src/external/bsd/mdocml/Makefile	Wed Oct 21 18:04:52 2009
@@ -0,0 +1,5 @@
+# $NetBSD: Makefile,v 1.1 2009/10/21 18:04:52 joerg Exp $
+
+SUBDIR= 	lib .WAIT bin man
+
+.include 
Index: src/external/bsd/mdocml/Makefile.inc
diff -u /dev/null src/external/bsd/mdocml/Makefile.inc:1.1
--- /dev/null	Wed Oct 21 18:04:52 2009
+++ src/external/bsd/mdocml/Makefile.inc	Wed Oct 21 18:04:52 2009
@@ -0,0 +1,18 @@
+# $NetBSD: Makefile.inc,v 1.1 2009/10/21 18:04:52 joerg Exp $
+
+.include 
+
+VERSION=	1.9.9
+
+CPPFLAGS+=	-DVERSION=\"${VERSION}\"
+
+DISTDIR:=	${.PARSEDIR}/dist
+
+.PATH:	${DISTDIR}
+
+.for _LIB in man mdoc
+MDOCMLOBJDIR.${_LIB} !=	cd ${.PARSEDIR}/lib/lib${_LIB} && ${PRINTOBJDIR}
+MDOCMLLIB.${_LIB}=	${MDOCMLOBJDIR.${_LIB}}/lib${_LIB}.a
+.endfor
+
+WARNS?=	4
Index: src/external/bsd/mdocml/prepare-import.sh
diff -u /dev/null src/external/bsd/mdocml/prepare-import.sh:1.1
--- /dev/null	Wed Oct 21 18:04:52 2009
+++ src/external/bsd/mdocml/prepare-import.sh	Wed Oct 21 18:04:52 2009
@@ -0,0 +1,14 @@
+#/bin/sh
+
+set -e
+
+cd dist
+rm -rf ChangeLog.xsl Makefile example.style.css index.css *.sgml
+
+uuencode external.png < external.png > external.png.uu
+
+rm external.png
+
+for f in [a-z]*; do
+	sed 's/\$Id: prepare-import.sh,v 1.1 2009/10/21 18:04:52 joerg Exp $Vendor-Id:/' < $f > $f.new && mv $f.new $f
+done

Index: src/external/bsd/mdocml/bin/Makefile
diff -u /dev/null src/external/bsd/mdocml/bin/Makefile:1.1
--- /dev/null	Wed Oct 21 18:04:52 2009
+++ src/external/bsd/mdocml/bin/Makefile	Wed Oct 21 18:04:52 2009
@@ -0,0 +1,5 @@
+# $NetBSD: Makefile,v 1.1 2009/10/21 18:04:52 joerg Exp $
+
+SUBDIR= 	mandoc
+
+.include 
Index: src/external/bsd/mdocml/bin/Makefile.inc
diff -u /dev/null src/external/bsd/mdocml/bin/Makefile.inc:1.1
--- /dev/null	Wed Oct 21 18:04:52 2009
+++ src/external/bsd/mdocml/bin/Makefile.inc	Wed Oct 21 18:04:52 2009
@@ -0,0 +1,3 @@
+# $NetBSD: Makefile.inc,v 1.1 2009/10/21 18:04:52 joerg Exp $
+
+.include "${.PARSEDIR}/../Makefile.inc"

Index: src/external/bsd/mdocml/bin/mandoc/Makefile
diff -u /dev/null src/external/bsd/mdocml/bin/mandoc/Makefile:1.1
--- /dev/null	Wed Oct 21 18:04:52 2009
+++ src/external/bsd/mdocml/bin/mandoc/Makefile	Wed Oct 21 18:04:52 2009
@@ -0,0 +1,20 @@
+# $NetBSD: Makefile,v 1.1 2009/10/21 18:04:52 joerg Exp $
+
+.include 
+
+PROG=		mandoc
+
+SRCS=		main.c mdoc_term.c chars.c term.c tree.c compat.c \
+	man_term.c html.c mdoc_html.c man_html.c out.c
+
+.ifndef HOSTPROG
+DPADD+= 	${MDOCMLLIB.man} ${MDOCMLLIB.mdoc}
+LDADD+= 	-L${MDOCMLOBJDIR.man} -lman -L${MDOCMLOBJDIR.mdoc} -lmdoc
+.else
+SRCS.libman!=	cd ${.PARSEDIR}/../../lib/libman && ${MAKE} -V '$${SRCS}'
+SRCS.libmdoc!=	cd ${.PARSEDIR}/../../lib/libmdoc && ${MAKE} -V '$${SRCS}'
+
+SRCS+=		${SRCS.libman} ${SRCS.libmdoc:Nmandoc.c}
+.endif
+
+.include 

Index: src/external/bsd/mdocml/lib/Makefile
diff -u /dev/null src/external/bsd/mdocml/lib/Makefile:1.1
--- /dev/null	Wed Oct 21 18:04:52 2009
+++ src/external/bsd/mdocml/lib/Makefile	Wed Oct 21 18:04:52 2009
@@ -0,0 +1,5 @@
+# $NetBSD: Makefile,v 1.1 2009/10/21 18:04:52 joerg Exp $
+
+SUBDIR=	libman libmdoc
+
+.include 
Index: src/external/bsd/mdocml/lib/Makefile.inc
diff -u /dev/null src/external/bsd/mdocml/lib/Makefile.inc:1.1
--- /dev/null	Wed Oct 21 18:04:52 2009
+++ src/external/bsd/mdocml/lib/Makefile.inc	Wed Oct 21 18:04:52 2009
@@ -0,0 +1,3 @@
+# $NetBSD: Makefile.inc,v 1.1 2009/10/21 18:04:52 joerg Exp $
+
+.i

CVS commit: src/external/bsd/mdocml/dist

2009-10-21 Thread Joerg Sonnenberger
Module Name:src
Committed By:   joerg
Date:   Wed Oct 21 17:45:09 UTC 2009

Update of /cvsroot/src/external/bsd/mdocml/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv24959

Log Message:
Initial import mdocml-1.9.9.

mdocml provides a fast parser for man(7) and mdoc(7) formated documents.
It supports validation and can currently create output as plain text
with overstriking and HTML.

Status:

Vendor Tag: KRISTAPS
Release Tags:   mdocml-1-9-9

N src/external/bsd/mdocml/dist/mdoc_macro.c
N src/external/bsd/mdocml/dist/external.png.uu
N src/external/bsd/mdocml/dist/chars.in
N src/external/bsd/mdocml/dist/vol.in
N src/external/bsd/mdocml/dist/st.in
N src/external/bsd/mdocml/dist/msec.in
N src/external/bsd/mdocml/dist/lib.in
N src/external/bsd/mdocml/dist/att.in
N src/external/bsd/mdocml/dist/arch.in
N src/external/bsd/mdocml/dist/style.css
N src/external/bsd/mdocml/dist/man.3
N src/external/bsd/mdocml/dist/man.7
N src/external/bsd/mdocml/dist/mandoc_char.7
N src/external/bsd/mdocml/dist/manuals.7
N src/external/bsd/mdocml/dist/mdoc.7
N src/external/bsd/mdocml/dist/mdoc.3
N src/external/bsd/mdocml/dist/mandoc.1
N src/external/bsd/mdocml/dist/main.h
N src/external/bsd/mdocml/dist/out.h
N src/external/bsd/mdocml/dist/chars.h
N src/external/bsd/mdocml/dist/html.h
N src/external/bsd/mdocml/dist/libmandoc.h
N src/external/bsd/mdocml/dist/term.h
N src/external/bsd/mdocml/dist/libman.h
N src/external/bsd/mdocml/dist/man.h
N src/external/bsd/mdocml/dist/libmdoc.h
N src/external/bsd/mdocml/dist/mdoc.h
N src/external/bsd/mdocml/dist/man_argv.c
N src/external/bsd/mdocml/dist/mandoc.c
N src/external/bsd/mdocml/dist/man_action.c
N src/external/bsd/mdocml/dist/man_validate.c
N src/external/bsd/mdocml/dist/man_hash.c
N src/external/bsd/mdocml/dist/man.c
N src/external/bsd/mdocml/dist/man_macro.c
N src/external/bsd/mdocml/dist/out.c
N src/external/bsd/mdocml/dist/man_html.c
N src/external/bsd/mdocml/dist/mdoc_html.c
N src/external/bsd/mdocml/dist/html.c
N src/external/bsd/mdocml/dist/man_term.c
N src/external/bsd/mdocml/dist/compat.c
N src/external/bsd/mdocml/dist/tree.c
N src/external/bsd/mdocml/dist/term.c
N src/external/bsd/mdocml/dist/chars.c
N src/external/bsd/mdocml/dist/mdoc_term.c
N src/external/bsd/mdocml/dist/main.c
N src/external/bsd/mdocml/dist/st.c
N src/external/bsd/mdocml/dist/msec.c
N src/external/bsd/mdocml/dist/vol.c
N src/external/bsd/mdocml/dist/arch.c
N src/external/bsd/mdocml/dist/att.c
N src/external/bsd/mdocml/dist/lib.c
N src/external/bsd/mdocml/dist/mdoc_action.c
N src/external/bsd/mdocml/dist/mdoc_validate.c
N src/external/bsd/mdocml/dist/mdoc_argv.c
N src/external/bsd/mdocml/dist/mdoc_strings.c
N src/external/bsd/mdocml/dist/mdoc_hash.c
N src/external/bsd/mdocml/dist/mdoc.c

No conflicts created by this import



CVS commit: src/sys/ufs/ext2fs

2009-10-21 Thread Antti Kantee
Module Name:src
Committed By:   pooka
Date:   Wed Oct 21 17:37:21 UTC 2009

Modified Files:
src/sys/ufs/ext2fs: ext2fs_extern.h ext2fs_vfsops.c ext2fs_vnops.c

Log Message:
update i_uid and i_gid after chown


To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 src/sys/ufs/ext2fs/ext2fs_extern.h
cvs rdiff -u -r1.151 -r1.152 src/sys/ufs/ext2fs/ext2fs_vfsops.c
cvs rdiff -u -r1.90 -r1.91 src/sys/ufs/ext2fs/ext2fs_vnops.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/ufs/ext2fs/ext2fs_extern.h
diff -u src/sys/ufs/ext2fs/ext2fs_extern.h:1.41 src/sys/ufs/ext2fs/ext2fs_extern.h:1.42
--- src/sys/ufs/ext2fs/ext2fs_extern.h:1.41	Mon Oct 19 18:41:17 2009
+++ src/sys/ufs/ext2fs/ext2fs_extern.h	Wed Oct 21 17:37:21 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: ext2fs_extern.h,v 1.41 2009/10/19 18:41:17 bouyer Exp $	*/
+/*	$NetBSD: ext2fs_extern.h,v 1.42 2009/10/21 17:37:21 pooka Exp $	*/
 
 /*-
  * Copyright (c) 1991, 1993, 1994
@@ -138,6 +138,7 @@
 int ext2fs_flushfiles(struct mount *, int);
 int ext2fs_sbupdate(struct ufsmount *, int);
 int ext2fs_cgupdate(struct ufsmount *, int);
+void ext2fs_set_inode_guid(struct inode *);
 
 /* ext2fs_readwrite.c */
 int ext2fs_read(void *);

Index: src/sys/ufs/ext2fs/ext2fs_vfsops.c
diff -u src/sys/ufs/ext2fs/ext2fs_vfsops.c:1.151 src/sys/ufs/ext2fs/ext2fs_vfsops.c:1.152
--- src/sys/ufs/ext2fs/ext2fs_vfsops.c:1.151	Mon Oct 19 18:41:17 2009
+++ src/sys/ufs/ext2fs/ext2fs_vfsops.c	Wed Oct 21 17:37:21 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: ext2fs_vfsops.c,v 1.151 2009/10/19 18:41:17 bouyer Exp $	*/
+/*	$NetBSD: ext2fs_vfsops.c,v 1.152 2009/10/21 17:37:21 pooka Exp $	*/
 
 /*
  * Copyright (c) 1989, 1991, 1993, 1994
@@ -60,7 +60,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ext2fs_vfsops.c,v 1.151 2009/10/19 18:41:17 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ext2fs_vfsops.c,v 1.152 2009/10/21 17:37:21 pooka Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_compat_netbsd.h"
@@ -106,7 +106,6 @@
 
 int ext2fs_sbupdate(struct ufsmount *, int);
 static int ext2fs_checksb(struct ext2fs *, int);
-static void ext2fs_set_inode_guid(struct inode *);
 
 static struct sysctllog *ext2fs_sysctl_log;
 
@@ -164,7 +163,7 @@
 };
 
 /* Fill in the inode uid/gid from ext2 halves.  */
-static void
+void
 ext2fs_set_inode_guid(struct inode *ip)
 {
 

Index: src/sys/ufs/ext2fs/ext2fs_vnops.c
diff -u src/sys/ufs/ext2fs/ext2fs_vnops.c:1.90 src/sys/ufs/ext2fs/ext2fs_vnops.c:1.91
--- src/sys/ufs/ext2fs/ext2fs_vnops.c:1.90	Mon Oct 19 18:41:17 2009
+++ src/sys/ufs/ext2fs/ext2fs_vnops.c	Wed Oct 21 17:37:21 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: ext2fs_vnops.c,v 1.90 2009/10/19 18:41:17 bouyer Exp $	*/
+/*	$NetBSD: ext2fs_vnops.c,v 1.91 2009/10/21 17:37:21 pooka Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986, 1989, 1993
@@ -65,7 +65,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ext2fs_vnops.c,v 1.90 2009/10/19 18:41:17 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ext2fs_vnops.c,v 1.91 2009/10/21 17:37:21 pooka Exp $");
 
 #include 
 #include 
@@ -502,8 +502,10 @@
 		ip->i_e2fs_gid_high = 0;
 		ip->i_e2fs_uid_high = 0;
 	}
-	if (ouid != uid || ogid != gid)
+	if (ouid != uid || ogid != gid) {
+		ext2fs_set_inode_guid(ip);
 		ip->i_flag |= IN_CHANGE;
+	}
 	if (ouid != uid && kauth_authorize_generic(cred,
 	KAUTH_GENERIC_ISSUSER, NULL) != 0)
 		ip->i_e2fs_mode &= ~ISUID;



CVS commit: src/usr.bin/patch

2009-10-21 Thread Joerg Sonnenberger
Module Name:src
Committed By:   joerg
Date:   Wed Oct 21 17:16:11 UTC 2009

Modified Files:
src/usr.bin/patch: inp.c

Log Message:
Do not try to mmap a zero length file.


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/usr.bin/patch/inp.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/usr.bin/patch/inp.c
diff -u src/usr.bin/patch/inp.c:1.22 src/usr.bin/patch/inp.c:1.23
--- src/usr.bin/patch/inp.c:1.22	Fri Jun  5 19:55:43 2009
+++ src/usr.bin/patch/inp.c	Wed Oct 21 17:16:11 2009
@@ -1,7 +1,7 @@
 /*
  * $OpenBSD: inp.c,v 1.34 2006/03/11 19:41:30 otto Exp $
  * $DragonFly: src/usr.bin/patch/inp.c,v 1.6 2007/09/29 23:11:10 swildner Exp $
- * $NetBSD: inp.c,v 1.22 2009/06/05 19:55:43 joerg Exp $
+ * $NetBSD: inp.c,v 1.23 2009/10/21 17:16:11 joerg Exp $
  */
 
 /*
@@ -31,7 +31,7 @@
  */
 
 #include 
-__RCSID("$NetBSD: inp.c,v 1.22 2009/06/05 19:55:43 joerg Exp $");
+__RCSID("$NetBSD: inp.c,v 1.23 2009/10/21 17:16:11 joerg Exp $");
 
 #include 
 #include 
@@ -261,12 +261,16 @@
 	if ((ifd = open(filename, O_RDONLY)) < 0)
 		pfatal("can't open file %s", filename);
 
-	i_womp = mmap(NULL, i_size, PROT_READ, MAP_PRIVATE, ifd, 0);
-	if (i_womp == MAP_FAILED) {
-		perror("mmap failed");
+	if (i_size) {
+		i_womp = mmap(NULL, i_size, PROT_READ, MAP_PRIVATE, ifd, 0);
+		if (i_womp == MAP_FAILED) {
+			perror("mmap failed");
+			i_womp = NULL;
+			close(ifd);
+			return false;
+		}
+	} else {
 		i_womp = NULL;
-		close(ifd);
-		return false;
 	}
 
 	close(ifd);



CVS commit: src/sys/arch/acorn32/eb7500atx

2009-10-21 Thread Mindaugas Rasiukevicius
Module Name:src
Committed By:   rmind
Date:   Wed Oct 21 16:16:24 UTC 2009

Modified Files:
src/sys/arch/acorn32/eb7500atx: rsbus.c

Log Message:
Drop 3rd and 4th clauses from Ichiro FUKUHARA's license.
Reviewed and approved by ichiro@ (copyright holder).

(this single file was missed in previous commit)


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/acorn32/eb7500atx/rsbus.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/acorn32/eb7500atx/rsbus.c
diff -u src/sys/arch/acorn32/eb7500atx/rsbus.c:1.6 src/sys/arch/acorn32/eb7500atx/rsbus.c:1.7
--- src/sys/arch/acorn32/eb7500atx/rsbus.c:1.6	Sat Mar 14 15:35:58 2009
+++ src/sys/arch/acorn32/eb7500atx/rsbus.c	Wed Oct 21 16:16:24 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: rsbus.c,v 1.6 2009/03/14 15:35:58 dsl Exp $ */
+/* $NetBSD: rsbus.c,v 1.7 2009/10/21 16:16:24 rmind Exp $ */
 
 /*
  * Copyright (c) 2002
@@ -13,12 +13,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *notice, this list of conditions and the following disclaimer in the
  *documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *must display the following acknowledgement:
- *	This product includes software developed by Ichiro FUKUHARA.
- * 4. The name of the company nor the name of the author may be used to
- *endorse or promote products derived from this software without specific
- *prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY ICHIRO FUKUHARA ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -35,7 +29,7 @@
 
 #include 
 
-__KERNEL_RCSID(0, "$NetBSD: rsbus.c,v 1.6 2009/03/14 15:35:58 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rsbus.c,v 1.7 2009/10/21 16:16:24 rmind Exp $");
 
 #include 
 #include 



CVS commit: src/distrib/notes/common

2009-10-21 Thread Soren Jacobsen
Module Name:src
Committed By:   snj
Date:   Wed Oct 21 16:13:36 UTC 2009

Modified Files:
src/distrib/notes/common: legal.common

Log Message:
jmcneill's ad clause is gone.


To generate a diff of this commit:
cvs rdiff -u -r1.65 -r1.66 src/distrib/notes/common/legal.common

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/distrib/notes/common/legal.common
diff -u src/distrib/notes/common/legal.common:1.65 src/distrib/notes/common/legal.common:1.66
--- src/distrib/notes/common/legal.common:1.65	Wed Oct 21 05:45:35 2009
+++ src/distrib/notes/common/legal.common	Wed Oct 21 16:13:36 2009
@@ -1,4 +1,4 @@
-.\"	$NetBSD: legal.common,v 1.65 2009/10/21 05:45:35 snj Exp $
+.\"	$NetBSD: legal.common,v 1.66 2009/10/21 16:13:36 snj Exp $
 .\"
 .\" Copyright (c) 1999-2004 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -279,8 +279,6 @@
 .It
 This product includes software developed by James R. Maynard III.
 .It
-This product includes software developed by Jared D. McNeill.
-.It
 This product includes software developed by Jason L. Wright
 .It
 This product includes software developed by Jason R. Thorpe



CVS commit: src/usr.bin/systat

2009-10-21 Thread Thomas Klausner
Module Name:src
Committed By:   wiz
Date:   Wed Oct 21 13:56:36 UTC 2009

Modified Files:
src/usr.bin/systat: syscall.c vmstat.c

Log Message:
Fix problems with SIGWINCH. From Paul Ripke in PR 42161.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/usr.bin/systat/syscall.c
cvs rdiff -u -r1.73 -r1.74 src/usr.bin/systat/vmstat.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/usr.bin/systat/syscall.c
diff -u src/usr.bin/systat/syscall.c:1.6 src/usr.bin/systat/syscall.c:1.7
--- src/usr.bin/systat/syscall.c:1.6	Mon Apr 13 23:20:27 2009
+++ src/usr.bin/systat/syscall.c	Wed Oct 21 13:56:36 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: syscall.c,v 1.6 2009/04/13 23:20:27 lukem Exp $	*/
+/*	$NetBSD: syscall.c,v 1.7 2009/10/21 13:56:36 wiz Exp $	*/
 
 /*-
  * Copyright (c) 2006 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include 
-__RCSID("$NetBSD: syscall.c,v 1.6 2009/04/13 23:20:27 lukem Exp $");
+__RCSID("$NetBSD: syscall.c,v 1.7 2009/10/21 13:56:36 wiz Exp $");
 
 /* System call stats */
 
@@ -201,9 +201,8 @@
 		etime = cur.cp_etime;
 		/* < 5 ticks - ignore this trash */
 		if ((etime * hertz) < 1.0) {
-			if (failcnt++ > MAXFAIL)
+			if (failcnt++ <= MAXFAIL)
 return;
-			failcnt = 0;
 			clear();
 			mvprintw(2, 10, "The alternate system clock has died!");
 			mvprintw(3, 10, "Reverting to ``pigs'' display.");

Index: src/usr.bin/systat/vmstat.c
diff -u src/usr.bin/systat/vmstat.c:1.73 src/usr.bin/systat/vmstat.c:1.74
--- src/usr.bin/systat/vmstat.c:1.73	Mon Apr 13 23:20:27 2009
+++ src/usr.bin/systat/vmstat.c	Wed Oct 21 13:56:36 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: vmstat.c,v 1.73 2009/04/13 23:20:27 lukem Exp $	*/
+/*	$NetBSD: vmstat.c,v 1.74 2009/10/21 13:56:36 wiz Exp $	*/
 
 /*-
  * Copyright (c) 1983, 1989, 1992, 1993
@@ -34,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)vmstat.c	8.2 (Berkeley) 1/12/94";
 #endif
-__RCSID("$NetBSD: vmstat.c,v 1.73 2009/04/13 23:20:27 lukem Exp $");
+__RCSID("$NetBSD: vmstat.c,v 1.74 2009/10/21 13:56:36 wiz Exp $");
 #endif /* not lint */
 
 /*
@@ -498,7 +498,7 @@
 		etime = cur.cp_etime;
 		/* < 5 ticks - ignore this trash */
 		if ((etime * hertz) < 1.0) {
-			if (failcnt++ > MAXFAIL)
+			if (failcnt++ <= MAXFAIL)
 return;
 			clear();
 			mvprintw(2, 10, "The alternate system clock has died!");



CVS commit: src/distrib/common

2009-10-21 Thread David Brownlee
Module Name:src
Committed By:   abs
Date:   Wed Oct 21 11:35:19 UTC 2009

Modified Files:
src/distrib/common: mktermcap

Log Message:
update to generate something closer to common/termcap


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/distrib/common/mktermcap

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/distrib/common/mktermcap
diff -u src/distrib/common/mktermcap:1.4 src/distrib/common/mktermcap:1.5
--- src/distrib/common/mktermcap:1.4	Mon Dec 22 18:58:22 2008
+++ src/distrib/common/mktermcap	Wed Oct 21 11:35:19 2009
@@ -1,11 +1,13 @@
 #!/bin/sh
-#	$NetBSD: mktermcap,v 1.4 2008/12/22 18:58:22 christos Exp $
+#	$NetBSD: mktermcap,v 1.5 2009/10/21 11:35:19 abs Exp $
+#
+# Note - output has been further adjusted by hand to save space
 
-TARGET=termcap.mini
+TARGET=termcap
 
+# x68k pulls in vt220
 echo "#	\$NetBSD\$" > ${TARGET}
-for t in wsvt25m vt100 vt220 xterm ansi
+for t in wsvt25m vt100 xterm ansi dumb hp300h iris-ansi iris-ansi-ap sun x68k
 do
 	getent termcap -rp $t
-	echo
-done >> ${TARGET}
+done | sed 's/^	//' | grep . >> ${TARGET}