2 files changed, 27 insertions, 292 deletions

diff --git a/mail/py-spambayes/Makefile b/mail/py-spambayes/Makefile
index defb6315f383..f3e19ca2fe3a 100644
--- a/mail/py-spambayes/Makefile
+++ b/mail/py-spambayes/Makefile
@@ -3,12 +3,13 @@
 
 PORTNAME=	spambayes
 PORTVERSION=	1.1b1
+PORTREVISION=	1
 CATEGORIES=	mail python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	koobs@FreeBSD.org
-COMMENT=	A Bayesian anti-spam filter written in Python
+COMMENT=	Bayesian anti-spam filter written in Python
 
 LICENSE=	PSFL
 
@@ -16,8 +17,10 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}bsddb>0:${PORTSDIR}/databases/py-bsddb \
 		${PYTHON_PKGNAMEPREFIX}dns>=2.0:${PORTSDIR}/dns/py-dns \
 		${PYTHON_PKGNAMEPREFIX}lockfile>=0.2:${PORTSDIR}/devel/py-lockfile
 
-USE_PYTHON=	2
-USE_PYDISTUTILS=easy_install
+USE_PYTHON=		2
+USE_PYDISTUTILS=	yes
+PYDISTUTILS_AUTOPLIST=	yes
+
 USE_RC_SUBR=	pyspamd
 
 LOCALSTATDIR?=	/var/db/spambayes
@@ -26,7 +29,9 @@ CACHEDIR?=	${LOCALSTATDIR}/cache
 
 PLIST_SUB+=	LOCALSTATDIR=${LOCALSTATDIR} \
 		DBDIR=${DBDIR} \
-		CACHEDIR=${CACHEDIR}
+		CACHEDIR=${CACHEDIR} \
+		RESETPREFIX=${PREFIX}
+
 SUB_LIST+=	PYTHON_CMD=${PYTHON_CMD}
 
 PORTDOCS=	CHANGELOG.txt \
@@ -40,7 +45,6 @@ PORTDOCS=	CHANGELOG.txt \
 		utilities/ \
 		contrib/
 
-NO_STAGE=	yes
 post-extract:
 	@${CHMOD} -Rf u+w ${WRKSRC}
 
@@ -63,20 +67,24 @@ post-patch:
 		'/unknown_cache/s|pop3proxy-unknown-cache|${CACHEDIR}/pop3proxy-unknown-cache|' \
 		${WRKSRC}/spambayes/Options.py
 
+.include <bsd.port.options.mk>
+
 post-install:
