sync

14 files changed, 2 insertions, 25 deletions

diff --git a/distrib/sets/lists/xserv/md.alpha b/distrib/sets/lists/xserv/md.alpha
index 3db711cc7..93c6035fa 100644
--- a/distrib/sets/lists/xserv/md.alpha
+++ b/distrib/sets/lists/xserv/md.alpha
@@ -7,7 +7,6 @@
 ./usr/X11R6/man/man1/Xnest.1
 ./usr/X11R6/man/man1/Xserver.1
 ./usr/X11R6/man/man1/Xvfb.1
-./usr/X11R6/share/doc/xorg-server
 ./var/db/xkb
 ./var/db/xkb/README.compiled
 ./var/log
diff --git a/distrib/sets/lists/xserv/md.amd64 b/distrib/sets/lists/xserv/md.amd64
index dd14ac345..af22b5b06 100644
--- a/distrib/sets/lists/xserv/md.amd64
+++ b/distrib/sets/lists/xserv/md.amd64
@@ -366,9 +366,9 @@
 ./usr/X11R6/man/man4/wsudl.4
 ./usr/X11R6/man/man5/xorg.conf.5
 ./usr/X11R6/man/man5/xorg.conf.d.5
-./usr/X11R6/share/aclocal/xorg-server.m4
 ./usr/X11R6/share/X11/xorg.conf.d
 ./usr/X11R6/share/X11/xorg.conf.d/50-fpit.conf
+./usr/X11R6/share/aclocal/xorg-server.m4
 ./var/db/xkb
 ./var/db/xkb/README.compiled
 ./var/log
diff --git a/distrib/sets/lists/xserv/md.armish b/distrib/sets/lists/xserv/md.armish
index cf9644738..772de120e 100644
--- a/distrib/sets/lists/xserv/md.armish
+++ b/distrib/sets/lists/xserv/md.armish
@@ -217,8 +217,6 @@
 ./usr/X11R6/man/man5/xorg.conf.5
 ./usr/X11R6/man/man5/xorg.conf.d.5
 ./usr/X11R6/share/aclocal/xorg-server.m4
-./usr/X11R6/share/X11/xorg.conf.d
-./usr/X11R6/share/X11/xorg.conf.d/50-fpit.conf
 ./var/db/xkb
 ./var/db/xkb/README.compiled
 ./var/log
diff --git a/distrib/sets/lists/xserv/md.hp300 b/distrib/sets/lists/xserv/md.hp300
index ca998f6eb..e5b0fb780 100644
--- a/distrib/sets/lists/xserv/md.hp300
+++ b/distrib/sets/lists/xserv/md.hp300
@@ -79,7 +79,6 @@
 ./usr/X11R6/include/xorg/randrstr.h
 ./usr/X11R6/include/xorg/region.h
 ./usr/X11R6/include/xorg/regionstr.h
-./usr/X11R6/include/xorg/renderedge.h
 ./usr/X11R6/include/xorg/resource.h
 ./usr/X11R6/include/xorg/rgb.h
 ./usr/X11R6/include/xorg/screenint.h
diff --git a/distrib/sets/lists/xserv/md.hppa b/distrib/sets/lists/xserv/md.hppa
index e43e025f3..85f9bba35 100644
--- a/distrib/sets/lists/xserv/md.hppa
+++ b/distrib/sets/lists/xserv/md.hppa
@@ -99,7 +99,6 @@
 ./usr/X11R6/include/xorg/region.h
 ./usr/X11R6/include/xorg/regionstr.h
 ./usr/X11R6/include/xorg/registry.h
-./usr/X11R6/include/xorg/renderedge.h
 ./usr/X11R6/include/xorg/resource.h
 ./usr/X11R6/include/xorg/rgb.h
 ./usr/X11R6/include/xorg/rrtransform.h
@@ -311,7 +310,5 @@
 ./usr/X11R6/man/man5/xorg.conf.5
 ./usr/X11R6/man/man5/xorg.conf.d.5
 ./usr/X11R6/share/aclocal/xorg-server.m4
-./usr/X11R6/share/X11/xorg.conf.d
-./usr/X11R6/share/X11/xorg.conf.d/50-fpit.conf
 ./var/db/xkb/README.compiled
 ./var/log
diff --git a/distrib/sets/lists/xserv/md.i386 b/distrib/sets/lists/xserv/md.i386
index d7c900e87..eaa06627e 100644
--- a/distrib/sets/lists/xserv/md.i386
+++ b/distrib/sets/lists/xserv/md.i386
@@ -374,9 +374,9 @@
 ./usr/X11R6/man/man4/wsudl.4
 ./usr/X11R6/man/man5/xorg.conf.5
 ./usr/X11R6/man/man5/xorg.conf.d.5
-./usr/X11R6/share/aclocal/xorg-server.m4
 ./usr/X11R6/share/X11/xorg.conf.d
 ./usr/X11R6/share/X11/xorg.conf.d/50-fpit.conf
+./usr/X11R6/share/aclocal/xorg-server.m4
 ./var/db/xkb
 ./var/db/xkb/README.compiled
 ./var/log
diff --git a/distrib/sets/lists/xserv/md.loongson b/distrib/sets/lists/xserv/md.loongson
index 14abf55a1..639cb7494 100644
--- a/distrib/sets/lists/xserv/md.loongson
+++ b/distrib/sets/lists/xserv/md.loongson
@@ -213,8 +213,6 @@
 ./usr/X11R6/man/man5/xorg.conf.5
 ./usr/X11R6/man/man5/xorg.conf.d.5
 ./usr/X11R6/share/aclocal/xorg-server.m4
