sync

46 files changed, 84 insertions, 161 deletions

diff --git a/distrib/sets/lists/base/md.alpha b/distrib/sets/lists/base/md.alpha
index 1ce714b889b..001f101d81a 100644
--- a/distrib/sets/lists/base/md.alpha
+++ b/distrib/sets/lists/base/md.alpha
@@ -120,7 +120,6 @@
 ./usr/lib/libpthread.so.12.1
 ./usr/lib/libreadline.so.3.0
 ./usr/lib/librpcsvc.so.1.2
-./usr/lib/libsectok.so.6.0
 ./usr/lib/libskey.so.5.1
 ./usr/lib/libsndio.so.3.3
 ./usr/lib/libssl.so.16.0
@@ -1280,6 +1279,8 @@
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/pci/fmsvar.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/pci/gcu.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/pci/gcu_reg.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/dev/pci/glxreg.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/dev/pci/glxvar.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/pci/hifn7751reg.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/pci/hifn7751var.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/pci/i82365_pcivar.ph
@@ -2241,7 +2242,6 @@
 ./usr/libdata/perl5/site_perl/alpha-openbsd/scsi/ses.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/scsi/ssvar.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/search.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/sectok.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/semaphore.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/setjmp.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/sgtty.ph
diff --git a/distrib/sets/lists/base/md.amd64 b/distrib/sets/lists/base/md.amd64
index 91722f41b93..2c89c93b6c4 100644
--- a/distrib/sets/lists/base/md.amd64
+++ b/distrib/sets/lists/base/md.amd64
@@ -124,7 +124,6 @@
 ./usr/lib/libpthread.so.12.1
 ./usr/lib/libreadline.so.3.0
 ./usr/lib/librpcsvc.so.1.2
-./usr/lib/libsectok.so.6.0
 ./usr/lib/libskey.so.5.1
 ./usr/lib/libsndio.so.3.3
 ./usr/lib/libssl.so.16.0
@@ -1305,6 +1304,8 @@
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/pci/fmsvar.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/pci/gcu.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/pci/gcu_reg.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/dev/pci/glxreg.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/dev/pci/glxvar.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/pci/hifn7751reg.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/pci/hifn7751var.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/pci/i82365_pcivar.ph
@@ -2339,7 +2340,6 @@
 ./usr/libdata/perl5/site_perl/amd64-openbsd/scsi/ses.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/scsi/ssvar.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/search.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/sectok.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/semaphore.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/setjmp.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/sgtty.ph
diff --git a/distrib/sets/lists/base/md.armish b/distrib/sets/lists/base/md.armish
index 4c89cf7a049..418ba70a382 100644
--- a/distrib/sets/lists/base/md.armish
+++ b/distrib/sets/lists/base/md.armish
@@ -96,7 +96,6 @@
 ./usr/lib/libpthread.so.12.1
 ./usr/lib/libreadline.so.3.0
 ./usr/lib/librpcsvc.so.1.2
-./usr/lib/libsectok.so.6.0
 ./usr/lib/libskey.so.5.1
 ./usr/lib/libsndio.so.3.3
 ./usr/lib/libssl.so.16.0
@@ -1296,6 +1295,8 @@
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/fmsvar.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/gcu.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/gcu_reg.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/glxreg.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/glxvar.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/hifn7751reg.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/hifn7751var.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/i82365_pcivar.ph
@@ -2257,7 +2258,6 @@
 ./usr/libdata/perl5/site_perl/arm-openbsd/scsi/ses.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/scsi/ssvar.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/search.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/sectok.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/semaphore.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/setjmp.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/sgtty.ph
diff --git a/distrib/sets/lists/base/md.aviion b/distrib/sets/lists/base/md.aviion
index e9882c401fa..35df901c591 100644
--- a/distrib/sets/lists/base/md.aviion
+++ b/distrib/sets/lists/base/md.aviion
@@ -1211,6 +1211,8 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/fmsvar.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/gcu.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/gcu_reg.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/glxreg.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/glxvar.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/hifn7751reg.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/hifn7751var.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/i82365_pcivar.ph
@@ -2200,7 +2202,6 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/scsi/ses.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/scsi/ssvar.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/search.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/sectok.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/semaphore.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/setjmp.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/sgtty.ph
diff --git a/distrib/sets/lists/base/md.hp300 b/distrib/sets/lists/base/md.hp300
index 427f51a0925..7cc5f361d64 100644
--- a/distrib/sets/lists/base/md.hp300
+++ b/distrib/sets/lists/base/md.hp300
@@ -60,7 +60,6 @@
 ./usr/lib/libpthread.so.12.1
 ./usr/lib/libreadline.so.3.0
 ./usr/lib/librpcsvc.so.1.2
-./usr/lib/libsectok.so.6.0
 ./usr/lib/libskey.so.5.1
 ./usr/lib/libsndio.so.3.3
 ./usr/lib/libssl.so.16.0
@@ -1167,6 +1166,8 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/fmsvar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/gcu.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/gcu_reg.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/glxreg.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/glxvar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/hifn7751reg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/hifn7751var.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/i82365_pcivar.ph
@@ -2190,7 +2191,6 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/scsi/ses.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/scsi/ssvar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/search.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/sectok.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/semaphore.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/setjmp.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/sgtty.ph
diff --git a/distrib/sets/lists/base/md.hppa b/distrib/sets/lists/base/md.hppa
index b23a6230b50..5b84d2270a6 100644
--- a/distrib/sets/lists/base/md.hppa
+++ b/distrib/sets/lists/base/md.hppa
@@ -119,7 +119,6 @@
 ./usr/lib/libpthread.so.12.1
 ./usr/lib/libreadline.so.3.0
 ./usr/lib/librpcsvc.so.1.2
-./usr/lib/libsectok.so.6.0
 ./usr/lib/libskey.so.5.1
 ./usr/lib/libsndio.so.3.3
 ./usr/lib/libssl.so.16.0
@@ -1226,6 +1225,8 @@
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/pci/fmsvar.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/pci/gcu.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/pci/gcu_reg.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/dev/pci/glxreg.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/dev/pci/glxvar.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/pci/hifn7751reg.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/pci/hifn7751var.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/pci/i82365_pcivar.ph
@@ -2309,7 +2310,6 @@
 ./usr/libdata/perl5/site_perl/hppa-openbsd/scsi/ses.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/scsi/ssvar.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/search.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/sectok.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/semaphore.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/setjmp.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/sgtty.ph
diff --git a/distrib/sets/lists/base/md.hppa64 b/distrib/sets/lists/base/md.hppa64
index c3a5e45701e..06e5b192628 100644
--- a/distrib/sets/lists/base/md.hppa64
+++ b/distrib/sets/lists/base/md.hppa64
@@ -120,7 +120,6 @@
 ./usr/lib/libpthread.so.12.1
 ./usr/lib/libreadline.so.3.0
 ./usr/lib/librpcsvc.so.1.2
