diff --git a/databases/puppetdb-terminus7/Makefile b/databases/puppetdb-terminus7/Makefile
index 6b0a64564baf7..59bf8c70aaded 100644
--- a/databases/puppetdb-terminus7/Makefile
+++ b/databases/puppetdb-terminus7/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	puppetdb-terminus
-PORTVERSION=	7.12.1
+PORTVERSION=	7.13.0
 CATEGORIES=	databases ruby
 MASTER_SITES=	https://downloads.puppetlabs.com/puppetdb/
 PKGNAMESUFFIX=	7
diff --git a/databases/puppetdb-terminus7/distinfo b/databases/puppetdb-terminus7/distinfo
index a1ef9a72a5792..6d1e58234b205 100644
--- a/databases/puppetdb-terminus7/distinfo
+++ b/databases/puppetdb-terminus7/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1676086550
-SHA256 (puppetdb-7.12.1.tar.gz) = 7512c61c46f51064346b2c7da216e0b6425e15140e68cf60bffca878d3cb7f22
-SIZE (puppetdb-7.12.1.tar.gz) = 49891988
+TIMESTAMP = 1680852885
+SHA256 (puppetdb-7.13.0.tar.gz) = 8984d0193911312ec719eba2ad70676036f1dad5dada0566e064512d4080c846
+SIZE (puppetdb-7.13.0.tar.gz) = 49917440
diff --git a/databases/puppetdb-terminus7/files/patch-Makefile b/databases/puppetdb-terminus7/files/patch-Makefile
index 4bee241c89f43..5417b760be4fe 100644
--- a/databases/puppetdb-terminus7/files/patch-Makefile
+++ b/databases/puppetdb-terminus7/files/patch-Makefile
@@ -1,4 +1,4 @@
---- Makefile.orig	2022-08-01 22:32:32 UTC
+--- Makefile.orig	2023-04-04 16:01:28 UTC
 +++ Makefile
 @@ -1,7 +1,7 @@
  prefix = /usr/local
@@ -9,26 +9,26 @@
  rundir = /var/run
  bindir = /usr/bin
  
-@@ -36,22 +36,30 @@ install-puppetdb:
+@@ -36,22 +36,31 @@ install-puppetdb:
  
  
  install-puppetdb-termini:
 -	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 -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/resource/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/resource/puppetdb.rb"
 -	install -Dm 0644 puppet/indirector/facts/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/facts/puppetdb.rb"
 -	install -Dm 0644 puppet/indirector/facts/puppetdb_apply.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/facts/puppetdb_apply.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/util/puppetdb/char_encoding.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/char_encoding.rb"
+-	install -Dm 0644 puppet/util/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb.rb"
+-	install -Dm 0644 puppet/util/puppetdb/command.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/command.rb"
+-	install -Dm 0644 puppet/util/puppetdb/atom.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/atom.rb"
 -	install -Dm 0644 puppet/util/puppetdb/command_names.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/command_names.rb"
--	install -Dm 0644 puppet/util/puppetdb/http.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/http.rb"
 -	install -Dm 0644 puppet/util/puppetdb/config.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/config.rb"
--	install -Dm 0644 puppet/util/puppetdb/atom.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/atom.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/util/puppetdb/char_encoding.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/char_encoding.rb"
+-	install -Dm 0644 puppet/util/puppetdb/http.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/http.rb"
+-	install -Dm 0644 puppet/reports/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/reports/puppetdb.rb"
 +	install -d -m 755 "$(DESTDIR)$(rubylibdir)/puppet/face/node"
 +	install -d -m 755 "$(DESTDIR)$(rubylibdir)/puppet/functions"
 +	install -d -m 755 "$(DESTDIR)$(rubylibdir)/puppet/indirector/catalog"
@@ -36,23 +36,24 @@
 +	install -d -m 755 "$(DESTDIR)$(rubylibdir)/puppet/indirector/node"
 +	install -d -m 755 "$(DESTDIR)$(rubylibdir)/puppet/indirector/resource"
 +	install -d -m 755 "$(DESTDIR)$(rubylibdir)/puppet/reports"
++	install -d -m 755 "$(DESTDIR)$(rubylibdir)/puppet/util"
 +	install -d -m 755 "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb"
 +	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 -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/resource/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/resource/puppetdb.rb"
 +	install -m 0644 puppet/indirector/facts/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/facts/puppetdb.rb"
 +	install -m 0644 puppet/indirector/facts/puppetdb_apply.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/facts/puppetdb_apply.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/util/puppetdb/char_encoding.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/char_encoding.rb"
++	install -m 0644 puppet/util/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb.rb"
++	install -m 0644 puppet/util/puppetdb/command.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/command.rb"
++	install -m 0644 puppet/util/puppetdb/atom.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/atom.rb"
 +	install -m 0644 puppet/util/puppetdb/command_names.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/command_names.rb"
-+	install -m 0644 puppet/util/puppetdb/http.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/http.rb"
 +	install -m 0644 puppet/util/puppetdb/config.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/config.rb"
