5 files changed, 70 insertions, 35 deletions
diff --git a/net/kea/files/patch-Makefile.am b/net/kea/files/patch-Makefile.am
deleted file mode 100644
index 2ffd64ee99a7..000000000000
--- a/net/kea/files/patch-Makefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
---- Makefile.am.orig	2025-05-22 13:26:43 UTC
-+++ Makefile.am
-@@ -176,10 +176,6 @@ install-exec-hook:
- 
- # These steps are necessary during installation. chmod is for reinstallation/upgrade.
- install-exec-hook:
--	mkdir -m 750 -p "$(DESTDIR)${localstatedir}/lib/${PACKAGE_NAME}"
--	chmod 750 "$(DESTDIR)${localstatedir}/lib/${PACKAGE_NAME}"
--	mkdir -m 750 -p "$(DESTDIR)${localstatedir}/log/${PACKAGE_NAME}"
--	chmod 750 "$(DESTDIR)${localstatedir}/log/${PACKAGE_NAME}"
- 	mkdir -m 750 -p "$(DESTDIR)${runstatedir}/${PACKAGE_NAME}"
- 	chmod 750 "$(DESTDIR)${runstatedir}/${PACKAGE_NAME}"
- 	mkdir -m 750 -p "$(DESTDIR)${sysconfdir}/${PACKAGE_NAME}"
diff --git a/net/kea/files/patch-meson.build b/net/kea/files/patch-meson.build
new file mode 100644
index 000000000000..f444e3bcdafe
--- /dev/null
+++ b/net/kea/files/patch-meson.build
@@ -0,0 +1,59 @@
+--- meson.build.orig	2025-06-20 16:28:47 UTC
++++ meson.build
+@@ -59,7 +59,7 @@ if PREFIX == '/usr/local'
+ # 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'
+-    LOCALSTATEDIR = 'var'    # Otherwise, it would have been 'var/local'.
++    LOCALSTATEDIR = '/var'    # Otherwise, it would have been 'var/local'.
+ endif
+ 
+ DATABASE_SCRIPTS_DIR = TOP_BUILD_DIR / 'src/share/database/scripts'
+@@ -69,17 +69,17 @@ KEA_LFC_INSTALLED = PREFIX / SBINDIR / 'kea-lfc'
+ 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'
+-LOCALSTATEDIR_INSTALLED = PREFIX / LOCALSTATEDIR
++LOCALSTATEDIR_INSTALLED = LOCALSTATEDIR
+ LIBDIR_INSTALLED = PREFIX / LIBDIR
+ LOGDIR = LOCALSTATEDIR / 'log/kea'
+-LOGDIR_INSTALLED = PREFIX / LOGDIR
++LOGDIR_INSTALLED = LOGDIR
+ if RUNSTATEDIR == ''
+     RUNSTATEDIR = LOCALSTATEDIR / 'run/kea'
+ else
+     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 @@ if PREFIX == '/usr/local'
+ # So we revert what it does.
+ if PREFIX == '/usr/local'
+     SYSCONFDIR_INSTALLED = '/usr/local/etc'
+-    LOGDIR_INSTALLED = '/usr/local/var/log/kea'
+-    RUNSTATEDIR_INSTALLED = '/usr/local/var/run/kea'
+-    SHAREDSTATEDIR_INSTALLED = '/usr/local/var/lib/kea'
++    LOGDIR_INSTALLED = '/var/log/kea'
++    RUNSTATEDIR_INSTALLED = '/var/run/kea'
++    SHAREDSTATEDIR_INSTALLED = '/var/db/kea'
+ endif
+ 
+ #### Build Options
+@@ -1108,9 +1108,9 @@ if PREFIX == '/usr/local'
+ # In case prefix is default, install to hardcoded path.
+ if PREFIX == '/usr/local'
+     install_emptydir('/usr/local/lib/kea')
+-    install_emptydir('/usr/local/var/lib/kea')
+-    install_emptydir('/usr/local/var/log/kea')
+-    install_emptydir('/usr/local/var/run/kea')
++    install_emptydir('/var/db/kea')
++    install_emptydir('/var/log/kea')
++    install_emptydir('/var/run/kea')
+ endif
+ 
+ # Print the setup report.
diff --git a/net/kea/files/patch-src_bin_keactrl_Makefile.am b/net/kea/files/patch-src_bin_keactrl_Makefile.am
deleted file mode 100644
index 385488664470..000000000000
--- a/net/kea/files/patch-src_bin_keactrl_Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/bin/keactrl/Makefile.am.orig	2019-10-25 12:41:08 UTC
-+++ src/bin/keactrl/Makefile.am
-@@ -62,7 +62,7 @@ install-data-local:
- 			   $(DESTDIR)$(sysconfdir)/@PACKAGE@/$$f.bak; \
- 		fi; \
- 		if test ! -f $(DESTDIR)$(sysconfdir)/@PACKAGE@/$$f; then \
--			${INSTALL_DATA} $$f $(DESTDIR)$(sysconfdir)/@PACKAGE@/; \
-+			${INSTALL_DATA} $$f $(DESTDIR)$(sysconfdir)/@PACKAGE@/$${f}.sample; \
- 		fi; \
- 	done
- 
diff --git a/net/kea/files/patch-src_bin_keactrl_meson.build b/net/kea/files/patch-src_bin_keactrl_meson.build
new file mode 100644
index 000000000000..535929a19de4
--- /dev/null
+++ b/net/kea/files/patch-src_bin_keactrl_meson.build
@@ -0,0 +1,11 @@
+--- src/bin/keactrl/meson.build.orig	2025-07-10 15:51:59 UTC
++++ src/bin/keactrl/meson.build
+@@ -14,7 +14,7 @@ keactrl_conf_data.set('PACKAGE_VERSION', PROJECT_VERSI
+     PROJECT_VERSION + f' (@SOURCE_OF_INSTALLATION@)',
+ )
+ keactrl_conf_data.set('PACKAGE_VERSION', PROJECT_VERSION)
+-keactrl_conf_data.set('runstatedir', '${prefix}/' + LOCALSTATEDIR + '/run')
++keactrl_conf_data.set('runstatedir', '/' + LOCALSTATEDIR + '/run')
+ keactrl_conf_data.set('localstatedir', '${prefix}/' + LOCALSTATEDIR)
+ 
+ kea_conf_data = configuration_data()
diff --git a/net/kea/files/patch-src_lib_dhcpsrv_Makefile.am b/net/kea/files/patch-src_lib_dhcpsrv_Makefile.am
deleted file mode 100644
index fc2cb111e705..000000000000
--- a/net/kea/files/patch-src_lib_dhcpsrv_Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/lib/dhcpsrv/Makefile.am.orig	2019-10-25 12:41:08 UTC
-+++ src/lib/dhcpsrv/Makefile.am
-@@ -4,7 +4,7 @@ SUBDIRS = . testutils tests benchmarks
- 
- # DATA_DIR is the directory where to put default CSV files and the DHCPv6
- # server ID file (i.e. the file where the server finds its DUID at startup).
--dhcp_data_dir = @localstatedir@/lib/@PACKAGE@
-+dhcp_data_dir = @localstatedir@/db/@PACKAGE@
- kea_lfc_location = @prefix@/sbin/kea-lfc
- 
- AM_CPPFLAGS = -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib -DDHCP_DATA_DIR="\"$(dhcp_data_dir)\""