-./usr/lib/libsectok.so.6.0
 ./usr/lib/libskey.so.5.1
 ./usr/lib/libsndio.so.3.3
 ./usr/lib/libssl.so.16.0
@@ -1227,6 +1226,8 @@
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/pci/fmsvar.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/pci/gcu.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/pci/gcu_reg.ph
+./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/pci/glxreg.ph
+./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/pci/glxvar.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/pci/hifn7751reg.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/pci/hifn7751var.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/pci/i82365_pcivar.ph
@@ -2239,7 +2240,6 @@
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/scsi/ses.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/scsi/ssvar.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/search.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/sectok.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/semaphore.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/setjmp.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/sgtty.ph
diff --git a/distrib/sets/lists/base/md.i386 b/distrib/sets/lists/base/md.i386
index c66a8eff804..14a5d54a485 100644
--- a/distrib/sets/lists/base/md.i386
+++ b/distrib/sets/lists/base/md.i386
@@ -126,7 +126,6 @@
 ./usr/lib/libpthread.so.12.1
 ./usr/lib/libreadline.so.3.0
 ./usr/lib/librpcsvc.so.1.2
-./usr/lib/libsectok.so.6.0
 ./usr/lib/libskey.so.5.1
 ./usr/lib/libsndio.so.3.3
 ./usr/lib/libssl.so.16.0
@@ -1233,6 +1232,8 @@
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/pci/fmsvar.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/pci/gcu.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/pci/gcu_reg.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/dev/pci/glxreg.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/dev/pci/glxvar.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/pci/hifn7751reg.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/pci/hifn7751var.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/pci/i82365_pcivar.ph
@@ -2343,7 +2344,6 @@
 ./usr/libdata/perl5/site_perl/i386-openbsd/scsi/ses.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/scsi/ssvar.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/search.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/sectok.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/semaphore.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/setjmp.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/sgtty.ph
diff --git a/distrib/sets/lists/base/md.landisk b/distrib/sets/lists/base/md.landisk
index d848dfe9686..99c8495d250 100644
--- a/distrib/sets/lists/base/md.landisk
+++ b/distrib/sets/lists/base/md.landisk
@@ -83,7 +83,6 @@
 ./usr/lib/libpthread.so.12.1
 ./usr/lib/libreadline.so.3.0
 ./usr/lib/librpcsvc.so.1.2
-./usr/lib/libsectok.so.6.0
 ./usr/lib/libskey.so.5.1
 ./usr/lib/libsndio.so.3.3
 ./usr/lib/libssl.so.16.0
@@ -1190,6 +1189,8 @@
 ./usr/libdata/perl5/site_perl/sh-openbsd/dev/pci/fmsvar.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/dev/pci/gcu.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/dev/pci/gcu_reg.ph
+./usr/libdata/perl5/site_perl/sh-openbsd/dev/pci/glxreg.ph
+./usr/libdata/perl5/site_perl/sh-openbsd/dev/pci/glxvar.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/dev/pci/hifn7751reg.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/dev/pci/hifn7751var.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/dev/pci/i82365_pcivar.ph
@@ -2195,7 +2196,6 @@
 ./usr/libdata/perl5/site_perl/sh-openbsd/scsi/ses.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/scsi/ssvar.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/search.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/sectok.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/semaphore.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/setjmp.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/sgtty.ph
diff --git a/distrib/sets/lists/base/md.loongson b/distrib/sets/lists/base/md.loongson
index f42c6539956..8ae97e6e576 100644
--- a/distrib/sets/lists/base/md.loongson
+++ b/distrib/sets/lists/base/md.loongson
@@ -89,7 +89,6 @@
 ./usr/lib/libpthread.so.12.1
 ./usr/lib/libreadline.so.3.0
 ./usr/lib/librpcsvc.so.1.2
-./usr/lib/libsectok.so.6.0
 ./usr/lib/libskey.so.5.1
 ./usr/lib/libsndio.so.3.3
 ./usr/lib/libssl.so.16.0
@@ -1197,6 +1196,8 @@
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/dev/pci/fmsvar.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/dev/pci/gcu.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/dev/pci/gcu_reg.ph
+./usr/libdata/perl5/site_perl/mips64el-openbsd/dev/pci/glxreg.ph
+./usr/libdata/perl5/site_perl/mips64el-openbsd/dev/pci/glxvar.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/dev/pci/hifn7751reg.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/dev/pci/hifn7751var.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/dev/pci/i82365_pcivar.ph
@@ -2322,7 +2323,6 @@
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/scsi/ses.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/scsi/ssvar.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/search.ph
-./usr/libdata/perl5/site_perl/mips64el-openbsd/sectok.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/semaphore.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/setjmp.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/sgtty.ph
diff --git a/distrib/sets/lists/base/md.luna88k b/distrib/sets/lists/base/md.luna88k
index 38d309e8cdc..492d2be481b 100644
--- a/distrib/sets/lists/base/md.luna88k
+++ b/distrib/sets/lists/base/md.luna88k
@@ -1020,6 +1020,8 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/fmsvar.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/gcu.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/gcu_reg.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/glxreg.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/glxvar.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/hifn7751reg.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/hifn7751var.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/i82365_pcivar.ph
@@ -2055,7 +2057,6 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/scsi/ses.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/scsi/ssvar.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/search.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/sectok.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/semaphore.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/setjmp.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/sgtty.ph
diff --git a/distrib/sets/lists/base/md.mac68k b/distrib/sets/lists/base/md.mac68k
index da63fea7228..bf03c1643f4 100644
--- a/distrib/sets/lists/base/md.mac68k
+++ b/distrib/sets/lists/base/md.mac68k
@@ -61,7 +61,6 @@
 ./usr/lib/libpthread.so.12.1
 ./usr/lib/libreadline.so.3.0
 ./usr/lib/librpcsvc.so.1.2
-./usr/lib/libsectok.so.6.0
 ./usr/lib/libskey.so.5.1
 ./usr/lib/libsndio.so.3.3
 ./usr/lib/libssl.so.16.0
@@ -1168,6 +1167,8 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/fmsvar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/gcu.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/gcu_reg.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/glxreg.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/glxvar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/hifn7751reg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/hifn7751var.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/i82365_pcivar.ph
@@ -2195,7 +2196,6 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/scsi/ses.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/scsi/ssvar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/search.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/sectok.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/semaphore.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/setjmp.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/sgtty.ph
diff --git a/distrib/sets/lists/base/md.macppc b/distrib/sets/lists/base/md.macppc
index e17998eb70d..e26546153a6 100644
--- a/distrib/sets/lists/base/md.macppc
+++ b/distrib/sets/lists/base/md.macppc
@@ -121,7 +121,6 @@
 ./usr/lib/libpthread.so.12.1
 ./usr/lib/libreadline.so.3.0
 ./usr/lib/librpcsvc.so.1.2
