sync

17 files changed, 32 insertions, 2 deletions

diff --git a/distrib/sets/lists/xbase/md.amd64 b/distrib/sets/lists/xbase/md.amd64
index d205c6790..bbbefa925 100644
--- a/distrib/sets/lists/xbase/md.amd64
+++ b/distrib/sets/lists/xbase/md.amd64
@@ -39,6 +39,7 @@
 ./usr/X11R6/include/xorg/joystick-properties.h
 ./usr/X11R6/include/xorg/list.h
 ./usr/X11R6/include/xorg/mioverlay.h
+./usr/X11R6/include/xorg/optionstr.h
 ./usr/X11R6/include/xorg/panoramiX.h
 ./usr/X11R6/include/xorg/panoramiXsrv.h
 ./usr/X11R6/include/xorg/privates.h
@@ -52,6 +53,7 @@
 ./usr/X11R6/include/xorg/ws-properties.h
 ./usr/X11R6/include/xorg/xf86Crtc.h
 ./usr/X11R6/include/xorg/xf86Modes.h
+./usr/X11R6/include/xorg/xf86Optionstr.h
 ./usr/X11R6/include/xorg/xf86Optrec.h
 ./usr/X11R6/include/xorg/xf86Parser.h
 ./usr/X11R6/include/xorg/xf86RandR12.h
diff --git a/distrib/sets/lists/xbase/md.armish b/distrib/sets/lists/xbase/md.armish
index d634caf99..d01f6fa3f 100644
--- a/distrib/sets/lists/xbase/md.armish
+++ b/distrib/sets/lists/xbase/md.armish
@@ -35,6 +35,7 @@
 ./usr/X11R6/include/xorg/hotplug.h
 ./usr/X11R6/include/xorg/list.h
 ./usr/X11R6/include/xorg/mioverlay.h
+./usr/X11R6/include/xorg/optionstr.h
 ./usr/X11R6/include/xorg/panoramiX.h
 ./usr/X11R6/include/xorg/panoramiXsrv.h
 ./usr/X11R6/include/xorg/privates.h
@@ -48,6 +49,7 @@
 ./usr/X11R6/include/xorg/ws-properties.h
 ./usr/X11R6/include/xorg/xf86Crtc.h
 ./usr/X11R6/include/xorg/xf86Modes.h
+./usr/X11R6/include/xorg/xf86Optionstr.h
 ./usr/X11R6/include/xorg/xf86Optrec.h
 ./usr/X11R6/include/xorg/xf86Parser.h
 ./usr/X11R6/include/xorg/xf86RandR12.h
diff --git a/distrib/sets/lists/xbase/md.hp300 b/distrib/sets/lists/xbase/md.hp300
index 173251ac2..6739bc9e1 100644
--- a/distrib/sets/lists/xbase/md.hp300
+++ b/distrib/sets/lists/xbase/md.hp300
@@ -27,6 +27,7 @@
 ./usr/X11R6/include/xorg/joystick-properties.h
 ./usr/X11R6/include/xorg/list.h
 ./usr/X11R6/include/xorg/mioverlay.h
+./usr/X11R6/include/xorg/optionstr.h
 ./usr/X11R6/include/xorg/panoramiX.h
 ./usr/X11R6/include/xorg/panoramiXsrv.h
 ./usr/X11R6/include/xorg/privates.h
@@ -36,6 +37,7 @@
 ./usr/X11R6/include/xorg/shmint.h
 ./usr/X11R6/include/xorg/vidmodeproc.h
 ./usr/X11R6/include/xorg/ws-properties.h
+./usr/X11R6/include/xorg/xf86Optionstr.h
 ./usr/X11R6/include/xorg/xf86VGAarbiter.h
 ./usr/X11R6/include/xorg/xfixes.h
 ./usr/X11R6/include/xorg/xkbfile.h
diff --git a/distrib/sets/lists/xbase/md.hppa b/distrib/sets/lists/xbase/md.hppa
index c8e0ea0f9..be9d8c20d 100644
--- a/distrib/sets/lists/xbase/md.hppa
+++ b/distrib/sets/lists/xbase/md.hppa
@@ -22,6 +22,8 @@
 ./usr/X11R6/include/pixman-1/pixman.h
 ./usr/X11R6/include/xf86drm.h
 ./usr/X11R6/include/xf86drmMode.h
+./usr/X11R6/include/xorg/optionstr.h
+./usr/X11R6/include/xorg/xf86Optionstr.h
 ./usr/X11R6/lib/libFS.so.9.0
 ./usr/X11R6/lib/libGL.a
 ./usr/X11R6/lib/libGL.so.12.0
