18 files changed, 187 insertions, 134 deletions
diff --git a/distrib/sets/lists/base/md.alpha b/distrib/sets/lists/base/md.alpha
index 56056634525..6e284f0a4ec 100644
--- a/distrib/sets/lists/base/md.alpha
+++ b/distrib/sets/lists/base/md.alpha
@@ -65,7 +65,7 @@
 ./usr/lib/libstdc++.so.31.0
 ./usr/lib/libtermcap.so.9.0
 ./usr/lib/libtermlib.so.9.0
-./usr/lib/libusbhid.so.1.0
+./usr/lib/libusbhid.so.2.0
 ./usr/lib/libutil.so.10.0
 ./usr/lib/libwrap.so.3.0
 ./usr/lib/libz.so.3.0
@@ -732,6 +732,8 @@
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/eisa/eisadevs_data.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/eisa/eisareg.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/eisa/eisavar.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/dev/gpio
+./usr/libdata/perl5/site_perl/alpha-openbsd/dev/gpio/gpiovar.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/hil
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/hil/hildevs.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/hil/hildevs_data.ph
@@ -1967,6 +1969,7 @@
 ./usr/libdata/perl5/site_perl/alpha-openbsd/sys/filedesc.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/sys/filio.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/sys/gmon.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/sys/gpio.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/sys/hash.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/sys/hotplug.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/sys/ioccom.ph
diff --git a/distrib/sets/lists/base/md.amd64 b/distrib/sets/lists/base/md.amd64
index 0e5c758fdc9..b3b037b7ef8 100644
--- a/distrib/sets/lists/base/md.amd64
+++ b/distrib/sets/lists/base/md.amd64
@@ -64,7 +64,7 @@
 ./usr/lib/libstdc++.so.32.0
 ./usr/lib/libtermcap.so.9.0
 ./usr/lib/libtermlib.so.9.0
-./usr/lib/libusbhid.so.1.0
+./usr/lib/libusbhid.so.2.0
 ./usr/lib/libutil.so.10.0
 ./usr/lib/libwrap.so.3.0
 ./usr/lib/libz.so.3.0
@@ -740,6 +740,8 @@
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/eisa/eisadevs_data.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/eisa/eisareg.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/eisa/eisavar.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/dev/gpio
+./usr/libdata/perl5/site_perl/amd64-openbsd/dev/gpio/gpiovar.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/hil
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/hil/hildevs.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/hil/hildevs_data.ph
@@ -1990,6 +1992,7 @@
 ./usr/libdata/perl5/site_perl/amd64-openbsd/sys/filedesc.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/sys/filio.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/sys/gmon.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/sys/gpio.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/sys/hash.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/sys/hotplug.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/sys/ioccom.ph
diff --git a/distrib/sets/lists/base/md.cats b/distrib/sets/lists/base/md.cats
index e8e5d0ebf37..536b21b07d5 100644
--- a/distrib/sets/lists/base/md.cats
+++ b/distrib/sets/lists/base/md.cats
@@ -68,7 +68,7 @@
 ./usr/lib/libstdc++.so.32.0
 ./usr/lib/libtermcap.so.9.0
 ./usr/lib/libtermlib.so.9.0
-./usr/lib/libusbhid.so.1.0
+./usr/lib/libusbhid.so.2.0
 ./usr/lib/libutil.so.10.0
 ./usr/lib/libwrap.so.3.0
 ./usr/lib/libz.so.3.0
@@ -776,6 +776,8 @@
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/eisa/eisadevs_data.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/eisa/eisareg.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/eisa/eisavar.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/dev/gpio
+./usr/libdata/perl5/site_perl/arm-openbsd/dev/gpio/gpiovar.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/hil
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/hil/hildevs.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/hil/hildevs_data.ph
@@ -2026,6 +2028,7 @@
 ./usr/libdata/perl5/site_perl/arm-openbsd/sys/filedesc.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/sys/filio.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/sys/gmon.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/sys/gpio.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/sys/hash.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/sys/hotplug.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/sys/ioccom.ph
diff --git a/distrib/sets/lists/base/md.hp300 b/distrib/sets/lists/base/md.hp300
index 762c78612f2..5ff7e1024e9 100644
--- a/distrib/sets/lists/base/md.hp300
+++ b/distrib/sets/lists/base/md.hp300
@@ -59,7 +59,7 @@
 ./usr/lib/libstdc++.so.31.0
 ./usr/lib/libtermcap.so.9.0
 ./usr/lib/libtermlib.so.9.0
