summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--devel/protobuf/Makefile4
-rw-r--r--devel/protobuf/PLIST8
-rw-r--r--devel/protobuf/distinfo12
-rw-r--r--devel/protobuf/patches/patch-gtest_configure6
-rw-r--r--devel/protobuf/patches/patch-src_google_protobuf_stubs_atomicops.h6
-rw-r--r--devel/py-protobuf/Makefile3
-rw-r--r--devel/py-protobuf/PLIST14
7 files changed, 34 insertions, 19 deletions
diff --git a/devel/protobuf/Makefile b/devel/protobuf/Makefile
index 0bccf9168d2..7a7fcfa3cd3 100644
--- a/devel/protobuf/Makefile
+++ b/devel/protobuf/Makefile
@@ -1,11 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2014/10/17 22:00:40 joerg Exp $
+# $NetBSD: Makefile,v 1.9 2015/06/10 01:31:51 wiedi Exp $
#
.include "Makefile.common"
-PKGREVISION= 1
CATEGORIES= devel
-MASTER_SITES= http://protobuf.googlecode.com/files/
MAINTAINER= aran@100acres.us
HOMEPAGE= http://code.google.com/p/protobuf/
diff --git a/devel/protobuf/PLIST b/devel/protobuf/PLIST
index ffec25448d3..1e39d91e896 100644
--- a/devel/protobuf/PLIST
+++ b/devel/protobuf/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2013/03/17 14:50:13 wiz Exp $
+@comment $NetBSD: PLIST,v 1.3 2015/06/10 01:31:51 wiedi Exp $
bin/protoc
include/google/protobuf/compiler/code_generator.h
include/google/protobuf/compiler/command_line_interface.h
@@ -22,6 +22,7 @@ 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
@@ -32,17 +33,22 @@ 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_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/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
diff --git a/devel/protobuf/distinfo b/devel/protobuf/distinfo
index d84319f45a6..02ba269fa51 100644
--- a/devel/protobuf/distinfo
+++ b/devel/protobuf/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.4 2015/02/19 14:12:33 joerg Exp $
+$NetBSD: distinfo,v 1.5 2015/06/10 01:31:51 wiedi Exp $
-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) = 5d17790e1c07336c3e4c08ed575ef74c366f628c
-SHA1 (patch-src_google_protobuf_stubs_atomicops.h) = afc60fb589e13a5ceb40996d3c367243c94c7b6c
+SHA1 (protobuf-2.6.1.tar.gz) = 375765455ad49e45e4e10364f91aaf2831d3e905
+RMD160 (protobuf-2.6.1.tar.gz) = f6f04600cd5d9a56161b070b26cdec49c680cbb7
+Size (protobuf-2.6.1.tar.gz) = 2641426 bytes
+SHA1 (patch-gtest_configure) = 57947ae35b3ffdc4906b0fcb99092e7cc5500a11
+SHA1 (patch-src_google_protobuf_stubs_atomicops.h) = 84754ded95b9b78f4211a7aa1de381ce53ed4e40
SHA1 (patch-src_google_protobuf_stubs_atomicops__internals__arm__gcc.h) = eea504fd07a52e90b28e93644fd5cc6172011036
diff --git a/devel/protobuf/patches/patch-gtest_configure b/devel/protobuf/patches/patch-gtest_configure
index 18cc15394b2..d80d83f2aa3 100644
--- a/devel/protobuf/patches/patch-gtest_configure
+++ b/devel/protobuf/patches/patch-gtest_configure
@@ -1,11 +1,11 @@
-$NetBSD: patch-gtest_configure,v 1.2 2013/03/17 14:54:36 wiz Exp $
+$NetBSD: patch-gtest_configure,v 1.3 2015/06/10 01:31:51 wiedi Exp $
Fix unportable test(1) construct.
http://code.google.com/p/protobuf/issues/detail?id=483
---- gtest/configure.orig 2013-03-17 14:48:21.000000000 +0000
+--- gtest/configure.orig 2014-10-22 20:10:24.000000000 +0000
+++ gtest/configure
-@@ -15556,7 +15556,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+@@ -15726,7 +15726,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
have_pthreads="$acx_pthread_ok"
fi
diff --git a/devel/protobuf/patches/patch-src_google_protobuf_stubs_atomicops.h b/devel/protobuf/patches/patch-src_google_protobuf_stubs_atomicops.h
index 6a6c0db7e31..f55fc2e8eda 100644
--- a/devel/protobuf/patches/patch-src_google_protobuf_stubs_atomicops.h
+++ b/devel/protobuf/patches/patch-src_google_protobuf_stubs_atomicops.h
@@ -1,8 +1,8 @@
-$NetBSD: patch-src_google_protobuf_stubs_atomicops.h,v 1.1 2015/02/19 14:12:33 joerg Exp $
+$NetBSD: patch-src_google_protobuf_stubs_atomicops.h,v 1.2 2015/06/10 01:31:51 wiedi Exp $
---- src/google/protobuf/stubs/atomicops.h.orig 2015-02-09 22:44:41.000000000 +0000
+--- src/google/protobuf/stubs/atomicops.h.orig 2014-10-21 00:01:40.000000000 +0000
+++ src/google/protobuf/stubs/atomicops.h
-@@ -77,7 +77,11 @@ typedef intptr_t Atomic64;
+@@ -78,7 +78,11 @@ typedef intptr_t Atomic64;
// Use AtomicWord for a machine-sized pointer. It will use the Atomic32 or
// Atomic64 routines below, depending on your architecture.
diff --git a/devel/py-protobuf/Makefile b/devel/py-protobuf/Makefile
index b8bb4fdb86d..bfc7094f211 100644
--- a/devel/py-protobuf/Makefile
+++ b/devel/py-protobuf/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2014/10/17 22:13:24 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2015/06/10 01:31:52 wiedi Exp $
.include "../../devel/protobuf/Makefile.common"
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
CATEGORIES= devel
-MASTER_SITES= http://protobuf.googlecode.com/files/
MAINTAINER= khorben@defora.org
HOMEPAGE= http://code.google.com/p/protobuf/
diff --git a/devel/py-protobuf/PLIST b/devel/py-protobuf/PLIST
index db069e1b2d5..eb932439657 100644
--- a/devel/py-protobuf/PLIST
+++ b/devel/py-protobuf/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2014/10/09 09:10:47 khorben Exp $
+@comment $NetBSD: PLIST,v 1.2 2015/06/10 01:31:52 wiedi Exp $
${PYSITELIB}/google/protobuf/__init__.py
${PYSITELIB}/google/protobuf/__init__.pyc
${PYSITELIB}/google/protobuf/__init__.pyo
@@ -59,6 +59,12 @@ ${PYSITELIB}/google/protobuf/message.pyo
${PYSITELIB}/google/protobuf/message_factory.py
${PYSITELIB}/google/protobuf/message_factory.pyc
${PYSITELIB}/google/protobuf/message_factory.pyo
+${PYSITELIB}/google/protobuf/pyext/__init__.py
+${PYSITELIB}/google/protobuf/pyext/__init__.pyc
+${PYSITELIB}/google/protobuf/pyext/__init__.pyo
+${PYSITELIB}/google/protobuf/pyext/cpp_message.py
+${PYSITELIB}/google/protobuf/pyext/cpp_message.pyc
+${PYSITELIB}/google/protobuf/pyext/cpp_message.pyo
${PYSITELIB}/google/protobuf/reflection.py
${PYSITELIB}/google/protobuf/reflection.pyc
${PYSITELIB}/google/protobuf/reflection.pyo
@@ -68,6 +74,12 @@ ${PYSITELIB}/google/protobuf/service.pyo
${PYSITELIB}/google/protobuf/service_reflection.py
${PYSITELIB}/google/protobuf/service_reflection.pyc
${PYSITELIB}/google/protobuf/service_reflection.pyo
+${PYSITELIB}/google/protobuf/symbol_database.py
+${PYSITELIB}/google/protobuf/symbol_database.pyc
+${PYSITELIB}/google/protobuf/symbol_database.pyo
+${PYSITELIB}/google/protobuf/text_encoding.py
+${PYSITELIB}/google/protobuf/text_encoding.pyc
+${PYSITELIB}/google/protobuf/text_encoding.pyo
${PYSITELIB}/google/protobuf/text_format.py
${PYSITELIB}/google/protobuf/text_format.pyc
${PYSITELIB}/google/protobuf/text_format.pyo