-.ifndef(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
+.if ${PORT_OPTIONS:MDOCS}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for file in ${PORTDOCS}
 	@if [ -f ${WRKSRC}/${file} ]; then \
-		${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR} ; \
+		${INSTALL_DATA} ${WRKSRC}/${file} ${STAGEDIR}${DOCSDIR} ; \
 	fi
 .endfor
-	@${MKDIR} ${DOCSDIR}/contrib
-	@${INSTALL_DATA} ${WRKSRC}/contrib/* ${DOCSDIR}/contrib
-	@${MKDIR} ${DOCSDIR}/utilities
-	@${INSTALL_DATA} ${WRKSRC}/utilities/* ${DOCSDIR}/utilities
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}/contrib
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}/utilities
+	@${INSTALL_DATA} ${WRKSRC}/contrib/* ${STAGEDIR}${DOCSDIR}/contrib
+	@${INSTALL_DATA} ${WRKSRC}/utilities/* ${STAGEDIR}${DOCSDIR}/utilities
 .endif
-	@${MKDIR} ${CACHEDIR}
-	@${MKDIR} ${DBDIR}
+	@${MKDIR} ${STAGEDIR}${CACHEDIR}/pop3proxy-spam-cache
+	@${MKDIR} ${STAGEDIR}${CACHEDIR}/pop3proxy-ham-cache
+	@${MKDIR} ${STAGEDIR}${CACHEDIR}/pop3proxy-unknown-cache
+	@${MKDIR} ${STAGEDIR}${DBDIR}
 
 .include <bsd.port.mk>
diff --git a/mail/py-spambayes/pkg-plist b/mail/py-spambayes/pkg-plist
index 631686fc4829..5b08b73b7e5b 100644
--- a/mail/py-spambayes/pkg-plist
+++ b/mail/py-spambayes/pkg-plist
@@ -1,285 +1,12 @@
-bin/core_server.py
-bin/sb_bnfilter.py
-bin/sb_bnserver.py
-bin/sb_chkopts.py
-bin/sb_client.py
-bin/sb_dbexpimp.py
-bin/sb_evoscore.py
-bin/sb_filter.py
-bin/sb_imapfilter.py
-bin/sb_mailsort.py
-bin/sb_mboxtrain.py
-bin/sb_notesfilter.py
-bin/sb_pop3dnd.py
-bin/sb_server.py
-bin/sb_unheader.py
-bin/sb_upload.py
-bin/sb_xmlrpcserver.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/CorePlugin.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/CorePlugin.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/CorePlugin.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/CoreUI.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/CoreUI.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/CoreUI.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/Corpus.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/Corpus.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/Corpus.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/CostCounter.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/CostCounter.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/CostCounter.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/Dibbler.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/Dibbler.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/Dibbler.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/FileCorpus.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/FileCorpus.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/FileCorpus.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/Histogram.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/Histogram.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/Histogram.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/ImageStripper.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/ImageStripper.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/ImageStripper.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/ImapUI.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/ImapUI.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/ImapUI.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/MoinSecurityPolicy.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/MoinSecurityPolicy.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/MoinSecurityPolicy.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/Options.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/Options.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/Options.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/OptionsClass.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/OptionsClass.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/OptionsClass.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/ProxyUI.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/ProxyUI.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/ProxyUI.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/PyMeldLite.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/PyMeldLite.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/PyMeldLite.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/ServerUI.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/ServerUI.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/ServerUI.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/Stats.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/Stats.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/Stats.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/TestDriver.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/TestDriver.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/TestDriver.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/TestToolsUI.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/TestToolsUI.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/TestToolsUI.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/Tester.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/Tester.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/Tester.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/UserInterface.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/UserInterface.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/UserInterface.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/Version.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/Version.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/Version.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/XMLRPCPlugin.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/XMLRPCPlugin.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/XMLRPCPlugin.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/asynchat.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/asynchat.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/asynchat.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/asyncore.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/asyncore.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/asyncore.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/cdb.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/cdb.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/cdb.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/cdb_classifier.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/cdb_classifier.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/cdb_classifier.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/chi2.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/chi2.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/chi2.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/classifier.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/classifier.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/classifier.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/compatcsv.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/compatcsv.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/compatcsv.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/compatheapq.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/compatheapq.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/compatheapq.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/compatsets.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/compatsets.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/compatsets.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/core_resources/README_txt.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/core_resources/README_txt.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/core_resources/README_txt.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/core_resources/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/core_resources/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/core_resources/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/core_resources/classify_gif.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/core_resources/classify_gif.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/core_resources/classify_gif.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/core_resources/config_gif.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/core_resources/config_gif.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/core_resources/config_gif.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/core_resources/helmet_gif.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/core_resources/helmet_gif.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/core_resources/helmet_gif.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/core_resources/help_gif.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/core_resources/help_gif.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/core_resources/help_gif.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/core_resources/message_gif.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/core_resources/message_gif.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/core_resources/message_gif.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/core_resources/query_gif.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/core_resources/query_gif.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/core_resources/query_gif.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/core_resources/scanning__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/core_resources/scanning__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/core_resources/scanning__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/core_resources/status_gif.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/core_resources/status_gif.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/core_resources/status_gif.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/core_resources/train_gif.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/core_resources/train_gif.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/core_resources/train_gif.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/core_resources/ui_html.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/core_resources/ui_html.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/core_resources/ui_html.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/core_resources/ui_psp.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/core_resources/ui_psp.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/core_resources/ui_psp.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/dbmstorage.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/dbmstorage.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/dbmstorage.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/dnscache.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/dnscache.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/dnscache.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/hammie.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/hammie.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/hammie.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/hammiebulk.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/hammiebulk.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/hammiebulk.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/i18n.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/i18n.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/i18n.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/mboxutils.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/mboxutils.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/mboxutils.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/message.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/message.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/message.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/msgs.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/msgs.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/msgs.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/oe_mailbox.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/oe_mailbox.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/oe_mailbox.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/optimize.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/optimize.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/optimize.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/port.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/port.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/port.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/postfixproxy.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/postfixproxy.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/postfixproxy.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/resources/README_txt.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/resources/README_txt.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/resources/README_txt.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/resources/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/resources/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/resources/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/resources/_cvsignore.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/resources/_cvsignore.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/resources/_cvsignore.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/resources/classify_gif.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/resources/classify_gif.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/resources/classify_gif.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/resources/config_gif.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/resources/config_gif.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/resources/config_gif.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/resources/helmet_gif.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/resources/helmet_gif.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/resources/helmet_gif.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/resources/help_gif.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/resources/help_gif.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/resources/help_gif.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/resources/junk.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/resources/junk.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/resources/junk.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/resources/message_gif.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/resources/message_gif.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/resources/message_gif.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/resources/query_gif.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/resources/query_gif.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/resources/query_gif.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/resources/scanning__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/resources/scanning__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/resources/scanning__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/resources/status_gif.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/resources/status_gif.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/resources/status_gif.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/resources/train_gif.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/resources/train_gif.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/resources/train_gif.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/resources/ui_html.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/resources/ui_html.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/resources/ui_html.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/resources/ui_psp.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/resources/ui_psp.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/resources/ui_psp.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/safepickle.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/safepickle.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/safepickle.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/smtpproxy.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/smtpproxy.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/smtpproxy.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/storage.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/storage.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/storage.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/tokenizer.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/tokenizer.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/tokenizer.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/PKG-INFO
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/SOURCES.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/dependency_links.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/not-zip-safe
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/requires.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/scripts/core_server.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/scripts/sb_bnfilter.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/scripts/sb_bnserver.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/scripts/sb_chkopts.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/scripts/sb_client.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/scripts/sb_dbexpimp.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/scripts/sb_evoscore.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/scripts/sb_filter.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/scripts/sb_imapfilter.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/scripts/sb_mailsort.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/scripts/sb_mboxtrain.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/scripts/sb_notesfilter.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/scripts/sb_pop3dnd.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/scripts/sb_server.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/scripts/sb_unheader.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/scripts/sb_upload.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/scripts/sb_xmlrpcserver.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/top_level.txt
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/core_resources
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes/resources
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/spambayes
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/scripts
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
 @cwd /
-@exec echo mkdir -p %%CACHEDIR%%
-@exec echo mkdir -p %%DBDIR%%
+@exec mkdir -p %%CACHEDIR%%/pop3proxy-spam-cache
+@exec mkdir -p %%CACHEDIR%%/pop3proxy-ham-cache
+@exec mkdir -p %%CACHEDIR%%/pop3proxy-unknown-cache
+@exec mkdir -p %%DBDIR%%
 @dirrmtry %%CACHEDIR%%/pop3proxy-spam-cache
 @dirrmtry %%CACHEDIR%%/pop3proxy-ham-cache
 @dirrmtry %%CACHEDIR%%/pop3proxy-unknown-cache
 @dirrmtry %%CACHEDIR%%
 @dirrmtry %%DBDIR%%
 @dirrmtry %%LOCALSTATDIR%%
-@cwd %%PREFIX%%
-@dirrmtry %%PYTHON_SITELIBDIR%%
+@cwd %%RESETPREFIX%%