git: d3b93d68cde7 - main - net/kea: Fix two QA issues

From: Cy Schubert <cy_at_FreeBSD.org>
Date: Thu, 14 Aug 2025 00:58:34 UTC
The branch main has been updated by cy:

URL: https://cgit.FreeBSD.org/ports/commit/?id=d3b93d68cde72d76b097bfa687b314dead0b6498

commit d3b93d68cde72d76b097bfa687b314dead0b6498
Author:     Cy Schubert <cy@FreeBSD.org>
AuthorDate: 2025-08-13 23:19:18 +0000
Commit:     Cy Schubert <cy@FreeBSD.org>
CommitDate: 2025-08-14 00:58:05 +0000

    net/kea: Fix two QA issues
    
    Fix extraneous /var/lib creation. It is not used.
    
    Fix python3 duplicate BUILD_DEPENDS. QA flags this when USES=python
    should be used.
---
 net/kea/Makefile                |  5 ++---
 net/kea/files/patch-meson.build | 21 +++++++++++++++------
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/net/kea/Makefile b/net/kea/Makefile
index c1d26ecb7cc9..87f03e92b1d6 100644
--- a/net/kea/Makefile
+++ b/net/kea/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	kea
 DISTVERSION=	3.0.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	ISC/kea/${DISTVERSION}
 
@@ -20,8 +20,7 @@ MESON_ARGS=	--auto-features=disabled \
 		-Dnetconf=disabled
 
 BUILD_DEPENDS=	googletest>0:devel/googletest \
-		rst2man:textproc/py-docutils@${PY_FLAVOR} \
-		python3:lang/python3
+		rst2man:textproc/py-docutils@${PY_FLAVOR}
 
 CPE_VENDOR=	isc
 CPE_VERSION=	${DISTVERSION:C/-.*//}
diff --git a/net/kea/files/patch-meson.build b/net/kea/files/patch-meson.build
index 36a5df714c02..58f40526b835 100644
--- a/net/kea/files/patch-meson.build
+++ b/net/kea/files/patch-meson.build
@@ -1,6 +1,6 @@
---- meson.build.orig	2025-06-20 16:28:47 UTC
-+++ meson.build
-@@ -59,7 +59,7 @@ if PREFIX == '/usr/local'
+--- meson.build.orig	2025-06-20 09:28:47.000000000 -0700
++++ meson.build	2025-07-10 10:25:47.651315000 -0700
+@@ -59,7 +59,7 @@
  # Meson is annoying with its opinionated alteration of certain paths based on whether prefix is default or not.
  # So we revert what it does.
  if PREFIX == '/usr/local'
@@ -9,7 +9,7 @@
  endif
  
  DATABASE_SCRIPTS_DIR = TOP_BUILD_DIR / 'src/share/database/scripts'
-@@ -69,10 +69,10 @@ KEA_LFC_INSTALLED = PREFIX / SBINDIR / 'kea-lfc'
+@@ -69,17 +69,17 @@
  KEA_ADMIN_INSTALLED = PREFIX / SBINDIR / 'kea-admin'
  KEA_LFC_BUILT = TOP_BUILD_DIR / 'src/bin/lfc/kea-lfc'
  KEA_LFC_INSTALLED = PREFIX / SBINDIR / 'kea-lfc'
@@ -22,7 +22,16 @@
  if RUNSTATEDIR == ''
      RUNSTATEDIR = LOCALSTATEDIR / 'run/kea'
  else
-@@ -88,9 +88,9 @@ if PREFIX == '/usr/local'
+     RUNSTATEDIR = RUNSTATEDIR / 'kea'
+ endif
+-RUNSTATEDIR_INSTALLED = PREFIX / RUNSTATEDIR
+-SHAREDSTATEDIR = LOCALSTATEDIR / 'lib/kea'
++RUNSTATEDIR_INSTALLED = RUNSTATEDIR
++SHAREDSTATEDIR = LOCALSTATEDIR / 'db/kea'
+ SHAREDSTATEDIR_INSTALLED = PREFIX / SHAREDSTATEDIR
+ SYSCONFDIR_INSTALLED = PREFIX / SYSCONFDIR
+ TEST_CA_DIR = TOP_SOURCE_DIR / 'src/lib/asiolink/testutils/ca'
+@@ -88,9 +88,9 @@
  # So we revert what it does.
  if PREFIX == '/usr/local'
      SYSCONFDIR_INSTALLED = '/usr/local/etc'
@@ -35,7 +44,7 @@
  endif
  
  #### Build Options
-@@ -1108,9 +1108,9 @@ if PREFIX == '/usr/local'
+@@ -1108,9 +1108,9 @@
  # In case prefix is default, install to hardcoded path.
  if PREFIX == '/usr/local'
      install_emptydir('/usr/local/lib/kea')