-./usr/lib/libusbhid.so.1.0
+./usr/lib/libusbhid.so.2.0
 ./usr/lib/libutil.so.10.0
 ./usr/lib/libwrap.so.3.0
 ./usr/lib/libz.so.3.0
@@ -669,6 +669,8 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/eisa/eisadevs_data.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/eisa/eisareg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/eisa/eisavar.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/gpio
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/gpio/gpiovar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/hil
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/hil/hildevs.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/hil/hildevs_data.ph
@@ -1980,6 +1982,7 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/sys/filedesc.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/sys/filio.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/sys/gmon.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/sys/gpio.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/sys/hash.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/sys/hotplug.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/sys/ioccom.ph
diff --git a/distrib/sets/lists/base/md.hppa b/distrib/sets/lists/base/md.hppa
index 2954c730c40..20f1819beb3 100644
--- a/distrib/sets/lists/base/md.hppa
+++ b/distrib/sets/lists/base/md.hppa
@@ -40,7 +40,7 @@
 ./usr/lib/libstdc++.so.32.0
 ./usr/lib/libtermcap.so.9.0
 ./usr/lib/libtermlib.so.9.0
-./usr/lib/libusbhid.so.1.0
+./usr/lib/libusbhid.so.2.0
 ./usr/lib/libutil.so.10.0
 ./usr/lib/libwrap.so.3.0
 ./usr/lib/libz.so.3.0
@@ -640,6 +640,8 @@
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/eisa/eisadevs_data.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/eisa/eisareg.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/eisa/eisavar.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/dev/gpio
+./usr/libdata/perl5/site_perl/hppa-openbsd/dev/gpio/gpiovar.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/hil
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/hil/hildevs.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/hil/hildevs_data.ph
@@ -1275,13 +1277,130 @@
 ./usr/libdata/perl5/site_perl/hppa-openbsd/ftw.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/g++
 ./usr/libdata/perl5/site_perl/hppa-openbsd/g++/FlexLexer.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/backward
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/backward/algo.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/backward/algobase.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/backward/alloc.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/backward/backward_warning.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/backward/bvector.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/backward/complex.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/backward/defalloc.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/backward/deque.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/backward/fstream.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/backward/function.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/backward/hash_map.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/backward/hash_set.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/backward/hashtable.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/backward/heap.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/backward/iomanip.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/backward/iostream.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/backward/istream.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/backward/iterator.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/backward/list.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/backward/map.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/backward/multimap.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/backward/multiset.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/backward/new.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/backward/ostream.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/backward/pair.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/backward/queue.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/backward/rope.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/backward/set.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/backward/slist.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/backward/stack.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/backward/stream.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/backward/streambuf.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/backward/tempbuf.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/backward/tree.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/backward/vector.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/bits
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/bits/basic_ios.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/bits/basic_string.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/bits/boost_concept_check.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/bits/char_traits.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/bits/codecvt.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/bits/concept_check.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/bits/cpp_type_traits.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/bits/fpos.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/bits/functexcept.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/bits/gslice.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/bits/gslice_array.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/bits/indirect_array.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/bits/ios_base.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/bits/locale_classes.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/bits/locale_facets.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/bits/localefwd.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/bits/mask_array.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/bits/pthread_allocimpl.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/bits/slice_array.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/bits/stl_algo.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/bits/stl_algobase.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/bits/stl_alloc.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/bits/stl_bvector.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/bits/stl_construct.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/bits/stl_deque.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/bits/stl_function.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/bits/stl_heap.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/bits/stl_iterator.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/bits/stl_iterator_base_funcs.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/bits/stl_iterator_base_types.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/bits/stl_list.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/bits/stl_map.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/bits/stl_multimap.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/bits/stl_multiset.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/bits/stl_numeric.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/bits/stl_pair.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/bits/stl_pthread_alloc.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/bits/stl_queue.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/bits/stl_raw_storage_iter.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/bits/stl_relops.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/bits/stl_set.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/bits/stl_stack.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/bits/stl_tempbuf.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/bits/stl_threads.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/bits/stl_tree.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/bits/stl_uninitialized.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/bits/stl_vector.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/bits/stream_iterator.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/bits/streambuf_iterator.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/bits/stringfwd.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/bits/type_traits.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/bits/valarray_array.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/bits/valarray_meta.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/g++/cursesapp.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/g++/cursesf.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/g++/cursesm.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/g++/cursesp.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/g++/cursesw.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/g++/cursslk.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/cxxabi.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/g++/etip.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/exception_defines.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/ext
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/ext/enc_filebuf.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/ext/ropeimpl.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/ext/stdio_filebuf.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/ext/stl_hash_fun.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/ext/stl_hashtable.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/ext/stl_rope.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd3.5
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd3.5/bits
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd3.5/bits/atomicity.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd3.5/bits/basic_file.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd3.5/bits/c++config.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd3.5/bits/c++io.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd3.5/bits/c++locale.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd3.5/bits/codecvt_specializations.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd3.5/bits/ctype_base.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd3.5/bits/ctype_inline.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd3.5/bits/ctype_noninline.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd3.5/bits/gthr-default.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd3.5/bits/gthr-posix.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd3.5/bits/gthr-single.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd3.5/bits/gthr.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd3.5/bits/messages_members.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd3.5/bits/os_defines.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd3.5/bits/time_members.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/g2c.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/getopt.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/glob.ph
@@ -1821,6 +1940,7 @@
 ./usr/libdata/perl5/site_perl/hppa-openbsd/sys/filedesc.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/sys/filio.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/sys/gmon.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/sys/gpio.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/sys/hash.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/sys/hotplug.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/sys/ioccom.ph
