sync

21 files changed, 63 insertions, 0 deletions

diff --git a/distrib/sets/lists/base/md.alpha b/distrib/sets/lists/base/md.alpha
index f2ece627592..b61843f2e64 100644
--- a/distrib/sets/lists/base/md.alpha
+++ b/distrib/sets/lists/base/md.alpha
@@ -1897,6 +1897,9 @@
 ./usr/libdata/perl5/site_perl/alpha-openbsd/netinet6/pim6_var.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/netinet6/raw_ip6.ph
 ./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 2a94081ef45..79121e6d8ee 100644
--- a/distrib/sets/lists/base/md.amd64
+++ b/distrib/sets/lists/base/md.amd64
@@ -1922,6 +1922,9 @@
 ./usr/libdata/perl5/site_perl/amd64-openbsd/netinet6/pim6_var.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/netinet6/raw_ip6.ph
 ./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 d78f8f30a46..fb177f401cf 100644
--- a/distrib/sets/lists/base/md.armish
+++ b/distrib/sets/lists/base/md.armish
@@ -1922,6 +1922,9 @@
 ./usr/libdata/perl5/site_perl/arm-openbsd/netinet6/pim6_var.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/netinet6/raw_ip6.ph
 ./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 10318ad02e3..8522ef814b0 100644
--- a/distrib/sets/lists/base/md.aviion
+++ b/distrib/sets/lists/base/md.aviion
@@ -1801,6 +1801,9 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/netinet6/pim6_var.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/netinet6/raw_ip6.ph
 ./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 93df8c69e44..2ed159376c7 100644
--- a/distrib/sets/lists/base/md.hp300
+++ b/distrib/sets/lists/base/md.hp300
@@ -1855,6 +1855,9 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet6/pim6_var.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet6/raw_ip6.ph
 ./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 5651d64c92c..d105fceccce 100644
--- a/distrib/sets/lists/base/md.hppa
+++ b/distrib/sets/lists/base/md.hppa
@@ -1897,6 +1897,9 @@
 ./usr/libdata/perl5/site_perl/hppa-openbsd/netinet6/pim6_var.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/netinet6/raw_ip6.ph
 ./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 c76d41f9ee3..aea71f9f492 100644
--- a/distrib/sets/lists/base/md.hppa64
+++ b/distrib/sets/lists/base/md.hppa64
@@ -1894,6 +1894,9 @@
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/netinet6/pim6_var.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/netinet6/raw_ip6.ph
 ./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 16cd00f3636..5b61f039db3 100644
--- a/distrib/sets/lists/base/md.i386
+++ b/distrib/sets/lists/base/md.i386
@@ -1928,6 +1928,9 @@
 ./usr/libdata/perl5/site_perl/i386-openbsd/netinet6/pim6_var.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/netinet6/raw_ip6.ph
 ./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 084023af181..d3a4d2c4cc1 100644
--- a/distrib/sets/lists/base/md.landisk
+++ b/distrib/sets/lists/base/md.landisk
@@ -1857,6 +1857,9 @@
 ./usr/libdata/perl5/site_perl/sh-openbsd/netinet6/pim6_var.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/netinet6/raw_ip6.ph
 ./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 25c5c68ab92..87e3c2a2542 100644
--- a/distrib/sets/lists/base/md.luna88k
+++ b/distrib/sets/lists/base/md.luna88k
@@ -1796,6 +1796,9 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/netinet6/pim6_var.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/netinet6/raw_ip6.ph
 ./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 8d0f9862fec..88af5f60586 100644
--- a/distrib/sets/lists/base/md.mac68k
+++ b/distrib/sets/lists/base/md.mac68k
@@ -1859,6 +1859,9 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet6/pim6_var.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet6/raw_ip6.ph
 ./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 2cce0644fea..9aea49c95c6 100644
--- a/distrib/sets/lists/base/md.macppc
+++ b/distrib/sets/lists/base/md.macppc
@@ -1904,6 +1904,9 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/netinet6/pim6_var.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/netinet6/raw_ip6.ph
 ./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 901cc4fbdaa..4e880eed9f2 100644
--- a/distrib/sets/lists/base/md.mvme68k
+++ b/distrib/sets/lists/base/md.mvme68k
@@ -1855,6 +1855,9 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet6/pim6_var.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet6/raw_ip6.ph
 ./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 6ba8212aaf4..49f84ba62eb 100644
--- a/distrib/sets/lists/base/md.mvme88k
+++ b/distrib/sets/lists/base/md.mvme88k
@@ -1805,6 +1805,9 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/netinet6/pim6_var.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/netinet6/raw_ip6.ph
 ./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 53abfb3fa8c..dfc259d159a 100644
--- a/distrib/sets/lists/base/md.mvmeppc
+++ b/distrib/sets/lists/base/md.mvmeppc
@@ -1811,6 +1811,9 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/netinet6/pim6_var.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/netinet6/raw_ip6.ph
 ./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 0d68067b8c8..185e1459058 100644
--- a/distrib/sets/lists/base/md.sgi
+++ b/distrib/sets/lists/base/md.sgi
@@ -1889,6 +1889,9 @@
 ./usr/libdata/perl5/site_perl/mips64-openbsd/netinet6/pim6_var.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/netinet6/raw_ip6.ph
 ./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 f7577bb3b59..0d028fd9dc4 100644
--- a/distrib/sets/lists/base/md.sparc
+++ b/distrib/sets/lists/base/md.sparc
@@ -1276,6 +1276,9 @@
 ./usr/libdata/perl5/site_perl/sparc-openbsd/netinet6/pim6_var.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/netinet6/raw_ip6.ph
 ./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 9c934baf444..56293bc6330 100644
--- a/distrib/sets/lists/base/md.sparc64
+++ b/distrib/sets/lists/base/md.sparc64
@@ -1334,6 +1334,9 @@
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/netinet6/pim6_var.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/netinet6/raw_ip6.ph
 ./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 fe59f1566a2..da71db90b63 100644
--- a/distrib/sets/lists/base/md.vax
+++ b/distrib/sets/lists/base/md.vax
@@ -1210,6 +1210,9 @@
 ./usr/libdata/perl5/site_perl/vax-openbsd/netinet6/pim6_var.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/netinet6/raw_ip6.ph
 ./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 b28c34a7b38..6f22e9979b5 100644
--- a/distrib/sets/lists/base/md.zaurus
+++ b/distrib/sets/lists/base/md.zaurus
@@ -1877,6 +1877,9 @@
 ./usr/libdata/perl5/site_perl/arm-openbsd/netinet6/pim6_var.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/netinet6/raw_ip6.ph
 ./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/comp/mi b/distrib/sets/lists/comp/mi
index 7b1a780c3ac..3e89919d085 100644
--- a/distrib/sets/lists/comp/mi
+++ b/distrib/sets/lists/comp/mi
@@ -1172,6 +1172,9 @@
 ./usr/include/netinet6/pim6_var.h
 ./usr/include/netinet6/raw_ip6.h
 ./usr/include/netinet6/tcpipv6.h
+./usr/include/netmpls
+./usr/include/netmpls/mpls.h
+./usr/include/netmpls/mpls_var.h
 ./usr/include/netnatm
 ./usr/include/netnatm/natm.h
 ./usr/include/nfs