From 0b44fd0ccd1e489e0f6b42e405cbbfa57f12c7a3 Mon Sep 17 00:00:00 2001
From: todd <todd@openbsd.org>
Date: Sat, 18 Aug 2012 21:05:25 +0000
Subject: [PATCH] sync

---
 distrib/sets/lists/xbase/md.alpha    | 4 ++--
 distrib/sets/lists/xbase/md.amd64    | 4 ++--
 distrib/sets/lists/xbase/md.armish   | 4 ++--
 distrib/sets/lists/xbase/md.hp300    | 4 ++--
 distrib/sets/lists/xbase/md.hppa     | 4 ++--
 distrib/sets/lists/xbase/md.i386     | 4 ++--
 distrib/sets/lists/xbase/md.landisk  | 2 +-
 distrib/sets/lists/xbase/md.loongson | 4 ++--
 distrib/sets/lists/xbase/md.macppc   | 4 ++--
 distrib/sets/lists/xbase/md.mvme68k  | 4 ++--
 distrib/sets/lists/xbase/md.sgi      | 4 ++--
 distrib/sets/lists/xbase/md.socppc   | 4 ++--
 distrib/sets/lists/xbase/md.sparc    | 4 ++--
 distrib/sets/lists/xbase/md.sparc64  | 4 ++--
 distrib/sets/lists/xbase/md.zaurus   | 4 ++--
 distrib/sets/lists/xserv/md.loongson | 2 ++
 distrib/sets/lists/xserv/md.sgi      | 2 ++
 17 files changed, 33 insertions(+), 29 deletions(-)

diff --git a/distrib/sets/lists/xbase/md.alpha b/distrib/sets/lists/xbase/md.alpha
index 69261fdb4..fc6fbe710 100644
--- a/distrib/sets/lists/xbase/md.alpha
+++ b/distrib/sets/lists/xbase/md.alpha
@@ -25,7 +25,7 @@
 ./usr/X11R6/include/xf86drmMode.h
 ./usr/X11R6/lib/libFS.so.9.0
 ./usr/X11R6/lib/libGL.a
-./usr/X11R6/lib/libGL.so.12.0
+./usr/X11R6/lib/libGL.so.13.0
 ./usr/X11R6/lib/libGLU.a
 ./usr/X11R6/lib/libGLU.so.7.0
 ./usr/X11R6/lib/libGLU_pic.a
@@ -77,7 +77,7 @@
 ./usr/X11R6/lib/libpciaccess.so.1.1
 ./usr/X11R6/lib/libpixman-1.a
 ./usr/X11R6/lib/libpixman-1.la
-./usr/X11R6/lib/libpixman-1.so.24.4
+./usr/X11R6/lib/libpixman-1.so.26.2
 ./usr/X11R6/lib/libpthread-stubs.so.1.0
 ./usr/X11R6/lib/libpthread-stubs_pic.a
 ./usr/X11R6/lib/libxcb-atom.so.1.0
diff --git a/distrib/sets/lists/xbase/md.amd64 b/distrib/sets/lists/xbase/md.amd64
index 0c02c4c72..3622c35f6 100644
--- a/distrib/sets/lists/xbase/md.amd64
+++ b/distrib/sets/lists/xbase/md.amd64
@@ -67,7 +67,7 @@
 ./usr/X11R6/include/xorg/xserver-properties.h
 ./usr/X11R6/lib/libFS.so.9.0
 ./usr/X11R6/lib/libGL.a
-./usr/X11R6/lib/libGL.so.12.0
+./usr/X11R6/lib/libGL.so.13.0
 ./usr/X11R6/lib/libGLU.a
 ./usr/X11R6/lib/libGLU.so.7.0
 ./usr/X11R6/lib/libGLU_pic.a
@@ -126,7 +126,7 @@
 ./usr/X11R6/lib/libpciaccess.so.1.1
 ./usr/X11R6/lib/libpixman-1.a
 ./usr/X11R6/lib/libpixman-1.la