-./usr/lib/libsectok.so.6.0
 ./usr/lib/libskey.so.5.1
 ./usr/lib/libsndio.so.3.3
 ./usr/lib/libssl.so.16.0
@@ -1229,6 +1228,8 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/fmsvar.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/gcu.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/gcu_reg.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/glxreg.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/glxvar.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/hifn7751reg.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/hifn7751var.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/i82365_pcivar.ph
@@ -2351,7 +2352,6 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/scsi/ses.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/scsi/ssvar.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/search.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/sectok.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/semaphore.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/setjmp.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/sgtty.ph
diff --git a/distrib/sets/lists/base/md.mvme68k b/distrib/sets/lists/base/md.mvme68k
index 544e100be3b..b8f99097bda 100644
--- a/distrib/sets/lists/base/md.mvme68k
+++ b/distrib/sets/lists/base/md.mvme68k
@@ -58,7 +58,6 @@
 ./usr/lib/libpthread.so.12.1
 ./usr/lib/libreadline.so.3.0
 ./usr/lib/librpcsvc.so.1.2
-./usr/lib/libsectok.so.6.0
 ./usr/lib/libskey.so.5.1
 ./usr/lib/libsndio.so.3.3
 ./usr/lib/libssl.so.16.0
@@ -1165,6 +1164,8 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/fmsvar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/gcu.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/gcu_reg.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/glxreg.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/glxvar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/hifn7751reg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/hifn7751var.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/i82365_pcivar.ph
@@ -2190,7 +2191,6 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/scsi/ses.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/scsi/ssvar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/search.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/sectok.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/semaphore.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/setjmp.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/sgtty.ph
diff --git a/distrib/sets/lists/base/md.mvme88k b/distrib/sets/lists/base/md.mvme88k
index 7d021034020..b2b8cd6656c 100644
--- a/distrib/sets/lists/base/md.mvme88k
+++ b/distrib/sets/lists/base/md.mvme88k
@@ -1158,6 +1158,8 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/fmsvar.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/gcu.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/gcu_reg.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/glxreg.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/glxvar.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/hifn7751reg.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/hifn7751var.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/i82365_pcivar.ph
@@ -2204,7 +2206,6 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/scsi/ses.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/scsi/ssvar.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/search.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/sectok.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/semaphore.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/setjmp.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/sgtty.ph
diff --git a/distrib/sets/lists/base/md.mvmeppc b/distrib/sets/lists/base/md.mvmeppc
index 08048f89c1d..48213974722 100644
--- a/distrib/sets/lists/base/md.mvmeppc
+++ b/distrib/sets/lists/base/md.mvmeppc
@@ -92,7 +92,6 @@
 ./usr/lib/libpthread.so.12.1
 ./usr/lib/libreadline.so.3.0
 ./usr/lib/librpcsvc.so.1.2
-./usr/lib/libsectok.so.6.0
 ./usr/lib/libskey.so.5.1
 ./usr/lib/libsndio.so.3.3
 ./usr/lib/libssl.so.16.0
@@ -1116,6 +1115,8 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/fmsvar.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/gcu.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/gcu_reg.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/glxreg.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/glxvar.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/hifn7751reg.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/hifn7751var.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/i82365_pcivar.ph
@@ -2102,7 +2103,6 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/scsi/ses.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/scsi/ssvar.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/search.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/sectok.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/semaphore.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/setjmp.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/sgtty.ph
diff --git a/distrib/sets/lists/base/md.palm b/distrib/sets/lists/base/md.palm
index 3cd8ed12d1a..fcfb74a5670 100644
--- a/distrib/sets/lists/base/md.palm
+++ b/distrib/sets/lists/base/md.palm
@@ -93,7 +93,6 @@
 ./usr/lib/libpthread.so.12.1
 ./usr/lib/libreadline.so.3.0
 ./usr/lib/librpcsvc.so.1.2
-./usr/lib/libsectok.so.6.0
 ./usr/lib/libskey.so.5.1
 ./usr/lib/libsndio.so.3.3
 ./usr/lib/libssl.so.16.0
@@ -1250,6 +1249,8 @@
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/fmsvar.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/gcu.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/gcu_reg.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/glxreg.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/glxvar.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/hifn7751reg.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/hifn7751var.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/i82365_pcivar.ph
@@ -2255,7 +2256,6 @@
 ./usr/libdata/perl5/site_perl/arm-openbsd/scsi/ses.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/scsi/ssvar.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/search.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/sectok.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/semaphore.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/setjmp.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/sgtty.ph
diff --git a/distrib/sets/lists/base/md.sgi b/distrib/sets/lists/base/md.sgi
index 568cd1cc536..ac6b5003251 100644
--- a/distrib/sets/lists/base/md.sgi
+++ b/distrib/sets/lists/base/md.sgi
@@ -116,7 +116,6 @@
 ./usr/lib/libpthread.so.12.1
 ./usr/lib/libreadline.so.3.0
 ./usr/lib/librpcsvc.so.1.2
-./usr/lib/libsectok.so.6.0
 ./usr/lib/libskey.so.5.1
 ./usr/lib/libsndio.so.3.3
 ./usr/lib/libssl.so.16.0
@@ -1224,6 +1223,8 @@
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/pci/fmsvar.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/pci/gcu.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/pci/gcu_reg.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/dev/pci/glxreg.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/dev/pci/glxvar.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/pci/hifn7751reg.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/pci/hifn7751var.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/pci/i82365_pcivar.ph
@@ -2298,7 +2299,6 @@
 ./usr/libdata/perl5/site_perl/mips64-openbsd/scsi/ses.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/scsi/ssvar.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/search.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/sectok.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/semaphore.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/setjmp.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/sgi
diff --git a/distrib/sets/lists/base/md.socppc b/distrib/sets/lists/base/md.socppc
index 3549e4d9aa3..41c782e7135 100644
--- a/distrib/sets/lists/base/md.socppc
+++ b/distrib/sets/lists/base/md.socppc
@@ -116,7 +116,6 @@
 ./usr/lib/libpthread.so.12.1
 ./usr/lib/libreadline.so.3.0
 ./usr/lib/librpcsvc.so.1.2
-./usr/lib/libsectok.so.6.0
 ./usr/lib/libskey.so.5.1
 ./usr/lib/libsndio.so.3.3
 ./usr/lib/libssl.so.16.0
