Hi,

this is a diff for updateing offlineimap to 7.0.0-rc2. I don't think it
should be updated in CVS before the final 7.0.0 version is released.

It works for me synching between local maildir and remote dovecot via
imaps.

Maybe somebody with a different setup can give it a try?

For this 7.0.0-rc2 version I had to do the following change to PLIST:

-lib/python${MODPY_VERSION}/site-packages/offlineimap-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info
+lib/python${MODPY_VERSION}/site-packages/offlineimap-7.0.0_rc2-py${MODPY_VERSION}.egg-info

This is needed because ${MODPY_EGG_VERSION} would be replaced with
7.0.0-rc2. But the file has the version string 7.0.0_rc2. Is there a
better way than hardcoding the version string in this case?

Remi


Index: Makefile
===================================================================
RCS file: /cvs/ports/mail/offlineimap/Makefile,v
retrieving revision 1.33
diff -u -p -r1.33 Makefile
--- Makefile    21 Mar 2016 14:39:27 -0000      1.33
+++ Makefile    5 Jun 2016 11:02:44 -0000
@@ -2,8 +2,7 @@
 
 COMMENT=       powerful IMAP/Maildir synchronization and reader support
 
-MODPY_EGG_VERSION = 6.7.0
-REVISION =     0
+MODPY_EGG_VERSION = 7.0.0-rc2
 GH_ACCOUNT =   OfflineIMAP
 GH_PROJECT =   offlineimap
 GH_TAGNAME =   v${MODPY_EGG_VERSION}
@@ -22,6 +21,8 @@ NO_TEST=      Yes
 MODULES=       lang/python
 
 BUILD_DEPENDS= textproc/asciidoc
+
+RUN_DEPENDS=   devel/py-six
 
 EXAMPLESDIR=   ${PREFIX}/share/examples/offlineimap
 
Index: distinfo
===================================================================
RCS file: /cvs/ports/mail/offlineimap/distinfo,v
retrieving revision 1.21
diff -u -p -r1.21 distinfo
--- distinfo    16 Mar 2016 00:04:16 -0000      1.21
+++ distinfo    5 Jun 2016 11:02:44 -0000
@@ -1,2 +1,2 @@
-SHA256 (offlineimap-6.7.0.tar.gz) = 
xEb7Mb3KkMfbQUa5GK0/oF9t9TYqTMlh32p3J6iqwhA=
-SIZE (offlineimap-6.7.0.tar.gz) = 678649
+SHA256 (offlineimap-7.0.0-rc2.tar.gz) = 
xOu6hS+4IQv5say9yHsWirLI7gheTzvlxs0wHH62lv4=
+SIZE (offlineimap-7.0.0-rc2.tar.gz) = 682499
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/mail/offlineimap/pkg/PLIST,v
retrieving revision 1.13
diff -u -p -r1.13 PLIST
--- pkg/PLIST   30 Nov 2015 22:27:13 -0000      1.13
+++ pkg/PLIST   5 Jun 2016 11:02:44 -0000
@@ -1,13 +1,15 @@
 @comment $OpenBSD: PLIST,v 1.13 2015/11/30 22:27:13 edd Exp $
 bin/offlineimap
 lib/python${MODPY_VERSION}/site-packages/offlineimap/
-lib/python${MODPY_VERSION}/site-packages/offlineimap-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info
+lib/python${MODPY_VERSION}/site-packages/offlineimap-7.0.0_rc2-py${MODPY_VERSION}.egg-info
 lib/python${MODPY_VERSION}/site-packages/offlineimap/CustomConfig.py
 lib/python${MODPY_VERSION}/site-packages/offlineimap/CustomConfig.pyc
 lib/python${MODPY_VERSION}/site-packages/offlineimap/__init__.py
 lib/python${MODPY_VERSION}/site-packages/offlineimap/__init__.pyc
 lib/python${MODPY_VERSION}/site-packages/offlineimap/accounts.py
 lib/python${MODPY_VERSION}/site-packages/offlineimap/accounts.pyc
+lib/python${MODPY_VERSION}/site-packages/offlineimap/bundled_imaplib2.py
+lib/python${MODPY_VERSION}/site-packages/offlineimap/bundled_imaplib2.pyc
 lib/python${MODPY_VERSION}/site-packages/offlineimap/emailutil.py
 lib/python${MODPY_VERSION}/site-packages/offlineimap/emailutil.pyc
 lib/python${MODPY_VERSION}/site-packages/offlineimap/error.py
@@ -33,8 +35,6 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/offlineimap/folder/__init__.pyc
 lib/python${MODPY_VERSION}/site-packages/offlineimap/globals.py
 lib/python${MODPY_VERSION}/site-packages/offlineimap/globals.pyc
-lib/python${MODPY_VERSION}/site-packages/offlineimap/imaplib2.py
-lib/python${MODPY_VERSION}/site-packages/offlineimap/imaplib2.pyc
 lib/python${MODPY_VERSION}/site-packages/offlineimap/imaplibutil.py
 lib/python${MODPY_VERSION}/site-packages/offlineimap/imaplibutil.pyc
 lib/python${MODPY_VERSION}/site-packages/offlineimap/imapserver.py
@@ -62,8 +62,6 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/offlineimap/repository/Maildir.pyc
 lib/python${MODPY_VERSION}/site-packages/offlineimap/repository/__init__.py
 lib/python${MODPY_VERSION}/site-packages/offlineimap/repository/__init__.pyc
-lib/python${MODPY_VERSION}/site-packages/offlineimap/syncmaster.py
-lib/python${MODPY_VERSION}/site-packages/offlineimap/syncmaster.pyc
 lib/python${MODPY_VERSION}/site-packages/offlineimap/threadutil.py
 lib/python${MODPY_VERSION}/site-packages/offlineimap/threadutil.pyc
 lib/python${MODPY_VERSION}/site-packages/offlineimap/ui/
@@ -90,6 +88,8 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/offlineimap/utils/distro.pyc
 lib/python${MODPY_VERSION}/site-packages/offlineimap/utils/stacktrace.py
 lib/python${MODPY_VERSION}/site-packages/offlineimap/utils/stacktrace.pyc
+lib/python${MODPY_VERSION}/site-packages/offlineimap/virtual_imaplib2.py
+lib/python${MODPY_VERSION}/site-packages/offlineimap/virtual_imaplib2.pyc
 @man man/man1/offlineimap.1
 @man man/man7/offlineimapui.7
 share/examples/offlineimap/

Reply via email to