diff --git a/databases/openvoxdb-terminus8/Makefile b/databases/openvoxdb-terminus8/Makefile
index 98ac666e1081..c149304f2224 100644
--- a/databases/openvoxdb-terminus8/Makefile
+++ b/databases/openvoxdb-terminus8/Makefile
@@ -1,25 +1,23 @@
 PORTNAME=	openvoxdb-terminus
-PORTVERSION=	8.9.1
+PORTVERSION=	8.11.0
 CATEGORIES=	databases ruby
 MASTER_SITES=	https://artifacts.voxpupuli.org/openvoxdb/${PORTVERSION}/
 PKGNAMESUFFIX=	8
 DISTNAME=	openvoxdb-${PORTVERSION}
 
 MAINTAINER=	puppet@FreeBSD.org
 COMMENT=	PuppetDB storeconfigs backend terminus module
 WWW=		https://docs.puppetlabs.com/puppetdb/latest/
 
 LICENSE=	APACHE20
 
 CONFLICTS_INSTALL=	openvoxdb-terminus[0-9] puppetdb-terminus[0-9]
 NO_BUILD=	yes
 USES=		gmake ruby
 WRKSRC=		${WRKDIR}/puppetdb-${PORTVERSION}
 
-post-patch:
-	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|" ${WRKSRC}/Makefile
-
 do-install:
-	@cd ${WRKSRC} && ${SETENV} DESTDIR=${STAGEDIR} ${GMAKE} install-puppetdb-termini
+	${MKDIR} ${STAGEDIR}${RUBY_SITELIBDIR}
+	cd ${WRKSRC} && ${COPYTREE_SHARE} puppet ${STAGEDIR}${RUBY_SITELIBDIR}
 
 .include <bsd.port.mk>
