diff options
Diffstat (limited to 'net/kea-devel')
| -rw-r--r-- | net/kea-devel/Makefile | 6 | ||||
| -rw-r--r-- | net/kea-devel/files/patch-meson.build | 17 | ||||
| -rw-r--r-- | net/kea-devel/files/patch-src_bin_keactrl_keactrl.in | 11 | ||||
| -rw-r--r-- | net/kea-devel/pkg-plist | 2 |
4 files changed, 28 insertions, 8 deletions
diff --git a/net/kea-devel/Makefile b/net/kea-devel/Makefile index 3c98f7fe5bb7..11a7e2022050 100644 --- a/net/kea-devel/Makefile +++ b/net/kea-devel/Makefile @@ -1,5 +1,6 @@ PORTNAME= kea DISTVERSION= 3.0.0 +PORTREVISION= 2 CATEGORIES= net MASTER_SITES= ISC/kea/cur/3.0 PKGNAMESUFFIX= -devel @@ -37,7 +38,8 @@ OPTIONS_DEFINE= DOCS MYSQL PGSQL OPTIONS_SUB= yes MESON_ARGS= --auto-features=disabled \ - -Dnetconf=disabled + -Dnetconf=disabled \ + -Drunstatedir=/var/run MYSQL_USES= mysql MYSQL_MESON_ENABLED= mysql @@ -56,7 +58,7 @@ post-build: post-install: @mkdir -p ${STAGEDIR}${PREFIX}/etc/kea ${STAGEDIR}/var/db/kea \ - ${STAGEDIR}/var/lib/kea ${STAGEDIR}/var/run/kea + ${STAGEDIR}/var/log/kea ${STAGEDIR}/var/run/kea @rm -rf ${STAGEDIR}${PREFIX}/var @cd ${WRKSRC}/doc/sphinx/man; \ cp *.8 ${STAGEDIR}${PREFIX}/share/man/man8 diff --git a/net/kea-devel/files/patch-meson.build b/net/kea-devel/files/patch-meson.build index 3bd6a82abfe7..58f40526b835 100644 --- a/net/kea-devel/files/patch-meson.build +++ b/net/kea-devel/files/patch-meson.build @@ -1,5 +1,5 @@ --- meson.build.orig 2025-06-20 09:28:47.000000000 -0700 -+++ meson.build 2025-07-09 22:46:20.088250000 -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. @@ -9,7 +9,7 @@ endif DATABASE_SCRIPTS_DIR = TOP_BUILD_DIR / 'src/share/database/scripts' -@@ -69,10 +69,10 @@ +@@ -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,6 +22,15 @@ 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 @@ # So we revert what it does. if PREFIX == '/usr/local' @@ -31,7 +40,7 @@ - SHAREDSTATEDIR_INSTALLED = '/usr/local/var/lib/kea' + LOGDIR_INSTALLED = '/var/log/kea' + RUNSTATEDIR_INSTALLED = '/var/run/kea' -+ SHAREDSTATEDIR_INSTALLED = '/var/lib/kea' ++ SHAREDSTATEDIR_INSTALLED = '/var/db/kea' endif #### Build Options @@ -42,7 +51,7 @@ - install_emptydir('/usr/local/var/lib/kea') - install_emptydir('/usr/local/var/log/kea') - install_emptydir('/usr/local/var/run/kea') -+ install_emptydir('/var/lib/kea') ++ install_emptydir('/var/db/kea') + install_emptydir('/var/log/kea') + install_emptydir('/var/run/kea') endif diff --git a/net/kea-devel/files/patch-src_bin_keactrl_keactrl.in b/net/kea-devel/files/patch-src_bin_keactrl_keactrl.in new file mode 100644 index 000000000000..567f27298889 --- /dev/null +++ b/net/kea-devel/files/patch-src_bin_keactrl_keactrl.in @@ -0,0 +1,11 @@ +--- src/bin/keactrl/keactrl.in.orig 2025-06-20 09:28:47.000000000 -0700 ++++ src/bin/keactrl/keactrl.in 2025-07-10 07:23:07.452981000 -0700 +@@ -127,7 +127,7 @@ + + # Default the directory to --localstatedir / run + local pid_file_dir +- pid_file_dir="@runstatedir@/@PACKAGE@" ++ pid_file_dir="/var/run/kea" + + # Use directory override if set (primarily for testing only) + if test -n "${KEA_PIDFILE_DIR+x}"; then diff --git a/net/kea-devel/pkg-plist b/net/kea-devel/pkg-plist index 27de1e821680..dbe5a05bf069 100644 --- a/net/kea-devel/pkg-plist +++ b/net/kea-devel/pkg-plist @@ -860,8 +860,6 @@ share/man/man8/kea-shell.8.gz share/man/man8/keactrl.8.gz share/man/man8/perfdhcp.8.gz @dir(,,0750) %%ETCDIR%% -@dir(,,0755) /var/lib @dir(,,0750) /var/db/kea -@dir(,,0750) /var/lib/kea @dir(,,0750) /var/log/kea @dir(,,0750) /var/run/kea |