config: rebase 18.7 amd64

config/18.7/plist.base.amd64

@@ -2053,6 +2053,7 @@
 ./usr/include/net/if_pflog.h
 ./usr/include/net/if_pfsync.h
 ./usr/include/net/if_sppp.h
+./usr/include/net/if_stf.h
 ./usr/include/net/if_tap.h
 ./usr/include/net/if_tapvar.h
 ./usr/include/net/if_tun.h

config/18.7/plist.obsolete.amd64

@@ -233,7 +233,6 @@
 /usr/include/kx509_asn1.h
 /usr/include/lzma/lzma.h
 /usr/include/machine/apicvar.h
-/usr/include/net/if_stf.h
 /usr/include/net/pf_mtag.h
 /usr/include/net/zlib.h
 /usr/include/net/zutil.h