sync

21 files changed, 1 insertions, 100 deletions

diff --git a/distrib/sets/lists/base/md.alpha b/distrib/sets/lists/base/md.alpha
index b61843f2e64..f8c45efb598 100644
--- a/distrib/sets/lists/base/md.alpha
+++ b/distrib/sets/lists/base/md.alpha
@@ -988,10 +988,6 @@
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/ic/ramdac.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/ic/revar.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/ic/rf3000reg.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/dev/ic/rln.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/dev/ic/rlncmd.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/dev/ic/rlnreg.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/dev/ic/rlnvar.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/ic/rt2560reg.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/ic/rt2560var.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/ic/rt2661reg.ph
@@ -1899,7 +1895,6 @@
 ./usr/libdata/perl5/site_perl/alpha-openbsd/netinet6/tcpipv6.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/netmpls
 ./usr/libdata/perl5/site_perl/alpha-openbsd/netmpls/mpls.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/netmpls/mpls_var.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/netnatm
 ./usr/libdata/perl5/site_perl/alpha-openbsd/netnatm/natm.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/nfs
diff --git a/distrib/sets/lists/base/md.amd64 b/distrib/sets/lists/base/md.amd64
index 79121e6d8ee..323a0cc602f 100644
--- a/distrib/sets/lists/base/md.amd64
+++ b/distrib/sets/lists/base/md.amd64
@@ -1011,10 +1011,6 @@
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/ic/ramdac.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/ic/revar.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/ic/rf3000reg.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/dev/ic/rln.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/dev/ic/rlncmd.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/dev/ic/rlnreg.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/dev/ic/rlnvar.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/ic/rt2560reg.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/ic/rt2560var.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/ic/rt2661reg.ph
@@ -1924,7 +1920,6 @@
 ./usr/libdata/perl5/site_perl/amd64-openbsd/netinet6/tcpipv6.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/netmpls
 ./usr/libdata/perl5/site_perl/amd64-openbsd/netmpls/mpls.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/netmpls/mpls_var.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/netnatm
 ./usr/libdata/perl5/site_perl/amd64-openbsd/netnatm/natm.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/nfs
diff --git a/distrib/sets/lists/base/md.armish b/distrib/sets/lists/base/md.armish
index fb177f401cf..2c6e234199d 100644
--- a/distrib/sets/lists/base/md.armish
+++ b/distrib/sets/lists/base/md.armish
@@ -1013,10 +1013,6 @@
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/ic/ramdac.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/ic/revar.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/ic/rf3000reg.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/dev/ic/rln.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/dev/ic/rlncmd.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/dev/ic/rlnreg.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/dev/ic/rlnvar.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/ic/rt2560reg.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/ic/rt2560var.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/ic/rt2661reg.ph
@@ -1924,7 +1920,6 @@
 ./usr/libdata/perl5/site_perl/arm-openbsd/netinet6/tcpipv6.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/netmpls
 ./usr/libdata/perl5/site_perl/arm-openbsd/netmpls/mpls.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/netmpls/mpls_var.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/netnatm
 ./usr/libdata/perl5/site_perl/arm-openbsd/netnatm/natm.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/nfs
diff --git a/distrib/sets/lists/base/md.aviion b/distrib/sets/lists/base/md.aviion
index 8522ef814b0..e87c5e576cb 100644
--- a/distrib/sets/lists/base/md.aviion
+++ b/distrib/sets/lists/base/md.aviion
@@ -865,10 +865,6 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ic/ramdac.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ic/revar.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ic/rf3000reg.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ic/rln.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ic/rlncmd.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ic/rlnreg.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ic/rlnvar.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ic/rt2560reg.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ic/rt2560var.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ic/rt2661reg.ph
@@ -1803,7 +1799,6 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/netinet6/tcpipv6.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/netmpls
 ./usr/libdata/perl5/site_perl/m88k-openbsd/netmpls/mpls.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/netmpls/mpls_var.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/netnatm
 ./usr/libdata/perl5/site_perl/m88k-openbsd/netnatm/natm.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/nfs
