upgrade to 3.99.15

PR:		51569
Submitted by:	maintainer

1 files changed, 56 insertions, 53 deletions

diff --git a/mail/offlineimap/pkg-plist b/mail/offlineimap/pkg-plist
index a8e7c7ca6af1..da17a3b3bdd7 100644
--- a/mail/offlineimap/pkg-plist
+++ b/mail/offlineimap/pkg-plist
@@ -1,13 +1,7 @@
 bin/offlineimap
-%%PYTHON_SITELIBDIR%%/offlineimap/__init__.py
-%%PYTHON_SITELIBDIR%%/offlineimap/__init__.pyc
-%%PYTHON_SITELIBDIR%%/offlineimap/__init__.pyo
-%%PYTHON_SITELIBDIR%%/offlineimap/CustomConfig.py
-%%PYTHON_SITELIBDIR%%/offlineimap/CustomConfig.pyc
-%%PYTHON_SITELIBDIR%%/offlineimap/CustomConfig.pyo
-%%PYTHON_SITELIBDIR%%/offlineimap/accounts.py
-%%PYTHON_SITELIBDIR%%/offlineimap/accounts.pyc
-%%PYTHON_SITELIBDIR%%/offlineimap/accounts.pyo
+%%PYTHON_SITELIBDIR%%/offlineimap/folder/__init__.py
+%%PYTHON_SITELIBDIR%%/offlineimap/folder/__init__.pyc
+%%PYTHON_SITELIBDIR%%/offlineimap/folder/__init__.pyo
 %%PYTHON_SITELIBDIR%%/offlineimap/folder/Base.py
 %%PYTHON_SITELIBDIR%%/offlineimap/folder/Base.pyc
 %%PYTHON_SITELIBDIR%%/offlineimap/folder/Base.pyo
@@ -20,27 +14,13 @@ bin/offlineimap
 %%PYTHON_SITELIBDIR%%/offlineimap/folder/Maildir.py
 %%PYTHON_SITELIBDIR%%/offlineimap/folder/Maildir.pyc
 %%PYTHON_SITELIBDIR%%/offlineimap/folder/Maildir.pyo
-%%PYTHON_SITELIBDIR%%/offlineimap/folder/__init__.py
-%%PYTHON_SITELIBDIR%%/offlineimap/folder/__init__.pyc
-%%PYTHON_SITELIBDIR%%/offlineimap/folder/__init__.pyo
-%%PYTHON_SITELIBDIR%%/offlineimap/imaplib.py
-%%PYTHON_SITELIBDIR%%/offlineimap/imaplib.pyc
-%%PYTHON_SITELIBDIR%%/offlineimap/imaplib.pyo
-%%PYTHON_SITELIBDIR%%/offlineimap/imapserver.py
-%%PYTHON_SITELIBDIR%%/offlineimap/imapserver.pyc
-%%PYTHON_SITELIBDIR%%/offlineimap/imapserver.pyo
-%%PYTHON_SITELIBDIR%%/offlineimap/imaputil.py
-%%PYTHON_SITELIBDIR%%/offlineimap/imaputil.pyc
-%%PYTHON_SITELIBDIR%%/offlineimap/imaputil.pyo
-%%PYTHON_SITELIBDIR%%/offlineimap/init.py
-%%PYTHON_SITELIBDIR%%/offlineimap/init.pyc
-%%PYTHON_SITELIBDIR%%/offlineimap/init.pyo
-%%PYTHON_SITELIBDIR%%/offlineimap/localeval.py
-%%PYTHON_SITELIBDIR%%/offlineimap/localeval.pyc
-%%PYTHON_SITELIBDIR%%/offlineimap/localeval.pyo
-%%PYTHON_SITELIBDIR%%/offlineimap/mbnames.py
-%%PYTHON_SITELIBDIR%%/offlineimap/mbnames.pyc
-%%PYTHON_SITELIBDIR%%/offlineimap/mbnames.pyo
+%%PYTHON_SITELIBDIR%%/offlineimap/folder/UIDMaps.py
+%%PYTHON_SITELIBDIR%%/offlineimap/folder/UIDMaps.pyc
+%%PYTHON_SITELIBDIR%%/offlineimap/folder/UIDMaps.pyo
+@dirrm %%PYTHON_SITELIBDIR%%/offlineimap/folder
+%%PYTHON_SITELIBDIR%%/offlineimap/repository/__init__.py
+%%PYTHON_SITELIBDIR%%/offlineimap/repository/__init__.pyc
+%%PYTHON_SITELIBDIR%%/offlineimap/repository/__init__.pyo
 %%PYTHON_SITELIBDIR%%/offlineimap/repository/Base.py
 %%PYTHON_SITELIBDIR%%/offlineimap/repository/Base.pyc
 %%PYTHON_SITELIBDIR%%/offlineimap/repository/Base.pyo