diff --git a/distrib/sets/lists/xbase/md.i386 b/distrib/sets/lists/xbase/md.i386
index 37a9a50fe..3a7a7dcf9 100644
--- a/distrib/sets/lists/xbase/md.i386
+++ b/distrib/sets/lists/xbase/md.i386
@@ -39,6 +39,7 @@
 ./usr/X11R6/include/xorg/joystick-properties.h
 ./usr/X11R6/include/xorg/list.h
 ./usr/X11R6/include/xorg/mioverlay.h
+./usr/X11R6/include/xorg/optionstr.h
 ./usr/X11R6/include/xorg/panoramiX.h
 ./usr/X11R6/include/xorg/panoramiXsrv.h
 ./usr/X11R6/include/xorg/privates.h
@@ -52,6 +53,7 @@
 ./usr/X11R6/include/xorg/ws-properties.h
 ./usr/X11R6/include/xorg/xf86Crtc.h
 ./usr/X11R6/include/xorg/xf86Modes.h
+./usr/X11R6/include/xorg/xf86Optionstr.h
 ./usr/X11R6/include/xorg/xf86Optrec.h
 ./usr/X11R6/include/xorg/xf86Parser.h
 ./usr/X11R6/include/xorg/xf86RandR12.h
diff --git a/distrib/sets/lists/xbase/md.landisk b/distrib/sets/lists/xbase/md.landisk
index 483f78291..c5387a824 100644
--- a/distrib/sets/lists/xbase/md.landisk
+++ b/distrib/sets/lists/xbase/md.landisk
@@ -22,6 +22,8 @@
 ./usr/X11R6/include/xf86drm.h
 ./usr/X11R6/include/xf86drmMode.h
 ./usr/X11R6/include/xorg
+./usr/X11R6/include/xorg/optionstr.h
+./usr/X11R6/include/xorg/xf86Optionstr.h
 ./usr/X11R6/lib/libFS.so.9.0
 ./usr/X11R6/lib/libGL.a
 ./usr/X11R6/lib/libGL.so.12.0
diff --git a/distrib/sets/lists/xbase/md.loongson b/distrib/sets/lists/xbase/md.loongson
index e60d3f683..4ed24b8d1 100644
--- a/distrib/sets/lists/xbase/md.loongson
+++ b/distrib/sets/lists/xbase/md.loongson
@@ -36,6 +36,7 @@
 ./usr/X11R6/include/xorg/hotplug.h
 ./usr/X11R6/include/xorg/list.h
 ./usr/X11R6/include/xorg/mioverlay.h
+./usr/X11R6/include/xorg/optionstr.h
 ./usr/X11R6/include/xorg/panoramiX.h
 ./usr/X11R6/include/xorg/panoramiXsrv.h
 ./usr/X11R6/include/xorg/privates.h
@@ -49,6 +50,7 @@
 ./usr/X11R6/include/xorg/ws-properties.h
 ./usr/X11R6/include/xorg/xf86Crtc.h
 ./usr/X11R6/include/xorg/xf86Modes.h
+./usr/X11R6/include/xorg/xf86Optionstr.h
 ./usr/X11R6/include/xorg/xf86Optrec.h
 ./usr/X11R6/include/xorg/xf86Parser.h
 ./usr/X11R6/include/xorg/xf86RandR12.h
diff --git a/distrib/sets/lists/xbase/md.macppc b/distrib/sets/lists/xbase/md.macppc
index af59516bf..3dcc24294 100644
--- a/distrib/sets/lists/xbase/md.macppc
+++ b/distrib/sets/lists/xbase/md.macppc
@@ -36,6 +36,7 @@
 ./usr/X11R6/include/xorg/joystick-properties.h
 ./usr/X11R6/include/xorg/list.h
 ./usr/X11R6/include/xorg/mioverlay.h
+./usr/X11R6/include/xorg/optionstr.h
 ./usr/X11R6/include/xorg/panoramiX.h
 ./usr/X11R6/include/xorg/panoramiXsrv.h
 ./usr/X11R6/include/xorg/privates.h
@@ -49,6 +50,7 @@
 ./usr/X11R6/include/xorg/ws-properties.h
 ./usr/X11R6/include/xorg/xf86Crtc.h
 ./usr/X11R6/include/xorg/xf86Modes.h
+./usr/X11R6/include/xorg/xf86Optionstr.h
 ./usr/X11R6/include/xorg/xf86Optrec.h
 ./usr/X11R6/include/xorg/xf86Parser.h
 ./usr/X11R6/include/xorg/xf86RandR12.h