@@ -1947,6 +2067,7 @@
 ./usr/libdata/perl5/site_perl/hppa-openbsd/ufs/ufs/ufsmount.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/unctrl.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/unistd.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/unwind.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/usbhid.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/util.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/utime.ph
@@ -2007,124 +2128,6 @@
 ./usr/libdata/perl5/site_perl/hppa-openbsd/xfs/xfs_vopdefs.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/zconf.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/zlib.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/backward
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/backward/algo.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/backward/algobase.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/backward/alloc.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/backward/backward_warning.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/backward/bvector.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/backward/complex.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/backward/defalloc.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/backward/deque.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/backward/fstream.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/backward/function.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/backward/hash_map.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/backward/hash_set.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/backward/hashtable.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/backward/heap.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/backward/iomanip.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/backward/iostream.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/backward/istream.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/backward/iterator.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/backward/list.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/backward/map.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/backward/multimap.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/backward/multiset.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/backward/new.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/backward/ostream.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/backward/pair.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/backward/queue.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/backward/rope.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/backward/set.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/backward/slist.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/backward/stack.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/backward/stream.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/backward/streambuf.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/backward/tempbuf.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/backward/tree.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/backward/vector.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/bits
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/bits/basic_ios.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/bits/basic_string.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/bits/boost_concept_check.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/bits/char_traits.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/bits/codecvt.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/bits/concept_check.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/bits/cpp_type_traits.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/bits/fpos.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/bits/functexcept.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/bits/gslice.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/bits/gslice_array.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/bits/indirect_array.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/bits/ios_base.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/bits/locale_classes.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/bits/locale_facets.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/bits/localefwd.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/bits/mask_array.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/bits/pthread_allocimpl.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/bits/slice_array.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/bits/stl_algo.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/bits/stl_algobase.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/bits/stl_alloc.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/bits/stl_bvector.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/bits/stl_construct.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/bits/stl_deque.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/bits/stl_function.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/bits/stl_heap.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/bits/stl_iterator.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/bits/stl_iterator_base_funcs.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/bits/stl_iterator_base_types.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/bits/stl_list.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/bits/stl_map.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/bits/stl_multimap.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/bits/stl_multiset.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/bits/stl_numeric.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/bits/stl_pair.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/bits/stl_pthread_alloc.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/bits/stl_queue.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/bits/stl_raw_storage_iter.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/bits/stl_relops.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/bits/stl_set.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/bits/stl_stack.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/bits/stl_tempbuf.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/bits/stl_threads.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/bits/stl_tree.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/bits/stl_uninitialized.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/bits/stl_vector.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/bits/stream_iterator.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/bits/streambuf_iterator.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/bits/stringfwd.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/bits/type_traits.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/bits/valarray_array.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/bits/valarray_meta.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/cxxabi.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/exception_defines.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/ext
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/ext/enc_filebuf.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/ext/ropeimpl.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/ext/stdio_filebuf.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/ext/stl_hash_fun.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/ext/stl_hashtable.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/ext/stl_rope.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd3.5
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd3.5/bits
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd3.5/bits/atomicity.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd3.5/bits/basic_file.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd3.5/bits/c++config.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd3.5/bits/c++io.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd3.5/bits/c++locale.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd3.5/bits/codecvt_specializations.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd3.5/bits/ctype_base.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd3.5/bits/ctype_inline.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd3.5/bits/ctype_noninline.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd3.5/bits/gthr-default.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd3.5/bits/gthr-posix.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd3.5/bits/gthr-single.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd3.5/bits/gthr.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd3.5/bits/messages_members.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd3.5/bits/os_defines.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd3.5/bits/time_members.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/unwind.ph
 ./usr/libexec/ld.so
 ./usr/local/libdata/perl5/site_perl/hppa-openbsd
 ./usr/mdec/boot
