Received: by mail.netbsd.org (Postfix, from userid 605) id 87EFD84E69; Sat, 4 Aug 2018 21:19:42 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 8FE6C84E63 for ; Sat, 4 Aug 2018 21:19:41 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id sZOE1MWOf63j for ; Sat, 4 Aug 2018 21:19:39 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 7222D84CD4 for ; Sat, 4 Aug 2018 21:19:39 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 6C241FBEC; Sat, 4 Aug 2018 21:19:39 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1533417579268170" MIME-Version: 1.0 Date: Sat, 4 Aug 2018 21:19:39 +0000 From: "Min Sik Kim" Subject: CVS commit: pkgsrc/devel/protobuf To: pkgsrc-changes@NetBSD.org Reply-To: minskim@netbsd.org X-Mailer: log_accum Message-Id: <20180804211939.6C241FBEC@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1533417579268170 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: minskim Date: Sat Aug 4 21:19:39 UTC 2018 Modified Files: pkgsrc/devel/protobuf: Makefile Makefile.common PLIST buildlink3.mk distinfo pkgsrc/devel/protobuf/patches: patch-configure Added Files: pkgsrc/devel/protobuf/patches: patch-third__party_googletest_googlemock_configure patch-third__party_googletest_googlemock_configure.ac Removed Files: pkgsrc/devel/protobuf/patches: patch-gmock_configure patch-gmock_configure.ac patch-src_google_protobuf_stubs_atomicops.h patch-src_google_protobuf_stubs_atomicops__internals__arm__gcc.h Log Message: devel/protobuf: Update to 3.6.0 Major changes: - Starting from this release, we now require C++11. - Moved to C++11 types like std::atomic and std::unique_ptr. To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 pkgsrc/devel/protobuf/Makefile cvs rdiff -u -r1.10 -r1.11 pkgsrc/devel/protobuf/Makefile.common cvs rdiff -u -r1.9 -r1.10 pkgsrc/devel/protobuf/PLIST cvs rdiff -u -r1.5 -r1.6 pkgsrc/devel/protobuf/buildlink3.mk cvs rdiff -u -r1.19 -r1.20 pkgsrc/devel/protobuf/distinfo cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/protobuf/patches/patch-configure cvs rdiff -u -r1.2 -r0 pkgsrc/devel/protobuf/patches/patch-gmock_configure cvs rdiff -u -r1.1 -r0 pkgsrc/devel/protobuf/patches/patch-gmock_configure.ac cvs rdiff -u -r1.5 -r0 \ pkgsrc/devel/protobuf/patches/patch-src_google_protobuf_stubs_atomicops.h cvs rdiff -u -r1.3 -r0 \ pkgsrc/devel/protobuf/patches/patch-src_google_protobuf_stubs_atomicops__internals__arm__gcc.h cvs rdiff -u -r0 -r1.1 \ pkgsrc/devel/protobuf/patches/patch-third__party_googletest_googlemock_configure \ pkgsrc/devel/protobuf/patches/patch-third__party_googletest_googlemock_configure.ac Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1533417579268170 Content-Disposition: inline Content-Length: 17297 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/devel/protobuf/Makefile diff -u pkgsrc/devel/protobuf/Makefile:1.15 pkgsrc/devel/protobuf/Makefile:1.16 --- pkgsrc/devel/protobuf/Makefile:1.15 Wed Jan 17 12:10:37 2018 +++ pkgsrc/devel/protobuf/Makefile Sat Aug 4 21:19:39 2018 @@ -1,6 +1,5 @@ -# $NetBSD: Makefile,v 1.15 2018/01/17 12:10:37 jperkin Exp $ +# $NetBSD: Makefile,v 1.16 2018/08/04 21:19:39 minskim Exp $ -PKGREVISION= 1 .include "Makefile.common" DISTNAME= protobuf-cpp-${PROTOBUFVER} @@ -11,7 +10,7 @@ COMMENT= Google protocol buffers GNU_CONFIGURE= yes USE_LIBTOOL= yes -USE_LANGUAGES= c++ c +USE_LANGUAGES= c++11 c USE_TOOLS+= autoreconf automake autoconf gmake SET_LIBDIR= yes Index: pkgsrc/devel/protobuf/Makefile.common diff -u pkgsrc/devel/protobuf/Makefile.common:1.10 pkgsrc/devel/protobuf/Makefile.common:1.11 --- pkgsrc/devel/protobuf/Makefile.common:1.10 Tue Jan 16 14:22:19 2018 +++ pkgsrc/devel/protobuf/Makefile.common Sat Aug 4 21:19:39 2018 @@ -1,9 +1,9 @@ -# $NetBSD: Makefile.common,v 1.10 2018/01/16 14:22:19 mef Exp $ +# $NetBSD: Makefile.common,v 1.11 2018/08/04 21:19:39 minskim Exp $ # # used by devel/protobuf/Makefile # used by devel/py-protobuf/Makefile -PROTOBUFVER= 3.5.1 +PROTOBUFVER= 3.6.0 MASTER_SITES= ${MASTER_SITE_GITHUB:=google/} GITHUB_PROJECT= protobuf Index: pkgsrc/devel/protobuf/PLIST diff -u pkgsrc/devel/protobuf/PLIST:1.9 pkgsrc/devel/protobuf/PLIST:1.10 --- pkgsrc/devel/protobuf/PLIST:1.9 Fri Nov 17 22:09:11 2017 +++ pkgsrc/devel/protobuf/PLIST Sat Aug 4 21:19:39 2018 @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.9 2017/11/17 22:09:11 he Exp $ +@comment $NetBSD: PLIST,v 1.10 2018/08/04 21:19:39 minskim Exp $ bin/protoc include/google/protobuf/any.h include/google/protobuf/any.pb.h @@ -16,7 +16,6 @@ include/google/protobuf/compiler/csharp/ include/google/protobuf/compiler/importer.h include/google/protobuf/compiler/java/java_generator.h include/google/protobuf/compiler/java/java_names.h -include/google/protobuf/compiler/javanano/javanano_generator.h include/google/protobuf/compiler/js/js_generator.h include/google/protobuf/compiler/js/well_known_types_embed.h include/google/protobuf/compiler/objectivec/objectivec_generator.h @@ -46,6 +45,8 @@ include/google/protobuf/generated_messag include/google/protobuf/generated_message_table_driven.h include/google/protobuf/generated_message_util.h include/google/protobuf/has_bits.h +include/google/protobuf/implicit_weak_message.h +include/google/protobuf/inlined_string_field.h include/google/protobuf/io/coded_stream.h include/google/protobuf/io/gzip_stream.h include/google/protobuf/io/printer.h @@ -73,20 +74,6 @@ include/google/protobuf/source_context.p include/google/protobuf/source_context.proto include/google/protobuf/struct.pb.h include/google/protobuf/struct.proto -include/google/protobuf/stubs/atomic_sequence_num.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_generic_c11_atomic.h -include/google/protobuf/stubs/atomicops_internals_generic_gcc.h -include/google/protobuf/stubs/atomicops_internals_mips_gcc.h -include/google/protobuf/stubs/atomicops_internals_power.h -include/google/protobuf/stubs/atomicops_internals_ppc_gcc.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/bytestream.h include/google/protobuf/stubs/callback.h include/google/protobuf/stubs/casts.h @@ -99,14 +86,11 @@ include/google/protobuf/stubs/mutex.h include/google/protobuf/stubs/once.h include/google/protobuf/stubs/platform_macros.h include/google/protobuf/stubs/port.h -include/google/protobuf/stubs/scoped_ptr.h -include/google/protobuf/stubs/shared_ptr.h include/google/protobuf/stubs/singleton.h include/google/protobuf/stubs/status.h include/google/protobuf/stubs/stl_util.h include/google/protobuf/stubs/stringpiece.h include/google/protobuf/stubs/template_util.h -include/google/protobuf/stubs/type_traits.h include/google/protobuf/text_format.h include/google/protobuf/timestamp.pb.h include/google/protobuf/timestamp.proto Index: pkgsrc/devel/protobuf/buildlink3.mk diff -u pkgsrc/devel/protobuf/buildlink3.mk:1.5 pkgsrc/devel/protobuf/buildlink3.mk:1.6 --- pkgsrc/devel/protobuf/buildlink3.mk:1.5 Wed Jan 17 12:10:37 2018 +++ pkgsrc/devel/protobuf/buildlink3.mk Sat Aug 4 21:19:39 2018 @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.5 2018/01/17 12:10:37 jperkin Exp $ +# $NetBSD: buildlink3.mk,v 1.6 2018/08/04 21:19:39 minskim Exp $ BUILDLINK_TREE+= protobuf @@ -6,7 +6,7 @@ BUILDLINK_TREE+= protobuf PROTOBUF_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.protobuf+= protobuf>=3.0.0 -BUILDLINK_ABI_DEPENDS.protobuf?= protobuf>=3.5.1nb1 +BUILDLINK_ABI_DEPENDS.protobuf?= protobuf>=3.6.0 BUILDLINK_PKGSRCDIR.protobuf?= ../../devel/protobuf .include "../../devel/zlib/buildlink3.mk" Index: pkgsrc/devel/protobuf/distinfo diff -u pkgsrc/devel/protobuf/distinfo:1.19 pkgsrc/devel/protobuf/distinfo:1.20 --- pkgsrc/devel/protobuf/distinfo:1.19 Tue Jan 16 14:22:19 2018 +++ pkgsrc/devel/protobuf/distinfo Sat Aug 4 21:19:39 2018 @@ -1,14 +1,12 @@ -$NetBSD: distinfo,v 1.19 2018/01/16 14:22:19 mef Exp $ +$NetBSD: distinfo,v 1.20 2018/08/04 21:19:39 minskim Exp $ -SHA1 (protobuf-cpp-3.5.1.tar.gz) = c63ba5e9c737abf83aa2b3f86229d2d65f682c56 -RMD160 (protobuf-cpp-3.5.1.tar.gz) = 21375095e562cfee25ba68d68e481cf608ac9a9a -SHA512 (protobuf-cpp-3.5.1.tar.gz) = 195ccb210229e0a1080dcdb0a1d87b2e421ad55f6b036c56db3183bd50a942c75b4cc84e6af8a10ad88022a247781a06f609a145a461dfbb8f04051b7dd714b3 -Size (protobuf-cpp-3.5.1.tar.gz) = 4272851 bytes -SHA1 (patch-configure) = ec7003c29d2d3e9aeb9ea90921313e9eb68d3127 +SHA1 (protobuf-cpp-3.6.0.tar.gz) = d211759135fca52daa2d625f27c386acbe65495f +RMD160 (protobuf-cpp-3.6.0.tar.gz) = f7bded7812f4740297d297f6bc2550c4aeb63c90 +SHA512 (protobuf-cpp-3.6.0.tar.gz) = 469a85026ca45dc43ccd01221d098905a244e92ca79a6681fae528a3a539184475e14fff9898a0eb82654782fd60c5e4650896b5ce7c7ab3f1baa879251c94b3 +Size (protobuf-cpp-3.6.0.tar.gz) = 4454101 bytes +SHA1 (patch-configure) = a35883ff62ba1db429a6cbc12b75714e78e28abf SHA1 (patch-configure.ac) = 208a5ce72905aa95ad73ee0f751d4a58f0c37f5f -SHA1 (patch-gmock_configure) = a39355c602366450e3cdb6bc7dbc0523fc194319 -SHA1 (patch-gmock_configure.ac) = cfd7b7c87eff4b06ce6ecb34dec046561bbdc113 SHA1 (patch-m4_acx__check__suncc.m4) = faf96ee5d305c08d30e7c7d3578896971983e1dd SHA1 (patch-src_google_protobuf_message__lite.cc) = 8f2ffe07b2710de5365148153978ad6d9939f522 -SHA1 (patch-src_google_protobuf_stubs_atomicops.h) = 9ec851134da674980a49302e9582a432a47f7974 -SHA1 (patch-src_google_protobuf_stubs_atomicops__internals__arm__gcc.h) = d60c554be8ff7fc9370bb036eef9101f9a6433e3 +SHA1 (patch-third__party_googletest_googlemock_configure) = fe3b812e819130d87d99316144507d2454461cd1 +SHA1 (patch-third__party_googletest_googlemock_configure.ac) = dc06fc7aebaef02df536458e45f77386cc857261 Index: pkgsrc/devel/protobuf/patches/patch-configure diff -u pkgsrc/devel/protobuf/patches/patch-configure:1.2 pkgsrc/devel/protobuf/patches/patch-configure:1.3 --- pkgsrc/devel/protobuf/patches/patch-configure:1.2 Tue May 2 10:51:31 2017 +++ pkgsrc/devel/protobuf/patches/patch-configure Sat Aug 4 21:19:39 2018 @@ -1,10 +1,170 @@ -$NetBSD: patch-configure,v 1.2 2017/05/02 10:51:31 wiz Exp $ +$NetBSD: patch-configure,v 1.3 2018/08/04 21:19:39 minskim Exp $ Fix unportable test(1) operator. ---- configure.orig 2017-04-06 00:37:52.000000000 +0000 +--- configure.orig 2018-06-06 19:44:06.000000000 +0000 +++ configure -@@ -18003,7 +18003,7 @@ fi +@@ -787,7 +787,6 @@ infodir + docdir + oldincludedir + includedir +-runstatedir + localstatedir + sharedstatedir + sysconfdir +@@ -882,7 +881,6 @@ datadir='${datarootdir}' + sysconfdir='${prefix}/etc' + sharedstatedir='${prefix}/com' + localstatedir='${prefix}/var' +-runstatedir='${localstatedir}/run' + includedir='${prefix}/include' + oldincludedir='/usr/include' + docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' +@@ -1135,15 +1133,6 @@ do + | -silent | --silent | --silen | --sile | --sil) + silent=yes ;; + +- -runstatedir | --runstatedir | --runstatedi | --runstated \ +- | --runstate | --runstat | --runsta | --runst | --runs \ +- | --run | --ru | --r) +- ac_prev=runstatedir ;; +- -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ +- | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ +- | --run=* | --ru=* | --r=*) +- runstatedir=$ac_optarg ;; +- + -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) + ac_prev=sbindir ;; + -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ +@@ -1281,7 +1270,7 @@ fi + for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ + datadir sysconfdir sharedstatedir localstatedir includedir \ + oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ +- libdir localedir mandir runstatedir ++ libdir localedir mandir + do + eval ac_val=\$$ac_var + # Remove trailing slashes. +@@ -1434,7 +1423,6 @@ Fine tuning of the installation director + --sysconfdir=DIR read-only single-machine data [PREFIX/etc] + --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] + --localstatedir=DIR modifiable single-machine data [PREFIX/var] +- --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] + --libdir=DIR object code libraries [EPREFIX/lib] + --includedir=DIR C header files [PREFIX/include] + --oldincludedir=DIR C header files for non-gcc [/usr/include] +@@ -7600,7 +7588,7 @@ fi + fi + + case $host_os in +- *solaris*) ++ *notsolaris*) + for ac_prog in isainfo + do + # Extract the first word of "$ac_prog", so it can be a program name with args. +@@ -8796,7 +8784,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu + lt_cv_deplibs_check_method=pass_all + ;; + +-netbsd* | netbsdelf*-gnu) ++netbsd*) + if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then + lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' + else +@@ -12231,9 +12219,6 @@ $as_echo_n "checking whether the $compil + openbsd* | bitrig*) + with_gnu_ld=no + ;; +- linux* | k*bsd*-gnu | gnu*) +- link_all_deplibs=no +- ;; + esac + + ld_shlibs=yes +@@ -12488,7 +12473,7 @@ _LT_EOF + fi + ;; + +- netbsd* | netbsdelf*-gnu) ++ netbsd*) + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' + wlarc= +@@ -13158,7 +13143,6 @@ $as_echo "$lt_cv_irix_exported_symbol" > + if test yes = "$lt_cv_irix_exported_symbol"; then + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib' + fi +- link_all_deplibs=no + else + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' + archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -exports_file $export_symbols -o $lib' +@@ -13180,7 +13164,7 @@ $as_echo "$lt_cv_irix_exported_symbol" > + esac + ;; + +- netbsd* | netbsdelf*-gnu) ++ netbsd*) + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out + else +@@ -14295,18 +14279,6 @@ fi + dynamic_linker='GNU/Linux ld.so' + ;; + +-netbsdelf*-gnu) +- version_type=linux +- need_lib_prefix=no +- need_version=no +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- shlibpath_var=LD_LIBRARY_PATH +- shlibpath_overrides_runpath=no +- hardcode_into_libs=yes +- dynamic_linker='NetBSD ld.elf_so' +- ;; +- + netbsd*) + version_type=sunos + need_lib_prefix=no +@@ -17201,7 +17173,7 @@ lt_prog_compiler_static_CXX= + ;; + esac + ;; +- netbsd* | netbsdelf*-gnu) ++ netbsd*) + ;; + *qnx* | *nto*) + # QNX uses GNU C++, but need to define -shared option too, otherwise +@@ -17576,9 +17548,6 @@ $as_echo_n "checking whether the $compil + ;; + esac + ;; +- linux* | k*bsd*-gnu | gnu*) +- link_all_deplibs_CXX=no +- ;; + *) + export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' + ;; +@@ -18272,18 +18241,6 @@ fi + dynamic_linker='GNU/Linux ld.so' + ;; + +-netbsdelf*-gnu) +- version_type=linux +- need_lib_prefix=no +- need_version=no +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- shlibpath_var=LD_LIBRARY_PATH +- shlibpath_overrides_runpath=no +- hardcode_into_libs=yes +- dynamic_linker='NetBSD ld.elf_so' +- ;; +- + netbsd*) + version_type=sunos + need_lib_prefix=no +@@ -18661,7 +18618,7 @@ fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LDFLAGS=$save_LDFLAGS @@ -13,3 +173,11 @@ Fix unportable test(1) operator. HAVE_LD_VERSION_SCRIPT_TRUE= HAVE_LD_VERSION_SCRIPT_FALSE='#' else +@@ -22590,6 +22549,7 @@ $as_echo X"$file" | + cat <<_LT_EOF >> "$cfgfile" + #! $SHELL + # Generated automatically by $as_me ($PACKAGE) $VERSION ++# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: + # NOTE: Changes made to this file will be lost: look at ltmain.sh. + + # Provide generalized library-building support services. Added files: Index: pkgsrc/devel/protobuf/patches/patch-third__party_googletest_googlemock_configure diff -u /dev/null pkgsrc/devel/protobuf/patches/patch-third__party_googletest_googlemock_configure:1.1 --- /dev/null Sat Aug 4 21:19:39 2018 +++ pkgsrc/devel/protobuf/patches/patch-third__party_googletest_googlemock_configure Sat Aug 4 21:19:39 2018 @@ -0,0 +1,24 @@ +$NetBSD: patch-third__party_googletest_googlemock_configure,v 1.1 2018/08/04 21:19:39 minskim Exp $ + +Fix shell portability issues. + +--- third_party/googletest/googlemock/configure.orig 2018-07-31 00:19:25.000000000 +0000 ++++ third_party/googletest/googlemock/configure +@@ -16355,7 +16355,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 +@@ -16385,7 +16385,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 Index: pkgsrc/devel/protobuf/patches/patch-third__party_googletest_googlemock_configure.ac diff -u /dev/null pkgsrc/devel/protobuf/patches/patch-third__party_googletest_googlemock_configure.ac:1.1 --- /dev/null Sat Aug 4 21:19:39 2018 +++ pkgsrc/devel/protobuf/patches/patch-third__party_googletest_googlemock_configure.ac Sat Aug 4 21:19:39 2018 @@ -0,0 +1,24 @@ +$NetBSD: patch-third__party_googletest_googlemock_configure.ac,v 1.1 2018/08/04 21:19:39 minskim Exp $ + +Fix shell portability issues. + +--- third_party/googletest/googlemock/configure.ac.orig 2018-05-17 17:42:54.000000000 +0000 ++++ third_party/googletest/googlemock/configure.ac +@@ -52,7 +52,7 @@ AS_IF([test "x$with_pthreads" != "xno"], + [AC_MSG_FAILURE( + [--with-pthreads was specified, but unable to be used])])]) + have_pthreads="$acx_pthread_ok"]) +-AM_CONDITIONAL([HAVE_PTHREADS],[test "x$have_pthreads" == "xyes"]) ++AM_CONDITIONAL([HAVE_PTHREADS],[test "x$have_pthreads" = "xyes"]) + AC_SUBST(PTHREAD_CFLAGS) + AC_SUBST(PTHREAD_LIBS) + +@@ -76,7 +76,7 @@ AC_ARG_ENABLE([external-gtest], + installed or user provided gtest. Any option to + '--with-gtest' is ignored. (Default is enabled.)]) + ], [], [enable_external_gtest=yes]) +-AS_IF([test "x$with_gtest" == "xno"], ++AS_IF([test "x$with_gtest" = "xno"], + [AC_MSG_ERROR([dnl + Support for GoogleTest was explicitly disabled. Currently GoogleMock has a hard + dependency upon GoogleTest to build, please provide a version, or allow --_----------=_1533417579268170--