- Update to recent cleanfeed release by Steve Crook (2. June)

- Claim maintainership
- Now installs a .sample config files and doesn't override
  the original (cleanfeed.local) if it has been edited
- Internal files moved into a separate directory (upstream default)

4 files changed, 36 insertions, 15 deletions

diff --git a/news/cleanfeed/Makefile b/news/cleanfeed/Makefile
index bc980d702732..a73b878c1efb 100644
--- a/news/cleanfeed/Makefile
+++ b/news/cleanfeed/Makefile
@@ -6,12 +6,11 @@
 #
 
 PORTNAME=	cleanfeed
-PORTVERSION=	20020501
+PORTVERSION=	20100602
 CATEGORIES=	news
-MASTER_SITES=	http://www.bofh.it/~md/cleanfeed/
-EXTRACT_SUFX=	.tgz
+MASTER_SITES=	http://www.mixmin.net/cleanfeed/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	johans@FreeBSD.org
 COMMENT=	Spam filter for Usenet news servers
 
 RUN_DEPENDS=	${LOCALBASE}/news/bin/innd:${PORTSDIR}/news/inn
@@ -24,14 +23,20 @@ SHAREOWN=	news
 SHAREGRP=	news
 INSTALL+=	-b
 PKGDEINSTALL=	${PKGINSTALL}
+WRKSRC=		${WRKDIR}/${PORTNAME}
 
 post-patch:
-	@${REINPLACE_CMD} -e 's,/news,${PREFIX}/news,g' ${WRKSRC}/cleanfeed*
+	@${REINPLACE_CMD} -e "/debug_batch_directory/s:'.*':'/var/log/cleanfeed':" ${WRKSRC}/etc/cleanfeed.local
 
 do-install:
-.for f in bad_adult_paths bad_cancel_paths bad_hosts bad_paths cleanfeed cleanfeed.local.sample
-	@${INSTALL_DATA} ${WRKSRC}/${f} ${LOCALBASE}/news/bin/filter
+	@${INSTALL} ${_SHROWNGRP} -d ${PREFIX}/news/cleanfeed/etc
+.for f in bad_adult_paths bad_body bad_cancel_paths bad_from bad_groups \
+		bad_hosts bad_paths bad_subject bad_url
+	@${INSTALL_DATA} ${WRKSRC}/etc/${f} ${PREFIX}/news/cleanfeed/etc
 .endfor
+	@${INSTALL_DATA} ${WRKSRC}/etc/cleanfeed.local \
+		${PREFIX}/news/cleanfeed/etc/cleanfeed.local.sample
+	@${INSTALL_DATA} ${WRKSRC}/cleanfeed ${PREFIX}/news/bin/filter
 
 post-install:
 	${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
diff --git a/news/cleanfeed/distinfo b/news/cleanfeed/distinfo
index c8daaaadaef3..d17edca41bf6 100644
--- a/news/cleanfeed/distinfo
+++ b/news/cleanfeed/distinfo
@@ -1,3 +1,3 @@
-MD5 (cleanfeed-20020501.tgz) = 8535cc55d63a1932a447d09829b6aa97
-SHA256 (cleanfeed-20020501.tgz) = 83fc2726c500b3c1a980ee5a7e011bbeaf3153fabe125a8c0aa9e4ff8d32195b
-SIZE (cleanfeed-20020501.tgz) = 31966
+MD5 (cleanfeed-20100602.tar.gz) = f114acfc4ea9e2941e9d04dadeafef0b
+SHA256 (cleanfeed-20100602.tar.gz) = 08d91b36887758a3a83786789d371f5f6057e2fcb6f05e28d342408e2e70e84d
+SIZE (cleanfeed-20100602.tar.gz) = 28800
diff --git a/news/cleanfeed/pkg-install b/news/cleanfeed/pkg-install
index c46663b49090..b86daaaa90b9 100644
--- a/news/cleanfeed/pkg-install
+++ b/news/cleanfeed/pkg-install
@@ -3,15 +3,24 @@
 PKGNAME=$1
 [ ! -n "${PKG_PREFIX}" ] && exit 1
 
+CONFFILE="${PKG_PREFIX}/news/cleanfeed/etc/cleanfeed.local"
+
 case $2 in
     POST-INSTALL)
 	cd ${PKG_PREFIX}/news/bin/filter \
 		&& mv filter_innd.pl filter_innd.pl.orig \
 		&& ln -s cleanfeed filter_innd.pl
+	mkdir -p /var/log/cleanfeed
+	chown news:news /var/log/cleanfeed
+	test -f ${CONFFILE} || cp -p ${CONFFILE}.sample ${CONFFILE}
+	;;
+    DEINSTALL)
+	cmp -s ${CONFFILE}.sample ${CONFFILE} && rm -f ${CONFFILE}
 	;;
     POST-DEINSTALL)
 	cd ${PKG_PREFIX}/news/bin/filter \
 		&& mv filter_innd.pl.orig filter_innd.pl
+	rmdir /var/log/cleanfeed
 	;;
 esac
 exit 0
diff --git a/news/cleanfeed/pkg-plist b/news/cleanfeed/pkg-plist
index 0890d48b4a16..a4c65ceb82eb 100644
--- a/news/cleanfeed/pkg-plist
+++ b/news/cleanfeed/pkg-plist
@@ -1,6 +1,13 @@
-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
+news/cleanfeed/etc/bad_adult_paths
+news/cleanfeed/etc/bad_body
+news/cleanfeed/etc/bad_cancel_paths
+news/cleanfeed/etc/bad_from
+news/cleanfeed/etc/bad_groups
+news/cleanfeed/etc/bad_hosts
+news/cleanfeed/etc/bad_paths
+news/cleanfeed/etc/bad_subject
+news/cleanfeed/etc/bad_url
+news/cleanfeed/etc/cleanfeed.local.sample
+@dirrmtry news/cleanfeed/etc
+@dirrmtry news/cleanfeed