diff --git a/distrib/sets/lists/base/md.i386 b/distrib/sets/lists/base/md.i386
index 817683a9220..6f9e86b7ea7 100644
--- a/distrib/sets/lists/base/md.i386
+++ b/distrib/sets/lists/base/md.i386
@@ -67,7 +67,7 @@
 ./usr/lib/libstdc++.so.31.0
 ./usr/lib/libtermcap.so.9.0
 ./usr/lib/libtermlib.so.9.0
-./usr/lib/libusbhid.so.1.0
+./usr/lib/libusbhid.so.2.0
 ./usr/lib/libutil.so.10.0
 ./usr/lib/libwrap.so.3.0
 ./usr/lib/libz.so.3.0
@@ -677,6 +677,8 @@
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/eisa/eisadevs_data.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/eisa/eisareg.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/eisa/eisavar.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/dev/gpio
+./usr/libdata/perl5/site_perl/i386-openbsd/dev/gpio/gpiovar.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/hil
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/hil/hildevs.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/hil/hildevs_data.ph
@@ -1970,6 +1972,7 @@
 ./usr/libdata/perl5/site_perl/i386-openbsd/sys/filedesc.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/sys/filio.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/sys/gmon.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/sys/gpio.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/sys/hash.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/sys/hotplug.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/sys/ioccom.ph
@@ -2167,6 +2170,7 @@
 ./usr/sbin/apmd
 ./usr/sbin/bad144
 ./usr/sbin/fdformat
+./usr/sbin/gpioctl
 ./usr/sbin/hotplugd
 ./usr/sbin/memconfig
 ./usr/sbin/wsconscfg
diff --git a/distrib/sets/lists/base/md.luna88k b/distrib/sets/lists/base/md.luna88k
index 01d05b09ce6..858ee5ca0cb 100644
--- a/distrib/sets/lists/base/md.luna88k
+++ b/distrib/sets/lists/base/md.luna88k
@@ -603,6 +603,8 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/eisa/eisadevs_data.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/eisa/eisareg.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/eisa/eisavar.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/dev/gpio
+./usr/libdata/perl5/site_perl/m88k-openbsd/dev/gpio/gpiovar.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/hil
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/hil/hildevs.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/hil/hildevs_data.ph
@@ -1922,6 +1924,7 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/sys/filedesc.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/sys/filio.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/sys/gmon.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/sys/gpio.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/sys/hash.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/sys/hotplug.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/sys/ioccom.ph
diff --git a/distrib/sets/lists/base/md.mac68k b/distrib/sets/lists/base/md.mac68k
index 2b297758ea1..f9bc6be300c 100644
--- a/distrib/sets/lists/base/md.mac68k
+++ b/distrib/sets/lists/base/md.mac68k
@@ -60,7 +60,7 @@
 ./usr/lib/libstdc++.so.31.0
 ./usr/lib/libtermcap.so.9.0
 ./usr/lib/libtermlib.so.9.0
-./usr/lib/libusbhid.so.1.0
+./usr/lib/libusbhid.so.2.0
 ./usr/lib/libutil.so.10.0
 ./usr/lib/libwrap.so.3.0
 ./usr/lib/libz.so.3.0
