diff options
| -rw-r--r-- | mail/offlineimap/Makefile | 18 | ||||
| -rw-r--r-- | mail/offlineimap/distinfo | 6 | ||||
| -rw-r--r-- | mail/offlineimap/files/patch-use-interpolation | 62 | ||||
| -rw-r--r-- | mail/offlineimap/pkg-descr | 4 | ||||
| -rw-r--r-- | mail/offlineimap/pkg-plist | 16 |
5 files changed, 28 insertions, 78 deletions
diff --git a/mail/offlineimap/Makefile b/mail/offlineimap/Makefile index f201c84..e03039c 100644 --- a/mail/offlineimap/Makefile +++ b/mail/offlineimap/Makefile @@ -2,13 +2,11 @@ # $FreeBSD$ PORTNAME= offlineimap -DISTVERSION= 6.5.4 -PORTREVISION= 1 +DISTVERSION= 6.5.5 CATEGORIES= mail python -MASTER_SITES= http://cloud.github.com/downloads/spaetz/offlineimap/ \ - http://dist.codelabs.ru/fbsd/offlineimap/ +MASTER_SITES= http://dist.codelabs.ru/fbsd/offlineimap/ + PATCH_SITES= http://codelabs.ru/patches/offlineimap/ -DISTNAME= ${PORTNAME}-v${DISTVERSION} MAINTAINER= rea@FreeBSD.org COMMENT= Powerful IMAP/Maildir synchronization and reader support @@ -21,14 +19,14 @@ LICENSE_FILE_GPLv2=${WRKSRC}/COPYING OPTIONS_DEFINE= HTMLDOCS EXAMPLES HTMLDOCS_DESC= Generate HTML documentation -WRKSRC= ${WRKDIR}/${GITHUB_USER}-${PORTNAME}-${GITHUB_HASH} +WRKSRC?= ${WRKDIR}/${DISTNAME} SUB_FILES= pkg-message PATCH_STRIP= -p1 -PATCH_DIST_STRIP= -p1 -PATCHFILES= 2012-properly-detect-readonly-folders.diff -GITHUB_USER= spaetz -GITHUB_HASH= c9e9690 +USE_GITHUB= yes +GH_ACCOUNT= OfflineIMAP +GH_TAGNAME= v${DISTVERSION} +GH_COMMIT= 8bc2f35 USE_PYTHON= 2.6+ USE_PYDISTUTILS= yes diff --git a/mail/offlineimap/distinfo b/mail/offlineimap/distinfo index 6eedc37..ff8844a 100644 --- a/mail/offlineimap/distinfo +++ b/mail/offlineimap/distinfo @@ -1,4 +1,2 @@ -SHA256 (offlineimap-v6.5.4.tar.gz) = 831a97b5154f398b65e1c06427668b78cf833d99fac36cc8278ad2cf0c393a0c -SIZE (offlineimap-v6.5.4.tar.gz) = 167023 -SHA256 (2012-properly-detect-readonly-folders.diff) = 461dc50ba198d7460a196a9f85c69b0221678a2bb2244bc43c8ca8b4672b44bf -SIZE (2012-properly-detect-readonly-folders.diff) = 1131 +SHA256 (offlineimap-6.5.5.tar.gz) = 578cd6d8706a15ee65faa43bb71dfacf1ed083a97d66a375b77dc0fb14266802 +SIZE (offlineimap-6.5.5.tar.gz) = 175348 diff --git a/mail/offlineimap/files/patch-use-interpolation b/mail/offlineimap/files/patch-use-interpolation deleted file mode 100644 index a6004f2..0000000 --- a/mail/offlineimap/files/patch-use-interpolation +++ /dev/null @@ -1,62 +0,0 @@ -From 8cf576b9edd7f7fe245d4590206ff740d3ed31e3 Mon Sep 17 00:00:00 2001 -From: Eygene Ryabinkin <rea@codelabs.ru> -Date: Wed, 6 Jun 2012 07:45:01 +0400 -Subject: [PATCH] Use '%' instead of String.format() - -Python 2.6 doesn't like empty {} specifications for -String.format(), but the ones that were changed don't -really need the full machinery of String.format() here. - -Signed-off-by: Eygene Ryabinkin <rea@codelabs.ru> ---- - offlineimap/folder/Base.py | 2 +- - offlineimap/ui/UIBase.py | 6 +++--- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/offlineimap/folder/Base.py b/offlineimap/folder/Base.py -index 6f6f364..4c3f1ca 100644 ---- a/offlineimap/folder/Base.py -+++ b/offlineimap/folder/Base.py -@@ -386,7 +386,7 @@ class BaseFolder(object): - self.getmessageuidlist()) - num_to_copy = len(copylist) - if num_to_copy and self.repository.account.dryrun: -- self.ui.info("[DRYRUN] Copy {} messages from {}[{}] to {}".format( -+ self.ui.info("[DRYRUN] Copy %d messages from %s[%s] to %s" % ( - num_to_copy, self, self.repository, dstfolder.repository)) - return - for num, uid in enumerate(copylist): -diff --git a/offlineimap/ui/UIBase.py b/offlineimap/ui/UIBase.py -index eea929d..6608d6d 100644 ---- a/offlineimap/ui/UIBase.py -+++ b/offlineimap/ui/UIBase.py -@@ -301,7 +301,7 @@ class UIBase(object): - def makefolder(self, repo, foldername): - """Called when a folder is created""" - prefix = "[DRYRUN] " if self.dryrun else "" -- self.info("{}Creating folder {}[{}]".format( -+ self.info("%sCreating folder %s[%s]" % ( - prefix, foldername, repo)) - - def syncingfolder(self, srcrepos, srcfolder, destrepos, destfolder): -@@ -346,7 +346,7 @@ class UIBase(object): - def deletingmessages(self, uidlist, destlist): - ds = self.folderlist(destlist) - prefix = "[DRYRUN] " if self.dryrun else "" -- self.info("{}Deleting {} messages ({}) in {}".format( -+ self.info("%sDeleting %s messages (%s) in %s" % ( - prefix, len(uidlist), - offlineimap.imaputil.uid_sequence(uidlist), ds)) - -@@ -474,7 +474,7 @@ class UIBase(object): - - def callhook(self, msg): - if self.dryrun: -- self.info("[DRYRUN] {}".format(msg)) -+ self.info("[DRYRUN] %s" % (msg)) - else: - self.info(msg) - --- -1.7.10.3 - diff --git a/mail/offlineimap/pkg-descr b/mail/offlineimap/pkg-descr index 71d5476..851050b 100644 --- a/mail/offlineimap/pkg-descr +++ b/mail/offlineimap/pkg-descr @@ -1,4 +1,4 @@ -OfflineImap synchronizes emails between two repositories, +OfflineIMAP synchronizes emails between two repositories, so that you can read the same mailbox from multiple computers. It supports IMAP as REMOTE repository and Maildir/IMAP as LOCAL repository. @@ -7,4 +7,4 @@ 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://offlineimap.org/ +WWW: http://offlineimap.org/ diff --git a/mail/offlineimap/pkg-plist b/mail/offlineimap/pkg-plist index 4a3d98f..e9eb07a 100644 --- a/mail/offlineimap/pkg-plist +++ b/mail/offlineimap/pkg-plist @@ -66,6 +66,16 @@ bin/offlineimap %%PYTHON_SITELIBDIR%%/offlineimap/ui/debuglock.pyc %%PYTHON_SITELIBDIR%%/offlineimap/ui/debuglock.pyo @dirrm %%PYTHON_SITELIBDIR%%/offlineimap/ui +%%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 +@dirrm %%PYTHON_SITELIBDIR%%/offlineimap/utils %%PYTHON_SITELIBDIR%%/offlineimap/CustomConfig.py %%PYTHON_SITELIBDIR%%/offlineimap/CustomConfig.pyc %%PYTHON_SITELIBDIR%%/offlineimap/CustomConfig.pyo @@ -75,9 +85,15 @@ bin/offlineimap %%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 |
