Update to 6.5.5. From the changelog:

OfflineIMAP v6.5.5 (2013-10-07)
===============================

* Avoid lockups for IMAP synchronizations running with the
  "-1" command-line switch (X-Ryl669 <boite.pour.spam@gmail.com>)
* Dump stacktrace for all threads on SIGQUIT: ease debugging
  of threading and other issues
* SIGHUP is now handled as the termination notification rather than
  the signal to reread the configuration (Dmitrijs Ledkovs)
* Honor the timezone of emails (Tobias Thierer)
* Allow mbnames output to be sorted by a custom sort key by specifying
  a 'sort_keyfunc' function in the [mbnames] section of the config.
* Support SASL PLAIN authentication method.  (Andreas Mack)
* Support transport-only tunnels that requre full IMAP authentication.
  (Steve Purcell)
* Make the list of authentication mechanisms to be configurable.
  (Andreas Mack)
* Allow to set message access and modification timestamps based
  on the "Date" header of the message itself.  (Cyril Russo)
* "peritem" format string for [mbnames] got new expansion key
  "localfolders" that corresponds to the same parameter of the
  local repository for the account being processed.
* [regression] pass folder names to the foldersort function,
  revert the documented behaviour
* Fix handling of zero-sized IMAP data items (GitHub#15).
* Updated bundled imaplib2 to 2.35:
  - fix for Gmail sending a BYE response after reading >100 messages
    in a session;
  - includes fix for GitHub#15: patch was accepted upstream.
* Updated bundled imaplib2 to 2.36: it includes support for SSL
  version override that was integrated into our code before,
  no other changes.
* Fixed parsing of quoted strings in IMAP responses: strings like "\\"
  were treated as having \" as the escaped quote, rather than treating
  it as the quoted escaped backslash (GitHub#53).
* Execute pre/post-sync hooks during synchronizations
  toggled by IMAP IDLE message processing. (maxgerer@gmail.com)
* Catch unsuccessful local mail uploads when IMAP server
  responds with "NO" status; that resulted in a loss of such
  local messages. (Adam Spiers)
* Don't create folders if readonly is enabled.
* Learn to deal with readonly folders to properly detect this
  condition and act accordingly.  One example is Gmail's "Chats"
  folder that is read-only, but contains logs of the quick chats. (E.
  Ryabinkin)
* Fix str.format() calls for Python 2.6 (D. Logie)
* Remove APPENDUID hack, previously introduced to fix Gmail, no longer
  necessary, it might have been breaking things. (J. Wiegley)
* Improve regex that could lead to 'NoneType' object has no attribute
  'group' (D. Franke)
* Improved error throwing on repository misconfiguration

OfflineIMAP v6.5.4 (2012-06-02)
===============================

* bump bundled imaplib2 library 2.29 --> 2.33
* Actually perform the SSL fingerprint check (reported by J. Cook)
* Curses UI, don't use colors after we shut down curses already (C.Höger)
* Document that '%' needs encoding as '%%' in configuration files.
* Fix crash when IMAP.quickchanged() led to an Error (reported by sharat87)
* Implement the createfolders setting to disable folder propagation (see docs)

OfflineIMAP v6.5.3.1 (2012-04-03)
=================================

* Don't fail if no dry-run setting exists in offlineimap.conf
  (introduced in 6.5.3)

OfflineIMAP v6.5.3 (2012-04-02)
===============================

* --dry-run mode protects us from performing any actual action.  It will
  not precisely give the exact information what will happen. If e.g. it
  would need to create a folder, it merely outputs "Would create folder
  X", but not how many and which mails it would transfer.
* internal code changes to prepare for Python3
* Improve user documentation of nametrans/folderfilter
* Fixed some cases where invalid nametrans rules were not caught and
  we would not propagate local folders to the remote repository.
  (now tested in test03)
* Revert "* Slight performance enhancement uploading mails to an IMAP
  server in the common case." It might have led to instabilities.
* Revamped documentation structure. `make` in the `docs` dir or `make
  doc` in the root dir will now create the 1) man page and 2) the user
  documentation using sphinx (requiring python-doctools, and
  sphinx). The resulting user docs are in `docs/html`. You can also
  only create the man pages with `make man` in the `docs` dir.
* -f command line option only works on the untranslated remote
  repository folder names now. Previously folderfilters had to match
  both the local AND remote name which caused unwanted behavior in
  combination with nametrans rules. Clarify in the help text.
* Some better output when using nonsensical configuration settings
* Improve compatability of the curses UI with python 2.6

pkgsrc changes:
* Add "strongly recommended" dependency on py-sqlite3.
* Remove seemingly outdated MESSAGE.

4 files changed, 29 insertions, 20 deletions

diff --git a/mail/offlineimap/MESSAGE b/mail/offlineimap/MESSAGE
deleted file mode 100644
index cf517c184fe..00000000000
--- a/mail/offlineimap/MESSAGE
+++ /dev/null
@@ -1,7 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.1.1.1 2003/08/10 10:09:21 seb Exp $
-
-To use a graphical user interface with ${PKGNAME} you could install
-the py-Tk package from the x11 category.
-
-===========================================================================
diff --git a/mail/offlineimap/Makefile b/mail/offlineimap/Makefile
index 978f139c44b..0c05001a2ac 100644
--- a/mail/offlineimap/Makefile
+++ b/mail/offlineimap/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.24 2014/01/25 10:30:12 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2014/04/23 16:11:31 schmonz Exp $
 
