Update to 1.0.a.2

4 files changed, 61 insertions, 9 deletions

diff --git a/mail/py-spambayes/Makefile b/mail/py-spambayes/Makefile
index 740c2061f9e3..48736eb8fd8d 100644
--- a/mail/py-spambayes/Makefile
+++ b/mail/py-spambayes/Makefile
@@ -6,12 +6,12 @@
 #
 
 PORTNAME=	spambayes
-PORTVERSION=	1.0.a.1
+PORTVERSION=	1.0.a.2
 CATEGORIES=	mail python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-DISTNAME=	${PORTNAME}-1.0a1
+DISTNAME=	${PORTNAME}-${PORTVERSION:C/(.)\.(.)\.(.)$/\1\2\3/}
 
 MAINTAINER=	lioux@FreeBSD.org
 
@@ -19,7 +19,8 @@ USE_PYTHON=		yes
 USE_PYDISTUTILS=	yes
 
 DOC_FILES=	HAMMIE.txt INTEGRATION.txt LICENSE.txt README.txt \
-		TESTING.txt hammie/BULK.txt
+		TESTING.txt contrib/BULK.txt \
+		contrib/muttrc contrib/procmailrc contrib/spambayes.el
 
 post-install:
 .ifndef(PORTDOCS)
diff --git a/mail/py-spambayes/distinfo b/mail/py-spambayes/distinfo
index 4d12421a59d5..41df1ea392fa 100644
--- a/mail/py-spambayes/distinfo
+++ b/mail/py-spambayes/distinfo
@@ -1 +1 @@
-MD5 (spambayes-1.0a1.tar.gz) = cac83c67cd780e57c77cebe184fc8415
+MD5 (spambayes-1.0a2.tar.gz) = bdcb60676b829cab4c18fe5ec6d0f4f0
diff --git a/mail/py-spambayes/files/patch-setup.py b/mail/py-spambayes/files/patch-setup.py
index 5dda74696b8f..05a470128443 100644
--- a/mail/py-spambayes/files/patch-setup.py
+++ b/mail/py-spambayes/files/patch-setup.py
@@ -1,10 +1,11 @@
---- setup.py.orig	Sat Feb  1 15:52:48 2003
-+++ setup.py	Sat Feb  1 15:53:53 2003
-@@ -36,6 +36,7 @@
+--- 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',
-            'proxytrainer.py',
             'proxytee.py',
+            'dbExpImp.py',
diff --git a/mail/py-spambayes/pkg-plist b/mail/py-spambayes/pkg-plist
index 3effbe402aa7..043b12424adc 100644
--- a/mail/py-spambayes/pkg-plist
+++ b/mail/py-spambayes/pkg-plist
@@ -1,11 +1,12 @@
+bin/dbExpImp.py
 bin/hammie.py
 bin/hammiecli.py
 bin/hammiefilter.py
 bin/hammiesrv.py
+bin/mailsort.py
 bin/mboxtrain.py
 bin/pop3proxy.py
 bin/proxytee.py
-bin/proxytrainer.py
 bin/unheader.py
 %%PYTHON_SITELIBDIR%%/spambayes/Corpus.py
 %%PYTHON_SITELIBDIR%%/spambayes/Corpus.pyc
@@ -13,15 +14,24 @@ bin/unheader.py
 %%PYTHON_SITELIBDIR%%/spambayes/CostCounter.py
 %%PYTHON_SITELIBDIR%%/spambayes/CostCounter.pyc
 %%PYTHON_SITELIBDIR%%/spambayes/CostCounter.pyo
+%%PYTHON_SITELIBDIR%%/spambayes/Dibbler.py
+%%PYTHON_SITELIBDIR%%/spambayes/Dibbler.pyc
+%%PYTHON_SITELIBDIR%%/spambayes/Dibbler.pyo
 %%PYTHON_SITELIBDIR%%/spambayes/FileCorpus.py
 %%PYTHON_SITELIBDIR%%/spambayes/FileCorpus.pyc
 %%PYTHON_SITELIBDIR%%/spambayes/FileCorpus.pyo
 %%PYTHON_SITELIBDIR%%/spambayes/Histogram.py
 %%PYTHON_SITELIBDIR%%/spambayes/Histogram.pyc
 %%PYTHON_SITELIBDIR%%/spambayes/Histogram.pyo
+%%PYTHON_SITELIBDIR%%/spambayes/OptionConfig.py
+%%PYTHON_SITELIBDIR%%/spambayes/OptionConfig.pyc
+%%PYTHON_SITELIBDIR%%/spambayes/OptionConfig.pyo
 %%PYTHON_SITELIBDIR%%/spambayes/Options.py
 %%PYTHON_SITELIBDIR%%/spambayes/Options.pyc
 %%PYTHON_SITELIBDIR%%/spambayes/Options.pyo
+%%PYTHON_SITELIBDIR%%/spambayes/PyMeldLite.py
+%%PYTHON_SITELIBDIR%%/spambayes/PyMeldLite.pyc
+%%PYTHON_SITELIBDIR%%/spambayes/PyMeldLite.pyo
 %%PYTHON_SITELIBDIR%%/spambayes/TestDriver.py
 %%PYTHON_SITELIBDIR%%/spambayes/TestDriver.pyc
 %%PYTHON_SITELIBDIR%%/spambayes/TestDriver.pyo
