Date: Sat, 30 May 2026 05:42:56 +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: afb0ced9dbc7 - main - news/inn-current: Drop blacklist/blocklist handling Message-ID: <6a1a78e0.44e30.203ddd41@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=afb0ced9dbc7c2cb1f63ba6aea2efcda2fc11c9a commit afb0ced9dbc7c2cb1f63ba6aea2efcda2fc11c9a Author: Kevin Bowling <kbowling@FreeBSD.org> AuthorDate: 2026-05-30 05:42:04 +0000 Commit: Kevin Bowling <kbowling@FreeBSD.org> CommitDate: 2026-05-30 05:42:04 +0000 news/inn-current: Drop blacklist/blocklist handling An autoconf m4 correctly handles the differences in -current. --- news/inn/Makefile | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/news/inn/Makefile b/news/inn/Makefile index bf73d128880b..ac29df62f43e 100644 --- a/news/inn/Makefile +++ b/news/inn/Makefile @@ -103,7 +103,7 @@ BERKELEYDB_CONFIGURE_ON= --with-bdb-include=${BDB_INCLUDE_DIR} \ --with-bdb-lib=${LOCALBASE}/lib \ --with-bdb=${LOCALBASE} -.if ${BRANCH:U} == 2.8 && ${OSVERSION:U} >= 1500000 +.if ${BRANCH:U} == 2.8 BLOCKLISTD_CONFIGURE_WITH= blocklist .else BLOCKLISTD_CONFIGURE_WITH= blacklist @@ -168,14 +168,7 @@ post-patch: .if ${PORT_OPTIONS:MBERKELEYDB} @${REINPLACE_CMD} -e 's!-ldb!-ldb-${BDB_VER}!' ${WRKSRC}/configure .endif -.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 ${BRANCH:U} == 2.7 . if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1500000 @${FIND} ${WRKSRC} -type f -exec ${SED} -i '' \ -e 's/BLACKLIST/BLOCKLIST/g' \home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?6a1a78e0.44e30.203ddd41>