sync

19 files changed, 19 insertions, 36 deletions

diff --git a/distrib/sets/lists/base/md.alpha b/distrib/sets/lists/base/md.alpha
index c9eba10effb..dc3997b62c2 100644
--- a/distrib/sets/lists/base/md.alpha
+++ b/distrib/sets/lists/base/md.alpha
@@ -950,8 +950,7 @@
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/ic/rtl80x9reg.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/ic/rtl80x9var.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/ic/rtl81x9reg.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/dev/ic/rtwphy.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/dev/ic/rtwphyio.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/dev/ic/rtl8225reg.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/ic/rtwreg.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/ic/rtwvar.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/ic/s3_617.ph
diff --git a/distrib/sets/lists/base/md.amd64 b/distrib/sets/lists/base/md.amd64
index 7e1cf116162..634189bbfb0 100644
--- a/distrib/sets/lists/base/md.amd64
+++ b/distrib/sets/lists/base/md.amd64
@@ -963,8 +963,7 @@
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/ic/rtl80x9reg.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/ic/rtl80x9var.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/ic/rtl81x9reg.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/dev/ic/rtwphy.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/dev/ic/rtwphyio.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/dev/ic/rtl8225reg.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/ic/rtwreg.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/ic/rtwvar.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/ic/s3_617.ph
diff --git a/distrib/sets/lists/base/md.cats b/distrib/sets/lists/base/md.cats
index 82d03b4184d..b977e9710aa 100644
--- a/distrib/sets/lists/base/md.cats
+++ b/distrib/sets/lists/base/md.cats
@@ -996,8 +996,7 @@
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/ic/rtl80x9reg.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/ic/rtl80x9var.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/ic/rtl81x9reg.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/dev/ic/rtwphy.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/dev/ic/rtwphyio.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/dev/ic/rtl8225reg.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/ic/rtwreg.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/ic/rtwvar.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/ic/s3_617.ph
diff --git a/distrib/sets/lists/base/md.hp300 b/distrib/sets/lists/base/md.hp300
index 559ff22dff8..e92211db192 100644
--- a/distrib/sets/lists/base/md.hp300
+++ b/distrib/sets/lists/base/md.hp300
@@ -857,8 +857,7 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/rtl80x9reg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/rtl80x9var.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/rtl81x9reg.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/rtwphy.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/rtwphyio.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/rtl8225reg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/rtwreg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/rtwvar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/s3_617.ph
diff --git a/distrib/sets/lists/base/md.hppa b/distrib/sets/lists/base/md.hppa
index 201e3d57b2b..cc763990cd0 100644
--- a/distrib/sets/lists/base/md.hppa
+++ b/distrib/sets/lists/base/md.hppa
@@ -894,8 +894,7 @@
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/ic/rtl80x9reg.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/ic/rtl80x9var.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/ic/rtl81x9reg.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/dev/ic/rtwphy.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/dev/ic/rtwphyio.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/dev/ic/rtl8225reg.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/ic/rtwreg.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/ic/rtwvar.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/ic/s3_617.ph
diff --git a/distrib/sets/lists/base/md.hppa64 b/distrib/sets/lists/base/md.hppa64
index 66588f3adcb..4bd5526b45d 100644
--- a/distrib/sets/lists/base/md.hppa64
+++ b/distrib/sets/lists/base/md.hppa64
@@ -894,8 +894,7 @@
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/ic/rtl80x9reg.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/ic/rtl80x9var.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/ic/rtl81x9reg.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/ic/rtwphy.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/ic/rtwphyio.ph
+./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/ic/rtl8225reg.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/ic/rtwreg.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/ic/rtwvar.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/ic/s3_617.ph
diff --git a/distrib/sets/lists/base/md.i386 b/distrib/sets/lists/base/md.i386
index 047f5601f17..d27f5c151e6 100644
--- a/distrib/sets/lists/base/md.i386
+++ b/distrib/sets/lists/base/md.i386
@@ -903,8 +903,7 @@
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/ic/rtl80x9reg.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/ic/rtl80x9var.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/ic/rtl81x9reg.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/dev/ic/rtwphy.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/dev/ic/rtwphyio.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/dev/ic/rtl8225reg.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/ic/rtwreg.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/ic/rtwvar.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/ic/s3_617.ph
diff --git a/distrib/sets/lists/base/md.luna88k b/distrib/sets/lists/base/md.luna88k
index cc951713ea5..27d812872e3 100644
--- a/distrib/sets/lists/base/md.luna88k
+++ b/distrib/sets/lists/base/md.luna88k
@@ -790,8 +790,7 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ic/rtl80x9reg.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ic/rtl80x9var.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ic/rtl81x9reg.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ic/rtwphy.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ic/rtwphyio.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ic/rtl8225reg.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ic/rtwreg.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ic/rtwvar.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ic/s3_617.ph
diff --git a/distrib/sets/lists/base/md.mac68k b/distrib/sets/lists/base/md.mac68k
index a825d5159a7..0ebb68d19c0 100644
--- a/distrib/sets/lists/base/md.mac68k
+++ b/distrib/sets/lists/base/md.mac68k
@@ -856,8 +856,7 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/rtl80x9reg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/rtl80x9var.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/rtl81x9reg.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/rtwphy.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/rtwphyio.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/rtl8225reg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/rtwreg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/rtwvar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/s3_617.ph
diff --git a/distrib/sets/lists/base/md.macppc b/distrib/sets/lists/base/md.macppc
index 4d37e9fcb0f..9811aefff51 100644
--- a/distrib/sets/lists/base/md.macppc
+++ b/distrib/sets/lists/base/md.macppc
@@ -900,8 +900,7 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/rtl80x9reg.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/rtl80x9var.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/rtl81x9reg.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/rtwphy.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/rtwphyio.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/rtl8225reg.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/rtwreg.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/rtwvar.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/s3_617.ph
diff --git a/distrib/sets/lists/base/md.mvme68k b/distrib/sets/lists/base/md.mvme68k
index 840ee88c766..5e476afc270 100644
--- a/distrib/sets/lists/base/md.mvme68k
+++ b/distrib/sets/lists/base/md.mvme68k
@@ -855,8 +855,7 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/rtl80x9reg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/rtl80x9var.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/rtl81x9reg.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/rtwphy.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/rtwphyio.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/rtl8225reg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/rtwreg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/rtwvar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/s3_617.ph
diff --git a/distrib/sets/lists/base/md.mvme88k b/distrib/sets/lists/base/md.mvme88k
index d6c06518919..8ed9cf7b2d6 100644
--- a/distrib/sets/lists/base/md.mvme88k
+++ b/distrib/sets/lists/base/md.mvme88k
@@ -789,8 +789,7 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ic/rtl80x9reg.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ic/rtl80x9var.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ic/rtl81x9reg.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ic/rtwphy.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ic/rtwphyio.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ic/rtl8225reg.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ic/rtwreg.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ic/rtwvar.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ic/s3_617.ph
diff --git a/distrib/sets/lists/base/md.mvmeppc b/distrib/sets/lists/base/md.mvmeppc
index de3ee74a4f4..8338487b37b 100644
--- a/distrib/sets/lists/base/md.mvmeppc
+++ b/distrib/sets/lists/base/md.mvmeppc
@@ -891,8 +891,7 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/rtl80x9reg.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/rtl80x9var.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/rtl81x9reg.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/rtwphy.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/rtwphyio.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/rtl8225reg.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/rtwreg.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/rtwvar.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/s3_617.ph
diff --git a/distrib/sets/lists/base/md.sgi b/distrib/sets/lists/base/md.sgi
index 88694b526c3..12bc8169f69 100644
--- a/distrib/sets/lists/base/md.sgi
+++ b/distrib/sets/lists/base/md.sgi
@@ -898,8 +898,7 @@
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/ic/rtl80x9reg.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/ic/rtl80x9var.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/ic/rtl81x9reg.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/dev/ic/rtwphy.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/dev/ic/rtwphyio.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/dev/ic/rtl8225reg.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/ic/rtwreg.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/ic/rtwvar.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/ic/s3_617.ph
diff --git a/distrib/sets/lists/base/md.sparc b/distrib/sets/lists/base/md.sparc
index 95e49a67ea1..9711e8be6fe 100644
--- a/distrib/sets/lists/base/md.sparc
+++ b/distrib/sets/lists/base/md.sparc
@@ -356,8 +356,7 @@
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/ic/rtl80x9reg.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/ic/rtl80x9var.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/ic/rtl81x9reg.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/dev/ic/rtwphy.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/dev/ic/rtwphyio.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/dev/ic/rtl8225reg.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/ic/rtwreg.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/ic/rtwvar.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/ic/s3_617.ph
diff --git a/distrib/sets/lists/base/md.sparc64 b/distrib/sets/lists/base/md.sparc64
index 43afae576db..3f8e6924b26 100644
--- a/distrib/sets/lists/base/md.sparc64
+++ b/distrib/sets/lists/base/md.sparc64
@@ -383,8 +383,7 @@
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/ic/rtl80x9reg.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/ic/rtl80x9var.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/ic/rtl81x9reg.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/ic/rtwphy.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/ic/rtwphyio.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/ic/rtl8225reg.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/ic/rtwreg.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/ic/rtwvar.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/ic/s3_617.ph
diff --git a/distrib/sets/lists/base/md.vax b/distrib/sets/lists/base/md.vax
index 66addd4311c..7ce0174f7aa 100644
--- a/distrib/sets/lists/base/md.vax
+++ b/distrib/sets/lists/base/md.vax
@@ -294,8 +294,7 @@
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/ic/rtl80x9reg.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/ic/rtl80x9var.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/ic/rtl81x9reg.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/dev/ic/rtwphy.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/dev/ic/rtwphyio.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/dev/ic/rtl8225reg.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/ic/rtwreg.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/ic/rtwvar.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/ic/s3_617.ph
diff --git a/distrib/sets/lists/base/md.zaurus b/distrib/sets/lists/base/md.zaurus
index 6ab1c706b8e..8b7a646d8b3 100644
--- a/distrib/sets/lists/base/md.zaurus
+++ b/distrib/sets/lists/base/md.zaurus
@@ -937,8 +937,7 @@
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/ic/rtl80x9reg.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/ic/rtl80x9var.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/ic/rtl81x9reg.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/dev/ic/rtwphy.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/dev/ic/rtwphyio.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/dev/ic/rtl8225reg.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/ic/rtwreg.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/ic/rtwvar.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/ic/s3_617.ph
diff --git a/distrib/sets/lists/base/mi b/distrib/sets/lists/base/mi
index ce920851dbc..a02c7c53fda 100644
--- a/distrib/sets/lists/base/mi
+++ b/distrib/sets/lists/base/mi
@@ -4394,3 +4394,4 @@
 ./var/yp/Makefile.yp
 ./var/yp/Makefile.yp.dist
 ./var/yp/README
+./usr/sbin/sasyncd