diff --git a/databases/openvoxdb-terminus8/distinfo b/databases/openvoxdb-terminus8/distinfo
index ea7fff96577c..12dbea093b01 100644
--- a/databases/openvoxdb-terminus8/distinfo
+++ b/databases/openvoxdb-terminus8/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1748051408
-SHA256 (openvoxdb-8.9.1.tar.gz) = ac4b2ad8de6b95edb2a53d8c85421cd3aa1daafff3499b986a822b68b4186355
-SIZE (openvoxdb-8.9.1.tar.gz) = 61667810
+TIMESTAMP = 1756944849
+SHA256 (openvoxdb-8.11.0.tar.gz) = 47f83042528b6b66539d48f9e465a9ac5aa1e50c28bad1d40bc9a28b27d566f3
+SIZE (openvoxdb-8.11.0.tar.gz) = 61566323
diff --git a/databases/openvoxdb-terminus8/files/patch-Makefile b/databases/openvoxdb-terminus8/files/patch-Makefile
deleted file mode 100644
index a8f4969db7a4..000000000000
--- a/databases/openvoxdb-terminus8/files/patch-Makefile
+++ /dev/null
@@ -1,61 +0,0 @@
---- Makefile.orig	2025-03-19 21:22:39 UTC
-+++ Makefile
-@@ -1,7 +1,7 @@ confdir = /etc
- prefix = /usr/local
- datadir = $(prefix)/share
- confdir = /etc
--rubylibdir = $(shell ruby -rrbconfig -e "puts RbConfig::CONFIG['sitelibdir']")
-+rubylibdir = $(shell %%PREFIX%%/bin/ruby -rrbconfig -e "puts RbConfig::CONFIG['sitelibdir']")
- rundir = /var/run
- bindir = /usr/bin
- 
-@@ -36,22 +36,33 @@ install-puppetdb-termini:
- 
- 
- install-puppetdb-termini:
--	install -Dm 0644 puppet/util/puppetdb/atom.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/atom.rb"
--	install -Dm 0644 puppet/util/puppetdb/http.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/http.rb"
--	install -Dm 0644 puppet/util/puppetdb/char_encoding.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/char_encoding.rb"
--	install -Dm 0644 puppet/util/puppetdb/command_names.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/command_names.rb"
--	install -Dm 0644 puppet/util/puppetdb/config.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/config.rb"
--	install -Dm 0644 puppet/util/puppetdb/command.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/command.rb"
--	install -Dm 0644 puppet/util/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb.rb"
--	install -Dm 0644 puppet/face/node/status.rb "$(DESTDIR)$(rubylibdir)/puppet/face/node/status.rb"
--	install -Dm 0644 puppet/face/node/deactivate.rb "$(DESTDIR)$(rubylibdir)/puppet/face/node/deactivate.rb"
--	install -Dm 0644 puppet/indirector/catalog/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/catalog/puppetdb.rb"
--	install -Dm 0644 puppet/indirector/node/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/node/puppetdb.rb"
--	install -Dm 0644 puppet/indirector/resource/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/resource/puppetdb.rb"
--	install -Dm 0644 puppet/indirector/facts/puppetdb_apply.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/facts/puppetdb_apply.rb"
--	install -Dm 0644 puppet/indirector/facts/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/facts/puppetdb.rb"
--	install -Dm 0644 puppet/functions/puppetdb_query.rb "$(DESTDIR)$(rubylibdir)/puppet/functions/puppetdb_query.rb"
--	install -Dm 0644 puppet/reports/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/reports/puppetdb.rb"
-+	install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/face"
-+	install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/face/node"
-+	install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/functions"
-+	install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/indirector"
-+	install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/indirector/catalog"
-+	install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/indirector/facts"
-+	install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/indirector/node"
-+	install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/indirector/resource"
-+	install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/reports"
-+	install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/util"
-+	install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb"
-+	install -m 0644 puppet/util/puppetdb/atom.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/atom.rb"
-+	install -m 0644 puppet/util/puppetdb/http.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/http.rb"
-+	install -m 0644 puppet/util/puppetdb/char_encoding.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/char_encoding.rb"
-+	install -m 0644 puppet/util/puppetdb/command_names.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/command_names.rb"
-+	install -m 0644 puppet/util/puppetdb/config.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/config.rb"
-+	install -m 0644 puppet/util/puppetdb/command.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/command.rb"
-+	install -m 0644 puppet/util/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb.rb"
-+	install -m 0644 puppet/face/node/status.rb "$(DESTDIR)$(rubylibdir)/puppet/face/node/status.rb"
-+	install -m 0644 puppet/face/node/deactivate.rb "$(DESTDIR)$(rubylibdir)/puppet/face/node/deactivate.rb"
-+	install -m 0644 puppet/indirector/catalog/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/catalog/puppetdb.rb"
-+	install -m 0644 puppet/indirector/node/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/node/puppetdb.rb"
-+	install -m 0644 puppet/indirector/resource/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/resource/puppetdb.rb"
-+	install -m 0644 puppet/indirector/facts/puppetdb_apply.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/facts/puppetdb_apply.rb"
-+	install -m 0644 puppet/indirector/facts/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/facts/puppetdb.rb"
-+	install -m 0644 puppet/functions/puppetdb_query.rb "$(DESTDIR)$(rubylibdir)/puppet/functions/puppetdb_query.rb"
-+	install -m 0644 puppet/reports/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/reports/puppetdb.rb"
- 
- install-rpm-sysv-init: install-rpm-preinst
- 	install -d -m 0755 "$(DESTDIR)$(initdir)"
diff --git a/databases/openvoxdb-terminus8/pkg-plist b/databases/openvoxdb-terminus8/pkg-plist
index a12b86eb6a1a..518271a192fa 100644
--- a/databases/openvoxdb-terminus8/pkg-plist
+++ b/databases/openvoxdb-terminus8/pkg-plist
@@ -1,17 +1,16 @@
 %%RUBY_SITELIBDIR%%/puppet/face/node/deactivate.rb
 %%RUBY_SITELIBDIR%%/puppet/face/node/status.rb
 %%RUBY_SITELIBDIR%%/puppet/functions/puppetdb_query.rb
 %%RUBY_SITELIBDIR%%/puppet/indirector/catalog/puppetdb.rb
 %%RUBY_SITELIBDIR%%/puppet/indirector/facts/puppetdb.rb
 %%RUBY_SITELIBDIR%%/puppet/indirector/facts/puppetdb_apply.rb
 %%RUBY_SITELIBDIR%%/puppet/indirector/node/puppetdb.rb
 %%RUBY_SITELIBDIR%%/puppet/indirector/resource/puppetdb.rb
 %%RUBY_SITELIBDIR%%/puppet/reports/puppetdb.rb
 %%RUBY_SITELIBDIR%%/puppet/util/puppetdb.rb
 %%RUBY_SITELIBDIR%%/puppet/util/puppetdb/atom.rb
 %%RUBY_SITELIBDIR%%/puppet/util/puppetdb/char_encoding.rb
 %%RUBY_SITELIBDIR%%/puppet/util/puppetdb/command.rb
 %%RUBY_SITELIBDIR%%/puppet/util/puppetdb/command_names.rb
 %%RUBY_SITELIBDIR%%/puppet/util/puppetdb/config.rb
 %%RUBY_SITELIBDIR%%/puppet/util/puppetdb/http.rb
-
diff --git a/databases/openvoxdb8/Makefile b/databases/openvoxdb8/Makefile
index 44305c7a51b6..5603107342ee 100644
--- a/databases/openvoxdb8/Makefile
+++ b/databases/openvoxdb8/Makefile
@@ -1,57 +1,59 @@
 PORTNAME=	openvoxdb
