Date: Wed, 29 Apr 2026 02:26:50 +0000 From: Kevin Bowling <kbowling@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: e6ca093236cd - main - news/cleanfeed: Clean up the port Message-ID: <69f16c6a.3e608.5a535c22@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by kbowling: URL: https://cgit.FreeBSD.org/ports/commit/?id=e6ca093236cdb74c1399b5284f11bc0d08d5cc70 commit e6ca093236cdb74c1399b5284f11bc0d08d5cc70 Author: Kevin Bowling <kbowling@FreeBSD.org> AuthorDate: 2026-04-29 02:24:39 +0000 Commit: Kevin Bowling <kbowling@FreeBSD.org> CommitDate: 2026-04-29 02:26:36 +0000 news/cleanfeed: Clean up the port - Use plist to handle ownerships and installation to filter_innd.pl - Install bad_ files as sample so the admin can edit them --- news/cleanfeed/Makefile | 37 +++++++++++++++++-------------------- news/cleanfeed/pkg-install | 26 -------------------------- news/cleanfeed/pkg-plist | 25 +++++++++++++++---------- 3 files changed, 32 insertions(+), 56 deletions(-) diff --git a/news/cleanfeed/Makefile b/news/cleanfeed/Makefile index 1e2f8330740b..2fc351703c1f 100644 --- a/news/cleanfeed/Makefile +++ b/news/cleanfeed/Makefile @@ -1,47 +1,44 @@ PORTNAME= cleanfeed DISTVERSION= 20200402 +PORTREVISION= 1 CATEGORIES= news -USE_GITHUB= yes -GH_ACCOUNT= crooks -GH_TAGNAME= dd177d4a3b6ea2e538da17bbb2a74772cea4a49a - MAINTAINER= kbowling@FreeBSD.org COMMENT= Spam filter for Usenet news servers WWW= https://github.com/crooks/cleanfeed +LICENSE= ART10 + FLAVORS= inn inncurrent FLAVOR?= ${FLAVORS:[1]} -inn_CONFLICTS_INSTALL= cleanfeed-current inn_RUN_DEPENDS= ${LOCALBASE}/news/bin/innd:news/inn +inn_CONFLICTS_INSTALL= cleanfeed-current inncurrent_PKGNAMESUFFIX= -current -inncurrent_CONFLICTS_INSTALL= cleanfeed inncurrent_RUN_DEPENDS= ${LOCALBASE}/news/bin/innd:news/inn-current +inncurrent_CONFLICTS_INSTALL= cleanfeed + +USES= perl5 +USE_GITHUB= yes +GH_ACCOUNT= crooks +GH_TAGNAME= dd177d4a3b6ea2e538da17bbb2a74772cea4a49a NO_ARCH= yes NO_BUILD= yes -USES= perl5 -BINOWN= news -BINGRP= news -SHAREOWN= news -SHAREGRP= news -INSTALL+= -b -PKGDEINSTALL= ${PKGINSTALL} post-patch: @${REINPLACE_CMD} -e "/debug_batch_directory/s:'.*':'/var/log/cleanfeed':" ${WRKSRC}/samples/cleanfeed.local do-install: - @${MKDIR} ${STAGEDIR}${PREFIX}/news/cleanfeed/etc + ${MKDIR} ${STAGEDIR}${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}/samples/${f} ${STAGEDIR}${PREFIX}/news/cleanfeed/etc + bad_hosts bad_paths bad_subject bad_url cleanfeed.local + ${INSTALL_DATA} ${WRKSRC}/samples/${f} \ + ${STAGEDIR}${PREFIX}/news/cleanfeed/etc/${f}.sample .endfor - @${INSTALL_DATA} ${WRKSRC}/samples/cleanfeed.local \ - ${STAGEDIR}${PREFIX}/news/cleanfeed/etc/cleanfeed.local.sample - @${MKDIR} ${STAGEDIR}${PREFIX}/news/bin/filter - @${INSTALL_DATA} ${WRKSRC}/cleanfeed ${STAGEDIR}${PREFIX}/news/bin/filter + ${MKDIR} ${STAGEDIR}${PREFIX}/news/bin/filter + ${INSTALL_DATA} ${WRKSRC}/cleanfeed ${STAGEDIR}${PREFIX}/news/bin/filter + ${MKDIR} ${STAGEDIR}/var/log/cleanfeed .include <bsd.port.mk> diff --git a/news/cleanfeed/pkg-install b/news/cleanfeed/pkg-install deleted file mode 100644 index b86daaaa90b9..000000000000 --- a/news/cleanfeed/pkg-install +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/sh - -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 f3193c74f89a..a9a32ab3bfce 100644 --- a/news/cleanfeed/pkg-plist +++ b/news/cleanfeed/pkg-plist @@ -1,11 +1,16 @@ +@owner news +@group news news/bin/filter/cleanfeed -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 +@sample news/cleanfeed/etc/bad_adult_paths.sample +@sample news/cleanfeed/etc/bad_body.sample +@sample news/cleanfeed/etc/bad_cancel_paths.sample +@sample news/cleanfeed/etc/bad_from.sample +@sample news/cleanfeed/etc/bad_groups.sample +@sample news/cleanfeed/etc/bad_hosts.sample +@sample news/cleanfeed/etc/bad_paths.sample +@sample news/cleanfeed/etc/bad_subject.sample +@sample news/cleanfeed/etc/bad_url.sample +@sample news/cleanfeed/etc/cleanfeed.local.sample +@dir(news,news,) /var/log/cleanfeed +@postexec ln -sf cleanfeed %D/news/bin/filter/filter_innd.pl +@preunexec cp -pf %D/news/bin/filter/filter_innd.pl.sample %D/news/bin/filter/filter_innd.pl 2>/dev/null || truehome | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69f16c6a.3e608.5a535c22>