@@ -53,15 +33,10 @@ bin/offlineimap
 %%PYTHON_SITELIBDIR%%/offlineimap/repository/Maildir.py
 %%PYTHON_SITELIBDIR%%/offlineimap/repository/Maildir.pyc
 %%PYTHON_SITELIBDIR%%/offlineimap/repository/Maildir.pyo
-%%PYTHON_SITELIBDIR%%/offlineimap/repository/__init__.py
-%%PYTHON_SITELIBDIR%%/offlineimap/repository/__init__.pyc
-%%PYTHON_SITELIBDIR%%/offlineimap/repository/__init__.pyo
-%%PYTHON_SITELIBDIR%%/offlineimap/syncmaster.py
-%%PYTHON_SITELIBDIR%%/offlineimap/syncmaster.pyc
-%%PYTHON_SITELIBDIR%%/offlineimap/syncmaster.pyo
-%%PYTHON_SITELIBDIR%%/offlineimap/threadutil.py
-%%PYTHON_SITELIBDIR%%/offlineimap/threadutil.pyc
-%%PYTHON_SITELIBDIR%%/offlineimap/threadutil.pyo
+@dirrm %%PYTHON_SITELIBDIR%%/offlineimap/repository
+%%PYTHON_SITELIBDIR%%/offlineimap/ui/__init__.py
+%%PYTHON_SITELIBDIR%%/offlineimap/ui/__init__.pyc
+%%PYTHON_SITELIBDIR%%/offlineimap/ui/__init__.pyo
 %%PYTHON_SITELIBDIR%%/offlineimap/ui/Blinkenlights.py
 %%PYTHON_SITELIBDIR%%/offlineimap/ui/Blinkenlights.pyc
 %%PYTHON_SITELIBDIR%%/offlineimap/ui/Blinkenlights.pyo
@@ -80,27 +55,55 @@ bin/offlineimap
 %%PYTHON_SITELIBDIR%%/offlineimap/ui/UIBase.py
 %%PYTHON_SITELIBDIR%%/offlineimap/ui/UIBase.pyc
 %%PYTHON_SITELIBDIR%%/offlineimap/ui/UIBase.pyo
-%%PYTHON_SITELIBDIR%%/offlineimap/ui/__init__.py
-%%PYTHON_SITELIBDIR%%/offlineimap/ui/__init__.pyc
-%%PYTHON_SITELIBDIR%%/offlineimap/ui/__init__.pyo
 %%PYTHON_SITELIBDIR%%/offlineimap/ui/debuglock.py
 %%PYTHON_SITELIBDIR%%/offlineimap/ui/debuglock.pyc
 %%PYTHON_SITELIBDIR%%/offlineimap/ui/debuglock.pyo
 %%PYTHON_SITELIBDIR%%/offlineimap/ui/detector.py
 %%PYTHON_SITELIBDIR%%/offlineimap/ui/detector.pyc
 %%PYTHON_SITELIBDIR%%/offlineimap/ui/detector.pyo
