Module Name: src
Committed By: mrg
Date: Sun Aug 23 09:05:45 UTC 2009
Modified Files:
src/distrib/sets/lists/base: mi
src/distrib/sets/lists/xserver: md.alpha md.amd64 md.cats md.i386
md.macppc md.netwinder md.sgimips md.shark md.sparc md.sparc64
src/etc/mtree: NetBSD.dist
src/external/mit/xorg/server/xorg-server/dix: Makefile
Log Message:
install the xorg "protocol.txt" file.
To generate a diff of this commit:
cvs rdiff -u -r1.823 -r1.824 src/distrib/sets/lists/base/mi
cvs rdiff -u -r1.21 -r1.22 src/distrib/sets/lists/xserver/md.alpha
cvs rdiff -u -r1.50 -r1.51 src/distrib/sets/lists/xserver/md.amd64
cvs rdiff -u -r1.29 -r1.30 src/distrib/sets/lists/xserver/md.cats
cvs rdiff -u -r1.67 -r1.68 src/distrib/sets/lists/xserver/md.i386
cvs rdiff -u -r1.49 -r1.50 src/distrib/sets/lists/xserver/md.macppc
cvs rdiff -u -r1.18 -r1.19 src/distrib/sets/lists/xserver/md.netwinder
cvs rdiff -u -r1.30 -r1.31 src/distrib/sets/lists/xserver/md.sgimips
cvs rdiff -u -r1.28 -r1.29 src/distrib/sets/lists/xserver/md.shark
cvs rdiff -u -r1.37 -r1.38 src/distrib/sets/lists/xserver/md.sparc
cvs rdiff -u -r1.36 -r1.37 src/distrib/sets/lists/xserver/md.sparc64
cvs rdiff -u -r1.408 -r1.409 src/etc/mtree/NetBSD.dist
cvs rdiff -u -r1.8 -r1.9 \
src/external/mit/xorg/server/xorg-server/dix/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/base/mi
diff -u src/distrib/sets/lists/base/mi:1.823 src/distrib/sets/lists/base/mi:1.824
--- src/distrib/sets/lists/base/mi:1.823 Sat Jul 18 22:24:02 2009
+++ src/distrib/sets/lists/base/mi Sun Aug 23 09:05:44 2009
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.823 2009/07/18 22:24:02 reinoud Exp $
+# $NetBSD: mi,v 1.824 2009/08/23 09:05:44 mrg Exp $
#
# Note: Don't delete entries from here - mark them as "obsolete" instead,
# unless otherwise stated below.
@@ -645,6 +645,7 @@
./usr/X11R7/lib/modules/fonts base-x11-root
./usr/X11R7/lib/modules/input base-x11-root
./usr/X11R7/lib/pkgconfig base-x11-root
+./usr/X11R7/lib/xorg base-x11-root
./usr/X11R7/libexec base-x11-root
./usr/X11R7/man base-x11-root
./usr/X11R7/man/cat1 base-x11-root
Index: src/distrib/sets/lists/xserver/md.alpha
diff -u src/distrib/sets/lists/xserver/md.alpha:1.21 src/distrib/sets/lists/xserver/md.alpha:1.22
--- src/distrib/sets/lists/xserver/md.alpha:1.21 Tue Jun 23 04:39:52 2009
+++ src/distrib/sets/lists/xserver/md.alpha Sun Aug 23 09:05:45 2009
@@ -1,4 +1,4 @@
-# $NetBSD: md.alpha,v 1.21 2009/06/23 04:39:52 mrg Exp $
+# $NetBSD: md.alpha,v 1.22 2009/08/23 09:05:45 mrg Exp $
./usr/X11R6/bin/X -unknown- x11
./usr/X11R6/bin/XalphaNetBSD -unknown- x11
./usr/X11R6/bin/XdecNetBSD -unknown- x11
@@ -216,6 +216,7 @@
./usr/X11R7/lib/modules/libxf8_32bpp.so -unknown- obsolete
./usr/X11R7/lib/modules/libxf8_32bpp.so.0 -unknown- obsolete
./usr/X11R7/lib/modules/libxf8_32bpp_pic.a -unknown- obsolete
+./usr/X11R7/lib/xorg/protocol.txt -unknown- xorg
./usr/X11R7/man/cat1/Xorg.0 -unknown- .cat,xorg
./usr/X11R7/man/cat1/cvt.0 -unknown- .cat,xorg
./usr/X11R7/man/cat1/gtf.0 -unknown- .cat,xorg
Index: src/distrib/sets/lists/xserver/md.amd64
diff -u src/distrib/sets/lists/xserver/md.amd64:1.50 src/distrib/sets/lists/xserver/md.amd64:1.51
--- src/distrib/sets/lists/xserver/md.amd64:1.50 Tue Jun 23 04:39:52 2009
+++ src/distrib/sets/lists/xserver/md.amd64 Sun Aug 23 09:05:45 2009
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.50 2009/06/23 04:39:52 mrg Exp $
+# $NetBSD: md.amd64,v 1.51 2009/08/23 09:05:45 mrg Exp $
./usr/X11R6/bin/X -unknown- x11
./usr/X11R6/bin/XFree86 -unknown- x11
./usr/X11R6/bin/gtf -unknown- x11
@@ -595,6 +595,7 @@
./usr/X11R7/lib/modules/libxf8_32bpp.so -unknown- obsolete
./usr/X11R7/lib/modules/libxf8_32bpp.so.0 -unknown- obsolete
./usr/X11R7/lib/modules/libxf8_32bpp_pic.a -unknown- obsolete
+./usr/X11R7/lib/xorg/protocol.txt -unknown- xorg
./usr/X11R7/man/cat1/Xorg.0 -unknown- .cat,xorg
./usr/X11R7/man/cat1/cvt.0 -unknown- .cat,xorg
./usr/X11R7/man/cat1/gtf.0 -unknown- .cat,xorg
Index: src/distrib/sets/lists/xserver/md.cats
diff -u src/distrib/sets/lists/xserver/md.cats:1.29 src/distrib/sets/lists/xserver/md.cats:1.30
--- src/distrib/sets/lists/xserver/md.cats:1.29 Tue Jun 23 04:39:52 2009
+++ src/distrib/sets/lists/xserver/md.cats Sun Aug 23 09:05:45 2009
@@ -1,4 +1,4 @@
-# $NetBSD: md.cats,v 1.29 2009/06/23 04:39:52 mrg Exp $
+# $NetBSD: md.cats,v 1.30 2009/08/23 09:05:45 mrg Exp $
./usr/X11R6/bin/X -unknown- x11
./usr/X11R6/bin/XFree86 -unknown- x11
./usr/X11R6/bin/gtf -unknown- x11
@@ -552,6 +552,7 @@
./usr/X11R7/lib/modules/libxf8_32bpp.so.0 -unknown- obsolete
./usr/X11R7/lib/modules/libxf8_32bpp_g.a -unknown- obsolete
./usr/X11R7/lib/modules/libxf8_32bpp_pic.a -unknown- obsolete
+./usr/X11R7/lib/xorg/protocol.txt -unknown- xorg
./usr/X11R7/man/cat1/Xorg.0 -unknown- .cat,xorg
./usr/X11R7/man/cat1/cvt.0 -unknown- .cat,xorg
./usr/X11R7/man/cat1/gtf.0 -unknown- .cat,xorg
Index: src/distrib/sets/lists/xserver/md.i386
diff -u src/distrib/sets/lists/xserver/md.i386:1.67 src/distrib/sets/lists/xserver/md.i386:1.68
--- src/distrib/sets/lists/xserver/md.i386:1.67 Tue Jun 23 04:39:52 2009
+++ src/distrib/sets/lists/xserver/md.i386 Sun Aug 23 09:05:45 2009
@@ -1,4 +1,4 @@
-# $NetBSD: md.i386,v 1.67 2009/06/23 04:39:52 mrg Exp $
+# $NetBSD: md.i386,v 1.68 2009/08/23 09:05:45 mrg Exp $
./usr/X11R6/bin/X -unknown- x11
./usr/X11R6/bin/XFree86 -unknown- x11
./usr/X11R6/bin/gtf -unknown- x11
@@ -693,6 +693,7 @@
./usr/X11R7/lib/modules/libxf8_32bpp.so.0 -unknown- obsolete
./usr/X11R7/lib/modules/libxf8_32bpp_g.a -unknown- obsolete
./usr/X11R7/lib/modules/libxf8_32bpp_pic.a -unknown- obsolete
+./usr/X11R7/lib/xorg/protocol.txt -unknown- xorg
./usr/X11R7/man/cat1/Xorg.0 -unknown- .cat,xorg
./usr/X11R7/man/cat1/cvt.0 -unknown- .cat,xorg
./usr/X11R7/man/cat1/gtf.0 -unknown- .cat,xorg
Index: src/distrib/sets/lists/xserver/md.macppc
diff -u src/distrib/sets/lists/xserver/md.macppc:1.49 src/distrib/sets/lists/xserver/md.macppc:1.50
--- src/distrib/sets/lists/xserver/md.macppc:1.49 Thu Jun 18 05:57:34 2009
+++ src/distrib/sets/lists/xserver/md.macppc Sun Aug 23 09:05:45 2009
@@ -1,4 +1,4 @@
-# $NetBSD: md.macppc,v 1.49 2009/06/18 05:57:34 mrg Exp $
+# $NetBSD: md.macppc,v 1.50 2009/08/23 09:05:45 mrg Exp $
./usr/X11R6/bin/X -unknown- x11
./usr/X11R6/bin/XFree86 -unknown- x11
./usr/X11R6/bin/Xmacppc -unknown- x11
@@ -499,6 +499,7 @@
./usr/X11R7/lib/modules/libxf8_32bpp.so.0 -unknown- obsolete
./usr/X11R7/lib/modules/libxf8_32bpp_g.a -unknown- obsolete
./usr/X11R7/lib/modules/libxf8_32bpp_pic.a -unknown- obsolete
+./usr/X11R7/lib/xorg/protocol.txt -unknown- xorg
./usr/X11R7/man/cat1/Xorg.0 -unknown- .cat,xorg
./usr/X11R7/man/cat1/cvt.0 -unknown- .cat,xorg
./usr/X11R7/man/cat1/dga.0 -unknown- .cat,xorg
Index: src/distrib/sets/lists/xserver/md.netwinder
diff -u src/distrib/sets/lists/xserver/md.netwinder:1.18 src/distrib/sets/lists/xserver/md.netwinder:1.19
--- src/distrib/sets/lists/xserver/md.netwinder:1.18 Thu Jun 18 05:57:34 2009
+++ src/distrib/sets/lists/xserver/md.netwinder Sun Aug 23 09:05:45 2009
@@ -1,4 +1,4 @@
-# $NetBSD: md.netwinder,v 1.18 2009/06/18 05:57:34 mrg Exp $
+# $NetBSD: md.netwinder,v 1.19 2009/08/23 09:05:45 mrg Exp $
./usr/X11R6/bin/X -unknown- x11
./usr/X11R6/bin/XFree86 -unknown- x11
./usr/X11R6/bin/gtf -unknown- x11
@@ -407,6 +407,7 @@
./usr/X11R7/lib/modules/libxf8_32bpp.so.0 -unknown- obsolete
./usr/X11R7/lib/modules/libxf8_32bpp_g.a -unknown- obsolete
./usr/X11R7/lib/modules/libxf8_32bpp_pic.a -unknown- obsolete
+./usr/X11R7/lib/xorg/protocol.txt -unknown- xorg
./usr/X11R7/man/cat1/Xorg.0 -unknown- .cat,xorg
./usr/X11R7/man/cat1/cvt.0 -unknown- .cat,xorg
./usr/X11R7/man/cat1/gtf.0 -unknown- .cat,xorg
Index: src/distrib/sets/lists/xserver/md.sgimips
diff -u src/distrib/sets/lists/xserver/md.sgimips:1.30 src/distrib/sets/lists/xserver/md.sgimips:1.31
--- src/distrib/sets/lists/xserver/md.sgimips:1.30 Thu Jun 18 05:57:34 2009
+++ src/distrib/sets/lists/xserver/md.sgimips Sun Aug 23 09:05:45 2009
@@ -1,4 +1,4 @@
-# $NetBSD: md.sgimips,v 1.30 2009/06/18 05:57:34 mrg Exp $ x11
+# $NetBSD: md.sgimips,v 1.31 2009/08/23 09:05:45 mrg Exp $ x11
./usr/X11R6/bin/X -unknown- x11
./usr/X11R6/bin/XFree86 -unknown- x11
./usr/X11R6/bin/Xprt -unknown- x11
@@ -556,6 +556,7 @@
./usr/X11R7/lib/modules/libxf8_32bpp.so.0 -unknown- obsolete
./usr/X11R7/lib/modules/libxf8_32bpp_g.a -unknown- obsolete
./usr/X11R7/lib/modules/libxf8_32bpp_pic.a -unknown- obsolete
+./usr/X11R7/lib/xorg/protocol.txt -unknown- xorg
./usr/X11R7/man/cat1/Xorg.0 -unknown- .cat,xorg
./usr/X11R7/man/cat1/cvt.0 -unknown- .cat,xorg
./usr/X11R7/man/cat1/gtf.0 -unknown- .cat,xorg
Index: src/distrib/sets/lists/xserver/md.shark
diff -u src/distrib/sets/lists/xserver/md.shark:1.28 src/distrib/sets/lists/xserver/md.shark:1.29
--- src/distrib/sets/lists/xserver/md.shark:1.28 Thu Jun 18 05:57:34 2009
+++ src/distrib/sets/lists/xserver/md.shark Sun Aug 23 09:05:45 2009
@@ -1,4 +1,4 @@
-# $NetBSD: md.shark,v 1.28 2009/06/18 05:57:34 mrg Exp $
+# $NetBSD: md.shark,v 1.29 2009/08/23 09:05:45 mrg Exp $
./usr/X11R6/bin/X -unknown- x11
./usr/X11R6/bin/XFree86 -unknown- x11
./usr/X11R6/bin/gtf -unknown- x11
@@ -398,6 +398,7 @@
./usr/X11R7/lib/modules/libxf8_32bpp.so.0 -unknown- obsolete
./usr/X11R7/lib/modules/libxf8_32bpp_g.a -unknown- obsolete
./usr/X11R7/lib/modules/libxf8_32bpp_pic.a -unknown- obsolete
+./usr/X11R7/lib/xorg/protocol.txt -unknown- xorg
./usr/X11R7/man/cat1/Xorg.0 -unknown- .cat,xorg
./usr/X11R7/man/cat1/cvt.0 -unknown- .cat,xorg
./usr/X11R7/man/cat1/gtf.0 -unknown- .cat,xorg
Index: src/distrib/sets/lists/xserver/md.sparc
diff -u src/distrib/sets/lists/xserver/md.sparc:1.37 src/distrib/sets/lists/xserver/md.sparc:1.38
--- src/distrib/sets/lists/xserver/md.sparc:1.37 Tue Jul 7 07:53:38 2009
+++ src/distrib/sets/lists/xserver/md.sparc Sun Aug 23 09:05:45 2009
@@ -1,4 +1,4 @@
-# $NetBSD: md.sparc,v 1.37 2009/07/07 07:53:38 mrg Exp $
+# $NetBSD: md.sparc,v 1.38 2009/08/23 09:05:45 mrg Exp $
./usr/X11R6/bin/X -unknown- x11
./usr/X11R6/bin/XFree86 -unknown- x11
./usr/X11R6/bin/Xsun -unknown- x11
@@ -460,6 +460,7 @@
./usr/X11R7/lib/modules/libxf8_32bpp.so.0 -unknown- obsolete
./usr/X11R7/lib/modules/libxf8_32bpp_g.a -unknown- obsolete
./usr/X11R7/lib/modules/libxf8_32bpp_pic.a -unknown- obsolete
+./usr/X11R7/lib/xorg/protocol.txt -unknown- xorg
./usr/X11R7/man/cat1/Xorg.0 -unknown- .cat,xorg
./usr/X11R7/man/cat1/cvt.0 -unknown- .cat,xorg
./usr/X11R7/man/cat1/dga.0 -unknown- .cat,xorg
Index: src/distrib/sets/lists/xserver/md.sparc64
diff -u src/distrib/sets/lists/xserver/md.sparc64:1.36 src/distrib/sets/lists/xserver/md.sparc64:1.37
--- src/distrib/sets/lists/xserver/md.sparc64:1.36 Tue Jul 7 07:53:38 2009
+++ src/distrib/sets/lists/xserver/md.sparc64 Sun Aug 23 09:05:45 2009
@@ -1,4 +1,4 @@
-# $NetBSD: md.sparc64,v 1.36 2009/07/07 07:53:38 mrg Exp $ x11
+# $NetBSD: md.sparc64,v 1.37 2009/08/23 09:05:45 mrg Exp $ x11
./usr/X11R6/bin/X -unknown- x11
./usr/X11R6/bin/XFree86 -unknown- x11
./usr/X11R6/bin/Xsun -unknown- x11
@@ -460,6 +460,7 @@
./usr/X11R7/lib/modules/libxf8_32bpp.so.0 -unknown- obsolete
./usr/X11R7/lib/modules/libxf8_32bpp_g.a -unknown- obsolete
./usr/X11R7/lib/modules/libxf8_32bpp_pic.a -unknown- obsolete
+./usr/X11R7/lib/xorg/protocol.txt -unknown- xorg
./usr/X11R7/man/cat1/Xorg.0 -unknown- .cat,xorg
./usr/X11R7/man/cat1/cvt.0 -unknown- .cat,xorg
./usr/X11R7/man/cat1/dga.0 -unknown- .cat,xorg
Index: src/etc/mtree/NetBSD.dist
diff -u src/etc/mtree/NetBSD.dist:1.408 src/etc/mtree/NetBSD.dist:1.409
--- src/etc/mtree/NetBSD.dist:1.408 Wed Jul 22 14:24:01 2009
+++ src/etc/mtree/NetBSD.dist Sun Aug 23 09:05:44 2009
@@ -1,4 +1,4 @@
-# $NetBSD: NetBSD.dist,v 1.408 2009/07/22 14:24:01 njoly Exp $
+# $NetBSD: NetBSD.dist,v 1.409 2009/08/23 09:05:44 mrg Exp $
# @(#)4.4BSD.dist 8.1 (Berkeley) 6/13/93
# Do not customize this file as it may be overwritten on upgrades.
@@ -392,6 +392,7 @@
./usr/X11R7/lib/modules/drivers
./usr/X11R7/lib/modules/input
./usr/X11R7/lib/pkgconfig
+./usr/X11R7/lib/xorg
./usr/X11R7/libexec
./usr/X11R7/man
./usr/X11R7/man/cat1
Index: src/external/mit/xorg/server/xorg-server/dix/Makefile
diff -u src/external/mit/xorg/server/xorg-server/dix/Makefile:1.8 src/external/mit/xorg/server/xorg-server/dix/Makefile:1.9
--- src/external/mit/xorg/server/xorg-server/dix/Makefile:1.8 Sat Aug 22 02:40:27 2009
+++ src/external/mit/xorg/server/xorg-server/dix/Makefile Sun Aug 23 09:05:44 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2009/08/22 02:40:27 mrg Exp $
+# $NetBSD: Makefile,v 1.9 2009/08/23 09:05:44 mrg Exp $
.include "../Makefile.serverlib"
.include "../Makefile.servermod"
@@ -6,7 +6,6 @@
LIB= dix
-
.PATH: ${X11SRCDIR.xorg-server}/dix
SRCS= atom.c colormap.c cursor.c devices.c dispatch.c dixfonts.c \
dixutils.c events.c extension.c ffs.c gc.c getevents.c \
@@ -29,6 +28,9 @@
-DVENDOR_RELEASE=${XORG_VERSION_CURRENT} \
-DVENDOR_NAME="\"The Xorg Foundation\""
+FILES= protocol.txt
+FILESDIR= ${X11ROOTDIR}/lib/xorg
+
COPTS.dixutils.c= -Wno-error
COPTS.colormap.c= -Wno-error
COPTS.cursor.c= -Wno-error
