6 files changed, 76 insertions, 173 deletions

diff --git a/mail/offlineimap/Makefile b/mail/offlineimap/Makefile
index 2fc15af95ac1..017fcfe65187 100644
--- a/mail/offlineimap/Makefile
+++ b/mail/offlineimap/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	offlineimap
-PORTVERSION=	3.99.7
-PORTREVISION=	1
+PORTVERSION=	3.99.15
 CATEGORIES=	mail python
 MASTER_SITES=	http://gopher.quux.org:70/devel/offlineimap/
 DISTNAME=	${PORTNAME}_${PORTVERSION}
@@ -16,31 +15,22 @@ MAINTAINER=	sergei@kolobov.com
 COMMENT=	Powerful IMAP/Maildir synchronization and reader support
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-PKGMESSAGE=	${WRKDIR}/pkg-message
 
 USE_PYTHON=	yes
-USE_PYDISTUTILS=yes
+USE_PYDISTUTILS=	yes
 
 MAN1=		offlineimap.1
 DOCS=		manual.html manual.pdf manual.ps manual.txt
 EXAMPLES=	offlineimap.conf offlineimap.conf.minimal
 
-DEFAULT_EXAMPLES_DIR=/usr/local/share/examples/offlineimap
-
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/offlineimap.1 ${MANPREFIX}/man/man1/
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-.for file in ${DOCS}
-	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
-.endfor
+	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
 .endif
 	@${MKDIR} ${EXAMPLESDIR}
