sync

18 files changed, 1 insertions, 19 deletions

diff --git a/distrib/sets/lists/xserv/md.alpha b/distrib/sets/lists/xserv/md.alpha
index e96df1063..ea095f5f4 100644
--- a/distrib/sets/lists/xserv/md.alpha
+++ b/distrib/sets/lists/xserv/md.alpha
@@ -317,7 +317,6 @@
 ./usr/X11R6/man/man4/wsfb.4
 ./usr/X11R6/man/man5/xorg.conf.5
 ./usr/X11R6/man/man7/Xprint.7
-./usr/X11R6/share/aclocal/xorg-macros.m4
 ./usr/X11R6/share/aclocal/xorg-server.m4
 ./var/db/xkb
 ./var/db/xkb/README.compiled
diff --git a/distrib/sets/lists/xserv/md.amd64 b/distrib/sets/lists/xserv/md.amd64
index aa7899448..cfa9ef20b 100644
--- a/distrib/sets/lists/xserv/md.amd64
+++ b/distrib/sets/lists/xserv/md.amd64
@@ -350,7 +350,6 @@
 ./usr/X11R6/man/man4/wsudl.4
 ./usr/X11R6/man/man5/xorg.conf.5
 ./usr/X11R6/man/man7/Xprint.7
-./usr/X11R6/share/aclocal/xorg-macros.m4
 ./usr/X11R6/share/aclocal/xorg-server.m4
 ./var/db/xkb
 ./var/db/xkb/README.compiled
diff --git a/distrib/sets/lists/xserv/md.armish b/distrib/sets/lists/xserv/md.armish
index ace345c96..896a83594 100644
--- a/distrib/sets/lists/xserv/md.armish
+++ b/distrib/sets/lists/xserv/md.armish
@@ -216,7 +216,6 @@
 ./usr/X11R6/man/man4/wsudl.4
 ./usr/X11R6/man/man5/xorg.conf.5
 ./usr/X11R6/man/man7/Xprint.7
-./usr/X11R6/share/aclocal/xorg-macros.m4
 ./usr/X11R6/share/aclocal/xorg-server.m4
 ./var/db/xkb
 ./var/db/xkb/README.compiled
diff --git a/distrib/sets/lists/xserv/md.hp300 b/distrib/sets/lists/xserv/md.hp300
index a95a20771..b39d95214 100644
--- a/distrib/sets/lists/xserv/md.hp300
+++ b/distrib/sets/lists/xserv/md.hp300
@@ -263,7 +263,6 @@
 ./usr/X11R6/man/man4/wsfb.4
 ./usr/X11R6/man/man5/xorg.conf.5
 ./usr/X11R6/man/man7/Xprint.7
-./usr/X11R6/share/aclocal/xorg-macros.m4
 ./usr/X11R6/share/aclocal/xorg-server.m4
 ./var/db/xkb
 ./var/db/xkb/README.compiled
diff --git a/distrib/sets/lists/xserv/md.hppa b/distrib/sets/lists/xserv/md.hppa
index f05d64c3c..e18bb4fce 100644
--- a/distrib/sets/lists/xserv/md.hppa
+++ b/distrib/sets/lists/xserv/md.hppa
@@ -64,6 +64,5 @@
 ./usr/X11R6/man/man3/XF86VidModeValidateModeLine.3
 ./usr/X11R6/man/man3/XFree86-DGA.3
 ./usr/X11R6/man/man7/Xprint.7
-./usr/X11R6/share/aclocal/xorg-macros.m4
 ./var/db/xkb/README.compiled
 ./var/log
diff --git a/distrib/sets/lists/xserv/md.i386 b/distrib/sets/lists/xserv/md.i386
index d3c64b2af..b562da807 100644
--- a/distrib/sets/lists/xserv/md.i386
+++ b/distrib/sets/lists/xserv/md.i386
@@ -358,7 +358,6 @@
 ./usr/X11R6/man/man4/wsudl.4
 ./usr/X11R6/man/man5/xorg.conf.5
 ./usr/X11R6/man/man7/Xprint.7
-./usr/X11R6/share/aclocal/xorg-macros.m4
 ./usr/X11R6/share/aclocal/xorg-server.m4
 ./var/db/xkb
 ./var/db/xkb/README.compiled