-./usr/X11R6/share/X11/xorg.conf.d
-./usr/X11R6/share/X11/xorg.conf.d/50-fpit.conf
 ./var/db/xkb
 ./var/db/xkb/README.compiled
 ./var/log
diff --git a/distrib/sets/lists/xserv/md.mac68k b/distrib/sets/lists/xserv/md.mac68k
index 524398ea8..385903504 100644
--- a/distrib/sets/lists/xserv/md.mac68k
+++ b/distrib/sets/lists/xserv/md.mac68k
@@ -251,8 +251,6 @@
 ./usr/X11R6/man/man5/xorg.conf.5
 ./usr/X11R6/man/man5/xorg.conf.d.5
 ./usr/X11R6/share/aclocal/xorg-server.m4
-./usr/X11R6/share/X11/xorg.conf.d
-./usr/X11R6/share/X11/xorg.conf.d/50-fpit.conf
 ./var/db/xkb
 ./var/db/xkb/README.compiled
 ./var/log
diff --git a/distrib/sets/lists/xserv/md.macppc b/distrib/sets/lists/xserv/md.macppc
index 120db084b..fc3d1ce44 100644
--- a/distrib/sets/lists/xserv/md.macppc
+++ b/distrib/sets/lists/xserv/md.macppc
@@ -257,8 +257,6 @@
 ./usr/X11R6/man/man5/xorg.conf.5
 ./usr/X11R6/man/man5/xorg.conf.d.5
 ./usr/X11R6/share/aclocal/xorg-server.m4
-./usr/X11R6/share/X11/xorg.conf.d
-./usr/X11R6/share/X11/xorg.conf.d/50-fpit.conf
 ./var/db/xkb
 ./var/db/xkb/README.compiled
 ./var/log
diff --git a/distrib/sets/lists/xserv/md.sgi b/distrib/sets/lists/xserv/md.sgi
index 43e082797..98b3d86a1 100644
--- a/distrib/sets/lists/xserv/md.sgi
+++ b/distrib/sets/lists/xserv/md.sgi
@@ -209,8 +209,6 @@
 ./usr/X11R6/man/man5/xorg.conf.5
 ./usr/X11R6/man/man5/xorg.conf.d.5
 ./usr/X11R6/share/aclocal/xorg-server.m4
-./usr/X11R6/share/X11/xorg.conf.d
-./usr/X11R6/share/X11/xorg.conf.d/50-fpit.conf
 ./var/db/xkb
 ./var/db/xkb/README.compiled
 ./var/log
diff --git a/distrib/sets/lists/xserv/md.socppc b/distrib/sets/lists/xserv/md.socppc
index 650815de7..b46c53126 100644
--- a/distrib/sets/lists/xserv/md.socppc
+++ b/distrib/sets/lists/xserv/md.socppc
@@ -214,8 +214,6 @@
 ./usr/X11R6/man/man5/xorg.conf.5
 ./usr/X11R6/man/man5/xorg.conf.d.5
 ./usr/X11R6/share/aclocal/xorg-server.m4
-./usr/X11R6/share/X11/xorg.conf.d
-./usr/X11R6/share/X11/xorg.conf.d/50-fpit.conf
 ./var/db/xkb
 ./var/db/xkb/README.compiled
 ./var/log
diff --git a/distrib/sets/lists/xserv/md.sparc b/distrib/sets/lists/xserv/md.sparc
index 3f4ef6834..835d04427 100644
--- a/distrib/sets/lists/xserv/md.sparc
+++ b/distrib/sets/lists/xserv/md.sparc
@@ -210,8 +210,6 @@
 ./usr/X11R6/man/man5/xorg.conf.5
 ./usr/X11R6/man/man5/xorg.conf.d.5
 ./usr/X11R6/share/aclocal/xorg-server.m4
-./usr/X11R6/share/X11/xorg.conf.d
-./usr/X11R6/share/X11/xorg.conf.d/50-fpit.conf
 ./var/db/xkb
 ./var/db/xkb/README.compiled
 ./var/log
diff --git a/distrib/sets/lists/xserv/md.sparc64 b/distrib/sets/lists/xserv/md.sparc64
index d654e42a4..eecce7040 100644
--- a/distrib/sets/lists/xserv/md.sparc64
+++ b/distrib/sets/lists/xserv/md.sparc64
@@ -260,8 +260,6 @@
 ./usr/X11R6/man/man5/xorg.conf.5
 ./usr/X11R6/man/man5/xorg.conf.d.5
 ./usr/X11R6/share/aclocal/xorg-server.m4
-./usr/X11R6/share/X11/xorg.conf.d
-./usr/X11R6/share/X11/xorg.conf.d/50-fpit.conf
 ./var/db/xkb
 ./var/db/xkb/README.compiled
 ./var/log
diff --git a/distrib/sets/lists/xserv/md.zaurus b/distrib/sets/lists/xserv/md.zaurus
index 650815de7..b46c53126 100644
--- a/distrib/sets/lists/xserv/md.zaurus
+++ b/distrib/sets/lists/xserv/md.zaurus
@@ -214,8 +214,6 @@
 ./usr/X11R6/man/man5/xorg.conf.5
 ./usr/X11R6/man/man5/xorg.conf.d.5
 ./usr/X11R6/share/aclocal/xorg-server.m4
-./usr/X11R6/share/X11/xorg.conf.d
-./usr/X11R6/share/X11/xorg.conf.d/50-fpit.conf
 ./var/db/xkb
 ./var/db/xkb/README.compiled
 ./var/log