sync

17 files changed, 1 insertions, 96 deletions

diff --git a/distrib/sets/lists/xbase/md.alpha b/distrib/sets/lists/xbase/md.alpha
index 296524b88..753c764c9 100644
--- a/distrib/sets/lists/xbase/md.alpha
+++ b/distrib/sets/lists/xbase/md.alpha
@@ -430,25 +430,11 @@
 ./usr/X11R6/include/X11/extensions/xf86dga1.h
 ./usr/X11R6/include/X11/extensions/xf86dga1str.h
 ./usr/X11R6/include/X11/extensions/xf86dgastr.h
-./usr/X11R6/include/drm
-./usr/X11R6/include/drm/drm.h
-./usr/X11R6/include/drm/drm_sarea.h
-./usr/X11R6/include/drm/i915_drm.h
-./usr/X11R6/include/drm/mach64_drm.h
-./usr/X11R6/include/drm/mga_drm.h
-./usr/X11R6/include/drm/r128_drm.h
-./usr/X11R6/include/drm/r300_reg.h
-./usr/X11R6/include/drm/radeon_drm.h
-./usr/X11R6/include/drm/savage_drm.h
-./usr/X11R6/include/drm/sis_drm.h
-./usr/X11R6/include/drm/via_3d_reg.h
-./usr/X11R6/include/drm/via_drm.h
 ./usr/X11R6/include/freetype2/freetype/ftgzip.h
 ./usr/X11R6/include/freetype2/freetype/ftincrem.h
 ./usr/X11R6/include/freetype2/freetype/ftpfr.h
 ./usr/X11R6/include/freetype2/freetype/ftwinfnt.h
 ./usr/X11R6/include/ft2build.h
-./usr/X11R6/include/xf86drm.h
 ./usr/X11R6/include/xf86mm.h
 ./usr/X11R6/include/xorg/hotplug.h
 ./usr/X11R6/include/xorg/wfbrename.h
@@ -512,8 +498,6 @@
 ./usr/X11R6/lib/libXxf86misc.so.5.0
 ./usr/X11R6/lib/libXxf86vm.so.5.0
 ./usr/X11R6/lib/libdmx.so.1.0
-./usr/X11R6/lib/libdrm.la
-./usr/X11R6/lib/libdrm.so.2.3
 ./usr/X11R6/lib/libfontconfig.so.5.1
 ./usr/X11R6/lib/libfontenc.so.3.0
 ./usr/X11R6/lib/libfreetype.so.16.0
@@ -530,7 +514,6 @@
 ./usr/X11R6/lib/pkgconfig/gl.pc
 ./usr/X11R6/lib/pkgconfig/glu.pc
 ./usr/X11R6/lib/pkgconfig/glw.pc
-./usr/X11R6/lib/pkgconfig/libdrm.pc
 ./usr/X11R6/man/cat1/glxgears.0
 ./usr/X11R6/man/cat1/glxinfo.0
 ./usr/X11R6/man/cat3/GLwCreateMDrawingArea.0
diff --git a/distrib/sets/lists/xbase/md.amd64 b/distrib/sets/lists/xbase/md.amd64
index 296524b88..753c764c9 100644
--- a/distrib/sets/lists/xbase/md.amd64
+++ b/distrib/sets/lists/xbase/md.amd64
@@ -430,25 +430,11 @@
 ./usr/X11R6/include/X11/extensions/xf86dga1.h
 ./usr/X11R6/include/X11/extensions/xf86dga1str.h
 ./usr/X11R6/include/X11/extensions/xf86dgastr.h
