- update from 6.5.5 to 6.5.7

- add py-sqlite3 as a run dependency
- simplify the port

PR:		201402
Submitted by:	mp39590 gmail com
Sponsored by:	Absolight

4 files changed, 21 insertions, 196 deletions

diff --git a/mail/offlineimap/Makefile b/mail/offlineimap/Makefile
index 4c48b2f..2ef4a3a 100644
--- a/mail/offlineimap/Makefile
+++ b/mail/offlineimap/Makefile
@@ -3,85 +3,39 @@
 
 PORTNAME=	offlineimap
 DISTVERSIONPREFIX=	v
-DISTVERSION=	6.5.5
+DISTVERSION=	6.5.7
 CATEGORIES=	mail python
-MASTER_SITES=	http://dist.codelabs.ru/fbsd/offlineimap/
 
-PATCH_SITES=	http://codelabs.ru/patches/offlineimap/
-
-MAINTAINER=	rea@FreeBSD.org
+MAINTAINER=	mp39590@gmail.com
 COMMENT=	Powerful IMAP/Maildir synchronization and reader support
 
+## GPLv2 or any later version (with an OpenSSL exception)
 LICENSE=	GPLv2 GPLv3
 LICENSE_COMB=	dual
+LICENSE_FILE=	${WRKSRC}/COPYING
 
-LICENSE_FILE_GPLv2=${WRKSRC}/COPYING
-
-OPTIONS_DEFINE=	HTMLDOCS EXAMPLES
-HTMLDOCS_DESC=	Generate HTML documentation
-
-SUB_FILES=	pkg-message
-PATCH_STRIP=	-p1
+## later versions have sqlite3 backend, which is recommended for local storages
+## with large amount of emails
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	OfflineIMAP
 
-USES=		python
-USE_PYTHON=	distutils
-
-DOC_FILES=	Changelog.maint.rst Changelog.rst \
-		docs/INSTALL.rst docs/MANUAL.rst \
-		docs/doc-src/API.rst docs/doc-src/FAQ.rst \
-		docs/doc-src/HACKING.rst docs/doc-src/INSTALL.rst \
-		docs/doc-src/MANUAL.rst docs/doc-src/advanced_config.rst \
-		docs/doc-src/features.rst docs/doc-src/index.rst \
-		docs/doc-src/nametrans.rst docs/doc-src/offlineimap.rst \
-		docs/doc-src/repository.rst docs/doc-src/ui.rst
-PORTDOCS=	docs ${DOC_FILES:N*/*}
-EXAMPLE_FILES=	offlineimap.conf offlineimap.conf.minimal
-PORTEXAMPLES=	${EXAMPLE_FILES:N*/*}
-
-DOC_DIRS=	${DOC_FILES:H:O:u:N.}
-EXAMPLE_DIRS=	${EXAMPLE_FILES:H:O:u:N.}
-
-.include <bsd.port.options.mk>
+USES=		python:2.7
+USE_PYTHON=	autoplist distutils
 
-.if ${PORT_OPTIONS:MDOCS} && ${PORT_OPTIONS:MHTMLDOCS}
-BUILD_DEPENDS+=	rst2html:${PORTSDIR}/textproc/py-docutils
-DOC_FILES:=	${DOC_FILES} ${DOC_FILES:M*.rst:S/.rst$/.html/}
-.endif
+OPTIONS_DEFINE=	DOCS EXAMPLES
 
-# This is needed for pkg-message.in
-.if ${PORT_OPTIONS:MEXAMPLES}
-SUB_LIST+=	PORTEXAMPLES=""
-.else
-SUB_LIST+=	PORTEXAMPLES="@comment "
-.endif
+PORTDOCS=	*
+PORTEXAMPLES=	offlineimap.conf offlineimap.conf.minimal
 
-post-build:
-.if ${PORT_OPTIONS:MDOCS} && ${PORT_OPTIONS:MHTMLDOCS}
-.for r in ${DOC_FILES:M*.rst}
-	@${ECHO} "Translating ${r} to HTML..."
-	@rst2html ${WRKSRC}/${r} ${WRKSRC}/${r:R}.html
-.endfor
-.endif
+post-install-DOCS-on:
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	cd ${WRKSRC}/docs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} '! -name Makefile'
 
