summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTodd T. Fries <todd@cvs.openbsd.org>2011-07-25 00:19:20 +0000
committerTodd T. Fries <todd@cvs.openbsd.org>2011-07-25 00:19:20 +0000
commit89a5fb36a75d68721ebff0415975c16f41422a2a (patch)
treec0457d3a31406499117c09f063e974bf56b6fac4
parente67a15b97c510d48e9ae5de9c7721cd50ea32829 (diff)
sync
-rw-r--r--distrib/sets/lists/xbase/md.alpha2
-rw-r--r--distrib/sets/lists/xbase/md.amd642
-rw-r--r--distrib/sets/lists/xbase/md.armish2
-rw-r--r--distrib/sets/lists/xbase/md.hp3002
-rw-r--r--distrib/sets/lists/xbase/md.hppa2
-rw-r--r--distrib/sets/lists/xbase/md.i3862
-rw-r--r--distrib/sets/lists/xbase/md.landisk2
-rw-r--r--distrib/sets/lists/xbase/md.loongson2
-rw-r--r--distrib/sets/lists/xbase/md.mac68k2
-rw-r--r--distrib/sets/lists/xbase/md.macppc2
-rw-r--r--distrib/sets/lists/xbase/md.mvme68k2
-rw-r--r--distrib/sets/lists/xbase/md.sgi2
-rw-r--r--distrib/sets/lists/xbase/md.socppc2
-rw-r--r--distrib/sets/lists/xbase/md.sparc2
-rw-r--r--distrib/sets/lists/xbase/md.sparc642
-rw-r--r--distrib/sets/lists/xbase/md.zaurus2
-rw-r--r--distrib/sets/lists/xshare/mi2
17 files changed, 17 insertions, 17 deletions
diff --git a/distrib/sets/lists/xbase/md.alpha b/distrib/sets/lists/xbase/md.alpha
index c4806c6cb..672ff595e 100644
--- a/distrib/sets/lists/xbase/md.alpha
+++ b/distrib/sets/lists/xbase/md.alpha
@@ -117,7 +117,7 @@
./usr/X11R6/lib/libpciaccess.so.1.0
./usr/X11R6/lib/libpixman-1.a
./usr/X11R6/lib/libpixman-1.la
-./usr/X11R6/lib/libpixman-1.so.20.0
+./usr/X11R6/lib/libpixman-1.so.22.2
./usr/X11R6/lib/libpthread-stubs.a
./usr/X11R6/lib/libpthread-stubs.so.1.0
./usr/X11R6/lib/libpthread-stubs_pic.a
diff --git a/distrib/sets/lists/xbase/md.amd64 b/distrib/sets/lists/xbase/md.amd64
index 201ea62a3..09bb1c585 100644
--- a/distrib/sets/lists/xbase/md.amd64
+++ b/distrib/sets/lists/xbase/md.amd64
@@ -164,7 +164,7 @@
./usr/X11R6/lib/libpciaccess.so.1.0
./usr/X11R6/lib/libpixman-1.a
./usr/X11R6/lib/libpixman-1.la
-./usr/X11R6/lib/libpixman-1.so.20.0
+./usr/X11R6/lib/libpixman-1.so.22.2
./usr/X11R6/lib/libpthread-stubs.a
./usr/X11R6/lib/libpthread-stubs.so.1.0
./usr/X11R6/lib/libpthread-stubs_pic.a
diff --git a/distrib/sets/lists/xbase/md.armish b/distrib/sets/lists/xbase/md.armish
index c0cf361e1..fb13943c4 100644
--- a/distrib/sets/lists/xbase/md.armish
+++ b/distrib/sets/lists/xbase/md.armish
@@ -153,7 +153,7 @@
./usr/X11R6/lib/libpciaccess.so.1.0
./usr/X11R6/lib/libpixman-1.a
./usr/X11R6/lib/libpixman-1.la
-./usr/X11R6/lib/libpixman-1.so.20.0
+./usr/X11R6/lib/libpixman-1.so.22.2
./usr/X11R6/lib/libpthread-stubs.a
./usr/X11R6/lib/libpthread-stubs.so.1.0
./usr/X11R6/lib/libpthread-stubs_pic.a
diff --git a/distrib/sets/lists/xbase/md.hp300 b/distrib/sets/lists/xbase/md.hp300
index d8d706d84..04d7d22ee 100644
--- a/distrib/sets/lists/xbase/md.hp300
+++ b/distrib/sets/lists/xbase/md.hp300
@@ -134,7 +134,7 @@
./usr/X11R6/lib/libpciaccess.so.1.0
./usr/X11R6/lib/libpixman-1.a
./usr/X11R6/lib/libpixman-1.la
-./usr/X11R6/lib/libpixman-1.so.20.0
+./usr/X11R6/lib/libpixman-1.so.22.2
./usr/X11R6/lib/libpthread-stubs.a
./usr/X11R6/lib/libpthread-stubs.so.1.0
./usr/X11R6/lib/libpthread-stubs_pic.a
diff --git a/distrib/sets/lists/xbase/md.hppa b/distrib/sets/lists/xbase/md.hppa
index 3e7ead336..27f232fdf 100644
--- a/distrib/sets/lists/xbase/md.hppa
+++ b/distrib/sets/lists/xbase/md.hppa
@@ -116,7 +116,7 @@
./usr/X11R6/lib/libpciaccess.so.1.0
./usr/X11R6/lib/libpixman-1.a
./usr/X11R6/lib/libpixman-1.la
-./usr/X11R6/lib/libpixman-1.so.20.0
+./usr/X11R6/lib/libpixman-1.so.22.2
./usr/X11R6/lib/libpthread-stubs.a
./usr/X11R6/lib/libpthread-stubs.so.1.0
./usr/X11R6/lib/libpthread-stubs_pic.a
diff --git a/distrib/sets/lists/xbase/md.i386 b/distrib/sets/lists/xbase/md.i386
index 2b17932fc..35533413e 100644
--- a/distrib/sets/lists/xbase/md.i386
+++ b/distrib/sets/lists/xbase/md.i386
@@ -164,7 +164,7 @@
./usr/X11R6/lib/libpciaccess.so.1.0
./usr/X11R6/lib/libpixman-1.a
./usr/X11R6/lib/libpixman-1.la
-./usr/X11R6/lib/libpixman-1.so.20.0
+./usr/X11R6/lib/libpixman-1.so.22.2
./usr/X11R6/lib/libpthread-stubs.a
./usr/X11R6/lib/libpthread-stubs.so.1.0
./usr/X11R6/lib/libpthread-stubs_pic.a
diff --git a/distrib/sets/lists/xbase/md.landisk b/distrib/sets/lists/xbase/md.landisk
index 090440ed1..b4120ece0 100644
--- a/distrib/sets/lists/xbase/md.landisk
+++ b/distrib/sets/lists/xbase/md.landisk
@@ -118,7 +118,7 @@
./usr/X11R6/lib/libpciaccess.so.1.0
./usr/X11R6/lib/libpixman-1.a
./usr/X11R6/lib/libpixman-1.la
-./usr/X11R6/lib/libpixman-1.so.20.0
+./usr/X11R6/lib/libpixman-1.so.22.2
./usr/X11R6/lib/libpthread-stubs.a
./usr/X11R6/lib/libpthread-stubs.so.1.0
./usr/X11R6/lib/libpthread-stubs_pic.a
diff --git a/distrib/sets/lists/xbase/md.loongson b/distrib/sets/lists/xbase/md.loongson
index 67be0289e..f3da26dbc 100644
--- a/distrib/sets/lists/xbase/md.loongson
+++ b/distrib/sets/lists/xbase/md.loongson
@@ -149,7 +149,7 @@
./usr/X11R6/lib/libpciaccess.so.1.0
./usr/X11R6/lib/libpixman-1.a
./usr/X11R6/lib/libpixman-1.la
-./usr/X11R6/lib/libpixman-1.so.20.0
+./usr/X11R6/lib/libpixman-1.so.22.2
./usr/X11R6/lib/libpthread-stubs.a
./usr/X11R6/lib/libpthread-stubs.so.1.0
./usr/X11R6/lib/libxcb-atom.a
diff --git a/distrib/sets/lists/xbase/md.mac68k b/distrib/sets/lists/xbase/md.mac68k
index 7eefdf4ea..43aa32eae 100644
--- a/distrib/sets/lists/xbase/md.mac68k
+++ b/distrib/sets/lists/xbase/md.mac68k
@@ -143,7 +143,7 @@
./usr/X11R6/lib/libpciaccess.so.1.0
./usr/X11R6/lib/libpixman-1.a
./usr/X11R6/lib/libpixman-1.la
-./usr/X11R6/lib/libpixman-1.so.20.0
+./usr/X11R6/lib/libpixman-1.so.22.2
./usr/X11R6/lib/libpthread-stubs.a
./usr/X11R6/lib/libpthread-stubs.so.1.0
./usr/X11R6/lib/libpthread-stubs_pic.a
diff --git a/distrib/sets/lists/xbase/md.macppc b/distrib/sets/lists/xbase/md.macppc
index 8ab440582..2aade4754 100644
--- a/distrib/sets/lists/xbase/md.macppc
+++ b/distrib/sets/lists/xbase/md.macppc
@@ -154,7 +154,7 @@
./usr/X11R6/lib/libpciaccess.so.1.0
./usr/X11R6/lib/libpixman-1.a
./usr/X11R6/lib/libpixman-1.la
-./usr/X11R6/lib/libpixman-1.so.20.0
+./usr/X11R6/lib/libpixman-1.so.22.2
./usr/X11R6/lib/libpthread-stubs.a
./usr/X11R6/lib/libpthread-stubs.so.1.0
./usr/X11R6/lib/libpthread-stubs_pic.a
diff --git a/distrib/sets/lists/xbase/md.mvme68k b/distrib/sets/lists/xbase/md.mvme68k
index 9ef8ab69b..7a744e4e5 100644
--- a/distrib/sets/lists/xbase/md.mvme68k
+++ b/distrib/sets/lists/xbase/md.mvme68k
@@ -117,7 +117,7 @@
./usr/X11R6/lib/libpciaccess.so.1.0
./usr/X11R6/lib/libpixman-1.a
./usr/X11R6/lib/libpixman-1.la
-./usr/X11R6/lib/libpixman-1.so.20.0
+./usr/X11R6/lib/libpixman-1.so.22.2
./usr/X11R6/lib/libpthread-stubs.a
./usr/X11R6/lib/libpthread-stubs.so.1.0
./usr/X11R6/lib/libpthread-stubs_pic.a
diff --git a/distrib/sets/lists/xbase/md.sgi b/distrib/sets/lists/xbase/md.sgi
index 422420f0a..a4183f87c 100644
--- a/distrib/sets/lists/xbase/md.sgi
+++ b/distrib/sets/lists/xbase/md.sgi
@@ -149,7 +149,7 @@
./usr/X11R6/lib/libpciaccess.so.1.0
./usr/X11R6/lib/libpixman-1.a
./usr/X11R6/lib/libpixman-1.la
-./usr/X11R6/lib/libpixman-1.so.20.0
+./usr/X11R6/lib/libpixman-1.so.22.2
./usr/X11R6/lib/libpthread-stubs.a
./usr/X11R6/lib/libpthread-stubs.so.1.0
./usr/X11R6/lib/libxcb-atom.a
diff --git a/distrib/sets/lists/xbase/md.socppc b/distrib/sets/lists/xbase/md.socppc
index c407e5be2..4a52e73f6 100644
--- a/distrib/sets/lists/xbase/md.socppc
+++ b/distrib/sets/lists/xbase/md.socppc
@@ -153,7 +153,7 @@
./usr/X11R6/lib/libpciaccess.so.1.0
./usr/X11R6/lib/libpixman-1.a
./usr/X11R6/lib/libpixman-1.la
-./usr/X11R6/lib/libpixman-1.so.20.0
+./usr/X11R6/lib/libpixman-1.so.22.2
./usr/X11R6/lib/libpthread-stubs.a
./usr/X11R6/lib/libpthread-stubs.so.1.0
./usr/X11R6/lib/libpthread-stubs_pic.a
diff --git a/distrib/sets/lists/xbase/md.sparc b/distrib/sets/lists/xbase/md.sparc
index c407e5be2..4a52e73f6 100644
--- a/distrib/sets/lists/xbase/md.sparc
+++ b/distrib/sets/lists/xbase/md.sparc
@@ -153,7 +153,7 @@
./usr/X11R6/lib/libpciaccess.so.1.0
./usr/X11R6/lib/libpixman-1.a
./usr/X11R6/lib/libpixman-1.la
-./usr/X11R6/lib/libpixman-1.so.20.0
+./usr/X11R6/lib/libpixman-1.so.22.2
./usr/X11R6/lib/libpthread-stubs.a
./usr/X11R6/lib/libpthread-stubs.so.1.0
./usr/X11R6/lib/libpthread-stubs_pic.a
diff --git a/distrib/sets/lists/xbase/md.sparc64 b/distrib/sets/lists/xbase/md.sparc64
index 1a2c2d438..1571b0dc5 100644
--- a/distrib/sets/lists/xbase/md.sparc64
+++ b/distrib/sets/lists/xbase/md.sparc64
@@ -154,7 +154,7 @@
./usr/X11R6/lib/libpciaccess.so.1.0
./usr/X11R6/lib/libpixman-1.a
./usr/X11R6/lib/libpixman-1.la
-./usr/X11R6/lib/libpixman-1.so.20.0
+./usr/X11R6/lib/libpixman-1.so.22.2
./usr/X11R6/lib/libpthread-stubs.a
./usr/X11R6/lib/libpthread-stubs.so.1.0
./usr/X11R6/lib/libpthread-stubs_pic.a
diff --git a/distrib/sets/lists/xbase/md.zaurus b/distrib/sets/lists/xbase/md.zaurus
index c0cf361e1..fb13943c4 100644
--- a/distrib/sets/lists/xbase/md.zaurus
+++ b/distrib/sets/lists/xbase/md.zaurus
@@ -153,7 +153,7 @@
./usr/X11R6/lib/libpciaccess.so.1.0
./usr/X11R6/lib/libpixman-1.a
./usr/X11R6/lib/libpixman-1.la
-./usr/X11R6/lib/libpixman-1.so.20.0
+./usr/X11R6/lib/libpixman-1.so.22.2
./usr/X11R6/lib/libpthread-stubs.a
./usr/X11R6/lib/libpthread-stubs.so.1.0
./usr/X11R6/lib/libpthread-stubs_pic.a
diff --git a/distrib/sets/lists/xshare/mi b/distrib/sets/lists/xshare/mi
index edad36af9..e846c904d 100644
--- a/distrib/sets/lists/xshare/mi
+++ b/distrib/sets/lists/xshare/mi
@@ -602,6 +602,7 @@
./usr/X11R6/include/freetype2/freetype/ftbbox.h
./usr/X11R6/include/freetype2/freetype/ftbdf.h
./usr/X11R6/include/freetype2/freetype/ftbitmap.h
+./usr/X11R6/include/freetype2/freetype/ftbzip2.h
./usr/X11R6/include/freetype2/freetype/ftcache.h
./usr/X11R6/include/freetype2/freetype/ftchapters.h
./usr/X11R6/include/freetype2/freetype/ftcid.h
@@ -3457,4 +3458,3 @@
./usr/local/lib
./usr/local/lib/X11
./usr/local/lib/X11/app-defaults
-./usr/X11R6/include/freetype2/freetype/ftbzip2.h