diff --git a/distrib/sets/lists/base/md.hp300 b/distrib/sets/lists/base/md.hp300
index 2ed159376c7..c5a195eed7f 100644
--- a/distrib/sets/lists/base/md.hp300
+++ b/distrib/sets/lists/base/md.hp300
@@ -885,10 +885,6 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/ramdac.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/revar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/rf3000reg.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/rln.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/rlncmd.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/rlnreg.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/rlnvar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/rt2560reg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/rt2560var.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/rt2661reg.ph
@@ -1857,7 +1853,6 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet6/tcpipv6.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netmpls
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netmpls/mpls.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/netmpls/mpls_var.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netnatm
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netnatm/natm.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/nfs
diff --git a/distrib/sets/lists/base/md.hppa b/distrib/sets/lists/base/md.hppa
index d105fceccce..66afc5c1f28 100644
--- a/distrib/sets/lists/base/md.hppa
+++ b/distrib/sets/lists/base/md.hppa
@@ -936,10 +936,6 @@
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/ic/ramdac.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/ic/revar.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/ic/rf3000reg.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/dev/ic/rln.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/dev/ic/rlncmd.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/dev/ic/rlnreg.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/dev/ic/rlnvar.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/ic/rt2560reg.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/ic/rt2560var.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/ic/rt2661reg.ph
@@ -1899,7 +1895,6 @@
 ./usr/libdata/perl5/site_perl/hppa-openbsd/netinet6/tcpipv6.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/netmpls
 ./usr/libdata/perl5/site_perl/hppa-openbsd/netmpls/mpls.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/netmpls/mpls_var.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/netnatm
 ./usr/libdata/perl5/site_perl/hppa-openbsd/netnatm/natm.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/nfs
diff --git a/distrib/sets/lists/base/md.hppa64 b/distrib/sets/lists/base/md.hppa64
index 0785ffd3ebf..0ac8f17092d 100644
--- a/distrib/sets/lists/base/md.hppa64
+++ b/distrib/sets/lists/base/md.hppa64
@@ -936,10 +936,6 @@
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/ic/ramdac.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/ic/revar.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/ic/rf3000reg.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/ic/rln.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/ic/rlncmd.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/ic/rlnreg.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/ic/rlnvar.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/ic/rt2560reg.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/ic/rt2560var.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/ic/rt2661reg.ph
@@ -1898,7 +1894,6 @@
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/netinet6/tcpipv6.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/netmpls
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/netmpls/mpls.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/netmpls/mpls_var.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/netnatm
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/netnatm/natm.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/nfs
diff --git a/distrib/sets/lists/base/md.i386 b/distrib/sets/lists/base/md.i386
index 5b61f039db3..ab835375346 100644
--- a/distrib/sets/lists/base/md.i386
+++ b/distrib/sets/lists/base/md.i386
@@ -944,10 +944,6 @@
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/ic/ramdac.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/ic/revar.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/ic/rf3000reg.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/dev/ic/rln.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/dev/ic/rlncmd.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/dev/ic/rlnreg.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/dev/ic/rlnvar.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/ic/rt2560reg.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/ic/rt2560var.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/ic/rt2661reg.ph
@@ -1930,7 +1926,6 @@
 ./usr/libdata/perl5/site_perl/i386-openbsd/netinet6/tcpipv6.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/netmpls
 ./usr/libdata/perl5/site_perl/i386-openbsd/netmpls/mpls.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/netmpls/mpls_var.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/netnatm
 ./usr/libdata/perl5/site_perl/i386-openbsd/netnatm/natm.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/nfs
diff --git a/distrib/sets/lists/base/md.landisk b/distrib/sets/lists/base/md.landisk
index d3a4d2c4cc1..6b3f11bba1e 100644
--- a/distrib/sets/lists/base/md.landisk
+++ b/distrib/sets/lists/base/md.landisk
@@ -904,10 +904,6 @@
 ./usr/libdata/perl5/site_perl/sh-openbsd/dev/ic/ramdac.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/dev/ic/revar.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/dev/ic/rf3000reg.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/dev/ic/rln.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/dev/ic/rlncmd.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/dev/ic/rlnreg.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/dev/ic/rlnvar.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/dev/ic/rt2560reg.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/dev/ic/rt2560var.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/dev/ic/rt2661reg.ph
@@ -1859,7 +1855,6 @@
 ./usr/libdata/perl5/site_perl/sh-openbsd/netinet6/tcpipv6.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/netmpls
 ./usr/libdata/perl5/site_perl/sh-openbsd/netmpls/mpls.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/netmpls/mpls_var.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/netnatm
 ./usr/libdata/perl5/site_perl/sh-openbsd/netnatm/natm.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/nfs
diff --git a/distrib/sets/lists/base/md.luna88k b/distrib/sets/lists/base/md.luna88k
index 87e3c2a2542..3a40c477fc3 100644
--- a/distrib/sets/lists/base/md.luna88k
+++ b/distrib/sets/lists/base/md.luna88k
@@ -814,10 +814,6 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ic/ramdac.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ic/revar.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ic/rf3000reg.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ic/rln.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ic/rlncmd.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ic/rlnreg.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ic/rlnvar.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ic/rt2560reg.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ic/rt2560var.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ic/rt2661reg.ph
@@ -1798,7 +1794,6 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/netinet6/tcpipv6.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/netmpls
 ./usr/libdata/perl5/site_perl/m88k-openbsd/netmpls/mpls.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/netmpls/mpls_var.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/netnatm
 ./usr/libdata/perl5/site_perl/m88k-openbsd/netnatm/natm.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/nfs