@@ -34,6 +44,9 @@ bin/unheader.py
 %%PYTHON_SITELIBDIR%%/spambayes/cdb.py
 %%PYTHON_SITELIBDIR%%/spambayes/cdb.pyc
 %%PYTHON_SITELIBDIR%%/spambayes/cdb.pyo
+%%PYTHON_SITELIBDIR%%/spambayes/cdb_classifier.py
+%%PYTHON_SITELIBDIR%%/spambayes/cdb_classifier.pyc
+%%PYTHON_SITELIBDIR%%/spambayes/cdb_classifier.pyo
 %%PYTHON_SITELIBDIR%%/spambayes/chi2.py
 %%PYTHON_SITELIBDIR%%/spambayes/chi2.pyc
 %%PYTHON_SITELIBDIR%%/spambayes/chi2.pyo
@@ -64,6 +77,39 @@ bin/unheader.py
 %%PYTHON_SITELIBDIR%%/spambayes/optimize.py
 %%PYTHON_SITELIBDIR%%/spambayes/optimize.pyc
 %%PYTHON_SITELIBDIR%%/spambayes/optimize.pyo
+%%PYTHON_SITELIBDIR%%/spambayes/resources/__init__.py
+%%PYTHON_SITELIBDIR%%/spambayes/resources/__init__.pyc
+%%PYTHON_SITELIBDIR%%/spambayes/resources/__init__.pyo
+%%PYTHON_SITELIBDIR%%/spambayes/resources/classify_gif.py
+%%PYTHON_SITELIBDIR%%/spambayes/resources/classify_gif.pyc
+%%PYTHON_SITELIBDIR%%/spambayes/resources/classify_gif.pyo
+%%PYTHON_SITELIBDIR%%/spambayes/resources/config_gif.py
+%%PYTHON_SITELIBDIR%%/spambayes/resources/config_gif.pyc
+%%PYTHON_SITELIBDIR%%/spambayes/resources/config_gif.pyo
+%%PYTHON_SITELIBDIR%%/spambayes/resources/helmet_gif.py
+%%PYTHON_SITELIBDIR%%/spambayes/resources/helmet_gif.pyc
+%%PYTHON_SITELIBDIR%%/spambayes/resources/helmet_gif.pyo
+%%PYTHON_SITELIBDIR%%/spambayes/resources/message_gif.py
+%%PYTHON_SITELIBDIR%%/spambayes/resources/message_gif.pyc
+%%PYTHON_SITELIBDIR%%/spambayes/resources/message_gif.pyo
+%%PYTHON_SITELIBDIR%%/spambayes/resources/query_gif.py
+%%PYTHON_SITELIBDIR%%/spambayes/resources/query_gif.pyc
+%%PYTHON_SITELIBDIR%%/spambayes/resources/query_gif.pyo
+%%PYTHON_SITELIBDIR%%/spambayes/resources/scanning__init__.py
+%%PYTHON_SITELIBDIR%%/spambayes/resources/scanning__init__.pyc
+%%PYTHON_SITELIBDIR%%/spambayes/resources/scanning__init__.pyo
+%%PYTHON_SITELIBDIR%%/spambayes/resources/status_gif.py
+%%PYTHON_SITELIBDIR%%/spambayes/resources/status_gif.pyc
+%%PYTHON_SITELIBDIR%%/spambayes/resources/status_gif.pyo
+%%PYTHON_SITELIBDIR%%/spambayes/resources/train_gif.py
+%%PYTHON_SITELIBDIR%%/spambayes/resources/train_gif.pyc
+%%PYTHON_SITELIBDIR%%/spambayes/resources/train_gif.pyo
+%%PYTHON_SITELIBDIR%%/spambayes/resources/ui_html.py
+%%PYTHON_SITELIBDIR%%/spambayes/resources/ui_html.pyc
+%%PYTHON_SITELIBDIR%%/spambayes/resources/ui_html.pyo
+%%PYTHON_SITELIBDIR%%/spambayes/resources/ui_psp.py
+%%PYTHON_SITELIBDIR%%/spambayes/resources/ui_psp.pyc
+%%PYTHON_SITELIBDIR%%/spambayes/resources/ui_psp.pyo
 %%PYTHON_SITELIBDIR%%/spambayes/storage.py
 %%PYTHON_SITELIBDIR%%/spambayes/storage.pyc
 %%PYTHON_SITELIBDIR%%/spambayes/storage.pyo
@@ -76,5 +122,9 @@ bin/unheader.py
 %%PORTDOCS%%%%DOCSDIR%%/LICENSE.txt
 %%PORTDOCS%%%%DOCSDIR%%/README.txt
 %%PORTDOCS%%%%DOCSDIR%%/TESTING.txt
+%%PORTDOCS%%%%DOCSDIR%%/muttrc
+%%PORTDOCS%%%%DOCSDIR%%/procmailrc
+%%PORTDOCS%%%%DOCSDIR%%/spambayes.el
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrm %%PYTHON_SITELIBDIR%%/spambayes/resources
 @dirrm %%PYTHON_SITELIBDIR%%/spambayes