From 1ef7a9ffe76d3dcaccdc64134d14191abe270652 Mon Sep 17 00:00:00 2001 From: mrg Date: Sun, 23 Aug 2009 09:05:44 +0000 Subject: [PATCH] install the xorg "protocol.txt" file. --- distrib/sets/lists/base/mi | 3 ++- distrib/sets/lists/xserver/md.alpha | 3 ++- distrib/sets/lists/xserver/md.amd64 | 3 ++- distrib/sets/lists/xserver/md.cats | 3 ++- distrib/sets/lists/xserver/md.i386 | 3 ++- distrib/sets/lists/xserver/md.macppc | 3 ++- distrib/sets/lists/xserver/md.netwinder | 3 ++- distrib/sets/lists/xserver/md.sgimips | 3 ++- distrib/sets/lists/xserver/md.shark | 3 ++- distrib/sets/lists/xserver/md.sparc | 3 ++- distrib/sets/lists/xserver/md.sparc64 | 3 ++- etc/mtree/NetBSD.dist | 3 ++- external/mit/xorg/server/xorg-server/dix/Makefile | 6 ++++-- 13 files changed, 28 insertions(+), 14 deletions(-) diff --git a/distrib/sets/lists/base/mi b/distrib/sets/lists/base/mi index aaa76aab9f1a..22a72e325f96 100644 --- a/distrib/sets/lists/base/mi +++ b/distrib/sets/lists/base/mi @@ -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 diff --git a/distrib/sets/lists/xserver/md.alpha b/distrib/sets/lists/xserver/md.alpha index d982c79b0c15..5f3d20b1007a 100644 --- a/distrib/sets/lists/xserver/md.alpha +++ b/distrib/sets/lists/xserver/md.alpha @@ -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 diff --git a/distrib/sets/lists/xserver/md.amd64 b/distrib/sets/lists/xserver/md.amd64 index 719a2c923fe5..22b55a860cd9 100644 --- a/distrib/sets/lists/xserver/md.amd64 +++ b/distrib/sets/lists/xserver/md.amd64 @@ -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 diff --git a/distrib/sets/lists/xserver/md.cats b/distrib/sets/lists/xserver/md.cats index af9c5316bcba..6f3120decc70 100644 --- a/distrib/sets/lists/xserver/md.cats +++ b/distrib/sets/lists/xserver/md.cats @@ -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 diff --git a/distrib/sets/lists/xserver/md.i386 b/distrib/sets/lists/xserver/md.i386 index b427087c032c..c5357b28e0c6 100644 --- a/distrib/sets/lists/xserver/md.i386 +++ b/distrib/sets/lists/xserver/md.i386 @@ -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 diff --git a/distrib/sets/lists/xserver/md.macppc b/distrib/sets/lists/xserver/md.macppc index 3473b8accb2d..aae407517163 100644 --- a/distrib/sets/lists/xserver/md.macppc +++ b/distrib/sets/lists/xserver/md.macppc @@ -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 diff --git a/distrib/sets/lists/xserver/md.netwinder b/distrib/sets/lists/xserver/md.netwinder index 017d80b0534f..6c5bdc60f8cd 100644 --- a/distrib/sets/lists/xserver/md.netwinder +++ b/distrib/sets/lists/xserver/md.netwinder @@ -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 diff --git a/distrib/sets/lists/xserver/md.sgimips b/distrib/sets/lists/xserver/md.sgimips index 3555c6ce64ea..e11fd238f2a5 100644 --- a/distrib/sets/lists/xserver/md.sgimips +++ b/distrib/sets/lists/xserver/md.sgimips @@ -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 diff --git a/distrib/sets/lists/xserver/md.shark b/distrib/sets/lists/xserver/md.shark index a145b9d9f1df..0787e6d9e3d1 100644 --- a/distrib/sets/lists/xserver/md.shark +++ b/distrib/sets/lists/xserver/md.shark @@ -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 diff --git a/distrib/sets/lists/xserver/md.sparc b/distrib/sets/lists/xserver/md.sparc index d51bba95274d..d41e38915973 100644 --- a/distrib/sets/lists/xserver/md.sparc +++ b/distrib/sets/lists/xserver/md.sparc @@ -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 diff --git a/distrib/sets/lists/xserver/md.sparc64 b/distrib/sets/lists/xserver/md.sparc64 index 65f6d4219a32..e1f3d40acd9b 100644 --- a/distrib/sets/lists/xserver/md.sparc64 +++ b/distrib/sets/lists/xserver/md.sparc64 @@ -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 diff --git a/etc/mtree/NetBSD.dist b/etc/mtree/NetBSD.dist index 6dd3c5dd809a..c2c8b74b82cd 100644 --- a/etc/mtree/NetBSD.dist +++ b/etc/mtree/NetBSD.dist @@ -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 diff --git a/external/mit/xorg/server/xorg-server/dix/Makefile b/external/mit/xorg/server/xorg-server/dix/Makefile index 1b1f2b1367f0..7cbd6d19c567 100644 --- a/external/mit/xorg/server/xorg-server/dix/Makefile +++ b/external/mit/xorg/server/xorg-server/dix/Makefile @@ -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 @@ CPPFLAGS.main.c= -DVENDOR_STRING="\"The Xorg Group\"" \ -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