4 files changed, 38 insertions, 14 deletions

diff --git a/mail/scmail/Makefile b/mail/scmail/Makefile
index 64fb1ae248ac..ec33a1b58f23 100644
--- a/mail/scmail/Makefile
+++ b/mail/scmail/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	scmail
-PORTVERSION=	0.2
+PORTVERSION=	1.0
 CATEGORIES=	mail
 MASTER_SITES=	http://www.namazu.org/~satoru/scmail/
 
@@ -14,16 +14,27 @@ MAINTAINER=	fuyuki@nigredo.org
 COMMENT=	A mail filter written in Scheme
 
 BUILD_DEPENDS=	gosh:${PORTSDIR}/lang/gauche
-RUN_DEPENDS=	${BUILD_DEPENDS}
+RUN_DEPENDS=	${LOCALBASE}/share/gauche/${GAUCHE_VER}/lib/dbm/gdbm.scm:${PORTSDIR}/databases/gauche-gdbm
 
 USE_REINPLACE=	yes
 MAKE_ARGS=	PREFIX="${PREFIX}" DATADIR="${EXAMPLESDIR}"
 
-post-patch:
-	${REINPLACE_CMD} -e "s|cp -p|${CP}|g" ${WRKSRC}/Makefile
+.if !defined(NOPORTDOCS)
+PORTDOCS=	scbayes-ja.html scbayes.html scmail-ja.html scmail.html
+.endif
+
+.include <bsd.port.pre.mk>
 
-pre-install:
-	${MKDIR} `gauche-config --sitelibdir`
+.if exists(${LOCALBASE}/bin/gauche-config)
+GAUCHE_VER!=	gauche-config -V
+.else
+GAUCHE_VER=	none
+.endif
+
+post-patch:
+	${REINPLACE_CMD} -E -e "s,cp -f?p,${CP},g;s,/dot.scmail,," \
+		${WRKSRC}/Makefile
+	${TOUCH} ${WRKSRC}/scmail/bayesian-filter.scm.in
 
 post-install:
 .if !defined(NOPORTDOCS)
@@ -31,4 +42,4 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/doc/* ${DOCSDIR}
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/mail/scmail/distinfo b/mail/scmail/distinfo
index e68e543fbf6f..047ce95ac6cc 100644
--- a/mail/scmail/distinfo
+++ b/mail/scmail/distinfo
@@ -1 +1,2 @@
-MD5 (scmail-0.2.tar.gz) = 0c3b7c7757c659fa0d8ed99e1c760807
+MD5 (scmail-1.0.tar.gz) = db4b2744303f8e2cd5a82b2815daa3c7
+SIZE (scmail-1.0.tar.gz) = 54275
diff --git a/mail/scmail/pkg-descr b/mail/scmail/pkg-descr
index 2c76cf55283e..df19515f157a 100644
--- a/mail/scmail/pkg-descr
+++ b/mail/scmail/pkg-descr
@@ -1,4 +1,12 @@
 scmail is a mail filter written in Scheme.  scmail can filter an
 incoming mail when it is received and filter mails in a mailbox.
 
+    * Written simply in Scheme.
+    * scmail supports MH and Maildir mailboxes.
+    * Simple filtering rules can be written in S-expressions.
+    * Advanced filtering rules can be written in Scheme programs.
+    * scmail can filter an incoming mail when it is received (like procmail).
+    * scmail can filter mails in a mailbox.
+    * spam filter (scbayes) is included. (now testing)
+
 WWW: http://www.namazu.org/~satoru/scmail/
diff --git a/mail/scmail/pkg-plist b/mail/scmail/pkg-plist
index e90f3033c6ae..49304e746c09 100644
--- a/mail/scmail/pkg-plist
+++ b/mail/scmail/pkg-plist
@@ -1,10 +1,14 @@
+bin/scbayes
 bin/scmail-deliver
 bin/scmail-refile
 share/gauche/site/lib/scmail.scm
-%%EXAMPLESDIR%%/scmailrc-deliver.sample
-%%EXAMPLESDIR%%/scmailrc-refile.sample
-%%EXAMPLESDIR%%/scmailrc.sample
+share/gauche/site/lib/scmail/bayesian-filter.scm
+share/gauche/site/lib/scmail/config.scm
+share/gauche/site/lib/scmail/mail.scm
+share/gauche/site/lib/scmail/progress.scm
+share/gauche/site/lib/scmail/util.scm
+@dirrm share/gauche/site/lib/scmail
+%%EXAMPLESDIR%%/config.sample
+%%EXAMPLESDIR%%/deliver-rules.sample
+%%EXAMPLESDIR%%/refile-rules.sample
 @dirrm %%EXAMPLESDIR%%
-%%PORTDOCS%%%%DOCSDIR%%/scmail-ja.html
-%%PORTDOCS%%%%DOCSDIR%%/scmail.html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%