@@ -1224,6 +1223,8 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/fmsvar.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/gcu.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/gcu_reg.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/glxreg.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/glxvar.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/hifn7751reg.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/hifn7751var.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/i82365_pcivar.ph
@@ -2294,7 +2295,6 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/scsi/ses.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/scsi/ssvar.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/search.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/sectok.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/semaphore.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/setjmp.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/sgtty.ph
diff --git a/distrib/sets/lists/base/md.sparc b/distrib/sets/lists/base/md.sparc
index c6b76d8ddd6..85e9ecc3b87 100644
--- a/distrib/sets/lists/base/md.sparc
+++ b/distrib/sets/lists/base/md.sparc
@@ -66,7 +66,6 @@
 ./usr/lib/libpthread.so.12.1
 ./usr/lib/libreadline.so.3.0
 ./usr/lib/librpcsvc.so.1.2
-./usr/lib/libsectok.so.6.0
 ./usr/lib/libskey.so.5.1
 ./usr/lib/libsndio.so.3.3
 ./usr/lib/libssl.so.16.0
@@ -593,6 +592,8 @@
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/pci/fmsvar.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/pci/gcu.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/pci/gcu_reg.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/dev/pci/glxreg.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/dev/pci/glxvar.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/pci/hifn7751reg.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/pci/hifn7751var.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/pci/i82365_pcivar.ph
@@ -1539,7 +1540,6 @@
 ./usr/libdata/perl5/site_perl/sparc-openbsd/scsi/ses.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/scsi/ssvar.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/search.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/sectok.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/semaphore.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/setjmp.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/sgtty.ph
diff --git a/distrib/sets/lists/base/md.sparc64 b/distrib/sets/lists/base/md.sparc64
index a56e15aac8d..9f64caa096d 100644
--- a/distrib/sets/lists/base/md.sparc64
+++ b/distrib/sets/lists/base/md.sparc64
@@ -121,7 +121,6 @@
 ./usr/lib/libpthread.so.12.1
 ./usr/lib/libreadline.so.3.0
 ./usr/lib/librpcsvc.so.1.2
-./usr/lib/libsectok.so.6.0
 ./usr/lib/libskey.so.5.1
 ./usr/lib/libsndio.so.3.3
 ./usr/lib/libssl.so.16.0
@@ -648,6 +647,8 @@
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/pci/fmsvar.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/pci/gcu.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/pci/gcu_reg.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/pci/glxreg.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/pci/glxvar.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/pci/hifn7751reg.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/pci/hifn7751var.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/pci/i82365_pcivar.ph
@@ -1678,7 +1679,6 @@
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/scsi/ses.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/scsi/ssvar.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/search.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/sectok.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/semaphore.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/setjmp.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/sgtty.ph
diff --git a/distrib/sets/lists/base/md.vax b/distrib/sets/lists/base/md.vax
index 1014280ff64..64dc5cb1f87 100644
--- a/distrib/sets/lists/base/md.vax
+++ b/distrib/sets/lists/base/md.vax
@@ -524,6 +524,8 @@
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/pci/fmsvar.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/pci/gcu.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/pci/gcu_reg.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/dev/pci/glxreg.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/dev/pci/glxvar.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/pci/hifn7751reg.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/pci/hifn7751var.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/pci/i82365_pcivar.ph
@@ -1469,7 +1471,6 @@
 ./usr/libdata/perl5/site_perl/vax-openbsd/scsi/ses.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/scsi/ssvar.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/search.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/sectok.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/semaphore.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/setjmp.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/sgtty.ph
diff --git a/distrib/sets/lists/base/md.zaurus b/distrib/sets/lists/base/md.zaurus
index 5c462fe61a0..807bb35cb9f 100644
--- a/distrib/sets/lists/base/md.zaurus
+++ b/distrib/sets/lists/base/md.zaurus
@@ -94,7 +94,6 @@
 ./usr/lib/libpthread.so.12.1
 ./usr/lib/libreadline.so.3.0
 ./usr/lib/librpcsvc.so.1.2
-./usr/lib/libsectok.so.6.0
 ./usr/lib/libskey.so.5.1
 ./usr/lib/libsndio.so.3.3
 ./usr/lib/libssl.so.16.0
@@ -1251,6 +1250,8 @@
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/fmsvar.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/gcu.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/gcu_reg.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/glxreg.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/glxvar.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/hifn7751reg.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/hifn7751var.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/i82365_pcivar.ph
@@ -2212,7 +2213,6 @@
 ./usr/libdata/perl5/site_perl/arm-openbsd/scsi/ses.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/scsi/ssvar.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/search.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/sectok.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/semaphore.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/setjmp.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/sgtty.ph
diff --git a/distrib/sets/lists/base/mi b/distrib/sets/lists/base/mi
index bb7399a1105..d6065b1dff8 100644
--- a/distrib/sets/lists/base/mi
+++ b/distrib/sets/lists/base/mi
@@ -439,7 +439,6 @@
 ./usr/bin/scp
 ./usr/bin/script
 ./usr/bin/sdiff
-./usr/bin/sectok
 ./usr/bin/sed
 ./usr/bin/sendbug
 ./usr/bin/sftp
@@ -3077,6 +3076,8 @@
 ./usr/share/locale/de_DE.ISO8859-1/LC_CTYPE
 ./usr/share/locale/de_DE.ISO8859-15
 ./usr/share/locale/de_DE.ISO8859-15/LC_CTYPE
+./usr/share/locale/de_DE.UTF-8
+./usr/share/locale/de_DE.UTF-8/LC_CTYPE
 ./usr/share/locale/el_GR.ISO8859-7
 ./usr/share/locale/el_GR.ISO8859-7/LC_CTYPE
 ./usr/share/locale/en_AU.ISO8859-1
@@ -3101,6 +3102,8 @@
 ./usr/share/locale/es_ES.ISO8859-1/LC_CTYPE
 ./usr/share/locale/es_ES.ISO8859-15
 ./usr/share/locale/es_ES.ISO8859-15/LC_CTYPE
+./usr/share/locale/es_ES.UTF-8
+./usr/share/locale/es_ES.UTF-8/LC_CTYPE
 ./usr/share/locale/fi_FI.ISO8859-1
 ./usr/share/locale/fi_FI.ISO8859-1/LC_CTYPE
 ./usr/share/locale/fi_FI.ISO8859-15
@@ -3109,22 +3112,32 @@
 ./usr/share/locale/fr_BE.ISO8859-1/LC_CTYPE
 ./usr/share/locale/fr_BE.ISO8859-15
 ./usr/share/locale/fr_BE.ISO8859-15/LC_CTYPE
+./usr/share/locale/fr_BE.UTF-8
+./usr/share/locale/fr_BE.UTF-8/LC_CTYPE
 ./usr/share/locale/fr_CA.ISO8859-1
 ./usr/share/locale/fr_CA.ISO8859-1/LC_CTYPE
 ./usr/share/locale/fr_CA.ISO8859-15
 ./usr/share/locale/fr_CA.ISO8859-15/LC_CTYPE
