CVS commit: pkgsrc/devel

["Kamil Rytarowski" <kamil%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   kamil
Date:           Sat Aug  6 21:38:45 UTC 2016

Modified Files:
        pkgsrc/devel/protobuf: distinfo
        pkgsrc/devel/py-protobuf: distinfo
Added Files:
        pkgsrc/devel/protobuf/patches: patch-gmock_configure
Removed Files:
        pkgsrc/devel/protobuf/patches: patch-gtest_configure

Log Message:
Install patch for protobuf/patches/patch-gmock_configure


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 pkgsrc/devel/protobuf/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/protobuf/patches/patch-gmock_configure
cvs rdiff -u -r1.3 -r0 pkgsrc/devel/protobuf/patches/patch-gtest_configure
cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/py-protobuf/distinfo

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/protobuf/distinfo
diff -u pkgsrc/devel/protobuf/distinfo:1.7 pkgsrc/devel/protobuf/distinfo:1.8
--- pkgsrc/devel/protobuf/distinfo:1.7  Sat Aug  6 11:40:14 2016
+++ pkgsrc/devel/protobuf/distinfo      Sat Aug  6 21:38:45 2016
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.7 2016/08/06 11:40:14 kamil Exp $
+$NetBSD: distinfo,v 1.8 2016/08/06 21:38:45 kamil Exp $
 
 SHA1 (protobuf-cpp-3.0.0.tar.gz) = 00140d255922bf33ef3842168954e3269fbba3af
 RMD160 (protobuf-cpp-3.0.0.tar.gz) = 01a00093e0f7297b3fb7933ef5700d2753109c95
 SHA512 (protobuf-cpp-3.0.0.tar.gz) = 72491ab54244b82f69f39bc485336d986d7238cdf62b48c6e02e53412f348f5cc0756a7249f45c32e7ddb37aaa1e1864244543d1414d6ce7dc03be00ef5f27ab
 Size (protobuf-cpp-3.0.0.tar.gz) = 4075839 bytes
-SHA1 (patch-gmock_configure) = 1703fe1d7bedcf0bf810d1e39ce5105275ae8239
+SHA1 (patch-gmock_configure) = 49a4c9301ad4c1973ee7058213df50a7833161f0
 SHA1 (patch-gmock_configure.ac) = cfd7b7c87eff4b06ce6ecb34dec046561bbdc113
 SHA1 (patch-src_google_protobuf_stubs_atomicops.h) = 6a13cf5597a09f862450916b00d8eae42877b5da
 SHA1 (patch-src_google_protobuf_stubs_atomicops__internals__arm__gcc.h) = 93cf8135660e945044e5a560a3010e32e660ae6f

Index: pkgsrc/devel/py-protobuf/distinfo
diff -u pkgsrc/devel/py-protobuf/distinfo:1.3 pkgsrc/devel/py-protobuf/distinfo:1.4
--- pkgsrc/devel/py-protobuf/distinfo:1.3       Sat Aug  6 11:45:24 2016
+++ pkgsrc/devel/py-protobuf/distinfo   Sat Aug  6 21:38:45 2016
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.3 2016/08/06 11:45:24 kamil Exp $
+$NetBSD: distinfo,v 1.4 2016/08/06 21:38:45 kamil Exp $
 
 SHA1 (protobuf-python-3.0.0.tar.gz) = f8f6508e9bc7965f7d63afe70641622fbbe1d933
 RMD160 (protobuf-python-3.0.0.tar.gz) = d3844f15146c5c4788f0026c6ec088a74fa17e6f
 SHA512 (protobuf-python-3.0.0.tar.gz) = 3d58d5e8b2ce36f6e49f3e3ec8f0a5648957a65a00dbef21e398e44735094c0024a1d94e53d90815b39ddf5db8c7af951adec126f376e3c160d8a222568c43a5
 Size (protobuf-python-3.0.0.tar.gz) = 4339278 bytes
-SHA1 (patch-gmock_configure) = 1703fe1d7bedcf0bf810d1e39ce5105275ae8239
+SHA1 (patch-gmock_configure) = 49a4c9301ad4c1973ee7058213df50a7833161f0
 SHA1 (patch-gmock_configure.ac) = cfd7b7c87eff4b06ce6ecb34dec046561bbdc113
 SHA1 (patch-src_google_protobuf_stubs_atomicops.h) = 6a13cf5597a09f862450916b00d8eae42877b5da
 SHA1 (patch-src_google_protobuf_stubs_atomicops__internals__arm__gcc.h) = 93cf8135660e945044e5a560a3010e32e660ae6f

Added files:

Index: pkgsrc/devel/protobuf/patches/patch-gmock_configure
diff -u /dev/null pkgsrc/devel/protobuf/patches/patch-gmock_configure:1.1
--- /dev/null   Sat Aug  6 21:38:45 2016
+++ pkgsrc/devel/protobuf/patches/patch-gmock_configure Sat Aug  6 21:38:45 2016
@@ -0,0 +1,22 @@
+$NetBSD: patch-gmock_configure,v 1.1 2016/08/06 21:38:45 kamil Exp $
+
+--- gmock/configure.orig       2016-07-15 19:19:42.000000000 +0000
++++ gmock/configure
+@@ -15761,7 +15761,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
+@@ -15791,7 +15791,7 @@ else
+   enable_external_gtest=yes
+ fi
+ 
+-if test "x$with_gtest" == "xno"; then :
++if test "x$with_gtest" = "xno"; then :
+   as_fn_error $? "Support for GoogleTest was explicitly disabled. Currently GoogleMock has a hard
+ dependency upon GoogleTest to build, please provide a version, or allow
+ GoogleMock to use any installed version and fall back upon its internal