Update offlineimap to 6.5.2.1.

may new features, changes and bug filxes from 4.0.16.
for  recent changes, please refer here:
  https://github.com/spaetz/offlineimap/blob/master/Changelog.rst

3 files changed, 39 insertions, 40 deletions

diff --git a/mail/offlineimap/Makefile b/mail/offlineimap/Makefile
index 31ac49535fa..a114d5bc762 100644
--- a/mail/offlineimap/Makefile
+++ b/mail/offlineimap/Makefile
@@ -1,38 +1,31 @@
-# $NetBSD: Makefile,v 1.19 2011/11/26 13:03:36 obache Exp $
+# $NetBSD: Makefile,v 1.20 2012/02/19 13:09:03 obache Exp $
 #
 
-DISTNAME=	offlineimap_${_OFFLINEIMAP_VER}
-PKGNAME=	offlineimap-${_OFFLINEIMAP_VER}
-PKGREVISION=	1
+DISTNAME=	offlineimap-v6.5.2.1
+PKGNAME=	${DISTNAME:S/-v/-/}
 CATEGORIES=	mail
-MASTER_SITES=	http://software.complete.org/offlineimap/static/download_area/${_OFFLINEIMAP_VER}/
+MASTER_SITES=	http://cloud.github.com/downloads/spaetz/offlineimap/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://offlineimap.org/
 COMMENT=	Powerful IMAP/Maildir synchronization and reader support
 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
+
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 WRKSRC=		${WRKDIR}/offlineimap
 
-# This is only to placate pkglint
-_OFFLINEIMAP_VER=	4.0.16
-
-PYDISTUTILSPKG=			yes
-PYTHON_PATCH_SCRIPTS=		bin/offlineimap
-PLIST_SUBST+=			PYSITELIB=${PYSITELIB:Q}
+INSTALLATION_DIRS=	share/examples/offlineimap
 
-INSTALLATION_DIRS=	${PKGMANDIR}/man1 share/examples/offlineimap
+EGG_NAME=	${PKGNAME}
 
 post-install:
