8 files changed, 118 insertions, 0 deletions

diff --git a/mail/Makefile b/mail/Makefile
index ad4a9dfe6fec..d44f2b38cb83 100644
--- a/mail/Makefile
+++ b/mail/Makefile
@@ -8,6 +8,7 @@
     SUBDIR += aileron
     SUBDIR += akpop3d
     SUBDIR += althea
+    SUBDIR += annoyance-filter
     SUBDIR += anomy-sanitizer
     SUBDIR += anubis
     SUBDIR += archivemail
diff --git a/mail/annoyance-filter/Makefile b/mail/annoyance-filter/Makefile
new file mode 100644
index 000000000000..e008ee47ccc4
--- /dev/null
+++ b/mail/annoyance-filter/Makefile
@@ -0,0 +1,35 @@
+# New ports collection makefile for:	annoyance-filter
+# Date created:		2004-01-02
+# Whom:			Sergei Kolobov <sergei@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	annoyance-filter
+PORTVERSION=	1.0b
+CATEGORIES=	mail
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
+		http://www.fourmilab.ch/annoyance-filter/
+MASTER_SITE_SUBDIR=	${PORTNAME:S/-//}
+
+MAINTAINER=	ports@FreeBSD.org
+COMMENT=	Adaptive Bayesian Junk Mail Filter
+
+#USE_GPG=		yes
+USE_GETOPT_LONG=	yes
+GNU_CONFIGURE=		yes
+CFLAGS+=		${CPPFLAGS}
+
+MAN1=		annoyance-filter.1
+DOCS=		COPYING INSTALL README *.pdf
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME}-run ${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${MAN1PREFIX}/man/man1
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
+.endif
+
+.include <bsd.port.mk>
diff --git a/mail/annoyance-filter/distinfo b/mail/annoyance-filter/distinfo
new file mode 100644
index 000000000000..f9235079c9a6
--- /dev/null
+++ b/mail/annoyance-filter/distinfo
@@ -0,0 +1,2 @@
+MD5 (annoyance-filter-1.0b.tar.gz) = f0910681eaa71bb71ab902d321e61e25
+MD5 (annoyance-filter-1.0b.tar.gz.sig) = dd8f179d01d49a3fc5af8faa7038e606
diff --git a/mail/annoyance-filter/files/patch-Makefile.in b/mail/annoyance-filter/files/patch-Makefile.in
new file mode 100644
index 000000000000..d8ac40b3bd98
--- /dev/null
+++ b/mail/annoyance-filter/files/patch-Makefile.in
@@ -0,0 +1,43 @@
+--- Makefile.in.orig	Tue Feb 18 15:57:20 2003
++++ Makefile.in	Fri Jan  2 02:56:16 2004
+@@ -83,11 +83,11 @@
+ 
+ #   Annoyance filter program
+ 
+-$(PRODUCT):    $(PRODUCT).o statlib.o $(DCDFLIB_OBJS) getopt.o getopt1.o
+-	$(CXX) $(PRODUCT).o statlib.o $(DCDFLIB_OBJS) getopt.o getopt1.o -o $(PRODUCT) $(CFLAGS) $(LDFLAGS)
++$(PRODUCT):    $(PRODUCT).o statlib.o $(DCDFLIB_OBJS) 
++	$(CXX) $(PRODUCT).o statlib.o $(DCDFLIB_OBJS) -o $(PRODUCT) $(CFLAGS) $(LDFLAGS)
+ 	@rm -f core core.*
+ 
+-$(PRODUCT).o: $(PRODUCT).cc config.h getopt.h
++$(PRODUCT).o: $(PRODUCT).cc config.h 
+ $(PRODUCT).cc: $(PRODUCT).w
+ $(PRODUCT).tex: $(PRODUCT).w log.w $(TOOLS)
+ $(PRODUCT).view: $(PRODUCT).dvi
+@@ -97,8 +97,8 @@
+ 
+ #   Statistical library
+ 
+-statlib_test: statlib_test.o statlib.o $(DCDFLIB_OBJS) getopt.o
+-	$(CXX) statlib_test.o statlib.o getopt.o -o statlib_test $(DCDFLIB_OBJS) $(CFLAGS) $(LDFLAGS)
++statlib_test: statlib_test.o statlib.o $(DCDFLIB_OBJS) 
++	$(CXX) statlib_test.o statlib.o -o statlib_test $(DCDFLIB_OBJS) $(CFLAGS) $(LDFLAGS)
+ 
+ statlib.o: statlib.cc config.h getopt.h
+ statlib.cc: statlib.w
+@@ -275,14 +275,6 @@
+ 	groff -man $(PRODUCT).1 | lp
+ 	
+ #   HTML edition of manual page
+-
+-$(PRODUCT)_man_raw.html: $(PRODUCT).1
+-	$(MAN2HTML) -H $(MAN2HTMLHOST) $(PRODUCT).1 \
+-		>$(PRODUCT)_man_raw.html
+-	
+-$(PRODUCT)_man.html:	$(PRODUCT)_man_raw.html
+-	$(PERL) docutil/fixman2html.pl $(PRODUCT)_man_raw.html \
+-		>$(PRODUCT)_man.html
+ 
+ manhtml:	$(PRODUCT)_man.html
+ 
diff --git a/mail/annoyance-filter/files/patch-annoyance-filter.cc b/mail/annoyance-filter/files/patch-annoyance-filter.cc
new file mode 100644
index 000000000000..1f4ef5714261
--- /dev/null
+++ b/mail/annoyance-filter/files/patch-annoyance-filter.cc
@@ -0,0 +1,11 @@
+--- annoyance-filter.cc.orig	Thu Sep 25 01:56:54 2003
++++ annoyance-filter.cc	Fri Jan  2 02:51:57 2004
+@@ -114,7 +114,7 @@
+ #define __GNU_LIBRARY__
+ #undef __GETOPT_H__
+ #endif
+-#include "getopt.h"     
++#include <getopt.h>
+ #include "statlib.h" 
+ 
+ /*237:*/
diff --git a/mail/annoyance-filter/files/patch-statlib_test.cc b/mail/annoyance-filter/files/patch-statlib_test.cc
new file mode 100644
index 000000000000..497017ebf93f
--- /dev/null
+++ b/mail/annoyance-filter/files/patch-statlib_test.cc
@@ -0,0 +1,11 @@
+--- statlib_test.cc.orig	Thu Sep 25 02:02:10 2003
++++ statlib_test.cc	Fri Jan  2 02:51:57 2004
+@@ -28,7 +28,7 @@
+ #include <unistd.h> 
+ #endif
+ #else
+-#include "getopt.h"     
++#include <getopt.h>
+ #endif
+ #include "statlib.h"        
+ 
diff --git a/mail/annoyance-filter/pkg-descr b/mail/annoyance-filter/pkg-descr
new file mode 100644
index 000000000000..18a15d1c043b
--- /dev/null
+++ b/mail/annoyance-filter/pkg-descr
@@ -0,0 +1,6 @@
+annoyance-filter  uses Bayesian statistics to determine the probability
+an E-mail message is junk based on an analysis of its contents compared
+to collections of known junk and legitimate E-mail.
+
+Author:	John Walker
+WWW:	http://www.fourmilab.ch/annoyance-filter/
diff --git a/mail/annoyance-filter/pkg-plist b/mail/annoyance-filter/pkg-plist
new file mode 100644
index 000000000000..1a639db39b5d
--- /dev/null
+++ b/mail/annoyance-filter/pkg-plist
@@ -0,0 +1,9 @@
+@comment $FreeBSD$
+bin/annoyance-filter
+bin/annoyance-filter-run
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/annoyance-filter.pdf
+%%PORTDOCS%%%%DOCSDIR%%/statlib.pdf
+%%PORTDOCS%%@dirrm %%DOCSDIR%%