sync

19 files changed, 33 insertions, 34 deletions

diff --git a/distrib/sets/lists/base/md.alpha b/distrib/sets/lists/base/md.alpha
index 980513dff0b..056d38b8765 100644
--- a/distrib/sets/lists/base/md.alpha
+++ b/distrib/sets/lists/base/md.alpha
@@ -91,7 +91,7 @@
 ./usr/lib/gcc-lib/alpha-unknown-openbsd5.0/3.3.5/include
 ./usr/lib/gcc-lib/alpha-unknown-openbsd5.0/3.3.5/specs
 ./usr/lib/libasn1.so.18.0
-./usr/lib/libc.so.60.1
+./usr/lib/libc.so.61.0
 ./usr/lib/libcom_err.so.18.0
 ./usr/lib/libcrypto.so.19.0
 ./usr/lib/libcurses.so.12.1
@@ -125,7 +125,7 @@
 ./usr/lib/libskey.so.5.1
 ./usr/lib/libsndio.so.4.0
 ./usr/lib/libssl.so.16.0
-./usr/lib/libstdc++.so.52.0
+./usr/lib/libstdc++.so.53.0
 ./usr/lib/libtermcap.so.12.1
 ./usr/lib/libtermlib.so.12.1
 ./usr/lib/libusbhid.so.3.0
diff --git a/distrib/sets/lists/base/md.amd64 b/distrib/sets/lists/base/md.amd64
index 961c0da07e8..9484bbc994c 100644
--- a/distrib/sets/lists/base/md.amd64
+++ b/distrib/sets/lists/base/md.amd64
@@ -95,7 +95,7 @@
 ./usr/lib/gcc-lib/amd64-unknown-openbsd5.0/4.2.1/collect2
 ./usr/lib/gcc-lib/amd64-unknown-openbsd5.0/4.2.1/specs
 ./usr/lib/libasn1.so.18.0
-./usr/lib/libc.so.60.1
+./usr/lib/libc.so.61.0
 ./usr/lib/libcom_err.so.18.0
 ./usr/lib/libcrypto.so.19.0
 ./usr/lib/libcurses.so.12.1
@@ -129,7 +129,7 @@
 ./usr/lib/libskey.so.5.1
 ./usr/lib/libsndio.so.4.0
 ./usr/lib/libssl.so.16.0
-./usr/lib/libstdc++.so.52.0
+./usr/lib/libstdc++.so.53.0
 ./usr/lib/libtermcap.so.12.1
 ./usr/lib/libtermlib.so.12.1
 ./usr/lib/libusbhid.so.3.0
diff --git a/distrib/sets/lists/base/md.armish b/distrib/sets/lists/base/md.armish
index 8e44e237f60..d2620eb7b07 100644
--- a/distrib/sets/lists/base/md.armish
+++ b/distrib/sets/lists/base/md.armish
@@ -61,7 +61,7 @@
 ./usr/lib/gcc-lib/arm-unknown-openbsd5.0/4.2.1/collect2
 ./usr/lib/gcc-lib/arm-unknown-openbsd5.0/4.2.1/specs
 ./usr/lib/libasn1.so.18.0
-./usr/lib/libc.so.60.1
+./usr/lib/libc.so.61.0
 ./usr/lib/libcom_err.so.18.0
 ./usr/lib/libcrypto.so.19.0
 ./usr/lib/libcurses.so.12.1
@@ -95,7 +95,7 @@
 ./usr/lib/libskey.so.5.1
 ./usr/lib/libsndio.so.4.0
 ./usr/lib/libssl.so.16.0
-./usr/lib/libstdc++.so.52.0
+./usr/lib/libstdc++.so.53.0
 ./usr/lib/libtermcap.so.12.1
 ./usr/lib/libtermlib.so.12.1
 ./usr/lib/libusbhid.so.3.0
diff --git a/distrib/sets/lists/base/md.hp300 b/distrib/sets/lists/base/md.hp300
index 86127810b78..9213ea69cce 100644
--- a/distrib/sets/lists/base/md.hp300
+++ b/distrib/sets/lists/base/md.hp300
@@ -28,7 +28,7 @@
 ./usr/lib/gcc-lib/m68k-unknown-openbsd5.0/2.95.3/include
 ./usr/lib/gcc-lib/m68k-unknown-openbsd5.0/2.95.3/specs
 ./usr/lib/libasn1.so.18.0
