7 files changed, 69 insertions, 43 deletions
diff --git a/news/cleanfeed/Makefile b/news/cleanfeed/Makefile
index 03113a242cb8..ad3473872392 100644
--- a/news/cleanfeed/Makefile
+++ b/news/cleanfeed/Makefile
@@ -6,25 +6,30 @@
 #
 
 PORTNAME=	cleanfeed
-PORTVERSION=	0.95.7b
+PORTVERSION=	20010805
 CATEGORIES=	news
-MASTER_SITES=	http://www.exit109.com/~jeremy/news/
+MASTER_SITES=	http://www.bofh.it/~md/cleanfeed/
+EXTRACT_SUFX=	.tgz
 
-PATCH_SITES=	${MASTER_SITES}
-PATCHFILES=	inn2.3.patch
-
-MAINTAINER=	leeym@cae.ce.ntu.edu.tw
+MAINTAINER=	leeym@leeym.com
 
 RUN_DEPENDS=	${LOCALBASE}/news/bin/innd:${PORTSDIR}/news/inn
 
 NO_BUILD=	yes
-MAN8=		cleanfeed.8
+BINOWN=		news
+BINGRP=		news
+SHAREOWN=	news
+SHAREGRP=	news
+
+post-patch:
+.for file in cleanfeed cleanfeed.local.sample
+	@${PERL} -pi -e "s,%%PREFIX%%,${PREFIX},g" ${WRKSRC}/${file}
+.endfor
 
 do-install:
-	@${PERL} -pi -e "s,%%PREFIX%%,${PREFIX},g" ${WRKSRC}/cleanfeed
-	@${PERL} -pi -e "s,%%LOCALBASE%%,${LOCALBASE},g" ${PKGDEINSTALL}
-	@${INSTALL_SCRIPT} ${WRKSRC}/cleanfeed ${LOCALBASE}/news/bin/filter/filter_innd.pl
-	@${INSTALL_DATA} ${WRKSRC}/cleanfeed.conf ${LOCALBASE}/news/bin/filter/cleanfeed.conf
-	@${INSTALL_MAN} ${WRKSRC}/cleanfeed.8 ${LOCALBASE}/man/man8/
+.for file in bad_adult_paths bad_cancel_paths bad_hosts bad_paths cleanfeed cleanfeed.local.sample
+	@${INSTALL_DATA} ${WRKSRC}/${file} ${LOCALBASE}/news/bin/filter
+.endfor
+	@cd ${LOCALBASE}/news/bin/filter; ${LN} -f cleanfeed filter_innd.pl
 
 .include <bsd.port.mk>
diff --git a/news/cleanfeed/distinfo b/news/cleanfeed/distinfo
index 4bfcca715d31..dfe490088beb 100644
--- a/news/cleanfeed/distinfo
+++ b/news/cleanfeed/distinfo
@@ -1,2 +1,2 @@
-MD5 (cleanfeed-0.95.7b.tar.gz) = a715445b9fb13382a3d97bbbb64d638f
+MD5 (cleanfeed-20010805.tgz) = 95e4895bf5ffbbaf8412975caf1db0ea
 MD5 (inn2.3.patch) = 98a2f6222aeeae4c6e442ed42440e37c