-post-install:
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	@for i in ${DOC_DIRS}; do \
-	  ${MKDIR} ${STAGEDIR}${DOCSDIR}/$$i; \
-	  done
-	@cd ${WRKSRC} && for i in ${DOC_FILES}; do \
-	  ${ECHO} "Installing ${STAGEDIR}${DOCSDIR}/$$i"; \
-	  ${INSTALL_DATA} $$i ${STAGEDIR}${DOCSDIR}/$$i; \
-	  done
-	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
-	@for i in ${EXAMPLE_DIRS}; do \
-	  ${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/$$i; \
-	  done
-	@cd ${WRKSRC} && for i in ${EXAMPLE_FILES}; do \
-	  ${ECHO} "Installing ${STAGEDIR}${EXAMPLESDIR}/$$i"; \
-	  ${INSTALL_DATA} $$i ${STAGEDIR}${EXAMPLESDIR}/$$i; \
-	  done
+post-install-EXAMPLES-on:
+	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/offlineimap.conf ${STAGEDIR}${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/offlineimap.conf.minimal ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
diff --git a/mail/offlineimap/distinfo b/mail/offlineimap/distinfo
index f7f8fdf..633588e 100644
--- a/mail/offlineimap/distinfo
+++ b/mail/offlineimap/distinfo
@@ -1,2 +1,2 @@
-SHA256 (OfflineIMAP-offlineimap-v6.5.5_GH0.tar.gz) = 578cd6d8706a15ee65faa43bb71dfacf1ed083a97d66a375b77dc0fb14266802
-SIZE (OfflineIMAP-offlineimap-v6.5.5_GH0.tar.gz) = 175348
+SHA256 (OfflineIMAP-offlineimap-v6.5.7_GH0.tar.gz) = b7de52c7d8995e0657bb55da13531c8d6f96d828217159477c685ae408e390a3
+SIZE (OfflineIMAP-offlineimap-v6.5.7_GH0.tar.gz) = 666620
diff --git a/mail/offlineimap/files/pkg-message.in b/mail/offlineimap/files/pkg-message.in
deleted file mode 100644
index 98249c2..0000000
--- a/mail/offlineimap/files/pkg-message.in
+++ /dev/null
@@ -1,11 +0,0 @@
-###########################################################################
-%%PORTEXAMPLES%%# 
-%%PORTEXAMPLES%%# Please copy sample configuration file from 
-%%PORTEXAMPLES%%# %%EXAMPLESDIR%%/offlineimap.conf.minimal 
-%%PORTEXAMPLES%%# to ~/.offlineimaprc and edit to suit your needs.
-#
-# WARNING: if you are upgrading from pre-3.99.12 version, please be sure 
-#          to check the manual for changes in configuration file format 
-#          that are incompatible with your existing configuration.
-#
-###########################################################################
diff --git a/mail/offlineimap/pkg-plist b/mail/offlineimap/pkg-plist
deleted file mode 100644
index db111e6..0000000
--- a/mail/offlineimap/pkg-plist
+++ /dev/null
@@ -1,118 +0,0 @@
-bin/offlineimap
-%%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
-%%PYTHON_SITELIBDIR%%/offlineimap/folder/Gmail.py
-%%PYTHON_SITELIBDIR%%/offlineimap/folder/Gmail.pyc
-%%PYTHON_SITELIBDIR%%/offlineimap/folder/Gmail.pyo
-%%PYTHON_SITELIBDIR%%/offlineimap/folder/IMAP.py
-%%PYTHON_SITELIBDIR%%/offlineimap/folder/IMAP.pyc
-%%PYTHON_SITELIBDIR%%/offlineimap/folder/IMAP.pyo
-%%PYTHON_SITELIBDIR%%/offlineimap/folder/LocalStatus.py
-%%PYTHON_SITELIBDIR%%/offlineimap/folder/LocalStatus.pyc
-%%PYTHON_SITELIBDIR%%/offlineimap/folder/LocalStatus.pyo
-%%PYTHON_SITELIBDIR%%/offlineimap/folder/LocalStatusSQLite.py
-%%PYTHON_SITELIBDIR%%/offlineimap/folder/LocalStatusSQLite.pyc
-%%PYTHON_SITELIBDIR%%/offlineimap/folder/LocalStatusSQLite.pyo
-%%PYTHON_SITELIBDIR%%/offlineimap/folder/Maildir.py
-%%PYTHON_SITELIBDIR%%/offlineimap/folder/Maildir.pyc
-%%PYTHON_SITELIBDIR%%/offlineimap/folder/Maildir.pyo
-%%PYTHON_SITELIBDIR%%/offlineimap/folder/UIDMaps.py
-%%PYTHON_SITELIBDIR%%/offlineimap/folder/UIDMaps.pyc
-%%PYTHON_SITELIBDIR%%/offlineimap/folder/UIDMaps.pyo
-%%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
-%%PYTHON_SITELIBDIR%%/offlineimap/repository/Gmail.py
-%%PYTHON_SITELIBDIR%%/offlineimap/repository/Gmail.pyc
-%%PYTHON_SITELIBDIR%%/offlineimap/repository/Gmail.pyo
-%%PYTHON_SITELIBDIR%%/offlineimap/repository/IMAP.py
-%%PYTHON_SITELIBDIR%%/offlineimap/repository/IMAP.pyc
-%%PYTHON_SITELIBDIR%%/offlineimap/repository/IMAP.pyo
-%%PYTHON_SITELIBDIR%%/offlineimap/repository/LocalStatus.py
-%%PYTHON_SITELIBDIR%%/offlineimap/repository/LocalStatus.pyc
-%%PYTHON_SITELIBDIR%%/offlineimap/repository/LocalStatus.pyo
-%%PYTHON_SITELIBDIR%%/offlineimap/repository/Maildir.py
-%%PYTHON_SITELIBDIR%%/offlineimap/repository/Maildir.pyc
-%%PYTHON_SITELIBDIR%%/offlineimap/repository/Maildir.pyo
-%%PYTHON_SITELIBDIR%%/offlineimap/ui/__init__.py
-%%PYTHON_SITELIBDIR%%/offlineimap/ui/__init__.pyc
-%%PYTHON_SITELIBDIR%%/offlineimap/ui/__init__.pyo
-%%PYTHON_SITELIBDIR%%/offlineimap/ui/Curses.py
-%%PYTHON_SITELIBDIR%%/offlineimap/ui/Curses.pyc
-%%PYTHON_SITELIBDIR%%/offlineimap/ui/Curses.pyo
-%%PYTHON_SITELIBDIR%%/offlineimap/ui/Machine.py
-%%PYTHON_SITELIBDIR%%/offlineimap/ui/Machine.pyc
-%%PYTHON_SITELIBDIR%%/offlineimap/ui/Machine.pyo
-%%PYTHON_SITELIBDIR%%/offlineimap/ui/Noninteractive.py
-%%PYTHON_SITELIBDIR%%/offlineimap/ui/Noninteractive.pyc
-%%PYTHON_SITELIBDIR%%/offlineimap/ui/Noninteractive.pyo
-%%PYTHON_SITELIBDIR%%/offlineimap/ui/TTY.py
-%%PYTHON_SITELIBDIR%%/offlineimap/ui/TTY.pyc
-%%PYTHON_SITELIBDIR%%/offlineimap/ui/TTY.pyo
-%%PYTHON_SITELIBDIR%%/offlineimap/ui/UIBase.py
-%%PYTHON_SITELIBDIR%%/offlineimap/ui/UIBase.pyc
-%%PYTHON_SITELIBDIR%%/offlineimap/ui/UIBase.pyo
-%%PYTHON_SITELIBDIR%%/offlineimap/ui/debuglock.py
-%%PYTHON_SITELIBDIR%%/offlineimap/ui/debuglock.pyc
-%%PYTHON_SITELIBDIR%%/offlineimap/ui/debuglock.pyo
-%%PYTHON_SITELIBDIR%%/offlineimap/utils/__init__.py
-%%PYTHON_SITELIBDIR%%/offlineimap/utils/__init__.pyc
-%%PYTHON_SITELIBDIR%%/offlineimap/utils/__init__.pyo
-%%PYTHON_SITELIBDIR%%/offlineimap/utils/const.py
-%%PYTHON_SITELIBDIR%%/offlineimap/utils/const.pyc
-%%PYTHON_SITELIBDIR%%/offlineimap/utils/const.pyo
-%%PYTHON_SITELIBDIR%%/offlineimap/utils/stacktrace.py
-%%PYTHON_SITELIBDIR%%/offlineimap/utils/stacktrace.pyc
-%%PYTHON_SITELIBDIR%%/offlineimap/utils/stacktrace.pyo
-%%PYTHON_SITELIBDIR%%/offlineimap/CustomConfig.py
-%%PYTHON_SITELIBDIR%%/offlineimap/CustomConfig.pyc
-%%PYTHON_SITELIBDIR%%/offlineimap/CustomConfig.pyo
-%%PYTHON_SITELIBDIR%%/offlineimap/__init__.py
-%%PYTHON_SITELIBDIR%%/offlineimap/__init__.pyc
-%%PYTHON_SITELIBDIR%%/offlineimap/__init__.pyo
-%%PYTHON_SITELIBDIR%%/offlineimap/accounts.py
-%%PYTHON_SITELIBDIR%%/offlineimap/accounts.pyc
-%%PYTHON_SITELIBDIR%%/offlineimap/accounts.pyo
-%%PYTHON_SITELIBDIR%%/offlineimap/emailutil.py
-%%PYTHON_SITELIBDIR%%/offlineimap/emailutil.pyc
-%%PYTHON_SITELIBDIR%%/offlineimap/emailutil.pyo
-%%PYTHON_SITELIBDIR%%/offlineimap/error.py
-%%PYTHON_SITELIBDIR%%/offlineimap/error.pyc
-%%PYTHON_SITELIBDIR%%/offlineimap/error.pyo
-%%PYTHON_SITELIBDIR%%/offlineimap/globals.py
-%%PYTHON_SITELIBDIR%%/offlineimap/globals.pyc
-%%PYTHON_SITELIBDIR%%/offlineimap/globals.pyo
-%%PYTHON_SITELIBDIR%%/offlineimap/imaplib2.py
-%%PYTHON_SITELIBDIR%%/offlineimap/imaplib2.pyc
-%%PYTHON_SITELIBDIR%%/offlineimap/imaplib2.pyo
-%%PYTHON_SITELIBDIR%%/offlineimap/imaplibutil.py
-%%PYTHON_SITELIBDIR%%/offlineimap/imaplibutil.pyc
-%%PYTHON_SITELIBDIR%%/offlineimap/imaplibutil.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