diff options
Diffstat (limited to 'net/kea-devel/files')
-rw-r--r-- | net/kea-devel/files/patch-Makefile.am | 10 | ||||
-rw-r--r-- | net/kea-devel/files/patch-meson.build | 37 | ||||
-rw-r--r-- | net/kea-devel/files/patch-src_bin_keactrl_Makefile.am | 11 | ||||
-rw-r--r-- | net/kea-devel/files/patch-src_lib_dhcpsrv_Makefile.am | 11 |
4 files changed, 37 insertions, 32 deletions
diff --git a/net/kea-devel/files/patch-Makefile.am b/net/kea-devel/files/patch-Makefile.am deleted file mode 100644 index 77fc64848c9e..000000000000 --- a/net/kea-devel/files/patch-Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ ---- Makefile.am.orig 2019-10-25 12:41:08 UTC -+++ Makefile.am -@@ -154,7 +154,6 @@ docs: - # These steps are necessary during installation - install-exec-hook: - mkdir -p $(DESTDIR)${localstatedir}/log/ -- mkdir -p $(DESTDIR)${localstatedir}/lib/${PACKAGE_NAME} - mkdir -p $(DESTDIR)${runstatedir}/${PACKAGE_NAME} - - EXTRA_DIST = tools/path_replacer.sh diff --git a/net/kea-devel/files/patch-meson.build b/net/kea-devel/files/patch-meson.build new file mode 100644 index 000000000000..ec2e626fdfc9 --- /dev/null +++ b/net/kea-devel/files/patch-meson.build @@ -0,0 +1,37 @@ +--- meson.build.orig 2025-06-20 09:28:47.000000000 -0700 ++++ meson.build 2025-07-09 21:04:32.714884000 -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' +- 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,10 +69,10 @@ + 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 +@@ -88,9 +88,9 @@ + # 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/lib/kea' + endif + + #### Build Options diff --git a/net/kea-devel/files/patch-src_bin_keactrl_Makefile.am b/net/kea-devel/files/patch-src_bin_keactrl_Makefile.am deleted file mode 100644 index 385488664470..000000000000 --- a/net/kea-devel/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-devel/files/patch-src_lib_dhcpsrv_Makefile.am b/net/kea-devel/files/patch-src_lib_dhcpsrv_Makefile.am deleted file mode 100644 index 3d0097012047..000000000000 --- a/net/kea-devel/files/patch-src_lib_dhcpsrv_Makefile.am +++ /dev/null @@ -1,11 +0,0 @@ ---- src/lib/dhcpsrv/Makefile.am.orig 2025-02-13 19:42:07.986412000 -0800 -+++ src/lib/dhcpsrv/Makefile.am 2025-02-13 19:44:15.141071000 -0800 -@@ -4,7 +4,7 @@ - - # 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 = @sbindir@/kea-lfc - - AM_CPPFLAGS = -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib |