o Update to 1.4

o DESCR: style changes (2 spaces after full stops), add more info
o PLIST: use %%DOCSDIR%% instead of hardwiring

Prompted by:	John Hay <jhay@icomtek.csir.co.za>

6 files changed, 66 insertions, 37 deletions

diff --git a/mail/spamoracle/Makefile b/mail/spamoracle/Makefile
index 0c1bf2441d66..d5f48f5a86a2 100644
--- a/mail/spamoracle/Makefile
+++ b/mail/spamoracle/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	spamoracle
-PORTVERSION=	1.2
-PORTREVISION=	1
+PORTVERSION=	1.4
 CATEGORIES=	mail
 MASTER_SITES=	http://cristal.inria.fr/~xleroy/software/
 
@@ -18,15 +17,23 @@ BUILD_DEPENDS=	ocaml:${PORTSDIR}/lang/ocaml
 
 USE_REINPLACE=	yes
 
-post-patch:
+MAN1=	spamoracle.1
+MAN5=	spamoracle.conf.5
+
+DOC_FILES=	Changes README
+
+do-configure:
 	@${REINPLACE_CMD} -E -e 's|^(CPP=)gcc[[:space:]]+-E|\1${CPP}|' \
+		-e 's|^(MANDIR=).*$$|\1${MANPREFIX}/man|' \
+		-e 's|^(BINDIR=).*$$|\1${PREFIX}/bin|' \
 		${WRKSRC}/Makefile
 
-do-install:
+post-install:
 .ifndef(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
+.for file in ${DOC_FILES}
+	@${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
+.endfor
 .endif
-	@${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
 
 .include <bsd.port.mk>
diff --git a/mail/spamoracle/distinfo b/mail/spamoracle/distinfo
index b21d7c72a132..898c45a1bf2f 100644
--- a/mail/spamoracle/distinfo
+++ b/mail/spamoracle/distinfo
@@ -1,2 +1,2 @@
-MD5 (spamoracle-1.2.tar.gz) = 1742952bc741a6036dc3a1bb3a5e73e3
-SIZE (spamoracle-1.2.tar.gz) = 15828
+MD5 (spamoracle-1.4.tar.gz) = 9cd2a825202c86a3728658545b0ac060
+SIZE (spamoracle-1.4.tar.gz) = 30391
diff --git a/mail/spamoracle/files/patch-Makefile b/mail/spamoracle/files/patch-Makefile
index 13b19689af9d..998d3f9c0db3 100644
--- a/mail/spamoracle/files/patch-Makefile
+++ b/mail/spamoracle/files/patch-Makefile
@@ -1,11 +1,28 @@
---- Makefile.orig	Thu Mar 11 21:39:28 2004
-+++ Makefile	Thu Mar 11 21:39:32 2004
-@@ -1,7 +1,7 @@
+--- Makefile.orig	Sun May 25 06:38:24 2003
++++ Makefile	Sat Mar 13 06:58:00 2004
+@@ -1,10 +1,10 @@
  ### Configuration section
  
  # The laguages you're interested in, besides English
--LANGUAGES=-DFRENCH #-DSPANISH -DITALIAN -DGERMAN
-+LANGUAGES=-DFRENCH -DSPANISH -DITALIAN -DGERMAN -DRUSSIAN
+-LANGUAGES=-DFRENCH #-DSPANISH -DITALIAN -DGERMAN -DPORTUGUESE -DJAPANESE
++LANGUAGES=-DFRENCH -DSPANISH -DITALIAN -DGERMAN -DPORTUGUESE -DJAPANESE -DRUSSIAN
  
  # How to invoke the C preprocessor
- CPP=gcc -E -P $(LANGUAGES) -
+-CPP=gcc -E -P $(LANGUAGES) -
++CPP=cpp -P $(LANGUAGES) -
+ 
+ # Where to install the binary
+ BINDIR=/usr/local/bin
+@@ -30,9 +30,9 @@
+ all: spamoracle
+ 
+ install:
+-	cp spamoracle $(BINDIR)/spamoracle
+-	cp spamoracle.1 $(MANDIR)/man1/spamoracle.1
+-	cp spamoracle.conf.5 $(MANDIR)/man5/spamoracle.conf.5
++	${BSD_INSTALL_PROGRAM} spamoracle $(BINDIR)/spamoracle
++	${BSD_INSTALL_MAN} spamoracle.1 $(MANDIR)/man1/spamoracle.1
++	${BSD_INSTALL_MAN} spamoracle.conf.5 $(MANDIR)/man5/spamoracle.conf.5
+ 
+ spamoracle: $(NATOBJS)
+ 	$(OCAMLOPT) -o spamoracle $(NATLIBS) $(NATOBJS)
diff --git a/mail/spamoracle/files/patch-wordsplit.mlp b/mail/spamoracle/files/patch-wordsplit.mlp
index 795bed332ab7..380030fe53a7 100644
--- a/mail/spamoracle/files/patch-wordsplit.mlp
+++ b/mail/spamoracle/files/patch-wordsplit.mlp
@@ -1,29 +1,27 @@
---- spamoracle-1.2-orig/wordsplit.mlp 2002-08-26 13:35:26 +0400
-+++ wordsplit.mlp  2002-10-25 21:04:30 +0400
+--- wordsplit.mlp.orig	Sat Mar 13 06:52:19 2004
++++ wordsplit.mlp	Sat Mar 13 06:55:09 2004
 @@ -35,10 +35,10 @@
  aaaaaaeceeeeiiii\
  ðnooooo÷ouuuuypy"
  
 -let normalize s =
 -  for i = 0 to String.length s - 1 do
--    s.[i] <- tbl.[Char.code s.[i]]
--  done
 +let normalize s = s
-+(*  for i = 0 to String.length s - 1 do
-+     s.[i] <- tbl.[Char.code s.[i]]
-+    done *)
- 
- }
++  (* for i = 0 to String.length s - 1 do
+     s.[i] <- tbl.[Char.code s.[i]]
+-  done
++  done *)
  
-@@ -62,6 +62,10 @@
-    '\164' (* Euro *)
-    'Ä' 'Ö' 'Ü' 'ä' 'ö' 'ü' 'ß' 
- #endif
+ let all_uppercase s =
+   try
+@@ -87,6 +87,10 @@
+ #ifdef PORTUGUESE
+    'À' 'Á' 'Â' 'Ã' 'Ç' 'É' 'Ê' 'Í' 'Ó' 'Ô' 'Õ' 'Ú' 'Ü'
+    'à' 'á' 'â' 'ã' 'ç' 'é' 'ê' 'í' 'ó' 'ô' 'õ' 'ú' 'ü'
++#endif
 +#ifdef RUSSIAN
 +  'Á' 'Â' '×' 'Ç' 'Ä' 'Å' '£' 'Ö' 'Ú' 'É' 'Ê' 'Ë' 'Ì' 'Í' 'Î' 'Ï' 'Ð' 'Ò' 'Ó' 'Ô' 'Õ' 'Æ' 'È' 'Ã' 'Þ' 'Û' 'Ý' 'ß' 'Ù' 'Ø' 'Ü' 'À' 'Ñ'
 +  'á' 'â' '÷' 'ç' 'ä' 'å' '³' 'ö' 'ú' 'é' 'ê' 'ë' 'ì' 'í' 'î' 'ï' 'ð' 'ò' 'ó' 'ô' 'õ' 'æ' 'è' 'ã' 'þ' 'û' 'ý' 'ÿ' 'ù' 'ø' 'ü' 'à' 'ñ'
-+#endif
- ]  
+ #endif
+ ]
  
