4 files changed, 23 insertions, 24 deletions

diff --git a/mail/offlineimap/Makefile b/mail/offlineimap/Makefile
index e67f2b7bfb35..50a18f845128 100644
--- a/mail/offlineimap/Makefile
+++ b/mail/offlineimap/Makefile
@@ -6,12 +6,10 @@
 #
 
 PORTNAME=	offlineimap
-PORTVERSION=	4.0.11
-PORTREVISION=	1
+PORTVERSION=	6.0.0
 CATEGORIES=	mail python
-MASTER_SITES=	${MASTER_SITE_LOCAL} \
-		http://www.quux.org/devel/offlineimap/
-MASTER_SITE_SUBDIR=	sergei
+MASTER_SITES=	${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR=	arved
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
@@ -28,13 +26,10 @@ PKGMESSAGE=	${WRKDIR}/pkg-message
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
 
-MAN1=		offlineimap.1
-DOCS=		COPYRIGHT ChangeLog UPGRADING manual.html manual.pdf \
-		manual.ps manual.txt
+DOCS=		COPYING COPYRIGHT FAQ.html README UPGRADING
 EXAMPLES=	offlineimap.conf offlineimap.conf.minimal
 
 post-install:
-	${INSTALL_MAN} ${WRKSRC}/offlineimap.1 ${MANPREFIX}/man/man1/
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
diff --git a/mail/offlineimap/distinfo b/mail/offlineimap/distinfo
index 2effb19b3999..96d28fdb183a 100644
--- a/mail/offlineimap/distinfo
+++ b/mail/offlineimap/distinfo
@@ -1,3 +1,3 @@
-MD5 (offlineimap_4.0.11.tar.gz) = 41af0924d5e19480377616f4b1d059e1
-SHA256 (offlineimap_4.0.11.tar.gz) = ced179eb6bcb782b9b95f9a1340aaf0ebddcea0485a25f3e9b396d11223b0558
-SIZE (offlineimap_4.0.11.tar.gz) = 218773
+MD5 (offlineimap_6.0.0.tar.gz) = 5e9cd283a5ca605af1fad88b1dcaa91d
+SHA256 (offlineimap_6.0.0.tar.gz) = dfd965730585cb3d6064ea7759e9f84c368740311f4e3f0c7cf724ada5680c40
+SIZE (offlineimap_6.0.0.tar.gz) = 96761
diff --git a/mail/offlineimap/pkg-descr b/mail/offlineimap/pkg-descr
index ddc41cfc430b..70e9e2198d83 100644
--- a/mail/offlineimap/pkg-descr
+++ b/mail/offlineimap/pkg-descr
@@ -7,4 +7,4 @@ on your work computer as well.  OfflineIMAP is also useful if you want
 to use a mail reader that does not have IMAP support, has poor IMAP
 support, or does not provide disconnected operation.
 
-WWW:	http://gopher.quux.org:70/devel/offlineimap/
+WWW:	http://software.complete.org/software/projects/show/offlineimap
diff --git a/mail/offlineimap/pkg-plist b/mail/offlineimap/pkg-plist
index 56fb6405a32d..ca95f2d38882 100644
--- a/mail/offlineimap/pkg-plist
+++ b/mail/offlineimap/pkg-plist
@@ -6,6 +6,9 @@ bin/offlineimap
 %%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
@@ -25,6 +28,9 @@ bin/offlineimap
 %%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
@@ -44,15 +50,15 @@ bin/offlineimap
 %%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/Tk.py
-%%PYTHON_SITELIBDIR%%/offlineimap/ui/Tk.pyc
-%%PYTHON_SITELIBDIR%%/offlineimap/ui/Tk.pyo
 %%PYTHON_SITELIBDIR%%/offlineimap/ui/UIBase.py
 %%PYTHON_SITELIBDIR%%/offlineimap/ui/UIBase.pyc
 %%PYTHON_SITELIBDIR%%/offlineimap/ui/UIBase.pyo
@@ -72,9 +78,9 @@ bin/offlineimap
 %%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/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
@@ -100,13 +106,11 @@ bin/offlineimap
 %%PYTHON_SITELIBDIR%%/offlineimap/version.pyc
 %%PYTHON_SITELIBDIR%%/offlineimap/version.pyo
 @dirrm %%PYTHON_SITELIBDIR%%/offlineimap
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/FAQ.html
+%%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/UPGRADING
-%%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