The build of protobuf-c 1.3.3 breaks with protobuf 3.20rc1 because protobuf no longer pulls std::string into the google::protobuf namespace: https://github.com/protobuf-c/protobuf-c/pull/443
Various other fixes, nothing super exciting. No API/ABI change, so no bump. https://github.com/protobuf-c/protobuf-c/blob/master/ChangeLog The sed to modify Makefile.in is to make the build work with protoc from ports with the .proto files below /usr/local/include. The bulk with this in has not fully completed, but I don't expect fallout. All tests pass. Index: Makefile =================================================================== RCS file: /cvs/ports/devel/protobuf-c/Makefile,v retrieving revision 1.18 diff -u -p -r1.18 Makefile --- Makefile 12 Mar 2020 19:02:21 -0000 1.18 +++ Makefile 6 Mar 2022 11:47:35 -0000 @@ -2,7 +2,7 @@ COMMENT = c protocol buffers -V = 1.3.3 +V = 1.4.0 DISTNAME = protobuf-c-$V SHARED_LIBS = protobuf-c 2.0 # 1.0 @@ -33,5 +33,8 @@ CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE USE_GMAKE = Yes SEPARATE_BUILD = Yes + +pre-configure: + sed -i -E 's,(--plugin|--cpp_out),-I${LOCALBASE}/include &,' ${WRKSRC}/Makefile.in .include <bsd.port.mk> Index: distinfo =================================================================== RCS file: /cvs/ports/devel/protobuf-c/distinfo,v retrieving revision 1.6 diff -u -p -r1.6 distinfo --- distinfo 12 Mar 2020 19:02:21 -0000 1.6 +++ distinfo 6 Mar 2022 07:43:39 -0000 @@ -1,2 +1,2 @@ -SHA256 (protobuf-c-1.3.3.tar.gz) = IpVmBu9Qxg3h+rwTp4+8UIMKBEfXgEZ9PFGfhK1Sfng= -SIZE (protobuf-c-1.3.3.tar.gz) = 500505 +SHA256 (protobuf-c-1.4.0.tar.gz) = JtmO6b8Ypuug0/hV3ewx2+hXZn0mm8C2AXM1Vy+Fu8s= +SIZE (protobuf-c-1.4.0.tar.gz) = 505251 Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/devel/protobuf-c/pkg/PLIST,v retrieving revision 1.4 diff -u -p -r1.4 PLIST --- pkg/PLIST 12 Mar 2020 19:02:21 -0000 1.4 +++ pkg/PLIST 6 Mar 2022 11:50:45 -0000 @@ -1,10 +1,10 @@ -@comment $OpenBSD: PLIST,v 1.4 2020/03/12 19:02:21 tb Exp $ bin/protoc-c @bin bin/protoc-gen-c include/google/protobuf-c/ include/google/protobuf-c/protobuf-c.h include/protobuf-c/ include/protobuf-c/protobuf-c.h +include/protobuf-c/protobuf-c.proto @static-lib lib/libprotobuf-c.a lib/libprotobuf-c.la @lib lib/libprotobuf-c.so.${LIBprotobuf-c_VERSION}