-./usr/lib/libc.so.60.1
+./usr/lib/libc.so.61.0
 ./usr/lib/libcom_err.so.18.0
 ./usr/lib/libcrypto.so.19.0
 ./usr/lib/libcurses.so.12.1
diff --git a/distrib/sets/lists/base/md.hppa b/distrib/sets/lists/base/md.hppa
index f3764e22255..6310adace42 100644
--- a/distrib/sets/lists/base/md.hppa
+++ b/distrib/sets/lists/base/md.hppa
@@ -90,7 +90,7 @@
 ./usr/lib/gcc-lib/hppa-unknown-openbsd5.0/4.2.1/collect2
 ./usr/lib/gcc-lib/hppa-unknown-openbsd5.0/4.2.1/specs
 ./usr/lib/libasn1.so.18.0
-./usr/lib/libc.so.60.1
+./usr/lib/libc.so.61.0
 ./usr/lib/libcom_err.so.18.0
 ./usr/lib/libcrypto.so.19.0
 ./usr/lib/libcurses.so.12.1
@@ -124,7 +124,7 @@
 ./usr/lib/libskey.so.5.1
 ./usr/lib/libsndio.so.4.0
 ./usr/lib/libssl.so.16.0
-./usr/lib/libstdc++.so.52.0
+./usr/lib/libstdc++.so.53.0
 ./usr/lib/libtermcap.so.12.1
 ./usr/lib/libtermlib.so.12.1
 ./usr/lib/libusbhid.so.3.0
diff --git a/distrib/sets/lists/base/md.hppa64 b/distrib/sets/lists/base/md.hppa64
index 78071fa3909..45763cfcf6a 100644
--- a/distrib/sets/lists/base/md.hppa64
+++ b/distrib/sets/lists/base/md.hppa64
@@ -91,7 +91,7 @@
 ./usr/lib/gcc-lib/hppa64-unknown-openbsd5.0/3.3.5/collect2
 ./usr/lib/gcc-lib/hppa64-unknown-openbsd5.0/3.3.5/specs
 ./usr/lib/libasn1.so.18.0
-./usr/lib/libc.so.60.1
+./usr/lib/libc.so.61.0
 ./usr/lib/libcom_err.so.18.0
 ./usr/lib/libcrypto.so.19.0
 ./usr/lib/libcurses.so.12.1
@@ -125,7 +125,7 @@
 ./usr/lib/libskey.so.5.1
 ./usr/lib/libsndio.so.4.0
 ./usr/lib/libssl.so.16.0
-./usr/lib/libstdc++.so.52.0
+./usr/lib/libstdc++.so.53.0
 ./usr/lib/libtermcap.so.12.1
 ./usr/lib/libtermlib.so.12.1
 ./usr/lib/libusbhid.so.3.0
diff --git a/distrib/sets/lists/base/md.i386 b/distrib/sets/lists/base/md.i386
index dbf6dd0ddbf..c277e0f2fd7 100644
--- a/distrib/sets/lists/base/md.i386
+++ b/distrib/sets/lists/base/md.i386
@@ -97,7 +97,7 @@
 ./usr/lib/gcc-lib/i386-unknown-openbsd5.0/4.2.1/collect2
 ./usr/lib/gcc-lib/i386-unknown-openbsd5.0/4.2.1/specs
 ./usr/lib/libasn1.so.18.0
-./usr/lib/libc.so.60.1
+./usr/lib/libc.so.61.0
 ./usr/lib/libcom_err.so.18.0
 ./usr/lib/libcrypto.so.19.0
 ./usr/lib/libcurses.so.12.1
@@ -131,7 +131,7 @@
 ./usr/lib/libskey.so.5.1
 ./usr/lib/libsndio.so.4.0
 ./usr/lib/libssl.so.16.0
-./usr/lib/libstdc++.so.52.0
+./usr/lib/libstdc++.so.53.0
 ./usr/lib/libtermcap.so.12.1
 ./usr/lib/libtermlib.so.12.1
 ./usr/lib/libusbhid.so.3.0
diff --git a/distrib/sets/lists/base/md.landisk b/distrib/sets/lists/base/md.landisk
index 9bf0938e627..2d590ad1029 100644
--- a/distrib/sets/lists/base/md.landisk
+++ b/distrib/sets/lists/base/md.landisk
@@ -51,7 +51,7 @@
 ./usr/lib/apache/modules/mod_usertrack.so
 ./usr/lib/apache/modules/mod_vhost_alias.so
 ./usr/lib/libasn1.so.18.0