-DISTNAME=	offlineimap-v6.5.2.1
-PKGNAME=	${DISTNAME:S/-v/-/}
-PKGREVISION=	1
+
+DISTNAME=	offlineimap-6.5.5
+DISTFILES=	v6.5.5.tar.gz
 CATEGORIES=	mail
-MASTER_SITES=	http://cloud.github.com/downloads/spaetz/offlineimap/
+MASTER_SITES=	https://github.com/OfflineIMAP/offlineimap/archive/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://offlineimap.org/
@@ -13,18 +13,19 @@ LICENSE=	python-software-foundation AND gnu-gpl-v2 # or later
 
 DEPENDS+=	${PYPKGPREFIX}-curses-[0-9]*:../../devel/py-curses
 DEPENDS+=	${PYPKGPREFIX}-cursespanel-[0-9]*:../../devel/py-cursespanel
-
-WRKSRC=		${WRKDIR}/offlineimap
+DEPENDS+=	${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3
 
 INSTALLATION_DIRS=	share/examples/offlineimap
 
 EGG_NAME=	${PKGNAME_NOREV}
-PYTHON_VERSIONS_INCOMPATIBLE=	33 # not yet ported as of 6.5.2.1
+REPLACE_PYTHON=	offlineimap/imaplib2.py
+PYTHON_VERSIONS_INCOMPATIBLE=	33 # not yet ported as of 6.5.5
 
 post-install:
 .for f in offlineimap.conf offlineimap.conf.minimal
 	${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${PREFIX}/share/examples/offlineimap/${f}
 .endfor
 
+.include "../../lang/python/application.mk"
 .include "../../lang/python/distutils.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/offlineimap/PLIST b/mail/offlineimap/PLIST
index 161a8a2a685..ae5ec6c4ffd 100644
--- a/mail/offlineimap/PLIST
+++ b/mail/offlineimap/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2012/04/08 20:21:51 wiz Exp $
+@comment $NetBSD: PLIST,v 1.6 2014/04/23 16:11:31 schmonz Exp $
 bin/offlineimap
 ${PYSITELIB}/${EGG_FILE}
 ${PYSITELIB}/offlineimap/CustomConfig.py
@@ -10,6 +10,9 @@ ${PYSITELIB}/offlineimap/__init__.pyo
 ${PYSITELIB}/offlineimap/accounts.py
 ${PYSITELIB}/offlineimap/accounts.pyc
 ${PYSITELIB}/offlineimap/accounts.pyo
+${PYSITELIB}/offlineimap/emailutil.py
+${PYSITELIB}/offlineimap/emailutil.pyc
+${PYSITELIB}/offlineimap/emailutil.pyo
 ${PYSITELIB}/offlineimap/error.py
 ${PYSITELIB}/offlineimap/error.pyc
 ${PYSITELIB}/offlineimap/error.pyo
@@ -37,6 +40,9 @@ ${PYSITELIB}/offlineimap/folder/UIDMaps.pyo
 ${PYSITELIB}/offlineimap/folder/__init__.py
 ${PYSITELIB}/offlineimap/folder/__init__.pyc
 ${PYSITELIB}/offlineimap/folder/__init__.pyo
+${PYSITELIB}/offlineimap/globals.py
+${PYSITELIB}/offlineimap/globals.pyc
+${PYSITELIB}/offlineimap/globals.pyo
 ${PYSITELIB}/offlineimap/imaplib2.py
 ${PYSITELIB}/offlineimap/imaplib2.pyc
 ${PYSITELIB}/offlineimap/imaplib2.pyo
@@ -103,5 +109,14 @@ ${PYSITELIB}/offlineimap/ui/__init__.pyo
 ${PYSITELIB}/offlineimap/ui/debuglock.py
 ${PYSITELIB}/offlineimap/ui/debuglock.pyc
 ${PYSITELIB}/offlineimap/ui/debuglock.pyo
+${PYSITELIB}/offlineimap/utils/__init__.py
+${PYSITELIB}/offlineimap/utils/__init__.pyc
+${PYSITELIB}/offlineimap/utils/__init__.pyo
+${PYSITELIB}/offlineimap/utils/const.py
+${PYSITELIB}/offlineimap/utils/const.pyc
+${PYSITELIB}/offlineimap/utils/const.pyo
+${PYSITELIB}/offlineimap/utils/stacktrace.py
+${PYSITELIB}/offlineimap/utils/stacktrace.pyc
+${PYSITELIB}/offlineimap/utils/stacktrace.pyo
 share/examples/offlineimap/offlineimap.conf
 share/examples/offlineimap/offlineimap.conf.minimal
diff --git a/mail/offlineimap/distinfo b/mail/offlineimap/distinfo
index 0d4ce8d787d..a7c44db4057 100644
--- a/mail/offlineimap/distinfo
+++ b/mail/offlineimap/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.5 2012/02/19 13:09:03 obache Exp $
+$NetBSD: distinfo,v 1.6 2014/04/23 16:11:31 schmonz Exp $
 
-SHA1 (offlineimap-v6.5.2.1.tar.gz) = 35d692a4c9e8296235994d2e811937ab0db401b7
-RMD160 (offlineimap-v6.5.2.1.tar.gz) = 28536b0a79534485b18c12d6f629fda37b13be8c
-Size (offlineimap-v6.5.2.1.tar.gz) = 161136 bytes
+SHA1 (v6.5.5.tar.gz) = 8cf4b1dfe98f14d51d8e331dd7393accc9320ac7
+RMD160 (v6.5.5.tar.gz) = 56408076074d8a38d8edbfd8fe4995d6ccbb30fe
+Size (v6.5.5.tar.gz) = 175348 bytes