diff --git a/devel/rubygem-google-protobuf/Makefile b/devel/rubygem-google-protobuf/Makefile
index 2bc5c88becc4..815922782ef1 100644
--- a/devel/rubygem-google-protobuf/Makefile
+++ b/devel/rubygem-google-protobuf/Makefile
@@ -1,17 +1,18 @@
 PORTNAME=	google-protobuf
 PORTVERSION=	3.21.7
+PORTREVISION=	1
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Ruby extension to Google Protocol Buffers
 WWW=		https://developers.google.com/protocol-buffers/
 
 LICENSE=	BSD3CLAUSE
 
 USES=		gem shebangfix
 USE_RUBY=	yes
 
 SHEBANG_GLOB=	*.rb
 
 .include <bsd.port.mk>
diff --git a/devel/rubygem-google-protobuf/files/patch-ext_google_protobuf__c_extconf.rb b/devel/rubygem-google-protobuf/files/patch-ext_google_protobuf__c_extconf.rb
new file mode 100644
index 000000000000..4e85cdbb04e7
--- /dev/null
+++ b/devel/rubygem-google-protobuf/files/patch-ext_google_protobuf__c_extconf.rb
@@ -0,0 +1,11 @@
+--- ext/google/protobuf_c/extconf.rb.orig	2022-10-28 07:09:57 UTC
++++ ext/google/protobuf_c/extconf.rb
+@@ -6,7 +6,7 @@ ext_name = "google/protobuf_c"
+ 
+ dir_config(ext_name)
+ 
+-if RUBY_PLATFORM =~ /darwin/ || RUBY_PLATFORM =~ /linux/
++if RUBY_PLATFORM =~ /darwin/ || RUBY_PLATFORM =~ /linux/ || RUBY_PLATFORM =~ /freebsd/
+   $CFLAGS += " -std=gnu99 -O3 -DNDEBUG -fvisibility=hidden -Wall -Wsign-compare -Wno-declaration-after-statement"
+ else
+   $CFLAGS += " -std=gnu99 -O3 -DNDEBUG"
diff --git a/devel/rubygem-google-protobuf319/Makefile b/devel/rubygem-google-protobuf319/Makefile
index 9c155cbf549f..c947f890e510 100644
--- a/devel/rubygem-google-protobuf319/Makefile
+++ b/devel/rubygem-google-protobuf319/Makefile
@@ -1,20 +1,21 @@
 PORTNAME=	google-protobuf
 PORTVERSION=	3.19.6
+PORTREVISION=	1
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 PKGNAMESUFFIX=	319
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Ruby extension to Google Protocol Buffers
 WWW=		https://developers.google.com/protocol-buffers/
 
 LICENSE=	BSD3CLAUSE
 
 USES=		gem shebangfix
 USE_RUBY=	yes
 
 PORTSCOUT=	limit:^3\.19\.
 
 SHEBANG_GLOB=	*.rb
 
 .include <bsd.port.mk>
diff --git a/devel/rubygem-google-protobuf319/files/patch-ext_google_protobuf__c_extconf.rb b/devel/rubygem-google-protobuf319/files/patch-ext_google_protobuf__c_extconf.rb
new file mode 100644
index 000000000000..aa8b00f64150
--- /dev/null
+++ b/devel/rubygem-google-protobuf319/files/patch-ext_google_protobuf__c_extconf.rb
@@ -0,0 +1,11 @@
+--- ext/google/protobuf_c/extconf.rb.orig	2022-10-28 07:07:50 UTC
++++ ext/google/protobuf_c/extconf.rb
+@@ -2,7 +2,7 @@
+ 
+ require 'mkmf'
+ 
+-if RUBY_PLATFORM =~ /darwin/ || RUBY_PLATFORM =~ /linux/
++if RUBY_PLATFORM =~ /darwin/ || RUBY_PLATFORM =~ /linux/ || RUBY_PLATFORM =~ /freebsd/
+   $CFLAGS += " -std=gnu99 -O3 -DNDEBUG -fvisibility=hidden -Wall -Wsign-compare -Wno-declaration-after-statement"
+ else
+   $CFLAGS += " -std=gnu99 -O3 -DNDEBUG"