-+	install -m 0644 puppet/util/puppetdb/atom.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/atom.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/util/puppetdb/char_encoding.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/char_encoding.rb"
++	install -m 0644 puppet/util/puppetdb/http.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/http.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/puppetdb7/Makefile b/databases/puppetdb7/Makefile
index f281d73866bdc..b939564555d81 100644
--- a/databases/puppetdb7/Makefile
+++ b/databases/puppetdb7/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	puppetdb
-PORTVERSION=	7.12.1
+PORTVERSION=	7.13.0
 CATEGORIES=	databases java
 MASTER_SITES=	https://downloads.puppetlabs.com/puppetdb/
 PKGNAMESUFFIX=	7
diff --git a/databases/puppetdb7/distinfo b/databases/puppetdb7/distinfo
index d6bdd51916036..b0611d6224ac3 100644
--- a/databases/puppetdb7/distinfo
+++ b/databases/puppetdb7/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1676086496
-SHA256 (puppetdb-7.12.1.tar.gz) = 7512c61c46f51064346b2c7da216e0b6425e15140e68cf60bffca878d3cb7f22
-SIZE (puppetdb-7.12.1.tar.gz) = 49891988
+TIMESTAMP = 1680852863
+SHA256 (puppetdb-7.13.0.tar.gz) = 8984d0193911312ec719eba2ad70676036f1dad5dada0566e064512d4080c846
+SIZE (puppetdb-7.13.0.tar.gz) = 49917440
diff --git a/databases/puppetdb7/files/patch-Makefile b/databases/puppetdb7/files/patch-Makefile
index 035ffaad9dc1f..f91d176cfc788 100644
--- a/databases/puppetdb7/files/patch-Makefile
+++ b/databases/puppetdb7/files/patch-Makefile
@@ -1,4 +1,4 @@
---- Makefile.orig	2022-08-01 22:32:32 UTC
+--- Makefile.orig	2023-04-04 16:01:28 UTC
 +++ Makefile
 @@ -1,24 +1,24 @@
 -prefix = /usr/local
@@ -18,19 +18,19 @@
  	install -m 0644 ext/ezbake.manifest "$(DESTDIR)$(datadir)/puppetdb"
 -	install -d -m 0755 "$(DESTDIR)$(confdir)/puppetlabs/puppetdb/conf.d"
 -	install -m 0644 ext/config/conf.d/database.ini "$(DESTDIR)$(confdir)/puppetlabs/puppetdb/conf.d/database.ini"
--	install -m 0644 ext/config/conf.d/jetty.ini "$(DESTDIR)$(confdir)/puppetlabs/puppetdb/conf.d/jetty.ini"
 -	install -m 0644 ext/config/conf.d/auth.conf "$(DESTDIR)$(confdir)/puppetlabs/puppetdb/conf.d/auth.conf"
--	install -m 0644 ext/config/conf.d/repl.ini "$(DESTDIR)$(confdir)/puppetlabs/puppetdb/conf.d/repl.ini"
 -	install -m 0644 ext/config/conf.d/config.ini "$(DESTDIR)$(confdir)/puppetlabs/puppetdb/conf.d/config.ini"
+-	install -m 0644 ext/config/conf.d/repl.ini "$(DESTDIR)$(confdir)/puppetlabs/puppetdb/conf.d/repl.ini"
+-	install -m 0644 ext/config/conf.d/jetty.ini "$(DESTDIR)$(confdir)/puppetlabs/puppetdb/conf.d/jetty.ini"
 -	install -m 0644 ext/config/bootstrap.cfg "$(DESTDIR)$(confdir)/puppetlabs/puppetdb/bootstrap.cfg"
 -	install -m 0644 ext/config/logback.xml "$(DESTDIR)$(confdir)/puppetlabs/puppetdb/logback.xml"
 -	install -m 0644 ext/config/request-logging.xml "$(DESTDIR)$(confdir)/puppetlabs/puppetdb/request-logging.xml"
 +	install -d -m 0755 "$(DESTDIR)$(confdir)/puppetdb/conf.d"
 +	install -m 0644 ext/config/conf.d/database.ini "$(DESTDIR)$(confdir)/puppetdb/conf.d/database.ini.sample"
-+	install -m 0644 ext/config/conf.d/jetty.ini "$(DESTDIR)$(confdir)/puppetdb/conf.d/jetty.ini.sample"
 +	install -m 0644 ext/config/conf.d/auth.conf "$(DESTDIR)$(confdir)/puppetdb/conf.d/auth.conf.sample"
-+	install -m 0644 ext/config/conf.d/repl.ini "$(DESTDIR)$(confdir)/puppetdb/conf.d/repl.ini.sample"
 +	install -m 0644 ext/config/conf.d/config.ini "$(DESTDIR)$(confdir)/puppetdb/conf.d/config.ini.sample"
++	install -m 0644 ext/config/conf.d/repl.ini "$(DESTDIR)$(confdir)/puppetdb/conf.d/repl.ini.sample"
++	install -m 0644 ext/config/conf.d/jetty.ini "$(DESTDIR)$(confdir)/puppetdb/conf.d/jetty.ini.sample"
 +	install -m 0644 ext/config/bootstrap.cfg "$(DESTDIR)$(confdir)/puppetdb/bootstrap.cfg.sample"
 +	install -m 0644 ext/config/logback.xml "$(DESTDIR)$(confdir)/puppetdb/logback.xml.sample"
 +	install -m 0644 ext/config/request-logging.xml "$(DESTDIR)$(confdir)/puppetdb/request-logging.xml.sample"