Sun Mar 17 14:50:14 2013 UTC ()
Update to 2.5.0:

2013-02-27 version 2.5.0:

  General
  * New notion "import public" that allows a proto file to forward the content
    it imports to its importers. For example,
      // foo.proto
      import public "bar.proto";
      import "baz.proto";

      // qux.proto
      import "foo.proto";
      // Stuff defined in bar.proto may be used in this file, but stuff from
      // baz.proto may NOT be used without importing it explicitly.
    This is useful for moving proto files. To move a proto file, just leave
    a single "import public" in the old proto file.
  * New enum option "allow_alias" that specifies whether different symbols can
    be assigned the same numeric value. Default value is "true". Setting it to
    false causes the compiler to reject enum definitions where multiple symbols
    have the same numeric value.

  C++
  * New generated method set_allocated_foo(Type* foo) for message and string
    fields. This method allows you to set the field to a pre-allocated object
    and the containing message takes the ownership of that object.
  * Added SetAllocatedExtension() and ReleaseExtension() to extensions API.
  * Custom options are now formatted correctly when descriptors are printed in
    text format.
  * Various speed optimizations.

  Java
  * Comments in proto files are now collected and put into generated code as
    comments for corresponding classes and data members.
  * Added Parser to parse directly into messages without a Builder. For
    example,
      Foo foo = Foo.getParser().ParseFrom(input);
    Using Parser is ~25% faster than using Builder to parse messages.
  * Added getters/setters to access the underlying ByteString of a string field
    directly.
  * ByteString now supports more operations: substring(), prepend(), and
    append(). The implementation of ByteString uses a binary tree structure
    to support these operations efficiently.
  * New method findInitializationErrors() that lists all missing required
    fields.
  * Various code size and speed optimizations.

  Python
  * Added support for dynamic message creation. DescriptorDatabase,
    DescriptorPool, and MessageFactory work like their C++ couterparts to
    simplify Descriptor construction from *DescriptorProtos, and MessageFactory
    provides a message instance from a Descriptor.
  * Added pickle support for protobuf messages.
  * Unknown fields are now preserved after parsing.
  * Fixed bug where custom options were not correctly populated. Custom
    options can be accessed now.
  * Added EnumTypeWrapper that provides better accessibility to enum types.
  * Added ParseMessage(descriptor, bytes) to generate a new Message instance
    from a descriptor and a byte string.


(wiz)
diff -r1.4 -r1.5 pkgsrc/devel/protobuf/Makefile
diff -r1.1.1.1 -r1.2 pkgsrc/devel/protobuf/PLIST
diff -r1.1.1.1 -r1.2 pkgsrc/devel/protobuf/distinfo
diff -r0 -r1.1 pkgsrc/devel/protobuf/patches/patch-gtest_configure

cvs diff -r1.4 -r1.5 pkgsrc/devel/protobuf/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/protobuf/Makefile 2012/12/20 09:14:34 1.4
+++ pkgsrc/devel/protobuf/Makefile 2013/03/17 14:50:13 1.5
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.4 2012/12/20 09:14:34 ryoon Exp $ 1# $NetBSD: Makefile,v 1.5 2013/03/17 14:50:13 wiz Exp $
2# 2#
3 3
4DISTNAME= protobuf-2.4.1 4DISTNAME= protobuf-2.5.0
5CATEGORIES= devel 5CATEGORIES= devel
6MASTER_SITES= http://protobuf.googlecode.com/files/ 6MASTER_SITES= http://protobuf.googlecode.com/files/
7 7
8MAINTAINER= aran@100acres.us 8MAINTAINER= aran@100acres.us
9HOMEPAGE= http://code.google.com/p/protobuf/ 9HOMEPAGE= http://code.google.com/p/protobuf/
10COMMENT= Google protocol buffers 10COMMENT= Google protocol buffers
11LICENSE= modified-bsd 11LICENSE= modified-bsd
12 12
13GNU_CONFIGURE= yes 13GNU_CONFIGURE= yes
14USE_LIBTOOL= yes 14USE_LIBTOOL= yes
15USE_LANGUAGES= c++ c 15USE_LANGUAGES= c++ c
16 16
17CONFIGURE_ARGS+= --libdir=${PREFIX}/lib 17CONFIGURE_ARGS+= --libdir=${PREFIX}/lib