-PORTVERSION=	8.9.1
+PORTVERSION=	8.11.0
 CATEGORIES=	databases java
 MASTER_SITES=	https://artifacts.voxpupuli.org/${PORTNAME}/${PORTVERSION}/
 PKGNAMESUFFIX=	8
 
 MAINTAINER=	puppet@FreeBSD.org
 COMMENT=	PuppetDB storeconfigs backend
 WWW=		https://docs.puppetlabs.com/puppetdb/latest/
 
 LICENSE=	APACHE20
 
 RUN_DEPENDS=	bash:shells/bash
 
 USE_RC_SUBR=	puppetdb
 
 CONFLICTS_INSTALL=	openvoxdb[0-9] puppetdb[0-9] # etc/puppetdb/bootstrap.cfg.sample
 USES=		cpe java shebangfix
 CPE_VENDOR=	puppet
 SHEBANG_FILES=	ext/bin/puppetdb \
 		ext/cli/anonymize \
 		ext/cli/config-migration \
 		ext/cli/foreground \
 		ext/cli/ssl-setup \
-		ext/cli/start \
-		ext/cli/stop \
-		ext/cli/reload \
-		ext/cli/upgrade \
-		ext/ezbake-functions.sh
+		ext/cli/upgrade
 JAVA_VERSION=	11+
 NO_ARCH=	yes
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/puppetdb-${PORTVERSION}
 
 USERS=		puppetdb
 GROUPS=		puppetdb
 
 SUB_LIST=	JAVA_HOME=${JAVA_HOME}
 SUB_FILES=	pkg-message
 
 DATADIR=	${PREFIX}/share/puppetdb
 ETCDIR=		${PREFIX}/etc/puppetdb
 
 post-patch:
-.for file in Makefile ext/bin/puppetdb ext/cli/ssl-setup \
+.for file in ext/bin/puppetdb ext/cli/ssl-setup \
 	ext/config/conf.d/jetty.ini ext/config/conf.d/config.ini
 	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|" ${WRKSRC}/${file}
 .endfor
 	@${REINPLACE_CMD} -e "s|%%DATADIR%%|${DATADIR}|" ${WRKSRC}/ext/bin/puppetdb
-	@${REINPLACE_CMD} -e 's|/puppetlabs/puppetdb/|/puppetdb/|' \
-		-e 's|\(install -m 0644 ext/config/.*\)"|\1.sample"|' \
-		${WRKSRC}/Makefile
+	${FIND} ${WRKSRC}/ext/cli ${WRKSRC}/ext/config \( -name \*.bak -o -name \*.orig \) -delete
+	${FIND} ${WRKSRC}/ext/config -type f -print0 | ${XARGS} -0 -I {} ${MV} {} {}.sample
 
 do-install:
-	@cd ${WRKSRC} && ${SETENV} DESTDIR=${STAGEDIR} make install-puppetdb
+	${INSTALL_SCRIPT} ${WRKSRC}/ext/bin/puppetdb ${STAGEDIR}${PREFIX}/bin
+	${MKDIR} ${STAGEDIR}${ETCDIR}
+	cd ${WRKSRC}/ext/config && ${COPYTREE_SHARE} \* ${STAGEDIR}${ETCDIR}
+	${MKDIR} ${STAGEDIR}${DATADIR}/cli/apps
+	cd ${WRKSRC} && ${COPYTREE_SHARE} puppetdb.jar ${STAGEDIR}${DATADIR}
+.for file in ext/cli/anonymize ext/cli/config-migration ext/cli/delete-reports ext/cli/foreground ext/cli/ssl-setup ext/cli/upgrade
+	${INSTALL_SCRIPT} ${WRKSRC}/${file} ${STAGEDIR}${DATADIR}/cli/apps
+.endfor
 
 .include <bsd.port.mk>