-./usr/X11R6/lib/libpixman-1.so.24.4
+./usr/X11R6/lib/libpixman-1.so.26.2
 ./usr/X11R6/lib/libpthread-stubs.so.1.0
 ./usr/X11R6/lib/libpthread-stubs_pic.a
 ./usr/X11R6/lib/libxcb-atom.so.1.0
diff --git a/distrib/sets/lists/xbase/md.armish b/distrib/sets/lists/xbase/md.armish
index 5b3faf5d2..3c38896e1 100644
--- a/distrib/sets/lists/xbase/md.armish
+++ b/distrib/sets/lists/xbase/md.armish
@@ -63,7 +63,7 @@
 ./usr/X11R6/include/xorg/xserver-properties.h
 ./usr/X11R6/lib/libFS.so.9.0
 ./usr/X11R6/lib/libGL.a
-./usr/X11R6/lib/libGL.so.12.0
+./usr/X11R6/lib/libGL.so.13.0
 ./usr/X11R6/lib/libGLU.a
 ./usr/X11R6/lib/libGLU.so.7.0
 ./usr/X11R6/lib/libGLU_pic.a
@@ -115,7 +115,7 @@
 ./usr/X11R6/lib/libpciaccess.so.1.1
 ./usr/X11R6/lib/libpixman-1.a
 ./usr/X11R6/lib/libpixman-1.la
-./usr/X11R6/lib/libpixman-1.so.24.4
+./usr/X11R6/lib/libpixman-1.so.26.2
 ./usr/X11R6/lib/libpthread-stubs.so.1.0
 ./usr/X11R6/lib/libpthread-stubs_pic.a
 ./usr/X11R6/lib/libxcb-atom.so.1.0
diff --git a/distrib/sets/lists/xbase/md.hp300 b/distrib/sets/lists/xbase/md.hp300
index b80961e41..55599e3b1 100644
--- a/distrib/sets/lists/xbase/md.hp300
+++ b/distrib/sets/lists/xbase/md.hp300
@@ -46,7 +46,7 @@
 ./usr/X11R6/include/xorg/xserver-properties.h
 ./usr/X11R6/lib/libFS.so.9.0
 ./usr/X11R6/lib/libGL.a
-./usr/X11R6/lib/libGL.so.12.0
+./usr/X11R6/lib/libGL.so.13.0
 ./usr/X11R6/lib/libGLU.a
 ./usr/X11R6/lib/libGLU.so.7.0
 ./usr/X11R6/lib/libGLU_pic.a
@@ -96,7 +96,7 @@
 ./usr/X11R6/lib/libpciaccess.so.1.1
 ./usr/X11R6/lib/libpixman-1.a
 ./usr/X11R6/lib/libpixman-1.la
-./usr/X11R6/lib/libpixman-1.so.24.4
+./usr/X11R6/lib/libpixman-1.so.26.2
 ./usr/X11R6/lib/libpthread-stubs.so.1.0
 ./usr/X11R6/lib/libpthread-stubs_pic.a
 ./usr/X11R6/lib/libxcb-atom.so.1.0
diff --git a/distrib/sets/lists/xbase/md.hppa b/distrib/sets/lists/xbase/md.hppa
index 36d6191f7..8f382ca3c 100644
--- a/distrib/sets/lists/xbase/md.hppa
+++ b/distrib/sets/lists/xbase/md.hppa
@@ -26,7 +26,7 @@
 ./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
+./usr/X11R6/lib/libGL.so.13.0
 ./usr/X11R6/lib/libGLU.a
 ./usr/X11R6/lib/libGLU.so.7.0
 ./usr/X11R6/lib/libGLU_pic.a
@@ -78,7 +78,7 @@
 ./usr/X11R6/lib/libpciaccess.so.1.1
 ./usr/X11R6/lib/libpixman-1.a
 ./usr/X11R6/lib/libpixman-1.la