+./usr/share/locale/fr_CA.UTF-8
+./usr/share/locale/fr_CA.UTF-8/LC_CTYPE
 ./usr/share/locale/fr_CH.ISO8859-1
 ./usr/share/locale/fr_CH.ISO8859-1/LC_CTYPE
 ./usr/share/locale/fr_CH.ISO8859-15
 ./usr/share/locale/fr_CH.ISO8859-15/LC_CTYPE
+./usr/share/locale/fr_CH.UTF-8
+./usr/share/locale/fr_CH.UTF-8/LC_CTYPE
 ./usr/share/locale/fr_FR.ISO8859-1
 ./usr/share/locale/fr_FR.ISO8859-1/LC_CTYPE
 ./usr/share/locale/fr_FR.ISO8859-15
 ./usr/share/locale/fr_FR.ISO8859-15/LC_CTYPE
+./usr/share/locale/fr_FR.UTF-8
+./usr/share/locale/fr_FR.UTF-8/LC_CTYPE
 ./usr/share/locale/hr_HR.ISO8859-2
 ./usr/share/locale/hr_HR.ISO8859-2/LC_CTYPE
 ./usr/share/locale/hu_HU.ISO8859-2
 ./usr/share/locale/hu_HU.ISO8859-2/LC_CTYPE
+./usr/share/locale/hu_HU.UTF-8
+./usr/share/locale/hu_HU.UTF-8/LC_CTYPE
 ./usr/share/locale/hy_AM.ARMSCII-8
 ./usr/share/locale/hy_AM.ARMSCII-8/LC_CTYPE
 ./usr/share/locale/is_IS.ISO8859-1
@@ -3135,16 +3148,23 @@
 ./usr/share/locale/it_CH.ISO8859-1/LC_CTYPE
 ./usr/share/locale/it_CH.ISO8859-15
 ./usr/share/locale/it_CH.ISO8859-15/LC_CTYPE
+./usr/share/locale/it_CH.UTF-8
+./usr/share/locale/it_CH.UTF-8/LC_CTYPE
 ./usr/share/locale/it_IT.ISO8859-1
 ./usr/share/locale/it_IT.ISO8859-1/LC_CTYPE
 ./usr/share/locale/it_IT.ISO8859-15
 ./usr/share/locale/it_IT.ISO8859-15/LC_CTYPE
+./usr/share/locale/it_IT.UTF-8
+./usr/share/locale/it_IT.UTF-8/LC_CTYPE
 ./usr/share/locale/ja_JP.ISO2022-JP
 ./usr/share/locale/ja_JP.ISO2022-JP2
 ./usr/share/locale/ja_JP.SJIS
+./usr/share/locale/ja_JP.UTF-8
+./usr/share/locale/ja_JP.UTF-8/LC_CTYPE
 ./usr/share/locale/ja_JP.ct
 ./usr/share/locale/ja_JP.eucJP
 ./usr/share/locale/ko_KR.UTF-8
+./usr/share/locale/ko_KR.UTF-8/LC_CTYPE
 ./usr/share/locale/ko_KR.eucKR
 ./usr/share/locale/lt_LT.ISO8859-13
 ./usr/share/locale/lt_LT.ISO8859-13/LC_CTYPE
@@ -3164,16 +3184,22 @@
 ./usr/share/locale/no_NO.ISO8859-15/LC_CTYPE
 ./usr/share/locale/pl_PL.ISO8859-2
 ./usr/share/locale/pl_PL.ISO8859-2/LC_CTYPE
+./usr/share/locale/pl_PL.UTF-8
+./usr/share/locale/pl_PL.UTF-8/LC_CTYPE
 ./usr/share/locale/pt_PT.ISO8859-1
 ./usr/share/locale/pt_PT.ISO8859-1/LC_CTYPE
 ./usr/share/locale/pt_PT.ISO8859-15
 ./usr/share/locale/pt_PT.ISO8859-15/LC_CTYPE
+./usr/share/locale/pt_PT.UTF-8
+./usr/share/locale/pt_PT.UTF-8/LC_CTYPE
 ./usr/share/locale/ru_RU.CP866
 ./usr/share/locale/ru_RU.CP866/LC_CTYPE
 ./usr/share/locale/ru_RU.ISO8859-5
 ./usr/share/locale/ru_RU.ISO8859-5/LC_CTYPE
 ./usr/share/locale/ru_RU.KOI8-R
 ./usr/share/locale/ru_RU.KOI8-R/LC_CTYPE
+./usr/share/locale/ru_RU.UTF-8
+./usr/share/locale/ru_RU.UTF-8/LC_CTYPE
 ./usr/share/locale/sk_SK.ISO8859-2
 ./usr/share/locale/sk_SK.ISO8859-2/LC_CTYPE
 ./usr/share/locale/sl_SI.ISO8859-2
@@ -3182,12 +3208,18 @@
 ./usr/share/locale/sv_SE.ISO8859-1/LC_CTYPE
 ./usr/share/locale/sv_SE.ISO8859-15
 ./usr/share/locale/sv_SE.ISO8859-15/LC_CTYPE
+./usr/share/locale/sv_SE.UTF-8
+./usr/share/locale/sv_SE.UTF-8/LC_CTYPE
 ./usr/share/locale/uk_UA.KOI8-U
 ./usr/share/locale/uk_UA.KOI8-U/LC_CTYPE
 ./usr/share/locale/zh_CN.GB18030
+./usr/share/locale/zh_CN.UTF-8
+./usr/share/locale/zh_CN.UTF-8/LC_CTYPE
 ./usr/share/locale/zh_CN.eucCN
 ./usr/share/locale/zh_TW.BIG5
 ./usr/share/locale/zh_TW.Big5
+./usr/share/locale/zh_TW.UTF-8
+./usr/share/locale/zh_TW.UTF-8/LC_CTYPE
 ./usr/share/locale/zh_TW.eucTW
 ./usr/share/man
 ./usr/share/man/COPYRIGHT
diff --git a/distrib/sets/lists/comp/md.alpha b/distrib/sets/lists/comp/md.alpha
index 0ff7ade7969..240a1d61093 100644
--- a/distrib/sets/lists/comp/md.alpha
+++ b/distrib/sets/lists/comp/md.alpha
@@ -251,7 +251,6 @@
 ./usr/lib/libpthread_pic.a
 ./usr/lib/libreadline_pic.a
 ./usr/lib/librpcsvc_pic.a
-./usr/lib/libsectok_pic.a
 ./usr/lib/libskey_pic.a
 ./usr/lib/libsndio_pic.a
 ./usr/lib/libssl_pic.a
diff --git a/distrib/sets/lists/comp/md.amd64 b/distrib/sets/lists/comp/md.amd64
index 4cc6127dea1..42e29ea6462 100644
--- a/distrib/sets/lists/comp/md.amd64
+++ b/distrib/sets/lists/comp/md.amd64
@@ -670,7 +670,6 @@
 ./usr/lib/libpthread_pic.a
 ./usr/lib/libreadline_pic.a
 ./usr/lib/librpcsvc_pic.a
