Module Name: src
Committed By: mrg
Date: Sun Mar 6 22:15:31 UTC 2011
Modified Files:
src/distrib/sets/lists/xbase: mi
src/distrib/sets/lists/xcomp: mi
src/etc/mtree: NetBSD.dist.Xorg
src/external/mit/xorg/server/xorg-server/hw/xfree86: Makefile
Log Message:
install xorg-server.m4 at the request of jmcneill.
To generate a diff of this commit:
cvs rdiff -u -r1.106 -r1.107 src/distrib/sets/lists/xbase/mi
cvs rdiff -u -r1.124 -r1.125 src/distrib/sets/lists/xcomp/mi
cvs rdiff -u -r1.9 -r1.10 src/etc/mtree/NetBSD.dist.Xorg
cvs rdiff -u -r1.30 -r1.31 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/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/xbase/mi
diff -u src/distrib/sets/lists/xbase/mi:1.106 src/distrib/sets/lists/xbase/mi:1.107
--- src/distrib/sets/lists/xbase/mi:1.106 Mon Feb 21 05:10:46 2011
+++ src/distrib/sets/lists/xbase/mi Sun Mar 6 22:15:29 2011
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.106 2011/02/21 05:10:46 mrg Exp $
+# $NetBSD: mi,v 1.107 2011/03/06 22:15:29 mrg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -2880,6 +2880,7 @@
./usr/X11R7/man/man7/Xsecurity.7 -unknown- .man,xorg
./usr/X11R7/man/whatis.db -unknown- man,xorg
./usr/X11R7/share base-x11-root xorg
+./usr/X11R7/share/aclocal base-x11-root xorg
./usr/X11R7/share/examples base-x11-root xorg
./usr/X11R7/share/examples/ssh-askpass base-x11-root xorg
./usr/X11R7/share/examples/ssh-askpass/SshAskpass-1337.ad -unknown- xorg
Index: src/distrib/sets/lists/xcomp/mi
diff -u src/distrib/sets/lists/xcomp/mi:1.124 src/distrib/sets/lists/xcomp/mi:1.125
--- src/distrib/sets/lists/xcomp/mi:1.124 Sat Feb 26 09:27:20 2011
+++ src/distrib/sets/lists/xcomp/mi Sun Mar 6 22:15:30 2011
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.124 2011/02/26 09:27:20 mrg Exp $
+# $NetBSD: mi,v 1.125 2011/03/06 22:15:30 mrg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -9225,6 +9225,7 @@
./usr/X11R7/man/man3/XvUngrabPort.3 -unknown- .man,xorg
./usr/X11R7/man/man3/XvVideoNotify.3 -unknown- .man,xorg
./usr/X11R7/man/man3/libXp.3 -obsolete- obsolete
+./usr/X11R7/share/aclocal/xorg-server.m4 -unknown- xorg
./usr/X11R7/share/xcb/bigreq.xml -unknown- xorg
./usr/X11R7/share/xcb/composite.xml -unknown- xorg
./usr/X11R7/share/xcb/damage.xml -unknown- xorg
Index: src/etc/mtree/NetBSD.dist.Xorg
diff -u src/etc/mtree/NetBSD.dist.Xorg:1.9 src/etc/mtree/NetBSD.dist.Xorg:1.10
--- src/etc/mtree/NetBSD.dist.Xorg:1.9 Sun Jul 18 07:07:09 2010
+++ src/etc/mtree/NetBSD.dist.Xorg Sun Mar 6 22:15:30 2011
@@ -1,4 +1,4 @@
-# $NetBSD: NetBSD.dist.Xorg,v 1.9 2010/07/18 07:07:09 mrg Exp $
+# $NetBSD: NetBSD.dist.Xorg,v 1.10 2011/03/06 22:15:30 mrg Exp $
./usr/X11R7
./usr/X11R7/bin
@@ -171,6 +171,7 @@
./usr/X11R7/man/man5
./usr/X11R7/man/man7
./usr/X11R7/share
+./usr/X11R7/share/aclocal
./usr/X11R7/share/examples
./usr/X11R7/share/examples/ssh-askpass
./usr/X11R7/share/pciids
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/Makefile:1.30 src/external/mit/xorg/server/xorg-server/hw/xfree86/Makefile:1.31
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/Makefile:1.30 Tue Nov 23 08:22:30 2010
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/Makefile Sun Mar 6 22:15:30 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2010/11/23 08:22:30 mrg Exp $
+# $NetBSD: Makefile,v 1.31 2011/03/06 22:15:30 mrg Exp $
SUBDIR= common init ddc dixmods doc dri dri2 i2c loader \
xf86modes exa \
@@ -130,6 +130,12 @@
# cp ${.ALLSRC} ${.TARGET}
MKMAN= no
+FILES= xorg-server.m4
+FILESDIR= ${X11ROOTDIR}/share/aclocal
+
+.PATH: ${X11SRCDIR.xorg-server}
+
.include <bsd.x11.mk>
.include <bsd.prog.mk>
.include <bsd.subdir.mk>
+.include <bsd.files.mk>