-.for file in ${EXAMPLES}
-	${INSTALL_DATA} ${WRKSRC}/${file} ${EXAMPLESDIR}
-.endfor
-	@${SED} -e 's!${DEFAULT_EXAMPLES_DIR}!${EXAMPLESDIR}!' \
-		${MASTERDIR}/pkg-message > ${PKGMESSAGE}
-	@${CAT} ${PKGMESSAGE}
+	cd ${WRKSRC} && ${INSTALL_DATA} ${EXAMPLES} ${EXAMPLESDIR}
+	@${SED} -e 's!%%EXAMPLESDIR%%!${EXAMPLESDIR}!' < ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/mail/offlineimap/distinfo b/mail/offlineimap/distinfo
index b7c7d5e5b85b..7706a24a0ca3 100644
--- a/mail/offlineimap/distinfo
+++ b/mail/offlineimap/distinfo
@@ -1 +1 @@
-MD5 (offlineimap_3.99.7.tar.gz) = a35b935bd424a8ab500e07c384d8d28c
+MD5 (offlineimap_3.99.15.tar.gz) = 9a1f6ecea92170ae542c04c2a0da9de9
diff --git a/mail/offlineimap/files/patch-Maildir.py b/mail/offlineimap/files/patch-Maildir.py
new file mode 100644
index 000000000000..a8394d754eaf
--- /dev/null
+++ b/mail/offlineimap/files/patch-Maildir.py
@@ -0,0 +1,11 @@
+--- offlineimap/repository/Maildir.py.orig	Thu May  8 01:28:58 2003
++++ offlineimap/repository/Maildir.py	Thu May  8 01:29:22 2003
+@@ -132,7 +132,7 @@
+ 
+                 retval.append(folder.Maildir.MaildirFolder(self.root, foldername,
+                                                            self.getsep(), self, self.accountname))
+-            if self.getsep() == '/':
++            if self.getsep() == '/' and dirname != '.':
+                 # Check sub-directories for folders.
+                 retval.extend(self._getfolders_scandir(root, foldername))
+         self.debug("_GETFOLDERS_SCANDIR RETURNING %s" % \
diff --git a/mail/offlineimap/files/patch-ui::Curses.py b/mail/offlineimap/files/patch-ui::Curses.py
deleted file mode 100644
index d2a30f30c345..000000000000
--- a/mail/offlineimap/files/patch-ui::Curses.py
+++ /dev/null
@@ -1,101 +0,0 @@
---- offlineimap/ui/Curses.py	(original)
-+++ offlineimap/ui/Curses.py	Fri Jan 10 11:47:36 2003
-@@ -29,12 +29,18 @@
- 
- class CursesUtil:
-     def __init__(self):
--        self.pairs = {self._getpairindex(curses.COLOR_WHITE,
--                                         curses.COLOR_BLACK): 0}
--        self.start()
--        self.nextpair = 1
-         self.pairlock = Lock()
-         self.iolock = MultiLock()
-+        self.start()
-+
-+    def initpairs(self):
-+        self.pairlock.acquire()
-+        try:
-+            self.pairs = {self._getpairindex(curses.COLOR_WHITE,
-+                                             curses.COLOR_BLACK): 0}
-+            self.nextpair = 1
-+        finally:
-+            self.pairlock.release()
- 
-     def lock(self):
-         self.iolock.acquire()
-@@ -63,6 +69,8 @@
-         return '%d/%d' % (fg,bg)
- 
-     def getpair(self, fg, bg):
-+        if not self.has_color:
-+            return 0
-         pindex = self._getpairindex(fg, bg)
-         self.pairlock.acquire()
-         try:
-@@ -96,6 +104,7 @@
-         self.stdscr.clear()
-         self.stdscr.refresh()
-         (self.height, self.width) = self.stdscr.getmaxyx()
-+        self.initpairs()
- 
-     def stop(self):
-         if not hasattr(self, 'stdscr'):
-@@ -200,7 +209,10 @@
- 
-     def display(self):
-         def lockedstuff():
--            self.window.addstr(self.y, self.x, '.', self.color)
-+            if self.getcolor() == 'black':
-+                self.window.addstr(self.y, self.x, ' ', self.color)
-+            else:
-+                self.window.addstr(self.y, self.x, '.', self.color)
-             self.c.stdscr.move(self.c.height - 1, self.c.width - 1)
-             self.window.refresh()
-         self.c.locked(lockedstuff)
-@@ -406,9 +418,12 @@
-             s.c.unlock()
- 
-     def setupwindow_drawbanner(s):
--        s.bannerwindow.bkgd(' ', curses.A_BOLD | \
--                            s.c.getpair(curses.COLOR_WHITE,
--                                        curses.COLOR_BLUE))
-+        if s.c.has_color:
-+            color = s.c.getpair(curses.COLOR_WHITE, curses.COLOR_BLUE) | \
-+                    curses.A_BOLD
-+        else:
-+            color = curses.A_REVERSE
-+        s.bannerwindow.bkgd(' ', color) # Fill background with that color
-         s.bannerwindow.addstr("%s %s" % (version.productname,
-                                          version.versionstr))
-         s.bannerwindow.addstr(0, s.bannerwindow.getmaxyx()[1] - len(version.copyright) - 1,
-@@ -417,7 +432,11 @@
-         s.bannerwindow.noutrefresh()
- 
-     def setupwindow_drawlog(s):
--        s.logwindow.bkgd(' ', s.c.getpair(curses.COLOR_WHITE, curses.COLOR_BLACK))
-+        if s.c.has_color:
-+            color = s.c.getpair(curses.COLOR_WHITE, curses.COLOR_BLACK)
-+        else:
-+            color = curses.A_NORMAL
-+        s.logwindow.bkgd(' ', color)
-         for line, color in s.text:
-             s.logwindow.addstr("\n" + line, color)
-         s.logwindow.noutrefresh()
-@@ -501,7 +520,7 @@
-     x = Blinkenlights(None)
-     x.init_banner()
-     import time
--    time.sleep(10)
-+    time.sleep(5)
-     x.c.stop()
-     fgs = {'black': curses.COLOR_BLACK, 'red': curses.COLOR_RED,
-            'green': curses.COLOR_GREEN, 'yellow': curses.COLOR_YELLOW,
-@@ -536,7 +555,7 @@
-     win4.refresh()
-     x.stdscr.refresh()
-     import time
--    time.sleep(40)
-+    time.sleep(5)
-     x.stop()
-     print x.has_color
-     print x.height
diff --git a/mail/offlineimap/pkg-message b/mail/offlineimap/pkg-message
index 2f0681657a79..ee7feab2131c 100644
--- a/mail/offlineimap/pkg-message
+++ b/mail/offlineimap/pkg-message
@@ -1,11 +1,11 @@
 ###########################################################################
 # 
 # Please copy sample configuration file from 
-# /usr/local/share/examples/offlineimap/offlineimap.conf.minimal 
+# %%EXAMPLESDIR%%/offlineimap.conf.minimal 
 # to ~/.offlineimaprc and edit to suit your needs.
 #
-# WARNING: if you are upgrading from pre-3.99.6 version, please be sure 
+# WARNING: if you are upgrading from pre-3.99.12 version, please be sure 
 #          to check the manual for changes in configuration file format 
-#          that could be incompatible with your existing configuration.
+#          that are incompatible with your existing configuration.
 #
 ###########################################################################
diff --git a/mail/offlineimap/pkg-plist b/mail/offlineimap/pkg-plist
index a8e7c7ca6af1..da17a3b3bdd7 100644
--- a/mail/offlineimap/pkg-plist
+++ b/mail/offlineimap/pkg-plist
@@ -1,13 +1,7 @@
 bin/offlineimap
-%%PYTHON_SITELIBDIR%%/offlineimap/__init__.py
-%%PYTHON_SITELIBDIR%%/offlineimap/__init__.pyc
-%%PYTHON_SITELIBDIR%%/offlineimap/__init__.pyo
-%%PYTHON_SITELIBDIR%%/offlineimap/CustomConfig.py
-%%PYTHON_SITELIBDIR%%/offlineimap/CustomConfig.pyc
-%%PYTHON_SITELIBDIR%%/offlineimap/CustomConfig.pyo
-%%PYTHON_SITELIBDIR%%/offlineimap/accounts.py
-%%PYTHON_SITELIBDIR%%/offlineimap/accounts.pyc
-%%PYTHON_SITELIBDIR%%/offlineimap/accounts.pyo
+%%PYTHON_SITELIBDIR%%/offlineimap/folder/__init__.py
+%%PYTHON_SITELIBDIR%%/offlineimap/folder/__init__.pyc
+%%PYTHON_SITELIBDIR%%/offlineimap/folder/__init__.pyo
 %%PYTHON_SITELIBDIR%%/offlineimap/folder/Base.py
 %%PYTHON_SITELIBDIR%%/offlineimap/folder/Base.pyc
 %%PYTHON_SITELIBDIR%%/offlineimap/folder/Base.pyo
@@ -20,27 +14,13 @@ bin/offlineimap
 %%PYTHON_SITELIBDIR%%/offlineimap/folder/Maildir.py
 %%PYTHON_SITELIBDIR%%/offlineimap/folder/Maildir.pyc
 %%PYTHON_SITELIBDIR%%/offlineimap/folder/Maildir.pyo
-%%PYTHON_SITELIBDIR%%/offlineimap/folder/__init__.py
-%%PYTHON_SITELIBDIR%%/offlineimap/folder/__init__.pyc
-%%PYTHON_SITELIBDIR%%/offlineimap/folder/__init__.pyo
-%%PYTHON_SITELIBDIR%%/offlineimap/imaplib.py
-%%PYTHON_SITELIBDIR%%/offlineimap/imaplib.pyc
-%%PYTHON_SITELIBDIR%%/offlineimap/imaplib.pyo
-%%PYTHON_SITELIBDIR%%/offlineimap/imapserver.py
-%%PYTHON_SITELIBDIR%%/offlineimap/imapserver.pyc
-%%PYTHON_SITELIBDIR%%/offlineimap/imapserver.pyo
-%%PYTHON_SITELIBDIR%%/offlineimap/imaputil.py
-%%PYTHON_SITELIBDIR%%/offlineimap/imaputil.pyc
-%%PYTHON_SITELIBDIR%%/offlineimap/imaputil.pyo
-%%PYTHON_SITELIBDIR%%/offlineimap/init.py
-%%PYTHON_SITELIBDIR%%/offlineimap/init.pyc
-%%PYTHON_SITELIBDIR%%/offlineimap/init.pyo
-%%PYTHON_SITELIBDIR%%/offlineimap/localeval.py
-%%PYTHON_SITELIBDIR%%/offlineimap/localeval.pyc
-%%PYTHON_SITELIBDIR%%/offlineimap/localeval.pyo
-%%PYTHON_SITELIBDIR%%/offlineimap/mbnames.py
-%%PYTHON_SITELIBDIR%%/offlineimap/mbnames.pyc
-%%PYTHON_SITELIBDIR%%/offlineimap/mbnames.pyo
+%%PYTHON_SITELIBDIR%%/offlineimap/folder/UIDMaps.py
+%%PYTHON_SITELIBDIR%%/offlineimap/folder/UIDMaps.pyc
+%%PYTHON_SITELIBDIR%%/offlineimap/folder/UIDMaps.pyo
+@dirrm %%PYTHON_SITELIBDIR%%/offlineimap/folder
+%%PYTHON_SITELIBDIR%%/offlineimap/repository/__init__.py
+%%PYTHON_SITELIBDIR%%/offlineimap/repository/__init__.pyc
+%%PYTHON_SITELIBDIR%%/offlineimap/repository/__init__.pyo
 %%PYTHON_SITELIBDIR%%/offlineimap/repository/Base.py
 %%PYTHON_SITELIBDIR%%/offlineimap/repository/Base.pyc
 %%PYTHON_SITELIBDIR%%/offlineimap/repository/Base.pyo
@@ -53,15 +33,10 @@ bin/offlineimap
 %%PYTHON_SITELIBDIR%%/offlineimap/repository/Maildir.py
 %%PYTHON_SITELIBDIR%%/offlineimap/repository/Maildir.pyc
 %%PYTHON_SITELIBDIR%%/offlineimap/repository/Maildir.pyo
-%%PYTHON_SITELIBDIR%%/offlineimap/repository/__init__.py
-%%PYTHON_SITELIBDIR%%/offlineimap/repository/__init__.pyc
-%%PYTHON_SITELIBDIR%%/offlineimap/repository/__init__.pyo
-%%PYTHON_SITELIBDIR%%/offlineimap/syncmaster.py
-%%PYTHON_SITELIBDIR%%/offlineimap/syncmaster.pyc
-%%PYTHON_SITELIBDIR%%/offlineimap/syncmaster.pyo
-%%PYTHON_SITELIBDIR%%/offlineimap/threadutil.py
-%%PYTHON_SITELIBDIR%%/offlineimap/threadutil.pyc
-%%PYTHON_SITELIBDIR%%/offlineimap/threadutil.pyo
+@dirrm %%PYTHON_SITELIBDIR%%/offlineimap/repository
+%%PYTHON_SITELIBDIR%%/offlineimap/ui/__init__.py
+%%PYTHON_SITELIBDIR%%/offlineimap/ui/__init__.pyc
+%%PYTHON_SITELIBDIR%%/offlineimap/ui/__init__.pyo
 %%PYTHON_SITELIBDIR%%/offlineimap/ui/Blinkenlights.py
 %%PYTHON_SITELIBDIR%%/offlineimap/ui/Blinkenlights.pyc
 %%PYTHON_SITELIBDIR%%/offlineimap/ui/Blinkenlights.pyo
@@ -80,27 +55,55 @@ bin/offlineimap
 %%PYTHON_SITELIBDIR%%/offlineimap/ui/UIBase.py
 %%PYTHON_SITELIBDIR%%/offlineimap/ui/UIBase.pyc
 %%PYTHON_SITELIBDIR%%/offlineimap/ui/UIBase.pyo
-%%PYTHON_SITELIBDIR%%/offlineimap/ui/__init__.py
-%%PYTHON_SITELIBDIR%%/offlineimap/ui/__init__.pyc
-%%PYTHON_SITELIBDIR%%/offlineimap/ui/__init__.pyo
 %%PYTHON_SITELIBDIR%%/offlineimap/ui/debuglock.py
 %%PYTHON_SITELIBDIR%%/offlineimap/ui/debuglock.pyc
 %%PYTHON_SITELIBDIR%%/offlineimap/ui/debuglock.pyo
 %%PYTHON_SITELIBDIR%%/offlineimap/ui/detector.py
 %%PYTHON_SITELIBDIR%%/offlineimap/ui/detector.pyc
 %%PYTHON_SITELIBDIR%%/offlineimap/ui/detector.pyo
+@dirrm %%PYTHON_SITELIBDIR%%/offlineimap/ui
+%%PYTHON_SITELIBDIR%%/offlineimap/__init__.py
+%%PYTHON_SITELIBDIR%%/offlineimap/__init__.pyc
+%%PYTHON_SITELIBDIR%%/offlineimap/__init__.pyo
+%%PYTHON_SITELIBDIR%%/offlineimap/CustomConfig.py
+%%PYTHON_SITELIBDIR%%/offlineimap/CustomConfig.pyc
+%%PYTHON_SITELIBDIR%%/offlineimap/CustomConfig.pyo
+%%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/imapserver.py
+%%PYTHON_SITELIBDIR%%/offlineimap/imapserver.pyc
+%%PYTHON_SITELIBDIR%%/offlineimap/imapserver.pyo
+%%PYTHON_SITELIBDIR%%/offlineimap/imaputil.py
+%%PYTHON_SITELIBDIR%%/offlineimap/imaputil.pyc
+%%PYTHON_SITELIBDIR%%/offlineimap/imaputil.pyo
+%%PYTHON_SITELIBDIR%%/offlineimap/init.py
+%%PYTHON_SITELIBDIR%%/offlineimap/init.pyc
+%%PYTHON_SITELIBDIR%%/offlineimap/init.pyo
+%%PYTHON_SITELIBDIR%%/offlineimap/localeval.py
+%%PYTHON_SITELIBDIR%%/offlineimap/localeval.pyc
+%%PYTHON_SITELIBDIR%%/offlineimap/localeval.pyo
+%%PYTHON_SITELIBDIR%%/offlineimap/mbnames.py
+%%PYTHON_SITELIBDIR%%/offlineimap/mbnames.pyc
+%%PYTHON_SITELIBDIR%%/offlineimap/mbnames.pyo
+%%PYTHON_SITELIBDIR%%/offlineimap/syncmaster.py
+%%PYTHON_SITELIBDIR%%/offlineimap/syncmaster.pyc
+%%PYTHON_SITELIBDIR%%/offlineimap/syncmaster.pyo
+%%PYTHON_SITELIBDIR%%/offlineimap/threadutil.py
+%%PYTHON_SITELIBDIR%%/offlineimap/threadutil.pyc
+%%PYTHON_SITELIBDIR%%/offlineimap/threadutil.pyo
 %%PYTHON_SITELIBDIR%%/offlineimap/version.py
 %%PYTHON_SITELIBDIR%%/offlineimap/version.pyc
 %%PYTHON_SITELIBDIR%%/offlineimap/version.pyo
-%%PORTDOCS%%share/doc/offlineimap/manual.html
-%%PORTDOCS%%share/doc/offlineimap/manual.pdf
-%%PORTDOCS%%share/doc/offlineimap/manual.ps
-%%PORTDOCS%%share/doc/offlineimap/manual.txt
-share/examples/offlineimap/offlineimap.conf
-share/examples/offlineimap/offlineimap.conf.minimal
-@dirrm share/examples/offlineimap
-%%PORTDOCS%%@dirrm share/doc/offlineimap
-@dirrm %%PYTHON_SITELIBDIR%%/offlineimap/ui
-@dirrm %%PYTHON_SITELIBDIR%%/offlineimap/repository
-@dirrm %%PYTHON_SITELIBDIR%%/offlineimap/folder
 @dirrm %%PYTHON_SITELIBDIR%%/offlineimap
+%%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
+@dirrm %%EXAMPLESDIR%%