date:20090609

CVS commit: src

2009-06-09 Thread Havard Eidnes

Module Name:src
Committed By:   he
Date:   Tue Jun  9 11:06:10 UTC 2009

Modified Files:
src/distrib/sparc/ramdisk: Makefile list
src/sys/arch/sparc/conf: INSTALL

Log Message:
Add -lprop to the ramdisk build, so that it builds again, due to
recent changes in newfs.  Bump the ramdisk size from 1536 to 1800
blocks as a consequence.


To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 src/distrib/sparc/ramdisk/Makefile
cvs rdiff -u -r1.18 -r1.19 src/distrib/sparc/ramdisk/list
cvs rdiff -u -r1.68 -r1.69 src/sys/arch/sparc/conf/INSTALL

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

Modified files:

Index: src/distrib/sparc/ramdisk/Makefile
diff -u src/distrib/sparc/ramdisk/Makefile:1.40 src/distrib/sparc/ramdisk/Makefile:1.41
--- src/distrib/sparc/ramdisk/Makefile:1.40	Wed Jun 25 03:33:06 2008
+++ src/distrib/sparc/ramdisk/Makefile	Tue Jun  9 11:06:09 2009
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.40 2008/06/25 03:33:06 matt Exp $
+#	$NetBSD: Makefile,v 1.41 2009/06/09 11:06:09 he Exp $
 #
 # ramdisk.fs is the microroot filesystem intended for use with
 # the INSTALL kernel. It provides just enough tools to extract the
@@ -10,7 +10,7 @@
 .include ${NETBSDSRCDIR}/distrib/common/Makefile.distrib
 
 IMAGE=		ramdisk.fs
-IMAGESIZE=	1536b
+IMAGESIZE=	1800b
 
 WARNS=		1
 DBG=		-Os

Index: src/distrib/sparc/ramdisk/list
diff -u src/distrib/sparc/ramdisk/list:1.18 src/distrib/sparc/ramdisk/list:1.19
--- src/distrib/sparc/ramdisk/list:1.18	Wed Jun 26 16:17:41 2002
+++ src/distrib/sparc/ramdisk/list	Tue Jun  9 11:06:09 2009
@@ -1,4 +1,4 @@
-#	$NetBSD: list,v 1.18 2002/06/26 16:17:41 grant Exp $
+#	$NetBSD: list,v 1.19 2009/06/09 11:06:09 he Exp $
 
 SRCDIRS bin sbin usr.bin usr.sbin
 
@@ -25,7 +25,7 @@
 SPECIAL	gzip		srcdir distrib/utils/x_gzip
 SPECIAL	umount		srcdir distrib/utils/x_umount
 
-LIBS	libhack.o -lz -ll -lutil -lrmt
+LIBS	libhack.o -lz -ll -lutil -lrmt -lprop
 
 COPY	${CURDIR}/dot.profile .profile
 

Index: src/sys/arch/sparc/conf/INSTALL
diff -u src/sys/arch/sparc/conf/INSTALL:1.68 src/sys/arch/sparc/conf/INSTALL:1.69
--- src/sys/arch/sparc/conf/INSTALL:1.68	Tue May  5 23:58:50 2009
+++ src/sys/arch/sparc/conf/INSTALL	Tue Jun  9 11:06:09 2009
@@ -1,4 +1,4 @@
-#	$NetBSD: INSTALL,v 1.68 2009/05/05 23:58:50 macallan Exp $
+#	$NetBSD: INSTALL,v 1.69 2009/06/09 11:06:09 he Exp $
 #
 # from: NetBSD: GENERIC,v 1.84 1999/06/06 13:00:03 mrg Exp
 #
@@ -19,7 +19,7 @@
 options 	MEMORY_DISK_SERVER=0	# no userspace memory disk support
 ## The miniroot size must be kept in sync manually with the size of
 ## the `ramdisk' image (which is built in distrib/sparc/ramdisk).
-options 	MEMORY_DISK_ROOT_SIZE=1536	# size of memory disk, in blocks
+options 	MEMORY_DISK_ROOT_SIZE=1800	# size of memory disk, in blocks
 options 	MEMORY_DISK_RBFLAGS=RB_SINGLE	# boot in single-user mode
 
 pseudo-device	md		1	# memory disk device (ramdisk)

CVS commit: src/distrib/sets/lists/comp

2009-06-09 Thread Nicolas Joly

Module Name:src
Committed By:   njoly
Date:   Tue Jun  9 12:16:07 UTC 2009

Modified Files:
src/distrib/sets/lists/comp: mi

Log Message:
+netpgpverify.debug


To generate a diff of this commit:
cvs rdiff -u -r1.1268 -r1.1269 src/distrib/sets/lists/comp/mi

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.1268 src/distrib/sets/lists/comp/mi:1.1269
--- src/distrib/sets/lists/comp/mi:1.1268	Tue Jun  9 05:44:42 2009
+++ src/distrib/sets/lists/comp/mi	Tue Jun  9 12:16:06 2009
@@ -1,4 +1,4 @@
-#	$NetBSD: mi,v 1.1268 2009/06/09 05:44:42 mrg Exp $
+#	$NetBSD: mi,v 1.1269 2009/06/09 12:16:06 njoly Exp $
 #
 # Note: don't delete entries from here - mark them as obsolete instead.
 #
@@ -2976,6 +2976,7 @@
 ./usr/libdata/debug/usr/bin/nbsvtool.debug	comp-crypto-debug	crypto,debug
 ./usr/libdata/debug/usr/bin/netgroup.debug	comp-nis-debug		debug
 ./usr/libdata/debug/usr/bin/netpgp.debug	comp-crypto-debug	crypto,debug
+./usr/libdata/debug/usr/bin/netpgpverify.debug	comp-crypto-debug	crypto,debug
 ./usr/libdata/debug/usr/bin/netstat.debug	comp-netutil-debug	debug
 ./usr/libdata/debug/usr/bin/newgrp.debug	comp-util-debug		debug
 ./usr/libdata/debug/usr/bin/newsyslog.debug	comp-util-debug		debug

CVS commit: src/lib/libedit

2009-06-09 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Tue Jun  9 13:04:34 UTC 2009

Modified Files:
src/lib/libedit: read.c

Log Message:
decrement the number of levels after the loop (Julien Torres)


To generate a diff of this commit:
cvs rdiff -u -r1.50 -r1.51 src/lib/libedit/read.c

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

Modified files:

Index: src/lib/libedit/read.c
diff -u src/lib/libedit/read.c:1.50 src/lib/libedit/read.c:1.51
--- src/lib/libedit/read.c:1.50	Mon Jun  8 11:10:53 2009
+++ src/lib/libedit/read.c	Tue Jun  9 09:04:33 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: read.c,v 1.50 2009/06/08 15:10:53 christos Exp $	*/
+/*	$NetBSD: read.c,v 1.51 2009/06/09 13:04:33 christos Exp $	*/
 
 /*-
  * Copyright (c) 1992, 1993
@@ -37,7 +37,7 @@
 #if 0
 static char sccsid[] = @(#)read.c	8.1 (Berkeley) 6/4/93;
 #else
-__RCSID($NetBSD: read.c,v 1.50 2009/06/08 15:10:53 christos Exp $);
+__RCSID($NetBSD: read.c,v 1.51 2009/06/09 13:04:33 christos Exp $);
 #endif
 #endif /* not lint  not SCCSID */
 
@@ -321,9 +321,9 @@
 	int i;
 
 	el_free(ma-macro[0]);
-	ma-level--;
 	for (i = 0; i  ma-level; i++)
 		ma-macro[i] = ma-macro[i + 1];
+	ma-level--;
 	ma-offset = 0;
 }

CVS commit: src/share/man/man7

2009-06-09 Thread Christoph Egger

Module Name:src
Committed By:   cegger
Date:   Tue Jun  9 13:05:15 UTC 2009

Modified Files:
src/share/man/man7: hier.7

Log Message:
X11R6 - X11R7
ok wiz@


To generate a diff of this commit:
cvs rdiff -u -r1.86 -r1.87 src/share/man/man7/hier.7

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/man7/hier.7
diff -u src/share/man/man7/hier.7:1.86 src/share/man/man7/hier.7:1.87
--- src/share/man/man7/hier.7:1.86	Mon May 18 12:07:30 2009
+++ src/share/man/man7/hier.7	Tue Jun  9 13:05:15 2009
@@ -1,4 +1,4 @@
-.\	$NetBSD: hier.7,v 1.86 2009/05/18 12:07:30 wiz Exp $
+.\	$NetBSD: hier.7,v 1.87 2009/06/09 13:05:15 cegger Exp $
 .\
 .\ Copyright (c) 1990, 1993, 1994
 .\	The Regents of the University of California.  All rights reserved.
@@ -29,7 +29,7 @@
 .\
 .\	@(#)hier.7	8.5 (Berkeley) 6/1/94
 .\
-.Dd January 13, 2009
+.Dd June 9, 2009
 .Dt HIER 7
 .Os
 .Sh NAME
@@ -402,7 +402,7 @@
 contains the majority of the system utilities and files
 .Pp
 .Bl -tag -width libdata/ -compact
-.It Sy X11R6/
+.It Sy X11R7/
 X11 files
 .Pp
 .Bl -tag -width include/ -compact

CVS commit: src/crypto/external/bsd/openssh/dist

2009-06-09 Thread Arnaud Ysmal

Module Name:src
Committed By:   stacktic
Date:   Tue Jun  9 13:32:46 UTC 2009

Modified Files:
src/crypto/external/bsd/openssh/dist: scp.c sshconnect2.c

Log Message:
Fixed strvisx usage


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/openssh/dist/scp.c \
src/crypto/external/bsd/openssh/dist/sshconnect2.c

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

Modified files:

Index: src/crypto/external/bsd/openssh/dist/scp.c
diff -u src/crypto/external/bsd/openssh/dist/scp.c:1.2 src/crypto/external/bsd/openssh/dist/scp.c:1.3
--- src/crypto/external/bsd/openssh/dist/scp.c:1.2	Sun Jun  7 22:38:47 2009
+++ src/crypto/external/bsd/openssh/dist/scp.c	Tue Jun  9 13:32:46 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: scp.c,v 1.2 2009/06/07 22:38:47 christos Exp $	*/
+/*	$NetBSD: scp.c,v 1.3 2009/06/09 13:32:46 stacktic Exp $	*/
 /* $OpenBSD: scp.c,v 1.164 2008/10/10 04:55:16 stevesk Exp $ */
 /*
  * scp - secure remote copy.  This is basically patched BSD rcp which
@@ -73,7 +73,7 @@
  */
 
 #include includes.h
-__RCSID($NetBSD: scp.c,v 1.2 2009/06/07 22:38:47 christos Exp $);
+__RCSID($NetBSD: scp.c,v 1.3 2009/06/09 13:32:46 stacktic Exp $);
 #include sys/param.h
 #include sys/types.h
 #include sys/poll.h
@@ -630,7 +630,7 @@
 		if ((fd = open(name, O_RDONLY|O_NONBLOCK, 0))  0)
 			goto syserr;
 		if (strchr(name, '\n') != NULL) {
-			strvisx(encname, name, sizeof(encname), VIS_NL);
+			strvisx(encname, name, len, VIS_NL);
 			name = encname;
 		}
 		if (fstat(fd, stb)  0) {
Index: src/crypto/external/bsd/openssh/dist/sshconnect2.c
diff -u src/crypto/external/bsd/openssh/dist/sshconnect2.c:1.2 src/crypto/external/bsd/openssh/dist/sshconnect2.c:1.3
--- src/crypto/external/bsd/openssh/dist/sshconnect2.c:1.2	Sun Jun  7 22:38:47 2009
+++ src/crypto/external/bsd/openssh/dist/sshconnect2.c	Tue Jun  9 13:32:46 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: sshconnect2.c,v 1.2 2009/06/07 22:38:47 christos Exp $	*/
+/*	$NetBSD: sshconnect2.c,v 1.3 2009/06/09 13:32:46 stacktic Exp $	*/
 /* $OpenBSD: sshconnect2.c,v 1.170 2008/11/04 08:22:13 djm Exp $ */
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
@@ -26,7 +26,7 @@
  */
 
 #include includes.h
-__RCSID($NetBSD: sshconnect2.c,v 1.2 2009/06/07 22:38:47 christos Exp $);
+__RCSID($NetBSD: sshconnect2.c,v 1.3 2009/06/09 13:32:46 stacktic Exp $);
 #include sys/types.h
 #include sys/socket.h
 #include sys/wait.h
@@ -450,7 +450,7 @@
 		if (len  65536)
 			len = 65536;
 		msg = xmalloc(len * 4 + 1); /* max expansion from strnvis() */
-		strvisx(msg, raw, len * 4 + 1, VIS_SAFE|VIS_OCTAL);
+		strvisx(msg, raw, len, VIS_SAFE|VIS_OCTAL);
 		fprintf(stderr, %s, msg);
 		xfree(msg);
 	}

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

2009-06-09 Thread Antti Kantee

Module Name:src
Committed By:   pooka
Date:   Tue Jun  9 14:20:42 UTC 2009

Modified Files:
src/sys/rump/librump/rumpvfs: Makefile.rumpvfs rumpfs.c

Log Message:
Put some spunk into deadfs.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/rump/librump/rumpvfs/Makefile.rumpvfs
cvs rdiff -u -r1.17 -r1.18 src/sys/rump/librump/rumpvfs/rumpfs.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/rumpvfs/Makefile.rumpvfs
diff -u src/sys/rump/librump/rumpvfs/Makefile.rumpvfs:1.7 src/sys/rump/librump/rumpvfs/Makefile.rumpvfs:1.8
--- src/sys/rump/librump/rumpvfs/Makefile.rumpvfs:1.7	Fri May 22 08:59:32 2009
+++ src/sys/rump/librump/rumpvfs/Makefile.rumpvfs	Tue Jun  9 14:20:42 2009
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.rumpvfs,v 1.7 2009/05/22 08:59:32 pooka Exp $
+#	$NetBSD: Makefile.rumpvfs,v 1.8 2009/06/09 14:20:42 pooka Exp $
 #
 
 .include ${RUMPTOP}/Makefile.rump
@@ -8,7 +8,7 @@
 .PATH:	${RUMPTOP}/librump/rumpvfs\
 	${RUMPTOP}/../kern ${RUMPTOP}/../lib/libkern		\
 	${RUMPTOP}/../miscfs/genfs ${RUMPTOP}/../miscfs/syncfs	\
-	${RUMPTOP}/../miscfs/specfs\
+	${RUMPTOP}/../miscfs/specfs ${RUMPTOP}/../miscfs/deadfs	\
 	${RUMPTOP}/../compat/common
 
 #
@@ -26,6 +26,9 @@
 # sys/miscfs/syncfs
 SRCS+=	sync_subr.c sync_vnops.c
 
+# sys/miscfs/deadfs
+SRCS+=	dead_vnops.c
+
 # sys/miscfs
 SRCS+=	genfs_vfsops.c genfs_vnops.c spec_vnops.c
 

Index: src/sys/rump/librump/rumpvfs/rumpfs.c
diff -u src/sys/rump/librump/rumpvfs/rumpfs.c:1.17 src/sys/rump/librump/rumpvfs/rumpfs.c:1.18
--- src/sys/rump/librump/rumpvfs/rumpfs.c:1.17	Tue May 19 13:42:35 2009
+++ src/sys/rump/librump/rumpvfs/rumpfs.c	Tue Jun  9 14:20:42 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: rumpfs.c,v 1.17 2009/05/19 13:42:35 pooka Exp $	*/
+/*	$NetBSD: rumpfs.c,v 1.18 2009/06/09 14:20:42 pooka Exp $	*/
 
 /*
  * Copyright (c) 2007 Antti Kantee.  All Rights Reserved.
@@ -28,7 +28,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: rumpfs.c,v 1.17 2009/05/19 13:42:35 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: rumpfs.c,v 1.18 2009/06/09 14:20:42 pooka Exp $);
 
 #include sys/param.h
 #include sys/mount.h
@@ -60,14 +60,6 @@
 static int rump_vop_reclaim(void *);
 static int rump_vop_success(void *);
 
-int (**dead_vnodeop_p)(void *);
-const struct vnodeopv_entry_desc dead_vnodeop_entries[] = {
-	{ vop_default_desc, vn_default_error },
-	{ NULL, NULL }
-};
-const struct vnodeopv_desc dead_vnodeop_opv_desc =
-	{ dead_vnodeop_p, dead_vnodeop_entries };
-
 int (**fifo_vnodeop_p)(void *);
 const struct vnodeopv_entry_desc fifo_vnodeop_entries[] = {
 	{ vop_default_desc, vn_default_error },

CVS commit: src/usr.sbin/puffs/rump_syspuffs

2009-06-09 Thread Antti Kantee

Module Name:src
Committed By:   pooka
Date:   Tue Jun  9 14:27:17 UTC 2009

Modified Files:
src/usr.sbin/puffs/rump_syspuffs: rump_syspuffs.8

Log Message:
+pseudo-device putter


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/puffs/rump_syspuffs/rump_syspuffs.8

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

Modified files:

Index: src/usr.sbin/puffs/rump_syspuffs/rump_syspuffs.8
diff -u src/usr.sbin/puffs/rump_syspuffs/rump_syspuffs.8:1.2 src/usr.sbin/puffs/rump_syspuffs/rump_syspuffs.8:1.3
--- src/usr.sbin/puffs/rump_syspuffs/rump_syspuffs.8:1.2	Sun Jan 11 22:03:10 2009
+++ src/usr.sbin/puffs/rump_syspuffs/rump_syspuffs.8	Tue Jun  9 14:27:17 2009
@@ -1,4 +1,4 @@
-.\	$NetBSD: rump_syspuffs.8,v 1.2 2009/01/11 22:03:10 wiz Exp $
+.\	$NetBSD: rump_syspuffs.8,v 1.3 2009/06/09 14:27:17 pooka Exp $
 .\
 .\ Copyright (c) 2008 Antti Kantee. All rights reserved.
 .\
@@ -23,7 +23,7 @@
 .\ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\ SUCH DAMAGE.
 .\
-.Dd August 9, 2008
+.Dd June 9, 2009
 .Dt RUMP_SYSPUFFS 8
 .Os
 .Sh NAME
@@ -31,6 +31,7 @@
 .Nd mount a puffs file server with a userspace puffs loop
 .Sh SYNOPSIS
 .Cd file-system PUFFS
+.Cd pseudo-device putter
 .Pp
 .Nm
 .Ar file_server

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

2009-06-09 Thread Antti Kantee

Module Name:src
Committed By:   pooka
Date:   Tue Jun  9 15:53:05 UTC 2009

Modified Files:
src/sys/rump/librump/rumpkern: ltsleep.c

Log Message:
simplelocks have been supported in rump for a while, allow their use.


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/rump/librump/rumpkern/ltsleep.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/ltsleep.c
diff -u src/sys/rump/librump/rumpkern/ltsleep.c:1.12 src/sys/rump/librump/rumpkern/ltsleep.c:1.13
--- src/sys/rump/librump/rumpkern/ltsleep.c:1.12	Wed Jun  3 15:16:42 2009
+++ src/sys/rump/librump/rumpkern/ltsleep.c	Tue Jun  9 15:53:05 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: ltsleep.c,v 1.12 2009/06/03 15:16:42 pooka Exp $	*/
+/*	$NetBSD: ltsleep.c,v 1.13 2009/06/09 15:53:05 pooka Exp $	*/
 
 /*
  * Copyright (c) 2007 Antti Kantee.  All Rights Reserved.
@@ -29,7 +29,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ltsleep.c,v 1.12 2009/06/03 15:16:42 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: ltsleep.c,v 1.13 2009/06/09 15:53:05 pooka Exp $);
 
 #include sys/param.h
 #include sys/proc.h
@@ -57,13 +57,11 @@
 {
 	struct ltsleeper lts;
 
-	if (__predict_false(slock))
-		panic(simplelock not supported by rump, convert code);
-
 	lts.id = ident;
 	cv_init(lts.cv, NULL);
 
 	mutex_enter(sleepermtx);
+	simple_unlock(slock);
 	LIST_INSERT_HEAD(sleepers, lts, entries);
 
 	/* protected by sleepermtx */
@@ -74,6 +72,9 @@
 
 	cv_destroy(lts.cv);
 
+	if (slock  (prio  PNORELOCK) == 0)
+		simple_lock(slock);
+
 	return 0;
 }

CVS commit: src/sys/arch/xen/xen

2009-06-09 Thread Christoph Egger

Module Name:src
Committed By:   cegger
Date:   Tue Jun  9 16:08:00 UTC 2009

Modified Files:
src/sys/arch/xen/xen: xencons.c

Log Message:
Fix crash on Dom0 resume.
A xencons interrupt may occur before xencons device has been resumed.
Fix tested in jym-xensuspend branch.


To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/sys/arch/xen/xen/xencons.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/xen/xen/xencons.c
diff -u src/sys/arch/xen/xen/xencons.c:1.31 src/sys/arch/xen/xen/xencons.c:1.32
--- src/sys/arch/xen/xen/xencons.c:1.31	Fri Jan 16 20:16:47 2009
+++ src/sys/arch/xen/xen/xencons.c	Tue Jun  9 16:08:00 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: xencons.c,v 1.31 2009/01/16 20:16:47 jym Exp $	*/
+/*	$NetBSD: xencons.c,v 1.32 2009/06/09 16:08:00 cegger Exp $	*/
 
 /*
  * Copyright (c) 2006 Manuel Bouyer.
@@ -63,7 +63,7 @@
 
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: xencons.c,v 1.31 2009/01/16 20:16:47 jym Exp $);
+__KERNEL_RCSID(0, $NetBSD: xencons.c,v 1.32 2009/06/09 16:08:00 cegger Exp $);
 
 #include opt_xen.h
 
@@ -559,6 +559,10 @@
 	int len;
 	struct xencons_softc *sc = p;
 
+	if (sc == NULL)
+		/* Interrupt may happen during resume */
+		return 1;
+
 	if (sc-polling)
 		return 1;

CVS commit: [netbsd-5-0] src/external/mit/xorg/server/drivers/xf86-video-s3

2009-06-09 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Tue Jun  9 17:26:27 UTC 2009

Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-s3 [netbsd-5-0]:
Makefile