@@ -670,6 +670,8 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/eisa/eisadevs_data.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/eisa/eisareg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/eisa/eisavar.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/gpio
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/gpio/gpiovar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/hil
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/hil/hildevs.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/hil/hildevs_data.ph
@@ -1989,6 +1991,7 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/sys/filedesc.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/sys/filio.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/sys/gmon.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/sys/gpio.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/sys/hash.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/sys/hotplug.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/sys/ioccom.ph
diff --git a/distrib/sets/lists/base/md.macppc b/distrib/sets/lists/base/md.macppc
index 4b5416a2c90..fede66f4e53 100644
--- a/distrib/sets/lists/base/md.macppc
+++ b/distrib/sets/lists/base/md.macppc
@@ -67,7 +67,7 @@
 ./usr/lib/libstdc++.so.31.0
 ./usr/lib/libtermcap.so.9.0
 ./usr/lib/libtermlib.so.9.0
-./usr/lib/libusbhid.so.1.0
+./usr/lib/libusbhid.so.2.0
 ./usr/lib/libutil.so.10.0
 ./usr/lib/libwrap.so.3.0
 ./usr/lib/libz.so.3.0
@@ -677,6 +677,8 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/eisa/eisadevs_data.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/eisa/eisareg.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/eisa/eisavar.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/gpio
+./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/gpio/gpiovar.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/hil
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/hil/hildevs.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/hil/hildevs_data.ph
@@ -2004,6 +2006,7 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/sys/filedesc.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/sys/filio.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/sys/gmon.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/sys/gpio.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/sys/hash.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/sys/hotplug.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/sys/ioccom.ph
diff --git a/distrib/sets/lists/base/md.mvme68k b/distrib/sets/lists/base/md.mvme68k
index 02ef5994924..7d025fdb6ab 100644
--- a/distrib/sets/lists/base/md.mvme68k
+++ b/distrib/sets/lists/base/md.mvme68k
@@ -59,7 +59,7 @@
 ./usr/lib/libstdc++.so.31.0
 ./usr/lib/libtermcap.so.9.0
 ./usr/lib/libtermlib.so.9.0
-./usr/lib/libusbhid.so.1.0
+./usr/lib/libusbhid.so.2.0
 ./usr/lib/libutil.so.10.0
 ./usr/lib/libwrap.so.3.0
 ./usr/lib/libz.so.3.0
@@ -669,6 +669,8 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/eisa/eisadevs_data.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/eisa/eisareg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/eisa/eisavar.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/gpio
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/gpio/gpiovar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/hil
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/hil/hildevs.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/hil/hildevs_data.ph
@@ -1984,6 +1986,7 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/sys/filedesc.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/sys/filio.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/sys/gmon.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/sys/gpio.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/sys/hash.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/sys/hotplug.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/sys/ioccom.ph
diff --git a/distrib/sets/lists/base/md.mvme88k b/distrib/sets/lists/base/md.mvme88k
index 59614f07a67..2c9c69c58f9 100644
--- a/distrib/sets/lists/base/md.mvme88k
+++ b/distrib/sets/lists/base/md.mvme88k
@@ -602,6 +602,8 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/eisa/eisadevs_data.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/eisa/eisareg.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/eisa/eisavar.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/dev/gpio
+./usr/libdata/perl5/site_perl/m88k-openbsd/dev/gpio/gpiovar.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/hil
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/hil/hildevs.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/hil/hildevs_data.ph
@@ -1932,6 +1934,7 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/sys/filedesc.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/sys/filio.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/sys/gmon.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/sys/gpio.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/sys/hash.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/sys/hotplug.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/sys/ioccom.ph
diff --git a/distrib/sets/lists/base/md.mvmeppc b/distrib/sets/lists/base/md.mvmeppc
index 2874b6a9ae1..eeb9eac80fd 100644
--- a/distrib/sets/lists/base/md.mvmeppc
+++ b/distrib/sets/lists/base/md.mvmeppc
@@ -63,7 +63,7 @@
 ./usr/lib/libstdc++.so.31.0
 ./usr/lib/libtermcap.so.9.0
 ./usr/lib/libtermlib.so.9.0
-./usr/lib/libusbhid.so.1.0
+./usr/lib/libusbhid.so.2.0
 ./usr/lib/libutil.so.10.0
 ./usr/lib/libwrap.so.3.0
 ./usr/lib/libz.so.3.0