-./usr/X11R6/include/drm
-./usr/X11R6/include/drm/drm.h
-./usr/X11R6/include/drm/drm_sarea.h
-./usr/X11R6/include/drm/i915_drm.h
-./usr/X11R6/include/drm/mach64_drm.h
-./usr/X11R6/include/drm/mga_drm.h
-./usr/X11R6/include/drm/r128_drm.h
-./usr/X11R6/include/drm/r300_reg.h
-./usr/X11R6/include/drm/radeon_drm.h
-./usr/X11R6/include/drm/savage_drm.h
-./usr/X11R6/include/drm/sis_drm.h
-./usr/X11R6/include/drm/via_3d_reg.h
-./usr/X11R6/include/drm/via_drm.h
 ./usr/X11R6/include/freetype2/freetype/ftgzip.h
 ./usr/X11R6/include/freetype2/freetype/ftincrem.h
 ./usr/X11R6/include/freetype2/freetype/ftpfr.h
 ./usr/X11R6/include/freetype2/freetype/ftwinfnt.h
 ./usr/X11R6/include/ft2build.h
-./usr/X11R6/include/xf86drm.h
 ./usr/X11R6/include/xf86mm.h
 ./usr/X11R6/include/xorg/hotplug.h
 ./usr/X11R6/include/xorg/wfbrename.h
@@ -512,8 +498,6 @@
 ./usr/X11R6/lib/libXxf86misc.so.5.0
 ./usr/X11R6/lib/libXxf86vm.so.5.0
 ./usr/X11R6/lib/libdmx.so.1.0
-./usr/X11R6/lib/libdrm.la
-./usr/X11R6/lib/libdrm.so.2.3
 ./usr/X11R6/lib/libfontconfig.so.5.1
 ./usr/X11R6/lib/libfontenc.so.3.0
 ./usr/X11R6/lib/libfreetype.so.16.0
@@ -530,7 +514,6 @@
 ./usr/X11R6/lib/pkgconfig/gl.pc
 ./usr/X11R6/lib/pkgconfig/glu.pc
 ./usr/X11R6/lib/pkgconfig/glw.pc
-./usr/X11R6/lib/pkgconfig/libdrm.pc
 ./usr/X11R6/man/cat1/glxgears.0
 ./usr/X11R6/man/cat1/glxinfo.0
 ./usr/X11R6/man/cat3/GLwCreateMDrawingArea.0
diff --git a/distrib/sets/lists/xbase/md.armish b/distrib/sets/lists/xbase/md.armish
index c19170e99..6a37b58d7 100644
--- a/distrib/sets/lists/xbase/md.armish
+++ b/distrib/sets/lists/xbase/md.armish
@@ -430,7 +430,6 @@
 ./usr/X11R6/include/X11/extensions/xf86dga1.h
 ./usr/X11R6/include/X11/extensions/xf86dga1str.h
 ./usr/X11R6/include/X11/extensions/xf86dgastr.h
-./usr/X11R6/include/drm
 ./usr/X11R6/include/freetype2/freetype/ftgzip.h
 ./usr/X11R6/include/freetype2/freetype/ftincrem.h
 ./usr/X11R6/include/freetype2/freetype/ftpfr.h
diff --git a/distrib/sets/lists/xbase/md.hp300 b/distrib/sets/lists/xbase/md.hp300
index 82936ca87..184b89d07 100644
--- a/distrib/sets/lists/xbase/md.hp300
+++ b/distrib/sets/lists/xbase/md.hp300
@@ -429,7 +429,6 @@
 ./usr/X11R6/include/X11/extensions/xf86dga1.h
 ./usr/X11R6/include/X11/extensions/xf86dga1str.h
 ./usr/X11R6/include/X11/extensions/xf86dgastr.h
-./usr/X11R6/include/drm
 ./usr/X11R6/include/freetype2/freetype/ftgzip.h
 ./usr/X11R6/include/freetype2/freetype/ftincrem.h
 ./usr/X11R6/include/freetype2/freetype/ftpfr.h
diff --git a/distrib/sets/lists/xbase/md.hppa b/distrib/sets/lists/xbase/md.hppa
index b2507784e..310042bd2 100644
--- a/distrib/sets/lists/xbase/md.hppa
+++ b/distrib/sets/lists/xbase/md.hppa
@@ -429,7 +429,6 @@
 ./usr/X11R6/include/X11/extensions/xf86dga1.h
 ./usr/X11R6/include/X11/extensions/xf86dga1str.h
 ./usr/X11R6/include/X11/extensions/xf86dgastr.h