-./usr/lib/libc.so.60.1
+./usr/lib/libc.so.61.0
 ./usr/lib/libcom_err.so.18.0
 ./usr/lib/libcrypto.so.19.0
 ./usr/lib/libcurses.so.12.1
@@ -85,7 +85,7 @@
 ./usr/lib/libskey.so.5.1
 ./usr/lib/libsndio.so.4.0
 ./usr/lib/libssl.so.16.0
-./usr/lib/libstdc++.so.52.0
+./usr/lib/libstdc++.so.53.0
 ./usr/lib/libtermcap.so.12.1
 ./usr/lib/libtermlib.so.12.1
 ./usr/lib/libusbhid.so.3.0
diff --git a/distrib/sets/lists/base/md.loongson b/distrib/sets/lists/base/md.loongson
index 03663f2af82..c61607f4340 100644
--- a/distrib/sets/lists/base/md.loongson
+++ b/distrib/sets/lists/base/md.loongson
@@ -57,7 +57,7 @@
 ./usr/lib/apache/modules/mod_vhost_alias.so
 ./usr/lib/gcc-lib/mips64el-unknown-openbsd5.0
 ./usr/lib/libasn1.so.18.0
-./usr/lib/libc.so.60.1
+./usr/lib/libc.so.61.0
 ./usr/lib/libcom_err.so.18.0
 ./usr/lib/libcrypto.so.19.0
 ./usr/lib/libcurses.so.12.1
@@ -91,7 +91,7 @@
 ./usr/lib/libskey.so.5.1
 ./usr/lib/libsndio.so.4.0
 ./usr/lib/libssl.so.16.0
-./usr/lib/libstdc++.so.52.0
+./usr/lib/libstdc++.so.53.0
 ./usr/lib/libtermcap.so.12.1
 ./usr/lib/libtermlib.so.12.1
 ./usr/lib/libusbhid.so.3.0
diff --git a/distrib/sets/lists/base/md.mac68k b/distrib/sets/lists/base/md.mac68k
index 0bad547a2cc..5f8b51e17a7 100644
--- a/distrib/sets/lists/base/md.mac68k
+++ b/distrib/sets/lists/base/md.mac68k
@@ -29,7 +29,7 @@
 ./usr/lib/gcc-lib/m68k-unknown-openbsd5.0/2.95.3/include
 ./usr/lib/gcc-lib/m68k-unknown-openbsd5.0/2.95.3/specs
 ./usr/lib/libasn1.so.18.0
-./usr/lib/libc.so.60.1
+./usr/lib/libc.so.61.0
 ./usr/lib/libcom_err.so.18.0
 ./usr/lib/libcrypto.so.19.0
 ./usr/lib/libcurses.so.12.1
diff --git a/distrib/sets/lists/base/md.macppc b/distrib/sets/lists/base/md.macppc
index 6aeeace9735..113805f7520 100644
--- a/distrib/sets/lists/base/md.macppc
+++ b/distrib/sets/lists/base/md.macppc
@@ -92,7 +92,7 @@
 ./usr/lib/gcc-lib/powerpc-unknown-openbsd5.0/4.2.1/collect2
 ./usr/lib/gcc-lib/powerpc-unknown-openbsd5.0/4.2.1/specs
 ./usr/lib/libasn1.so.18.0
-./usr/lib/libc.so.60.1
+./usr/lib/libc.so.61.0
 ./usr/lib/libcom_err.so.18.0
 ./usr/lib/libcrypto.so.19.0
 ./usr/lib/libcurses.so.12.1
@@ -126,7 +126,7 @@
 ./usr/lib/libskey.so.5.1
 ./usr/lib/libsndio.so.4.0
 ./usr/lib/libssl.so.16.0
-./usr/lib/libstdc++.so.52.0
+./usr/lib/libstdc++.so.53.0
 ./usr/lib/libtermcap.so.12.1
 ./usr/lib/libtermlib.so.12.1
 ./usr/lib/libusbhid.so.3.0