diff --git a/distrib/sets/lists/xbase/md.mvme68k b/distrib/sets/lists/xbase/md.mvme68k
index 6aab48128..e91ee556a 100644
--- a/distrib/sets/lists/xbase/md.mvme68k
+++ b/distrib/sets/lists/xbase/md.mvme68k
@@ -23,6 +23,8 @@
 ./usr/X11R6/include/pixman-1/pixman.h
 ./usr/X11R6/include/xf86drm.h
 ./usr/X11R6/include/xf86drmMode.h
+./usr/X11R6/include/xorg/optionstr.h
+./usr/X11R6/include/xorg/xf86Optionstr.h
 ./usr/X11R6/lib/libFS.so.9.0
 ./usr/X11R6/lib/libGL.a
 ./usr/X11R6/lib/libGL.so.12.0
diff --git a/distrib/sets/lists/xbase/md.mvme88k b/distrib/sets/lists/xbase/md.mvme88k
index 3548d20a1..44110c713 100644
--- a/distrib/sets/lists/xbase/md.mvme88k
+++ b/distrib/sets/lists/xbase/md.mvme88k
@@ -1,4 +1,6 @@
 ./usr/X11R6/bin/ucs2any
+./usr/X11R6/include/xorg/optionstr.h
+./usr/X11R6/include/xorg/xf86Optionstr.h
 ./usr/X11R6/man/man1/bdftruncate.1
 ./usr/X11R6/man/man1/dga.1
 ./usr/X11R6/man/man1/ucs2any.1
diff --git a/distrib/sets/lists/xbase/md.sgi b/distrib/sets/lists/xbase/md.sgi
index e59479142..689a52c24 100644
--- a/distrib/sets/lists/xbase/md.sgi
+++ b/distrib/sets/lists/xbase/md.sgi
@@ -36,6 +36,7 @@
 ./usr/X11R6/include/xorg/hotplug.h
 ./usr/X11R6/include/xorg/list.h
 ./usr/X11R6/include/xorg/mioverlay.h
+./usr/X11R6/include/xorg/optionstr.h
 ./usr/X11R6/include/xorg/panoramiX.h
 ./usr/X11R6/include/xorg/panoramiXsrv.h
 ./usr/X11R6/include/xorg/privates.h
@@ -49,6 +50,7 @@
 ./usr/X11R6/include/xorg/ws-properties.h
 ./usr/X11R6/include/xorg/xf86Crtc.h
 ./usr/X11R6/include/xorg/xf86Modes.h
+./usr/X11R6/include/xorg/xf86Optionstr.h
 ./usr/X11R6/include/xorg/xf86Optrec.h
 ./usr/X11R6/include/xorg/xf86Parser.h
 ./usr/X11R6/include/xorg/xf86RandR12.h
diff --git a/distrib/sets/lists/xbase/md.socppc b/distrib/sets/lists/xbase/md.socppc
index 18e502360..2117d6f75 100644
--- a/distrib/sets/lists/xbase/md.socppc
+++ b/distrib/sets/lists/xbase/md.socppc
@@ -35,6 +35,7 @@
 ./usr/X11R6/include/xorg/hotplug.h
 ./usr/X11R6/include/xorg/list.h
 ./usr/X11R6/include/xorg/mioverlay.h
+./usr/X11R6/include/xorg/optionstr.h
 ./usr/X11R6/include/xorg/panoramiX.h
 ./usr/X11R6/include/xorg/panoramiXsrv.h
 ./usr/X11R6/include/xorg/privates.h
@@ -48,6 +49,7 @@
 ./usr/X11R6/include/xorg/ws-properties.h
 ./usr/X11R6/include/xorg/xf86Crtc.h
 ./usr/X11R6/include/xorg/xf86Modes.h
+./usr/X11R6/include/xorg/xf86Optionstr.h
 ./usr/X11R6/include/xorg/xf86Optrec.h
 ./usr/X11R6/include/xorg/xf86Parser.h
 ./usr/X11R6/include/xorg/xf86RandR12.h
diff --git a/distrib/sets/lists/xbase/md.sparc b/distrib/sets/lists/xbase/md.sparc
index 18e502360..2117d6f75 100644
--- a/distrib/sets/lists/xbase/md.sparc
+++ b/distrib/sets/lists/xbase/md.sparc
@@ -35,6 +35,7 @@
 ./usr/X11R6/include/xorg/hotplug.h
 ./usr/X11R6/include/xorg/list.h
 ./usr/X11R6/include/xorg/mioverlay.h
+./usr/X11R6/include/xorg/optionstr.h
 ./usr/X11R6/include/xorg/panoramiX.h
 ./usr/X11R6/include/xorg/panoramiXsrv.h
 ./usr/X11R6/include/xorg/privates.h