diff --git a/distrib/sets/lists/xserv/md.landisk b/distrib/sets/lists/xserv/md.landisk
index 44b6fd986..95590756c 100644
--- a/distrib/sets/lists/xserv/md.landisk
+++ b/distrib/sets/lists/xserv/md.landisk
@@ -3,6 +3,5 @@
 ./usr/X11R6/man/man1/Xephyr.1
 ./usr/X11R6/man/man3/XFree86-DGA.3
 ./usr/X11R6/man/man7/Xprint.7
-./usr/X11R6/share/aclocal/xorg-macros.m4
 ./var/db/xkb
 ./var/log
diff --git a/distrib/sets/lists/xserv/md.loongson b/distrib/sets/lists/xserv/md.loongson
index b1e918bdb..ec16e190c 100644
--- a/distrib/sets/lists/xserv/md.loongson
+++ b/distrib/sets/lists/xserv/md.loongson
@@ -212,7 +212,6 @@
 ./usr/X11R6/man/man4/wsfb.4
 ./usr/X11R6/man/man5/xorg.conf.5
 ./usr/X11R6/man/man7/Xprint.7
-./usr/X11R6/share/aclocal/xorg-macros.m4
 ./usr/X11R6/share/aclocal/xorg-server.m4
 ./var/db/xkb
 ./var/db/xkb/README.compiled
diff --git a/distrib/sets/lists/xserv/md.mac68k b/distrib/sets/lists/xserv/md.mac68k
index beed96981..3f8620fa5 100644
--- a/distrib/sets/lists/xserv/md.mac68k
+++ b/distrib/sets/lists/xserv/md.mac68k
@@ -250,7 +250,6 @@
 ./usr/X11R6/man/man4/wsfb.4
 ./usr/X11R6/man/man5/xorg.conf.5
 ./usr/X11R6/man/man7/Xprint.7
-./usr/X11R6/share/aclocal/xorg-macros.m4
 ./usr/X11R6/share/aclocal/xorg-server.m4
 ./var/db/xkb
 ./var/db/xkb/README.compiled
diff --git a/distrib/sets/lists/xserv/md.macppc b/distrib/sets/lists/xserv/md.macppc
index c3e572f18..dab75397b 100644
--- a/distrib/sets/lists/xserv/md.macppc
+++ b/distrib/sets/lists/xserv/md.macppc
@@ -259,7 +259,6 @@
 ./usr/X11R6/man/man4/wsudl.4
 ./usr/X11R6/man/man5/xorg.conf.5
 ./usr/X11R6/man/man7/Xprint.7
-./usr/X11R6/share/aclocal/xorg-macros.m4
 ./usr/X11R6/share/aclocal/xorg-server.m4
 ./var/db/xkb
 ./var/db/xkb/README.compiled
diff --git a/distrib/sets/lists/xserv/md.mvme68k b/distrib/sets/lists/xserv/md.mvme68k
index ab63ad075..9d27c3332 100644
--- a/distrib/sets/lists/xserv/md.mvme68k
+++ b/distrib/sets/lists/xserv/md.mvme68k
@@ -2,7 +2,6 @@
 ./usr/X11R6/bin/Xvfb
 ./usr/X11R6/include/xorg
 ./usr/X11R6/lib/libxkbui.so.4.0
-./usr/X11R6/lib/pkgconfig/xorg-server.pc
 ./usr/X11R6/man/man1/Xnest.1
 ./usr/X11R6/man/man1/Xserver.1
 ./usr/X11R6/man/man1/Xvfb.1
@@ -59,8 +58,6 @@
 ./usr/X11R6/man/man3/XF86VidModeValidateModeLine.3
 ./usr/X11R6/man/man3/XFree86-DGA.3
 ./usr/X11R6/man/man7/Xprint.7
-./usr/X11R6/share/aclocal/xorg-macros.m4
-./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.mvme88k b/distrib/sets/lists/xserv/md.mvme88k
index 08cae479a..f692ddcdb 100644
--- a/distrib/sets/lists/xserv/md.mvme88k
+++ b/distrib/sets/lists/xserv/md.mvme88k
@@ -5,7 +5,6 @@
 ./usr/X11R6/man/man1/Xnest.1
 ./usr/X11R6/man/man1/Xserver.1
 ./usr/X11R6/man/man1/Xvfb.1
