- Update to 1.0.4

- OPTIONS was added.
- Since "japanese/ruby-chasen" had BROKEN, it deleted from KNOB.
- The sample file was added.
- pkg-descr was updated according to official site.

PR:		ports/70664
Submitted by:	maintainer

5 files changed, 42 insertions, 18 deletions

diff --git a/mail/bsfilter/Makefile b/mail/bsfilter/Makefile
index 028ad5797aa6..c6030b67a34b 100644
--- a/mail/bsfilter/Makefile
+++ b/mail/bsfilter/Makefile
@@ -6,29 +6,33 @@
 #
 
 PORTNAME=	bsfilter
-PORTVERSION=	1.0.3
+PORTVERSION=	1.0.4
 CATEGORIES=	mail ruby
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_JP}
-MASTER_SITE_SUBDIR=	bsfilter/9787
+MASTER_SITE_SUBDIR=	bsfilter/10876
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	info@otsune.com
 COMMENT=	A bayesian spam filter written in Ruby
 
 RUN_DEPENDS=	${RUBY_ARCHLIBDIR}/gdbm.so:${PORTSDIR}/databases/ruby-gdbm
+
+NO_BUILD=	yes
+USE_RUBY=	yes
+
+OPTIONS=	MECAB "Use japanese/mecab" off \
+		CHASEN "Use japanese/chasen" off \
+		KAKASI "Use japanese/kakasi" off
+
+.include <bsd.port.pre.mk>
+
 .if defined(WITH_MECAB)
 RUN_DEPENDS+=	${RUBY_SITEARCHLIBDIR}/MeCab.so:${PORTSDIR}/japanese/ruby-mecab
 .endif
-.if defined(WITH_CHASEN)
-RUN_DEPENDS+=	${RUBY_SITEARCHLIBDIR}/chasen.so:${PORTSDIR}/japanese/ruby-chasen
-.endif
 .if defined(WITH_KAKASI)
 RUN_DEPENDS+=	${RUBY_SITEARCHLIBDIR}/kakasi.so:${PORTSDIR}/japanese/ruby-kakasi
 .endif
 
-NO_BUILD=	yes
-USE_RUBY=	yes
-
 pre-build:
 	@${ECHO_MSG} "specify algorithm of a tokenizer for Japanese language"
 	@${ECHO_MSG} "WITH_CHASEN=yes (japanese/chasen)"
@@ -42,6 +46,9 @@ do-install:
 .for FILE in bsfilter.conf.sample dot-qmail.sample
 	@${INSTALL_DATA} ${FILESDIR}/${FILE} ${EXAMPLESDIR}
 .endfor
+.for DIR in mda mua
+	@${CP} -r ${WRKSRC}/${DIR} ${EXAMPLESDIR}/${DIR}
+.endfor
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/mail/bsfilter/distinfo b/mail/bsfilter/distinfo
index 0bf6195c6c2c..1d261dc4e166 100644
--- a/mail/bsfilter/distinfo
+++ b/mail/bsfilter/distinfo
@@ -1,2 +1,2 @@
-MD5 (bsfilter-1.0.3.tgz) = e7603e270015752d2141e12969a678c7
-SIZE (bsfilter-1.0.3.tgz) = 855878
+MD5 (bsfilter-1.0.4.tgz) = 6fb0bb985bd6c4cbac1d5589de03d985
+SIZE (bsfilter-1.0.4.tgz) = 862941
diff --git a/mail/bsfilter/files/bsfilter.conf.sample b/mail/bsfilter/files/bsfilter.conf.sample
index c4be8a2133de..ff739e3a666f 100644
--- a/mail/bsfilter/files/bsfilter.conf.sample
+++ b/mail/bsfilter/files/bsfilter.conf.sample
@@ -2,6 +2,7 @@
 #jtokenizer kakasi # 'make WITH_KAKASI=yes install'
 #jtokenizer MeCab # 'make WITH_MECAB=yes install'
 spam-cutoff 0.6
+db gdbm
 
 ## IMAP 
 ## (bsfilter --imap --imap-fetch-unflagged --insert-flag --insert-probability --imap-folder-spam inbox.spam inbox)
diff --git a/mail/bsfilter/pkg-descr b/mail/bsfilter/pkg-descr
index 50124df044d9..62f2698b43aa 100644
--- a/mail/bsfilter/pkg-descr
+++ b/mail/bsfilter/pkg-descr
@@ -1,10 +1,13 @@
-- English and Japanese are supported.
-- Written in Ruby
-- Three interfaces are supported.
-- Local mail file. accesses files or stdin/out.
-- IMAP. accesses mails in a IMAP server.
-- POP proxy. works as a proxy between a POP server and MUA.
-- GPL
+bsfilter is a spam filter using Bayesian(statistical) algorithm.
+
+- a filter which distinguishes spam and non-spam mail
+- support mails written in English and Japanese language
+- written in Ruby
+- support 3 methods for access
+-- traditional unix-style filter. study and judge local files or pipe
+-- IMAP. study and judge mails in an IMAP server
+-- POP proxy. run between POP server and MUA
+- distributed under GPL
 
 Author:	nabeken
 WWW:	http://bsfilter.org/index-e.html
diff --git a/mail/bsfilter/pkg-plist b/mail/bsfilter/pkg-plist
index 24ec067e7fef..f0db7f2b2c19 100644
--- a/mail/bsfilter/pkg-plist
+++ b/mail/bsfilter/pkg-plist
@@ -1,4 +1,17 @@
 bin/bsfilter
 %%PORTDOCS%%share/examples/bsfilter/bsfilter.conf.sample
 %%PORTDOCS%%share/examples/bsfilter/dot-qmail.sample
+%%PORTDOCS%%share/examples/bsfilter/mda/maildrop/mailfilter.header
+%%PORTDOCS%%share/examples/bsfilter/mda/procmail/procmailrc.black_gray
+%%PORTDOCS%%share/examples/bsfilter/mda/procmail/procmailrc.header
+%%PORTDOCS%%share/examples/bsfilter/mda/procmail/procmailrc.status
+%%PORTDOCS%%share/examples/bsfilter/mua/mew3/bs_clean
+%%PORTDOCS%%share/examples/bsfilter/mua/mew3/bs_mark
+%%PORTDOCS%%share/examples/bsfilter/mua/mew3/bs_spam
+%%PORTDOCS%%share/examples/bsfilter/mua/mew3/mew.el
+%%PORTDOCS%%@dirrm share/examples/bsfilter/mda/maildrop
+%%PORTDOCS%%@dirrm share/examples/bsfilter/mda/procmail
+%%PORTDOCS%%@dirrm share/examples/bsfilter/mda
+%%PORTDOCS%%@dirrm share/examples/bsfilter/mua/mew3
+%%PORTDOCS%%@dirrm share/examples/bsfilter/mua
 %%PORTDOCS%%@dirrm share/examples/bsfilter