diff --git a/net/kea/Makefile b/net/kea/Makefile index a937964fc4ab..a70dcc3cf3e7 100644 --- a/net/kea/Makefile +++ b/net/kea/Makefile @@ -1,66 +1,67 @@ PORTNAME= kea DISTVERSION= 3.0.1 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= ISC/kea/${DISTVERSION} MAINTAINER= apevnev@me.com COMMENT= Alternative DHCP implementation by ISC WWW= https://kea.isc.org/ LICENSE= MPL20 LICENSE_FILE= ${WRKSRC}/COPYING -LIB_DEPENDS= libboost_system.so:devel/boost-libs \ +LIB_DEPENDS= libboost_date_time.so:devel/boost-libs \ liblog4cplus.so:devel/log4cplus USES= compiler:c++11-lang cpe iconv libtool pathfix ssl python tar:xz meson pkgconfig cmake:indirect shebangfix MESON_ARGS= --auto-features=disabled \ -Dcrypto=openssl \ -Dnetconf=disabled BUILD_DEPENDS= googletest>0:devel/googletest \ rst2man:textproc/py-docutils@${PY_FLAVOR} CPE_VENDOR= isc CPE_VERSION= ${DISTVERSION:C/-.*//} .if ${DISTVERSION:M*-*} CPE_UPDATE= ${DISTVERSION:C/.*-//:tl} .endif USE_LDCONFIG= yes USE_RC_SUBR= ${PORTNAME} PORTDOCS= AUTHORS CONTRIBUTING.md COPYING ChangeLog README SECURITY.md \ code_of_conduct.md examples platforms.rst SHEBANG_GLOB= *.py *.in python_OLD_CMD+=@PYTHON@ OPTIONS_DEFINE= DOCS MYSQL PGSQL OPTIONS_SUB= yes MYSQL_USES= mysql MYSQL_MESON_ENABLED= mysql MYSQL_SUB_LIST= REQ_MYSQL=mysql MYSQL_SUB_LIST_OFF= REQ_MYSQL="" PGSQL_USES= pgsql PGSQL_MESON_ENABLED= postgresql PGSQL_SUB_LIST= REQ_PGSQL=postgresql PGSQL_SUB_LIST_OFF= REQ_PGSQL="" PGSQL_VARS= WANT_PGSQL=client post-build: cd ${WRKSRC}/doc/sphinx/man; \ for i in *.8.rst; do rst2man $$i > $$(basename $$i .rst); done post-install: @${MKDIR} ${STAGEDIR}${PREFIX}/etc/kea ${STAGEDIR}/var/db/kea \ ${STAGEDIR}/var/run/kea @${RM} -rf ${STAGEDIR}${PREFIX}/var @cd ${WRKSRC}/doc/sphinx/man; \ ${CP} *.8 ${STAGEDIR}${PREFIX}/share/man/man8 @cd ${WRKSRC}/_build/src/bin/keactrl; \ for i in *.conf; do ${CP} $$i ${STAGEDIR}${PREFIX}/etc/kea/$$i.sample; done .include diff --git a/net/kea/files/patch-meson.build b/net/kea/files/patch-meson.build index f444e3bcdafe..d630616d50fb 100644 --- a/net/kea/files/patch-meson.build +++ b/net/kea/files/patch-meson.build @@ -1,59 +1,68 @@ ---- meson.build.orig 2025-06-20 16:28:47 UTC +--- meson.build.orig 2025-08-20 08:14:44 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' +@@ -189,7 +189,7 @@ message(f'Detected system "@SYSTEM@".') + + #### Dependencies + +-boost_dep = dependency('boost', version: '>=1.66', modules: ['system']) ++boost_dep = dependency('boost', version: '>=1.69') + dl_dep = dependency('dl') + threads_dep = dependency('threads') + add_project_dependencies(boost_dep, dl_dep, threads_dep, language: ['cpp']) +@@ -1127,9 +1127,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_lib_asiodns_io__fetch.h b/net/kea/files/patch-src_lib_asiodns_io__fetch.h new file mode 100644 index 000000000000..fb9d73b8c564 --- /dev/null +++ b/net/kea/files/patch-src_lib_asiodns_io__fetch.h @@ -0,0 +1,10 @@ +--- src/lib/asiodns/io_fetch.h.orig 2025-08-20 08:14:44 UTC ++++ src/lib/asiodns/io_fetch.h +@@ -16,6 +16,7 @@ + #include + + #include ++#include + #include + #include + #include diff --git a/net/kea/files/patch-src_lib_asiolink_interval__timer.h b/net/kea/files/patch-src_lib_asiolink_interval__timer.h new file mode 100644 index 000000000000..433c6df0e7f0 --- /dev/null +++ b/net/kea/files/patch-src_lib_asiolink_interval__timer.h @@ -0,0 +1,10 @@ +--- src/lib/asiolink/interval_timer.h.orig 2025-08-20 08:14:44 UTC ++++ src/lib/asiolink/interval_timer.h +@@ -7,6 +7,7 @@ + #ifndef ASIOLINK_INTERVAL_TIMER_H + #define ASIOLINK_INTERVAL_TIMER_H 1 + ++#include + #include + #include +