-./usr/X11R6/lib/libpixman-1.so.24.4
+./usr/X11R6/lib/libpixman-1.so.26.2
 ./usr/X11R6/lib/libpthread-stubs.so.1.0
 ./usr/X11R6/lib/libpthread-stubs_pic.a
 ./usr/X11R6/lib/libxcb-atom.so.1.0
diff --git a/distrib/sets/lists/xbase/md.i386 b/distrib/sets/lists/xbase/md.i386
index f6e146413..91d826bdd 100644
--- a/distrib/sets/lists/xbase/md.i386
+++ b/distrib/sets/lists/xbase/md.i386
@@ -67,7 +67,7 @@
 ./usr/X11R6/include/xorg/xserver-properties.h
 ./usr/X11R6/lib/libFS.so.9.0
 ./usr/X11R6/lib/libGL.a
-./usr/X11R6/lib/libGL.so.12.0
+./usr/X11R6/lib/libGL.so.13.0
 ./usr/X11R6/lib/libGLU.a
 ./usr/X11R6/lib/libGLU.so.7.0
 ./usr/X11R6/lib/libGLU_pic.a
@@ -126,7 +126,7 @@
 ./usr/X11R6/lib/libpciaccess.so.1.1
 ./usr/X11R6/lib/libpixman-1.a
 ./usr/X11R6/lib/libpixman-1.la
-./usr/X11R6/lib/libpixman-1.so.24.4
+./usr/X11R6/lib/libpixman-1.so.26.2
 ./usr/X11R6/lib/libpthread-stubs.so.1.0
 ./usr/X11R6/lib/libpthread-stubs_pic.a
 ./usr/X11R6/lib/libxcb-atom.so.1.0
diff --git a/distrib/sets/lists/xbase/md.landisk b/distrib/sets/lists/xbase/md.landisk
index dcdc885af..1a9c1edb7 100644
--- a/distrib/sets/lists/xbase/md.landisk
+++ b/distrib/sets/lists/xbase/md.landisk
@@ -24,7 +24,7 @@
 ./usr/X11R6/include/xorg
 ./usr/X11R6/lib/libFS.so.9.0
 ./usr/X11R6/lib/libGL.a
-./usr/X11R6/lib/libGL.so.12.0
+./usr/X11R6/lib/libGL.so.13.0
 ./usr/X11R6/lib/libGLU.a
 ./usr/X11R6/lib/libGLU.so.7.0
 ./usr/X11R6/lib/libGLU_pic.a
diff --git a/distrib/sets/lists/xbase/md.loongson b/distrib/sets/lists/xbase/md.loongson
index ed43afebb..6356b2958 100644
--- a/distrib/sets/lists/xbase/md.loongson
+++ b/distrib/sets/lists/xbase/md.loongson
@@ -64,7 +64,7 @@
 ./usr/X11R6/include/xorg/xserver-properties.h
 ./usr/X11R6/lib/libFS.so.9.0
 ./usr/X11R6/lib/libGL.a
-./usr/X11R6/lib/libGL.so.12.0
+./usr/X11R6/lib/libGL.so.13.0
 ./usr/X11R6/lib/libGLU.a
 ./usr/X11R6/lib/libGLU.so.7.0
 ./usr/X11R6/lib/libGLw.a
@@ -111,7 +111,7 @@
 ./usr/X11R6/lib/libpciaccess.so.1.1
 ./usr/X11R6/lib/libpixman-1.a
 ./usr/X11R6/lib/libpixman-1.la
-./usr/X11R6/lib/libpixman-1.so.24.4
+./usr/X11R6/lib/libpixman-1.so.26.2
 ./usr/X11R6/lib/libpthread-stubs.so.1.0
 ./usr/X11R6/lib/libxcb-atom.so.1.0
 ./usr/X11R6/lib/libxcb-aux.so.0.0
