Created attachment 251053 [details] update to 2.6.0 Update KEA to the next stable release 2.6.0
*** Bug 279377 has been marked as a duplicate of this bug. ***
Hi, I'm going to test this to commit it later. I've also noticed a few possible improvements. I'll attach an updated proposed patch shortly with details.
Created attachment 251059 [details] update v2 I've prepared a modified update, some notes: - Why do tha manual thing on ISCVERSION? Have you tried using DISTVERSION? It should do all the correct replacements to get an acceptable PORTVERSION based on what upstream is doing. ports are already doing this on DISTVERSION [1] Since this is a clean version number, it is a good time to switch, to avoid versions going backwards due to differences in calculation. - I've reordered some variables and added some spaces/tabs to help readability. - I put the WANT_PGSQL inside PGSQL_VARS, so that is enabled only when PGSQL is enabled. I've tested in poudriere and seems to build fine, I'll also be run testing this. Please let me know if my changes are all acceptable to you. [1] https://cgit.freebsd.org/ports/tree/Mk/bsd.port.mk#n1376
Comment on attachment 251059 [details] update v2 Sounds good, thanks for the updates! ISCVERSION was there initially as ISC likes to do stuff like 2.4.0-P1 but I don't remember them doing that for KEA recently. Can always revert to ISCVERSION if needed.
(In reply to Andrey Pevnev from comment #4) DISTVERSION leads to this kind of results: DISTVERSION=2.6.0 leads to PORTVERSION=2.6.0 DISTVERSION=2.6.0-P1 leads to PORTVERSION=2.6.0.p1 DISTVERSION=2.6.0-BETA leads to PORTVERSION=2.6.0.b And similar, usually pkg version gets the higher version correctly. There is the case of: DISTVERSION=2.6.0-RC1 leading to PORTVERSION=2.6.0.r1 which causes: > pkg version -t 2.6.0.p1 2.6.0.r1 < so the RC would be considered higher version than the -P1. Considering in ports we do not usually distribute release candidates (and I see no such tag in their repo), I think the simplification is worth the risk. BTW My patch is missing a file in DOCS, I'll add that at commit time later.
A commit in branch main references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=d2749ec0735c69172fa362082cdf06ced5f259fe commit d2749ec0735c69172fa362082cdf06ced5f259fe Author: Andrey Pevnev <apevnev@me.com> AuthorDate: 2024-05-30 05:54:32 +0000 Commit: Guido Falsi <madpilot@FreeBSD.org> CommitDate: 2024-05-30 05:58:38 +0000 net/kea: Update to 2.6.0 - Use DISTVERSION to account for upstream release numbering strategy - Cleanup Makefile, reorder/sort variables - Put WANT_PGSQL inside optional PGSQL_VARS PR: 279376 net/kea/Makefile | 64 +++++++++++---------- net/kea/distinfo | 6 +- net/kea/pkg-plist | 163 ++++++++++++++++++++++++++++-------------------------- 3 files changed, 119 insertions(+), 114 deletions(-)
Update committed. Thanks!