@@ -48,6 +49,7 @@
 ./usr/X11R6/include/xorg/ws-properties.h
 ./usr/X11R6/include/xorg/xf86Crtc.h
 ./usr/X11R6/include/xorg/xf86Modes.h
+./usr/X11R6/include/xorg/xf86Optionstr.h
 ./usr/X11R6/include/xorg/xf86Optrec.h
 ./usr/X11R6/include/xorg/xf86Parser.h
 ./usr/X11R6/include/xorg/xf86RandR12.h
diff --git a/distrib/sets/lists/xbase/md.sparc64 b/distrib/sets/lists/xbase/md.sparc64
index 55daa4f36..806409968 100644
--- a/distrib/sets/lists/xbase/md.sparc64
+++ b/distrib/sets/lists/xbase/md.sparc64
@@ -36,6 +36,7 @@
 ./usr/X11R6/include/xorg/joystick-properties.h
 ./usr/X11R6/include/xorg/list.h
 ./usr/X11R6/include/xorg/mioverlay.h
+./usr/X11R6/include/xorg/optionstr.h
 ./usr/X11R6/include/xorg/panoramiX.h
 ./usr/X11R6/include/xorg/panoramiXsrv.h
 ./usr/X11R6/include/xorg/privates.h
@@ -49,6 +50,7 @@
 ./usr/X11R6/include/xorg/ws-properties.h
 ./usr/X11R6/include/xorg/xf86Crtc.h
 ./usr/X11R6/include/xorg/xf86Modes.h
+./usr/X11R6/include/xorg/xf86Optionstr.h
 ./usr/X11R6/include/xorg/xf86Optrec.h
 ./usr/X11R6/include/xorg/xf86Parser.h
 ./usr/X11R6/include/xorg/xf86RandR12.h
diff --git a/distrib/sets/lists/xbase/md.vax b/distrib/sets/lists/xbase/md.vax
index 2f041d9a7..5583c63ef 100644
--- a/distrib/sets/lists/xbase/md.vax
+++ b/distrib/sets/lists/xbase/md.vax
@@ -1,5 +1,7 @@
 ./usr/X11R6/bin/ucs2any
 ./usr/X11R6/include/xorg
+./usr/X11R6/include/xorg/optionstr.h
+./usr/X11R6/include/xorg/xf86Optionstr.h
 ./usr/X11R6/man/man1/bdftruncate.1
 ./usr/X11R6/man/man1/dga.1
 ./usr/X11R6/man/man1/ucs2any.1
diff --git a/distrib/sets/lists/xbase/md.zaurus b/distrib/sets/lists/xbase/md.zaurus
index d634caf99..d01f6fa3f 100644
--- a/distrib/sets/lists/xbase/md.zaurus
+++ b/distrib/sets/lists/xbase/md.zaurus
@@ -35,6 +35,7 @@
 ./usr/X11R6/include/xorg/hotplug.h
 ./usr/X11R6/include/xorg/list.h
 ./usr/X11R6/include/xorg/mioverlay.h
+./usr/X11R6/include/xorg/optionstr.h
 ./usr/X11R6/include/xorg/panoramiX.h
 ./usr/X11R6/include/xorg/panoramiXsrv.h
 ./usr/X11R6/include/xorg/privates.h
@@ -48,6 +49,7 @@
 ./usr/X11R6/include/xorg/ws-properties.h
 ./usr/X11R6/include/xorg/xf86Crtc.h
 ./usr/X11R6/include/xorg/xf86Modes.h
+./usr/X11R6/include/xorg/xf86Optionstr.h
 ./usr/X11R6/include/xorg/xf86Optrec.h
 ./usr/X11R6/include/xorg/xf86Parser.h
 ./usr/X11R6/include/xorg/xf86RandR12.h
diff --git a/distrib/sets/lists/xshare/mi b/distrib/sets/lists/xshare/mi
index 1dffd976a..1915b1faf 100644
--- a/distrib/sets/lists/xshare/mi
+++ b/distrib/sets/lists/xshare/mi
@@ -727,8 +727,6 @@
 ./usr/X11R6/include/xcb/xtest.h
 ./usr/X11R6/include/xcb/xv.h
 ./usr/X11R6/include/xcb/xvmc.h
-./usr/X11R6/include/xorg/optionstr.h
-./usr/X11R6/include/xorg/xf86Optionstr.h
 ./usr/X11R6/lib/X11/config
 ./usr/X11R6/lib/X11/config/Amoeba.cf
 ./usr/X11R6/lib/X11/config/DGUX.cf