Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/mail/offlineimap/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- Makefile	2003/02/21 12:42:19	1.9
+++ Makefile	2003/04/29 10:24:23
@@ -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}
@@ -19,27 +18,21 @@
 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}!' \
+	cd ${WRKSRC} && ${INSTALL_DATA} ${EXAMPLES} ${EXAMPLESDIR}
+	@${SED} -e 's!/usr/local!${PREFIX}!' \
 		${MASTERDIR}/pkg-message > ${PKGMESSAGE}
 	@${CAT} ${PKGMESSAGE}
 
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/mail/offlineimap/distinfo,v
retrieving revision 1.6
diff -u -r1.6 distinfo
--- distinfo	2003/01/09 17:44:05	1.6
+++ distinfo	2003/04/29 10:24:23
@@ -1 +1 @@
-MD5 (offlineimap_3.99.7.tar.gz) = a35b935bd424a8ab500e07c384d8d28c
+MD5 (offlineimap_3.99.15.tar.gz) = 9a1f6ecea92170ae542c04c2a0da9de9
Index: pkg-message
===================================================================
RCS file: /home/ncvs/ports/mail/offlineimap/pkg-message,v
retrieving revision 1.2
diff -u -r1.2 pkg-message
--- pkg-message	2003/01/09 14:21:21	1.2
+++ pkg-message	2003/04/29 10:24:23
@@ -4,8 +4,8 @@
 # /usr/local/share/examples/offlineimap/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.
 #
 ###########################################################################
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/mail/offlineimap/pkg-plist,v
retrieving revision 1.4
diff -u -r1.4 pkg-plist
--- pkg-plist	2003/01/09 14:21:21	1.4
+++ pkg-plist	2003/04/29 10:24:23
@@ -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 @@
 %%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 @@
 %%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 @@
 %%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%%