Index: head/devel/protobuf/Makefile
===================================================================
--- head/devel/protobuf/Makefile	(revision 448383)
+++ head/devel/protobuf/Makefile	(revision 448384)
@@ -1,36 +1,36 @@
 # Created by: vanilla
 # $FreeBSD$
 
 PORTNAME=	protobuf
 PORTVERSION=	3.4.0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	devel
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Data interchange format library
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
+BROKEN_sparc64=	fails to compile: no atomic ops available
+
 TEST_DEPENDS=	googlemock>=0:devel/googlemock \
 		googletest>=0:devel/googletest
-
-BROKEN_sparc64=	fails to compile: no atomic ops available
 
 CFLAGS+=	-DGOOGLE_PROTOBUF_NO_RTTI -I${WRKSRC}/src
 CONFIGURE_ENV=	CXX_FOR_BUILD=c++
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 TEST_ARGS=	${MAKE_ARGS} ${_MAKE_JOBS}
 TEST_TARGET=	check
 USE_LDCONFIG=	yes
 USES=		autoreconf compiler:c++11-lang gmake libtool localbase pathfix pkgconfig
 
 GH_ACCOUNT=	google
 USE_GITHUB=	yes
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|^check-local:|disabled-&|' ${WRKSRC}/Makefile.am
 	@${REINPLACE_CMD} -Ee '/gtest|mock/ s|[^ ]*lib(.*)\.la|-l\1|' ${WRKSRC}/src/Makefile.am
 
 .include <bsd.port.mk>
Index: head/devel/protobuf/files/patch-src-google-protobuf-stubs-atomicops.h
===================================================================
--- head/devel/protobuf/files/patch-src-google-protobuf-stubs-atomicops.h	(revision 448383)
+++ head/devel/protobuf/files/patch-src-google-protobuf-stubs-atomicops.h	(revision 448384)
@@ -1,11 +1,11 @@
---- src/google/protobuf/stubs/atomicops.h.orig	2016-09-24 02:12:45 UTC
+--- src/google/protobuf/stubs/atomicops.h.orig	2017-08-15 23:39:12 UTC
 +++ src/google/protobuf/stubs/atomicops.h
-@@ -202,6 +202,8 @@ Atomic64 Release_Load(volatile const Ato
+@@ -198,6 +198,8 @@ Atomic64 Release_Load(volatile const Ato
  #elif defined(__GNUC__)
  #if defined(GOOGLE_PROTOBUF_ARCH_IA32) || defined(GOOGLE_PROTOBUF_ARCH_X64)
  #include <google/protobuf/stubs/atomicops_internals_x86_gcc.h>
 +#elif defined(GOOGLE_PROTOBUF_ARCH_ARM) && defined(__FreeBSD__)
 +#include <google/protobuf/stubs/atomicops_internals_generic_gcc.h>
  #elif defined(GOOGLE_PROTOBUF_ARCH_ARM) && defined(__linux__)
- #include <google/protobuf/stubs/atomicops_internals_arm_gcc.h>
- #elif defined(GOOGLE_PROTOBUF_ARCH_AARCH64)
+ #if (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 7)) || (__GNUC__ > 4))
+ #include <google/protobuf/stubs/atomicops_internals_generic_gcc.h>