+@dirrm %%PYTHON_SITELIBDIR%%/offlineimap/ui
+%%PYTHON_SITELIBDIR%%/offlineimap/__init__.py
+%%PYTHON_SITELIBDIR%%/offlineimap/__init__.pyc
+%%PYTHON_SITELIBDIR%%/offlineimap/__init__.pyo
+%%PYTHON_SITELIBDIR%%/offlineimap/CustomConfig.py
+%%PYTHON_SITELIBDIR%%/offlineimap/CustomConfig.pyc
+%%PYTHON_SITELIBDIR%%/offlineimap/CustomConfig.pyo
+%%PYTHON_SITELIBDIR%%/offlineimap/accounts.py
+%%PYTHON_SITELIBDIR%%/offlineimap/accounts.pyc
+%%PYTHON_SITELIBDIR%%/offlineimap/accounts.pyo
+%%PYTHON_SITELIBDIR%%/offlineimap/imaplib.py
+%%PYTHON_SITELIBDIR%%/offlineimap/imaplib.pyc
+%%PYTHON_SITELIBDIR%%/offlineimap/imaplib.pyo
+%%PYTHON_SITELIBDIR%%/offlineimap/imapserver.py
+%%PYTHON_SITELIBDIR%%/offlineimap/imapserver.pyc
+%%PYTHON_SITELIBDIR%%/offlineimap/imapserver.pyo
+%%PYTHON_SITELIBDIR%%/offlineimap/imaputil.py
+%%PYTHON_SITELIBDIR%%/offlineimap/imaputil.pyc
+%%PYTHON_SITELIBDIR%%/offlineimap/imaputil.pyo
+%%PYTHON_SITELIBDIR%%/offlineimap/init.py
+%%PYTHON_SITELIBDIR%%/offlineimap/init.pyc
+%%PYTHON_SITELIBDIR%%/offlineimap/init.pyo
+%%PYTHON_SITELIBDIR%%/offlineimap/localeval.py
+%%PYTHON_SITELIBDIR%%/offlineimap/localeval.pyc
+%%PYTHON_SITELIBDIR%%/offlineimap/localeval.pyo
+%%PYTHON_SITELIBDIR%%/offlineimap/mbnames.py
+%%PYTHON_SITELIBDIR%%/offlineimap/mbnames.pyc
+%%PYTHON_SITELIBDIR%%/offlineimap/mbnames.pyo
+%%PYTHON_SITELIBDIR%%/offlineimap/syncmaster.py
+%%PYTHON_SITELIBDIR%%/offlineimap/syncmaster.pyc
+%%PYTHON_SITELIBDIR%%/offlineimap/syncmaster.pyo
+%%PYTHON_SITELIBDIR%%/offlineimap/threadutil.py
+%%PYTHON_SITELIBDIR%%/offlineimap/threadutil.pyc
+%%PYTHON_SITELIBDIR%%/offlineimap/threadutil.pyo
 %%PYTHON_SITELIBDIR%%/offlineimap/version.py
 %%PYTHON_SITELIBDIR%%/offlineimap/version.pyc
 %%PYTHON_SITELIBDIR%%/offlineimap/version.pyo
-%%PORTDOCS%%share/doc/offlineimap/manual.html
-%%PORTDOCS%%share/doc/offlineimap/manual.pdf
-%%PORTDOCS%%share/doc/offlineimap/manual.ps
-%%PORTDOCS%%share/doc/offlineimap/manual.txt
-share/examples/offlineimap/offlineimap.conf
-share/examples/offlineimap/offlineimap.conf.minimal
-@dirrm share/examples/offlineimap
-%%PORTDOCS%%@dirrm share/doc/offlineimap
-@dirrm %%PYTHON_SITELIBDIR%%/offlineimap/ui
-@dirrm %%PYTHON_SITELIBDIR%%/offlineimap/repository
-@dirrm %%PYTHON_SITELIBDIR%%/offlineimap/folder
 @dirrm %%PYTHON_SITELIBDIR%%/offlineimap
+%%PORTDOCS%%%%DOCSDIR%%/manual.html
+%%PORTDOCS%%%%DOCSDIR%%/manual.pdf
+%%PORTDOCS%%%%DOCSDIR%%/manual.ps
+%%PORTDOCS%%%%DOCSDIR%%/manual.txt
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+%%EXAMPLESDIR%%/offlineimap.conf
+%%EXAMPLESDIR%%/offlineimap.conf.minimal
+@dirrm %%EXAMPLESDIR%%