diff --git a/distrib/sets/lists/base/md.mvme68k b/distrib/sets/lists/base/md.mvme68k
index 9bfcdb092d4..177711cdd5e 100644
--- a/distrib/sets/lists/base/md.mvme68k
+++ b/distrib/sets/lists/base/md.mvme68k
@@ -26,7 +26,7 @@
 ./usr/lib/gcc-lib/m68k-unknown-openbsd5.0/2.95.3/include
 ./usr/lib/gcc-lib/m68k-unknown-openbsd5.0/2.95.3/specs
 ./usr/lib/libasn1.so.18.0
-./usr/lib/libc.so.60.1
+./usr/lib/libc.so.61.0
 ./usr/lib/libcom_err.so.18.0
 ./usr/lib/libcrypto.so.19.0
 ./usr/lib/libcurses.so.12.1
diff --git a/distrib/sets/lists/base/md.palm b/distrib/sets/lists/base/md.palm
index 76c2d050f18..36a7251b3e1 100644
--- a/distrib/sets/lists/base/md.palm
+++ b/distrib/sets/lists/base/md.palm
@@ -58,7 +58,7 @@
 ./usr/lib/gcc-lib/arm-unknown-openbsd5.0/4.2.1/collect2
 ./usr/lib/gcc-lib/arm-unknown-openbsd5.0/4.2.1/specs
 ./usr/lib/libasn1.so.18.0
-./usr/lib/libc.so.60.1
+./usr/lib/libc.so.61.0
 ./usr/lib/libcom_err.so.18.0
 ./usr/lib/libcrypto.so.19.0
 ./usr/lib/libcurses.so.12.1
@@ -92,7 +92,7 @@
 ./usr/lib/libskey.so.5.1
 ./usr/lib/libsndio.so.4.0
 ./usr/lib/libssl.so.16.0
-./usr/lib/libstdc++.so.52.0
+./usr/lib/libstdc++.so.53.0
 ./usr/lib/libtermcap.so.12.1
 ./usr/lib/libtermlib.so.12.1
 ./usr/lib/libusbhid.so.3.0
diff --git a/distrib/sets/lists/base/md.sgi b/distrib/sets/lists/base/md.sgi
index 0338d8a05d4..f5554004fca 100644
--- a/distrib/sets/lists/base/md.sgi
+++ b/distrib/sets/lists/base/md.sgi
@@ -87,7 +87,7 @@
 ./usr/lib/apache/modules/mod_vhost_alias.so
 ./usr/lib/gcc-lib/mips64-unknown-openbsd5.0
 ./usr/lib/libasn1.so.18.0
-./usr/lib/libc.so.60.1
+./usr/lib/libc.so.61.0
 ./usr/lib/libcom_err.so.18.0
 ./usr/lib/libcrypto.so.19.0
 ./usr/lib/libcurses.so.12.1
@@ -121,7 +121,7 @@
 ./usr/lib/libskey.so.5.1
 ./usr/lib/libsndio.so.4.0
 ./usr/lib/libssl.so.16.0
-./usr/lib/libstdc++.so.52.0
+./usr/lib/libstdc++.so.53.0
 ./usr/lib/libtermcap.so.12.1
 ./usr/lib/libtermlib.so.12.1
 ./usr/lib/libusbhid.so.3.0
diff --git a/distrib/sets/lists/base/md.socppc b/distrib/sets/lists/base/md.socppc
index 8d4e3bf9b03..23165207542 100644
--- a/distrib/sets/lists/base/md.socppc
+++ b/distrib/sets/lists/base/md.socppc
@@ -84,7 +84,7 @@
 ./usr/lib/gcc-lib/powerpc-unknown-openbsd5.0/4.2.1/collect2
 ./usr/lib/gcc-lib/powerpc-unknown-openbsd5.0/4.2.1/specs
 ./usr/lib/libasn1.so.18.0
-./usr/lib/libc.so.60.1
+./usr/lib/libc.so.61.0
 ./usr/lib/libcom_err.so.18.0
 ./usr/lib/libcrypto.so.19.0
 ./usr/lib/libcurses.so.12.1
@@ -118,7 +118,7 @@
 ./usr/lib/libskey.so.5.1
 ./usr/lib/libsndio.so.4.0
 ./usr/lib/libssl.so.16.0
-./usr/lib/libstdc++.so.52.0
+./usr/lib/libstdc++.so.53.0
 ./usr/lib/libtermcap.so.12.1
 ./usr/lib/libtermlib.so.12.1
 ./usr/lib/libusbhid.so.3.0