-./usr/lib/libsectok_pic.a
 ./usr/lib/libskey_pic.a
 ./usr/lib/libsndio_pic.a
 ./usr/lib/libssl_pic.a
diff --git a/distrib/sets/lists/comp/md.armish b/distrib/sets/lists/comp/md.armish
index 9ef532cb660..6cb0446dccb 100644
--- a/distrib/sets/lists/comp/md.armish
+++ b/distrib/sets/lists/comp/md.armish
@@ -290,7 +290,6 @@
 ./usr/lib/libpthread_pic.a
 ./usr/lib/libreadline_pic.a
 ./usr/lib/librpcsvc_pic.a
-./usr/lib/libsectok_pic.a
 ./usr/lib/libskey_pic.a
 ./usr/lib/libsndio_pic.a
 ./usr/lib/libssl_pic.a
diff --git a/distrib/sets/lists/comp/md.hp300 b/distrib/sets/lists/comp/md.hp300
index a590b87b256..ccf8b1f036a 100644
--- a/distrib/sets/lists/comp/md.hp300
+++ b/distrib/sets/lists/comp/md.hp300
@@ -239,7 +239,6 @@
 ./usr/lib/libpthread_pic.a
 ./usr/lib/libreadline_pic.a
 ./usr/lib/librpcsvc_pic.a
-./usr/lib/libsectok_pic.a
 ./usr/lib/libskey_pic.a
 ./usr/lib/libsndio_pic.a
 ./usr/lib/libssl_pic.a
diff --git a/distrib/sets/lists/comp/md.hppa b/distrib/sets/lists/comp/md.hppa
index 20638eb2c0d..6393dad0fab 100644
--- a/distrib/sets/lists/comp/md.hppa
+++ b/distrib/sets/lists/comp/md.hppa
@@ -642,7 +642,6 @@
 ./usr/lib/libpthread_pic.a
 ./usr/lib/libreadline_pic.a
 ./usr/lib/librpcsvc_pic.a
-./usr/lib/libsectok_pic.a
 ./usr/lib/libskey_pic.a
 ./usr/lib/libsndio_pic.a
 ./usr/lib/libssl_pic.a
diff --git a/distrib/sets/lists/comp/md.hppa64 b/distrib/sets/lists/comp/md.hppa64
index 2b8baacbc56..c4bc787f016 100644
--- a/distrib/sets/lists/comp/md.hppa64
+++ b/distrib/sets/lists/comp/md.hppa64
@@ -247,7 +247,6 @@
 ./usr/lib/libpthread_pic.a
 ./usr/lib/libreadline_pic.a
 ./usr/lib/librpcsvc_pic.a
-./usr/lib/libsectok_pic.a
 ./usr/lib/libskey_pic.a
 ./usr/lib/libsndio_pic.a
 ./usr/lib/libssl_pic.a
diff --git a/distrib/sets/lists/comp/md.i386 b/distrib/sets/lists/comp/md.i386
index 259a002278c..7c43b720f7f 100644
--- a/distrib/sets/lists/comp/md.i386
+++ b/distrib/sets/lists/comp/md.i386
@@ -672,7 +672,6 @@
 ./usr/lib/libpthread_pic.a
 ./usr/lib/libreadline_pic.a
 ./usr/lib/librpcsvc_pic.a
-./usr/lib/libsectok_pic.a
 ./usr/lib/libskey_pic.a
 ./usr/lib/libsndio_pic.a
 ./usr/lib/libssl_pic.a
diff --git a/distrib/sets/lists/comp/md.landisk b/distrib/sets/lists/comp/md.landisk
index 3110799af11..f4258e3bde2 100644
--- a/distrib/sets/lists/comp/md.landisk
+++ b/distrib/sets/lists/comp/md.landisk
@@ -303,7 +303,6 @@
 ./usr/lib/libpthread_pic.a
 ./usr/lib/libreadline_pic.a
 ./usr/lib/librpcsvc_pic.a
-./usr/lib/libsectok_pic.a
 ./usr/lib/libskey_pic.a
 ./usr/lib/libsndio_pic.a
 ./usr/lib/libssl_pic.a
diff --git a/distrib/sets/lists/comp/md.mac68k b/distrib/sets/lists/comp/md.mac68k
index 245451b62d9..f9785186366 100644
--- a/distrib/sets/lists/comp/md.mac68k
+++ b/distrib/sets/lists/comp/md.mac68k
@@ -243,7 +243,6 @@
 ./usr/lib/libpthread_pic.a
 ./usr/lib/libreadline_pic.a
 ./usr/lib/librpcsvc_pic.a
-./usr/lib/libsectok_pic.a
 ./usr/lib/libskey_pic.a
 ./usr/lib/libsndio_pic.a
 ./usr/lib/libssl_pic.a
diff --git a/distrib/sets/lists/comp/md.macppc b/distrib/sets/lists/comp/md.macppc
index 631fb9ca86e..32d78cc4d69 100644
--- a/distrib/sets/lists/comp/md.macppc
+++ b/distrib/sets/lists/comp/md.macppc
@@ -683,7 +683,6 @@
 ./usr/lib/libpthread_pic.a
 ./usr/lib/libreadline_pic.a
 ./usr/lib/librpcsvc_pic.a
-./usr/lib/libsectok_pic.a
 ./usr/lib/libskey_pic.a
 ./usr/lib/libsndio_pic.a
 ./usr/lib/libssl_pic.a
diff --git a/distrib/sets/lists/comp/md.mvme68k b/distrib/sets/lists/comp/md.mvme68k
index 334859d324b..a517ea86ab8 100644
--- a/distrib/sets/lists/comp/md.mvme68k
+++ b/distrib/sets/lists/comp/md.mvme68k
@@ -241,7 +241,6 @@
 ./usr/lib/libpthread_pic.a
 ./usr/lib/libreadline_pic.a
 ./usr/lib/librpcsvc_pic.a
-./usr/lib/libsectok_pic.a
 ./usr/lib/libskey_pic.a
 ./usr/lib/libsndio_pic.a
 ./usr/lib/libssl_pic.a
diff --git a/distrib/sets/lists/comp/md.mvmeppc b/distrib/sets/lists/comp/md.mvmeppc
index e66a8f35008..5d16f6b1ef6 100644
--- a/distrib/sets/lists/comp/md.mvmeppc
+++ b/distrib/sets/lists/comp/md.mvmeppc
@@ -204,7 +204,6 @@
 ./usr/lib/libpthread_pic.a
 ./usr/lib/libreadline_pic.a
 ./usr/lib/librpcsvc_pic.a
-./usr/lib/libsectok_pic.a
 ./usr/lib/libskey_pic.a
 ./usr/lib/libsndio_pic.a
 ./usr/lib/libssl_pic.a