diff --git a/distrib/sets/lists/base/md.mac68k b/distrib/sets/lists/base/md.mac68k
index 88af5f60586..340987b9464 100644
--- a/distrib/sets/lists/base/md.mac68k
+++ b/distrib/sets/lists/base/md.mac68k
@@ -886,10 +886,6 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/ramdac.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/revar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/rf3000reg.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/rln.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/rlncmd.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/rlnreg.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/rlnvar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/rt2560reg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/rt2560var.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/rt2661reg.ph
@@ -1861,7 +1857,6 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet6/tcpipv6.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netmpls
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netmpls/mpls.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/netmpls/mpls_var.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netnatm
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netnatm/natm.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/nfs
diff --git a/distrib/sets/lists/base/md.macppc b/distrib/sets/lists/base/md.macppc
index 9aea49c95c6..77a523324a8 100644
--- a/distrib/sets/lists/base/md.macppc
+++ b/distrib/sets/lists/base/md.macppc
@@ -940,10 +940,6 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/ramdac.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/revar.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/rf3000reg.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/rln.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/rlncmd.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/rlnreg.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/rlnvar.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/rt2560reg.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/rt2560var.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/rt2661reg.ph
@@ -1906,7 +1902,6 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/netinet6/tcpipv6.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/netmpls
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/netmpls/mpls.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/netmpls/mpls_var.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/netnatm
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/netnatm/natm.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/nfs
diff --git a/distrib/sets/lists/base/md.mvme68k b/distrib/sets/lists/base/md.mvme68k
index 4e880eed9f2..bcccc66df2f 100644
--- a/distrib/sets/lists/base/md.mvme68k
+++ b/distrib/sets/lists/base/md.mvme68k
@@ -883,10 +883,6 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/ramdac.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/revar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/rf3000reg.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/rln.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/rlncmd.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/rlnreg.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/rlnvar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/rt2560reg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/rt2560var.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/rt2661reg.ph
@@ -1857,7 +1853,6 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet6/tcpipv6.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netmpls
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netmpls/mpls.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/netmpls/mpls_var.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netnatm
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netnatm/natm.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/nfs
diff --git a/distrib/sets/lists/base/md.mvme88k b/distrib/sets/lists/base/md.mvme88k
index 49f84ba62eb..7f0c8dafb8d 100644
--- a/distrib/sets/lists/base/md.mvme88k
+++ b/distrib/sets/lists/base/md.mvme88k
@@ -813,10 +813,6 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ic/ramdac.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ic/revar.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ic/rf3000reg.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ic/rln.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ic/rlncmd.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ic/rlnreg.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ic/rlnvar.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ic/rt2560reg.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ic/rt2560var.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ic/rt2661reg.ph
@@ -1807,7 +1803,6 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/netinet6/tcpipv6.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/netmpls
 ./usr/libdata/perl5/site_perl/m88k-openbsd/netmpls/mpls.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/netmpls/mpls_var.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/netnatm
 ./usr/libdata/perl5/site_perl/m88k-openbsd/netnatm/natm.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/nfs
diff --git a/distrib/sets/lists/base/md.mvmeppc b/distrib/sets/lists/base/md.mvmeppc
index dfc259d159a..2ebfe414250 100644
--- a/distrib/sets/lists/base/md.mvmeppc
+++ b/distrib/sets/lists/base/md.mvmeppc
@@ -922,10 +922,6 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/ramdac.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/revar.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/rf3000reg.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/rln.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/rlncmd.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/rlnreg.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/rlnvar.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/rt2560reg.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/rt2560var.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/rt2661reg.ph
@@ -1813,7 +1809,6 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/netinet6/tcpipv6.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/netmpls
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/netmpls/mpls.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/netmpls/mpls_var.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/netnatm
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/netnatm/natm.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/nfs
diff --git a/distrib/sets/lists/base/md.sgi b/distrib/sets/lists/base/md.sgi
index 185e1459058..5a7451c42d5 100644
--- a/distrib/sets/lists/base/md.sgi
+++ b/distrib/sets/lists/base/md.sgi
@@ -940,10 +940,6 @@
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/ic/ramdac.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/ic/revar.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/ic/rf3000reg.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/dev/ic/rln.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/dev/ic/rlncmd.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/dev/ic/rlnreg.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/dev/ic/rlnvar.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/ic/rt2560reg.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/ic/rt2560var.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/ic/rt2661reg.ph
@@ -1891,7 +1887,6 @@
 ./usr/libdata/perl5/site_perl/mips64-openbsd/netinet6/tcpipv6.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/netmpls
 ./usr/libdata/perl5/site_perl/mips64-openbsd/netmpls/mpls.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/netmpls/mpls_var.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/netnatm
 ./usr/libdata/perl5/site_perl/mips64-openbsd/netnatm/natm.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/nfs