diff --git a/distrib/sets/lists/xbase/md.macppc b/distrib/sets/lists/xbase/md.macppc
index f50d7eaa0..7ab8880b6 100644
--- a/distrib/sets/lists/xbase/md.macppc
+++ b/distrib/sets/lists/xbase/md.macppc
@@ -64,7 +64,7 @@
 ./usr/X11R6/include/xorg/xserver-properties.h
 ./usr/X11R6/lib/libFS.so.9.0
 ./usr/X11R6/lib/libGL.a
-./usr/X11R6/lib/libGL.so.12.0
+./usr/X11R6/lib/libGL.so.13.0
 ./usr/X11R6/lib/libGLU.a
 ./usr/X11R6/lib/libGLU.so.7.0
 ./usr/X11R6/lib/libGLU_pic.a
@@ -116,7 +116,7 @@
 ./usr/X11R6/lib/libpciaccess.so.1.1
 ./usr/X11R6/lib/libpixman-1.a
 ./usr/X11R6/lib/libpixman-1.la
-./usr/X11R6/lib/libpixman-1.so.24.4
+./usr/X11R6/lib/libpixman-1.so.26.2
 ./usr/X11R6/lib/libpthread-stubs.so.1.0
 ./usr/X11R6/lib/libpthread-stubs_pic.a
 ./usr/X11R6/lib/libxcb-atom.so.1.0
diff --git a/distrib/sets/lists/xbase/md.mvme68k b/distrib/sets/lists/xbase/md.mvme68k
index 8884df801..b17872884 100644
--- a/distrib/sets/lists/xbase/md.mvme68k
+++ b/distrib/sets/lists/xbase/md.mvme68k
@@ -27,7 +27,7 @@
 ./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
+./usr/X11R6/lib/libGL.so.13.0
 ./usr/X11R6/lib/libGLU.a
 ./usr/X11R6/lib/libGLU.so.7.0
 ./usr/X11R6/lib/libGLU_pic.a
@@ -79,7 +79,7 @@
 ./usr/X11R6/lib/libpciaccess.so.1.1
 ./usr/X11R6/lib/libpixman-1.a
 ./usr/X11R6/lib/libpixman-1.la
-./usr/X11R6/lib/libpixman-1.so.24.4
+./usr/X11R6/lib/libpixman-1.so.26.2
 ./usr/X11R6/lib/libpthread-stubs.so.1.0
 ./usr/X11R6/lib/libpthread-stubs_pic.a
 ./usr/X11R6/lib/libxcb-atom.so.1.0
diff --git a/distrib/sets/lists/xbase/md.sgi b/distrib/sets/lists/xbase/md.sgi
index 42e0ec4ea..a9247ed9a 100644
--- a/distrib/sets/lists/xbase/md.sgi
+++ b/distrib/sets/lists/xbase/md.sgi
@@ -64,7 +64,7 @@
 ./usr/X11R6/include/xorg/xserver-properties.h
 ./usr/X11R6/lib/libFS.so.9.0
 ./usr/X11R6/lib/libGL.a
-./usr/X11R6/lib/libGL.so.12.0
+./usr/X11R6/lib/libGL.so.13.0
 ./usr/X11R6/lib/libGLU.a
 ./usr/X11R6/lib/libGLU.so.7.0
 ./usr/X11R6/lib/libGLw.a
@@ -111,7 +111,7 @@
 ./usr/X11R6/lib/libpciaccess.so.1.1
 ./usr/X11R6/lib/libpixman-1.a
 ./usr/X11R6/lib/libpixman-1.la
-./usr/X11R6/lib/libpixman-1.so.24.4
+./usr/X11R6/lib/libpixman-1.so.26.2
 ./usr/X11R6/lib/libpthread-stubs.so.1.0
 ./usr/X11R6/lib/libxcb-atom.so.1.0
 ./usr/X11R6/lib/libxcb-aux.so.0.0
