3 files changed, 66 insertions, 2 deletions

diff --git a/mail/py-spambayes/Makefile b/mail/py-spambayes/Makefile
index 35691c4c430a..5830dc2423d8 100644
--- a/mail/py-spambayes/Makefile
+++ b/mail/py-spambayes/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	spambayes
 PORTVERSION=	1.0.4
+PORTREVISION=	1
 CATEGORIES=	mail python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -20,6 +21,13 @@ RUN_DEPENDS=	${PYTHON_SITELIBDIR}/_bsddb.so:${PORTSDIR}/databases/py-bsddb
 
 USE_PYTHON=		yes
 USE_PYDISTUTILS=	yes
+USE_RC_SUBR=	pyspamd
+LOCALSTATDIR?=	/var/db/spambayes
+DBDIR?=		${LOCALSTATDIR}/dbs
+CACHEDIR?=	${LOCALSTATDIR}/cache
+PLIST_SUB+=	LOCALSTATDIR=${LOCALSTATDIR} \
+		DBDIR=${DBDIR} \
+		CACHEDIR=${CACHEDIR}
 
 PORTDOCS=	CHANGELOG.txt \
 		LICENSE.txt \
@@ -40,8 +48,19 @@ post-patch:
 		${XARGS} -n 10 -x \
 		${REINPLACE_CMD} -E \
 		-e 's|/usr/bin/env python|${PYTHONBASE}/bin/${PYTHON_VERSION}|'
-	@${FIND} ${WRKSRC}/utilities ${WRKSRC}/contrib \
+	@${FIND} ${WRKSRC}/utilities ${WRKSRC}/contrib ${WRKSRC}/spambayes\
 		-type f -name *.bak | ${XARGS} ${RM}
+	@${REINPLACE_CMD} -e \
+		'/persistent_storage_file/s|hammie.db|${DBDIR}/hammie.db|' \
+		-e \
+		'/messageinfo_storage_file/s|spambayes.messageinfo.db|${DBDIR}/spambayes.messageinfo.db|' \
+		-e \
+		'/spam_cache/s|pop3proxy-spam-cache|${CACHEDIR}/pop3proxy-spam-cache|' \
+		-e \
+		'/ham_cache/s|pop3proxy-ham-cache|${CACHEDIR}/pop3proxy-ham-cache|' \
+		-e \
+		'/unknown_cache/s|pop3proxy-unknown-cache|${CACHEDIR}/pop3proxy-unknown-cache|' \
+		${WRKSRC}/spambayes/Options.py
 
 post-install:
 .ifndef(NOPORTDOCS)
@@ -56,5 +75,7 @@ post-install:
 	@${MKDIR} ${DOCSDIR}/utilities
 	@${INSTALL_DATA} ${WRKSRC}/utilities/* ${DOCSDIR}/utilities
 .endif
+	@${MKDIR} ${CACHEDIR}
+	@${MKDIR} ${DBDIR}
 
 .include <bsd.port.mk>
diff --git a/mail/py-spambayes/files/pyspamd.in b/mail/py-spambayes/files/pyspamd.in
new file mode 100644
index 000000000000..79c9370a496c
--- /dev/null
+++ b/mail/py-spambayes/files/pyspamd.in
@@ -0,0 +1,33 @@
+#!/bin/sh
+
+# Start or stop pyspamd
+# $FreeBSD$
+
+# PROVIDE: pyspamd
+# REQUIRE: DAEMON
+# KEYWORD: shutdown
+#
+prefix=/usr/local
+
+# Define these pyspamd_* variables in one of these files:
+#       /etc/rc.conf
+#       /etc/rc.conf.local
+#
+# DO NOT CHANGE THESE DEFAULT VALUES HERE
+#
+
+. /etc/rc.subr
+
+name="pyspamd"
+rcvar=`set_rcvar`
+
+load_rc_config $name
+
+: ${pyspamd_enable="NO"}
+
+command="/usr/sbin/daemon"
+command_args=" -p /var/run/pyspamd.pid /usr/local/bin/python -OO /usr/local/bin/sb_server.py 2>&1 >/dev/null"
+pidfile="/var/run/pyspamd.pid"
+procname="/usr/local/bin/python"
+
+run_rc_command "$1"
diff --git a/mail/py-spambayes/pkg-plist b/mail/py-spambayes/pkg-plist
index c79ecb1b87b6..ccf316211033 100644
--- a/mail/py-spambayes/pkg-plist
+++ b/mail/py-spambayes/pkg-plist
@@ -160,4 +160,14 @@ bin/sb_xmlrpcserver.py
 %%PYTHON_SITELIBDIR%%/spambayes/tokenizer.pyo
 @dirrm %%PYTHON_SITELIBDIR%%/spambayes/resources
 @dirrm %%PYTHON_SITELIBDIR%%/spambayes
-@unexec rmdir %%PYTHON_SITELIBDIR%% 2>/dev/null || true
+@cwd /
+@exec echo mkdir -p %%CACHEDIR%%
+@exec echo 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%%