-./usr/X11R6/include/drm
 ./usr/X11R6/include/freetype2/freetype/ftgzip.h
 ./usr/X11R6/include/freetype2/freetype/ftincrem.h
 ./usr/X11R6/include/freetype2/freetype/ftpfr.h
diff --git a/distrib/sets/lists/xbase/md.i386 b/distrib/sets/lists/xbase/md.i386
index da20aba94..ee9b5a29e 100644
--- a/distrib/sets/lists/xbase/md.i386
+++ b/distrib/sets/lists/xbase/md.i386
@@ -430,25 +430,11 @@
 ./usr/X11R6/include/X11/extensions/xf86dga1.h
 ./usr/X11R6/include/X11/extensions/xf86dga1str.h
 ./usr/X11R6/include/X11/extensions/xf86dgastr.h
-./usr/X11R6/include/drm
-./usr/X11R6/include/drm/drm.h
-./usr/X11R6/include/drm/drm_sarea.h
-./usr/X11R6/include/drm/i915_drm.h
-./usr/X11R6/include/drm/mach64_drm.h
-./usr/X11R6/include/drm/mga_drm.h
-./usr/X11R6/include/drm/r128_drm.h
-./usr/X11R6/include/drm/r300_reg.h
-./usr/X11R6/include/drm/radeon_drm.h
-./usr/X11R6/include/drm/savage_drm.h
-./usr/X11R6/include/drm/sis_drm.h
-./usr/X11R6/include/drm/via_3d_reg.h
-./usr/X11R6/include/drm/via_drm.h
 ./usr/X11R6/include/freetype2/freetype/ftgzip.h
 ./usr/X11R6/include/freetype2/freetype/ftincrem.h
 ./usr/X11R6/include/freetype2/freetype/ftpfr.h
 ./usr/X11R6/include/freetype2/freetype/ftwinfnt.h
 ./usr/X11R6/include/ft2build.h
-./usr/X11R6/include/xf86drm.h
 ./usr/X11R6/include/xf86mm.h
 ./usr/X11R6/include/xorg/hotplug.h
 ./usr/X11R6/include/xorg/wfbrename.h
@@ -512,8 +498,6 @@
 ./usr/X11R6/lib/libXxf86misc.so.5.0
 ./usr/X11R6/lib/libXxf86vm.so.5.0
 ./usr/X11R6/lib/libdmx.so.1.0
-./usr/X11R6/lib/libdrm.la
-./usr/X11R6/lib/libdrm.so.2.3
 ./usr/X11R6/lib/libfontconfig.so.5.1
 ./usr/X11R6/lib/libfontenc.so.3.0
 ./usr/X11R6/lib/libfreetype.so.16.0
@@ -530,7 +514,6 @@
 ./usr/X11R6/lib/pkgconfig/gl.pc
 ./usr/X11R6/lib/pkgconfig/glu.pc
 ./usr/X11R6/lib/pkgconfig/glw.pc
-./usr/X11R6/lib/pkgconfig/libdrm.pc
 ./usr/X11R6/man/cat1/glxgears.0
 ./usr/X11R6/man/cat1/glxinfo.0
 ./usr/X11R6/man/cat3/GLwCreateMDrawingArea.0
diff --git a/distrib/sets/lists/xbase/md.landisk b/distrib/sets/lists/xbase/md.landisk
index 19246193d..60622c914 100644
--- a/distrib/sets/lists/xbase/md.landisk
+++ b/distrib/sets/lists/xbase/md.landisk
@@ -429,7 +429,6 @@
 ./usr/X11R6/include/X11/extensions/xf86dga1.h
 ./usr/X11R6/include/X11/extensions/xf86dga1str.h
 ./usr/X11R6/include/X11/extensions/xf86dgastr.h
-./usr/X11R6/include/drm
 ./usr/X11R6/include/freetype2/freetype/ftgzip.h
 ./usr/X11R6/include/freetype2/freetype/ftincrem.h
 ./usr/X11R6/include/freetype2/freetype/ftpfr.h