diff --git a/distrib/sets/lists/xbase/md.socppc b/distrib/sets/lists/xbase/md.socppc
index 0a1342103..c13c9d644 100644
--- a/distrib/sets/lists/xbase/md.socppc
+++ b/distrib/sets/lists/xbase/md.socppc
@@ -63,7 +63,7 @@
 ./usr/X11R6/include/xorg/xserver-properties.h
 ./usr/X11R6/lib/libFS.so.9.0
 ./usr/X11R6/lib/libGL.a
-./usr/X11R6/lib/libGL.so.12.0
+./usr/X11R6/lib/libGL.so.13.0
 ./usr/X11R6/lib/libGLU.a
 ./usr/X11R6/lib/libGLU.so.7.0
 ./usr/X11R6/lib/libGLU_pic.a
@@ -115,7 +115,7 @@
 ./usr/X11R6/lib/libpciaccess.so.1.1
 ./usr/X11R6/lib/libpixman-1.a
 ./usr/X11R6/lib/libpixman-1.la
-./usr/X11R6/lib/libpixman-1.so.24.4
+./usr/X11R6/lib/libpixman-1.so.26.2
 ./usr/X11R6/lib/libpthread-stubs.so.1.0
 ./usr/X11R6/lib/libpthread-stubs_pic.a
 ./usr/X11R6/lib/libxcb-atom.so.1.0
diff --git a/distrib/sets/lists/xbase/md.sparc b/distrib/sets/lists/xbase/md.sparc
index 0a1342103..c13c9d644 100644
--- a/distrib/sets/lists/xbase/md.sparc
+++ b/distrib/sets/lists/xbase/md.sparc
@@ -63,7 +63,7 @@
 ./usr/X11R6/include/xorg/xserver-properties.h
 ./usr/X11R6/lib/libFS.so.9.0
 ./usr/X11R6/lib/libGL.a
-./usr/X11R6/lib/libGL.so.12.0
+./usr/X11R6/lib/libGL.so.13.0
 ./usr/X11R6/lib/libGLU.a
 ./usr/X11R6/lib/libGLU.so.7.0
 ./usr/X11R6/lib/libGLU_pic.a
@@ -115,7 +115,7 @@
 ./usr/X11R6/lib/libpciaccess.so.1.1
 ./usr/X11R6/lib/libpixman-1.a
 ./usr/X11R6/lib/libpixman-1.la
-./usr/X11R6/lib/libpixman-1.so.24.4
+./usr/X11R6/lib/libpixman-1.so.26.2
 ./usr/X11R6/lib/libpthread-stubs.so.1.0
 ./usr/X11R6/lib/libpthread-stubs_pic.a
 ./usr/X11R6/lib/libxcb-atom.so.1.0
diff --git a/distrib/sets/lists/xbase/md.sparc64 b/distrib/sets/lists/xbase/md.sparc64
index 6edf1be3b..19ce4dfaa 100644
--- a/distrib/sets/lists/xbase/md.sparc64
+++ b/distrib/sets/lists/xbase/md.sparc64
@@ -64,7 +64,7 @@
 ./usr/X11R6/include/xorg/xserver-properties.h
 ./usr/X11R6/lib/libFS.so.9.0
 ./usr/X11R6/lib/libGL.a
-./usr/X11R6/lib/libGL.so.12.0
+./usr/X11R6/lib/libGL.so.13.0
 ./usr/X11R6/lib/libGLU.a
 ./usr/X11R6/lib/libGLU.so.7.0
 ./usr/X11R6/lib/libGLU_pic.a
@@ -116,7 +116,7 @@
 ./usr/X11R6/lib/libpciaccess.so.1.1
 ./usr/X11R6/lib/libpixman-1.a
 ./usr/X11R6/lib/libpixman-1.la
-./usr/X11R6/lib/libpixman-1.so.24.4
+./usr/X11R6/lib/libpixman-1.so.26.2
 ./usr/X11R6/lib/libpthread-stubs.so.1.0
 ./usr/X11R6/lib/libpthread-stubs_pic.a
 ./usr/X11R6/lib/libxcb-atom.so.1.0