-.for _f_ in offlineimap.conf offlineimap.conf.minimal
-	${INSTALL_DATA} ${WRKSRC}/${_f_} ${DESTDIR}${PREFIX}/share/examples/offlineimap/${_f_}
+.for f in offlineimap.conf offlineimap.conf.minimal
+	${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${PREFIX}/share/examples/offlineimap/${f}
 .endfor
-	${INSTALL_MAN} ${WRKSRC}/offlineimap.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/offlineimap.1
 
-.include "../../devel/py-cursespanel/buildlink3.mk"
-.include "../../devel/py-curses/buildlink3.mk"
-.include "../../lang/python/extension.mk"
-.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 7ec0460303b..cca07dcb1b3 100644
--- a/mail/offlineimap/PLIST
+++ b/mail/offlineimap/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.3 2009/06/14 18:04:39 joerg Exp $
+@comment $NetBSD: PLIST,v 1.4 2012/02/19 13:09:03 obache Exp $
 bin/offlineimap
+${PLIST.eggfile}${PYSITELIB}/${EGG_FILE}
 ${PYSITELIB}/offlineimap/CustomConfig.py
 ${PYSITELIB}/offlineimap/CustomConfig.pyc
 ${PYSITELIB}/offlineimap/CustomConfig.pyo
@@ -9,15 +10,24 @@ ${PYSITELIB}/offlineimap/__init__.pyo
 ${PYSITELIB}/offlineimap/accounts.py
 ${PYSITELIB}/offlineimap/accounts.pyc
 ${PYSITELIB}/offlineimap/accounts.pyo
+${PYSITELIB}/offlineimap/error.py
+${PYSITELIB}/offlineimap/error.pyc
+${PYSITELIB}/offlineimap/error.pyo
 ${PYSITELIB}/offlineimap/folder/Base.py
 ${PYSITELIB}/offlineimap/folder/Base.pyc
 ${PYSITELIB}/offlineimap/folder/Base.pyo
+${PYSITELIB}/offlineimap/folder/Gmail.py
+${PYSITELIB}/offlineimap/folder/Gmail.pyc
+${PYSITELIB}/offlineimap/folder/Gmail.pyo
 ${PYSITELIB}/offlineimap/folder/IMAP.py
 ${PYSITELIB}/offlineimap/folder/IMAP.pyc
 ${PYSITELIB}/offlineimap/folder/IMAP.pyo
 ${PYSITELIB}/offlineimap/folder/LocalStatus.py
 ${PYSITELIB}/offlineimap/folder/LocalStatus.pyc
 ${PYSITELIB}/offlineimap/folder/LocalStatus.pyo
+${PYSITELIB}/offlineimap/folder/LocalStatusSQLite.py
+${PYSITELIB}/offlineimap/folder/LocalStatusSQLite.pyc
+${PYSITELIB}/offlineimap/folder/LocalStatusSQLite.pyo
 ${PYSITELIB}/offlineimap/folder/Maildir.py
 ${PYSITELIB}/offlineimap/folder/Maildir.pyc
 ${PYSITELIB}/offlineimap/folder/Maildir.pyo
@@ -27,9 +37,12 @@ ${PYSITELIB}/offlineimap/folder/UIDMaps.pyo
 ${PYSITELIB}/offlineimap/folder/__init__.py
 ${PYSITELIB}/offlineimap/folder/__init__.pyc
 ${PYSITELIB}/offlineimap/folder/__init__.pyo
-${PYSITELIB}/offlineimap/imaplib.py
-${PYSITELIB}/offlineimap/imaplib.pyc
-${PYSITELIB}/offlineimap/imaplib.pyo
+${PYSITELIB}/offlineimap/imaplib2.py
+${PYSITELIB}/offlineimap/imaplib2.pyc
+${PYSITELIB}/offlineimap/imaplib2.pyo
+${PYSITELIB}/offlineimap/imaplibutil.py
+${PYSITELIB}/offlineimap/imaplibutil.pyc
+${PYSITELIB}/offlineimap/imaplibutil.pyo
 ${PYSITELIB}/offlineimap/imapserver.py
 ${PYSITELIB}/offlineimap/imapserver.pyc
 ${PYSITELIB}/offlineimap/imapserver.pyo
@@ -48,6 +61,9 @@ ${PYSITELIB}/offlineimap/mbnames.pyo
 ${PYSITELIB}/offlineimap/repository/Base.py
 ${PYSITELIB}/offlineimap/repository/Base.pyc
 ${PYSITELIB}/offlineimap/repository/Base.pyo
+${PYSITELIB}/offlineimap/repository/Gmail.py
+${PYSITELIB}/offlineimap/repository/Gmail.pyc
+${PYSITELIB}/offlineimap/repository/Gmail.pyo
 ${PYSITELIB}/offlineimap/repository/IMAP.py
 ${PYSITELIB}/offlineimap/repository/IMAP.pyc
 ${PYSITELIB}/offlineimap/repository/IMAP.pyo
@@ -66,21 +82,18 @@ ${PYSITELIB}/offlineimap/syncmaster.pyo
 ${PYSITELIB}/offlineimap/threadutil.py
 ${PYSITELIB}/offlineimap/threadutil.pyc
 ${PYSITELIB}/offlineimap/threadutil.pyo
-${PYSITELIB}/offlineimap/ui/Blinkenlights.py
-${PYSITELIB}/offlineimap/ui/Blinkenlights.pyc
-${PYSITELIB}/offlineimap/ui/Blinkenlights.pyo
 ${PYSITELIB}/offlineimap/ui/Curses.py
 ${PYSITELIB}/offlineimap/ui/Curses.pyc
 ${PYSITELIB}/offlineimap/ui/Curses.pyo
+${PYSITELIB}/offlineimap/ui/Machine.py
+${PYSITELIB}/offlineimap/ui/Machine.pyc
+${PYSITELIB}/offlineimap/ui/Machine.pyo
 ${PYSITELIB}/offlineimap/ui/Noninteractive.py
 ${PYSITELIB}/offlineimap/ui/Noninteractive.pyc
 ${PYSITELIB}/offlineimap/ui/Noninteractive.pyo
 ${PYSITELIB}/offlineimap/ui/TTY.py
 ${PYSITELIB}/offlineimap/ui/TTY.pyc
 ${PYSITELIB}/offlineimap/ui/TTY.pyo
-${PYSITELIB}/offlineimap/ui/Tk.py
-${PYSITELIB}/offlineimap/ui/Tk.pyc
-${PYSITELIB}/offlineimap/ui/Tk.pyo
 ${PYSITELIB}/offlineimap/ui/UIBase.py
 ${PYSITELIB}/offlineimap/ui/UIBase.pyc
 ${PYSITELIB}/offlineimap/ui/UIBase.pyo
@@ -90,12 +103,5 @@ ${PYSITELIB}/offlineimap/ui/__init__.pyo
 ${PYSITELIB}/offlineimap/ui/debuglock.py
 ${PYSITELIB}/offlineimap/ui/debuglock.pyc
 ${PYSITELIB}/offlineimap/ui/debuglock.pyo
-${PYSITELIB}/offlineimap/ui/detector.py
-${PYSITELIB}/offlineimap/ui/detector.pyc
-${PYSITELIB}/offlineimap/ui/detector.pyo
-${PYSITELIB}/offlineimap/version.py
-${PYSITELIB}/offlineimap/version.pyc
-${PYSITELIB}/offlineimap/version.pyo
-man/man1/offlineimap.1
 share/examples/offlineimap/offlineimap.conf
 share/examples/offlineimap/offlineimap.conf.minimal
diff --git a/mail/offlineimap/distinfo b/mail/offlineimap/distinfo
index 9461c3984ad..0d4ce8d787d 100644
--- a/mail/offlineimap/distinfo
+++ b/mail/offlineimap/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.4 2007/02/16 15:46:21 tonio Exp $
+$NetBSD: distinfo,v 1.5 2012/02/19 13:09:03 obache Exp $
 
-SHA1 (offlineimap_4.0.16.tar.gz) = fcbd16b1838d3dde328b939de2256b9480216e43
-RMD160 (offlineimap_4.0.16.tar.gz) = 0182994bab7a244c45d59c5cdbd620451c21f29c
-Size (offlineimap_4.0.16.tar.gz) = 174917 bytes
+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