- let uppercase_letter =
-
diff --git a/mail/spamoracle/pkg-descr b/mail/spamoracle/pkg-descr
index e8511e5f6853..6d64d9b421af 100644
--- a/mail/spamoracle/pkg-descr
+++ b/mail/spamoracle/pkg-descr
@@ -1,11 +1,17 @@
 [ excerpt from developer's site ]
 
 SpamOracle, a.k.a. "Saint Peter", is a tool to help detect and
-filter away "spam" (unsolicited commercial e-mail). It proceeds by
-statistical analysis of the words that appear in the e-mail, comparing
-the frequencies of words with those found in a user-provided corpus
-of known spam and known legitimate e-mail. The classification
+filter away "spam" (unsolicited commercial e-mail).  It proceeds
+by statistical analysis of the words that appear in the e-mail,
+comparing the frequencies of words with those found in a user-provided
+corpus of known spam and known legitimate e-mail.  The classification
 algorithm is based on Bayes' formula, and is described in Paul
 Graham's paper, A plan for spam.
 
+This program is designed to work in conjunction with procmail.  The
+result of the analysis is output as an additional message header
+X-Spam:, followed by yes, no or unknown, plus additional details.
+A procmail rule can then test this X-Spam: header and deliver the
+e-mail to the appropriate mailbox.
+
 WWW: http://cristal.inria.fr/~xleroy/software.html
diff --git a/mail/spamoracle/pkg-plist b/mail/spamoracle/pkg-plist
index 014d8f848cd1..7505e4e04dbe 100644
--- a/mail/spamoracle/pkg-plist
+++ b/mail/spamoracle/pkg-plist
@@ -1,3 +1,4 @@
 bin/spamoracle
-%%PORTDOCS%%share/doc/spamoracle/README
-%%PORTDOCS%%@dirrm share/doc/spamoracle
+%%PORTDOCS%%%%DOCSDIR%%/Changes
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%@dirrm %%DOCSDIR%%