CVS commit: pkgsrc/net/kea

["Takahiro Kambe" <taca%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   taca
Date:           Tue Oct 28 15:09:55 UTC 2025

Modified Files:
        pkgsrc/net/kea: PLIST options.mk

Log Message:
net/kea: fix build problem

* Fix build problem caused by handling of mysql option.
* Fix build problem with mysql and pgsql options.

TODO: It still broken with botan PKG_OPTIONS.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/net/kea/PLIST
cvs rdiff -u -r1.2 -r1.3 pkgsrc/net/kea/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/kea/PLIST
diff -u pkgsrc/net/kea/PLIST:1.5 pkgsrc/net/kea/PLIST:1.6
--- pkgsrc/net/kea/PLIST:1.5    Mon Oct 27 15:46:56 2025
+++ pkgsrc/net/kea/PLIST        Tue Oct 28 15:09:55 2025
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2025/10/27 15:46:56 adam Exp $
+@comment $NetBSD: PLIST,v 1.6 2025/10/28 15:09:55 taca Exp $
 bin/kea-msg-compiler
 include/kea/asiodns/asiodns_messages.h
 include/kea/asiodns/io_fetch.h
@@ -229,8 +229,6 @@ include/kea/dhcpsrv/legal_log_mgr_factor
 include/kea/dhcpsrv/memfile_lease_limits.h
 include/kea/dhcpsrv/memfile_lease_mgr.h
 include/kea/dhcpsrv/memfile_lease_storage.h
-${PLIST.mysql}include/kea/dhcpsrv/mysql_host_data_source.h
-${PLIST.mysql}include/kea/dhcpsrv/mysql_lease_mgr.h
 include/kea/dhcpsrv/ncr_generator.h
 include/kea/dhcpsrv/network.h
 include/kea/dhcpsrv/network_state.h
@@ -457,7 +455,7 @@ lib/kea/hooks/libdhcp_lease_cmds.so
 lib/kea/hooks/libdhcp_lease_query.so
 lib/kea/hooks/libdhcp_legal_log.so
 lib/kea/hooks/libdhcp_limits.so
-${PLIST.mysql}lib/kea/hooks/libdhcp_mysql_cb.so
+${PLIST.mysql}lib/kea/hooks/libdhcp_mysql.so
 lib/kea/hooks/libdhcp_perfmon.so
 ${PLIST.pgsql}lib/kea/hooks/libdhcp_pgsql.so
 lib/kea/hooks/libdhcp_ping_check.so
@@ -520,6 +518,8 @@ lib/libkea-log.so
 lib/libkea-log.so.85
 lib/libkea-log.so.85.0.0
 ${PLIST.mysql}lib/libkea-mysql.so
+${PLIST.mysql}lib/libkea-mysql.so.101
+${PLIST.mysql}lib/libkea-mysql.so.101.0.0
 ${PLIST.pgsql}lib/libkea-pgsql.so
 ${PLIST.pgsql}lib/libkea-pgsql.so.101
 ${PLIST.pgsql}lib/libkea-pgsql.so.101.0.0

Index: pkgsrc/net/kea/options.mk
diff -u pkgsrc/net/kea/options.mk:1.2 pkgsrc/net/kea/options.mk:1.3
--- pkgsrc/net/kea/options.mk:1.2       Mon Oct 27 15:46:56 2025
+++ pkgsrc/net/kea/options.mk   Tue Oct 28 15:09:55 2025
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2025/10/27 15:46:56 adam Exp $
+# $NetBSD: options.mk,v 1.3 2025/10/28 15:09:55 taca Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.kea
 PKG_SUPPORTED_OPTIONS+=        botan libyang pgsql mysql
@@ -20,17 +20,17 @@ MESON_ARGS+=        -Dcrypto=openssl
 .endif
 
 .if !empty(PKG_OPTIONS:Mpgsql)
-.  include "../../mk/pgsql.buildlink3.mk"
 MESON_ARGS+=   -Dpostgresql=enabled
 PLIST.pgsql=   yes
+.  include "../../mk/pgsql.buildlink3.mk"
 .else
 MESON_ARGS+=   -Dpostgresql=disabled
 .endif
 
 .if !empty(PKG_OPTIONS:Mmysql)
 MESON_ARGS+=   -Dmysql=enabled
-.  include "../../mk/mysql.buildlink3.mk"
-MESON_ARGS+=   -Dmysql=disabled
 PLIST.mysql=   yes
+.  include "../../mk/mysql.buildlink3.mk"
 .else
+MESON_ARGS+=   -Dmysql=disabled
 .endif