Update to 1.0a6. See CHANGELOG.txt for extensive list of configuration

changes and bugfixes.  Compiles on both 4.x and 5.x.
PR:		ports/57910
Submitted by:	Marco Molteni <molter@tin.it>
Committed on behalf of lioux@, who is having machine problems.

4 files changed, 24 insertions, 27 deletions

diff --git a/mail/py-spambayes/Makefile b/mail/py-spambayes/Makefile
index ccec8cfcfcf8..f8883a4b15bd 100644
--- a/mail/py-spambayes/Makefile
+++ b/mail/py-spambayes/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	spambayes
-PORTVERSION=	1.0.a.4
+PORTVERSION=	1.0.a.6
 CATEGORIES=	mail python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -20,7 +20,7 @@ USE_PYTHON=		yes
 USE_PYDISTUTILS=	yes
 
 DOC_FILES=	HAMMIE.txt INTEGRATION.txt LICENSE.txt README.txt \
-		TESTING.txt contrib/BULK.txt \
+		TESTING.txt WHAT_IS_NEW.txt contrib/BULK.txt \
 		contrib/muttrc contrib/procmailrc contrib/spambayes.el
 
 post-install:
diff --git a/mail/py-spambayes/distinfo b/mail/py-spambayes/distinfo
index 9bb236c1a3ba..202a086945ca 100644
--- a/mail/py-spambayes/distinfo
+++ b/mail/py-spambayes/distinfo
@@ -1 +1 @@
-MD5 (spambayes-1.0a4.tar.gz) = 3dc9582aae341e23b8a527d9fad4cfb3
+MD5 (spambayes-1.0a6.tar.gz) = f8b84ef6b582334794eaf97718b5ad9f
diff --git a/mail/py-spambayes/files/patch-setup.py b/mail/py-spambayes/files/patch-setup.py
deleted file mode 100644
index 05a470128443..000000000000
--- a/mail/py-spambayes/files/patch-setup.py
+++ /dev/null
@@ -1,11 +0,0 @@
---- setup.py.orig	Mon Feb  3 05:53:52 2003
-+++ setup.py	Mon Feb 17 02:25:52 2003
-@@ -36,6 +36,8 @@
-            'hammiecli.py',
-            'hammiesrv.py',
-            'hammiefilter.py',
-+           'mailsort.py',
-+           'mboxtrain.py',
-            'pop3proxy.py',
-            'proxytee.py',
-            'dbExpImp.py',
diff --git a/mail/py-spambayes/pkg-plist b/mail/py-spambayes/pkg-plist
index 256f8439401e..f5c57b67e45e 100644
--- a/mail/py-spambayes/pkg-plist
+++ b/mail/py-spambayes/pkg-plist
@@ -1,16 +1,17 @@
-bin/dbExpImp.py
-bin/hammie.py
-bin/hammiecli.py
-bin/hammiefilter.py
-bin/hammiesrv.py
-bin/imapfilter.py
-bin/mailsort.py
-bin/mboxtrain.py
-bin/notesfilter.py
-bin/pop3proxy.py
-bin/proxytee.py
-bin/smtpproxy.py
-bin/unheader.py
+bin/sb_pop3dnd.py
+bin/sb_dbexpimp.py
+bin/sb_chkopts.py
+bin/sb_xmlrpcserver.py
+bin/sb_upload.py
+bin/sb_unheader.py
+bin/sb_smtpproxy.py
+bin/sb_filter.py
+bin/sb_imapfilter.py
+bin/sb_mailsort.py
+bin/sb_mboxtrain.py
+bin/sb_notesfilter.py
+bin/sb_server.py
+bin/sb_client.py
 %%PYTHON_SITELIBDIR%%/spambayes/Corpus.py
 %%PYTHON_SITELIBDIR%%/spambayes/Corpus.pyc
 %%PYTHON_SITELIBDIR%%/spambayes/Corpus.pyo
@@ -41,6 +42,9 @@ bin/unheader.py
 %%PYTHON_SITELIBDIR%%/spambayes/PyMeldLite.py
 %%PYTHON_SITELIBDIR%%/spambayes/PyMeldLite.pyc
 %%PYTHON_SITELIBDIR%%/spambayes/PyMeldLite.pyo
+%%PYTHON_SITELIBDIR%%/spambayes/ServerUI.py
+%%PYTHON_SITELIBDIR%%/spambayes/ServerUI.pyc
+%%PYTHON_SITELIBDIR%%/spambayes/ServerUI.pyo
 %%PYTHON_SITELIBDIR%%/spambayes/TestDriver.py
 %%PYTHON_SITELIBDIR%%/spambayes/TestDriver.pyc
 %%PYTHON_SITELIBDIR%%/spambayes/TestDriver.pyo
@@ -92,6 +96,9 @@ bin/unheader.py
 %%PYTHON_SITELIBDIR%%/spambayes/msgs.py
 %%PYTHON_SITELIBDIR%%/spambayes/msgs.pyc
 %%PYTHON_SITELIBDIR%%/spambayes/msgs.pyo
+%%PYTHON_SITELIBDIR%%/spambayes/oe_mailbox.py
+%%PYTHON_SITELIBDIR%%/spambayes/oe_mailbox.pyc
+%%PYTHON_SITELIBDIR%%/spambayes/oe_mailbox.pyo
 %%PYTHON_SITELIBDIR%%/spambayes/optimize.py
 %%PYTHON_SITELIBDIR%%/spambayes/optimize.pyc
 %%PYTHON_SITELIBDIR%%/spambayes/optimize.pyo
@@ -140,6 +147,7 @@ bin/unheader.py
 %%PORTDOCS%%%%DOCSDIR%%/LICENSE.txt
 %%PORTDOCS%%%%DOCSDIR%%/README.txt
 %%PORTDOCS%%%%DOCSDIR%%/TESTING.txt
+%%PORTDOCS%%%%DOCSDIR%%/WHAT_IS_NEW.txt
 %%PORTDOCS%%%%DOCSDIR%%/muttrc
 %%PORTDOCS%%%%DOCSDIR%%/procmailrc
 %%PORTDOCS%%%%DOCSDIR%%/spambayes.el