diff --git a/distrib/sets/lists/xbase/md.mac68k b/distrib/sets/lists/xbase/md.mac68k
index a0cda7f79..56ffa99b1 100644
--- a/distrib/sets/lists/xbase/md.mac68k
+++ b/distrib/sets/lists/xbase/md.mac68k
@@ -435,7 +435,6 @@
 ./usr/X11R6/include/GL/osmesa.h
 ./usr/X11R6/include/X11/misc.h
 ./usr/X11R6/include/X11/os.h
-./usr/X11R6/include/drm
 ./usr/X11R6/include/freetype2/freetype/ftgzip.h
 ./usr/X11R6/include/freetype2/freetype/ftincrem.h
 ./usr/X11R6/include/freetype2/freetype/ftpfr.h
diff --git a/distrib/sets/lists/xbase/md.macppc b/distrib/sets/lists/xbase/md.macppc
index 9a25f0659..15ea082ac 100644
--- a/distrib/sets/lists/xbase/md.macppc
+++ b/distrib/sets/lists/xbase/md.macppc
@@ -430,25 +430,11 @@
 ./usr/X11R6/include/X11/extensions/xf86dga1.h
 ./usr/X11R6/include/X11/extensions/xf86dga1str.h
 ./usr/X11R6/include/X11/extensions/xf86dgastr.h
-./usr/X11R6/include/drm
-./usr/X11R6/include/drm/drm.h
-./usr/X11R6/include/drm/drm_sarea.h
-./usr/X11R6/include/drm/i915_drm.h
-./usr/X11R6/include/drm/mach64_drm.h
-./usr/X11R6/include/drm/mga_drm.h
-./usr/X11R6/include/drm/r128_drm.h
-./usr/X11R6/include/drm/r300_reg.h
-./usr/X11R6/include/drm/radeon_drm.h
-./usr/X11R6/include/drm/savage_drm.h
-./usr/X11R6/include/drm/sis_drm.h
-./usr/X11R6/include/drm/via_3d_reg.h
-./usr/X11R6/include/drm/via_drm.h
 ./usr/X11R6/include/freetype2/freetype/ftgzip.h
 ./usr/X11R6/include/freetype2/freetype/ftincrem.h
 ./usr/X11R6/include/freetype2/freetype/ftpfr.h
 ./usr/X11R6/include/freetype2/freetype/ftwinfnt.h
 ./usr/X11R6/include/ft2build.h
-./usr/X11R6/include/xf86drm.h
 ./usr/X11R6/include/xf86mm.h
 ./usr/X11R6/include/xorg/hotplug.h
 ./usr/X11R6/include/xorg/wfbrename.h
@@ -512,8 +498,6 @@
 ./usr/X11R6/lib/libXxf86misc.so.5.0
 ./usr/X11R6/lib/libXxf86vm.so.5.0
 ./usr/X11R6/lib/libdmx.so.1.0
-./usr/X11R6/lib/libdrm.la
-./usr/X11R6/lib/libdrm.so.2.3
 ./usr/X11R6/lib/libfontconfig.so.5.1
 ./usr/X11R6/lib/libfontenc.so.3.0
 ./usr/X11R6/lib/libfreetype.so.16.0
@@ -530,7 +514,6 @@
 ./usr/X11R6/lib/pkgconfig/gl.pc
 ./usr/X11R6/lib/pkgconfig/glu.pc
 ./usr/X11R6/lib/pkgconfig/glw.pc
-./usr/X11R6/lib/pkgconfig/libdrm.pc
 ./usr/X11R6/man/cat1/glxgears.0
 ./usr/X11R6/man/cat1/glxinfo.0
 ./usr/X11R6/man/cat3/GLwCreateMDrawingArea.0
diff --git a/distrib/sets/lists/xbase/md.mvme68k b/distrib/sets/lists/xbase/md.mvme68k
index 5c0dfc9fb..c709b3c4f 100644
--- a/distrib/sets/lists/xbase/md.mvme68k
+++ b/distrib/sets/lists/xbase/md.mvme68k
@@ -430,7 +430,6 @@
 ./usr/X11R6/include/X11/extensions/xf86dga1.h
 ./usr/X11R6/include/X11/extensions/xf86dga1str.h
 ./usr/X11R6/include/X11/extensions/xf86dgastr.h