-./usr/X11R6/share/aclocal/xorg-macros.m4
 ./usr/X11R6/share/aclocal/xorg-server.m4
 ./var/db/xkb
 ./var/db/xkb/README.compiled
diff --git a/distrib/sets/lists/xserv/md.sgi b/distrib/sets/lists/xserv/md.sgi
index f2f171c7b..e959009e8 100644
--- a/distrib/sets/lists/xserv/md.sgi
+++ b/distrib/sets/lists/xserv/md.sgi
@@ -208,7 +208,6 @@
 ./usr/X11R6/man/man4/wsfb.4
 ./usr/X11R6/man/man5/xorg.conf.5
 ./usr/X11R6/man/man7/Xprint.7
-./usr/X11R6/share/aclocal/xorg-macros.m4
 ./usr/X11R6/share/aclocal/xorg-server.m4
 ./var/db/xkb
 ./var/db/xkb/README.compiled
diff --git a/distrib/sets/lists/xserv/md.socppc b/distrib/sets/lists/xserv/md.socppc
index c25dae862..0bad0725b 100644
--- a/distrib/sets/lists/xserv/md.socppc
+++ b/distrib/sets/lists/xserv/md.socppc
@@ -213,7 +213,6 @@
 ./usr/X11R6/man/man4/wsfb.4
 ./usr/X11R6/man/man5/xorg.conf.5
 ./usr/X11R6/man/man7/Xprint.7
-./usr/X11R6/share/aclocal/xorg-macros.m4
 ./usr/X11R6/share/aclocal/xorg-server.m4
 ./var/db/xkb
 ./var/db/xkb/README.compiled
diff --git a/distrib/sets/lists/xserv/md.sparc b/distrib/sets/lists/xserv/md.sparc
index e02abd792..d2192569b 100644
--- a/distrib/sets/lists/xserv/md.sparc
+++ b/distrib/sets/lists/xserv/md.sparc
@@ -207,7 +207,6 @@
 ./usr/X11R6/man/man4/wsfb.4
 ./usr/X11R6/man/man5/xorg.conf.5
 ./usr/X11R6/man/man7/Xprint.7
-./usr/X11R6/share/aclocal/xorg-macros.m4
 ./usr/X11R6/share/aclocal/xorg-server.m4
 ./var/db/xkb
 ./var/db/xkb/README.compiled
diff --git a/distrib/sets/lists/xserv/md.sparc64 b/distrib/sets/lists/xserv/md.sparc64
index 041a6a417..0947b1f27 100644
--- a/distrib/sets/lists/xserv/md.sparc64
+++ b/distrib/sets/lists/xserv/md.sparc64
@@ -262,7 +262,6 @@
 ./usr/X11R6/man/man4/wsfb.4
 ./usr/X11R6/man/man5/xorg.conf.5
 ./usr/X11R6/man/man7/Xprint.7
-./usr/X11R6/share/aclocal/xorg-macros.m4
 ./usr/X11R6/share/aclocal/xorg-server.m4
 ./var/db/xkb
 ./var/db/xkb/README.compiled
diff --git a/distrib/sets/lists/xserv/md.zaurus b/distrib/sets/lists/xserv/md.zaurus
index c25dae862..0bad0725b 100644
--- a/distrib/sets/lists/xserv/md.zaurus
+++ b/distrib/sets/lists/xserv/md.zaurus
@@ -213,7 +213,6 @@
 ./usr/X11R6/man/man4/wsfb.4
 ./usr/X11R6/man/man5/xorg.conf.5
 ./usr/X11R6/man/man7/Xprint.7
-./usr/X11R6/share/aclocal/xorg-macros.m4
 ./usr/X11R6/share/aclocal/xorg-server.m4
 ./var/db/xkb
 ./var/db/xkb/README.compiled
diff --git a/distrib/sets/lists/xserv/mi b/distrib/sets/lists/xserv/mi
index 13f4c9263..88a6ea095 100644
--- a/distrib/sets/lists/xserv/mi
+++ b/distrib/sets/lists/xserv/mi
@@ -6,4 +6,5 @@
 ./usr/X11R6/lib/modules/input
 ./usr/X11R6/lib/modules/linux
 ./usr/X11R6/lib/modules/multimedia
+./usr/X11R6/share/aclocal/xorg-macros.m4
 ./var/db