cvs diff -r1.1.1.1 -r1.2 pkgsrc/devel/protobuf/PLIST (expand / switch to unified diff)

--- pkgsrc/devel/protobuf/PLIST 2012/06/04 13:21:50 1.1.1.1
+++ pkgsrc/devel/protobuf/PLIST 2013/03/17 14:50:13 1.2
@@ -1,44 +1,57 @@ @@ -1,44 +1,57 @@
1@comment $NetBSD: PLIST,v 1.1.1.1 2012/06/04 13:21:50 obache Exp $ 1@comment $NetBSD: PLIST,v 1.2 2013/03/17 14:50:13 wiz Exp $
2bin/protoc 2bin/protoc
3include/google/protobuf/compiler/code_generator.h 3include/google/protobuf/compiler/code_generator.h
4include/google/protobuf/compiler/command_line_interface.h 4include/google/protobuf/compiler/command_line_interface.h
5include/google/protobuf/compiler/cpp/cpp_generator.h 5include/google/protobuf/compiler/cpp/cpp_generator.h
6include/google/protobuf/compiler/importer.h 6include/google/protobuf/compiler/importer.h
7include/google/protobuf/compiler/java/java_generator.h 7include/google/protobuf/compiler/java/java_generator.h
8include/google/protobuf/compiler/parser.h 8include/google/protobuf/compiler/parser.h
9include/google/protobuf/compiler/plugin.h 9include/google/protobuf/compiler/plugin.h
10include/google/protobuf/compiler/plugin.pb.h 10include/google/protobuf/compiler/plugin.pb.h
11include/google/protobuf/compiler/plugin.proto 11include/google/protobuf/compiler/plugin.proto
12include/google/protobuf/compiler/python/python_generator.h 12include/google/protobuf/compiler/python/python_generator.h
13include/google/protobuf/descriptor.h 13include/google/protobuf/descriptor.h
14include/google/protobuf/descriptor.pb.h 14include/google/protobuf/descriptor.pb.h
15include/google/protobuf/descriptor.proto 15include/google/protobuf/descriptor.proto
16include/google/protobuf/descriptor_database.h 16include/google/protobuf/descriptor_database.h
17include/google/protobuf/dynamic_message.h 17include/google/protobuf/dynamic_message.h
18include/google/protobuf/extension_set.h 18include/google/protobuf/extension_set.h
 19include/google/protobuf/generated_enum_reflection.h
19include/google/protobuf/generated_message_reflection.h 20include/google/protobuf/generated_message_reflection.h
20include/google/protobuf/generated_message_util.h 21include/google/protobuf/generated_message_util.h
21include/google/protobuf/io/coded_stream.h 22include/google/protobuf/io/coded_stream.h
22include/google/protobuf/io/gzip_stream.h 23include/google/protobuf/io/gzip_stream.h
23include/google/protobuf/io/printer.h 24include/google/protobuf/io/printer.h
24include/google/protobuf/io/tokenizer.h 25include/google/protobuf/io/tokenizer.h
25include/google/protobuf/io/zero_copy_stream.h 26include/google/protobuf/io/zero_copy_stream.h
26include/google/protobuf/io/zero_copy_stream_impl.h 27include/google/protobuf/io/zero_copy_stream_impl.h
27include/google/protobuf/io/zero_copy_stream_impl_lite.h 28include/google/protobuf/io/zero_copy_stream_impl_lite.h
28include/google/protobuf/message.h 29include/google/protobuf/message.h
29include/google/protobuf/message_lite.h 30include/google/protobuf/message_lite.h
30include/google/protobuf/reflection_ops.h 31include/google/protobuf/reflection_ops.h
31include/google/protobuf/repeated_field.h 32include/google/protobuf/repeated_field.h
32include/google/protobuf/service.h 33include/google/protobuf/service.h
 34include/google/protobuf/stubs/atomicops.h
 35include/google/protobuf/stubs/atomicops_internals_arm_gcc.h
 36include/google/protobuf/stubs/atomicops_internals_arm_qnx.h
 37include/google/protobuf/stubs/atomicops_internals_atomicword_compat.h
 38include/google/protobuf/stubs/atomicops_internals_macosx.h
 39include/google/protobuf/stubs/atomicops_internals_mips_gcc.h
 40include/google/protobuf/stubs/atomicops_internals_pnacl.h
 41include/google/protobuf/stubs/atomicops_internals_x86_gcc.h
 42include/google/protobuf/stubs/atomicops_internals_x86_msvc.h