-./usr/X11R6/include/drm
 ./usr/X11R6/include/freetype2/freetype/ftgzip.h
 ./usr/X11R6/include/freetype2/freetype/ftincrem.h
 ./usr/X11R6/include/freetype2/freetype/ftpfr.h
diff --git a/distrib/sets/lists/xbase/md.mvme88k b/distrib/sets/lists/xbase/md.mvme88k
index c07f95613..08df28612 100644
--- a/distrib/sets/lists/xbase/md.mvme88k
+++ b/distrib/sets/lists/xbase/md.mvme88k
@@ -20,7 +20,6 @@
 ./usr/X11R6/include/X11/extensions/xf86dga1.h
 ./usr/X11R6/include/X11/extensions/xf86dga1str.h
 ./usr/X11R6/include/X11/extensions/xf86dgastr.h
-./usr/X11R6/include/drm
 ./usr/X11R6/include/freetype2/freetype/ftgzip.h
 ./usr/X11R6/include/freetype2/freetype/ftincrem.h
 ./usr/X11R6/include/freetype2/freetype/ftpfr.h
diff --git a/distrib/sets/lists/xbase/md.sgi b/distrib/sets/lists/xbase/md.sgi
index db880d973..87fcb033e 100644
--- a/distrib/sets/lists/xbase/md.sgi
+++ b/distrib/sets/lists/xbase/md.sgi
@@ -417,7 +417,6 @@
 ./usr/X11R6/include/X11/extensions/xf86dga1.h
 ./usr/X11R6/include/X11/extensions/xf86dga1str.h
 ./usr/X11R6/include/X11/extensions/xf86dgastr.h
-./usr/X11R6/include/drm
 ./usr/X11R6/include/freetype2/freetype/ftgzip.h
 ./usr/X11R6/include/freetype2/freetype/ftincrem.h
 ./usr/X11R6/include/freetype2/freetype/ftpfr.h
diff --git a/distrib/sets/lists/xbase/md.sparc b/distrib/sets/lists/xbase/md.sparc
index 512d4fe34..db9ac03a0 100644
--- a/distrib/sets/lists/xbase/md.sparc
+++ b/distrib/sets/lists/xbase/md.sparc
@@ -430,7 +430,6 @@
 ./usr/X11R6/include/X11/extensions/xf86dga1.h
 ./usr/X11R6/include/X11/extensions/xf86dga1str.h
 ./usr/X11R6/include/X11/extensions/xf86dgastr.h
-./usr/X11R6/include/drm
 ./usr/X11R6/include/freetype2/freetype/ftgzip.h
 ./usr/X11R6/include/freetype2/freetype/ftincrem.h
 ./usr/X11R6/include/freetype2/freetype/ftpfr.h
diff --git a/distrib/sets/lists/xbase/md.sparc64 b/distrib/sets/lists/xbase/md.sparc64
index bf9f54042..9227f6075 100644
--- a/distrib/sets/lists/xbase/md.sparc64
+++ b/distrib/sets/lists/xbase/md.sparc64
@@ -430,25 +430,11 @@
 ./usr/X11R6/include/X11/extensions/xf86dga1.h
 ./usr/X11R6/include/X11/extensions/xf86dga1str.h
 ./usr/X11R6/include/X11/extensions/xf86dgastr.h
-./usr/X11R6/include/drm
-./usr/X11R6/include/drm/drm.h
-./usr/X11R6/include/drm/drm_sarea.h
-./usr/X11R6/include/drm/i915_drm.h
-./usr/X11R6/include/drm/mach64_drm.h
-./usr/X11R6/include/drm/mga_drm.h
-./usr/X11R6/include/drm/r128_drm.h
-./usr/X11R6/include/drm/r300_reg.h
-./usr/X11R6/include/drm/radeon_drm.h
-./usr/X11R6/include/drm/savage_drm.h
-./usr/X11R6/include/drm/sis_drm.h
-./usr/X11R6/include/drm/via_3d_reg.h
-./usr/X11R6/include/drm/via_drm.h
 ./usr/X11R6/include/freetype2/freetype/ftgzip.h
 ./usr/X11R6/include/freetype2/freetype/ftincrem.h
 ./usr/X11R6/include/freetype2/freetype/ftpfr.h
 ./usr/X11R6/include/freetype2/freetype/ftwinfnt.h
 ./usr/X11R6/include/ft2build.h