@@ -676,6 +676,8 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/eisa/eisadevs_data.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/eisa/eisareg.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/eisa/eisavar.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/gpio
+./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/gpio/gpiovar.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/hil
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/hil/hildevs.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/hil/hildevs_data.ph
@@ -1954,6 +1956,7 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/sys/filedesc.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/sys/filio.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/sys/gmon.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/sys/gpio.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/sys/hash.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/sys/hotplug.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/sys/ioccom.ph
diff --git a/distrib/sets/lists/base/md.sparc b/distrib/sets/lists/base/md.sparc
index 6b34fc4f432..d11e9240dea 100644
--- a/distrib/sets/lists/base/md.sparc
+++ b/distrib/sets/lists/base/md.sparc
@@ -62,7 +62,7 @@
 ./usr/lib/libstdc++.so.31.0
 ./usr/lib/libtermcap.so.9.0
 ./usr/lib/libtermlib.so.9.0
-./usr/lib/libusbhid.so.1.0
+./usr/lib/libusbhid.so.2.0
 ./usr/lib/libutil.so.10.0
 ./usr/lib/libwrap.so.3.0
 ./usr/lib/libz.so.3.0
@@ -165,6 +165,8 @@
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/eisa/eisadevs_data.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/eisa/eisareg.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/eisa/eisavar.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/dev/gpio
+./usr/libdata/perl5/site_perl/sparc-openbsd/dev/gpio/gpiovar.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/hil
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/hil/hildevs.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/hil/hildevs_data.ph
@@ -1455,6 +1457,7 @@
 ./usr/libdata/perl5/site_perl/sparc-openbsd/sys/filedesc.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/sys/filio.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/sys/gmon.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/sys/gpio.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/sys/hash.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/sys/hotplug.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/sys/ioccom.ph
diff --git a/distrib/sets/lists/base/md.sparc64 b/distrib/sets/lists/base/md.sparc64
index f269048146c..2b84da18f2a 100644
--- a/distrib/sets/lists/base/md.sparc64
+++ b/distrib/sets/lists/base/md.sparc64
@@ -58,7 +58,7 @@
 ./usr/lib/libstdc++.so.32.0
 ./usr/lib/libtermcap.so.9.0
 ./usr/lib/libtermlib.so.9.0
-./usr/lib/libusbhid.so.1.0
+./usr/lib/libusbhid.so.2.0
 ./usr/lib/libutil.so.10.0
 ./usr/lib/libwrap.so.3.0
 ./usr/lib/libz.so.3.0
@@ -161,6 +161,8 @@
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/eisa/eisadevs_data.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/eisa/eisareg.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/eisa/eisavar.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/gpio
+./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/gpio/gpiovar.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/hil
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/hil/hildevs.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/hil/hildevs_data.ph
@@ -1467,6 +1469,7 @@
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/sys/filedesc.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/sys/filio.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/sys/gmon.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/sys/gpio.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/sys/hash.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/sys/hotplug.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/sys/ioccom.ph
diff --git a/distrib/sets/lists/base/md.vax b/distrib/sets/lists/base/md.vax
index b62886285d3..fd643ef91ff 100644
--- a/distrib/sets/lists/base/md.vax
+++ b/distrib/sets/lists/base/md.vax
@@ -105,6 +105,8 @@
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/eisa/eisadevs_data.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/eisa/eisareg.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/eisa/eisavar.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/dev/gpio
+./usr/libdata/perl5/site_perl/vax-openbsd/dev/gpio/gpiovar.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/hil
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/hil/hildevs.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/hil/hildevs_data.ph
@@ -1338,6 +1340,7 @@
 ./usr/libdata/perl5/site_perl/vax-openbsd/sys/filedesc.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/sys/filio.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/sys/gmon.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/sys/gpio.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/sys/hash.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/sys/hotplug.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/sys/ioccom.ph
diff --git a/distrib/sets/lists/comp/md.hppa b/distrib/sets/lists/comp/md.hppa
index 3a4a1dbd29f..dd31b9e955a 100644
--- a/distrib/sets/lists/comp/md.hppa
+++ b/distrib/sets/lists/comp/md.hppa
@@ -213,12 +213,9 @@
 ./usr/lib/gcc-lib/hppa-unknown-openbsd3.5/3.3.2/include
 ./usr/lib/gcc-lib/hppa-unknown-openbsd3.5/3.3.2/include/unwind.h
 ./usr/lib/gcc-lib/hppa-unknown-openbsd3.5/3.3.2/libgcc.a
