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.

4 files changed, 36 insertions, 7 deletions

diff --git a/devel/protobuf/Makefile b/devel/protobuf/Makefile
index c436170a4c7..a7eabdd54a6 100644
--- a/devel/protobuf/Makefile
+++ b/devel/protobuf/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2012/12/20 09:14:34 ryoon Exp $
+# $NetBSD: Makefile,v 1.5 2013/03/17 14:50:13 wiz Exp $
 #
 
-DISTNAME=	protobuf-2.4.1
+DISTNAME=	protobuf-2.5.0
 CATEGORIES=	devel
 MASTER_SITES=	http://protobuf.googlecode.com/files/
 
diff --git a/devel/protobuf/PLIST b/devel/protobuf/PLIST
index 613817f4955..ffec25448d3 100644
--- a/devel/protobuf/PLIST
+++ b/devel/protobuf/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2012/06/04 13:21:50 obache Exp $
+@comment $NetBSD: PLIST,v 1.2 2013/03/17 14:50:13 wiz Exp $
 bin/protoc
 include/google/protobuf/compiler/code_generator.h
 include/google/protobuf/compiler/command_line_interface.h
@@ -16,6 +16,7 @@ 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
@@ -30,8 +31,20 @@ 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_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_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_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/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
diff --git a/devel/protobuf/distinfo b/devel/protobuf/distinfo
index 21fa4cf94fa..d4722a1fc6b 100644
--- a/devel/protobuf/distinfo
+++ b/devel/protobuf/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2012/06/04 13:21:50 obache Exp $
+$NetBSD: distinfo,v 1.2 2013/03/17 14:50:13 wiz Exp $
 
-SHA1 (protobuf-2.4.1.tar.gz) = efc84249525007b1e3105084ea27e3273f7cbfb0
-RMD160 (protobuf-2.4.1.tar.gz) = 58769f8737b6ac3bd62250230852fefb9dc7d8b2
-Size (protobuf-2.4.1.tar.gz) = 1935301 bytes
+SHA1 (protobuf-2.5.0.tar.gz) = 7f6ea7bc1382202fb1ce8c6933f1ef8fea0c0148
+RMD160 (protobuf-2.5.0.tar.gz) = 94755535c75f12db6a34d2f043e59597bea02dda
+Size (protobuf-2.5.0.tar.gz) = 2401901 bytes
+SHA1 (patch-gtest_configure) = 5a3e2b5ba5c5f74da0ab70fb6762f03a1e12aa96
diff --git a/devel/protobuf/patches/patch-gtest_configure b/devel/protobuf/patches/patch-gtest_configure
new file mode 100644
index 00000000000..da773d49a9e
--- /dev/null
+++ b/devel/protobuf/patches/patch-gtest_configure
@@ -0,0 +1,15 @@
+$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