diff --git a/distrib/sets/lists/base/md.sparc b/distrib/sets/lists/base/md.sparc
index 0d028fd9dc4..113f30b0307 100644
--- a/distrib/sets/lists/base/md.sparc
+++ b/distrib/sets/lists/base/md.sparc
@@ -382,10 +382,6 @@
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/ic/ramdac.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/ic/revar.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/ic/rf3000reg.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/dev/ic/rln.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/dev/ic/rlncmd.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/dev/ic/rlnreg.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/dev/ic/rlnvar.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/ic/rt2560reg.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/ic/rt2560var.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/ic/rt2661reg.ph
@@ -1278,7 +1274,6 @@
 ./usr/libdata/perl5/site_perl/sparc-openbsd/netinet6/tcpipv6.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/netmpls
 ./usr/libdata/perl5/site_perl/sparc-openbsd/netmpls/mpls.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/netmpls/mpls_var.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/netnatm
 ./usr/libdata/perl5/site_perl/sparc-openbsd/netnatm/natm.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/nfs
diff --git a/distrib/sets/lists/base/md.sparc64 b/distrib/sets/lists/base/md.sparc64
index 56293bc6330..85c3357f0be 100644
--- a/distrib/sets/lists/base/md.sparc64
+++ b/distrib/sets/lists/base/md.sparc64
@@ -425,10 +425,6 @@
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/ic/ramdac.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/ic/revar.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/ic/rf3000reg.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/ic/rln.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/ic/rlncmd.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/ic/rlnreg.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/ic/rlnvar.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/ic/rt2560reg.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/ic/rt2560var.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/ic/rt2661reg.ph
@@ -1336,7 +1332,6 @@
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/netinet6/tcpipv6.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/netmpls
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/netmpls/mpls.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/netmpls/mpls_var.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/netnatm
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/netnatm/natm.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/nfs
diff --git a/distrib/sets/lists/base/md.vax b/distrib/sets/lists/base/md.vax
index da71db90b63..58a000eaac6 100644
--- a/distrib/sets/lists/base/md.vax
+++ b/distrib/sets/lists/base/md.vax
@@ -318,10 +318,6 @@
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/ic/ramdac.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/ic/revar.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/ic/rf3000reg.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/dev/ic/rln.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/dev/ic/rlncmd.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/dev/ic/rlnreg.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/dev/ic/rlnvar.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/ic/rt2560reg.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/ic/rt2560var.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/ic/rt2661reg.ph
@@ -1212,7 +1208,6 @@
 ./usr/libdata/perl5/site_perl/vax-openbsd/netinet6/tcpipv6.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/netmpls
 ./usr/libdata/perl5/site_perl/vax-openbsd/netmpls/mpls.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/netmpls/mpls_var.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/netnatm
 ./usr/libdata/perl5/site_perl/vax-openbsd/netnatm/natm.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/nfs
diff --git a/distrib/sets/lists/base/md.zaurus b/distrib/sets/lists/base/md.zaurus
index 6f22e9979b5..f08441c1c3f 100644
--- a/distrib/sets/lists/base/md.zaurus
+++ b/distrib/sets/lists/base/md.zaurus
@@ -968,10 +968,6 @@
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/ic/ramdac.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/ic/revar.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/ic/rf3000reg.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/dev/ic/rln.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/dev/ic/rlncmd.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/dev/ic/rlnreg.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/dev/ic/rlnvar.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/ic/rt2560reg.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/ic/rt2560var.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/ic/rt2661reg.ph
@@ -1879,7 +1875,6 @@
 ./usr/libdata/perl5/site_perl/arm-openbsd/netinet6/tcpipv6.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/netmpls
 ./usr/libdata/perl5/site_perl/arm-openbsd/netmpls/mpls.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/netmpls/mpls_var.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/netnatm
 ./usr/libdata/perl5/site_perl/arm-openbsd/netnatm/natm.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/nfs
diff --git a/distrib/sets/lists/base/mi b/distrib/sets/lists/base/mi
index 648090eab96..c3d430192d3 100644
--- a/distrib/sets/lists/base/mi
+++ b/distrib/sets/lists/base/mi
@@ -1932,6 +1932,7 @@
 ./usr/sbin/sysctl
 ./usr/sbin/syslogc
 ./usr/sbin/syslogd
+./usr/sbin/sysmerge
 ./usr/sbin/tcpdchk
 ./usr/sbin/tcpdmatch
 ./usr/sbin/tcpdrop