+./usr/lib/libasn1_pic.a
 ./usr/lib/libbfd.a
 ./usr/lib/libbfd.la
-./usr/lib/libopcodes.a
-./usr/lib/libopcodes.la
-./usr/lib/libsupc++.a
-./usr/lib/libasn1_pic.a
 ./usr/lib/libc_pic.a
 ./usr/lib/libcom_err_pic.a
 ./usr/lib/libcrypto_pic.a
@@ -241,6 +238,8 @@
 ./usr/lib/libncurses_pic.a
 ./usr/lib/libobjc_pic.a
 ./usr/lib/libocurses_pic.a
+./usr/lib/libopcodes.a
+./usr/lib/libopcodes.la
 ./usr/lib/libossaudio_pic.a
 ./usr/lib/libotermcap_pic.a
 ./usr/lib/libpanel_pic.a
@@ -251,6 +250,7 @@
 ./usr/lib/libsectok_pic.a
 ./usr/lib/libskey_pic.a
 ./usr/lib/libssl_pic.a
+./usr/lib/libsupc++.a
 ./usr/lib/libtermcap_pic.a
 ./usr/lib/libtermlib_pic.a
 ./usr/lib/libusbhid_pic.a
diff --git a/distrib/sets/lists/comp/mi b/distrib/sets/lists/comp/mi
index e6ee5513350..4b04f3f67d8 100644
--- a/distrib/sets/lists/comp/mi
+++ b/distrib/sets/lists/comp/mi
@@ -124,6 +124,8 @@
 ./usr/include/dev/eisa/eisadevs_data.h
 ./usr/include/dev/eisa/eisareg.h
 ./usr/include/dev/eisa/eisavar.h
+./usr/include/dev/gpio
+./usr/include/dev/gpio/gpiovar.h
 ./usr/include/dev/hil
 ./usr/include/dev/hil/hildevs.h
 ./usr/include/dev/hil/hildevs_data.h
@@ -1315,6 +1317,7 @@
 ./usr/include/sys/filedesc.h
 ./usr/include/sys/filio.h
 ./usr/include/sys/gmon.h
+./usr/include/sys/gpio.h
 ./usr/include/sys/hash.h
 ./usr/include/sys/hotplug.h
 ./usr/include/sys/ioccom.h
@@ -3411,6 +3414,7 @@
 ./usr/share/man/cat3/hid_parse_usage_page.0
 ./usr/share/man/cat3/hid_report_size.0
 ./usr/share/man/cat3/hid_set_data.0
+./usr/share/man/cat3/hid_start.0
 ./usr/share/man/cat3/hid_start_parse.0
 ./usr/share/man/cat3/hid_usage_in_page.0
 ./usr/share/man/cat3/hid_usage_page.0
diff --git a/distrib/sets/lists/man/mi b/distrib/sets/lists/man/mi
index a281a2d9377..08f98782065 100644
--- a/distrib/sets/lists/man/mi
+++ b/distrib/sets/lists/man/mi
@@ -1135,6 +1135,7 @@
 ./usr/share/man/cat4/gdt.0
 ./usr/share/man/cat4/gem.0
 ./usr/share/man/cat4/gif.0
+./usr/share/man/cat4/gpio.0
 ./usr/share/man/cat4/gpr.0
 ./usr/share/man/cat4/gre.0
 ./usr/share/man/cat4/gscsio.0
@@ -1199,6 +1200,7 @@
 ./usr/share/man/cat4/i386/cpu.0
 ./usr/share/man/cat4/i386/elansc.0
 ./usr/share/man/cat4/i386/geodesc.0
+./usr/share/man/cat4/i386/gscpcib.0
 ./usr/share/man/cat4/i386/gus.0
 ./usr/share/man/cat4/i386/ichpcib.0
 ./usr/share/man/cat4/i386/ie.0
@@ -1922,6 +1924,7 @@
 ./usr/share/man/cat8/i386/boot.conf.0
 ./usr/share/man/cat8/i386/boot_i386.0
 ./usr/share/man/cat8/i386/fdisk.0
+./usr/share/man/cat8/i386/gpioctl.0
 ./usr/share/man/cat8/i386/hotplugd.0
 ./usr/share/man/cat8/i386/installboot.0
 ./usr/share/man/cat8/i386/kbd.0