Index: devel/protobuf/Makefile =================================================================== --- devel/protobuf/Makefile +++ devel/protobuf/Makefile @@ -2,9 +2,8 @@ # $FreeBSD$ PORTNAME= protobuf -PORTVERSION= 3.5.2 +PORTVERSION= 3.6.1 DISTVERSIONPREFIX= v -PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= devel @@ -19,6 +18,9 @@ TEST_DEPENDS= googlemock>=0:devel/googlemock \ googletest>=0:devel/googletest +USES= autoreconf compiler:c++11-lang gmake libtool localbase pathfix pkgconfig +USE_LDCONFIG= yes + CFLAGS+= -DGOOGLE_PROTOBUF_NO_RTTI -I${WRKSRC}/src CONFIGURE_ENV= CC_FOR_BUILD="${CC}" CFLAGS_FOR_BUILD="${CFLAGS}" \ CPPFLAGS_FOR_BUILD="${CPPFLAGS}" \ @@ -28,8 +30,6 @@ INSTALL_TARGET= install-strip TEST_ARGS= ${MAKE_ARGS} ${_MAKE_JOBS} TEST_TARGET= check -USES= autoreconf compiler:c++11-lang gmake libtool localbase pathfix pkgconfig -USE_LDCONFIG= yes GH_ACCOUNT= google USE_GITHUB= yes Index: devel/protobuf/distinfo =================================================================== --- devel/protobuf/distinfo +++ devel/protobuf/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1523095599 -SHA256 (google-protobuf-v3.5.2_GH0.tar.gz) = 4ffd420f39f226e96aebc3554f9c66a912f6cad6261f39f194f16af8a1f6dab2 -SIZE (google-protobuf-v3.5.2_GH0.tar.gz) = 4584659 +TIMESTAMP = 1542887251 +SHA256 (google-protobuf-v3.6.1_GH0.tar.gz) = 3d4e589d81b2006ca603c1ab712c9715a76227293032d05b26fca603f90b3f5b +SIZE (google-protobuf-v3.6.1_GH0.tar.gz) = 4485582 Index: devel/protobuf/files/patch-src-google-protobuf-stubs-atomicops.h =================================================================== --- devel/protobuf/files/patch-src-google-protobuf-stubs-atomicops.h +++ /dev/null @@ -1,11 +0,0 @@ ---- src/google/protobuf/stubs/atomicops.h.orig 2017-08-15 23:39:12 UTC -+++ src/google/protobuf/stubs/atomicops.h -@@ -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 -+#elif defined(GOOGLE_PROTOBUF_ARCH_ARM) && defined(__FreeBSD__) -+#include - #elif defined(GOOGLE_PROTOBUF_ARCH_ARM) && defined(__linux__) - #if (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 7)) || (__GNUC__ > 4)) - #include Index: devel/protobuf/files/patch-src-google-protobuf-testing-zcgunzip.cc =================================================================== --- devel/protobuf/files/patch-src-google-protobuf-testing-zcgunzip.cc +++ /dev/null @@ -1,10 +0,0 @@ ---- src/google/protobuf/testing/zcgunzip.cc.orig 2016-09-24 02:12:45 UTC -+++ src/google/protobuf/testing/zcgunzip.cc -@@ -42,6 +42,7 @@ - #include - #include - #include -+#include - - #ifdef _WIN32 - #ifndef STDIN_FILENO Index: devel/protobuf/files/patch-src-google-protobuf-testing-zcgzip.cc =================================================================== --- devel/protobuf/files/patch-src-google-protobuf-testing-zcgzip.cc +++ /dev/null @@ -1,10 +0,0 @@ ---- src/google/protobuf/testing/zcgzip.cc.orig 2016-09-24 02:12:45 UTC -+++ src/google/protobuf/testing/zcgzip.cc -@@ -41,6 +41,7 @@ - #include - #include - #include -+#include - - #ifdef _WIN32 - #ifndef STDIN_FILENO Index: devel/protobuf/files/patch-src_Makefile.am =================================================================== --- devel/protobuf/files/patch-src_Makefile.am +++ /dev/null @@ -1,11 +0,0 @@ ---- src/Makefile.am.bak 2018-10-27 21:56:16.784704000 +0200 -+++ src/Makefile.am 2018-10-27 22:01:47.564751000 +0200 -@@ -518,7 +518,7 @@ - # to build the js_embed binary using $(CXX_FOR_BUILD) so that it is executable - # on the build machine in a cross-compilation setup. - js_embed$(EXEEXT): $(srcdir)/google/protobuf/compiler/js/embed.cc -- $(CXX_FOR_BUILD) -o $@ $< -+ $(CXX_FOR_BUILD) ${CXXFLAGS} -o $@ $< - js_well_known_types_sources = \ - google/protobuf/compiler/js/well_known_types/any.js \ - google/protobuf/compiler/js/well_known_types/struct.js \ Index: devel/protobuf/pkg-plist =================================================================== --- devel/protobuf/pkg-plist +++ devel/protobuf/pkg-plist @@ -15,7 +15,6 @@ include/google/protobuf/compiler/importer.h include/google/protobuf/compiler/java/java_generator.h include/google/protobuf/compiler/java/java_names.h -include/google/protobuf/compiler/javanano/javanano_generator.h include/google/protobuf/compiler/js/js_generator.h include/google/protobuf/compiler/js/well_known_types_embed.h include/google/protobuf/compiler/objectivec/objectivec_generator.h @@ -45,6 +44,8 @@ include/google/protobuf/generated_message_table_driven.h include/google/protobuf/generated_message_util.h include/google/protobuf/has_bits.h +include/google/protobuf/implicit_weak_message.h +include/google/protobuf/inlined_string_field.h include/google/protobuf/io/coded_stream.h include/google/protobuf/io/gzip_stream.h include/google/protobuf/io/printer.h @@ -72,20 +73,6 @@ include/google/protobuf/source_context.proto include/google/protobuf/struct.pb.h include/google/protobuf/struct.proto -include/google/protobuf/stubs/atomic_sequence_num.h -include/google/protobuf/stubs/atomicops.h -include/google/protobuf/stubs/atomicops_internals_arm64_gcc.h -include/google/protobuf/stubs/atomicops_internals_arm_gcc.h -include/google/protobuf/stubs/atomicops_internals_arm_qnx.h -include/google/protobuf/stubs/atomicops_internals_generic_c11_atomic.h -include/google/protobuf/stubs/atomicops_internals_generic_gcc.h -include/google/protobuf/stubs/atomicops_internals_mips_gcc.h -include/google/protobuf/stubs/atomicops_internals_power.h -include/google/protobuf/stubs/atomicops_internals_ppc_gcc.h -include/google/protobuf/stubs/atomicops_internals_solaris.h -include/google/protobuf/stubs/atomicops_internals_tsan.h -include/google/protobuf/stubs/atomicops_internals_x86_gcc.h -include/google/protobuf/stubs/atomicops_internals_x86_msvc.h include/google/protobuf/stubs/bytestream.h include/google/protobuf/stubs/callback.h include/google/protobuf/stubs/casts.h @@ -98,14 +85,11 @@ include/google/protobuf/stubs/once.h include/google/protobuf/stubs/platform_macros.h include/google/protobuf/stubs/port.h -include/google/protobuf/stubs/scoped_ptr.h -include/google/protobuf/stubs/shared_ptr.h include/google/protobuf/stubs/singleton.h include/google/protobuf/stubs/status.h include/google/protobuf/stubs/stl_util.h include/google/protobuf/stubs/stringpiece.h include/google/protobuf/stubs/template_util.h -include/google/protobuf/stubs/type_traits.h include/google/protobuf/text_format.h include/google/protobuf/timestamp.pb.h include/google/protobuf/timestamp.proto @@ -127,15 +111,15 @@ include/google/protobuf/wrappers.proto lib/libprotobuf-lite.a lib/libprotobuf-lite.so -lib/libprotobuf-lite.so.15 -lib/libprotobuf-lite.so.15.0.1 +lib/libprotobuf-lite.so.17 +lib/libprotobuf-lite.so.17.0.0 lib/libprotobuf.a lib/libprotobuf.so -lib/libprotobuf.so.15 -lib/libprotobuf.so.15.0.1 +lib/libprotobuf.so.17 +lib/libprotobuf.so.17.0.0 lib/libprotoc.a lib/libprotoc.so -lib/libprotoc.so.15 -lib/libprotoc.so.15.0.1 +lib/libprotoc.so.17 +lib/libprotoc.so.17.0.0 libdata/pkgconfig/protobuf-lite.pc libdata/pkgconfig/protobuf.pc