diff -ruN offlineimap.orig/Makefile offlineimap/Makefile
--- offlineimap.orig/Makefile	Wed Aug 21 17:00:44 2002
+++ offlineimap/Makefile	Wed Aug 21 17:16:17 2002
@@ -6,14 +6,14 @@
 #
 
 PORTNAME=	offlineimap
-PORTVERSION=	3.2.2
+PORTVERSION=	3.2.6
 CATEGORIES=	mail
 MASTER_SITES=	http://gopher.quux.org:70/devel/offlineimap/
-DISTNAME=	offlineimap_3.2.2
+DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	nbm@FreeBSD.org
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
+WRKSRC=		${WRKDIR}/${PORTNAME}
 
 USE_PYTHON=	yes
 USE_PYDISTUTILS=yes
@@ -23,7 +23,7 @@
 post-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/offlineimap.py ${PREFIX}/bin/offlineimap
 	${INSTALL_MAN} ${WRKSRC}/offlineimap.1 ${MANPREFIX}/man/man1/
-	${MKDIR} ${PREFIX}/share/examples/offlineimap
-	${INSTALL_DATA} ${WRKSRC}/offlineimap.conf ${PREFIX}/share/examples/offlineimap
+	${MKDIR} ${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/offlineimap.conf ${EXAMPLESDIR}
 
 .include <bsd.port.mk>
diff -ruN offlineimap.orig/distinfo offlineimap/distinfo
--- offlineimap.orig/distinfo	Wed Aug 21 17:00:44 2002
+++ offlineimap/distinfo	Wed Aug 21 17:02:45 2002
@@ -1 +1 @@
-MD5 (offlineimap_3.2.2.tar.gz) = 5a05d1ff200fc60686508096b2b32631
+MD5 (offlineimap_3.2.6.tar.gz) = bf62e533c4b4f9ced8948eabbc1a413c
diff -ruN offlineimap.orig/pkg-plist offlineimap/pkg-plist
--- offlineimap.orig/pkg-plist	Wed Aug 21 17:00:44 2002
+++ offlineimap/pkg-plist	Wed Aug 21 17:09:22 2002
@@ -1,76 +1,79 @@
 bin/offlineimap
-lib/%%PYTHON_VERSION%%/site-packages/offlineimap/__init__.py
-lib/%%PYTHON_VERSION%%/site-packages/offlineimap/__init__.pyc
-lib/%%PYTHON_VERSION%%/site-packages/offlineimap/__init__.pyo
-lib/%%PYTHON_VERSION%%/site-packages/offlineimap/folder/Base.py
-lib/%%PYTHON_VERSION%%/site-packages/offlineimap/folder/Base.pyc
-lib/%%PYTHON_VERSION%%/site-packages/offlineimap/folder/Base.pyo
-lib/%%PYTHON_VERSION%%/site-packages/offlineimap/folder/IMAP.py
-lib/%%PYTHON_VERSION%%/site-packages/offlineimap/folder/IMAP.pyc
-lib/%%PYTHON_VERSION%%/site-packages/offlineimap/folder/IMAP.pyo
-lib/%%PYTHON_VERSION%%/site-packages/offlineimap/folder/LocalStatus.py
-lib/%%PYTHON_VERSION%%/site-packages/offlineimap/folder/LocalStatus.pyc
-lib/%%PYTHON_VERSION%%/site-packages/offlineimap/folder/LocalStatus.pyo
-lib/%%PYTHON_VERSION%%/site-packages/offlineimap/folder/Maildir.py
-lib/%%PYTHON_VERSION%%/site-packages/offlineimap/folder/Maildir.pyc
-lib/%%PYTHON_VERSION%%/site-packages/offlineimap/folder/Maildir.pyo
-lib/%%PYTHON_VERSION%%/site-packages/offlineimap/folder/__init__.py
-lib/%%PYTHON_VERSION%%/site-packages/offlineimap/folder/__init__.pyc
-lib/%%PYTHON_VERSION%%/site-packages/offlineimap/folder/__init__.pyo
-lib/%%PYTHON_VERSION%%/site-packages/offlineimap/imaplib.py
-lib/%%PYTHON_VERSION%%/site-packages/offlineimap/imaplib.pyc
-lib/%%PYTHON_VERSION%%/site-packages/offlineimap/imaplib.pyo
-lib/%%PYTHON_VERSION%%/site-packages/offlineimap/imapserver.py
-lib/%%PYTHON_VERSION%%/site-packages/offlineimap/imapserver.pyc
-lib/%%PYTHON_VERSION%%/site-packages/offlineimap/imapserver.pyo
-lib/%%PYTHON_VERSION%%/site-packages/offlineimap/imaputil.py
-lib/%%PYTHON_VERSION%%/site-packages/offlineimap/imaputil.pyc
-lib/%%PYTHON_VERSION%%/site-packages/offlineimap/imaputil.pyo
-lib/%%PYTHON_VERSION%%/site-packages/offlineimap/mbnames.py
-lib/%%PYTHON_VERSION%%/site-packages/offlineimap/mbnames.pyc
-lib/%%PYTHON_VERSION%%/site-packages/offlineimap/mbnames.pyo
-lib/%%PYTHON_VERSION%%/site-packages/offlineimap/repository/Base.py
-lib/%%PYTHON_VERSION%%/site-packages/offlineimap/repository/Base.pyc
-lib/%%PYTHON_VERSION%%/site-packages/offlineimap/repository/Base.pyo
-lib/%%PYTHON_VERSION%%/site-packages/offlineimap/repository/IMAP.py
-lib/%%PYTHON_VERSION%%/site-packages/offlineimap/repository/IMAP.pyc
-lib/%%PYTHON_VERSION%%/site-packages/offlineimap/repository/IMAP.pyo
-lib/%%PYTHON_VERSION%%/site-packages/offlineimap/repository/LocalStatus.py
-lib/%%PYTHON_VERSION%%/site-packages/offlineimap/repository/LocalStatus.pyc
-lib/%%PYTHON_VERSION%%/site-packages/offlineimap/repository/LocalStatus.pyo
-lib/%%PYTHON_VERSION%%/site-packages/offlineimap/repository/Maildir.py
-lib/%%PYTHON_VERSION%%/site-packages/offlineimap/repository/Maildir.pyc
-lib/%%PYTHON_VERSION%%/site-packages/offlineimap/repository/Maildir.pyo
-lib/%%PYTHON_VERSION%%/site-packages/offlineimap/repository/__init__.py
-lib/%%PYTHON_VERSION%%/site-packages/offlineimap/repository/__init__.pyc
-lib/%%PYTHON_VERSION%%/site-packages/offlineimap/repository/__init__.pyo
-lib/%%PYTHON_VERSION%%/site-packages/offlineimap/threadutil.py
-lib/%%PYTHON_VERSION%%/site-packages/offlineimap/threadutil.pyc
-lib/%%PYTHON_VERSION%%/site-packages/offlineimap/threadutil.pyo
-lib/%%PYTHON_VERSION%%/site-packages/offlineimap/ui/Noninteractive.py
-lib/%%PYTHON_VERSION%%/site-packages/offlineimap/ui/Noninteractive.pyc
-lib/%%PYTHON_VERSION%%/site-packages/offlineimap/ui/Noninteractive.pyo
-lib/%%PYTHON_VERSION%%/site-packages/offlineimap/ui/TTY.py
-lib/%%PYTHON_VERSION%%/site-packages/offlineimap/ui/TTY.pyc
-lib/%%PYTHON_VERSION%%/site-packages/offlineimap/ui/TTY.pyo
-lib/%%PYTHON_VERSION%%/site-packages/offlineimap/ui/Tk.py
-lib/%%PYTHON_VERSION%%/site-packages/offlineimap/ui/Tk.pyc
-lib/%%PYTHON_VERSION%%/site-packages/offlineimap/ui/Tk.pyo
-lib/%%PYTHON_VERSION%%/site-packages/offlineimap/ui/UIBase.py
-lib/%%PYTHON_VERSION%%/site-packages/offlineimap/ui/UIBase.pyc
-lib/%%PYTHON_VERSION%%/site-packages/offlineimap/ui/UIBase.pyo
-lib/%%PYTHON_VERSION%%/site-packages/offlineimap/ui/__init__.py
-lib/%%PYTHON_VERSION%%/site-packages/offlineimap/ui/__init__.pyc
-lib/%%PYTHON_VERSION%%/site-packages/offlineimap/ui/__init__.pyo
-lib/%%PYTHON_VERSION%%/site-packages/offlineimap/ui/detector.py
-lib/%%PYTHON_VERSION%%/site-packages/offlineimap/ui/detector.pyc
-lib/%%PYTHON_VERSION%%/site-packages/offlineimap/ui/detector.pyo
-lib/%%PYTHON_VERSION%%/site-packages/offlineimap/version.py
-lib/%%PYTHON_VERSION%%/site-packages/offlineimap/version.pyc
-lib/%%PYTHON_VERSION%%/site-packages/offlineimap/version.pyo
+%%PYTHON_SITELIBDIR%%/offlineimap/__init__.py
+%%PYTHON_SITELIBDIR%%/offlineimap/__init__.pyc
+%%PYTHON_SITELIBDIR%%/offlineimap/__init__.pyo
+%%PYTHON_SITELIBDIR%%/offlineimap/folder/Base.py
+%%PYTHON_SITELIBDIR%%/offlineimap/folder/Base.pyc
+%%PYTHON_SITELIBDIR%%/offlineimap/folder/Base.pyo
+%%PYTHON_SITELIBDIR%%/offlineimap/folder/IMAP.py
+%%PYTHON_SITELIBDIR%%/offlineimap/folder/IMAP.pyc
+%%PYTHON_SITELIBDIR%%/offlineimap/folder/IMAP.pyo
+%%PYTHON_SITELIBDIR%%/offlineimap/folder/LocalStatus.py
+%%PYTHON_SITELIBDIR%%/offlineimap/folder/LocalStatus.pyc
+%%PYTHON_SITELIBDIR%%/offlineimap/folder/LocalStatus.pyo
+%%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/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/repository/Base.py
+%%PYTHON_SITELIBDIR%%/offlineimap/repository/Base.pyc
+%%PYTHON_SITELIBDIR%%/offlineimap/repository/Base.pyo
+%%PYTHON_SITELIBDIR%%/offlineimap/repository/IMAP.py
+%%PYTHON_SITELIBDIR%%/offlineimap/repository/IMAP.pyc
+%%PYTHON_SITELIBDIR%%/offlineimap/repository/IMAP.pyo
+%%PYTHON_SITELIBDIR%%/offlineimap/repository/LocalStatus.py
+%%PYTHON_SITELIBDIR%%/offlineimap/repository/LocalStatus.pyc
+%%PYTHON_SITELIBDIR%%/offlineimap/repository/LocalStatus.pyo
+%%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/threadutil.py
+%%PYTHON_SITELIBDIR%%/offlineimap/threadutil.pyc
+%%PYTHON_SITELIBDIR%%/offlineimap/threadutil.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
+%%PYTHON_SITELIBDIR%%/offlineimap/ui/__init__.py
+%%PYTHON_SITELIBDIR%%/offlineimap/ui/__init__.pyc
+%%PYTHON_SITELIBDIR%%/offlineimap/ui/__init__.pyo
+%%PYTHON_SITELIBDIR%%/offlineimap/ui/detector.py
+%%PYTHON_SITELIBDIR%%/offlineimap/ui/detector.pyc
+%%PYTHON_SITELIBDIR%%/offlineimap/ui/detector.pyo
+%%PYTHON_SITELIBDIR%%/offlineimap/version.py
+%%PYTHON_SITELIBDIR%%/offlineimap/version.pyc
+%%PYTHON_SITELIBDIR%%/offlineimap/version.pyo
 share/examples/offlineimap/offlineimap.conf
 @dirrm share/examples/offlineimap
-@dirrm lib/%%PYTHON_VERSION%%/site-packages/offlineimap/ui
-@dirrm lib/%%PYTHON_VERSION%%/site-packages/offlineimap/repository
-@dirrm lib/%%PYTHON_VERSION%%/site-packages/offlineimap/folder
-@dirrm lib/%%PYTHON_VERSION%%/site-packages/offlineimap
+@dirrm %%PYTHON_SITELIBDIR%%/offlineimap/ui
+@dirrm %%PYTHON_SITELIBDIR%%/offlineimap/repository
+@dirrm %%PYTHON_SITELIBDIR%%/offlineimap/folder
+@dirrm %%PYTHON_SITELIBDIR%%/offlineimap