Log Message:
Apply patch (requested by ahoka in ticket #795):
Add missing object file to build a properly working s3 module.
Fixes PR xsrc/41206.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.3.12.1 \
src/external/mit/xorg/server/drivers/xf86-video-s3/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/mit/xorg/server/drivers/xf86-video-s3/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-s3/Makefile:1.3 src/external/mit/xorg/server/drivers/xf86-video-s3/Makefile:1.3.12.1
--- src/external/mit/xorg/server/drivers/xf86-video-s3/Makefile:1.3	Sun Aug  3 09:24:14 2008
+++ src/external/mit/xorg/server/drivers/xf86-video-s3/Makefile	Tue Jun  9 17:26:27 2009
@@ -1,10 +1,19 @@
-#	$NetBSD: Makefile,v 1.3 2008/08/03 09:24:14 rtr Exp $
+#	$NetBSD: Makefile,v 1.3.12.1 2009/06/09 17:26:27 snj Exp $
 
 DRIVER=		xf86-video-s3
 DRIVER_NAME=	s3_drv
 
-SRCS=		s3_bios.c s3_cursor.c s3_dga.c s3_driver.c s3_IBMRGB.c
-SRCS+=		s3_Ti.c s3_Trio64DAC.c s3_video.c
+SRCS=		s3_bios.c s3_cursor.c s3_dga.c s3_driver.c s3_IBMRGB.c \
+		s3_Ti.c s3_Trio64DAC.c s3_video.c s3_accel.c \  
+		s3_accel_newmmio.c  
+   
+# PLEASE NOTE: s3_accel.c is compiled two times with different 
+# cpp macros for PIO and NEWMMIO support. Check Makefile.am
+# before upgrading the driver. 
+#  
+BUILDSYMLINKS=	s3_accel.c s3_accel_newmmio.c   
+CPPFLAGS.s3_accel_newmmio.c+=	-DS3_NEWMMIO=1 \
+-I${X11SRCDIR.xf86-video-s3}/src
 
 CPPFLAGS.s3_driver.c=	-Wno-error	# XXX fix me please
 .include ../Makefile.xf86-driver

CVS commit: [netbsd-5] src/sys/netinet

2009-06-09 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Tue Jun  9 17:31:46 UTC 2009

Modified Files:
src/sys/netinet [netbsd-5]: ip_carp.c

Log Message:
Pull up following revision(s) (requested by taca in ticket #796):
sys/netinet/ip_carp.c: revision 1.38
Make ip_carp.c compile, fixing usage of CARP_LOG().


To generate a diff of this commit:
cvs rdiff -u -r1.26.10.1 -r1.26.10.2 src/sys/netinet/ip_carp.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/netinet/ip_carp.c
diff -u src/sys/netinet/ip_carp.c:1.26.10.1 src/sys/netinet/ip_carp.c:1.26.10.2
--- src/sys/netinet/ip_carp.c:1.26.10.1	Fri Jun  5 18:24:01 2009
+++ src/sys/netinet/ip_carp.c	Tue Jun  9 17:31:46 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: ip_carp.c,v 1.26.10.1 2009/06/05 18:24:01 snj Exp $	*/
+/*	$NetBSD: ip_carp.c,v 1.26.10.2 2009/06/09 17:31:46 snj Exp $	*/
 /*	$OpenBSD: ip_carp.c,v 1.113 2005/11/04 08:11:54 mcbride Exp $	*/
 
 /*
@@ -28,7 +28,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ip_carp.c,v 1.26.10.1 2009/06/05 18:24:01 snj Exp $);
+__KERNEL_RCSID(0, $NetBSD: ip_carp.c,v 1.26.10.2 2009/06/09 17:31:46 snj Exp $);
 
 /*
  * TODO:
@@ -697,7 +697,7 @@
 		if (timercmp(sc_tv, ch_tv, ) ||
 		timercmp(sc_tv, ch_tv, ==)) {
 			callout_stop(sc-sc_ad_tmo);
-			CARP_LOG(sc, MASTER - BACKUP (more frequent advertisement received));
+			CARP_LOG(sc, (MASTER - BACKUP (more frequent advertisement received)));
 			carp_set_state(sc, BACKUP);
 			carp_setrun(sc, 0);
 			carp_setroute(sc, RTM_DELETE);
@@ -709,7 +709,7 @@
 		 * and this one claims to be slower, treat him as down.
 		 */
 		if (carp_opts[CARPCTL_PREEMPT]  timercmp(sc_tv, ch_tv, )) {
-			CARP_LOG(sc, BACKUP - MASTER (preempting a slower master));
+			CARP_LOG(sc, (BACKUP - MASTER (preempting a slower master)));
 			carp_master_down(sc);
 			break;
 		}
@@ -721,7 +721,7 @@
 		 */
 		sc_tv.tv_sec = sc-sc_advbase * 3;
 		if (timercmp(sc_tv, ch_tv, )) {
-			CARP_LOG(sc, BACKUP - MASTER (master timed out))
+			CARP_LOG(sc, (BACKUP - MASTER (master timed out)));
 			carp_master_down(sc);
 			break;
 		}
@@ -1392,7 +1392,7 @@
 	case MASTER:
 		break;
 	case BACKUP:
-		CARP_LOG(sc, INIT - MASTER (preempting));
+		CARP_LOG(sc, (INIT - MASTER (preempting)));
 		carp_set_state(sc, MASTER);
 		carp_send_ad(sc);
 		carp_send_arp(sc);

CVS commit: [netbsd-5] src/bin/df

2009-06-09 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Tue Jun  9 17:35:38 UTC 2009

Modified Files:
src/bin/df [netbsd-5]: df.c

Log Message:
Pull up following revision(s) (requested by mlelstv in ticket #797):
bin/df/df.c: revision 1.86
block numbers are measured in f_frsize units. Make -P option
use this instead of f_bsize. Also account for reserved blocks
like normal non-P output.
Fixes PR bin/41541.


To generate a diff of this commit:
cvs rdiff -u -r1.83 -r1.83.4.1 src/bin/df/df.c

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

Modified files:

Index: src/bin/df/df.c
diff -u src/bin/df/df.c:1.83 src/bin/df/df.c:1.83.4.1
--- src/bin/df/df.c:1.83	Sun Jul 20 00:52:39 2008
+++ src/bin/df/df.c	Tue Jun  9 17:35:38 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: df.c,v 1.83 2008/07/20 00:52:39 lukem Exp $ */
+/*	$NetBSD: df.c,v 1.83.4.1 2009/06/09 17:35:38 snj Exp $ */
 
 /*
  * Copyright (c) 1980, 1990, 1993, 1994
@@ -45,7 +45,7 @@
 #if 0
 static char sccsid[] = @(#)df.c	8.7 (Berkeley) 4/2/94;
 #else
-__RCSID($NetBSD: df.c,v 1.83 2008/07/20 00:52:39 lukem Exp $);
+__RCSID($NetBSD: df.c,v 1.83.4.1 2009/06/09 17:35:38 snj Exp $);
 #endif
 #endif /* not lint */
 
@@ -473,9 +473,9 @@
 		 */
 		(void)printf(%s % PRId64  % PRId64  % PRId64  %s %s\n,
 		sfsp-f_mntfromname,
-		fsbtoblk(sfsp-f_blocks, sfsp-f_bsize, blocksize),
-		fsbtoblk(used, sfsp-f_bsize, blocksize),
-		fsbtoblk(sfsp-f_bavail, sfsp-f_bsize, blocksize),
+		fsbtoblk(sfsp-f_blocks, sfsp-f_frsize, blocksize),
+		fsbtoblk(used, sfsp-f_frsize, blocksize),
+		fsbtoblk(bavail, sfsp-f_frsize, blocksize),
 		availblks == 0 ? full : strpct64((uint64_t) used,
 		(uint64_t) availblks, 0), sfsp-f_mntonname);
 		/*

CVS commit: [netbsd-5] src/sys/arch/alpha

2009-06-09 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Tue Jun  9 17:38:39 UTC 2009

Modified Files:
src/sys/arch/alpha/alpha [netbsd-5]: locore.s vm_machdep.c
src/sys/arch/alpha/include [netbsd-5]: alpha.h

Log Message:
Pull up following revision(s) (requested by martin in ticket #798):
sys/arch/alpha/alpha/locore.s: revision 1.114
sys/arch/alpha/alpha/vm_machdep.c: revision 1.100
sys/arch/alpha/include/alpha.h: revision 1.24
Do not use lwp_trampoline for cpu_setfunc, but a simplified setfunc_trampoline
that does not call lwp_startup() instead.


To generate a diff of this commit:
cvs rdiff -u -r1.113 -r1.113.10.1 src/sys/arch/alpha/alpha/locore.s
cvs rdiff -u -r1.96 -r1.96.30.1 src/sys/arch/alpha/alpha/vm_machdep.c
cvs rdiff -u -r1.23 -r1.23.28.1 src/sys/arch/alpha/include/alpha.h

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/alpha/alpha/locore.s
diff -u src/sys/arch/alpha/alpha/locore.s:1.113 src/sys/arch/alpha/alpha/locore.s:1.113.10.1
--- src/sys/arch/alpha/alpha/locore.s:1.113	Mon Apr 28 20:23:10 2008
+++ src/sys/arch/alpha/alpha/locore.s	Tue Jun  9 17:38:38 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.113 2008/04/28 20:23:10 martin Exp $ */
+/* $NetBSD: locore.s,v 1.113.10.1 2009/06/09 17:38:38 snj Exp $ */
 
 /*-
  * Copyright (c) 1999, 2000 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
 
 #include machine/asm.h
 
-__KERNEL_RCSID(0, $NetBSD: locore.s,v 1.113 2008/04/28 20:23:10 martin Exp $);
+__KERNEL_RCSID(0, $NetBSD: locore.s,v 1.113.10.1 2009/06/09 17:38:38 snj Exp $);
 
 #include assym.h
 
@@ -748,6 +748,16 @@
 	jmp	zero, (pv)
 	END(lwp_trampoline)
 
+/*
+ * Simplified version of above: don't call lwp_startup()
+ */
+LEAF_NOPROFILE(setfunc_trampoline, 0)
+	mov	s0, pv
+	mov	s1, ra
+	mov	s2, a0
+	jmp	zero, (pv)
+	END(setfunc_trampoline)
+
 /**/
 
 /*

Index: src/sys/arch/alpha/alpha/vm_machdep.c
diff -u src/sys/arch/alpha/alpha/vm_machdep.c:1.96 src/sys/arch/alpha/alpha/vm_machdep.c:1.96.30.1
--- src/sys/arch/alpha/alpha/vm_machdep.c:1.96	Wed Oct 17 19:52:56 2007
+++ src/sys/arch/alpha/alpha/vm_machdep.c	Tue Jun  9 17:38:39 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: vm_machdep.c,v 1.96 2007/10/17 19:52:56 garbled Exp $ */
+/* $NetBSD: vm_machdep.c,v 1.96.30.1 2009/06/09 17:38:39 snj Exp $ */
 
 /*
  * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
@@ -29,7 +29,7 @@
 
 #include sys/cdefs.h			/* RCS ID  Copyright macro defns */
 
-__KERNEL_RCSID(0, $NetBSD: vm_machdep.c,v 1.96 2007/10/17 19:52:56 garbled Exp $);
+__KERNEL_RCSID(0, $NetBSD: vm_machdep.c,v 1.96.30.1 2009/06/09 17:38:39 snj Exp $);
 #include opt_coredump.h
 
 #include sys/param.h
@@ -129,6 +129,7 @@
 void (*func)(void *), void *arg)
 {
 	struct user *up = l2-l_addr;
+	extern void lwp_trampoline(void);
 
 	l2-l_md.md_tf = l1-l_md.md_tf;
 	l2-l_md.md_flags = l1-l_md.md_flags  (MDP_FPUSED | MDP_FP_C);
@@ -194,7 +195,19 @@
 		l2tf-tf_regs[FRAME_A3] = 0;		/* no error */
 		l2tf-tf_regs[FRAME_A4] = 1;		/* is child */
 
-		cpu_setfunc(l2, func, arg);
+		up = l2-l_addr;
+		up-u_pcb.pcb_hw.apcb_ksp =
+		(u_int64_t)l2-l_md.md_tf;
+		up-u_pcb.pcb_context[0] =
+		(u_int64_t)func;			/* s0: pc */
+		up-u_pcb.pcb_context[1] =
+		(u_int64_t)exception_return;	/* s1: ra */
+		up-u_pcb.pcb_context[2] =
+		(u_int64_t)arg;			/* s2: arg */
+		up-u_pcb.pcb_context[3] =
+		(u_int64_t)l2;			/* s3: lwp */
+		up-u_pcb.pcb_context[7] =
+		(u_int64_t)lwp_trampoline;		/* ra: assembly magic */
 	}
 }
 
@@ -205,6 +218,7 @@
 	void *arg;
 {
 	struct user *up = l-l_addr;
+	extern void setfunc_trampoline(void);
 
 	up-u_pcb.pcb_hw.apcb_ksp =
 	(u_int64_t)l-l_md.md_tf;
@@ -214,10 +228,8 @@
 	(u_int64_t)exception_return;	/* s1: ra */
 	up-u_pcb.pcb_context[2] =
 	(u_int64_t)arg;			/* s2: arg */
-	up-u_pcb.pcb_context[3] =
-	(u_int64_t)l;			/* s3: lwp */
 	up-u_pcb.pcb_context[7] =
-	(u_int64_t)lwp_trampoline;		/* ra: assembly magic */
+	(u_int64_t)setfunc_trampoline;	/* ra: assembly magic */
 }	
 
 /*

Index: src/sys/arch/alpha/include/alpha.h
diff -u src/sys/arch/alpha/include/alpha.h:1.23 src/sys/arch/alpha/include/alpha.h:1.23.28.1
--- src/sys/arch/alpha/include/alpha.h:1.23	Wed Nov 28 17:40:03 2007
+++ src/sys/arch/alpha/include/alpha.h	Tue Jun  9 17:38:39 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: alpha.h,v 1.23 2007/11/28 17:40:03 ad Exp $ */
+/* $NetBSD: alpha.h,v 1.23.28.1 2009/06/09 17:38:39 snj Exp $ */
 
 /*
  * Copyright (c) 1982, 1990, 1993
@@ -139,7 +139,6 @@
 void	regdump(struct trapframe *);
 void	regtoframe(const struct reg *, struct trapframe *);
 void	savectx(struct pcb *);
-void	lwp_trampoline(void);	/* MAGIC */
 void	trap(unsigned long, unsigned long, unsigned long, unsigned long,
 	struct trapframe *);
 void	trap_init(void);

CVS commit: [netbsd-5-0] src/sys/arch/alpha

2009-06-09 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Tue Jun  9 17:40:04 UTC 2009

Modified Files:
src/sys/arch/alpha/alpha [netbsd-5-0]: locore.s vm_machdep.c
src/sys/arch/alpha/include [netbsd-5-0]: alpha.h

Log Message:
Pull up following revision(s) (requested by martin in ticket #798):
sys/arch/alpha/alpha/locore.s: revision 1.114
sys/arch/alpha/alpha/vm_machdep.c: revision 1.100
sys/arch/alpha/include/alpha.h: revision 1.24
Do not use lwp_trampoline for cpu_setfunc, but a simplified setfunc_trampoline
that does not call lwp_startup() instead.


To generate a diff of this commit:
cvs rdiff -u -r1.113 -r1.113.16.1 src/sys/arch/alpha/alpha/locore.s
cvs rdiff -u -r1.96 -r1.96.32.1 src/sys/arch/alpha/alpha/vm_machdep.c
cvs rdiff -u -r1.23 -r1.23.34.1 src/sys/arch/alpha/include/alpha.h

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/alpha/alpha/locore.s
diff -u src/sys/arch/alpha/alpha/locore.s:1.113 src/sys/arch/alpha/alpha/locore.s:1.113.16.1
--- src/sys/arch/alpha/alpha/locore.s:1.113	Mon Apr 28 20:23:10 2008
+++ src/sys/arch/alpha/alpha/locore.s	Tue Jun  9 17:40:04 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.113 2008/04/28 20:23:10 martin Exp $ */
+/* $NetBSD: locore.s,v 1.113.16.1 2009/06/09 17:40:04 snj Exp $ */
 
 /*-
  * Copyright (c) 1999, 2000 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
 
 #include machine/asm.h
 
-__KERNEL_RCSID(0, $NetBSD: locore.s,v 1.113 2008/04/28 20:23:10 martin Exp $);
+__KERNEL_RCSID(0, $NetBSD: locore.s,v 1.113.16.1 2009/06/09 17:40:04 snj Exp $);
 
 #include assym.h
 
@@ -748,6 +748,16 @@
 	jmp	zero, (pv)
 	END(lwp_trampoline)
 
+/*
+ * Simplified version of above: don't call lwp_startup()
+ */
+LEAF_NOPROFILE(setfunc_trampoline, 0)
+	mov	s0, pv
+	mov	s1, ra
+	mov	s2, a0
+	jmp	zero, (pv)
+	END(setfunc_trampoline)
+
 /**/
 
 /*

Index: src/sys/arch/alpha/alpha/vm_machdep.c
diff -u src/sys/arch/alpha/alpha/vm_machdep.c:1.96 src/sys/arch/alpha/alpha/vm_machdep.c:1.96.32.1
--- src/sys/arch/alpha/alpha/vm_machdep.c:1.96	Wed Oct 17 19:52:56 2007
+++ src/sys/arch/alpha/alpha/vm_machdep.c	Tue Jun  9 17:40:04 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: vm_machdep.c,v 1.96 2007/10/17 19:52:56 garbled Exp $ */
+/* $NetBSD: vm_machdep.c,v 1.96.32.1 2009/06/09 17:40:04 snj Exp $ */
 
 /*
  * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
@@ -29,7 +29,7 @@
 
 #include sys/cdefs.h			/* RCS ID  Copyright macro defns */
 
-__KERNEL_RCSID(0, $NetBSD: vm_machdep.c,v 1.96 2007/10/17 19:52:56 garbled Exp $);
+__KERNEL_RCSID(0, $NetBSD: vm_machdep.c,v 1.96.32.1 2009/06/09 17:40:04 snj Exp $);
 #include opt_coredump.h
 
 #include sys/param.h
@@ -129,6 +129,7 @@
 void (*func)(void *), void *arg)
 {
 	struct user *up = l2-l_addr;
+	extern void lwp_trampoline(void);
 
 	l2-l_md.md_tf = l1-l_md.md_tf;
 	l2-l_md.md_flags = l1-l_md.md_flags  (MDP_FPUSED | MDP_FP_C);
@@ -194,7 +195,19 @@
 		l2tf-tf_regs[FRAME_A3] = 0;		/* no error */
 		l2tf-tf_regs[FRAME_A4] = 1;		/* is child */
 
-		cpu_setfunc(l2, func, arg);
+		up = l2-l_addr;
+		up-u_pcb.pcb_hw.apcb_ksp =
+		(u_int64_t)l2-l_md.md_tf;
+		up-u_pcb.pcb_context[0] =
+		(u_int64_t)func;			/* s0: pc */
+		up-u_pcb.pcb_context[1] =
+		(u_int64_t)exception_return;	/* s1: ra */
+		up-u_pcb.pcb_context[2] =
+		(u_int64_t)arg;			/* s2: arg */
+		up-u_pcb.pcb_context[3] =
+		(u_int64_t)l2;			/* s3: lwp */
+		up-u_pcb.pcb_context[7] =
+		(u_int64_t)lwp_trampoline;		/* ra: assembly magic */
 	}
 }
 
@@ -205,6 +218,7 @@
 	void *arg;
 {
 	struct user *up = l-l_addr;
+	extern void setfunc_trampoline(void);
 
 	up-u_pcb.pcb_hw.apcb_ksp =
 	(u_int64_t)l-l_md.md_tf;
@@ -214,10 +228,8 @@
 	(u_int64_t)exception_return;	/* s1: ra */
 	up-u_pcb.pcb_context[2] =
 	(u_int64_t)arg;			/* s2: arg */
-	up-u_pcb.pcb_context[3] =
-	(u_int64_t)l;			/* s3: lwp */
 	up-u_pcb.pcb_context[7] =
-	(u_int64_t)lwp_trampoline;		/* ra: assembly magic */
+	(u_int64_t)setfunc_trampoline;	/* ra: assembly magic */
 }	
 
 /*

Index: src/sys/arch/alpha/include/alpha.h
diff -u src/sys/arch/alpha/include/alpha.h:1.23 src/sys/arch/alpha/include/alpha.h:1.23.34.1
--- src/sys/arch/alpha/include/alpha.h:1.23	Wed Nov 28 17:40:03 2007
+++ src/sys/arch/alpha/include/alpha.h	Tue Jun  9 17:40:04 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: alpha.h,v 1.23 2007/11/28 17:40:03 ad Exp $ */
+/* $NetBSD: alpha.h,v 1.23.34.1 2009/06/09 17:40:04 snj Exp $ */
 
 /*
  * Copyright (c) 1982, 1990, 1993
@@ -139,7 +139,6 @@
 void	regdump(struct trapframe *);
 void	regtoframe(const struct reg *, struct trapframe *);
 void	savectx(struct pcb *);
-void	lwp_trampoline(void);	/* MAGIC */
 void	trap(unsigned long, unsigned long, unsigned long, unsigned long,
 	struct trapframe *);
 void	trap_init(void);

CVS commit: src/share/man/man7

2009-06-09 Thread Christoph Egger

Module Name:src
Committed By:   cegger
Date:   Tue Jun  9 17:43:27 UTC 2009

Modified Files:
src/share/man/man7: hier.7

Log Message:
mention both X11R6 and X11R7
requested by mrg@ on source-changes-d


To generate a diff of this commit:
cvs rdiff -u -r1.87 -r1.88 src/share/man/man7/hier.7

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/man7/hier.7
diff -u src/share/man/man7/hier.7:1.87 src/share/man/man7/hier.7:1.88
--- src/share/man/man7/hier.7:1.87	Tue Jun  9 13:05:15 2009
+++ src/share/man/man7/hier.7	Tue Jun  9 17:43:27 2009
@@ -1,4 +1,4 @@
-.\	$NetBSD: hier.7,v 1.87 2009/06/09 13:05:15 cegger Exp $
+.\	$NetBSD: hier.7,v 1.88 2009/06/09 17:43:27 cegger Exp $
 .\
 .\ Copyright (c) 1990, 1993, 1994
 .\	The Regents of the University of California.  All rights reserved.
@@ -402,6 +402,8 @@
 contains the majority of the system utilities and files
 .Pp
 .Bl -tag -width libdata/ -compact
+.It Sy X11R6/
+X11 files
 .It Sy X11R7/
 X11 files
 .Pp

CVS commit: [netbsd-5-0] src/sys/arch/mips

2009-06-09 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Tue Jun  9 17:48:20 UTC 2009

Modified Files:
src/sys/arch/mips/include [netbsd-5-0]: locore.h
src/sys/arch/mips/mips [netbsd-5-0]: locore_mips1.S mipsX_subr.S
mips_machdep.c vm_machdep.c

