Upgrade offlineimap to 3.99.6

PR:		46848
Submitted by:	Sergei Kolobov <sergei@kolobov.com>

4 files changed, 35 insertions, 7 deletions

diff --git a/mail/offlineimap/Makefile b/mail/offlineimap/Makefile
index d601bcd..50f8105 100644
--- a/mail/offlineimap/Makefile
+++ b/mail/offlineimap/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	offlineimap
-PORTVERSION=	3.99.3
+PORTVERSION=	3.99.6
 CATEGORIES=	mail python
 MASTER_SITES=	http://gopher.quux.org:70/devel/offlineimap/
 DISTNAME=	${PORTNAME}_${PORTVERSION}
@@ -14,12 +14,16 @@ DISTNAME=	${PORTNAME}_${PORTVERSION}
 MAINTAINER=	nbm@FreeBSD.org
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
+PKGMESSAGE=	${WRKDIR}/pkg-message
 
 USE_PYTHON=	yes
 USE_PYDISTUTILS=yes
 
 MAN1=		offlineimap.1
 DOCS=		manual.html manual.pdf manual.ps manual.txt
+EXAMPLES=	offlineimap.conf offlineimap.conf.minimal
+
+DEFAULT_EXAMPLES_DIR=/usr/local/share/examples/offlineimap
 
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/offlineimap.1 ${MANPREFIX}/man/man1/
@@ -29,8 +33,12 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
 .endfor
 .endif
-	${MKDIR} ${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKSRC}/offlineimap.conf ${EXAMPLESDIR}
-	@${SED} -e 's!__EXAMPLESDIR__!${EXAMPLESDIR}!' ${PKGMESSAGE}
+	@${MKDIR} ${EXAMPLESDIR}
+.for file in ${EXAMPLES}
+	${INSTALL_DATA} ${WRKSRC}/${file} ${EXAMPLESDIR}
+.endfor
+	@${SED} -e 's!${DEFAULT_EXAMPLES_DIR}!${EXAMPLESDIR}!' \
+		${MASTERDIR}/pkg-message > ${PKGMESSAGE}
+	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/mail/offlineimap/distinfo b/mail/offlineimap/distinfo
index e75213d..40d03e0 100644
--- a/mail/offlineimap/distinfo
+++ b/mail/offlineimap/distinfo
@@ -1 +1 @@
-MD5 (offlineimap_3.99.3.tar.gz) = a7411260ce2be60c237a8783263a2844
+MD5 (offlineimap_3.99.6.tar.gz) = 54cfb2137a0e1a495f4376f39bf01845
diff --git a/mail/offlineimap/pkg-message b/mail/offlineimap/pkg-message
index 203dba9..2f06816 100644
--- a/mail/offlineimap/pkg-message
+++ b/mail/offlineimap/pkg-message
@@ -1,7 +1,11 @@
 ###########################################################################
 # 
 # Please copy sample configuration file from 
-# __EXAMPLESDIR__/offlineimap.conf to ~/.offlineimaprc
-# and edit to suit your needs.
+# /usr/local/share/examples/offlineimap/offlineimap.conf.minimal 
+# to ~/.offlineimaprc and edit to suit your needs.
+#
+# WARNING: if you are upgrading from pre-3.99.6 version, please be sure 
+#          to check the manual for changes in configuration file format 
+#          that could be incompatible with your existing configuration.
 #
 ###########################################################################
diff --git a/mail/offlineimap/pkg-plist b/mail/offlineimap/pkg-plist
index 53be277..a8e7c7c 100644
--- a/mail/offlineimap/pkg-plist
+++ b/mail/offlineimap/pkg-plist
@@ -2,6 +2,12 @@ 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/Base.py
 %%PYTHON_SITELIBDIR%%/offlineimap/folder/Base.pyc
 %%PYTHON_SITELIBDIR%%/offlineimap/folder/Base.pyo
@@ -56,6 +62,12 @@ bin/offlineimap
 %%PYTHON_SITELIBDIR%%/offlineimap/threadutil.py
 %%PYTHON_SITELIBDIR%%/offlineimap/threadutil.pyc
 %%PYTHON_SITELIBDIR%%/offlineimap/threadutil.pyo
+%%PYTHON_SITELIBDIR%%/offlineimap/ui/Blinkenlights.py
+%%PYTHON_SITELIBDIR%%/offlineimap/ui/Blinkenlights.pyc
+%%PYTHON_SITELIBDIR%%/offlineimap/ui/Blinkenlights.pyo
+%%PYTHON_SITELIBDIR%%/offlineimap/ui/Curses.py
+%%PYTHON_SITELIBDIR%%/offlineimap/ui/Curses.pyc
+%%PYTHON_SITELIBDIR%%/offlineimap/ui/Curses.pyo
 %%PYTHON_SITELIBDIR%%/offlineimap/ui/Noninteractive.py
 %%PYTHON_SITELIBDIR%%/offlineimap/ui/Noninteractive.pyc
 %%PYTHON_SITELIBDIR%%/offlineimap/ui/Noninteractive.pyo
@@ -71,6 +83,9 @@ bin/offlineimap
 %%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
@@ -82,6 +97,7 @@ bin/offlineimap
 %%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