Module Name: src
Committed By: wiz
Date: Sat Sep 19 23:00:44 UTC 2015
Modified Files:
src/distrib/sets/lists/xbase: mi
src/distrib/sets/lists/xserver: md.amd64 md.i386
src/etc/mtree: NetBSD.dist.Xorg
src/external/mit/xorg/server/drivers/xf86-video-radeon-kms: Makefile
Log Message:
Install radeon(4) from radeon-kms into x86 subdir.
This way, there is no file name issue with radeon(4) from
the old not-kms driver; and subdir man pages are preferred
to non-subdir.
Addresses MKREPRO issue from PR 50132.
XXX: This will stop being correct if radeon-kms is ported to more
platforms like sparc64.
To generate a diff of this commit:
cvs rdiff -u -r1.129 -r1.130 src/distrib/sets/lists/xbase/mi
cvs rdiff -u -r1.83 -r1.84 src/distrib/sets/lists/xserver/md.amd64
cvs rdiff -u -r1.101 -r1.102 src/distrib/sets/lists/xserver/md.i386
cvs rdiff -u -r1.15 -r1.16 src/etc/mtree/NetBSD.dist.Xorg
cvs rdiff -u -r1.1 -r1.2 \
src/external/mit/xorg/server/drivers/xf86-video-radeon-kms/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.129 src/distrib/sets/lists/xbase/mi:1.130
--- src/distrib/sets/lists/xbase/mi:1.129 Fri Sep 11 10:35:44 2015
+++ src/distrib/sets/lists/xbase/mi Sat Sep 19 23:00:44 2015
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.129 2015/09/11 10:35:44 kamil Exp $
+# $NetBSD: mi,v 1.130 2015/09/19 23:00:44 wiz Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -2712,6 +2712,7 @@
./usr/X11R7/man/cat1/xwud.0 -unknown- .cat,xorg
./usr/X11R7/man/cat3 base-x11-root xorg
./usr/X11R7/man/cat4 base-x11-root xorg
+./usr/X11R7/man/cat4/x86 base-x11-root xorg
./usr/X11R7/man/cat5 base-x11-root xorg
./usr/X11R7/man/cat5/fonts-conf.0 -unknown- .cat,xorg
./usr/X11R7/man/cat7 base-x11-root xorg
@@ -2853,6 +2854,7 @@
./usr/X11R7/man/html1/xwud.html -unknown- html,xorg
./usr/X11R7/man/html3 base-x11-root xorg
./usr/X11R7/man/html4 base-x11-root xorg
+./usr/X11R7/man/html4/x86 base-x11-root xorg
./usr/X11R7/man/html5 base-x11-root xorg
./usr/X11R7/man/html5/fonts-conf.html -unknown- html,xorg
./usr/X11R7/man/html7 base-x11-root xorg
@@ -2995,6 +2997,7 @@
./usr/X11R7/man/man1/xwud.1 -unknown- .man,xorg
./usr/X11R7/man/man3 base-x11-root xorg
./usr/X11R7/man/man4 base-x11-root xorg
+./usr/X11R7/man/man4/x86 base-x11-root xorg
./usr/X11R7/man/man5 base-x11-root xorg
./usr/X11R7/man/man5/fonts-conf.5 -unknown- .man,xorg
./usr/X11R7/man/man7 base-x11-root xorg
Index: src/distrib/sets/lists/xserver/md.amd64
diff -u src/distrib/sets/lists/xserver/md.amd64:1.83 src/distrib/sets/lists/xserver/md.amd64:1.84
--- src/distrib/sets/lists/xserver/md.amd64:1.83 Fri Jul 24 07:13:34 2015
+++ src/distrib/sets/lists/xserver/md.amd64 Sat Sep 19 23:00:44 2015
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.83 2015/07/24 07:13:34 mrg Exp $
+# $NetBSD: md.amd64,v 1.84 2015/09/19 23:00:44 wiz Exp $
./usr/X11R6/bin/X -unknown- x11
./usr/X11R6/bin/XFree86 -unknown- x11
./usr/X11R6/bin/gtf -unknown- x11
@@ -355,8 +355,6 @@
./usr/X11R7/lib/X11/doc/README.fonts -unknown- obsolete
./usr/X11R7/lib/X11/doc/README.modes -unknown- xorg
./usr/X11R7/lib/X11/doc/README.rapidaccess -unknown- obsolete
-./usr/X11R7/lib/modules/dri/mesa_dri_drivers.so -unknown- xorg
-./usr/X11R7/lib/modules/dri/mesa_dri_drivers.so.0 -unknown- xorg
./usr/X11R7/lib/modules/dri/i810_dri.so -unknown- obsolete
./usr/X11R7/lib/modules/dri/i810_dri.so.0 -unknown- obsolete
./usr/X11R7/lib/modules/dri/i915_dri.so -unknown- xorg
@@ -365,6 +363,8 @@
./usr/X11R7/lib/modules/dri/i965_dri.so.0 -unknown- xorg
./usr/X11R7/lib/modules/dri/mach64_dri.so -unknown- obsolete
./usr/X11R7/lib/modules/dri/mach64_dri.so.0 -unknown- obsolete
+./usr/X11R7/lib/modules/dri/mesa_dri_drivers.so -unknown- xorg
+./usr/X11R7/lib/modules/dri/mesa_dri_drivers.so.0 -unknown- xorg
./usr/X11R7/lib/modules/dri/mga_dri.so -unknown- obsolete
./usr/X11R7/lib/modules/dri/mga_dri.so.0 -unknown- obsolete
./usr/X11R7/lib/modules/dri/r128_dri.so -unknown- obsolete
@@ -447,10 +447,10 @@
./usr/X11R7/lib/modules/drivers/openchrome_drv.so.0 -unknown- xorg
./usr/X11R7/lib/modules/drivers/r128_drv.so -unknown- xorg
./usr/X11R7/lib/modules/drivers/r128_drv.so.6 -unknown- xorg
-./usr/X11R7/lib/modules/drivers/radeon_drv_old.so -unknown- xorg
-./usr/X11R7/lib/modules/drivers/radeon_drv_old.so.6 -unknown- xorg
./usr/X11R7/lib/modules/drivers/radeon_drv.so -unknown- xorg
./usr/X11R7/lib/modules/drivers/radeon_drv.so.7 -unknown- xorg
+./usr/X11R7/lib/modules/drivers/radeon_drv_old.so -unknown- xorg
+./usr/X11R7/lib/modules/drivers/radeon_drv_old.so.6 -unknown- xorg
./usr/X11R7/lib/modules/drivers/radeonhd_drv.so -unknown- xorg,obsolete
./usr/X11R7/lib/modules/drivers/radeonhd_drv.so.1 -unknown- xorg,obsolete
./usr/X11R7/lib/modules/drivers/s3_drv.so -unknown- xorg
@@ -514,11 +514,11 @@
./usr/X11R7/lib/modules/extensions/libdri.a -unknown- xorg
./usr/X11R7/lib/modules/extensions/libdri.so -unknown- xorg
./usr/X11R7/lib/modules/extensions/libdri.so.0 -unknown- xorg
-./usr/X11R7/lib/modules/extensions/libdri_pic.a -unknown- xorg,picinstall,obsolete
./usr/X11R7/lib/modules/extensions/libdri2.a -unknown- xorg
./usr/X11R7/lib/modules/extensions/libdri2.so -unknown- xorg
./usr/X11R7/lib/modules/extensions/libdri2.so.0 -unknown- xorg
./usr/X11R7/lib/modules/extensions/libdri2_pic.a -unknown- xorg,picinstall,obsolete
+./usr/X11R7/lib/modules/extensions/libdri_pic.a -unknown- xorg,picinstall,obsolete
./usr/X11R7/lib/modules/extensions/libextmod.a -unknown- xorg,obsolete
./usr/X11R7/lib/modules/extensions/libextmod.so -unknown- xorg
./usr/X11R7/lib/modules/extensions/libextmod.so.0 -unknown- xorg
@@ -650,6 +650,7 @@
./usr/X11R7/man/cat4/void.0 -unknown- obsolete
./usr/X11R7/man/cat4/ws.0 -unknown- .cat,xorg
./usr/X11R7/man/cat4/wsfb.0 -unknown- .cat,xorg
+./usr/X11R7/man/cat4/x86/radeon.0 -unknown- .cat,xorg
./usr/X11R7/man/cat4/xgi.0 -unknown- .cat,xorg
./usr/X11R7/man/cat5/xorg.conf.0 -unknown- .cat,xorg
./usr/X11R7/man/html1/Xorg.html -unknown- html,xorg
@@ -695,6 +696,7 @@
./usr/X11R7/man/html4/void.html -unknown- obsolete
./usr/X11R7/man/html4/ws.html -unknown- html,xorg
./usr/X11R7/man/html4/wsfb.html -unknown- html,xorg
+./usr/X11R7/man/html4/x86/radeon.html -unknown- html,xorg
./usr/X11R7/man/html4/xgi.html -unknown- html,xorg
./usr/X11R7/man/html5/xorg.conf.html -unknown- html,xorg
./usr/X11R7/man/man1/Xorg.1 -unknown- .man,xorg
@@ -740,6 +742,7 @@
./usr/X11R7/man/man4/void.4 -unknown- obsolete
./usr/X11R7/man/man4/ws.4 -unknown- .man,xorg
./usr/X11R7/man/man4/wsfb.4 -unknown- .man,xorg
+./usr/X11R7/man/man4/x86/radeon.4 -unknown- .man,xorg
./usr/X11R7/man/man4/xgi.4 -unknown- .man,xorg
./usr/X11R7/man/man5/xorg.conf.5 -unknown- .man,xorg
./usr/X11R7/share/aclocal/xorg-server.m4 -unknown- xorg
Index: src/distrib/sets/lists/xserver/md.i386
diff -u src/distrib/sets/lists/xserver/md.i386:1.101 src/distrib/sets/lists/xserver/md.i386:1.102
--- src/distrib/sets/lists/xserver/md.i386:1.101 Fri Jul 24 07:13:34 2015
+++ src/distrib/sets/lists/xserver/md.i386 Sat Sep 19 23:00:44 2015
@@ -1,4 +1,4 @@
-# $NetBSD: md.i386,v 1.101 2015/07/24 07:13:34 mrg Exp $
+# $NetBSD: md.i386,v 1.102 2015/09/19 23:00:44 wiz Exp $
./usr/X11R6/bin/X -unknown- x11
./usr/X11R6/bin/XFree86 -unknown- x11
./usr/X11R6/bin/gtf -unknown- x11
@@ -399,6 +399,8 @@
./usr/X11R7/lib/modules/dri/i965_dri.so.0 -unknown- xorg
./usr/X11R7/lib/modules/dri/mach64_dri.so -unknown- obsolete
./usr/X11R7/lib/modules/dri/mach64_dri.so.0 -unknown- obsolete
+./usr/X11R7/lib/modules/dri/mesa_dri_drivers.so -unknown- xorg
+./usr/X11R7/lib/modules/dri/mesa_dri_drivers.so.0 -unknown- xorg
./usr/X11R7/lib/modules/dri/mga_dri.so -unknown- obsolete
./usr/X11R7/lib/modules/dri/mga_dri.so.0 -unknown- obsolete
./usr/X11R7/lib/modules/dri/r128_dri.so -unknown- obsolete
@@ -411,8 +413,6 @@
./usr/X11R7/lib/modules/dri/r600_dri.so.0 -unknown- xorg
./usr/X11R7/lib/modules/dri/radeon_dri.so -unknown- xorg
./usr/X11R7/lib/modules/dri/radeon_dri.so.0 -unknown- xorg
-./usr/X11R7/lib/modules/dri/mesa_dri_drivers.so -unknown- xorg
-./usr/X11R7/lib/modules/dri/mesa_dri_drivers.so.0 -unknown- xorg
./usr/X11R7/lib/modules/dri/s3v_dri.so -unknown- obsolete
./usr/X11R7/lib/modules/dri/s3v_dri.so.0 -unknown- obsolete
./usr/X11R7/lib/modules/dri/savage_dri.so -unknown- obsolete
@@ -487,10 +487,10 @@
./usr/X11R7/lib/modules/drivers/openchrome_drv.so.0 -unknown- xorg
./usr/X11R7/lib/modules/drivers/r128_drv.so -unknown- xorg
./usr/X11R7/lib/modules/drivers/r128_drv.so.6 -unknown- xorg
-./usr/X11R7/lib/modules/drivers/radeon_drv_old.so -unknown- xorg
-./usr/X11R7/lib/modules/drivers/radeon_drv_old.so.6 -unknown- xorg
./usr/X11R7/lib/modules/drivers/radeon_drv.so -unknown- xorg
./usr/X11R7/lib/modules/drivers/radeon_drv.so.7 -unknown- xorg
+./usr/X11R7/lib/modules/drivers/radeon_drv_old.so -unknown- xorg
+./usr/X11R7/lib/modules/drivers/radeon_drv_old.so.6 -unknown- xorg
./usr/X11R7/lib/modules/drivers/radeonhd_drv.so -unknown- xorg,obsolete
./usr/X11R7/lib/modules/drivers/radeonhd_drv.so.1 -unknown- xorg,obsolete
./usr/X11R7/lib/modules/drivers/s3_drv.so -unknown- xorg
@@ -691,6 +691,7 @@
./usr/X11R7/man/cat4/void.0 -unknown- obsolete
./usr/X11R7/man/cat4/ws.0 -unknown- .cat,xorg
./usr/X11R7/man/cat4/wsfb.0 -unknown- .cat,xorg
+./usr/X11R7/man/cat4/x86/radeon.0 -unknown- .cat,xorg
./usr/X11R7/man/cat4/xgi.0 -unknown- .cat,xorg
./usr/X11R7/man/cat5/xorg.conf.0 -unknown- .cat,xorg
./usr/X11R7/man/html1/Xorg.html -unknown- html,xorg
@@ -737,6 +738,7 @@
./usr/X11R7/man/html4/void.html -unknown- obsolete
./usr/X11R7/man/html4/ws.html -unknown- html,xorg
./usr/X11R7/man/html4/wsfb.html -unknown- html,xorg
+./usr/X11R7/man/html4/x86/radeon.html -unknown- html,xorg
./usr/X11R7/man/html4/xgi.html -unknown- html,xorg
./usr/X11R7/man/html5/xorg.conf.html -unknown- html,xorg
./usr/X11R7/man/man1/Xorg.1 -unknown- .man,xorg
@@ -783,6 +785,7 @@
./usr/X11R7/man/man4/void.4 -unknown- obsolete
./usr/X11R7/man/man4/ws.4 -unknown- .man,xorg
./usr/X11R7/man/man4/wsfb.4 -unknown- .man,xorg
+./usr/X11R7/man/man4/x86/radeon.4 -unknown- .man,xorg
./usr/X11R7/man/man4/xgi.4 -unknown- .man,xorg
./usr/X11R7/man/man5/xorg.conf.5 -unknown- .man,xorg
./usr/X11R7/share/aclocal/xorg-server.m4 -unknown- xorg
Index: src/etc/mtree/NetBSD.dist.Xorg
diff -u src/etc/mtree/NetBSD.dist.Xorg:1.15 src/etc/mtree/NetBSD.dist.Xorg:1.16
--- src/etc/mtree/NetBSD.dist.Xorg:1.15 Thu Sep 3 22:24:02 2015
+++ src/etc/mtree/NetBSD.dist.Xorg Sat Sep 19 23:00:44 2015
@@ -1,4 +1,4 @@
-# $NetBSD: NetBSD.dist.Xorg,v 1.15 2015/09/03 22:24:02 youri Exp $
+# $NetBSD: NetBSD.dist.Xorg,v 1.16 2015/09/19 23:00:44 wiz Exp $
./usr/X11R7
./usr/X11R7/bin
./usr/X11R7/include
@@ -153,16 +153,19 @@
./usr/X11R7/man/cat1
./usr/X11R7/man/cat3
./usr/X11R7/man/cat4
+./usr/X11R7/man/cat4/x86
./usr/X11R7/man/cat5
./usr/X11R7/man/cat7
./usr/X11R7/man/html1
./usr/X11R7/man/html3
./usr/X11R7/man/html4
+./usr/X11R7/man/html4/x86
./usr/X11R7/man/html5
./usr/X11R7/man/html7
./usr/X11R7/man/man1
./usr/X11R7/man/man3
./usr/X11R7/man/man4
+./usr/X11R7/man/man4/x86
./usr/X11R7/man/man5
./usr/X11R7/man/man7
./usr/X11R7/share
Index: src/external/mit/xorg/server/drivers/xf86-video-radeon-kms/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-radeon-kms/Makefile:1.1 src/external/mit/xorg/server/drivers/xf86-video-radeon-kms/Makefile:1.2
--- src/external/mit/xorg/server/drivers/xf86-video-radeon-kms/Makefile:1.1 Sun Mar 1 07:46:04 2015
+++ src/external/mit/xorg/server/drivers/xf86-video-radeon-kms/Makefile Sat Sep 19 23:00:44 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2015/03/01 07:46:04 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2015/09/19 23:00:44 wiz Exp $
.include <bsd.own.mk>
@@ -40,7 +40,8 @@ SRCS= radeon_accel.c radeon_video.c \
$(SRCS.EXA) \
$(SRCS.KMS)
-MAN= radeon.4
+MAN= radeon.4
+MANSUBDIR= /x86
CPPFLAGS+= -DHAVE_CONFIG_H
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11 \
