Date: Sun, 03 May 2026 08:54:40 +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: 8c851e1425ae - main - news/inn: Fix blocklistd/blacklistd compat Message-ID: <69f70d50.19f52.6457789d@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=8c851e1425aed90b7f99dc51293757a7df468063 commit 8c851e1425aed90b7f99dc51293757a7df468063 Author: Kevin Bowling <kbowling@FreeBSD.org> AuthorDate: 2026-05-03 08:53:16 +0000 Commit: Kevin Bowling <kbowling@FreeBSD.org> CommitDate: 2026-05-03 08:53:29 +0000 news/inn: Fix blocklistd/blacklistd compat Use Jose's find/sed approach to handle the blocklist rename across FreeBSD versions. My attepmt was not broad enough. INN 2.8 source uses "blocklist" so on FreeBSD < 15.0 we sed it back to "blacklist". INN 2.7 source uses "blacklist" so on FreeBSD >= 15.0 we sed it to "blocklist". Co-Authored-By: Jose Luis Duran <jlduran@FreeBSD.org> --- news/inn/Makefile | 31 ++++++++++++++----------------- 1 file changed, 14 insertions(+), 17 deletions(-) diff --git a/news/inn/Makefile b/news/inn/Makefile index d66fbd6fd151..2eb84d393911 100644 --- a/news/inn/Makefile +++ b/news/inn/Makefile @@ -162,23 +162,20 @@ post-patch: .if ${PORT_OPTIONS:MBERKELEYDB} @${REINPLACE_CMD} -e 's!-ldb!-ldb-${BDB_VER}!' ${WRKSRC}/configure .endif -.if ${BRANCH:U} == 2.8 && ${OSVERSION} < 1500000 && ${PORT_OPTIONS:MBLOCKLISTD} - @${REINPLACE_CMD} -e 's|blocklist\.h|blacklist.h|g' \ - -e 's|libblocklist|libblacklist|g' \ - -e 's|-lblocklist|-lblacklist|g' \ - -e 's|blocklist_open|blacklist_open|g' \ - -e 's|blocklist_close|blacklist_close|g' \ - -e 's|blocklist_r|blacklist_r|g' \ - -e 's|BLOCKLIST_AUTH|BLACKLIST_AUTH|g' \ - -e 's|struct blocklist|struct blacklist|g' \ - -e 's|HAVE_BLOCKLIST|HAVE_BLACKLIST|g' \ - ${WRKSRC}/nnrpd/perm.c \ - ${WRKSRC}/include/config.h.in - @${REINPLACE_CMD} -e 's|blocklist|blacklist|g' \ - -e 's|BLOCKLIST|BLACKLIST|g' \ - ${WRKSRC}/m4/blocklist.m4 \ - ${WRKSRC}/Makefile.global.in \ - ${WRKSRC}/configure +.if ${BRANCH:U} == 2.8 +. if ${OPSYS} == FreeBSD && ${OSVERSION} < 1500000 + @${FIND} ${WRKSRC} -type f -exec ${SED} -i '' \ + -e 's/BLOCKLIST/BLACKLIST/g' \ + -e 's/Blocklist/Blacklist/g' \ + -e 's/blocklist/blacklist/g' {} + +. endif +.else +. if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1500000 + @${FIND} ${WRKSRC} -type f -exec ${SED} -i '' \ + -e 's/BLACKLIST/BLOCKLIST/g' \ + -e 's/Blacklist/Blocklist/g' \ + -e 's/blacklist/blocklist/g' {} + +. endif .endif pre-install:home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69f70d50.19f52.6457789d>