diff --git a/news/cleanfeed/files/patch-aa b/news/cleanfeed/files/patch-aa
deleted file mode 100644
index 42d12ad2e25e..000000000000
--- a/news/cleanfeed/files/patch-aa
+++ /dev/null
@@ -1,17 +0,0 @@
---- cleanfeed.orig	Sun Jan 14 02:10:40 2001
-+++ cleanfeed	Sun Jan 14 02:11:08 2001
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- #
- # Cleanfeed
- #  Version 0.95.7b  3 September 1998
-@@ -26,7 +26,7 @@
- # directory where the cleanfeed.conf and cleanfeed.local files live
- # set this to undef to not use the external file
- 
--$config_dir = '/usr/news/bin/control';
-+$config_dir = '%%PREFIX%%/news/bin/filter';
- 
- 
- # Everything below here can be set in cleanfeed.conf
diff --git a/news/cleanfeed/files/patch-cleanfeed b/news/cleanfeed/files/patch-cleanfeed
new file mode 100644
index 000000000000..abd0869762f3
--- /dev/null
+++ b/news/cleanfeed/files/patch-cleanfeed
@@ -0,0 +1,11 @@
+--- cleanfeed.orig	Sat Sep  8 09:42:19 2001
++++ cleanfeed	Sat Sep  8 09:42:31 2001
+@@ -11,7 +11,7 @@
+ # Directory where cleanfeed.local and the other configuration files live.
+ # Set this to undef to not use any external file.
+ 
+-$config_dir = '/news/bin/filter';
++$config_dir = '%%PREFIX%%/news/bin/filter';
+ 
+ ##############################################################################
+ # Server configuration
diff --git a/news/cleanfeed/files/patch-cleanfeed.local.sample b/news/cleanfeed/files/patch-cleanfeed.local.sample
new file mode 100644
index 000000000000..4fb6565761de
--- /dev/null
+++ b/news/cleanfeed/files/patch-cleanfeed.local.sample
@@ -0,0 +1,21 @@
+--- cleanfeed.local.sample.orig	Sat Sep  8 09:41:06 2001
++++ cleanfeed.local.sample	Sat Sep  8 09:41:24 2001
+@@ -213,13 +213,13 @@
+ sub local_config {
+ 	%config_local = (
+ 		block_late_cancels => 1,
+-		active_file => '/news/db/active',
+-		statfile => '/news/log/cleanfeed.stats',
+-#		html_statfile => '/news/log/cleanfeed.stats.html',
++		active_file => '%%PREFIX%%/news/db/active',
++		statfile => '%%PREFIX%%/news/log/cleanfeed.stats',
++#		html_statfile => '%%PREFIX%%/news/log/cleanfeed.stats.html',
+ 		stats_interval => 300,
+ 		do_emp_dump => 1,
+-		emp_dump_file => '/news/tmp/empdump',
+-		debug_batch_directory => '/news/spam',
++		emp_dump_file => '%%PREFIX%%/news/tmp/empdump',
++		debug_batch_directory => '%%PREFIX%%/news/spam',
+ 	);
+ 
+ 	%config_append = (
diff --git a/news/cleanfeed/pkg-descr b/news/cleanfeed/pkg-descr
index 530639d36a23..98e8eeb8bd27 100644
--- a/news/cleanfeed/pkg-descr
+++ b/news/cleanfeed/pkg-descr
@@ -1,14 +1,15 @@
-Cleanfeed 0.95.7b
------------------
-
-Cleanfeed is a spam filter for INN, Cyclone, Typhoon, Breeze, and
-NNTPRelay servers.
-
-Full documentation, including configuration and installation, is in the
-file "cleanfeed.man", and in "cleanfeed.8" in man page form (suitable for
-installation at /usr/local/man/man8, or wherever fine man pages live on
-your system).
-
-Written by Jeremy Nixon <jeremy@exit109.com>
+This is a new release of the popular cleanfeed usenet spam filter written
+by Jeremy Nixon. I will continue releasing new versions until I get tired
+or somebody else will step forward.
 
+There is no real documentation, so if you never used cleanfeed please
+download the original package from
 WWW: http://www.exit109.com/~jeremy/news/cleanfeed.html
+and enjoy trying to understand what changed.
+
+If you already have an existing cleanfeed installation please double check
+your cleanfeed.local, because it may not be compatibile with this release.
+cleanfeed.conf does not exist anymore, the bad_cancel_paths config option
+is now read from a configuration file and most local_* functions changed
+their name. Please read the CHANGES file for details about these and other
+things. When in doubt, check the source code.
diff --git a/news/cleanfeed/pkg-plist b/news/cleanfeed/pkg-plist
index 61fb7d0efc26..aa0facde98ef 100644
--- a/news/cleanfeed/pkg-plist
+++ b/news/cleanfeed/pkg-plist
@@ -1,2 +1,7 @@
 news/bin/filter/filter_innd.pl
-news/bin/filter/cleanfeed.conf
+news/bin/filter/bad_adult_paths
+news/bin/filter/bad_cancel_paths
+news/bin/filter/bad_hosts
+news/bin/filter/bad_paths
+news/bin/filter/cleanfeed
+news/bin/filter/cleanfeed.local.sample