diff --git a/distrib/sets/lists/comp/md.palm b/distrib/sets/lists/comp/md.palm
index 7356a5d90f7..378222237fb 100644
--- a/distrib/sets/lists/comp/md.palm
+++ b/distrib/sets/lists/comp/md.palm
@@ -291,7 +291,6 @@
 ./usr/lib/libpthread_pic.a
 ./usr/lib/libreadline_pic.a
 ./usr/lib/librpcsvc_pic.a
-./usr/lib/libsectok_pic.a
 ./usr/lib/libskey_pic.a
 ./usr/lib/libsndio_pic.a
 ./usr/lib/libssl_pic.a
diff --git a/distrib/sets/lists/comp/md.socppc b/distrib/sets/lists/comp/md.socppc
index 5b4f11baf4d..c9dd49b810a 100644
--- a/distrib/sets/lists/comp/md.socppc
+++ b/distrib/sets/lists/comp/md.socppc
@@ -677,7 +677,6 @@
 ./usr/lib/libpthread_pic.a
 ./usr/lib/libreadline_pic.a
 ./usr/lib/librpcsvc_pic.a
-./usr/lib/libsectok_pic.a
 ./usr/lib/libskey_pic.a
 ./usr/lib/libsndio_pic.a
 ./usr/lib/libssl_pic.a
diff --git a/distrib/sets/lists/comp/md.sparc b/distrib/sets/lists/comp/md.sparc
index 0207fe600c1..b2f4fef8383 100644
--- a/distrib/sets/lists/comp/md.sparc
+++ b/distrib/sets/lists/comp/md.sparc
@@ -227,7 +227,6 @@
 ./usr/lib/libpthread_pic.a
 ./usr/lib/libreadline_pic.a
 ./usr/lib/librpcsvc_pic.a
-./usr/lib/libsectok_pic.a
 ./usr/lib/libskey_pic.a
 ./usr/lib/libsndio_pic.a
 ./usr/lib/libssl_pic.a
diff --git a/distrib/sets/lists/comp/md.sparc64 b/distrib/sets/lists/comp/md.sparc64
index 83b0fad0691..04efafe0579 100644
--- a/distrib/sets/lists/comp/md.sparc64
+++ b/distrib/sets/lists/comp/md.sparc64
@@ -648,7 +648,6 @@
 ./usr/lib/libpthread_pic.a
 ./usr/lib/libreadline_pic.a
 ./usr/lib/librpcsvc_pic.a
-./usr/lib/libsectok_pic.a
 ./usr/lib/libskey_pic.a
 ./usr/lib/libsndio_pic.a
 ./usr/lib/libssl_pic.a
diff --git a/distrib/sets/lists/comp/md.zaurus b/distrib/sets/lists/comp/md.zaurus
index 00c7ba69833..b73104b3fd1 100644
--- a/distrib/sets/lists/comp/md.zaurus
+++ b/distrib/sets/lists/comp/md.zaurus
@@ -291,7 +291,6 @@
 ./usr/lib/libpthread_pic.a
 ./usr/lib/libreadline_pic.a
 ./usr/lib/librpcsvc_pic.a
-./usr/lib/libsectok_pic.a
 ./usr/lib/libskey_pic.a
 ./usr/lib/libsndio_pic.a
 ./usr/lib/libssl_pic.a
diff --git a/distrib/sets/lists/comp/mi b/distrib/sets/lists/comp/mi
index 716dceedb8a..960c81174b1 100644
--- a/distrib/sets/lists/comp/mi
+++ b/distrib/sets/lists/comp/mi
@@ -539,6 +539,8 @@
 ./usr/include/dev/pci/fmsvar.h
 ./usr/include/dev/pci/gcu.h
 ./usr/include/dev/pci/gcu_reg.h
+./usr/include/dev/pci/glxreg.h
+./usr/include/dev/pci/glxvar.h
 ./usr/include/dev/pci/hifn7751reg.h
 ./usr/include/dev/pci/hifn7751var.h
 ./usr/include/dev/pci/i82365_pcivar.h
@@ -1442,7 +1444,6 @@
 ./usr/include/scsi/ses.h
 ./usr/include/scsi/ssvar.h
 ./usr/include/search.h
-./usr/include/sectok.h
 ./usr/include/semaphore.h
 ./usr/include/setjmp.h
 ./usr/include/sgtty.h
@@ -1799,8 +1800,6 @@
 ./usr/lib/libreadline_p.a
 ./usr/lib/librpcsvc.a
 ./usr/lib/librpcsvc_p.a
-./usr/lib/libsectok.a
-./usr/lib/libsectok_p.a
 ./usr/lib/libskey.a
 ./usr/lib/libskey_p.a
 ./usr/lib/libsndio.a
@@ -1847,7 +1846,6 @@
 ./usr/libdata/lint/llib-lposix.ln
 ./usr/libdata/lint/llib-lpthread.ln
 ./usr/libdata/lint/llib-lrpcsvc.ln
-./usr/libdata/lint/llib-lsectok.ln
 ./usr/libdata/lint/llib-lskey.ln
 ./usr/libdata/lint/llib-lssl.ln
 ./usr/libdata/lint/llib-lstdc.ln
@@ -5529,26 +5527,6 @@
 ./usr/share/man/cat3/scrl.0
 ./usr/share/man/cat3/scroll.0
 ./usr/share/man/cat3/scrollok.0
-./usr/share/man/cat3/sectok.0
-./usr/share/man/cat3/sectok_apdu.0
-./usr/share/man/cat3/sectok_cardpresent.0
-./usr/share/man/cat3/sectok_close.0
-./usr/share/man/cat3/sectok_dump_reply.0
-./usr/share/man/cat3/sectok_fdump_reply.0
-./usr/share/man/cat3/sectok_fmt_fid.0
-./usr/share/man/cat3/sectok_friendly_open.0
-./usr/share/man/cat3/sectok_get_input.0
-./usr/share/man/cat3/sectok_get_ins.0
-./usr/share/man/cat3/sectok_get_sw.0
-./usr/share/man/cat3/sectok_open.0
-./usr/share/man/cat3/sectok_parse_atr.0
-./usr/share/man/cat3/sectok_parse_fname.0
-./usr/share/man/cat3/sectok_parse_input.0
-./usr/share/man/cat3/sectok_print_sw.0
-./usr/share/man/cat3/sectok_reset.0
-./usr/share/man/cat3/sectok_selectfile.0
-./usr/share/man/cat3/sectok_swOK.0
-./usr/share/man/cat3/sectok_xopen.0
 ./usr/share/man/cat3/secure_path.0
 ./usr/share/man/cat3/seed48.0
 ./usr/share/man/cat3/seekdir.0