diff --git a/databases/openvoxdb8/distinfo b/databases/openvoxdb8/distinfo
index 0a39ca95e129..e56c05f546c6 100644
--- a/databases/openvoxdb8/distinfo
+++ b/databases/openvoxdb8/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1748051253
-SHA256 (openvoxdb-8.9.1.tar.gz) = ac4b2ad8de6b95edb2a53d8c85421cd3aa1daafff3499b986a822b68b4186355
-SIZE (openvoxdb-8.9.1.tar.gz) = 61667810
+TIMESTAMP = 1756944780
+SHA256 (openvoxdb-8.11.0.tar.gz) = 47f83042528b6b66539d48f9e465a9ac5aa1e50c28bad1d40bc9a28b27d566f3
+SIZE (openvoxdb-8.11.0.tar.gz) = 61566323
diff --git a/databases/openvoxdb8/files/patch-Makefile b/databases/openvoxdb8/files/patch-Makefile
deleted file mode 100644
index 0bdb0aa87c7f..000000000000
--- a/databases/openvoxdb8/files/patch-Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
---- Makefile.orig	2024-06-10 16:24:36 UTC
-+++ Makefile
-@@ -1,9 +1,9 @@
--prefix = /usr/local
-+prefix = %%PREFIX%%
- datadir = $(prefix)/share
--confdir = /etc
-+confdir = %%PREFIX%%/etc
- rubylibdir = $(shell ruby -rrbconfig -e "puts RbConfig::CONFIG['sitelibdir']")
- rundir = /var/run
--bindir = /usr/bin
-+bindir = %%PREFIX%%/bin
- 
- install-puppetdb:
- 	install -d -m 0755 "$(DESTDIR)$(datadir)/puppetdb"
diff --git a/databases/openvoxdb8/files/patch-ext_bin_puppetdb b/databases/openvoxdb8/files/patch-ext_bin_puppetdb
index 0a139b110d2e..cb29a348fc9d 100644
--- a/databases/openvoxdb8/files/patch-ext_bin_puppetdb
+++ b/databases/openvoxdb8/files/patch-ext_bin_puppetdb
@@ -1,15 +1,15 @@
---- ext/bin/puppetdb.orig	2016-03-17 04:17:10 UTC
+--- ext/bin/puppetdb.orig	2025-08-08 17:49:06 UTC
 +++ ext/bin/puppetdb
-@@ -5,6 +5,12 @@ if [ -r "/etc/default/puppetdb" ] ; then
+@@ -8,6 +8,12 @@ elif [ -r "/etc/sysconfig/puppetdb" ] ; then
      . /etc/default/puppetdb
  elif [ -r "/etc/sysconfig/puppetdb" ] ; then
      . /etc/sysconfig/puppetdb
 +elif [ `uname` == "FreeBSD" ] ; then
 +    CONFIG="%%PREFIX%%/etc/puppetdb/conf.d"
 +    INSTALL_DIR="%%DATADIR%%"
 +    JAVA_BIN="%%PREFIX%%/bin/java"
 +    JAVA_ARGS="-Xmx192m"
 +    USER="puppet"
  elif [ `uname` == "OpenBSD" ] ; then
      JAVA_BIN=$(javaPathHelper -c puppetdb)
-     JAVA_ARGS="-Xmx192m"
+     JAVA_ARGS="-Xmx192m -Djdk.tls.ephemeralDHKeySize=2048"
diff --git a/databases/openvoxdb8/files/patch-ext_cli_ssl-setup b/databases/openvoxdb8/files/patch-ext_cli_ssl-setup
index ab86d849142d..bfed8fb8f9fa 100644
--- a/databases/openvoxdb8/files/patch-ext_cli_ssl-setup
+++ b/databases/openvoxdb8/files/patch-ext_cli_ssl-setup
@@ -1,11 +1,11 @@
---- ext/cli/ssl-setup.orig	2016-03-17 04:17:10 UTC
+--- ext/cli/ssl-setup.orig	2025-08-08 17:49:06 UTC
 +++ ext/cli/ssl-setup
-@@ -230,7 +230,7 @@ else
+@@ -243,7 +243,7 @@ else
    user=puppetdb
    group=puppetdb
  
 -  puppetdb_confdir="/etc/puppetlabs/puppetdb"
 +  puppetdb_confdir="%%PREFIX%%/etc/puppetdb"
  fi
  
  set -e
diff --git a/databases/openvoxdb8/pkg-plist b/databases/openvoxdb8/pkg-plist
index 91c4e1df6246..9b67faf053ec 100644
--- a/databases/openvoxdb8/pkg-plist
+++ b/databases/openvoxdb8/pkg-plist
@@ -1,23 +1,18 @@
 bin/puppetdb
 %%DATADIR%%/cli/apps/anonymize
 %%DATADIR%%/cli/apps/config-migration
 %%DATADIR%%/cli/apps/delete-reports
 %%DATADIR%%/cli/apps/foreground
 %%DATADIR%%/cli/apps/ssl-setup
-%%DATADIR%%/cli/apps/start
-%%DATADIR%%/cli/apps/stop
-%%DATADIR%%/cli/apps/reload
 %%DATADIR%%/cli/apps/upgrade
-%%DATADIR%%/ezbake-functions.sh
-%%DATADIR%%/ezbake.manifest
 %%DATADIR%%/puppetdb.jar
 @group puppetdb
 @sample etc/puppetdb/bootstrap.cfg.sample
 @sample etc/puppetdb/conf.d/auth.conf.sample
 @sample etc/puppetdb/conf.d/config.ini.sample
 @sample etc/puppetdb/conf.d/database.ini.sample
 @sample etc/puppetdb/conf.d/jetty.ini.sample
 @sample etc/puppetdb/conf.d/repl.ini.sample
 @sample etc/puppetdb/logback.xml.sample
 @sample etc/puppetdb/request-logging.xml.sample
 @group