33include/google/protobuf/stubs/common.h 43include/google/protobuf/stubs/common.h
34include/google/protobuf/stubs/once.h 44include/google/protobuf/stubs/once.h
 45include/google/protobuf/stubs/platform_macros.h
 46include/google/protobuf/stubs/template_util.h
 47include/google/protobuf/stubs/type_traits.h
35include/google/protobuf/text_format.h 48include/google/protobuf/text_format.h
36include/google/protobuf/unknown_field_set.h 49include/google/protobuf/unknown_field_set.h
37include/google/protobuf/wire_format.h 50include/google/protobuf/wire_format.h
38include/google/protobuf/wire_format_lite.h 51include/google/protobuf/wire_format_lite.h
39include/google/protobuf/wire_format_lite_inl.h 52include/google/protobuf/wire_format_lite_inl.h
40lib/libprotobuf-lite.la 53lib/libprotobuf-lite.la
41lib/libprotobuf.la 54lib/libprotobuf.la
42lib/libprotoc.la 55lib/libprotoc.la
43lib/pkgconfig/protobuf-lite.pc 56lib/pkgconfig/protobuf-lite.pc
44lib/pkgconfig/protobuf.pc 57lib/pkgconfig/protobuf.pc

cvs diff -r1.1.1.1 -r1.2 pkgsrc/devel/protobuf/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/protobuf/distinfo 2012/06/04 13:21:50 1.1.1.1
+++ pkgsrc/devel/protobuf/distinfo 2013/03/17 14:50:13 1.2
@@ -1,5 +1,6 @@ @@ -1,5 +1,6 @@
1$NetBSD: distinfo,v 1.1.1.1 2012/06/04 13:21:50 obache Exp $ 1$NetBSD: distinfo,v 1.2 2013/03/17 14:50:13 wiz Exp $
2 2
3SHA1 (protobuf-2.4.1.tar.gz) = efc84249525007b1e3105084ea27e3273f7cbfb0 3SHA1 (protobuf-2.5.0.tar.gz) = 7f6ea7bc1382202fb1ce8c6933f1ef8fea0c0148
4RMD160 (protobuf-2.4.1.tar.gz) = 58769f8737b6ac3bd62250230852fefb9dc7d8b2 4RMD160 (protobuf-2.5.0.tar.gz) = 94755535c75f12db6a34d2f043e59597bea02dda
5Size (protobuf-2.4.1.tar.gz) = 1935301 bytes 5Size (protobuf-2.5.0.tar.gz) = 2401901 bytes
 6SHA1 (patch-gtest_configure) = 5a3e2b5ba5c5f74da0ab70fb6762f03a1e12aa96

File Added: pkgsrc/devel/protobuf/patches/Attic/patch-gtest_configure
$NetBSD: patch-gtest_configure,v 1.1 2013/03/17 14:50:14 wiz Exp $

Fix unportable test(1) construct.

--- gtest/configure.orig	2013-03-17 14:48:21.000000000 +0000
+++ gtest/configure
@@ -15556,7 +15556,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
        have_pthreads="$acx_pthread_ok"
 fi
- if test "x$have_pthreads" == "xyes"; then
+ if test "x$have_pthreads" = "xyes"; then
   HAVE_PTHREADS_TRUE=
   HAVE_PTHREADS_FALSE='#'
 else