Index: head/devel/protobuf/Makefile =================================================================== --- head/devel/protobuf/Makefile (revision 385546) +++ head/devel/protobuf/Makefile (revision 385547) @@ -1,29 +1,30 @@ # Created by: vanilla # $FreeBSD$ PORTNAME= protobuf -PORTVERSION= 2.6.0 +PORTVERSION= 2.6.1 CATEGORIES= devel -MASTER_SITES= https://protobuf.googlecode.com/svn/rc/ \ - LOCAL/sunpoet MAINTAINER= sunpoet@FreeBSD.org COMMENT= Data interchange format library LICENSE= BSD3CLAUSE CFLAGS+= -DGOOGLE_PROTOBUF_NO_RTTI GNU_CONFIGURE= yes INSTALL_TARGET= install-strip ONLY_FOR_ARCHS= amd64 armv6 i386 +PATHFIX_MAKEFILEIN= Makefile.am +USE_CSTD= c99 # for audio/clementine-player support USE_LDCONFIG= yes -USES= gmake libtool pathfix pkgconfig tar:bzip2 +USES= autoreconf gmake libtool pathfix pkgconfig tar:bzip2 -# Clang will generate code that just doesn't work with clementine-player -# if this isn't compiled as though it were C99. -USE_CSTD= c99 +USE_GITHUB= yes +GH_ACCOUNT= google +GH_PROJECT= protobuf +GH_TAGNAME= v${PORTVERSION} regression-test test: build cd ${WRKSRC}/ && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} check .include Index: head/devel/protobuf/distinfo =================================================================== --- head/devel/protobuf/distinfo (revision 385546) +++ head/devel/protobuf/distinfo (revision 385547) @@ -1,2 +1,2 @@ -SHA256 (protobuf-2.6.0.tar.bz2) = 0a2f8533b2e0587a2b4efce0c4c8aea21bbfae1c41c466634d958dedf580f6aa -SIZE (protobuf-2.6.0.tar.bz2) = 2021255 +SHA256 (google-protobuf-2.6.1-v2.6.1_GH0.tar.bz2) = 2667b7cda4a6bc8a09e5463adf3b5984e08d94e72338277affa8594d8b6e5cd1 +SIZE (google-protobuf-2.6.1-v2.6.1_GH0.tar.bz2) = 1349051 Index: head/devel/protobuf/files/patch-src-google-protobuf-stubs-atomicops_internals_generic_gcc.h =================================================================== --- head/devel/protobuf/files/patch-src-google-protobuf-stubs-atomicops_internals_generic_gcc.h (revision 385546) +++ head/devel/protobuf/files/patch-src-google-protobuf-stubs-atomicops_internals_generic_gcc.h (nonexistent) @@ -1,20 +0,0 @@ ---- src/google/protobuf/stubs/atomicops_internals_generic_gcc.h.orig 2014-08-26 03:52:37.000000000 +0800 -+++ src/google/protobuf/stubs/atomicops_internals_generic_gcc.h 2015-02-21 11:38:26.948928195 +0800 -@@ -83,7 +83,7 @@ - } - - inline void Acquire_Store(volatile Atomic32* ptr, Atomic32 value) { -- __atomic_store_n(ptr, value, __ATOMIC_ACQUIRE); -+ __atomic_store_n(ptr, value, __ATOMIC_SEQ_CST); - } - - inline void Release_Store(volatile Atomic32* ptr, Atomic32 value) { -@@ -99,7 +99,7 @@ - } - - inline Atomic32 Release_Load(volatile const Atomic32* ptr) { -- return __atomic_load_n(ptr, __ATOMIC_RELEASE); -+ return __atomic_load_n(ptr, __ATOMIC_SEQ_CST); - } - - #ifdef __LP64__ Property changes on: head/devel/protobuf/files/patch-src-google-protobuf-stubs-atomicops_internals_generic_gcc.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/protobuf/files/patch-src-google-protobuf-stubs-atomicops.h =================================================================== --- head/devel/protobuf/files/patch-src-google-protobuf-stubs-atomicops.h (revision 385546) +++ head/devel/protobuf/files/patch-src-google-protobuf-stubs-atomicops.h (revision 385547) @@ -1,11 +1,11 @@ ---- src/google/protobuf/stubs/atomicops.h.orig 2014-08-26 03:52:37.000000000 +0800 -+++ src/google/protobuf/stubs/atomicops.h 2015-02-21 11:45:38.816841509 +0800 -@@ -182,6 +182,8 @@ +--- src/google/protobuf/stubs/atomicops.h.orig 2015-05-06 14:28:24 UTC ++++ src/google/protobuf/stubs/atomicops.h +@@ -187,6 +187,8 @@ GOOGLE_PROTOBUF_ATOMICOPS_ERROR #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__) #include #elif defined(GOOGLE_PROTOBUF_ARCH_AARCH64) Index: head/devel/protobuf/pkg-descr =================================================================== --- head/devel/protobuf/pkg-descr (revision 385546) +++ head/devel/protobuf/pkg-descr (revision 385547) @@ -1,5 +1,5 @@ Protocol Buffers are a way of encoding structured data in an efficient yet extensible format. Google uses Protocol Buffers for almost all of its internal RPC protocols and file formats. -WWW: https://code.google.com/p/protobuf/ +WWW: https://github.com/google/protobuf Index: head/devel/protobuf/pkg-plist =================================================================== --- head/devel/protobuf/pkg-plist (revision 385546) +++ head/devel/protobuf/pkg-plist (revision 385547) @@ -1,70 +1,70 @@ bin/protoc include/google/protobuf/compiler/code_generator.h include/google/protobuf/compiler/command_line_interface.h include/google/protobuf/compiler/cpp/cpp_generator.h include/google/protobuf/compiler/importer.h include/google/protobuf/compiler/java/java_generator.h include/google/protobuf/compiler/parser.h include/google/protobuf/compiler/plugin.h include/google/protobuf/compiler/plugin.pb.h include/google/protobuf/compiler/plugin.proto include/google/protobuf/compiler/python/python_generator.h include/google/protobuf/descriptor.h include/google/protobuf/descriptor.pb.h include/google/protobuf/descriptor.proto include/google/protobuf/descriptor_database.h include/google/protobuf/dynamic_message.h include/google/protobuf/extension_set.h include/google/protobuf/generated_enum_reflection.h include/google/protobuf/generated_message_reflection.h include/google/protobuf/generated_message_util.h include/google/protobuf/io/coded_stream.h include/google/protobuf/io/gzip_stream.h include/google/protobuf/io/printer.h include/google/protobuf/io/strtod.h include/google/protobuf/io/tokenizer.h include/google/protobuf/io/zero_copy_stream.h include/google/protobuf/io/zero_copy_stream_impl.h include/google/protobuf/io/zero_copy_stream_impl_lite.h include/google/protobuf/message.h include/google/protobuf/message_lite.h include/google/protobuf/reflection_ops.h include/google/protobuf/repeated_field.h include/google/protobuf/service.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_atomicword_compat.h include/google/protobuf/stubs/atomicops_internals_generic_gcc.h include/google/protobuf/stubs/atomicops_internals_macosx.h include/google/protobuf/stubs/atomicops_internals_mips_gcc.h include/google/protobuf/stubs/atomicops_internals_pnacl.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/common.h include/google/protobuf/stubs/once.h include/google/protobuf/stubs/platform_macros.h include/google/protobuf/stubs/stl_util.h include/google/protobuf/stubs/template_util.h include/google/protobuf/stubs/type_traits.h include/google/protobuf/text_format.h include/google/protobuf/unknown_field_set.h include/google/protobuf/wire_format.h include/google/protobuf/wire_format_lite.h include/google/protobuf/wire_format_lite_inl.h lib/libprotobuf-lite.a lib/libprotobuf-lite.so lib/libprotobuf-lite.so.9 -lib/libprotobuf-lite.so.9.0.0 +lib/libprotobuf-lite.so.9.0.1 lib/libprotobuf.a lib/libprotobuf.so lib/libprotobuf.so.9 -lib/libprotobuf.so.9.0.0 +lib/libprotobuf.so.9.0.1 lib/libprotoc.a lib/libprotoc.so lib/libprotoc.so.9 -lib/libprotoc.so.9.0.0 +lib/libprotoc.so.9.0.1 libdata/pkgconfig/protobuf-lite.pc libdata/pkgconfig/protobuf.pc