Log Message:
Pull up following revision(s) (requested by martin in ticket #799):
sys/arch/mips/include/locore.h: revision 1.79
sys/arch/mips/mips/locore_mips1.S: revision 1.65
sys/arch/mips/mips/mipsX_subr.S: revision 1.28
sys/arch/mips/mips/mips_machdep.c: revision 1.211
sys/arch/mips/mips/vm_machdep.c: revision 1.123
Do not use the same trampoline for cpu_lwp_fork and cpu_setfunc - only
the former needs to call lwp_startup().


To generate a diff of this commit:
cvs rdiff -u -r1.78 -r1.78.36.1 src/sys/arch/mips/include/locore.h
cvs rdiff -u -r1.64 -r1.64.26.1 src/sys/arch/mips/mips/locore_mips1.S
cvs rdiff -u -r1.26 -r1.26.36.1 src/sys/arch/mips/mips/mipsX_subr.S
cvs rdiff -u -r1.205.4.1 -r1.205.4.1.2.1 \
src/sys/arch/mips/mips/mips_machdep.c
cvs rdiff -u -r1.121 -r1.121.6.1 src/sys/arch/mips/mips/vm_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/mips/include/locore.h
diff -u src/sys/arch/mips/include/locore.h:1.78 src/sys/arch/mips/include/locore.h:1.78.36.1
--- src/sys/arch/mips/include/locore.h:1.78	Wed Oct 17 19:55:36 2007
+++ src/sys/arch/mips/include/locore.h	Tue Jun  9 17:48:20 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.h,v 1.78 2007/10/17 19:55:36 garbled Exp $ */
+/* $NetBSD: locore.h,v 1.78.36.1 2009/06/09 17:48:20 snj Exp $ */
 
 /*
  * Copyright 1996 The Board of Trustees of The Leland Stanford
@@ -53,6 +53,7 @@
 int	mips1_TLBUpdate(u_int, u_int);
 void	mips1_wbflush(void);
 void	mips1_lwp_trampoline(void);
+void	mips1_setfunc_trampoline(void);
 void	mips1_cpu_switch_resume(void);
 
 uint32_t tx3900_cp0_config_read(void);
@@ -68,6 +69,7 @@
 void	mips3_TLBWriteIndexedVPS(int, struct tlb *);
 void	mips3_wbflush(void);
 void	mips3_lwp_trampoline(void);
+void	mips3_setfunc_trampoline(void);
 void	mips3_cpu_switch_resume(void);
 void	mips3_pagezero(void *dst);
 
@@ -81,6 +83,7 @@
 void	mips5900_TLBWriteIndexedVPS(int, struct tlb *);
 void	mips5900_wbflush(void);
 void	mips5900_lwp_trampoline(void);
+void	mips5900_setfunc_trampoline(void);
 void	mips5900_cpu_switch_resume(void);
 void	mips5900_pagezero(void *dst);
 #endif
@@ -96,6 +99,7 @@
 void	mips32_TLBWriteIndexedVPS(int, struct tlb *);
 void	mips32_wbflush(void);
 void	mips32_lwp_trampoline(void);
+void	mips32_setfunc_trampoline(void);
 void	mips32_cpu_switch_resume(void);
 #endif
 
@@ -109,6 +113,7 @@
 void	mips64_TLBWriteIndexedVPS(int, struct tlb *);
 void	mips64_wbflush(void);
 void	mips64_lwp_trampoline(void);
+void	mips64_setfunc_trampoline(void);
 void	mips64_cpu_switch_resume(void);
 void	mips64_pagezero(void *dst);
 #endif
@@ -235,6 +240,7 @@
 #define MachTLBUpdate		mips1_TLBUpdate
 #define wbflush()		mips1_wbflush()
 #define lwp_trampoline		mips1_lwp_trampoline
+#define setfunc_trampoline	mips1_setfunc_trampoline
 #elif !defined(MIPS1)   defined(MIPS3)  !defined(MIPS32)  !defined(MIPS64)  !defined(MIPS3_5900)
 #define MachSetPID		mips3_SetPID
 #define MIPS_TBIAP()		mips3_TBIAP(mips_num_tlb_entries)
@@ -242,6 +248,7 @@
 #define MachTLBUpdate		mips3_TLBUpdate
 #define MachTLBWriteIndexedVPS	mips3_TLBWriteIndexedVPS
 #define lwp_trampoline		mips3_lwp_trampoline
+#define setfunc_trampoline	mips3_setfunc_trampoline
 #define wbflush()		mips3_wbflush()
 #elif !defined(MIPS1)  !defined(MIPS3)   defined(MIPS32)  !defined(MIPS64)
 #define MachSetPID		mips32_SetPID
@@ -250,6 +257,7 @@
 #define MachTLBUpdate		mips32_TLBUpdate
 #define MachTLBWriteIndexedVPS	mips32_TLBWriteIndexedVPS
 #define lwp_trampoline		mips32_lwp_trampoline
+#define setfunc_trampoline	mips32_setfunc_trampoline
 #define wbflush()		mips32_wbflush()
 #elif !defined(MIPS1)  !defined(MIPS3)  !defined(MIPS32)   defined(MIPS64)
  /* all common with mips3 */
@@ -259,6 +267,7 @@
 #define MachTLBUpdate		mips64_TLBUpdate
 #define MachTLBWriteIndexedVPS	mips64_TLBWriteIndexedVPS
 #define lwp_trampoline		mips64_lwp_trampoline
+#define setfunc_trampoline	mips64_setfunc_trampoline
 #define wbflush()		mips64_wbflush()
 #elif !defined(MIPS1)   defined(MIPS3)  !defined(MIPS32)  !defined(MIPS64)  defined(MIPS3_5900)
 #define MachSetPID		mips5900_SetPID
@@ -267,6 +276,7 @@
 #define MachTLBUpdate		mips5900_TLBUpdate
 #define MachTLBWriteIndexedVPS	mips5900_TLBWriteIndexedVPS
 #define lwp_trampoline		mips5900_lwp_trampoline
+#define setfunc_trampoline	mips5900_setfunc_trampoline
 #define wbflush()		mips5900_wbflush()
 #else
 #define MachSetPID		(*(mips_locore_jumpvec.setTLBpid))
@@ -275,6 +285,7 @@
 #define MachTLBUpdate		(*(mips_locore_jumpvec.tlbUpdate))
 #define wbflush()		(*(mips_locore_jumpvec.wbflush))()
 #define lwp_trampoline		(mips_locoresw[1])
+#define

CVS commit: [netbsd-5] src/sys/arch/sparc/dev

2009-06-09 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Tue Jun  9 17:50:34 UTC 2009

Modified Files:
src/sys/arch/sparc/dev [netbsd-5]: zs.c

Log Message:
Pull up following revision(s) (requested by martin in ticket #800):
sys/arch/sparc/dev/zs.c: revision 1.116
Properly initialize child attach args to zero - we could end up with
various devices having different ideas about being console otherwise.


To generate a diff of this commit:
cvs rdiff -u -r1.111.6.1 -r1.111.6.2 src/sys/arch/sparc/dev/zs.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/sparc/dev/zs.c
diff -u src/sys/arch/sparc/dev/zs.c:1.111.6.1 src/sys/arch/sparc/dev/zs.c:1.111.6.2
--- src/sys/arch/sparc/dev/zs.c:1.111.6.1	Tue Nov 18 02:34:06 2008
+++ src/sys/arch/sparc/dev/zs.c	Tue Jun  9 17:50:34 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: zs.c,v 1.111.6.1 2008/11/18 02:34:06 snj Exp $	*/
+/*	$NetBSD: zs.c,v 1.111.6.2 2009/06/09 17:50:34 snj Exp $	*/
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: zs.c,v 1.111.6.1 2008/11/18 02:34:06 snj Exp $);
+__KERNEL_RCSID(0, $NetBSD: zs.c,v 1.111.6.2 2009/06/09 17:50:34 snj Exp $);
 
 #include opt_ddb.h
 #include opt_kgdb.h
@@ -401,6 +401,7 @@
 	int ch0_is_cons = 0;
 #endif
 
+	memset(zsc_args, 0, sizeof zsc_args);
 	if (zsd == NULL) {
 		aprint_error(: configuration incomplete\n);
 		return;
@@ -424,6 +425,7 @@
 		int hwflags;
 
 		zsc_args.channel = channel;
+		zsc_args.hwflags = 0;
 		cs = zsc-zsc_cs_store[channel];
 		zsc-zsc_cs[channel] = cs;

CVS commit: [netbsd-5-0] src/sys/arch/powerpc/powerpc

2009-06-09 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Tue Jun  9 17:54:06 UTC 2009

Modified Files:
src/sys/arch/powerpc/powerpc [netbsd-5-0]: locore_subr.S vm_machdep.c

Log Message:
Pull up following revision(s) (requested by martin in ticket #801):
sys/arch/powerpc/powerpc/locore_subr.S: revision 1.38
sys/arch/powerpc/powerpc/vm_machdep.c: revision 1.77
Do not use the same trampoline for cpu_setfunc and cpu_lwp_fork, the
latter does a lot more work.


To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.37.20.1 src/sys/arch/powerpc/powerpc/locore_subr.S
cvs rdiff -u -r1.74 -r1.74.6.1 src/sys/arch/powerpc/powerpc/vm_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/powerpc/powerpc/locore_subr.S
diff -u src/sys/arch/powerpc/powerpc/locore_subr.S:1.37 src/sys/arch/powerpc/powerpc/locore_subr.S:1.37.20.1
--- src/sys/arch/powerpc/powerpc/locore_subr.S:1.37	Thu Apr 10 23:29:01 2008
+++ src/sys/arch/powerpc/powerpc/locore_subr.S	Tue Jun  9 17:54:06 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: locore_subr.S,v 1.37 2008/04/10 23:29:01 matt Exp $	*/
+/*	$NetBSD: locore_subr.S,v 1.37.20.1 2009/06/09 17:54:06 snj Exp $	*/
 
 /*
  * Copyright (c) 2001 Wasabi Systems, Inc.
@@ -288,6 +288,9 @@
 	 */
 	bl	_C_LABEL(lwp_startup)
 
+	.globl	_C_LABEL(setfunc_trampoline)
+_C_LABEL(setfunc_trampoline):
+
 	mtlr	%r31
 	mr	%r3,%r30
 	blrl/* jump indirect to r31 */

Index: src/sys/arch/powerpc/powerpc/vm_machdep.c
diff -u src/sys/arch/powerpc/powerpc/vm_machdep.c:1.74 src/sys/arch/powerpc/powerpc/vm_machdep.c:1.74.6.1
--- src/sys/arch/powerpc/powerpc/vm_machdep.c:1.74	Sat Oct 25 09:10:07 2008
+++ src/sys/arch/powerpc/powerpc/vm_machdep.c	Tue Jun  9 17:54:06 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: vm_machdep.c,v 1.74 2008/10/25 09:10:07 mrg Exp $	*/
+/*	$NetBSD: vm_machdep.c,v 1.74.6.1 2009/06/09 17:54:06 snj Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -32,7 +32,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: vm_machdep.c,v 1.74 2008/10/25 09:10:07 mrg Exp $);
+__KERNEL_RCSID(0, $NetBSD: vm_machdep.c,v 1.74.6.1 2009/06/09 17:54:06 snj Exp $);
 
 #include opt_altivec.h
 #include opt_multiprocessor.h
@@ -351,7 +351,7 @@
 void
 cpu_setfunc(struct lwp *l, void (*func)(void *), void *arg)
 {
-	extern void fork_trampoline(void);
+	extern void setfunc_trampoline(void);
 	struct pcb *pcb = l-l_addr-u_pcb;
 	struct trapframe *tf;
 	struct callframe *cf;
@@ -359,7 +359,7 @@
 
 	tf = trapframe(l);
 	cf = (struct callframe *) ((uintptr_t)tf  ~(CALLFRAMELEN-1));
-	cf-lr = (register_t)cpu_lwp_bootstrap;
+	cf-lr = (register_t)setfunc_trampoline;
 	cf--;
 	cf-sp = (register_t) (cf+1);
 	cf-r31 = (register_t) func;

CVS commit: [netbsd-5] src/doc

2009-06-09 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Tue Jun  9 18:07:57 UTC 2009

Modified Files:
src/doc [netbsd-5]: CHANGES-5.1

Log Message:
Tickets 795-801.


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.27 -r1.1.2.28 src/doc/CHANGES-5.1

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-5.1
diff -u src/doc/CHANGES-5.1:1.1.2.27 src/doc/CHANGES-5.1:1.1.2.28
--- src/doc/CHANGES-5.1:1.1.2.27	Sat Jun  6 22:15:22 2009
+++ src/doc/CHANGES-5.1	Tue Jun  9 18:07:57 2009
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-5.1,v 1.1.2.27 2009/06/06 22:15:22 bouyer Exp $
+# $NetBSD: CHANGES-5.1,v 1.1.2.28 2009/06/09 18:07:57 snj Exp $
 
 A complete list of changes from the NetBSD 5.0 release to the NetBSD 5.1
 release:
@@ -913,3 +913,54 @@
 	make space for a trailing \0 in model,revision and serial buffers.
 	[mlelstv, ticket #794]
 
+external/mit/xorg/server/drivers/xf86-video-s3/Makefile patch
+ 
+	Add missing object file to build a properly working s3 module.
+	Fixes PR xsrc/41206.
+	[ahoka, ticket #795]
+
+sys/netinet/ip_carp.c1.38
+
+	Make ip_carp.c compile, fixing usage of CARP_LOG().
+	[taca, ticket #796]
+
+bin/df/df.c	1.86
+
+	Block numbers are measured in f_frsize units. Make -P option
+	use this instead of f_bsize. Also account for reserved blocks
+	like normal non-P output.
+	Fixes PR bin/41541.
+	[mlelstv, ticket #797]
+
+sys/arch/alpha/alpha/locore.s			1.114
+sys/arch/alpha/alpha/vm_machdep.c		1.100
+sys/arch/alpha/include/alpha.h			1.24
+
+	Do not use lwp_trampoline for cpu_setfunc, but a simplified
+	setfunc_trampoline that does not call lwp_startup() instead.
+	[martin, ticket #798]
+
+sys/arch/mips/include/locore.h			1.79
+sys/arch/mips/mips/locore_mips1.S		1.65
+sys/arch/mips/mips/mipsX_subr.S			1.28
+sys/arch/mips/mips/mips_machdep.c		1.211
+sys/arch/mips/mips/vm_machdep.c			1.123
+
+	Do not use the same trampoline for cpu_lwp_fork and
+	cpu_setfunc - only the former needs to call lwp_startup().
+	[martin, ticket #799]
+
+sys/arch/sparc/dev/zs.c1.116
+
+	Properly initialize child attach args to zero - we could end
+	up with various devices having different ideas about being
+	console otherwise.
+	[martin, ticket #800]
+
+sys/arch/powerpc/powerpc/locore_subr.S		1.38
+sys/arch/powerpc/powerpc/vm_machdep.c		1.77
+
+	Do not use the same trampoline for cpu_setfunc and
+	cpu_lwp_fork, the latter does a lot more work.
+	[martin, ticket #801]
+

CVS commit: [netbsd-5] src/sys/arch/powerpc/powerpc

2009-06-09 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Tue Jun  9 17:52:58 UTC 2009

Modified Files:
src/sys/arch/powerpc/powerpc [netbsd-5]: locore_subr.S vm_machdep.c

Log Message:
Pull up following revision(s) (requested by martin in ticket #801):
sys/arch/powerpc/powerpc/locore_subr.S: revision 1.38
sys/arch/powerpc/powerpc/vm_machdep.c: revision 1.77
Do not use the same trampoline for cpu_setfunc and cpu_lwp_fork, the
latter does a lot more work.


To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.37.14.1 src/sys/arch/powerpc/powerpc/locore_subr.S
cvs rdiff -u -r1.74 -r1.74.4.1 src/sys/arch/powerpc/powerpc/vm_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/powerpc/powerpc/locore_subr.S
diff -u src/sys/arch/powerpc/powerpc/locore_subr.S:1.37 src/sys/arch/powerpc/powerpc/locore_subr.S:1.37.14.1
--- src/sys/arch/powerpc/powerpc/locore_subr.S:1.37	Thu Apr 10 23:29:01 2008
+++ src/sys/arch/powerpc/powerpc/locore_subr.S	Tue Jun  9 17:52:58 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: locore_subr.S,v 1.37 2008/04/10 23:29:01 matt Exp $	*/
+/*	$NetBSD: locore_subr.S,v 1.37.14.1 2009/06/09 17:52:58 snj Exp $	*/
 
 /*
  * Copyright (c) 2001 Wasabi Systems, Inc.
@@ -288,6 +288,9 @@
 	 */
 	bl	_C_LABEL(lwp_startup)
 
+	.globl	_C_LABEL(setfunc_trampoline)
+_C_LABEL(setfunc_trampoline):
+
 	mtlr	%r31
 	mr	%r3,%r30
 	blrl/* jump indirect to r31 */

Index: src/sys/arch/powerpc/powerpc/vm_machdep.c
diff -u src/sys/arch/powerpc/powerpc/vm_machdep.c:1.74 src/sys/arch/powerpc/powerpc/vm_machdep.c:1.74.4.1
--- src/sys/arch/powerpc/powerpc/vm_machdep.c:1.74	Sat Oct 25 09:10:07 2008
+++ src/sys/arch/powerpc/powerpc/vm_machdep.c	Tue Jun  9 17:52:58 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: vm_machdep.c,v 1.74 2008/10/25 09:10:07 mrg Exp $	*/
+/*	$NetBSD: vm_machdep.c,v 1.74.4.1 2009/06/09 17:52:58 snj Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -32,7 +32,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: vm_machdep.c,v 1.74 2008/10/25 09:10:07 mrg Exp $);
+__KERNEL_RCSID(0, $NetBSD: vm_machdep.c,v 1.74.4.1 2009/06/09 17:52:58 snj Exp $);
 
 #include opt_altivec.h
 #include opt_multiprocessor.h
@@ -351,7 +351,7 @@
 void
 cpu_setfunc(struct lwp *l, void (*func)(void *), void *arg)
 {
-	extern void fork_trampoline(void);
+	extern void setfunc_trampoline(void);
 	struct pcb *pcb = l-l_addr-u_pcb;
 	struct trapframe *tf;
 	struct callframe *cf;
@@ -359,7 +359,7 @@
 
 	tf = trapframe(l);
 	cf = (struct callframe *) ((uintptr_t)tf  ~(CALLFRAMELEN-1));
-	cf-lr = (register_t)cpu_lwp_bootstrap;
+	cf-lr = (register_t)setfunc_trampoline;
 	cf--;
 	cf-sp = (register_t) (cf+1);
 	cf-r31 = (register_t) func;

CVS commit: src/external/gpl2/lvm2/lib/libdevmapper

2009-06-09 Thread Adam Hamsik

Module Name:src
Committed By:   haad
Date:   Tue Jun  9 18:24:02 UTC 2009

Modified Files:
src/external/gpl2/lvm2/lib/libdevmapper: netbsd-dm.h

Log Message:
Add const to second argument of nbsd_dm_parse_param, too.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/gpl2/lvm2/lib/libdevmapper/netbsd-dm.h

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

Modified files:

Index: src/external/gpl2/lvm2/lib/libdevmapper/netbsd-dm.h
diff -u src/external/gpl2/lvm2/lib/libdevmapper/netbsd-dm.h:1.2 src/external/gpl2/lvm2/lib/libdevmapper/netbsd-dm.h:1.3
--- src/external/gpl2/lvm2/lib/libdevmapper/netbsd-dm.h:1.2	Fri Jun  5 20:03:58 2009
+++ src/external/gpl2/lvm2/lib/libdevmapper/netbsd-dm.h	Tue Jun  9 18:24:02 2009
@@ -1,4 +1,4 @@
-/*$NetBSD: netbsd-dm.h,v 1.2 2009/06/05 20:03:58 haad Exp $  */
+/*$NetBSD: netbsd-dm.h,v 1.3 2009/06/09 18:24:02 haad Exp $  */
 
 /*
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -287,7 +287,7 @@
 int nbsd_dm_add_uint(const char *, uint64_t, prop_dictionary_t);
 int nbsd_dm_add_str(const char *, char *, prop_dictionary_t );
 
-prop_dictionary_t nbsd_dm_parse_param(const char *, char *);
+prop_dictionary_t nbsd_dm_parse_param(const char *, const char *);
 
 struct dm_ioctl* nbsd_dm_dict_to_dmi(prop_dictionary_t, const int);

CVS commit: src/sys/kern

2009-06-09 Thread John Nemeth

Module Name:src
Committed By:   jnemeth
Date:   Tue Jun  9 19:09:03 UTC 2009

Modified Files:
src/sys/kern: kern_module.c

Log Message:
Add code to merge the modload command line with module.prop.


To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 src/sys/kern/kern_module.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/kern/kern_module.c
diff -u src/sys/kern/kern_module.c:1.46 src/sys/kern/kern_module.c:1.47
--- src/sys/kern/kern_module.c:1.46	Sun Jun  7 09:47:31 2009
+++ src/sys/kern/kern_module.c	Tue Jun  9 19:09:03 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: kern_module.c,v 1.46 2009/06/07 09:47:31 jnemeth Exp $	*/
+/*	$NetBSD: kern_module.c,v 1.47 2009/06/09 19:09:03 jnemeth Exp $	*/
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: kern_module.c,v 1.46 2009/06/07 09:47:31 jnemeth Exp $);
+__KERNEL_RCSID(0, $NetBSD: kern_module.c,v 1.47 2009/06/09 19:09:03 jnemeth Exp $);
 
 #ifdef _KERNEL_OPT
 #include opt_ddb.h
@@ -95,6 +95,7 @@
 static void	module_thread(void *);
 static int	module_load_plist_file(const char *, const bool, void **,
 		size_t *);
+static bool	module_merge_dicts(prop_dictionary_t, const prop_dictionary_t);
 
 /*
  * module_error:
@@ -797,6 +798,10 @@
 			filedict = prop_dictionary_internalize(plist);
 			if (filedict == NULL) {
 error = EINVAL;
+			} else if (!module_merge_dicts(filedict, props)) {
+error = EINVAL;
+prop_object_release(filedict);
+filedict = NULL;
 			}
 		}
 		if (plist != NULL) {
@@ -810,7 +815,7 @@
 	KASSERT(module_active == NULL);
 	module_active = mod;
 	error = (*mi-mi_modcmd)(MODULE_CMD_INIT, (filedict != NULL) ?
-	filedict : props);
+	filedict : props);	/* props will have been merged with filedict */
 	module_active = NULL;
 	if (filedict != NULL) {
 		prop_object_release(filedict);
@@ -1197,3 +1202,37 @@
 	*basep = base;
 	return error;
 }
+
+static bool
+module_merge_dicts(prop_dictionary_t existing_dict,
+		   const prop_dictionary_t new_dict)
+{
+	prop_dictionary_keysym_t props_keysym;
+	prop_object_iterator_t props_iter;
+	prop_object_t props_obj;
+	const char *props_key;
+	bool error;
+
+	error = false;
+	props_iter = prop_dictionary_iterator(new_dict);
+	if (props_iter == NULL) {
+		return false;
+	}
+
+	while ((props_obj = prop_object_iterator_next(props_iter)) != NULL) {
+		props_keysym = (prop_dictionary_keysym_t)props_obj;
+		props_key = prop_dictionary_keysym_cstring_nocopy(props_keysym);
+		props_obj = prop_dictionary_get_keysym(new_dict, props_keysym);
+		if ((props_obj == NULL) || !prop_dictionary_set(existing_dict,
+		props_key, props_obj)) {
+			error = true;
+			goto out;
+		}
+	}
+	error = false;
+
+out:
+	prop_object_iterator_release(props_iter);
+
+	return !error;
+}

CVS commit: src/crypto/external/bsd/netpgp/dist/src/lib

2009-06-09 Thread Alistair G. Crooks

Module Name:src
Committed By:   agc
Date:   Tue Jun  9 19:32:11 UTC 2009

Modified Files:
src/crypto/external/bsd/netpgp/dist/src/lib: packet-parse.c

Log Message:
avoid a double-free of the passphrase


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 \
src/crypto/external/bsd/netpgp/dist/src/lib/packet-parse.c

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

Modified files:

Index: src/crypto/external/bsd/netpgp/dist/src/lib/packet-parse.c
diff -u src/crypto/external/bsd/netpgp/dist/src/lib/packet-parse.c:1.19 src/crypto/external/bsd/netpgp/dist/src/lib/packet-parse.c:1.20
--- src/crypto/external/bsd/netpgp/dist/src/lib/packet-parse.c:1.19	Tue Jun  9 00:51:02 2009
+++ src/crypto/external/bsd/netpgp/dist/src/lib/packet-parse.c	Tue Jun  9 19:32:11 2009
@@ -58,7 +58,7 @@
 
 #if defined(__NetBSD__)
 __COPYRIGHT(@(#) Copyright (c) 2009 The NetBSD Foundation, Inc. All rights reserved.);
-__RCSID($NetBSD: packet-parse.c,v 1.19 2009/06/09 00:51:02 agc Exp $);
+__RCSID($NetBSD: packet-parse.c,v 1.20 2009/06/09 19:32:11 agc Exp $);
 #endif
 
 #ifdef HAVE_OPENSSL_CAST_H
@@ -167,7 +167,6 @@
  stream-readinfo, stream-cbinfo)) {
 		return 0;
 	}
-	/* ! ensure the string is NULL-terminated */
 	(*str)[len] = '\0';
 	return 1;
 }
@@ -2620,7 +2619,6 @@
 		}
 
 		__ops_forget(passphrase, passlen);