diff --git a/distrib/sets/lists/base/md.sparc b/distrib/sets/lists/base/md.sparc
index 80df6eb0066..caea764f2e9 100644
--- a/distrib/sets/lists/base/md.sparc
+++ b/distrib/sets/lists/base/md.sparc
@@ -32,7 +32,7 @@
 ./usr/lib/gcc-lib/sparc-unknown-openbsd5.0/4.2.1/collect2
 ./usr/lib/gcc-lib/sparc-unknown-openbsd5.0/4.2.1/specs
 ./usr/lib/libasn1.so.18.0
-./usr/lib/libc.so.60.1
+./usr/lib/libc.so.61.0
 ./usr/lib/libcom_err.so.18.0
 ./usr/lib/libcrypto.so.19.0
 ./usr/lib/libcurses.so.12.1
@@ -66,7 +66,7 @@
 ./usr/lib/libskey.so.5.1
 ./usr/lib/libsndio.so.4.0
 ./usr/lib/libssl.so.16.0
-./usr/lib/libstdc++.so.52.0
+./usr/lib/libstdc++.so.53.0
 ./usr/lib/libtermcap.so.12.1
 ./usr/lib/libtermlib.so.12.1
 ./usr/lib/libusbhid.so.3.0
diff --git a/distrib/sets/lists/base/md.sparc64 b/distrib/sets/lists/base/md.sparc64
index cd4e5bce322..44fd6677348 100644
--- a/distrib/sets/lists/base/md.sparc64
+++ b/distrib/sets/lists/base/md.sparc64
@@ -92,7 +92,7 @@
 ./usr/lib/gcc-lib/sparc64-unknown-openbsd5.0/4.2.1/collect2
 ./usr/lib/gcc-lib/sparc64-unknown-openbsd5.0/4.2.1/specs
 ./usr/lib/libasn1.so.18.0
-./usr/lib/libc.so.60.1
+./usr/lib/libc.so.61.0
 ./usr/lib/libcom_err.so.18.0
 ./usr/lib/libcrypto.so.19.0
 ./usr/lib/libcurses.so.12.1
@@ -126,7 +126,7 @@
 ./usr/lib/libskey.so.5.1
 ./usr/lib/libsndio.so.4.0
 ./usr/lib/libssl.so.16.0
-./usr/lib/libstdc++.so.52.0
+./usr/lib/libstdc++.so.53.0
 ./usr/lib/libtermcap.so.12.1
 ./usr/lib/libtermlib.so.12.1
 ./usr/lib/libusbhid.so.3.0
diff --git a/distrib/sets/lists/base/md.zaurus b/distrib/sets/lists/base/md.zaurus
index a16097a8c06..e5ee587331a 100644
--- a/distrib/sets/lists/base/md.zaurus
+++ b/distrib/sets/lists/base/md.zaurus
@@ -59,7 +59,7 @@
 ./usr/lib/gcc-lib/arm-unknown-openbsd5.0/4.2.1/collect2
 ./usr/lib/gcc-lib/arm-unknown-openbsd5.0/4.2.1/specs
 ./usr/lib/libasn1.so.18.0
-./usr/lib/libc.so.60.1
+./usr/lib/libc.so.61.0
 ./usr/lib/libcom_err.so.18.0
 ./usr/lib/libcrypto.so.19.0
 ./usr/lib/libcurses.so.12.1
@@ -93,7 +93,7 @@
 ./usr/lib/libskey.so.5.1
 ./usr/lib/libsndio.so.4.0
 ./usr/lib/libssl.so.16.0
-./usr/lib/libstdc++.so.52.0
+./usr/lib/libstdc++.so.53.0
 ./usr/lib/libtermcap.so.12.1
 ./usr/lib/libtermlib.so.12.1
 ./usr/lib/libusbhid.so.3.0
diff --git a/distrib/sets/lists/base/mi b/distrib/sets/lists/base/mi
index 8da8e54e677..c738bb032f3 100644
--- a/distrib/sets/lists/base/mi
+++ b/distrib/sets/lists/base/mi
@@ -340,7 +340,6 @@
 ./usr/bin/merge
 ./usr/bin/mesg
 ./usr/bin/mg
-./usr/bin/midicat
 ./usr/bin/midiplay
 ./usr/bin/mixerctl
 ./usr/bin/mkdep