Merge branch '3.6' into 3.7

sqlite3/.signature

@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/core.pub
-RWRJc1FUaeVequ/pk/8vYvZiFQA7xYRtVh1dLwZ4IvY82Z+xSMSVNz2ZPETSJ8poH1kam0TMkSSCvbLeiwYnTa2MPPwT9BZGbg0=
-SHA256 (Pkgfile) = d1537cc2ee402bb4385d0c1b2a79a0eb400fa2622caa0a4deea38a6f26e041ff
+RWRJc1FUaeVeqpTZyFX4wz0lSdDOLMIBLTSaikRfKdGbd4ArTZP+BkhalxedaNYYvsqMfZwexPybabE4jQeQA55gS6AS1OJcqQU=
+SHA256 (Pkgfile) = f170d4f2212d31793c5e9168168d40311f604d09fd0183109ae5a68cfbdecd58
 SHA256 (.footprint) = 54d29bd72af140bd285f65d0e72b3ef8eb4279298c98354632552b41db701253
-SHA256 (sqlite-autoconf-3380300.tar.gz) = 61f2dd93a2e38c33468b7125967c3218bf9f4dd8365def6025e314f905dc942e
+SHA256 (sqlite-autoconf-3380400.tar.gz) = 1935751066c2fd447404caa78cfb8b2b701fad3f6b1cf40b3d658440f6cc7563

sqlite3/Pkgfile

@@ -4,7 +4,7 @@
 # Depends on: readline zlib
 
 name=sqlite3
-version=3.38.3
+version=3.38.4
 release=1
 _version=$(printf "%i%.2i%.2i%.2i" ${version//./ })
 

vim/.footprint

@@ -413,11 +413,13 @@ drwxr-xr-x	root/root	usr/share/vim/ftplugin/
 -rw-r--r--	root/root	usr/share/vim/ftplugin/dune.vim
 -rw-r--r--	root/root	usr/share/vim/ftplugin/eiffel.vim
 -rw-r--r--	root/root	usr/share/vim/ftplugin/elinks.vim
+-rw-r--r--	root/root	usr/share/vim/ftplugin/elixir.vim
 -rw-r--r--	root/root	usr/share/vim/ftplugin/elm.vim
 -rw-r--r--	root/root	usr/share/vim/ftplugin/erlang.vim
 -rw-r--r--	root/root	usr/share/vim/ftplugin/eruby.vim
 -rw-r--r--	root/root	usr/share/vim/ftplugin/eterm.vim
 -rw-r--r--	root/root	usr/share/vim/ftplugin/falcon.vim
+-rw-r--r--	root/root	usr/share/vim/ftplugin/fennel.vim
 -rw-r--r--	root/root	usr/share/vim/ftplugin/fetchmail.vim
 -rw-r--r--	root/root	usr/share/vim/ftplugin/flexwiki.vim
 -rw-r--r--	root/root	usr/share/vim/ftplugin/fortran.vim
@@ -652,6 +654,7 @@ drwxr-xr-x	root/root	usr/share/vim/indent/
 -rw-r--r--	root/root	usr/share/vim/indent/eruby.vim
 -rw-r--r--	root/root	usr/share/vim/indent/eterm.vim
 -rw-r--r--	root/root	usr/share/vim/indent/falcon.vim
+-rw-r--r--	root/root	usr/share/vim/indent/fennel.vim
 -rw-r--r--	root/root	usr/share/vim/indent/fortran.vim
 -rw-r--r--	root/root	usr/share/vim/indent/framescript.vim
 -rw-r--r--	root/root	usr/share/vim/indent/freebasic.vim
@@ -673,6 +676,7 @@ drwxr-xr-x	root/root	usr/share/vim/indent/
 -rw-r--r--	root/root	usr/share/vim/indent/jsonc.vim
 -rw-r--r--	root/root	usr/share/vim/indent/jsp.vim
 -rw-r--r--	root/root	usr/share/vim/indent/julia.vim
+-rw-r--r--	root/root	usr/share/vim/indent/krl.vim
 -rw-r--r--	root/root	usr/share/vim/indent/ld.vim
 -rw-r--r--	root/root	usr/share/vim/indent/less.vim
 -rw-r--r--	root/root	usr/share/vim/indent/lifelines.vim
@@ -1127,6 +1131,7 @@ drwxr-xr-x	root/root	usr/share/vim/syntax/
 -rw-r--r--	root/root	usr/share/vim/syntax/kconfig.vim
 -rw-r--r--	root/root	usr/share/vim/syntax/kivy.vim
 -rw-r--r--	root/root	usr/share/vim/syntax/kix.vim
+-rw-r--r--	root/root	usr/share/vim/syntax/krl.vim
 -rw-r--r--	root/root	usr/share/vim/syntax/kscript.vim
 -rw-r--r--	root/root	usr/share/vim/syntax/kwt.vim
 -rw-r--r--	root/root	usr/share/vim/syntax/lace.vim
@@ -1229,6 +1234,7 @@ drwxr-xr-x	root/root	usr/share/vim/syntax/
 -rw-r--r--	root/root	usr/share/vim/syntax/omnimark.vim
 -rw-r--r--	root/root	usr/share/vim/syntax/opam.vim
 -rw-r--r--	root/root	usr/share/vim/syntax/openroad.vim
+-rw-r--r--	root/root	usr/share/vim/syntax/openscad.vim
 -rw-r--r--	root/root	usr/share/vim/syntax/opl.vim
 -rw-r--r--	root/root	usr/share/vim/syntax/ora.vim
 -rw-r--r--	root/root	usr/share/vim/syntax/pamconf.vim

vim/.signature

@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/core.pub
-RWRJc1FUaeVeqj1BITj+n1jwueMxz0GLxzMXTY1JjieoztHPMkOxBKaJr8yq+HIdRbs8dzceAyUVj3KR5/ViOLNCZ0lQ5021PAE=
-SHA256 (Pkgfile) = 0663125cbb741fee3dd865da7ad4f99f3a15538d7b53226502517674ae346ca9
-SHA256 (.footprint) = 1cdb1505ee12d0ff4d19ff426065689012ada0f629f86082f7b3ecc957d2a99b
-SHA256 (vim-8.2.4708.tar.gz) = 99cf8c3220c03a4df4bd9ea08c84bd2368be8a416e731ec7886f8fdc411c3d39
+RWRJc1FUaeVeqrqN7bsgF416XCRynZgD0hVCq2EaRWqDUp7tfwJplFtxoO8c6E3xR0nkZRTvl0DE7Vz762UnuQ1z0PKvWtJyGQo=
+SHA256 (Pkgfile) = 3e8aa53a52960f5dbbb978b1d36e242d9a2bd2d296c157b88012a71f45d699c8
+SHA256 (.footprint) = 6097c85f685a88a8a79d16d007ec3923270e25f10acfbe55c0ebc2bfd2713441
+SHA256 (vim-8.2.4846.tar.gz) = 9189d7d484ec65ee7b9ce2574ed135015fd8e98cb909077b7a6ce7a773ed01f9

vim/Pkgfile

@@ -4,7 +4,7 @@
 # Depends on: ncurses acl
 
 name=vim
-version=8.2.4708
+version=8.2.4846
 release=1
 source=(https://github.com/vim/vim/archive/v${version}/$name-$version.tar.gz)