diff --git a/distrib/sets/lists/xbase/md.zaurus b/distrib/sets/lists/xbase/md.zaurus
index 5b3faf5d2..3c38896e1 100644
--- a/distrib/sets/lists/xbase/md.zaurus
+++ b/distrib/sets/lists/xbase/md.zaurus
@@ -63,7 +63,7 @@
 ./usr/X11R6/include/xorg/xserver-properties.h
 ./usr/X11R6/lib/libFS.so.9.0
 ./usr/X11R6/lib/libGL.a
-./usr/X11R6/lib/libGL.so.12.0
+./usr/X11R6/lib/libGL.so.13.0
 ./usr/X11R6/lib/libGLU.a
 ./usr/X11R6/lib/libGLU.so.7.0
 ./usr/X11R6/lib/libGLU_pic.a
@@ -115,7 +115,7 @@
 ./usr/X11R6/lib/libpciaccess.so.1.1
 ./usr/X11R6/lib/libpixman-1.a
 ./usr/X11R6/lib/libpixman-1.la
-./usr/X11R6/lib/libpixman-1.so.24.4
+./usr/X11R6/lib/libpixman-1.so.26.2
 ./usr/X11R6/lib/libpthread-stubs.so.1.0
 ./usr/X11R6/lib/libpthread-stubs_pic.a
 ./usr/X11R6/lib/libxcb-atom.so.1.0
diff --git a/distrib/sets/lists/xserv/md.loongson b/distrib/sets/lists/xserv/md.loongson
index 639cb7494..a5c6e8391 100644
--- a/distrib/sets/lists/xserv/md.loongson
+++ b/distrib/sets/lists/xserv/md.loongson
@@ -107,6 +107,7 @@
 ./usr/X11R6/include/xorg/xaarop.h
 ./usr/X11R6/include/xorg/xace.h
 ./usr/X11R6/include/xorg/xacestr.h
+./usr/X11R6/include/xorg/xf86-mouse-properties.h
 ./usr/X11R6/include/xorg/xf86.h
 ./usr/X11R6/include/xorg/xf86Cursor.h
 ./usr/X11R6/include/xorg/xf86DDC.h
@@ -193,6 +194,7 @@
 ./usr/X11R6/lib/modules/multimedia/tda9885_drv.so
 ./usr/X11R6/lib/modules/multimedia/uda1380_drv.la
 ./usr/X11R6/lib/modules/multimedia/uda1380_drv.so
+./usr/X11R6/lib/pkgconfig/xorg-mouse.pc
 ./usr/X11R6/lib/pkgconfig/xorg-server.pc
 ./usr/X11R6/man/man1/Xephyr.1
 ./usr/X11R6/man/man1/Xnest.1
diff --git a/distrib/sets/lists/xserv/md.sgi b/distrib/sets/lists/xserv/md.sgi
index 98b3d86a1..c0792abbb 100644
--- a/distrib/sets/lists/xserv/md.sgi
+++ b/distrib/sets/lists/xserv/md.sgi
@@ -105,6 +105,7 @@
 ./usr/X11R6/include/xorg/xaarop.h
 ./usr/X11R6/include/xorg/xace.h
 ./usr/X11R6/include/xorg/xacestr.h
+./usr/X11R6/include/xorg/xf86-mouse-properties.h
 ./usr/X11R6/include/xorg/xf86.h
 ./usr/X11R6/include/xorg/xf86Cursor.h
 ./usr/X11R6/include/xorg/xf86DDC.h
@@ -191,6 +192,7 @@
 ./usr/X11R6/lib/modules/multimedia/tda9885_drv.so
 ./usr/X11R6/lib/modules/multimedia/uda1380_drv.la
 ./usr/X11R6/lib/modules/multimedia/uda1380_drv.so
+./usr/X11R6/lib/pkgconfig/xorg-mouse.pc
 ./usr/X11R6/lib/pkgconfig/xorg-server.pc
 ./usr/X11R6/man/man1/Xephyr.1
 ./usr/X11R6/man/man1/Xnest.1