diff --git a/distrib/sets/lists/man/mi b/distrib/sets/lists/man/mi
index f223aa6e992..72791856a0e 100644
--- a/distrib/sets/lists/man/mi
+++ b/distrib/sets/lists/man/mi
@@ -731,7 +731,6 @@
 ./usr/share/man/cat1/scp.0
 ./usr/share/man/cat1/script.0
 ./usr/share/man/cat1/sdiff.0
-./usr/share/man/cat1/sectok.0
 ./usr/share/man/cat1/sed.0
 ./usr/share/man/cat1/sendbug.0
 ./usr/share/man/cat1/sftp.0
diff --git a/distrib/sets/lists/misc/mi b/distrib/sets/lists/misc/mi
index 8ac90b4ce24..e69de29bb2d 100644
--- a/distrib/sets/lists/misc/mi
+++ b/distrib/sets/lists/misc/mi
@@ -1,72 +0,0 @@
-./usr/share/doc/README
-./usr/share/doc/psd
-./usr/share/doc/psd/12.make
-./usr/share/doc/psd/12.make/Makefile
-./usr/share/doc/psd/12.make/tutorial.ms
-./usr/share/doc/psd/15.yacc
-./usr/share/doc/psd/15.yacc/Makefile
-./usr/share/doc/psd/15.yacc/ss..
-./usr/share/doc/psd/15.yacc/ss0
-./usr/share/doc/psd/15.yacc/ss1
-./usr/share/doc/psd/15.yacc/ss2
-./usr/share/doc/psd/15.yacc/ss3
-./usr/share/doc/psd/15.yacc/ss4
-./usr/share/doc/psd/15.yacc/ss5
-./usr/share/doc/psd/15.yacc/ss6
-./usr/share/doc/psd/15.yacc/ss7
-./usr/share/doc/psd/15.yacc/ss8
-./usr/share/doc/psd/15.yacc/ss9
-./usr/share/doc/psd/15.yacc/ssA
-./usr/share/doc/psd/15.yacc/ssB
-./usr/share/doc/psd/15.yacc/ssa
-./usr/share/doc/psd/15.yacc/ssb
-./usr/share/doc/psd/15.yacc/ssc
-./usr/share/doc/psd/15.yacc/ssd
-./usr/share/doc/psd/16.lex
-./usr/share/doc/psd/16.lex/Makefile
-./usr/share/doc/psd/16.lex/lex.ms
-./usr/share/doc/psd/18.gprof
-./usr/share/doc/psd/18.gprof/Makefile
-./usr/share/doc/psd/18.gprof/abstract.me
-./usr/share/doc/psd/18.gprof/gathering.me
-./usr/share/doc/psd/18.gprof/header.me
-./usr/share/doc/psd/18.gprof/intro.me
-./usr/share/doc/psd/18.gprof/postp.me
-./usr/share/doc/psd/18.gprof/postp1.pic
-./usr/share/doc/psd/18.gprof/postp2.pic
-./usr/share/doc/psd/18.gprof/postp3.pic
-./usr/share/doc/psd/18.gprof/pres1.pic
-./usr/share/doc/psd/18.gprof/pres2.pic
-./usr/share/doc/psd/18.gprof/present.me
-./usr/share/doc/psd/18.gprof/profiling.me
-./usr/share/doc/psd/18.gprof/refs.me
-./usr/share/doc/smm
-./usr/share/doc/smm/08.sendmailop
-./usr/share/doc/smm/08.sendmailop/Makefile
-./usr/share/doc/smm/08.sendmailop/op.me
-./usr/share/doc/usd
-./usr/share/doc/usd/06.bc
-./usr/share/doc/usd/06.bc/Makefile
-./usr/share/doc/usd/06.bc/bc
-./usr/share/doc/usd/11.edit
-./usr/share/doc/usd/11.edit/Makefile
-./usr/share/doc/usd/11.edit/edittut.ms
-./usr/share/doc/usd/12.vi
-./usr/share/doc/usd/12.vi/Makefile
-./usr/share/doc/usd/12.vi/vi.apwh.ms
-./usr/share/doc/usd/12.vi/vi.chars
-./usr/share/doc/usd/12.vi/vi.in
-./usr/share/doc/usd/12.vi/vi.summary
-./usr/share/doc/usd/13.ex
-./usr/share/doc/usd/13.ex/Makefile
-./usr/share/doc/usd/13.ex/ex.rm
-./usr/share/doc/usd/13.ex/ex.summary
-./usr/share/doc/usd/13.viref
-./usr/share/doc/usd/13.viref/Makefile
-./usr/share/doc/usd/13.viref/ex.cmd.roff
-./usr/share/doc/usd/13.viref/merge.awk
-./usr/share/doc/usd/13.viref/ref.so
-./usr/share/doc/usd/13.viref/set.opt.roff
-./usr/share/doc/usd/13.viref/spell.ok
-./usr/share/doc/usd/13.viref/vi.cmd.roff
-./usr/share/doc/usd/13.viref/vi.ref
diff --git a/distrib/sets/makeflist b/distrib/sets/makeflist
index b910a9fde3e..570e2295b5f 100644
--- a/distrib/sets/makeflist
+++ b/distrib/sets/makeflist
@@ -1,5 +1,5 @@
 #!/bin/sh
-#	$OpenBSD: makeflist,v 1.9 2003/07/02 02:08:02 avsm Exp $
+#	$OpenBSD: makeflist,v 1.10 2010/10/18 04:11:15 deraadt Exp $
 #
 # Copyright (c) 2001 Theo de Raadt
 # All rights reserved.
@@ -33,6 +33,5 @@ for i in base comp etc game; do
 	cat ./lists/$i/mi ./lists/$i/md.${arch} >> $TMP
 done
 cat ./lists/man/mi ./lists/man/md.${arch} >> $TMP
-cat ./lists/misc/mi ./lists/misc/md.${arch} >> $TMP
 
 sort $TMP
diff --git a/distrib/sets/maketars b/distrib/sets/maketars
index bacf3a06b58..e20d4f9e6e5 100644
--- a/distrib/sets/maketars
+++ b/distrib/sets/maketars
@@ -1,5 +1,5 @@
 #!/bin/sh
-#	$OpenBSD: maketars,v 1.19 2006/12/09 21:12:54 deraadt Exp $
+#	$OpenBSD: maketars,v 1.20 2010/10/18 04:11:15 deraadt Exp $
 #
 # Copyright (c) 2001 Theo de Raadt
 # All rights reserved.
@@ -53,7 +53,7 @@ trap 'rm -f $TMP $TMP2; exit 1' 1 15
 
 cd $fsdir
 
-for i in base comp etc game man misc; do
+for i in base comp etc game man; do
 	echo -n "$i: "
 	sort ${lists}/$i/mi ${lists}/$i/md.${arch} > $TMP
 	cat $TMP | grep '^./usr/lib/lib' > $TMP2