-./usr/X11R6/include/xf86drm.h
 ./usr/X11R6/include/xf86mm.h
 ./usr/X11R6/include/xorg/hotplug.h
 ./usr/X11R6/include/xorg/wfbrename.h
@@ -512,8 +498,6 @@
 ./usr/X11R6/lib/libXxf86misc.so.5.0
 ./usr/X11R6/lib/libXxf86vm.so.5.0
 ./usr/X11R6/lib/libdmx.so.1.0
-./usr/X11R6/lib/libdrm.la
-./usr/X11R6/lib/libdrm.so.2.3
 ./usr/X11R6/lib/libfontconfig.so.5.1
 ./usr/X11R6/lib/libfontenc.so.3.0
 ./usr/X11R6/lib/libfreetype.so.16.0
@@ -529,7 +513,6 @@
 ./usr/X11R6/lib/pkgconfig/gl.pc
 ./usr/X11R6/lib/pkgconfig/glu.pc
 ./usr/X11R6/lib/pkgconfig/glw.pc
-./usr/X11R6/lib/pkgconfig/libdrm.pc
 ./usr/X11R6/man/cat1/glxgears.0
 ./usr/X11R6/man/cat1/glxinfo.0
 ./usr/X11R6/man/cat3/GLwCreateMDrawingArea.0
diff --git a/distrib/sets/lists/xbase/md.vax b/distrib/sets/lists/xbase/md.vax
index 3d97d241e..9f168f1c9 100644
--- a/distrib/sets/lists/xbase/md.vax
+++ b/distrib/sets/lists/xbase/md.vax
@@ -416,7 +416,6 @@
 ./usr/X11R6/include/X11/extensions/xf86dga1.h
 ./usr/X11R6/include/X11/extensions/xf86dga1str.h
 ./usr/X11R6/include/X11/extensions/xf86dgastr.h
-./usr/X11R6/include/drm
 ./usr/X11R6/include/freetype2/freetype/ftgzip.h
 ./usr/X11R6/include/freetype2/freetype/ftincrem.h
 ./usr/X11R6/include/freetype2/freetype/ftpfr.h
diff --git a/distrib/sets/lists/xbase/md.zaurus b/distrib/sets/lists/xbase/md.zaurus
index c19170e99..6a37b58d7 100644
--- a/distrib/sets/lists/xbase/md.zaurus
+++ b/distrib/sets/lists/xbase/md.zaurus
@@ -430,7 +430,6 @@
 ./usr/X11R6/include/X11/extensions/xf86dga1.h
 ./usr/X11R6/include/X11/extensions/xf86dga1str.h
 ./usr/X11R6/include/X11/extensions/xf86dgastr.h
-./usr/X11R6/include/drm
 ./usr/X11R6/include/freetype2/freetype/ftgzip.h
 ./usr/X11R6/include/freetype2/freetype/ftincrem.h
 ./usr/X11R6/include/freetype2/freetype/ftpfr.h
diff --git a/distrib/sets/lists/xshare/mi b/distrib/sets/lists/xshare/mi
index ed746490a..a207e62a2 100644
--- a/distrib/sets/lists/xshare/mi
+++ b/distrib/sets/lists/xshare/mi
@@ -2944,6 +2944,7 @@
 ./usr/X11R6/share/doc/renderproto/renderproto.txt
 ./usr/X11R6/share/mk
 ./usr/X11R6/share/mk/automake.dep
+./usr/X11R6/share/mk/bsd.xconf.mk
 ./usr/X11R6/share/mk/bsd.xorg.mk
 ./usr/local
 ./usr/local/lib