-		(void) free(passphrase);
 
 		__ops_crypt_any(decrypt, pkt.u.seckey.alg);
 		if (__ops_get_debug_level(__FILE__)) {

CVS commit: src/sbin/wsconsctl

2009-06-09 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Tue Jun  9 19:46:33 UTC 2009

Modified Files:
src/sbin/wsconsctl: wsconsctl.8

Log Message:
Mention a number of keyboard encodings.
From Jukka Ruohonen in PR kern/15955.


To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/sbin/wsconsctl/wsconsctl.8

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

Modified files:

Index: src/sbin/wsconsctl/wsconsctl.8
diff -u src/sbin/wsconsctl/wsconsctl.8:1.26 src/sbin/wsconsctl/wsconsctl.8:1.27
--- src/sbin/wsconsctl/wsconsctl.8:1.26	Sat Nov 29 05:52:32 2008
+++ src/sbin/wsconsctl/wsconsctl.8	Tue Jun  9 19:46:32 2009
@@ -1,4 +1,4 @@
-.\ $NetBSD: wsconsctl.8,v 1.26 2008/11/29 05:52:32 jnemeth Exp $
+.\ $NetBSD: wsconsctl.8,v 1.27 2009/06/09 19:46:32 snj Exp $
 .\
 .\ Copyright (c) 1998, 2004 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 November 28, 2008
+.Dd June 9, 2009
 .Dt WSCONSCTL 8
 .Os
 .Sh NAME
@@ -116,8 +116,9 @@
 emulation and graphics (mapped) modes.
 .Pp
 In addition to British, US, and US-Dvorak keyboard encodings, support
-currently exists for the following languages: Danish, Finnish, French,
-German, Italian, Japanese, Norwegian, Portuguese, Spanish, and Swedish.
+currently exists for the following languages: Belgian, Danish, Finnish,
+French, German, Greek, Hungarian, Italian, Japanese, Norwegian, Polish,
+Portugese, Russian, Spanish, Swedish, Swiss, and Ukrainian.
 Additionally, a user-defined encoding is supported.
 .Sh FILES
 .Bl -tag -width /dev/wsmouse

CVS commit: src/sys/net/agr

2009-06-09 Thread YAMAMOTO Takashi

Module Name:src
Committed By:   yamt
Date:   Tue Jun  9 22:21:54 UTC 2009

Modified Files:
src/sys/net/agr: if_agr.c

Log Message:
comment style.  no functional change.


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/sys/net/agr/if_agr.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/net/agr/if_agr.c
diff -u src/sys/net/agr/if_agr.c:1.23 src/sys/net/agr/if_agr.c:1.24
--- src/sys/net/agr/if_agr.c:1.23	Fri May 29 04:57:05 2009
+++ src/sys/net/agr/if_agr.c	Tue Jun  9 22:21:54 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_agr.c,v 1.23 2009/05/29 04:57:05 darran Exp $	*/
+/*	$NetBSD: if_agr.c,v 1.24 2009/06/09 22:21:54 yamt Exp $	*/
 
 /*-
  * Copyright (c)2005 YAMAMOTO Takashi,
@@ -27,7 +27,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_agr.c,v 1.23 2009/05/29 04:57:05 darran Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_agr.c,v 1.24 2009/06/09 22:21:54 yamt Exp $);
 
 #include bpfilter.h
 #include opt_inet.h
@@ -646,7 +646,8 @@
 	 * start to modify ifp_port.
 	 */
 
-	/* XXX this should probably be SIOCALIFADDR but that doesn't 
+	/*
+	 * XXX this should probably be SIOCALIFADDR but that doesn't 
 	 * appear to work (ENOTTY). We want to change the mac address
 	 * of each port to that of the first port. No need for arps 
 	 * since there are no inet addresses assigned to the ports.
@@ -969,7 +970,8 @@
 #endif
 
 	case SIOCSIFFLAGS:
-		/* Check for a change in vlan status.  This ioctl is the 
+		/*
+		 * Check for a change in vlan status.  This ioctl is the
 		 * only way we can tell that a vlan has attached or detached.
 		 * Note the agr interface must be up.
 		 */

CVS commit: src/sys/net/agr

2009-06-09 Thread YAMAMOTO Takashi

Module Name:src
Committed By:   yamt
Date:   Tue Jun  9 22:26:49 UTC 2009

Modified Files:
src/sys/net/agr: if_agrether.c

Log Message:
comment style.  no functional change.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/net/agr/if_agrether.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/net/agr/if_agrether.c
diff -u src/sys/net/agr/if_agrether.c:1.7 src/sys/net/agr/if_agrether.c:1.8
--- src/sys/net/agr/if_agrether.c:1.7	Fri May 29 04:57:05 2009
+++ src/sys/net/agr/if_agrether.c	Tue Jun  9 22:26:49 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_agrether.c,v 1.7 2009/05/29 04:57:05 darran Exp $	*/
+/*	$NetBSD: if_agrether.c,v 1.8 2009/06/09 22:26:49 yamt Exp $	*/
 
 /*-
  * Copyright (c)2005 YAMAMOTO Takashi,
@@ -27,7 +27,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_agrether.c,v 1.7 2009/05/29 04:57:05 darran Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_agrether.c,v 1.8 2009/06/09 22:26:49 yamt Exp $);
 
 #include sys/param.h
 #include sys/callout.h
@@ -98,7 +98,8 @@
 	agr_mc_init(sc, priv-aep_multiaddrs);
 
 	sc-sc_iftprivate = priv;
-	/* inherit ports capabilities
+	/*
+	 * inherit ports capabilities
 	 * XXX this really needs to be the intersection of all
 	 * ports capabilities, not just the latest port.
 	 * Okay if ports are the same.

CVS commit: [netbsd-5-0] src/external/mit/xorg/server/drivers/xf86-video-s3

2009-06-09 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Tue Jun  9 23:10:04 UTC 2009

Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-s3 [netbsd-5-0]:
Makefile

Log Message:
Kill trailing whitespace.


To generate a diff of this commit:
cvs rdiff -u -r1.3.12.1 -r1.3.12.2 \
src/external/mit/xorg/server/drivers/xf86-video-s3/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/mit/xorg/server/drivers/xf86-video-s3/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-s3/Makefile:1.3.12.1 src/external/mit/xorg/server/drivers/xf86-video-s3/Makefile:1.3.12.2
--- src/external/mit/xorg/server/drivers/xf86-video-s3/Makefile:1.3.12.1	Tue Jun  9 17:26:27 2009
+++ src/external/mit/xorg/server/drivers/xf86-video-s3/Makefile	Tue Jun  9 23:10:04 2009
@@ -1,19 +1,19 @@
-#	$NetBSD: Makefile,v 1.3.12.1 2009/06/09 17:26:27 snj Exp $
+#	$NetBSD: Makefile,v 1.3.12.2 2009/06/09 23:10:04 snj Exp $
 
 DRIVER=		xf86-video-s3
 DRIVER_NAME=	s3_drv
 
-SRCS=		s3_bios.c s3_cursor.c s3_dga.c s3_driver.c s3_IBMRGB.c \
-		s3_Ti.c s3_Trio64DAC.c s3_video.c s3_accel.c \  
-		s3_accel_newmmio.c  
-   
-# PLEASE NOTE: s3_accel.c is compiled two times with different 
-# cpp macros for PIO and NEWMMIO support. Check Makefile.am
-# before upgrading the driver. 
-#  
-BUILDSYMLINKS=	s3_accel.c s3_accel_newmmio.c   
-CPPFLAGS.s3_accel_newmmio.c+=	-DS3_NEWMMIO=1 \
--I${X11SRCDIR.xf86-video-s3}/src
+SRCS=		s3_bios.c s3_cursor.c s3_dga.c s3_driver.c s3_IBMRGB.c \
+		s3_Ti.c s3_Trio64DAC.c s3_video.c s3_accel.c \
+		s3_accel_newmmio.c
+
+# PLEASE NOTE: s3_accel.c is compiled two times with different
+# cpp macros for PIO and NEWMMIO support. Check Makefile.am
+# before upgrading the driver.
+#
+BUILDSYMLINKS=	s3_accel.c s3_accel_newmmio.c
+CPPFLAGS.s3_accel_newmmio.c+=	-DS3_NEWMMIO=1 \
+-I${X11SRCDIR.xf86-video-s3}/src
 
 CPPFLAGS.s3_driver.c=	-Wno-error	# XXX fix me please
 .include ../Makefile.xf86-driver

CVS commit: [netbsd-5] src/external/mit/xorg/server/drivers/xf86-video-s3

2009-06-09 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Tue Jun  9 23:10:41 UTC 2009

Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-s3 [netbsd-5]: Makefile

Log Message:
Kill trailing whitespace.


To generate a diff of this commit:
cvs rdiff -u -r1.3.8.1 -r1.3.8.2 \
src/external/mit/xorg/server/drivers/xf86-video-s3/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/mit/xorg/server/drivers/xf86-video-s3/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-s3/Makefile:1.3.8.1 src/external/mit/xorg/server/drivers/xf86-video-s3/Makefile:1.3.8.2
--- src/external/mit/xorg/server/drivers/xf86-video-s3/Makefile:1.3.8.1	Tue Jun  9 17:25:47 2009
+++ src/external/mit/xorg/server/drivers/xf86-video-s3/Makefile	Tue Jun  9 23:10:41 2009
@@ -1,19 +1,19 @@
-#	$NetBSD: Makefile,v 1.3.8.1 2009/06/09 17:25:47 snj Exp $
+#	$NetBSD: Makefile,v 1.3.8.2 2009/06/09 23:10:41 snj Exp $
 
 DRIVER=		xf86-video-s3
 DRIVER_NAME=	s3_drv
 
-SRCS=		s3_bios.c s3_cursor.c s3_dga.c s3_driver.c s3_IBMRGB.c \
-		s3_Ti.c s3_Trio64DAC.c s3_video.c s3_accel.c \  
-		s3_accel_newmmio.c  
-   
-# PLEASE NOTE: s3_accel.c is compiled two times with different 
-# cpp macros for PIO and NEWMMIO support. Check Makefile.am
-# before upgrading the driver. 
-#  
-BUILDSYMLINKS=	s3_accel.c s3_accel_newmmio.c   
-CPPFLAGS.s3_accel_newmmio.c+=	-DS3_NEWMMIO=1 \
--I${X11SRCDIR.xf86-video-s3}/src
+SRCS=		s3_bios.c s3_cursor.c s3_dga.c s3_driver.c s3_IBMRGB.c \
+		s3_Ti.c s3_Trio64DAC.c s3_video.c s3_accel.c \
+		s3_accel_newmmio.c
+
+# PLEASE NOTE: s3_accel.c is compiled two times with different
+# cpp macros for PIO and NEWMMIO support. Check Makefile.am
+# before upgrading the driver.
+#
+BUILDSYMLINKS=	s3_accel.c s3_accel_newmmio.c
+CPPFLAGS.s3_accel_newmmio.c+=	-DS3_NEWMMIO=1 \
+-I${X11SRCDIR.xf86-video-s3}/src
 
 CPPFLAGS.s3_driver.c=	-Wno-error	# XXX fix me please
 .include ../Makefile.xf86-driver

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

2009-06-09 Thread Antti Kantee

Module Name:src
Committed By:   pooka
Date:   Tue Jun  9 23:26:19 UTC 2009

Modified Files:
src/sys/rump/librump/rumpkern: ltsleep.c

Log Message:
check that interlock isn't null before releasing it


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/rump/librump/rumpkern/ltsleep.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/ltsleep.c
diff -u src/sys/rump/librump/rumpkern/ltsleep.c:1.13 src/sys/rump/librump/rumpkern/ltsleep.c:1.14
--- src/sys/rump/librump/rumpkern/ltsleep.c:1.13	Tue Jun  9 15:53:05 2009
+++ src/sys/rump/librump/rumpkern/ltsleep.c	Tue Jun  9 23:26:19 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: ltsleep.c,v 1.13 2009/06/09 15:53:05 pooka Exp $	*/
+/*	$NetBSD: ltsleep.c,v 1.14 2009/06/09 23:26:19 pooka Exp $	*/
 
 /*
  * Copyright (c) 2007 Antti Kantee.  All Rights Reserved.
@@ -29,7 +29,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ltsleep.c,v 1.13 2009/06/09 15:53:05 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: ltsleep.c,v 1.14 2009/06/09 23:26:19 pooka Exp $);
 
 #include sys/param.h
 #include sys/proc.h
@@ -61,7 +61,8 @@
 	cv_init(lts.cv, NULL);
 
 	mutex_enter(sleepermtx);
-	simple_unlock(slock);
+	if (slock)
+		simple_unlock(slock);
 	LIST_INSERT_HEAD(sleepers, lts, entries);
 
 	/* protected by sleepermtx */

CVS commit: xsrc/external/mit/glproto/dist

2009-06-09 Thread matthew green

Module Name:xsrc
Committed By:   mrg
Date:   Wed Jun 10 00:46:07 UTC 2009

Update of /cvsroot/xsrc/external/mit/glproto/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv5534

Log Message:
initial import of glproto-1.4.10

Status:

Vendor Tag: xorg
Release Tags:   glproto-1-4-10

U xsrc/external/mit/glproto/dist/glproto.pc.in
U xsrc/external/mit/glproto/dist/Makefile.in
U xsrc/external/mit/glproto/dist/glxint.h
U xsrc/external/mit/glproto/dist/ChangeLog
U xsrc/external/mit/glproto/dist/configure.ac
U xsrc/external/mit/glproto/dist/missing
U xsrc/external/mit/glproto/dist/glxmd.h
U xsrc/external/mit/glproto/dist/Makefile.am
U xsrc/external/mit/glproto/dist/glxtokens.h
U xsrc/external/mit/glproto/dist/glxproto.h
U xsrc/external/mit/glproto/dist/COPYING
U xsrc/external/mit/glproto/dist/install-sh
U xsrc/external/mit/glproto/dist/aclocal.m4
U xsrc/external/mit/glproto/dist/configure
U xsrc/external/mit/glproto/dist/glcore.h

No conflicts created by this import

CVS commit: xsrc/external/mit/libpciaccess/dist

2009-06-09 Thread matthew green

Module Name:xsrc
Committed By:   mrg
Date:   Wed Jun 10 00:46:10 UTC 2009

Update of /cvsroot/xsrc/external/mit/libpciaccess/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv3999

Log Message:
initial import of libpciaccess-0.10.6

Status:

Vendor Tag: xorg
Release Tags:   libpciaccess-0-10-6

N xsrc/external/mit/libpciaccess/dist/configure.ac
N xsrc/external/mit/libpciaccess/dist/README
N xsrc/external/mit/libpciaccess/dist/pciaccess.pc.in
N xsrc/external/mit/libpciaccess/dist/aclocal.m4
N xsrc/external/mit/libpciaccess/dist/Makefile.am
N xsrc/external/mit/libpciaccess/dist/Makefile.in
N xsrc/external/mit/libpciaccess/dist/config.h.in
N xsrc/external/mit/libpciaccess/dist/configure
N xsrc/external/mit/libpciaccess/dist/AUTHORS
N xsrc/external/mit/libpciaccess/dist/COPYING
N xsrc/external/mit/libpciaccess/dist/ChangeLog
N xsrc/external/mit/libpciaccess/dist/INSTALL
N xsrc/external/mit/libpciaccess/dist/NEWS
N xsrc/external/mit/libpciaccess/dist/config.guess
N xsrc/external/mit/libpciaccess/dist/config.sub
N xsrc/external/mit/libpciaccess/dist/depcomp
N xsrc/external/mit/libpciaccess/dist/install-sh
N xsrc/external/mit/libpciaccess/dist/ltmain.sh
N xsrc/external/mit/libpciaccess/dist/missing
N xsrc/external/mit/libpciaccess/dist/m4/ac_define_dir.m4
N xsrc/external/mit/libpciaccess/dist/src/common_bridge.c
N xsrc/external/mit/libpciaccess/dist/src/scanpci.c
N xsrc/external/mit/libpciaccess/dist/src/scanpci.man
N xsrc/external/mit/libpciaccess/dist/src/Makefile.am
N xsrc/external/mit/libpciaccess/dist/src/Makefile.in
N xsrc/external/mit/libpciaccess/dist/src/common_iterator.c
N xsrc/external/mit/libpciaccess/dist/src/common_init.c
N xsrc/external/mit/libpciaccess/dist/src/common_interface.c
N xsrc/external/mit/libpciaccess/dist/src/common_capability.c
N xsrc/external/mit/libpciaccess/dist/src/common_device_name.c
N xsrc/external/mit/libpciaccess/dist/src/common_map.c
N xsrc/external/mit/libpciaccess/dist/src/pciaccess_private.h
N xsrc/external/mit/libpciaccess/dist/src/freebsd_pci.c
N xsrc/external/mit/libpciaccess/dist/src/linux_sysfs.c
N xsrc/external/mit/libpciaccess/dist/src/linux_devmem.c
N xsrc/external/mit/libpciaccess/dist/src/linux_devmem.h
N xsrc/external/mit/libpciaccess/dist/src/netbsd_pci.c
N xsrc/external/mit/libpciaccess/dist/src/openbsd_pci.c
N xsrc/external/mit/libpciaccess/dist/src/solx_devfs.c
N xsrc/external/mit/libpciaccess/dist/src/pci_tools.h
N xsrc/external/mit/libpciaccess/dist/include/pciaccess.h

No conflicts created by this import

CVS commit: xsrc/external/mit/xf86-input-keyboard/dist

2009-06-09 Thread matthew green

Module Name:xsrc
Committed By:   mrg
Date:   Wed Jun 10 00:46:15 UTC 2009

Update of /cvsroot/xsrc/external/mit/xf86-input-keyboard/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv5943

Log Message:
initial import of xf86-input-keyboard-1.3.2

Status:

Vendor Tag: xorg
Release Tags:   xf86-input-keyboard-1-3-2

U xsrc/external/mit/xf86-input-keyboard/dist/configure.ac
U xsrc/external/mit/xf86-input-keyboard/dist/aclocal.m4
U xsrc/external/mit/xf86-input-keyboard/dist/Makefile.am
U xsrc/external/mit/xf86-input-keyboard/dist/Makefile.in
U xsrc/external/mit/xf86-input-keyboard/dist/config.h.in
U xsrc/external/mit/xf86-input-keyboard/dist/configure
U xsrc/external/mit/xf86-input-keyboard/dist/COPYING
U xsrc/external/mit/xf86-input-keyboard/dist/ChangeLog
U xsrc/external/mit/xf86-input-keyboard/dist/config.guess
U xsrc/external/mit/xf86-input-keyboard/dist/config.sub
U xsrc/external/mit/xf86-input-keyboard/dist/depcomp
U xsrc/external/mit/xf86-input-keyboard/dist/install-sh
U xsrc/external/mit/xf86-input-keyboard/dist/ltmain.sh
U xsrc/external/mit/xf86-input-keyboard/dist/missing
U xsrc/external/mit/xf86-input-keyboard/dist/src/at_scancode.c
U xsrc/external/mit/xf86-input-keyboard/dist/src/Makefile.am
U xsrc/external/mit/xf86-input-keyboard/dist/src/Makefile.in
U xsrc/external/mit/xf86-input-keyboard/dist/src/kbd.c
U xsrc/external/mit/xf86-input-keyboard/dist/src/xf86OSKbd.h
U xsrc/external/mit/xf86-input-keyboard/dist/src/xf86Keymap.h
N xsrc/external/mit/xf86-input-keyboard/dist/src/atKeynames.h
U xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_KbdMap.c
U xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_kbd.c
U xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_kbd.h
U xsrc/external/mit/xf86-input-keyboard/dist/src/sun_kbd.c
U xsrc/external/mit/xf86-input-keyboard/dist/src/sun_kbd.h
U xsrc/external/mit/xf86-input-keyboard/dist/src/sun_kbdMap.c
U xsrc/external/mit/xf86-input-keyboard/dist/src/lnx_KbdMap.c
U xsrc/external/mit/xf86-input-keyboard/dist/src/lnx_kbd.c
U xsrc/external/mit/xf86-input-keyboard/dist/src/lnx_kbd.h
U xsrc/external/mit/xf86-input-keyboard/dist/src/sco_KbdMap.c
U xsrc/external/mit/xf86-input-keyboard/dist/src/sco_kbd.c
U xsrc/external/mit/xf86-input-keyboard/dist/src/sco_kbd.h
U xsrc/external/mit/xf86-input-keyboard/dist/src/hurd_kbd.c
U xsrc/external/mit/xf86-input-keyboard/dist/man/Makefile.am
U xsrc/external/mit/xf86-input-keyboard/dist/man/Makefile.in
U xsrc/external/mit/xf86-input-keyboard/dist/man/kbd.man

No conflicts created by this import

CVS commit: xsrc/external/mit/xf86-video-ark/dist

2009-06-09 Thread matthew green

Module Name:xsrc
Committed By:   mrg
Date:   Wed Jun 10 00:46:26 UTC 2009

Update of /cvsroot/xsrc/external/mit/xf86-video-ark/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv19759

Log Message:
initial import of xf86-video-ark-0.7.1

Status:

Vendor Tag: xorg
Release Tags:   xf86-video-ark-0-7-1

U xsrc/external/mit/xf86-video-ark/dist/COPYING
U xsrc/external/mit/xf86-video-ark/dist/install-sh
U xsrc/external/mit/xf86-video-ark/dist/config.h.in
U xsrc/external/mit/xf86-video-ark/dist/config.sub
U xsrc/external/mit/xf86-video-ark/dist/Makefile.am
U xsrc/external/mit/xf86-video-ark/dist/ChangeLog
U xsrc/external/mit/xf86-video-ark/dist/ltmain.sh
U xsrc/external/mit/xf86-video-ark/dist/Makefile.in
U xsrc/external/mit/xf86-video-ark/dist/missing
U xsrc/external/mit/xf86-video-ark/dist/aclocal.m4
U xsrc/external/mit/xf86-video-ark/dist/configure.ac
U xsrc/external/mit/xf86-video-ark/dist/depcomp
U xsrc/external/mit/xf86-video-ark/dist/configure
U xsrc/external/mit/xf86-video-ark/dist/config.guess
U xsrc/external/mit/xf86-video-ark/dist/src/ark_reg.h
U xsrc/external/mit/xf86-video-ark/dist/src/ark.h
U xsrc/external/mit/xf86-video-ark/dist/src/ark_driver.c
U xsrc/external/mit/xf86-video-ark/dist/src/Makefile.am
U xsrc/external/mit/xf86-video-ark/dist/src/ark_accel.c
U xsrc/external/mit/xf86-video-ark/dist/src/Makefile.in

No conflicts created by this import

CVS commit: xsrc/external/mit/xf86-video-cirrus/dist

2009-06-09 Thread matthew green

Module Name:xsrc
Committed By:   mrg
Date:   Wed Jun 10 00:46:48 UTC 2009

Update of /cvsroot/xsrc/external/mit/xf86-video-cirrus/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv15341

Log Message:
initial import of xf86-video-cirrus-1.3.0

Status:

Vendor Tag: xorg
Release Tags:   xf86-video-cirrus-1-3-0

U xsrc/external/mit/xf86-video-cirrus/dist/configure.ac
N xsrc/external/mit/xf86-video-cirrus/dist/README
U xsrc/external/mit/xf86-video-cirrus/dist/README.multihead
U xsrc/external/mit/xf86-video-cirrus/dist/aclocal.m4
U xsrc/external/mit/xf86-video-cirrus/dist/Makefile.am
U xsrc/external/mit/xf86-video-cirrus/dist/Makefile.in
U xsrc/external/mit/xf86-video-cirrus/dist/config.h.in
U xsrc/external/mit/xf86-video-cirrus/dist/configure
U xsrc/external/mit/xf86-video-cirrus/dist/COPYING
U xsrc/external/mit/xf86-video-cirrus/dist/ChangeLog
U xsrc/external/mit/xf86-video-cirrus/dist/config.guess
U xsrc/external/mit/xf86-video-cirrus/dist/config.sub
U xsrc/external/mit/xf86-video-cirrus/dist/depcomp
U xsrc/external/mit/xf86-video-cirrus/dist/install-sh
U xsrc/external/mit/xf86-video-cirrus/dist/ltmain.sh
U xsrc/external/mit/xf86-video-cirrus/dist/missing
N xsrc/external/mit/xf86-video-cirrus/dist/src/cir_pcirename.h
U xsrc/external/mit/xf86-video-cirrus/dist/src/Makefile.am
U xsrc/external/mit/xf86-video-cirrus/dist/src/Makefile.in
U xsrc/external/mit/xf86-video-cirrus/dist/src/alp_driver.c
U xsrc/external/mit/xf86-video-cirrus/dist/src/alp.h
U xsrc/external/mit/xf86-video-cirrus/dist/src/alp_hwcurs.c
U xsrc/external/mit/xf86-video-cirrus/dist/src/alp_i2c.c
U xsrc/external/mit/xf86-video-cirrus/dist/src/alp_xaa.c
U xsrc/external/mit/xf86-video-cirrus/dist/src/alp_xaam.c
U xsrc/external/mit/xf86-video-cirrus/dist/src/cir_dga.c
U xsrc/external/mit/xf86-video-cirrus/dist/src/cir_driver.c
U xsrc/external/mit/xf86-video-cirrus/dist/src/cir.h
U xsrc/external/mit/xf86-video-cirrus/dist/src/CirrusClk.c
U xsrc/external/mit/xf86-video-cirrus/dist/src/cir_shadow.c
U xsrc/external/mit/xf86-video-cirrus/dist/src/lg_driver.c
U xsrc/external/mit/xf86-video-cirrus/dist/src/lg.h
U xsrc/external/mit/xf86-video-cirrus/dist/src/lg_hwcurs.c
U xsrc/external/mit/xf86-video-cirrus/dist/src/lg_i2c.c
U xsrc/external/mit/xf86-video-cirrus/dist/src/lg_xaa.c
U xsrc/external/mit/xf86-video-cirrus/dist/src/lg_xaa.h
U xsrc/external/mit/xf86-video-cirrus/dist/man/Makefile.am
U xsrc/external/mit/xf86-video-cirrus/dist/man/Makefile.in
U xsrc/external/mit/xf86-video-cirrus/dist/man/cirrus.man

No conflicts created by this import

CVS commit: xsrc/external/mit/xf86-video-glint/dist

2009-06-09 Thread matthew green

Module Name:xsrc
Committed By:   mrg
Date:   Wed Jun 10 00:46:56 UTC 2009

Update of /cvsroot/xsrc/external/mit/xf86-video-glint/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv2703

Log Message:
initial import of xf86-video-glint-1.2.2

Status:

Vendor Tag: xorg
Release Tags:   xf86-video-glint-1-2-2

U xsrc/external/mit/xf86-video-glint/dist/COPYING
U xsrc/external/mit/xf86-video-glint/dist/install-sh
U xsrc/external/mit/xf86-video-glint/dist/config.h.in
U xsrc/external/mit/xf86-video-glint/dist/config.sub
U xsrc/external/mit/xf86-video-glint/dist/README.pm3
U xsrc/external/mit/xf86-video-glint/dist/DRI.txt
U xsrc/external/mit/xf86-video-glint/dist/Makefile.am
U xsrc/external/mit/xf86-video-glint/dist/ChangeLog
U xsrc/external/mit/xf86-video-glint/dist/ltmain.sh
U xsrc/external/mit/xf86-video-glint/dist/Makefile.in
U xsrc/external/mit/xf86-video-glint/dist/missing
U xsrc/external/mit/xf86-video-glint/dist/aclocal.m4
U xsrc/external/mit/xf86-video-glint/dist/configure.ac
U xsrc/external/mit/xf86-video-glint/dist/depcomp
U xsrc/external/mit/xf86-video-glint/dist/configure
U xsrc/external/mit/xf86-video-glint/dist/config.guess
U xsrc/external/mit/xf86-video-glint/dist/src/glint_common.h
U xsrc/external/mit/xf86-video-glint/dist/src/pm3_regs.h
U xsrc/external/mit/xf86-video-glint/dist/src/pm2_dac.c
U xsrc/external/mit/xf86-video-glint/dist/src/glint.h
U xsrc/external/mit/xf86-video-glint/dist/src/pm3_video.c
U xsrc/external/mit/xf86-video-glint/dist/src/glint_dga.c
U xsrc/external/mit/xf86-video-glint/dist/src/glint_regs.h
U xsrc/external/mit/xf86-video-glint/dist/src/IBMramdac.c
U xsrc/external/mit/xf86-video-glint/dist/src/pm2_video.c
U xsrc/external/mit/xf86-video-glint/dist/src/TIramdac.c
U xsrc/external/mit/xf86-video-glint/dist/src/pm3_dac.c
U xsrc/external/mit/xf86-video-glint/dist/src/pm3_accel.c
U xsrc/external/mit/xf86-video-glint/dist/src/pm2vramdac.c
U xsrc/external/mit/xf86-video-glint/dist/src/Makefile.am
U xsrc/external/mit/xf86-video-glint/dist/src/pm2v_dac.c
U xsrc/external/mit/xf86-video-glint/dist/src/pm_accel.c
U xsrc/external/mit/xf86-video-glint/dist/src/pm2_accel.c
U xsrc/external/mit/xf86-video-glint/dist/src/Makefile.in
C xsrc/external/mit/xf86-video-glint/dist/src/glint_dri.c
U xsrc/external/mit/xf86-video-glint/dist/src/sx_accel.c
U xsrc/external/mit/xf86-video-glint/dist/src/tx_accel.c
U xsrc/external/mit/xf86-video-glint/dist/src/tx_dac.c
N xsrc/external/mit/xf86-video-glint/dist/src/glintpcirename.h
U xsrc/external/mit/xf86-video-glint/dist/src/pm_dac.c
U xsrc/external/mit/xf86-video-glint/dist/src/glint_dri.h
U xsrc/external/mit/xf86-video-glint/dist/src/pm2ramdac.c
C xsrc/external/mit/xf86-video-glint/dist/src/glint_driver.c
U xsrc/external/mit/xf86-video-glint/dist/src/glint_shadow.c
U xsrc/external/mit/xf86-video-glint/dist/src/glint_dripriv.h
U xsrc/external/mit/xf86-video-glint/dist/man/Makefile.am
U xsrc/external/mit/xf86-video-glint/dist/man/Makefile.in
U xsrc/external/mit/xf86-video-glint/dist/man/glint.man

2 conflicts created by this import.
Use the following command to help the merge:

cvs checkout -jxorg:yesterday -jxorg 
xsrc/external/mit/xf86-video-glint/dist

CVS commit: xsrc/external/mit/xf86-video-i740/dist

2009-06-09 Thread matthew green

Module Name:xsrc
Committed By:   mrg
Date:   Wed Jun 10 00:47:11 UTC 2009

Update of /cvsroot/xsrc/external/mit/xf86-video-i740/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv12659

Log Message:
initial import of xf86-video-i740-1.3.0

Status:

Vendor Tag: xorg
Release Tags:   xf86-video-i740-1-3-0

U xsrc/external/mit/xf86-video-i740/dist/missing
U xsrc/external/mit/xf86-video-i740/dist/Makefile.in
U xsrc/external/mit/xf86-video-i740/dist/COPYING
U xsrc/external/mit/xf86-video-i740/dist/ChangeLog
U xsrc/external/mit/xf86-video-i740/dist/configure.ac
U xsrc/external/mit/xf86-video-i740/dist/Makefile.am
U xsrc/external/mit/xf86-video-i740/dist/config.guess
U xsrc/external/mit/xf86-video-i740/dist/README.sgml
U xsrc/external/mit/xf86-video-i740/dist/README
U xsrc/external/mit/xf86-video-i740/dist/config.h.in
U xsrc/external/mit/xf86-video-i740/dist/install-sh
U xsrc/external/mit/xf86-video-i740/dist/aclocal.m4
U xsrc/external/mit/xf86-video-i740/dist/ltmain.sh
U xsrc/external/mit/xf86-video-i740/dist/configure
U xsrc/external/mit/xf86-video-i740/dist/depcomp
U xsrc/external/mit/xf86-video-i740/dist/config.sub
U xsrc/external/mit/xf86-video-i740/dist/src/i740_cursor.c
U xsrc/external/mit/xf86-video-i740/dist/src/Makefile.in
U xsrc/external/mit/xf86-video-i740/dist/src/i740_dga.c
U xsrc/external/mit/xf86-video-i740/dist/src/i740_i2c.c
U xsrc/external/mit/xf86-video-i740/dist/src/Makefile.am
U xsrc/external/mit/xf86-video-i740/dist/src/i740_driver.c
U xsrc/external/mit/xf86-video-i740/dist/src/i740_video.c
U xsrc/external/mit/xf86-video-i740/dist/src/i740_macros.h
U xsrc/external/mit/xf86-video-i740/dist/src/i740_accel.c
U xsrc/external/mit/xf86-video-i740/dist/src/i740_reg.h
U xsrc/external/mit/xf86-video-i740/dist/src/i740_dga.h
U xsrc/external/mit/xf86-video-i740/dist/src/i740_io.c
U xsrc/external/mit/xf86-video-i740/dist/src/i740.h
N xsrc/external/mit/xf86-video-i740/dist/src/i740_pcirename.h
U xsrc/external/mit/xf86-video-i740/dist/man/Makefile.in
U xsrc/external/mit/xf86-video-i740/dist/man/Makefile.am
U xsrc/external/mit/xf86-video-i740/dist/man/i740.man

No conflicts created by this import

CVS commit: xsrc/external/mit/xf86-video-i128/dist

2009-06-09 Thread matthew green

Module Name:xsrc
Committed By:   mrg
Date:   Wed Jun 10 00:47:02 UTC 2009

Update of /cvsroot/xsrc/external/mit/xf86-video-i128/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv4182

Log Message:
initial import of xf86-video-i128-1.3.1

Status:

Vendor Tag: xorg
Release Tags:   xf86-video-i128-1-3-1

U xsrc/external/mit/xf86-video-i128/dist/configure.ac
U xsrc/external/mit/xf86-video-i128/dist/README
U xsrc/external/mit/xf86-video-i128/dist/aclocal.m4
U xsrc/external/mit/xf86-video-i128/dist/Makefile.am
U xsrc/external/mit/xf86-video-i128/dist/Makefile.in
U xsrc/external/mit/xf86-video-i128/dist/config.h.in
U xsrc/external/mit/xf86-video-i128/dist/configure
U xsrc/external/mit/xf86-video-i128/dist/COPYING
U xsrc/external/mit/xf86-video-i128/dist/ChangeLog
U xsrc/external/mit/xf86-video-i128/dist/config.guess
U xsrc/external/mit/xf86-video-i128/dist/config.sub
U xsrc/external/mit/xf86-video-i128/dist/depcomp
U xsrc/external/mit/xf86-video-i128/dist/install-sh
U xsrc/external/mit/xf86-video-i128/dist/ltmain.sh
U xsrc/external/mit/xf86-video-i128/dist/missing
U xsrc/external/mit/xf86-video-i128/dist/README.sgml
U xsrc/external/mit/xf86-video-i128/dist/src/i128_driver.c
U xsrc/external/mit/xf86-video-i128/dist/src/Makefile.am
U xsrc/external/mit/xf86-video-i128/dist/src/Makefile.in
U xsrc/external/mit/xf86-video-i128/dist/src/i128accel.c
U xsrc/external/mit/xf86-video-i128/dist/src/i128dga.c
U xsrc/external/mit/xf86-video-i128/dist/src/i128exa.c
U xsrc/external/mit/xf86-video-i128/dist/src/i128IBMDAC.c
U xsrc/external/mit/xf86-video-i128/dist/src/i128.h
N xsrc/external/mit/xf86-video-i128/dist/src/i128pcirename.h
U xsrc/external/mit/xf86-video-i128/dist/src/i128init.c
U xsrc/external/mit/xf86-video-i128/dist/src/i128reg.h
U xsrc/external/mit/xf86-video-i128/dist/src/IBMRGB.h
U xsrc/external/mit/xf86-video-i128/dist/src/Ti302X.h
U xsrc/external/mit/xf86-video-i128/dist/man/Makefile.am
U xsrc/external/mit/xf86-video-i128/dist/man/Makefile.in
U xsrc/external/mit/xf86-video-i128/dist/man/i128.man

No conflicts created by this import

CVS commit: xsrc/external/mit/xf86-video-mach64/dist

2009-06-09 Thread matthew green

Module Name:xsrc
Committed By:   mrg
Date:   Wed Jun 10 00:47:26 UTC 2009

Update of /cvsroot/xsrc/external/mit/xf86-video-mach64/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv29160

Log Message:
initial import of xf86-video-mach64-6.8.1

Status:

Vendor Tag: xorg
Release Tags:   xf86-video-mach64-6-8-1

U xsrc/external/mit/xf86-video-mach64/dist/configure.ac
N xsrc/external/mit/xf86-video-mach64/dist/README
U xsrc/external/mit/xf86-video-mach64/dist/README.ati.sgml
U xsrc/external/mit/xf86-video-mach64/dist/aclocal.m4
U xsrc/external/mit/xf86-video-mach64/dist/Makefile.am
U xsrc/external/mit/xf86-video-mach64/dist/Makefile.in
U xsrc/external/mit/xf86-video-mach64/dist/config.h.in
U xsrc/external/mit/xf86-video-mach64/dist/configure
U xsrc/external/mit/xf86-video-mach64/dist/COPYING
U xsrc/external/mit/xf86-video-mach64/dist/ChangeLog
U xsrc/external/mit/xf86-video-mach64/dist/config.guess
U xsrc/external/mit/xf86-video-mach64/dist/config.sub
U xsrc/external/mit/xf86-video-mach64/dist/depcomp
U xsrc/external/mit/xf86-video-mach64/dist/install-sh
U xsrc/external/mit/xf86-video-mach64/dist/ltmain.sh
U xsrc/external/mit/xf86-video-mach64/dist/missing
U xsrc/external/mit/xf86-video-mach64/dist/README.ati
U xsrc/external/mit/xf86-video-mach64/dist/src/atimach64accel.c
U xsrc/external/mit/xf86-video-mach64/dist/src/Makefile.am
U xsrc/external/mit/xf86-video-mach64/dist/src/Makefile.in
U xsrc/external/mit/xf86-video-mach64/dist/src/atibus.c
U xsrc/external/mit/xf86-video-mach64/dist/src/atichip.c
U xsrc/external/mit/xf86-video-mach64/dist/src/atiprobe.c
U xsrc/external/mit/xf86-video-mach64/dist/src/atividmem.c
U xsrc/external/mit/xf86-video-mach64/dist/src/atiadjust.c
U xsrc/external/mit/xf86-video-mach64/dist/src/atiaudio.c
U xsrc/external/mit/xf86-video-mach64/dist/src/aticlock.c
U xsrc/external/mit/xf86-video-mach64/dist/src/aticonfig.c
U xsrc/external/mit/xf86-video-mach64/dist/src/aticonsole.c
U xsrc/external/mit/xf86-video-mach64/dist/src/atidac.c
U xsrc/external/mit/xf86-video-mach64/dist/src/atidecoder.c
U xsrc/external/mit/xf86-video-mach64/dist/src/atidsp.c
U xsrc/external/mit/xf86-video-mach64/dist/src/atii2c.c
U xsrc/external/mit/xf86-video-mach64/dist/src/atilock.c
U xsrc/external/mit/xf86-video-mach64/dist/src/atimach64.c
U xsrc/external/mit/xf86-video-mach64/dist/src/atimach64cursor.c
U xsrc/external/mit/xf86-video-mach64/dist/src/atimach64i2c.c
U xsrc/external/mit/xf86-video-mach64/dist/src/atimach64io.c
U xsrc/external/mit/xf86-video-mach64/dist/src/atimach64xv.c
U xsrc/external/mit/xf86-video-mach64/dist/src/atimode.c
U xsrc/external/mit/xf86-video-mach64/dist/src/atipreinit.c
U xsrc/external/mit/xf86-video-mach64/dist/src/atiprint.c
U xsrc/external/mit/xf86-video-mach64/dist/src/atirgb514.c
U xsrc/external/mit/xf86-video-mach64/dist/src/atiscreen.c
U xsrc/external/mit/xf86-video-mach64/dist/src/atituner.c
U xsrc/external/mit/xf86-video-mach64/dist/src/atiutil.c
U xsrc/external/mit/xf86-video-mach64/dist/src/ativalid.c
U xsrc/external/mit/xf86-video-mach64/dist/src/atiload.c
U xsrc/external/mit/xf86-video-mach64/dist/src/atimisc.c
U xsrc/external/mit/xf86-video-mach64/dist/src/atimach64probe.c
U xsrc/external/mit/xf86-video-mach64/dist/src/ativga.c
U xsrc/external/mit/xf86-video-mach64/dist/src/ativgaio.c
U xsrc/external/mit/xf86-video-mach64/dist/src/atibank.c
U xsrc/external/mit/xf86-video-mach64/dist/src/atiwonder.c
U xsrc/external/mit/xf86-video-mach64/dist/src/atiwonderio.c
U xsrc/external/mit/xf86-video-mach64/dist/src/atidga.c
U xsrc/external/mit/xf86-video-mach64/dist/src/atidri.c
U xsrc/external/mit/xf86-video-mach64/dist/src/atimach64exa.c
U xsrc/external/mit/xf86-video-mach64/dist/src/atimach64render.c
U xsrc/external/mit/xf86-video-mach64/dist/src/atiadjust.h
U xsrc/external/mit/xf86-video-mach64/dist/src/atiaudio.h
U xsrc/external/mit/xf86-video-mach64/dist/src/atibank.h
U xsrc/external/mit/xf86-video-mach64/dist/src/atibus.h
U xsrc/external/mit/xf86-video-mach64/dist/src/atichip.h
U xsrc/external/mit/xf86-video-mach64/dist/src/aticlock.h
U xsrc/external/mit/xf86-video-mach64/dist/src/aticonsole.h
U xsrc/external/mit/xf86-video-mach64/dist/src/aticrtc.h
U xsrc/external/mit/xf86-video-mach64/dist/src/aticursor.h
U xsrc/external/mit/xf86-video-mach64/dist/src/atidac.h
U xsrc/external/mit/xf86-video-mach64/dist/src/atidecoder.h
U xsrc/external/mit/xf86-video-mach64/dist/src/atidga.h
U xsrc/external/mit/xf86-video-mach64/dist/src/atidri.h
U xsrc/external/mit/xf86-video-mach64/dist/src/atidripriv.h
U xsrc/external/mit/xf86-video-mach64/dist/src/atidsp.h
U xsrc/external/mit/xf86-video-mach64/dist/src/ati.h
U xsrc/external/mit/xf86-video-mach64/dist/src/atii2c.h
U xsrc/external/mit/xf86-video-mach64/dist/src/atiload.h
U xsrc/external/mit/xf86-video-mach64/dist/src/atilock.h
U xsrc/external/mit/xf86-video-mach64/dist/src/atimach64accel.h
U xsrc/external/mit/xf86-video-mach64/dist/src/atimach64.h
U

CVS commit: xsrc/external/mit/xf86-video-mga/dist

2009-06-09 Thread matthew green

Module Name:xsrc
Committed By:   mrg
Date:   Wed Jun 10 00:47:38 UTC 2009

Update of /cvsroot/xsrc/external/mit/xf86-video-mga/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv2278

Log Message:
initial import of xf86-video-mga-1.4.10

Status:

Vendor Tag: xorg
Release Tags:   xf86-video-mga-1-4-10

U xsrc/external/mit/xf86-video-mga/dist/missing
U xsrc/external/mit/xf86-video-mga/dist/Makefile.in
U xsrc/external/mit/xf86-video-mga/dist/COPYING
U xsrc/external/mit/xf86-video-mga/dist/ChangeLog
U xsrc/external/mit/xf86-video-mga/dist/configure.ac
U xsrc/external/mit/xf86-video-mga/dist/Makefile.am
U xsrc/external/mit/xf86-video-mga/dist/config.guess
N xsrc/external/mit/xf86-video-mga/dist/README
U xsrc/external/mit/xf86-video-mga/dist/depcomp
U xsrc/external/mit/xf86-video-mga/dist/README_HALLIB
U xsrc/external/mit/xf86-video-mga/dist/config.h.in
U xsrc/external/mit/xf86-video-mga/dist/install-sh
U xsrc/external/mit/xf86-video-mga/dist/aclocal.m4
U xsrc/external/mit/xf86-video-mga/dist/ltmain.sh
U xsrc/external/mit/xf86-video-mga/dist/mga_PInS.txt
U xsrc/external/mit/xf86-video-mga/dist/configure
U xsrc/external/mit/xf86-video-mga/dist/config.sub
U xsrc/external/mit/xf86-video-mga/dist/src/mgareg_flags.h
U xsrc/external/mit/xf86-video-mga/dist/src/mga_dri.c
U xsrc/external/mit/xf86-video-mga/dist/src/Makefile.in
U xsrc/external/mit/xf86-video-mga/dist/src/mga_macros.h
U xsrc/external/mit/xf86-video-mga/dist/src/clientlx.c
U xsrc/external/mit/xf86-video-mga/dist/src/mga_driver.c
U xsrc/external/mit/xf86-video-mga/dist/src/mga_hwcurs.c
U xsrc/external/mit/xf86-video-mga/dist/src/Makefile.am
U xsrc/external/mit/xf86-video-mga/dist/src/binding.h
U xsrc/external/mit/xf86-video-mga/dist/src/mga_arc.c
U xsrc/external/mit/xf86-video-mga/dist/src/mga_g450pll.c
U xsrc/external/mit/xf86-video-mga/dist/src/mga_esc.c
U xsrc/external/mit/xf86-video-mga/dist/src/mga_merge.h
U xsrc/external/mit/xf86-video-mga/dist/src/mga_video.c
U xsrc/external/mit/xf86-video-mga/dist/src/mga_maven.h
U xsrc/external/mit/xf86-video-mga/dist/src/mga_dga.c
U xsrc/external/mit/xf86-video-mga/dist/src/client.h
U xsrc/external/mit/xf86-video-mga/dist/src/mga_dripriv.h
U xsrc/external/mit/xf86-video-mga/dist/src/mga.h
U xsrc/external/mit/xf86-video-mga/dist/src/mga_bios.c
U xsrc/external/mit/xf86-video-mga/dist/src/mga_common.h
U xsrc/external/mit/xf86-video-mga/dist/src/mga_halmod.c
U xsrc/external/mit/xf86-video-mga/dist/src/mga_dh.c
U xsrc/external/mit/xf86-video-mga/dist/src/mga_dac3026.c
U xsrc/external/mit/xf86-video-mga/dist/src/mga_storm.c
U xsrc/external/mit/xf86-video-mga/dist/src/mga_dri.h
U xsrc/external/mit/xf86-video-mga/dist/src/mga_exa.c
U xsrc/external/mit/xf86-video-mga/dist/src/mga_sarea.h
U xsrc/external/mit/xf86-video-mga/dist/src/mga_ucode.h
U xsrc/external/mit/xf86-video-mga/dist/src/mga_vga.c
U xsrc/external/mit/xf86-video-mga/dist/src/mga_shadow.c
U xsrc/external/mit/xf86-video-mga/dist/src/mga_reg.h
U xsrc/external/mit/xf86-video-mga/dist/src/mga_dacG.c
U xsrc/external/mit/xf86-video-mga/dist/src/mga_merge.c
U xsrc/external/mit/xf86-video-mga/dist/man/Makefile.in
U xsrc/external/mit/xf86-video-mga/dist/man/Makefile.am
U xsrc/external/mit/xf86-video-mga/dist/man/mga.man
U xsrc/external/mit/xf86-video-mga/dist/util/Makefile.in
U xsrc/external/mit/xf86-video-mga/dist/util/Makefile.am
U xsrc/external/mit/xf86-video-mga/dist/util/stormdwg.c
U xsrc/external/mit/xf86-video-mga/dist/util/README

No conflicts created by this import

CVS commit: xsrc/external/mit/xf86-video-neomagic/dist

2009-06-09 Thread matthew green

Module Name:xsrc
Committed By:   mrg
Date:   Wed Jun 10 00:47:48 UTC 2009

Update of /cvsroot/xsrc/external/mit/xf86-video-neomagic/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv8155

Log Message:
initial import of xf86-video-neomagic-1.2.2

Status:

Vendor Tag: xorg
Release Tags:   xf86-video-neomagic-1-2-2

U xsrc/external/mit/xf86-video-neomagic/dist/COPYING
U xsrc/external/mit/xf86-video-neomagic/dist/install-sh
U xsrc/external/mit/xf86-video-neomagic/dist/config.h.in
U xsrc/external/mit/xf86-video-neomagic/dist/README
U xsrc/external/mit/xf86-video-neomagic/dist/config.sub
U xsrc/external/mit/xf86-video-neomagic/dist/TODO
U xsrc/external/mit/xf86-video-neomagic/dist/Makefile.am
U xsrc/external/mit/xf86-video-neomagic/dist/ChangeLog
U xsrc/external/mit/xf86-video-neomagic/dist/ltmain.sh
U xsrc/external/mit/xf86-video-neomagic/dist/Makefile.in
U xsrc/external/mit/xf86-video-neomagic/dist/missing
U xsrc/external/mit/xf86-video-neomagic/dist/aclocal.m4
U xsrc/external/mit/xf86-video-neomagic/dist/configure.ac
U xsrc/external/mit/xf86-video-neomagic/dist/depcomp
U xsrc/external/mit/xf86-video-neomagic/dist/configure
U xsrc/external/mit/xf86-video-neomagic/dist/NM-reg.txt
U xsrc/external/mit/xf86-video-neomagic/dist/config.guess
N xsrc/external/mit/xf86-video-neomagic/dist/src/neo_pcirename.h
U xsrc/external/mit/xf86-video-neomagic/dist/src/neo_cursor.c
U xsrc/external/mit/xf86-video-neomagic/dist/src/neo_video.h
U xsrc/external/mit/xf86-video-neomagic/dist/src/neo.h
U xsrc/external/mit/xf86-video-neomagic/dist/src/neo_2090.c
U xsrc/external/mit/xf86-video-neomagic/dist/src/neo_dga.c
U xsrc/external/mit/xf86-video-neomagic/dist/src/neo_reg.h
U xsrc/external/mit/xf86-video-neomagic/dist/src/neo_i2c.c
U xsrc/external/mit/xf86-video-neomagic/dist/src/Makefile.am
U xsrc/external/mit/xf86-video-neomagic/dist/src/neo_video.c
U xsrc/external/mit/xf86-video-neomagic/dist/src/neo_shadow.c
U xsrc/external/mit/xf86-video-neomagic/dist/src/neo_2070.c
U xsrc/external/mit/xf86-video-neomagic/dist/src/neo_macros.h
U xsrc/external/mit/xf86-video-neomagic/dist/src/Makefile.in
U xsrc/external/mit/xf86-video-neomagic/dist/src/neo_2097.c
U xsrc/external/mit/xf86-video-neomagic/dist/src/neo_bank.c
U xsrc/external/mit/xf86-video-neomagic/dist/src/neo_driver.c
U xsrc/external/mit/xf86-video-neomagic/dist/src/neo_2200.c
U xsrc/external/mit/xf86-video-neomagic/dist/man/Makefile.am
U xsrc/external/mit/xf86-video-neomagic/dist/man/Makefile.in
U xsrc/external/mit/xf86-video-neomagic/dist/man/neomagic.man

No conflicts created by this import

CVS commit: xsrc/external/mit/xf86-video-nv/dist

2009-06-09 Thread matthew green

Module Name:xsrc
Committed By:   mrg
Date:   Wed Jun 10 00:48:00 UTC 2009

Update of /cvsroot/xsrc/external/mit/xf86-video-nv/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv27296

Log Message:
initial import of xf86-video-nv-2.1.13

Status:

Vendor Tag: xorg
Release Tags:   xf86-video-nv-2-1-13

U xsrc/external/mit/xf86-video-nv/dist/missing
U xsrc/external/mit/xf86-video-nv/dist/Makefile.in
U xsrc/external/mit/xf86-video-nv/dist/ChangeLog
U xsrc/external/mit/xf86-video-nv/dist/configure.ac
U xsrc/external/mit/xf86-video-nv/dist/Makefile.am
U xsrc/external/mit/xf86-video-nv/dist/config.guess
N xsrc/external/mit/xf86-video-nv/dist/README
U xsrc/external/mit/xf86-video-nv/dist/COPYING
U xsrc/external/mit/xf86-video-nv/dist/config.h.in
U xsrc/external/mit/xf86-video-nv/dist/install-sh
U xsrc/external/mit/xf86-video-nv/dist/aclocal.m4
U xsrc/external/mit/xf86-video-nv/dist/ltmain.sh
U xsrc/external/mit/xf86-video-nv/dist/configure
U xsrc/external/mit/xf86-video-nv/dist/depcomp
U xsrc/external/mit/xf86-video-nv/dist/config.sub
U xsrc/external/mit/xf86-video-nv/dist/README.G80
U xsrc/external/mit/xf86-video-nv/dist/src/g80_display.c
U xsrc/external/mit/xf86-video-nv/dist/src/riva_proto.h
U xsrc/external/mit/xf86-video-nv/dist/src/Makefile.in
U xsrc/external/mit/xf86-video-nv/dist/src/nv_dac.c
U xsrc/external/mit/xf86-video-nv/dist/src/nv_xaa.c
U xsrc/external/mit/xf86-video-nv/dist/src/riva_setup.c
U xsrc/external/mit/xf86-video-nv/dist/src/g80_cursor.c
U xsrc/external/mit/xf86-video-nv/dist/src/riva_shadow.c
U xsrc/external/mit/xf86-video-nv/dist/src/Makefile.am
U xsrc/external/mit/xf86-video-nv/dist/src/nv_video.c
U xsrc/external/mit/xf86-video-nv/dist/src/nv_hw.c
U xsrc/external/mit/xf86-video-nv/dist/src/g80_cursor.h
U xsrc/external/mit/xf86-video-nv/dist/src/riva_driver.c
U xsrc/external/mit/xf86-video-nv/dist/src/g80_exa.c
U xsrc/external/mit/xf86-video-nv/dist/src/nv_dma.h
U xsrc/external/mit/xf86-video-nv/dist/src/nv_shadow.c
U xsrc/external/mit/xf86-video-nv/dist/src/riva_include.h
U xsrc/external/mit/xf86-video-nv/dist/src/g80_output.c
U xsrc/external/mit/xf86-video-nv/dist/src/riva_tbl.h
U xsrc/external/mit/xf86-video-nv/dist/src/local_xf86Rename.h
U xsrc/external/mit/xf86-video-nv/dist/src/g80_sor.c
U xsrc/external/mit/xf86-video-nv/dist/src/g80_driver.c
U xsrc/external/mit/xf86-video-nv/dist/src/riva_hw.h
U xsrc/external/mit/xf86-video-nv/dist/src/riva_cursor.c
U xsrc/external/mit/xf86-video-nv/dist/src/g80_dac.c
U xsrc/external/mit/xf86-video-nv/dist/src/nv_setup.c
U xsrc/external/mit/xf86-video-nv/dist/src/nv_local.h
U xsrc/external/mit/xf86-video-nv/dist/src/nv_proto.h
U xsrc/external/mit/xf86-video-nv/dist/src/nv_const.h
U xsrc/external/mit/xf86-video-nv/dist/src/g80_dma.h
U xsrc/external/mit/xf86-video-nv/dist/src/nv_include.h
U xsrc/external/mit/xf86-video-nv/dist/src/g80_type.h
U xsrc/external/mit/xf86-video-nv/dist/src/nv_type.h
U xsrc/external/mit/xf86-video-nv/dist/src/g80_xaa.h
U xsrc/external/mit/xf86-video-nv/dist/src/g80_output.h
U xsrc/external/mit/xf86-video-nv/dist/src/riva_dac.c
U xsrc/external/mit/xf86-video-nv/dist/src/riva_hw.c
U xsrc/external/mit/xf86-video-nv/dist/src/g80_exa.h
U xsrc/external/mit/xf86-video-nv/dist/src/riva_dga.c
U xsrc/external/mit/xf86-video-nv/dist/src/riva_const.h
U xsrc/external/mit/xf86-video-nv/dist/src/nv_cursor.c
U xsrc/external/mit/xf86-video-nv/dist/src/riva_local.h
U xsrc/external/mit/xf86-video-nv/dist/src/riva_type.h
U xsrc/external/mit/xf86-video-nv/dist/src/riva_xaa.c
U xsrc/external/mit/xf86-video-nv/dist/src/nv_driver.c
U xsrc/external/mit/xf86-video-nv/dist/src/g80_display.h
U xsrc/external/mit/xf86-video-nv/dist/src/g80_xaa.c
U xsrc/external/mit/xf86-video-nv/dist/src/nv_dga.c
U xsrc/external/mit/xf86-video-nv/dist/src/g80_dma.c
U xsrc/external/mit/xf86-video-nv/dist/compat/Makefile.in
U xsrc/external/mit/xf86-video-nv/dist/compat/Makefile.am
U xsrc/external/mit/xf86-video-nv/dist/compat/README
U xsrc/external/mit/xf86-video-nv/dist/compat/parser/xf86Optrec.h
U xsrc/external/mit/xf86-video-nv/dist/compat/parser/xf86Parser.h
U xsrc/external/mit/xf86-video-nv/dist/compat/modes/xf86RandR12.h
U xsrc/external/mit/xf86-video-nv/dist/compat/modes/xf86Crtc.c
U xsrc/external/mit/xf86-video-nv/dist/compat/modes/xf86DiDGA.c
U xsrc/external/mit/xf86-video-nv/dist/compat/modes/xf86Cursors.c
U xsrc/external/mit/xf86-video-nv/dist/compat/modes/xf86Rotate.c
U xsrc/external/mit/xf86-video-nv/dist/compat/modes/xf86gtf.c
U xsrc/external/mit/xf86-video-nv/dist/compat/modes/xf86cvt.c
U xsrc/external/mit/xf86-video-nv/dist/compat/modes/xf86Modes.h
U xsrc/external/mit/xf86-video-nv/dist/compat/modes/xf86EdidModes.c
U xsrc/external/mit/xf86-video-nv/dist/compat/modes/xf86Crtc.h
U xsrc/external/mit/xf86-video-nv/dist/compat/modes/xf86Rename.h
U xsrc/external/mit/xf86-video-nv/dist/compat/modes/xf86Modes.c
U xsrc/external/mit/xf86-video-nv/dist/compat/modes/xf86RandR12.c
U xsrc/external/mit/xf86-video-nv/dist/man/Makefile.in
U

CVS commit: xsrc/external/mit/xf86-video-sis/dist

2009-06-09 Thread matthew green

Module Name:xsrc
Committed By:   mrg
Date:   Wed Jun 10 00:48:37 UTC 2009

Update of /cvsroot/xsrc/external/mit/xf86-video-sis/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv16325

Log Message:
initial import of xf86-video-sis-0.10.1

Status:

Vendor Tag: xorg
Release Tags:   xf86-video-sis-0-10-1

U xsrc/external/mit/xf86-video-sis/dist/COPYING
U xsrc/external/mit/xf86-video-sis/dist/install-sh
U xsrc/external/mit/xf86-video-sis/dist/config.h.in
U xsrc/external/mit/xf86-video-sis/dist/README
U xsrc/external/mit/xf86-video-sis/dist/config.sub
U xsrc/external/mit/xf86-video-sis/dist/Makefile.am
U xsrc/external/mit/xf86-video-sis/dist/ChangeLog
U xsrc/external/mit/xf86-video-sis/dist/ltmain.sh
U xsrc/external/mit/xf86-video-sis/dist/Makefile.in
U xsrc/external/mit/xf86-video-sis/dist/missing
U xsrc/external/mit/xf86-video-sis/dist/aclocal.m4
U xsrc/external/mit/xf86-video-sis/dist/configure.ac
U xsrc/external/mit/xf86-video-sis/dist/depcomp
U xsrc/external/mit/xf86-video-sis/dist/configure
U xsrc/external/mit/xf86-video-sis/dist/README.sgml
U xsrc/external/mit/xf86-video-sis/dist/config.guess
N xsrc/external/mit/xf86-video-sis/dist/src/sispcirename.h
U xsrc/external/mit/xf86-video-sis/dist/src/osdef.h
U xsrc/external/mit/xf86-video-sis/dist/src/310vtbl.h
U xsrc/external/mit/xf86-video-sis/dist/src/oem300.h
U xsrc/external/mit/xf86-video-sis/dist/src/sis_utility.c
U xsrc/external/mit/xf86-video-sis/dist/src/sis_driver.h
U xsrc/external/mit/xf86-video-sis/dist/src/initextx.h
U xsrc/external/mit/xf86-video-sis/dist/src/sis_dri.c
U xsrc/external/mit/xf86-video-sis/dist/src/sis_video.c
U xsrc/external/mit/xf86-video-sis/dist/src/sis_video.h
U xsrc/external/mit/xf86-video-sis/dist/src/300vtbl.h
U xsrc/external/mit/xf86-video-sis/dist/src/sis_videostr.h
U xsrc/external/mit/xf86-video-sis/dist/src/vstruct.h
U xsrc/external/mit/xf86-video-sis/dist/src/sis_accel.c
U xsrc/external/mit/xf86-video-sis/dist/src/init301.h
U xsrc/external/mit/xf86-video-sis/dist/src/Makefile.am
U xsrc/external/mit/xf86-video-sis/dist/src/sis_vb.c
U xsrc/external/mit/xf86-video-sis/dist/src/sis310_accel.c
U xsrc/external/mit/xf86-video-sis/dist/src/sis_dri.h
U xsrc/external/mit/xf86-video-sis/dist/src/init301.c
U xsrc/external/mit/xf86-video-sis/dist/src/sis6326_video.c
U xsrc/external/mit/xf86-video-sis/dist/src/sis300_accel.h
U xsrc/external/mit/xf86-video-sis/dist/src/sis_regs.h
U xsrc/external/mit/xf86-video-sis/dist/src/sis_accel.h
U xsrc/external/mit/xf86-video-sis/dist/src/sis_opt.c
U xsrc/external/mit/xf86-video-sis/dist/src/Makefile.in
U xsrc/external/mit/xf86-video-sis/dist/src/sis_common.h
U xsrc/external/mit/xf86-video-sis/dist/src/initextx.c
U xsrc/external/mit/xf86-video-sis/dist/src/sis.h
U xsrc/external/mit/xf86-video-sis/dist/src/sis300_accel.c
U xsrc/external/mit/xf86-video-sis/dist/src/vgatypes.h
U xsrc/external/mit/xf86-video-sis/dist/src/sis310_accel.h
U xsrc/external/mit/xf86-video-sis/dist/src/sis_dga.c
U xsrc/external/mit/xf86-video-sis/dist/src/sis_setup.c
U xsrc/external/mit/xf86-video-sis/dist/src/sis_dac.h
U xsrc/external/mit/xf86-video-sis/dist/src/init.c
U xsrc/external/mit/xf86-video-sis/dist/src/oem310.h
U xsrc/external/mit/xf86-video-sis/dist/src/sis_memcpy.c
U xsrc/external/mit/xf86-video-sis/dist/src/sis_driver.c
U xsrc/external/mit/xf86-video-sis/dist/src/init.h
U xsrc/external/mit/xf86-video-sis/dist/src/sis_dac.c
U xsrc/external/mit/xf86-video-sis/dist/src/sis_shadow.c
U xsrc/external/mit/xf86-video-sis/dist/src/sis_cursor.h
U xsrc/external/mit/xf86-video-sis/dist/src/initdef.h
U xsrc/external/mit/xf86-video-sis/dist/src/sis_cursor.c
U xsrc/external/mit/xf86-video-sis/dist/src/sis_vga.c
U xsrc/external/mit/xf86-video-sis/dist/man/Makefile.am
U xsrc/external/mit/xf86-video-sis/dist/man/Makefile.in
U xsrc/external/mit/xf86-video-sis/dist/man/sis.man

No conflicts created by this import

CVS commit: xsrc/external/mit/xf86-video-suncg6/dist

2009-06-09 Thread matthew green

Module Name:xsrc
Committed By:   mrg
Date:   Wed Jun 10 00:48:44 UTC 2009

Update of /cvsroot/xsrc/external/mit/xf86-video-suncg6/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv2115

Log Message:
initial import of xf86-video-suncg6-1.1.1

Status:

Vendor Tag: xorg
Release Tags:   xf86-video-suncg6-1-1-1

U xsrc/external/mit/xf86-video-suncg6/dist/configure.ac
N xsrc/external/mit/xf86-video-suncg6/dist/README
U xsrc/external/mit/xf86-video-suncg6/dist/aclocal.m4
U xsrc/external/mit/xf86-video-suncg6/dist/Makefile.am
U xsrc/external/mit/xf86-video-suncg6/dist/Makefile.in
U xsrc/external/mit/xf86-video-suncg6/dist/config.h.in
U xsrc/external/mit/xf86-video-suncg6/dist/configure
U xsrc/external/mit/xf86-video-suncg6/dist/COPYING
U xsrc/external/mit/xf86-video-suncg6/dist/ChangeLog
U xsrc/external/mit/xf86-video-suncg6/dist/config.guess
U xsrc/external/mit/xf86-video-suncg6/dist/config.sub
U xsrc/external/mit/xf86-video-suncg6/dist/depcomp
U xsrc/external/mit/xf86-video-suncg6/dist/install-sh
U xsrc/external/mit/xf86-video-suncg6/dist/ltmain.sh
U xsrc/external/mit/xf86-video-suncg6/dist/missing
U xsrc/external/mit/xf86-video-suncg6/dist/src/Makefile.am
U xsrc/external/mit/xf86-video-suncg6/dist/src/Makefile.in
U xsrc/external/mit/xf86-video-suncg6/dist/src/cg6_cursor.c
C xsrc/external/mit/xf86-video-suncg6/dist/src/cg6_driver.c
U xsrc/external/mit/xf86-video-suncg6/dist/src/cg6.h
C xsrc/external/mit/xf86-video-suncg6/dist/src/cg6_regs.h
U xsrc/external/mit/xf86-video-suncg6/dist/man/Makefile.am
U xsrc/external/mit/xf86-video-suncg6/dist/man/Makefile.in
U xsrc/external/mit/xf86-video-suncg6/dist/man/suncg6.man

2 conflicts created by this import.
Use the following command to help the merge:

cvs checkout -jxorg:yesterday -jxorg 
xsrc/external/mit/xf86-video-suncg6/dist

CVS commit: xsrc/external/mit/xf86-video-tdfx/dist

2009-06-09 Thread matthew green

Module Name:xsrc
Committed By:   mrg
Date:   Wed Jun 10 00:48:49 UTC 2009

Update of /cvsroot/xsrc/external/mit/xf86-video-tdfx/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv2534

Log Message:
initial import of xf86-video-tdfx-1.4.1

Status:

Vendor Tag: xorg
Release Tags:   xf86-video-tdfx-1-4-1

U xsrc/external/mit/xf86-video-tdfx/dist/COPYING
U xsrc/external/mit/xf86-video-tdfx/dist/install-sh
U xsrc/external/mit/xf86-video-tdfx/dist/config.h.in
U xsrc/external/mit/xf86-video-tdfx/dist/config.sub
U xsrc/external/mit/xf86-video-tdfx/dist/Makefile.am
U xsrc/external/mit/xf86-video-tdfx/dist/ChangeLog
U xsrc/external/mit/xf86-video-tdfx/dist/ltmain.sh
U xsrc/external/mit/xf86-video-tdfx/dist/Makefile.in
U xsrc/external/mit/xf86-video-tdfx/dist/missing
U xsrc/external/mit/xf86-video-tdfx/dist/aclocal.m4
U xsrc/external/mit/xf86-video-tdfx/dist/configure.ac
U xsrc/external/mit/xf86-video-tdfx/dist/depcomp
U xsrc/external/mit/xf86-video-tdfx/dist/configure
U xsrc/external/mit/xf86-video-tdfx/dist/config.guess
U xsrc/external/mit/xf86-video-tdfx/dist/src/tdfx_dripriv.h
U xsrc/external/mit/xf86-video-tdfx/dist/src/tdfx_dri.c
U xsrc/external/mit/xf86-video-tdfx/dist/src/tdfx_accel.c
U xsrc/external/mit/xf86-video-tdfx/dist/src/tdfx_sli.c
U xsrc/external/mit/xf86-video-tdfx/dist/src/tdfx.h
U xsrc/external/mit/xf86-video-tdfx/dist/src/tdfx_driver.c
U xsrc/external/mit/xf86-video-tdfx/dist/src/tdfx_priv.h
U xsrc/external/mit/xf86-video-tdfx/dist/src/tdfx_priv.c
U xsrc/external/mit/xf86-video-tdfx/dist/src/Makefile.am
U xsrc/external/mit/xf86-video-tdfx/dist/src/tdfx_video.c
U xsrc/external/mit/xf86-video-tdfx/dist/src/tdfx_hwcurs.c
U xsrc/external/mit/xf86-video-tdfx/dist/src/Makefile.in
U xsrc/external/mit/xf86-video-tdfx/dist/src/tdfx_dri.h
U xsrc/external/mit/xf86-video-tdfx/dist/src/tdfx_dga.c
U xsrc/external/mit/xf86-video-tdfx/dist/src/tdfxdefs.h
U xsrc/external/mit/xf86-video-tdfx/dist/src/tdfx_io.c
U xsrc/external/mit/xf86-video-tdfx/dist/man/Makefile.am
U xsrc/external/mit/xf86-video-tdfx/dist/man/Makefile.in
U xsrc/external/mit/xf86-video-tdfx/dist/man/tdfx.man

No conflicts created by this import

CVS commit: xsrc/external/mit/xf86-video-tga/dist

2009-06-09 Thread matthew green

Module Name:xsrc
Committed By:   mrg
Date:   Wed Jun 10 00:48:55 UTC 2009

Update of /cvsroot/xsrc/external/mit/xf86-video-tga/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv15512

Log Message:
initial import of xf86-video-tga-1.2.0

Status:

Vendor Tag: xorg
Release Tags:   xf86-video-tga-1-2-0

U xsrc/external/mit/xf86-video-tga/dist/missing
U xsrc/external/mit/xf86-video-tga/dist/Makefile.in
U xsrc/external/mit/xf86-video-tga/dist/ChangeLog
U xsrc/external/mit/xf86-video-tga/dist/configure.ac
U xsrc/external/mit/xf86-video-tga/dist/Makefile.am
U xsrc/external/mit/xf86-video-tga/dist/config.guess
U xsrc/external/mit/xf86-video-tga/dist/README.sgml
U xsrc/external/mit/xf86-video-tga/dist/README
U xsrc/external/mit/xf86-video-tga/dist/COPYING
U xsrc/external/mit/xf86-video-tga/dist/config.h.in
U xsrc/external/mit/xf86-video-tga/dist/install-sh
U xsrc/external/mit/xf86-video-tga/dist/aclocal.m4
U xsrc/external/mit/xf86-video-tga/dist/ltmain.sh
U xsrc/external/mit/xf86-video-tga/dist/configure
U xsrc/external/mit/xf86-video-tga/dist/depcomp
U xsrc/external/mit/xf86-video-tga/dist/config.sub
U xsrc/external/mit/xf86-video-tga/dist/src/BT463ramdac.c
U xsrc/external/mit/xf86-video-tga/dist/src/Makefile.in
U xsrc/external/mit/xf86-video-tga/dist/src/IBM561ramdac.c
U xsrc/external/mit/xf86-video-tga/dist/src/tga_seg.c
U xsrc/external/mit/xf86-video-tga/dist/src/tga_cursor.c
U xsrc/external/mit/xf86-video-tga/dist/src/Makefile.am
U xsrc/external/mit/xf86-video-tga/dist/src/BTramdac.c
U xsrc/external/mit/xf86-video-tga/dist/src/tga_accel.c
U xsrc/external/mit/xf86-video-tga/dist/src/tga_line.c
U xsrc/external/mit/xf86-video-tga/dist/src/tga_driver.c
U xsrc/external/mit/xf86-video-tga/dist/src/ICS1562.c
U xsrc/external/mit/xf86-video-tga/dist/src/tga.h
U xsrc/external/mit/xf86-video-tga/dist/src/tga_dac.c
N xsrc/external/mit/xf86-video-tga/dist/src/tga_pcirename.h
U xsrc/external/mit/xf86-video-tga/dist/src/tga_regs.h

No conflicts created by this import

CVS commit: xsrc/external/mit/xinput/dist

2009-06-09 Thread matthew green

Module Name:xsrc
Committed By:   mrg
Date:   Wed Jun 10 00:49:03 UTC 2009

Update of /cvsroot/xsrc/external/mit/xinput/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv25769

Log Message:
initial import of xinput-1.4.2

Status:

Vendor Tag: xorg
Release Tags:   xinput-1-4-2

U xsrc/external/mit/xinput/dist/COPYING
U xsrc/external/mit/xinput/dist/config.guess
U xsrc/external/mit/xinput/dist/aclocal.m4
U xsrc/external/mit/xinput/dist/Makefile.am
U xsrc/external/mit/xinput/dist/README
U xsrc/external/mit/xinput/dist/missing
U xsrc/external/mit/xinput/dist/depcomp
U xsrc/external/mit/xinput/dist/config.h.in
U xsrc/external/mit/xinput/dist/configure.ac
U xsrc/external/mit/xinput/dist/Makefile.in
U xsrc/external/mit/xinput/dist/INSTALL
U xsrc/external/mit/xinput/dist/AUTHORS
U xsrc/external/mit/xinput/dist/config.sub
U xsrc/external/mit/xinput/dist/ChangeLog
U xsrc/external/mit/xinput/dist/NEWS
U xsrc/external/mit/xinput/dist/configure
U xsrc/external/mit/xinput/dist/install-sh
U xsrc/external/mit/xinput/dist/man/xinput.man
U xsrc/external/mit/xinput/dist/man/Makefile.am
U xsrc/external/mit/xinput/dist/man/Makefile.in
U xsrc/external/mit/xinput/dist/src/Makefile.am
U xsrc/external/mit/xinput/dist/src/state.c
U xsrc/external/mit/xinput/dist/src/buttonmap.c
U xsrc/external/mit/xinput/dist/src/list.c
U xsrc/external/mit/xinput/dist/src/version.c
U xsrc/external/mit/xinput/dist/src/test.c
U xsrc/external/mit/xinput/dist/src/setcp.c
U xsrc/external/mit/xinput/dist/src/setmode.c
U xsrc/external/mit/xinput/dist/src/property.c
U xsrc/external/mit/xinput/dist/src/hierarchy.c
U xsrc/external/mit/xinput/dist/src/setint.c
U xsrc/external/mit/xinput/dist/src/Makefile.in
U xsrc/external/mit/xinput/dist/src/xinput.c
U xsrc/external/mit/xinput/dist/src/xinput.h
U xsrc/external/mit/xinput/dist/src/feedback.c
U xsrc/external/mit/xinput/dist/src/setptr.c

No conflicts created by this import

CVS commit: xsrc/external/mit/xf86-video-cirrus/dist/src

2009-06-09 Thread matthew green

Module Name:xsrc
Committed By:   mrg
Date:   Wed Jun 10 01:54:49 UTC 2009

Modified Files:
xsrc/external/mit/xf86-video-cirrus/dist/src: lg_driver.c

Log Message:
#include inputstr.h since we use stuff from there.
CVS--


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.2 \
xsrc/external/mit/xf86-video-cirrus/dist/src/lg_driver.c

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

Modified files:

Index: xsrc/external/mit/xf86-video-cirrus/dist/src/lg_driver.c
diff -u xsrc/external/mit/xf86-video-cirrus/dist/src/lg_driver.c:1.1.1.2 xsrc/external/mit/xf86-video-cirrus/dist/src/lg_driver.c:1.2
--- xsrc/external/mit/xf86-video-cirrus/dist/src/lg_driver.c:1.1.1.2	Wed Jun 10 00:46:44 2009
+++ xsrc/external/mit/xf86-video-cirrus/dist/src/lg_driver.c	Wed Jun 10 01:54:49 2009
@@ -57,6 +57,8 @@
 
 #include fb.h
 
+#include inputstr.h
+
 #include xf86DDC.h
 
 #undef LG_DEBUG

CVS commit: src/sys/uvm

2009-06-09 Thread YAMAMOTO Takashi

Module Name:src
Committed By:   yamt
Date:   Wed Jun 10 01:55:33 UTC 2009

Modified Files:
src/sys/uvm: uvm_map.c uvm_map.h uvm_mmap.c

Log Message:
on MADV_WILLNEED, start prefetching backing object's pages.


To generate a diff of this commit:
cvs rdiff -u -r1.270 -r1.271 src/sys/uvm/uvm_map.c
cvs rdiff -u -r1.62 -r1.63 src/sys/uvm/uvm_map.h
cvs rdiff -u -r1.129 -r1.130 src/sys/uvm/uvm_mmap.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/uvm/uvm_map.c
diff -u src/sys/uvm/uvm_map.c:1.270 src/sys/uvm/uvm_map.c:1.271
--- src/sys/uvm/uvm_map.c:1.270	Sun May  3 16:52:54 2009
+++ src/sys/uvm/uvm_map.c	Wed Jun 10 01:55:33 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: uvm_map.c,v 1.270 2009/05/03 16:52:54 pooka Exp $	*/
+/*	$NetBSD: uvm_map.c,v 1.271 2009/06/10 01:55:33 yamt Exp $	*/
 
 /*
  * Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -71,7 +71,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: uvm_map.c,v 1.270 2009/05/03 16:52:54 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: uvm_map.c,v 1.271 2009/06/10 01:55:33 yamt Exp $);
 
 #include opt_ddb.h
 #include opt_uvmhist.h
@@ -95,6 +95,7 @@
 #endif
 
 #include uvm/uvm.h
+#include uvm/uvm_readahead.h
 
 #if defined(DDB) || defined(DEBUGPRINT)
 #include uvm/uvm_ddb.h
@@ -3335,6 +3336,57 @@
 }
 
 /*
+ * uvm_map_willneed: apply MADV_WILLNEED
+ */
+
+int
+uvm_map_willneed(struct vm_map *map, vaddr_t start, vaddr_t end)
+{
+	struct vm_map_entry *entry;
+	UVMHIST_FUNC(uvm_map_willneed); UVMHIST_CALLED(maphist);
+	UVMHIST_LOG(maphist,(map=0x%lx,start=0x%lx,end=0x%lx),
+	map, start, end, 0);
+
+	vm_map_lock_read(map);
+	VM_MAP_RANGE_CHECK(map, start, end);
+	if (!uvm_map_lookup_entry(map, start, entry)) {
+		entry = entry-next;
+	}
+	while (entry-start  end) {
+		struct vm_amap * const amap = entry-aref.ar_amap;
+		struct uvm_object * const uobj = entry-object.uvm_obj;
+
+		KASSERT(entry != map-header);
+		KASSERT(start  entry-end);
+		/*
+		 * XXX IMPLEMENT ME.
+		 * Should invent a weak mode for uvm_fault()
+		 * which would only do the PGO_LOCKED pgo_get().
+		 *
+		 * for now, we handle only the easy but common case.
+		 */
+		if (UVM_ET_ISOBJ(entry)  amap == NULL  uobj != NULL) {
+			off_t offset;
+			off_t size;
+
+			offset = entry-offset;
+			if (start  entry-start) {
+offset += entry-start - start;
+			}
+			size = entry-offset + (entry-end - entry-start);
+			if (entry-end  end) {
+size -= end - entry-end;
+			}
+			uvm_readahead(uobj, offset, size);
+		}
+		entry = entry-next;
+	}
+	vm_map_unlock_read(map);
+	UVMHIST_LOG(maphist,- done (OK),0,0,0,0);
+	return 0;
+}
+
+/*
  * uvm_map_pageable: sets the pageability of a range in a map.
  *
  * = wires map entries.  should not be used for transient page locking.

Index: src/sys/uvm/uvm_map.h
diff -u src/sys/uvm/uvm_map.h:1.62 src/sys/uvm/uvm_map.h:1.63
--- src/sys/uvm/uvm_map.h:1.62	Tue Jul 29 00:03:06 2008
+++ src/sys/uvm/uvm_map.h	Wed Jun 10 01:55:33 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: uvm_map.h,v 1.62 2008/07/29 00:03:06 matt Exp $	*/
+/*	$NetBSD: uvm_map.h,v 1.63 2009/06/10 01:55:33 yamt Exp $	*/
 
 /*
  * Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -297,6 +297,7 @@
 
 void		uvm_map_deallocate(struct vm_map *);
 
+int		uvm_map_willneed(struct vm_map *, vaddr_t, vaddr_t);
 int		uvm_map_clean(struct vm_map *, vaddr_t, vaddr_t, int);
 void		uvm_map_clip_start(struct vm_map *, struct vm_map_entry *,
 		vaddr_t, struct uvm_mapent_reservation *);

Index: src/sys/uvm/uvm_mmap.c
diff -u src/sys/uvm/uvm_mmap.c:1.129 src/sys/uvm/uvm_mmap.c:1.130
--- src/sys/uvm/uvm_mmap.c:1.129	Sat May 30 04:26:16 2009
+++ src/sys/uvm/uvm_mmap.c	Wed Jun 10 01:55:33 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: uvm_mmap.c,v 1.129 2009/05/30 04:26:16 yamt Exp $	*/
+/*	$NetBSD: uvm_mmap.c,v 1.130 2009/06/10 01:55:33 yamt Exp $	*/
 
 /*
  * Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -51,7 +51,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: uvm_mmap.c,v 1.129 2009/05/30 04:26:16 yamt Exp $);
+__KERNEL_RCSID(0, $NetBSD: uvm_mmap.c,v 1.130 2009/06/10 01:55:33 yamt Exp $);
 
 #include opt_compat_netbsd.h
 #include opt_pax.h
@@ -849,13 +849,9 @@
 		 * Activate all these pages, pre-faulting them in if
 		 * necessary.
 		 */
-		/*
-		 * XXX IMPLEMENT ME.
-		 * Should invent a weak mode for uvm_fault()
-		 * which would only do the PGO_LOCKED pgo_get().
-		 */
-
-		return (0);
+		error = uvm_map_willneed(p-p_vmspace-vm_map,
+		addr, addr + size);
+		break;
 
 	case MADV_DONTNEED:

CVS commit: xsrc/external/mit/libpciaccess/dist/src

2009-06-09 Thread matthew green

Module Name:xsrc
Committed By:   mrg
Date:   Wed Jun 10 01:55:38 UTC 2009

Modified Files:
xsrc/external/mit/libpciaccess/dist/src: netbsd_pci.c

Log Message:
apply pkgsrc patch-ac to make this work.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
xsrc/external/mit/libpciaccess/dist/src/netbsd_pci.c

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

Modified files:

Index: xsrc/external/mit/libpciaccess/dist/src/netbsd_pci.c
diff -u xsrc/external/mit/libpciaccess/dist/src/netbsd_pci.c:1.1.1.1 xsrc/external/mit/libpciaccess/dist/src/netbsd_pci.c:1.2
--- xsrc/external/mit/libpciaccess/dist/src/netbsd_pci.c:1.1.1.1	Wed Jun 10 00:46:09 2009
+++ xsrc/external/mit/libpciaccess/dist/src/netbsd_pci.c	Wed Jun 10 01:55:37 2009
@@ -20,12 +20,15 @@
 #include sys/mman.h
 #include sys/types.h
 
+#ifdef HAVE_MTRR
 #include machine/sysarch.h
 #include machine/mtrr.h
+#define netbsd_set_mtrr(mr, num)	_X86_SYSARCH_L(set_mtrr)(mr, num)
+#endif
 
+#include dev/pci/pcidevs.h
 #include dev/pci/pciio.h
 #include dev/pci/pcireg.h
-#include dev/pci/pcidevs.h
 
 #include errno.h
 #include fcntl.h
@@ -35,6 +38,8 @@
 #include unistd.h
 
 
+#include pci.h
+
 #include pciaccess.h
 #include pciaccess_private.h
 
@@ -43,20 +48,12 @@
 static int
 pci_read(int bus, int dev, int func, uint32_t reg, uint32_t *val)
 {
-	struct pciio_bdf_cfgreg io;
-	int err;
+	uint32_t rval;
 
-	bzero(io, sizeof(io));
-	io.bus = bus;
-	io.device = dev;
-	io.function = func;
-	io.cfgreg.reg = reg;
+	if (pcibus_conf_read(pcifd, bus, dev, func, reg, rval) == -1)
+		return (-1);
 
-	err = ioctl(pcifd, PCI_IOC_BDF_CFGREAD, io);
-	if (err)
-		return (err);
-
-	*val = io.cfgreg.val;
+	*val = rval;
 
 	return 0;
 }
@@ -64,16 +61,7 @@
 static int
 pci_write(int bus, int dev, int func, uint32_t reg, uint32_t val)
 {
-	struct pciio_bdf_cfgreg io;
-
-	bzero(io, sizeof(io));
-	io.bus = bus;
-	io.device = dev;
-	io.function = func;
-	io.cfgreg.reg = reg;
-	io.cfgreg.val = val;
-
-	return ioctl(pcifd, PCI_IOC_BDF_CFGWRITE, io);
+	return pcibus_conf_write(pcifd, bus, dev, func, reg, val);
 }
 
 static int
@@ -91,70 +79,68 @@
 pci_device_netbsd_map_range(struct pci_device *dev,
 struct pci_device_mapping *map)
 {
-	struct mtrr mtrr;
-	int fd, error, nmtrr, prot = PROT_READ;
+#ifdef HAVE_MTRR
+	struct mtrr m;
+	int n = 1;
+#endif
+	int prot, fd, ret = 0;
 
-	if ((fd = open(/dev/mem, O_RDWR)) == -1)
-		return errno;
+	prot = PROT_READ;
 
 	if (map-flags  PCI_DEV_MAP_FLAG_WRITABLE)
 		prot |= PROT_WRITE;
 
-	map-memory = mmap(NULL, map-size, prot, MAP_SHARED,
-	fd, map-base);
+	fd = open(/dev/mem, O_RDWR);
+	if (fd == -1)
+		return errno;
+	map-memory = mmap(NULL, map-size, prot, MAP_SHARED, fd, map-base);
 	if (map-memory == MAP_FAILED)
 		return errno;
 
+#ifdef HAVE_MTRR
+	memset(m, 0, sizeof(m));
+
 	/* No need to set an MTRR if it's the default mode. */
 	if ((map-flags  PCI_DEV_MAP_FLAG_CACHABLE) ||
 	(map-flags  PCI_DEV_MAP_FLAG_WRITE_COMBINE)) {
-		mtrr.base = map-base;
-		mtrr.len = map-size;
-		mtrr.flags = MTRR_VALID;
-
-		if (map-flags  PCI_DEV_MAP_FLAG_CACHABLE)
-			mtrr.type = MTRR_TYPE_WB;
+		m.base = base;
+		m.flags = MTRR_VALID | MTRR_PRIVATE;
+		m.len = size;
+		m.owner = getpid();
+		if (map-flags  PCI_DEV_MAP_FLAG_CACHEABLE)
+			m.type = MTRR_TYPE_WB;
 		if (map-flags  PCI_DEV_MAP_FLAG_WRITE_COMBINE)
-			mtrr.type = MTRR_TYPE_WC;
-#ifdef __i386__
-		error = i386_set_mtrr(mtrr, nmtrr);
-#endif
-#ifdef __amd64__
-		error = x86_64_set_mtrr(mtrr, nmtrr);
-#endif
-		if (error) {
-			close(fd);
-			return errno;
-		}
+			m.type = MTRR_TYPE_WC;
+
+		if ((netbsd_set_mtrr(m, n)) == -1)
+			ret = errno;
 	}
+#endif
 
 	close(fd);
 
-	return 0;
+	return ret;
 }
 
 static int
 pci_device_netbsd_unmap_range(struct pci_device *dev,
 struct pci_device_mapping *map)
 {
-	struct mtrr mtrr;
-	int nmtrr, error;
+#ifdef HAVE_MTRR
+	struct mtrr m;
+	int n = 1;
+
+	memset(m, 0, sizeof(m));
 
 	if ((map-flags  PCI_DEV_MAP_FLAG_CACHABLE) ||
 	(map-flags  PCI_DEV_MAP_FLAG_WRITE_COMBINE)) {
-		mtrr.base = map-base;
-		mtrr.len = map-size;
-		mtrr.type = MTRR_TYPE_UC;
-		mtrr.flags = 0; /* clear/set MTRR */
-#ifdef __i386__
-		error = i386_set_mtrr(mtrr, nmtrr);
-#endif
-#ifdef __amd64__
-		error = x86_64_set_mtrr(mtrr, nmtrr);
-#endif
-		if (error)
-			return errno;
+		m.base = map-base;
+		m.flags = 0;
+		m.len = size;
+		m.type = MTRR_TYPE_UC;
+		(void)netbsd_set_mtrr(m, n);
 	}
+#endif
 
 	return pci_device_generic_unmap_range(dev, map);
 }
@@ -163,25 +149,22 @@
 pci_device_netbsd_read(struct pci_device *dev, void *data,
 pciaddr_t offset, pciaddr_t size, pciaddr_t *bytes_read)
 {
-	struct pciio_bdf_cfgreg io;
-
-	io.bus = dev-bus;
-	io.device = dev-dev;
-	io.function = dev-func;
+	u_int reg, rval;
 
 	*bytes_read = 0;
 	while (size  0) {
 		int toread = MIN(size, 4 - (offset  0x3));
 
-		io.cfgreg.reg = (offset  ~0x3);
+		reg = (offset  ~0x3);
 
-		if

CVS commit: xsrc/external/mit/libpciaccess/dist/src

2009-06-09 Thread matthew green

Module Name:xsrc
Committed By:   mrg
Date:   Wed Jun 10 01:55:53 UTC 2009

Modified Files:
xsrc/external/mit/libpciaccess/dist/src: common_bridge.c
common_device_name.c

Log Message:
use #ifdef HAVE_CONFIG_H as necessary.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
xsrc/external/mit/libpciaccess/dist/src/common_bridge.c \
xsrc/external/mit/libpciaccess/dist/src/common_device_name.c

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

Modified files:

Index: xsrc/external/mit/libpciaccess/dist/src/common_bridge.c
diff -u xsrc/external/mit/libpciaccess/dist/src/common_bridge.c:1.1.1.1 xsrc/external/mit/libpciaccess/dist/src/common_bridge.c:1.2
--- xsrc/external/mit/libpciaccess/dist/src/common_bridge.c:1.1.1.1	Wed Jun 10 00:46:09 2009
+++ xsrc/external/mit/libpciaccess/dist/src/common_bridge.c	Wed Jun 10 01:55:53 2009
@@ -29,7 +29,10 @@
  * \author Ian Romanick i...@us.ibm.com
  */
 
+#if defined(HAVE_CONFIG_H)
 #include config.h
+#endif
+
 #include stdio.h
 #include stdlib.h
 #include ctype.h
Index: xsrc/external/mit/libpciaccess/dist/src/common_device_name.c
diff -u xsrc/external/mit/libpciaccess/dist/src/common_device_name.c:1.1.1.1 xsrc/external/mit/libpciaccess/dist/src/common_device_name.c:1.2
--- xsrc/external/mit/libpciaccess/dist/src/common_device_name.c:1.1.1.1	Wed Jun 10 00:46:09 2009
+++ xsrc/external/mit/libpciaccess/dist/src/common_device_name.c	Wed Jun 10 01:55:53 2009
@@ -28,7 +28,10 @@
  * with a particular device or vendor.
  */
 
+#if defined(HAVE_CONFIG_H)
 #include config.h
+#endif
+
 #include stdio.h
 #include stdlib.h
 #include ctype.h

CVS commit: src/sys/kern

2009-06-09 Thread YAMAMOTO Takashi

Module Name:src
Committed By:   yamt
Date:   Wed Jun 10 01:56:35 UTC 2009

Modified Files:
src/sys/kern: sys_descrip.c

Log Message:
do_posix_fadvise: on POSIX_FADV_WILLNEED, start prefeching of object's pages.


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/kern/sys_descrip.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/kern/sys_descrip.c
diff -u src/sys/kern/sys_descrip.c:1.14 src/sys/kern/sys_descrip.c:1.15
--- src/sys/kern/sys_descrip.c:1.14	Sun May 31 22:15:13 2009
+++ src/sys/kern/sys_descrip.c	Wed Jun 10 01:56:34 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: sys_descrip.c,v 1.14 2009/05/31 22:15:13 yamt Exp $	*/
+/*	$NetBSD: sys_descrip.c,v 1.15 2009/06/10 01:56:34 yamt Exp $	*/
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: sys_descrip.c,v 1.14 2009/05/31 22:15:13 yamt Exp $);
+__KERNEL_RCSID(0, $NetBSD: sys_descrip.c,v 1.15 2009/06/10 01:56:34 yamt Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -94,6 +94,8 @@
 #include sys/mount.h
 #include sys/syscallargs.h
 
+#include uvm/uvm_readahead.h
+
 /*
  * Duplicate a file descriptor.
  */
@@ -613,6 +615,7 @@
 do_posix_fadvise(int fd, off_t offset, off_t len, int advice)
 {
 	file_t *fp;
+	vnode_t *vp;
 	int error;
 	CTASSERT(POSIX_FADV_NORMAL == UVM_ADV_NORMAL);
 	CTASSERT(POSIX_FADV_RANDOM == UVM_ADV_RANDOM);
@@ -647,6 +650,11 @@
 		break;
 
 	case POSIX_FADV_WILLNEED:
+		vp = fp-f_data;
+		error = uvm_readahead(vp-v_uobj, offset,
+		len != 0 ? len : INT64_MAX - offset);
+		break;
+
 	case POSIX_FADV_DONTNEED:
 	case POSIX_FADV_NOREUSE:
 		/* Not implemented yet. */

CVS commit: src/external/mit/xorg/server/drivers

2009-06-09 Thread matthew green

Module Name:src
Committed By:   mrg
Date:   Wed Jun 10 01:59:09 UTC 2009

Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-ark: Makefile
src/external/mit/xorg/server/drivers/xf86-video-s3virge: Makefile

Log Message:
define PACKAGE_VERSION.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/external/mit/xorg/server/drivers/xf86-video-ark/Makefile
cvs rdiff -u -r1.2 -r1.3 \
src/external/mit/xorg/server/drivers/xf86-video-s3virge/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/mit/xorg/server/drivers/xf86-video-ark/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-ark/Makefile:1.3 src/external/mit/xorg/server/drivers/xf86-video-ark/Makefile:1.4
--- src/external/mit/xorg/server/drivers/xf86-video-ark/Makefile:1.3	Sun Aug  3 09:24:14 2008
+++ src/external/mit/xorg/server/drivers/xf86-video-ark/Makefile	Wed Jun 10 01:59:09 2009
@@ -1,8 +1,10 @@
-#	$NetBSD: Makefile,v 1.3 2008/08/03 09:24:14 rtr Exp $
+#	$NetBSD: Makefile,v 1.4 2009/06/10 01:59:09 mrg Exp $
 
 DRIVER=		xf86-video-ark
 DRIVER_NAME=	ark_drv
 
 SRCS=		ark_accel.c ark_driver.c
 
+CPPFLAGS+=	-DPACKAGE_VERSION=\${PACKAGE_VERSION}\
+
 .include ../Makefile.xf86-driver

Index: src/external/mit/xorg/server/drivers/xf86-video-s3virge/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-s3virge/Makefile:1.2 src/external/mit/xorg/server/drivers/xf86-video-s3virge/Makefile:1.3
--- src/external/mit/xorg/server/drivers/xf86-video-s3virge/Makefile:1.2	Sun Aug  3 07:32:04 2008
+++ src/external/mit/xorg/server/drivers/xf86-video-s3virge/Makefile	Wed Jun 10 01:59:09 2009
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 2008/08/03 07:32:04 rtr Exp $
+#	$NetBSD: Makefile,v 1.3 2009/06/10 01:59:09 mrg Exp $
 
 DRIVER=		xf86-video-s3virge
 DRIVER_NAME=	s3virge_drv
@@ -7,4 +7,6 @@
 SRCS+=		s3v_i2c.c s3v_shadow.c s3v_xv.c
 MAN=		s3virge.4
 
+CPPFLAGS+=	-DPACKAGE_VERSION=\${PACKAGE_VERSION}\
+
 .include ../Makefile.xf86-driver

CVS commit: src/external/mit/xorg/server/drivers/xf86-video-glint

2009-06-09 Thread matthew green

Module Name:src
Committed By:   mrg
Date:   Wed Jun 10 02:00:10 UTC 2009

Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-glint: Makefile

Log Message:
define HAVE_CONFIG_H, and use the newly provided one.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
src/external/mit/xorg/server/drivers/xf86-video-glint/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/mit/xorg/server/drivers/xf86-video-glint/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-glint/Makefile:1.5 src/external/mit/xorg/server/drivers/xf86-video-glint/Makefile:1.6
--- src/external/mit/xorg/server/drivers/xf86-video-glint/Makefile:1.5	Sat Feb 14 13:32:13 2009
+++ src/external/mit/xorg/server/drivers/xf86-video-glint/Makefile	Wed Jun 10 02:00:10 2009
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.5 2009/02/14 13:32:13 abs Exp $
+#	$NetBSD: Makefile,v 1.6 2009/06/10 02:00:10 mrg Exp $
 
 DRIVER=		xf86-video-glint
 DRIVER_NAME=	glint_drv
@@ -17,6 +17,7 @@
 CPPFLAGS+=	-DPPC_MMIO_IS_BE
 .endif
 
+CPPFLAGS+=	-DHAVE_CONFIG_H -I${X11SRCDIR.${DRIVER}}/../include
 CPPFLAGS+=	-I${DESTDIR}${X11INCDIR}/X11
 CPPFLAGS+=	-I${DESTDIR}${X11INCDIR}/X11/dri
 CPPFLAGS+=	-I${DESTDIR}${X11INCDIR}/X11/drm

CVS commit: src/external/mit/xorg/server/drivers/xf86-video-mga

2009-06-09 Thread matthew green

Module Name:src
Committed By:   mrg
Date:   Wed Jun 10 02:00:51 UTC 2009

Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-mga: Makefile

Log Message:
mga_dacG.c has an const issue; work around it.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
src/external/mit/xorg/server/drivers/xf86-video-mga/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/mit/xorg/server/drivers/xf86-video-mga/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-mga/Makefile:1.4 src/external/mit/xorg/server/drivers/xf86-video-mga/Makefile:1.5
--- src/external/mit/xorg/server/drivers/xf86-video-mga/Makefile:1.4	Mon Sep  1 04:21:04 2008
+++ src/external/mit/xorg/server/drivers/xf86-video-mga/Makefile	Wed Jun 10 02:00:51 2009
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.4 2008/09/01 04:21:04 mrg Exp $
+#	$NetBSD: Makefile,v 1.5 2009/06/10 02:00:51 mrg Exp $
 
 .include bsd.own.mk
 
@@ -28,5 +28,6 @@
 CPPFLAGS+=	-I${DESTDIR}${X11INCDIR}/X11/drm
 
 CPPFLAGS.mga_driver.c=	-Wno-error	# XXX fix me please
+CPPFLAGS.mga_dacG.c=	-Wno-error	# XXX fix me please
 
 .include ../Makefile.xf86-driver

CVS commit: src/external/mit/xorg/tools/bdftopcf

2009-06-09 Thread matthew green

Module Name:src
Committed By:   mrg
Date:   Wed Jun 10 02:01:39 UTC 2009

Modified Files:
src/external/mit/xorg/tools/bdftopcf: Makefile

Log Message:
enable bz2 support.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/mit/xorg/tools/bdftopcf/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/mit/xorg/tools/bdftopcf/Makefile
diff -u src/external/mit/xorg/tools/bdftopcf/Makefile:1.1.1.1 src/external/mit/xorg/tools/bdftopcf/Makefile:1.2
--- src/external/mit/xorg/tools/bdftopcf/Makefile:1.1.1.1	Tue Jul 29 05:01:23 2008
+++ src/external/mit/xorg/tools/bdftopcf/Makefile	Wed Jun 10 02:01:39 2009
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1.1.1 2008/07/29 05:01:23 mrg Exp $
+#	$NetBSD: Makefile,v 1.2 2009/06/10 02:01:39 mrg Exp $
 
 NOMAN=		1
 
@@ -16,7 +16,7 @@
 		-I${DESTDIR}${X11INCDIR}/X11/fonts \
 		-I${DESTDIR}${X11INCDIR}/freetype2 \
 		-I${X11SRCDIR.Xfont}/src/stubs \
-		-DBDFFORMAT -DPCFFORMAT -DSNFFORMAT -DX_GZIP_FONT_COMPRESSION \
+		-DBDFFORMAT -DPCFFORMAT -DSNFFORMAT -DX_GZIP_FONT_COMPRESSION -DX_BZIP2_FONT_COMPRESSION \
 		-DFONT_ENCODINGS_DIRECTORY=\${X11FONTDIR}/encodings/encodings.dir\
 
 .PATH:		${X11SRCDIR.Xfont}/src/bitmap

CVS commit: src/external/mit/xorg/lib/libXfont

2009-06-09 Thread matthew green

Module Name:src
Committed By:   mrg
Date:   Wed Jun 10 02:04:21 UTC 2009

Modified Files:
src/external/mit/xorg/lib/libXfont: Makefile

Log Message:
enable bz2 support.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/lib/libXfont/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/mit/xorg/lib/libXfont/Makefile
diff -u src/external/mit/xorg/lib/libXfont/Makefile:1.4 src/external/mit/xorg/lib/libXfont/Makefile:1.5
--- src/external/mit/xorg/lib/libXfont/Makefile:1.4	Thu Nov  6 22:28:26 2008
+++ src/external/mit/xorg/lib/libXfont/Makefile	Wed Jun 10 02:04:20 2009
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.4 2008/11/06 22:28:26 veego Exp $
+#	$NetBSD: Makefile,v 1.5 2009/06/10 02:04:20 mrg Exp $
 
 .include bsd.own.mk
 
@@ -43,7 +43,7 @@
 
 CPPFLAGS+=	${X11FLAGS.THREADLIB} ${X11FLAGS.CONNECTION}
 CPPFLAGS+=	-DHAS_SNPRINTF -DHAVE_CONFIG_H
-CPPFLAGS+=  -DBDFFORMAT -DSNFFORMAT -DPCFFORMAT -DX_GZIP_FONT_COMPRESSION
+CPPFLAGS+=  -DBDFFORMAT -DSNFFORMAT -DPCFFORMAT -DX_GZIP_FONT_COMPRESSION -DX_BZIP2_FONT_COMPRESSION
 CPPFLAGS+=	-DFONT_ENCODINGS_DIRECTORY=\${X11LIBDIR}/X11/fonts/encodings/encodings.dir\ 
 CPPFLAGS+=	-I${DESTDIR}${X11INCDIR}
 CPPFLAGS+=	-I${DESTDIR}${X11INCDIR}/X11/fonts

CVS commit: src/share/mk

2009-06-09 Thread matthew green

Module Name:src
Committed By:   mrg
Date:   Wed Jun 10 02:05:45 UTC 2009

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

Log Message:
sync the list of valid xorg packages:
- add libpciaccess
- remove Xp XprintUtil XprintAppUtil


To generate a diff of this commit:
cvs rdiff -u -r1.563 -r1.564 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.563 src/share/mk/bsd.own.mk:1.564
--- src/share/mk/bsd.own.mk:1.563	Mon May  4 21:32:31 2009
+++ src/share/mk/bsd.own.mk	Wed Jun 10 02:05:45 2009
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.own.mk,v 1.563 2009/05/04 21:32:31 ad Exp $
+#	$NetBSD: bsd.own.mk,v 1.564 2009/06/10 02:05:45 mrg Exp $
 
 .if !defined(_BSD_OWN_MK_)
 _BSD_OWN_MK_=1
@@ -836,9 +836,9 @@
 X11SRCDIRMIT?=		${X11SRCDIR}/external/mit
 .for _lib in \
 	FS ICE SM X11 XScrnSaver XTrap Xau Xcomposite Xcursor Xdamage \
-	Xdmcp Xevie Xext Xfixes Xfont Xft Xi Xinerama Xmu Xp Xpm XprintUtil \
+	Xdmcp Xevie Xext Xfixes Xfont Xft Xi Xinerama Xmu Xpm \
 	Xrandr Xrender Xres Xt Xtst Xv XvMC Xxf86dga Xxf86misc Xxf86vm drm \
-	fontenc xkbfile xkbui Xaw lbxutil Xfontcache XprintAppUtil
+	fontenc xkbfile xkbui Xaw lbxutil Xfontcache pciaccess
 X11SRCDIR.${_lib}?=		${X11SRCDIRMIT}/lib${_lib}/dist
 .endfor

CVS commit: xsrc/external/mit/xf86-video-trident/dist/src

2009-06-09 Thread matthew green

Module Name:xsrc
Committed By:   mrg
Date:   Wed Jun 10 02:27:58 UTC 2009

Removed Files:
xsrc/external/mit/xf86-video-trident/dist/src: tridentramdac.c

Log Message:
merge xf86-video-trident 1.3.1


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r0 \
xsrc/external/mit/xf86-video-trident/dist/src/tridentramdac.c

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

CVS commit: src/external/mit/xorg/server/drivers/xf86-video-trident

2009-06-09 Thread matthew green

Module Name:src
Committed By:   mrg
Date:   Wed Jun 10 02:29:27 UTC 2009

Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-trident: Makefile

Log Message:
don't build tridentramdac.c anymore


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/external/mit/xorg/server/drivers/xf86-video-trident/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/mit/xorg/server/drivers/xf86-video-trident/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-trident/Makefile:1.2 src/external/mit/xorg/server/drivers/xf86-video-trident/Makefile:1.3
--- src/external/mit/xorg/server/drivers/xf86-video-trident/Makefile:1.2	Sun Aug  3 07:32:04 2008
+++ src/external/mit/xorg/server/drivers/xf86-video-trident/Makefile	Wed Jun 10 02:29:27 2009
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 2008/08/03 07:32:04 rtr Exp $
+#	$NetBSD: Makefile,v 1.3 2009/06/10 02:29:27 mrg Exp $
 
 DRIVER=		xf86-video-trident
 DRIVER_NAME=	trident_drv
@@ -6,7 +6,7 @@
 SRCS=		blade_accel.c blade_accel_exa.c image_accel.c
 SRCS+=		trident_accel.c trident_bank.c trident_dac.c
 SRCS+=		trident_dga.c trident_driver.c tridenthelper.c
-SRCS+=		trident_i2c.c tridentramdac.c trident_shadow.c
+SRCS+=		trident_i2c.c trident_shadow.c
 SRCS+=		trident_tv.c trident_video.c tvga_dac.c xp_accel.c
 SRCS+=		xp4_accel.c xp4_accel_exa.c
 MAN=		trident.4

CVS commit: xsrc/external/mit/xf86-video-tseng/dist

2009-06-09 Thread matthew green

Module Name:xsrc
Committed By:   mrg
Date:   Wed Jun 10 02:35:53 UTC 2009

Update of /cvsroot/xsrc/external/mit/xf86-video-tseng/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv8479

Log Message:
initial import of xf86-video-tseng-1.2.1

Status:

Vendor Tag: xorg
Release Tags:   xf86-video-tseng-1-2-1

U xsrc/external/mit/xf86-video-tseng/dist/COPYING
U xsrc/external/mit/xf86-video-tseng/dist/install-sh
U xsrc/external/mit/xf86-video-tseng/dist/config.h.in
U xsrc/external/mit/xf86-video-tseng/dist/config.sub
U xsrc/external/mit/xf86-video-tseng/dist/Makefile.am
U xsrc/external/mit/xf86-video-tseng/dist/ChangeLog
U xsrc/external/mit/xf86-video-tseng/dist/ltmain.sh
U xsrc/external/mit/xf86-video-tseng/dist/Makefile.in
U xsrc/external/mit/xf86-video-tseng/dist/missing
U xsrc/external/mit/xf86-video-tseng/dist/aclocal.m4
U xsrc/external/mit/xf86-video-tseng/dist/configure.ac
U xsrc/external/mit/xf86-video-tseng/dist/depcomp
U xsrc/external/mit/xf86-video-tseng/dist/configure
U xsrc/external/mit/xf86-video-tseng/dist/config.guess
U xsrc/external/mit/xf86-video-tseng/dist/src/tseng_driver.c
U xsrc/external/mit/xf86-video-tseng/dist/src/tseng_dga.c
U xsrc/external/mit/xf86-video-tseng/dist/src/tseng_accel.c
U xsrc/external/mit/xf86-video-tseng/dist/src/README
N xsrc/external/mit/xf86-video-tseng/dist/src/tseng_pcirename.h
U xsrc/external/mit/xf86-video-tseng/dist/src/Makefile.am
U xsrc/external/mit/xf86-video-tseng/dist/src/tseng_cursor.c
U xsrc/external/mit/xf86-video-tseng/dist/src/tseng.h
U xsrc/external/mit/xf86-video-tseng/dist/src/Makefile.in
U xsrc/external/mit/xf86-video-tseng/dist/src/tseng_mode.c
U xsrc/external/mit/xf86-video-tseng/dist/src/tseng_accel.h
U xsrc/external/mit/xf86-video-tseng/dist/man/Makefile.am
U xsrc/external/mit/xf86-video-tseng/dist/man/tseng.man
U xsrc/external/mit/xf86-video-tseng/dist/man/Makefile.in

No conflicts created by this import

CVS commit: xsrc/external/mit/dri2proto/dist

2009-06-09 Thread matthew green

Module Name:xsrc
Committed By:   mrg
Date:   Wed Jun 10 02:53:04 UTC 2009

Update of /cvsroot/xsrc/external/mit/dri2proto/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv8991

Log Message:
initial import of dri2proto-2.0

Status:

Vendor Tag: xorg
Release Tags:   dri2proto-2-0

N xsrc/external/mit/dri2proto/dist/dri2proto.txt
N xsrc/external/mit/dri2proto/dist/Makefile.in
N xsrc/external/mit/dri2proto/dist/dri2proto.h
N xsrc/external/mit/dri2proto/dist/aclocal.m4
N xsrc/external/mit/dri2proto/dist/COPYING
N xsrc/external/mit/dri2proto/dist/configure.ac
N xsrc/external/mit/dri2proto/dist/missing
N xsrc/external/mit/dri2proto/dist/dri2proto.pc.in
N xsrc/external/mit/dri2proto/dist/ChangeLog
N xsrc/external/mit/dri2proto/dist/dri2tokens.h
N xsrc/external/mit/dri2proto/dist/configure
N xsrc/external/mit/dri2proto/dist/install-sh
N xsrc/external/mit/dri2proto/dist/Makefile.am

No conflicts created by this import

CVS commit: src/doc

2009-06-09 Thread John Nemeth

Module Name:src
Committed By:   jnemeth
Date:   Wed Jun 10 03:28:22 UTC 2009

Modified Files:
src/doc: CHANGES

Log Message:
mention my MODULAR and modload(8) changes


To generate a diff of this commit:
cvs rdiff -u -r1.1238 -r1.1239 src/doc/CHANGES

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.1238 src/doc/CHANGES:1.1239
--- src/doc/CHANGES:1.1238	Mon Jun  8 00:15:37 2009
+++ src/doc/CHANGES	Wed Jun 10 03:28:22 2009
@@ -1,4 +1,4 @@
-# LIST OF CHANGES FROM LAST RELEASE:			$Revision: 1.1238 $
+# LIST OF CHANGES FROM LAST RELEASE:			$Revision: 1.1239 $
 #
 #
 # [Note: This file does not mention every change made to the NetBSD source tree.
@@ -291,3 +291,10 @@
 	agr(4): Add support for layering vlans on top. Also allow LACP
 		to be disabled. [darran 20090529]
 	openssh: Import 5.2. [christos 20090707]
+	module: Add the capability to read an module.prop associated
+		with a module and merge a plist passed in by modload(8).
+		Also, add MODCTL_NO_PROP flag to prevent loading
+		module.prop. [jnemeth 20090709]
+	modload(8): Add various flags to assist in the creation and
+		maintenance of module.prop and/or to set MODCTL_NO_PROP.
+		[jnemeth 20090709]

CVS commit: src/sbin/modload

2009-06-09 Thread John Nemeth

Module Name:src
Committed By:   jnemeth
Date:   Wed Jun 10 03:30:32 UTC 2009

Modified Files:
src/sbin/modload: main.c modload.8

Log Message:
-p -P doesn't make much sense since no module will be loaded.


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sbin/modload/main.c
cvs rdiff -u -r1.35 -r1.36 src/sbin/modload/modload.8

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

Modified files:

Index: src/sbin/modload/main.c
diff -u src/sbin/modload/main.c:1.11 src/sbin/modload/main.c:1.12
--- src/sbin/modload/main.c:1.11	Tue Jun  9 20:35:02 2009
+++ src/sbin/modload/main.c	Wed Jun 10 03:30:32 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: main.c,v 1.11 2009/06/09 20:35:02 jnemeth Exp $	*/
+/*	$NetBSD: main.c,v 1.12 2009/06/10 03:30:32 jnemeth Exp $	*/
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -28,7 +28,7 @@
 
 #include sys/cdefs.h
 #ifndef lint
-__RCSID($NetBSD: main.c,v 1.11 2009/06/09 20:35:02 jnemeth Exp $);
+__RCSID($NetBSD: main.c,v 1.12 2009/06/10 03:30:32 jnemeth Exp $);
 #endif /* !lint */
 
 #include sys/module.h
@@ -253,7 +253,7 @@
 	(void)fprintf(stderr,
 	Usage: %s [-P] [-f] [-b var=boolean] [-i var=integer] 
 	[-s var=string] module\n
-	   %s -p [-P] [-b var=boolean] [-d var] [-i var=integer] 
+	   %s -p [-b var=boolean] [-d var] [-i var=integer] 
 	[-m plist]\n   [-s var=string]\n,
 	getprogname(), getprogname());
 	exit(EXIT_FAILURE);

Index: src/sbin/modload/modload.8
diff -u src/sbin/modload/modload.8:1.35 src/sbin/modload/modload.8:1.36
--- src/sbin/modload/modload.8:1.35	Tue Jun  9 20:35:02 2009
+++ src/sbin/modload/modload.8	Wed Jun 10 03:30:32 2009
@@ -1,4 +1,4 @@
-.\ $NetBSD: modload.8,v 1.35 2009/06/09 20:35:02 jnemeth Exp $
+.\ $NetBSD: modload.8,v 1.36 2009/06/10 03:30:32 jnemeth Exp $
 .\
 .\ Copyright (c) 1993 Christopher G. Demetriou
 .\ All rights reserved.
@@ -43,7 +43,6 @@
 .Op Fl f
 .Op Fl b Ar var=boolean
 .Op Fl i Ar var=integer
-.Op Fl P
 .Op Fl s Ar var=string
 .Ar module
 .Nm

CVS commit: src/share/mk

2009-06-09 Thread matthew green

Module Name:src
Committed By:   mrg
Date:   Wed Jun 10 04:11:01 UTC 2009

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

Log Message:
+dri2proto -printproto


To generate a diff of this commit:
cvs rdiff -u -r1.564 -r1.565 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.564 src/share/mk/bsd.own.mk:1.565
--- src/share/mk/bsd.own.mk:1.564	Wed Jun 10 02:05:45 2009
+++ src/share/mk/bsd.own.mk	Wed Jun 10 04:11:01 2009
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.own.mk,v 1.564 2009/06/10 02:05:45 mrg Exp $
+#	$NetBSD: bsd.own.mk,v 1.565 2009/06/10 04:11:01 mrg Exp $
 
 .if !defined(_BSD_OWN_MK_)
 _BSD_OWN_MK_=1
@@ -844,7 +844,7 @@
 
 .for _proto in \
 	xcmisc xext xf86bigfont bigreqs input kb x fonts fixes scrnsaver \
-	xinerama print render resource record video xf86dga xf86misc \
+	xinerama dri2 render resource record video xf86dga xf86misc \
 	xf86vidmode composite damage trap gl randr fontcache xf86dri
 X11SRCDIR.${_proto}proto?=		${X11SRCDIRMIT}/${_proto}proto/dist
 .endfor

CVS commit: xsrc/external/mit/xf86-video-glint/include

2009-06-09 Thread matthew green

Module Name:xsrc
Committed By:   mrg
Date:   Wed Jun 10 04:11:40 UTC 2009

Added Files:
xsrc/external/mit/xf86-video-glint/include: config.h

Log Message:
add a generated config for glint driver.


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 xsrc/external/mit/xf86-video-glint/include/config.h

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

Added files:

Index: xsrc/external/mit/xf86-video-glint/include/config.h
diff -u /dev/null xsrc/external/mit/xf86-video-glint/include/config.h:1.1
--- /dev/null	Wed Jun 10 04:11:40 2009
+++ xsrc/external/mit/xf86-video-glint/include/config.h	Wed Jun 10 04:11:40 2009
@@ -0,0 +1,76 @@
+/* config.h.  Generated from config.h.in by configure.  */
+/* config.h.in.  Generated from configure.ac by autoheader.  */
+
+#include xorg-server.h
+
+/* Have cfb8_32 support */
+/* #undef HAVE_CFB8_32 */
+
+/* Define to 1 if you have the dlfcn.h header file. */
+#define HAVE_DLFCN_H 1
+
+/* Define to 1 if you have the inttypes.h header file. */
+#define HAVE_INTTYPES_H 1
+
+/* Define to 1 if you have the memory.h header file. */
+#define HAVE_MEMORY_H 1
+
+/* Define to 1 if you have the stdint.h header file. */
+#define HAVE_STDINT_H 1
+
+/* Define to 1 if you have the stdlib.h header file. */
+#define HAVE_STDLIB_H 1
+
+/* Define to 1 if you have the strings.h header file. */
+#define HAVE_STRINGS_H 1
+
+/* Define to 1 if you have the string.h header file. */
+#define HAVE_STRING_H 1
+
+/* Define to 1 if you have the sys/stat.h header file. */
+#define HAVE_SYS_STAT_H 1
+
+/* Define to 1 if you have the sys/types.h header file. */
+#define HAVE_SYS_TYPES_H 1
+
+/* Define to 1 if you have the unistd.h header file. */
+#define HAVE_UNISTD_H 1
+
+/* Name of package */
+#define PACKAGE xf86-video-glint
+
+/* Define to the address where bug reports for this package should be sent. */
+#define PACKAGE_BUGREPORT https://bugs.freedesktop.org/enter_bug.cgi?product=xorg;
+
+/* Define to the full name of this package. */
+#define PACKAGE_NAME xf86-video-glint
+
+/* Define to the full name and version of this package. */
+#define PACKAGE_STRING xf86-video-glint 1.2.2
+
+/* Define to the one symbol short name of this package. */
+#define PACKAGE_TARNAME xf86-video-glint
+
+/* Define to the version of this package. */
+#define PACKAGE_VERSION 1.2.2
+
+/* Major version of this package */
+#define PACKAGE_VERSION_MAJOR 1
+
+/* Minor version of this package */
+#define PACKAGE_VERSION_MINOR 2
+
+/* Patch version of this package */
+#define PACKAGE_VERSION_PATCHLEVEL 2
+
+/* Define to 1 if you have the ANSI C header files. */
+#define STDC_HEADERS 1
+
+/* Version number of package */
+#define VERSION 1.2.2
+
+/* Enable DRI driver support */
+#define XF86DRI 1
+
+/* Enable developmental DRI driver support */
+#define XF86DRI_DEVEL 1

CVS commit: src/bin/ed

2009-06-09 Thread Brian Ginsbach

Module Name:src
Committed By:   ginsbach
Date:   Wed Jun 10 04:16:53 UTC 2009

Modified Files:
src/bin/ed: main.c

Log Message:
Make sure that buffer is NULL terminated when input to strip_escapes() is
too long.  (Thanks jnemeth!)


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/bin/ed/main.c

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

Modified files:

Index: src/bin/ed/main.c
diff -u src/bin/ed/main.c:1.21 src/bin/ed/main.c:1.22
--- src/bin/ed/main.c:1.21	Wed Jun 10 03:24:27 2009
+++ src/bin/ed/main.c	Wed Jun 10 04:16:53 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: main.c,v 1.21 2009/06/10 03:24:27 ginsbach Exp $	*/
+/*	$NetBSD: main.c,v 1.22 2009/06/10 04:16:53 ginsbach Exp $	*/
 
 /* main.c: This file contains the main control and user-interface routines
for the ed line editor. */
@@ -39,7 +39,7 @@
 #if 0
 static char *rcsid = @(#)main.c,v 1.1 1994/02/01 00:34:42 alm Exp;
 #else
-__RCSID($NetBSD: main.c,v 1.21 2009/06/10 03:24:27 ginsbach Exp $);
+__RCSID($NetBSD: main.c,v 1.22 2009/06/10 04:16:53 ginsbach Exp $);
 #endif
 #endif /* not lint */
 
@@ -1329,6 +1329,7 @@
 	while ((i  (filesz - 1)) 
 	   (file[i++] = (*s == '\\') != '\0' ? *++s : *s))
 		s++;
+	file[filesz - 1] = '\0';
 	return file;
 }

CVS commit: src

2009-06-09 Thread matthew green

Module Name:src
Committed By:   mrg
Date:   Wed Jun 10 04:37:27 UTC 2009

Modified Files:
src/distrib/sets/lists/xcomp: mi
src/external/mit/xorg/include: Makefile
Added Files:
src/external/mit/xorg/include/dri2proto: Makefile

Log Message:
install dri2proto headers.


To generate a diff of this commit:
cvs rdiff -u -r1.92 -r1.93 src/distrib/sets/lists/xcomp/mi
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/include/Makefile
cvs rdiff -u -r0 -r1.1 src/external/mit/xorg/include/dri2proto/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/xcomp/mi
diff -u src/distrib/sets/lists/xcomp/mi:1.92 src/distrib/sets/lists/xcomp/mi:1.93
--- src/distrib/sets/lists/xcomp/mi:1.92	Tue Jun  9 05:24:31 2009
+++ src/distrib/sets/lists/xcomp/mi	Wed Jun 10 04:37:27 2009
@@ -1,4 +1,4 @@
-#	 $NetBSD: mi,v 1.92 2009/06/09 05:24:31 mrg Exp $
+#	 $NetBSD: mi,v 1.93 2009/06/10 04:37:27 mrg Exp $
 #
 # Note: don't delete entries from here - mark them as obsolete instead.
 #
@@ -5543,6 +5543,8 @@
 ./usr/X11R7/include/X11/extensions/damagewire.h		-unknown-	xorg
 ./usr/X11R7/include/X11/extensions/dpms.h		-unknown-	xorg
 ./usr/X11R7/include/X11/extensions/dpmsstr.h		-unknown-	xorg
+./usr/X11R7/include/X11/extensions/dri2proto.h		-unknown-	xorg
+./usr/X11R7/include/X11/extensions/dri2tokens.h		-unknown-	xorg
 ./usr/X11R7/include/X11/extensions/extutil.h		-unknown-	xorg
 ./usr/X11R7/include/X11/extensions/fontcache.h		-unknown-	xorg
 ./usr/X11R7/include/X11/extensions/fontcacheP.h		-unknown-	xorg
@@ -6156,6 +6158,7 @@
 ./usr/X11R7/lib/pkgconfig/bigreqsproto.pc		-unknown-	xorg
 ./usr/X11R7/lib/pkgconfig/compositeproto.pc		-unknown-	xorg
 ./usr/X11R7/lib/pkgconfig/damageproto.pc		-unknown-	xorg
+./usr/X11R7/lib/pkgconfig/dri2proto.pc			-unknown-	xorg
 ./usr/X11R7/lib/pkgconfig/evieproto.pc			-unknown-	xorg
 ./usr/X11R7/lib/pkgconfig/fixesproto.pc			-unknown-	xorg
 ./usr/X11R7/lib/pkgconfig/fontcacheproto.pc		-unknown-	xorg

Index: src/external/mit/xorg/include/Makefile
diff -u src/external/mit/xorg/include/Makefile:1.2 src/external/mit/xorg/include/Makefile:1.3
--- src/external/mit/xorg/include/Makefile:1.2	Mon Apr 20 03:07:14 2009
+++ src/external/mit/xorg/include/Makefile	Wed Jun 10 04:37:27 2009
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 2009/04/20 03:07:14 mrg Exp $
+#	$NetBSD: Makefile,v 1.3 2009/06/10 04:37:27 mrg Exp $
 
 # *proto packages for xorg
 
@@ -6,7 +6,7 @@
 	fixesproto inputproto scrnsaverproto xextproto evieext xineramaproto \
 	resourceproto recordproto videoproto xf86dgaproto xf86miscproto \
 	compositeproto damageproto trapproto glproto randrproto fontcacheproto \
-	xf86driproto xf86vidmodeproto renderproto \
+	xf86driproto xf86vidmodeproto renderproto dri2proto \
 	xproxymanagementprotocol xbitmaps .WAIT \
 	xtrans
 

Added files:

Index: src/external/mit/xorg/include/dri2proto/Makefile
diff -u /dev/null src/external/mit/xorg/include/dri2proto/Makefile:1.1
--- /dev/null	Wed Jun 10 04:37:27 2009
+++ src/external/mit/xorg/include/dri2proto/Makefile	Wed Jun 10 04:37:27 2009
@@ -0,0 +1,15 @@
+#	$NetBSD: Makefile,v 1.1 2009/06/10 04:37:27 mrg Exp $
+
+.include bsd.own.mk
+
+.PATH:	${X11SRCDIR.dri2proto}
+
+INCS=	dri2proto.h dri2tokens.h
+INCSDIR=${X11INCDIR}/X11/extensions
+
+NOOBJ=	# defined
+
+PKGCONFIG=	dri2proto
+
+.include bsd.x11.mk
+.include bsd.prog.mk

CVS commit: xsrc/external/mit/xf86-video-vmware/dist

2009-06-09 Thread matthew green

Module Name:xsrc
Committed By:   mrg
Date:   Wed Jun 10 04:40:22 UTC 2009

Update of /cvsroot/xsrc/external/mit/xf86-video-vmware/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv16630

Log Message:
initial import of xf86-video-vmware-10.16.6

Status:

Vendor Tag: xorg
Release Tags:   xf86-video-vmware-10-16-6

U xsrc/external/mit/xf86-video-vmware/dist/depcomp
U xsrc/external/mit/xf86-video-vmware/dist/install-sh
U xsrc/external/mit/xf86-video-vmware/dist/missing
U xsrc/external/mit/xf86-video-vmware/dist/config.guess
U xsrc/external/mit/xf86-video-vmware/dist/configure.ac
U xsrc/external/mit/xf86-video-vmware/dist/ltmain.sh
U xsrc/external/mit/xf86-video-vmware/dist/ChangeLog
U xsrc/external/mit/xf86-video-vmware/dist/README
U xsrc/external/mit/xf86-video-vmware/dist/COPYING
U xsrc/external/mit/xf86-video-vmware/dist/configure
U xsrc/external/mit/xf86-video-vmware/dist/config.sub
U xsrc/external/mit/xf86-video-vmware/dist/Makefile.in
U xsrc/external/mit/xf86-video-vmware/dist/aclocal.m4
U xsrc/external/mit/xf86-video-vmware/dist/config.h.in
U xsrc/external/mit/xf86-video-vmware/dist/Makefile.am
N xsrc/external/mit/xf86-video-vmware/dist/src/vmwaremodes.c
U xsrc/external/mit/xf86-video-vmware/dist/src/vmwarectrl.h
U xsrc/external/mit/xf86-video-vmware/dist/src/guest_os.h
U xsrc/external/mit/xf86-video-vmware/dist/src/vmwarectrlproto.h
U xsrc/external/mit/xf86-video-vmware/dist/src/svga_modes.h
U xsrc/external/mit/xf86-video-vmware/dist/src/svga_overlay.h
U xsrc/external/mit/xf86-video-vmware/dist/src/vmwarevideo.c
U xsrc/external/mit/xf86-video-vmware/dist/src/vmware.c
U xsrc/external/mit/xf86-video-vmware/dist/src/bits2pixels.c
U xsrc/external/mit/xf86-video-vmware/dist/src/svga_reg.h
U xsrc/external/mit/xf86-video-vmware/dist/src/includeCheck.h
U xsrc/external/mit/xf86-video-vmware/dist/src/vmwarectrl.c
U xsrc/external/mit/xf86-video-vmware/dist/src/vm_basic_types.h
U xsrc/external/mit/xf86-video-vmware/dist/src/svga_limits.h
U xsrc/external/mit/xf86-video-vmware/dist/src/bits2pixels.h
U xsrc/external/mit/xf86-video-vmware/dist/src/svga_struct.h
U xsrc/external/mit/xf86-video-vmware/dist/src/vmware.h
U xsrc/external/mit/xf86-video-vmware/dist/src/svga_escape.h
U xsrc/external/mit/xf86-video-vmware/dist/src/vmwarecurs.c
U xsrc/external/mit/xf86-video-vmware/dist/src/vm_device_version.h
U xsrc/external/mit/xf86-video-vmware/dist/src/Makefile.in
U xsrc/external/mit/xf86-video-vmware/dist/src/Makefile.am
U xsrc/external/mit/xf86-video-vmware/dist/src/vmwarexinerama.c
U xsrc/external/mit/xf86-video-vmware/dist/man/vmware.man
U xsrc/external/mit/xf86-video-vmware/dist/man/Makefile.in
U xsrc/external/mit/xf86-video-vmware/dist/man/Makefile.am

No conflicts created by this import

CVS commit: xsrc/external/mit/xf86-video-vmware/include

2009-06-09 Thread matthew green

Module Name:xsrc
Committed By:   mrg
Date:   Wed Jun 10 05:05:53 UTC 2009

Added Files:
xsrc/external/mit/xf86-video-vmware/include: config.h

Log Message:
add a config.h for xf86-video-vmware


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 xsrc/external/mit/xf86-video-vmware/include/config.h

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

Added files:

Index: xsrc/external/mit/xf86-video-vmware/include/config.h
diff -u /dev/null xsrc/external/mit/xf86-video-vmware/include/config.h:1.1
--- /dev/null	Wed Jun 10 05:05:54 2009
+++ xsrc/external/mit/xf86-video-vmware/include/config.h	Wed Jun 10 05:05:52 2009
@@ -0,0 +1,76 @@
+/* config.h.  Generated from config.h.in by configure.  */
+/* config.h.in.  Generated from configure.ac by autoheader.  */
+
+#include xorg-server.h
+
+/* Define to 1 if you have the dlfcn.h header file. */
+#define HAVE_DLFCN_H 1
+
+/* Define to 1 if you have the inttypes.h header file. */
+#define HAVE_INTTYPES_H 1
+
+/* Define to 1 if you have the memory.h header file. */
+#define HAVE_MEMORY_H 1
+
+/* Define to 1 if you have the stdint.h header file. */
+#define HAVE_STDINT_H 1
+
+/* Define to 1 if you have the stdlib.h header file. */
+#define HAVE_STDLIB_H 1
+
+/* Define to 1 if you have the strings.h header file. */
+#define HAVE_STRINGS_H 1
+
+/* Define to 1 if you have the string.h header file. */
+#define HAVE_STRING_H 1
+
+/* Define to 1 if you have the sys/stat.h header file. */
+#define HAVE_SYS_STAT_H 1
+
+/* Define to 1 if you have the sys/types.h header file. */
+#define HAVE_SYS_TYPES_H 1
+
+/* Define to 1 if you have the unistd.h header file. */
+#define HAVE_UNISTD_H 1
+
+/* Has version 1.0.99.901 or greater of the Xserver */
+#define HAVE_XORG_SERVER_1_0_99_901 1
+
+/* Has version 1.1.0 or greater of the Xserver */
+#define HAVE_XORG_SERVER_1_1_0 1
+
+/* Has version 1.2.0 or greater of the Xserver */
+#define HAVE_XORG_SERVER_1_2_0 1
+
+/* Name of package */
+#define PACKAGE xf86-video-vmware
+
+/* Define to the address where bug reports for this package should be sent. */
+#define PACKAGE_BUGREPORT https://bugs.freedesktop.org/enter_bug.cgi?product=xorg;
+
+/* Define to the full name of this package. */
+#define PACKAGE_NAME xf86-video-vmware
+
+/* Define to the full name and version of this package. */
+#define PACKAGE_STRING xf86-video-vmware 10.16.6
+
+/* Define to the one symbol short name of this package. */
+#define PACKAGE_TARNAME xf86-video-vmware
+
+/* Define to the version of this package. */
+#define PACKAGE_VERSION 10.16.6
+
+/* Major version of this package */
+#define PACKAGE_VERSION_MAJOR 10
+
+/* Minor version of this package */
+#define PACKAGE_VERSION_MINOR 16
+
+/* Patch version of this package */
+#define PACKAGE_VERSION_PATCHLEVEL 6
+
+/* Define to 1 if you have the ANSI C header files. */
+#define STDC_HEADERS 1
+
+/* Version number of package */
+#define VERSION 10.16.6

69 matches

Mail list logo