diff --git a/databases/rubygem-pg_query/Makefile b/databases/rubygem-pg_query/Makefile
index 122fcfa0d18bb..de678f8249e63 100644
--- a/databases/rubygem-pg_query/Makefile
+++ b/databases/rubygem-pg_query/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	pg_query
-PORTVERSION=	2.2.1
+PORTVERSION=	4.2.1
 CATEGORIES=	databases rubygems
 MASTER_SITES=	RG
 
@@ -11,7 +11,7 @@ LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	rubygem-pathname>0:devel/rubygem-pathname
-RUN_DEPENDS=	rubygem-google-protobuf>=3.19.2:devel/rubygem-google-protobuf
+RUN_DEPENDS=	rubygem-google-protobuf>=3.22.3:devel/rubygem-google-protobuf
 
 USES=		gem
 
diff --git a/databases/rubygem-pg_query/distinfo b/databases/rubygem-pg_query/distinfo
index 1eaf56556c908..2eda39dc429d2 100644
--- a/databases/rubygem-pg_query/distinfo
+++ b/databases/rubygem-pg_query/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1676991927
-SHA256 (rubygem/pg_query-2.2.1.gem) = 6086972bbf4eab86d8425b35f14ca8b6fe41e4341423582801c1ec86ff5f8cea
-SIZE (rubygem/pg_query-2.2.1.gem) = 2157056
+TIMESTAMP = 1687446390
+SHA256 (rubygem/pg_query-4.2.1.gem) = b04820a9d1c0c1608e3240b7d84baabbee1b95a7302f29fdd0f00e901c604833
+SIZE (rubygem/pg_query-4.2.1.gem) = 2274816
diff --git a/databases/rubygem-pg_query/files/patch-ext_pg__query_extconf.rb b/databases/rubygem-pg_query/files/patch-ext_pg__query_extconf.rb
new file mode 100644
index 0000000000000..a59d508ab6d10
--- /dev/null
+++ b/databases/rubygem-pg_query/files/patch-ext_pg__query_extconf.rb
@@ -0,0 +1,14 @@
+--- ext/pg_query/extconf.rb.orig	2023-06-25 07:15:18 UTC
++++ ext/pg_query/extconf.rb
+@@ -12,11 +12,7 @@ $CFLAGS << " -fvisibility=hidden -O3 -Wall -fno-strict
+ $INCFLAGS = "-I#{File.join(__dir__, 'include')} " + $INCFLAGS
+ 
+ SYMFILE =
+-  if RUBY_PLATFORM =~ /freebsd/
+-    File.join(__dir__, 'pg_query_ruby_freebsd.sym')
+-  else
+     File.join(__dir__, 'pg_query_ruby.sym')
+-  end
+ 
+ if RUBY_PLATFORM =~ /darwin/
+   $DLDFLAGS << " -Wl,-exported_symbols_list #{SYMFILE}" unless defined?(::Rubinius)
diff --git a/databases/rubygem-pg_query/files/patch-ext_pg__query_pg__query__ruby.sym b/databases/rubygem-pg_query/files/patch-ext_pg__query_pg__query__ruby.sym
new file mode 100644
index 0000000000000..eea0cec5dc238
--- /dev/null
+++ b/databases/rubygem-pg_query/files/patch-ext_pg__query_pg__query__ruby.sym
@@ -0,0 +1,5 @@
+--- ext/pg_query/pg_query_ruby.sym.orig	2023-06-25 07:13:00 UTC
++++ ext/pg_query/pg_query_ruby.sym
+@@ -1 +1,2 @@
+ _Init_pg_query
++Init_pg_query