Copy devel/protobuf to wip/protobuf.

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: Copy devel/protobuf to wip/protobuf.
From: Benny Siegert <bsiegert%NetBSD.org@localhost>
Date: Sun, 16 Jul 2023 09:28:07 +0000
Module Name:	pkgsrc-wip
Committed By:	Benny Siegert <bsiegert%NetBSD.org@localhost>
Pushed By:	bsiegert
Date:		Sun Jul 16 11:28:07 2023 +0200
Changeset:	8739965d98da991746637cff7220d271e3250a5d

Modified Files:
	Makefile
Added Files:
	protobuf/DESCR
	protobuf/Makefile
	protobuf/PLIST
	protobuf/buildlink3.mk
	protobuf/distinfo
	protobuf/patches/patch-configure
	protobuf/patches/patch-third__party_googletest_googlemock_configure

Log Message:
Copy devel/protobuf to wip/protobuf.

The update to the latest version will take a bit of effort, since it is now
CMake-only.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=8739965d98da991746637cff7220d271e3250a5d

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

diffstat:
 Makefile                                           |   1 +
 protobuf/DESCR                                     |   3 +
 protobuf/Makefile                                  |  46 +++++++
 protobuf/PLIST                                     | 138 +++++++++++++++++++++
 protobuf/buildlink3.mk                             |  15 +++
 protobuf/distinfo                                  |   7 ++
 protobuf/patches/patch-configure                   |  15 +++
 ...ch-third__party_googletest_googlemock_configure |  24 ++++
 8 files changed, 249 insertions(+)

diffs:
diff --git a/Makefile b/Makefile
index 63198446b7..a6930954a8 100644
--- a/Makefile
+++ b/Makefile
@@ -3252,6 +3252,7 @@ SUBDIR+=	prometheus-lts
 SUBDIR+=	promtail
 SUBDIR+=	proplib
 SUBDIR+=	proselint
+SUBDIR+=	protobuf
 SUBDIR+=	proton-bridge
 SUBDIR+=	prover9
 SUBDIR+=	proxify
diff --git a/protobuf/DESCR b/protobuf/DESCR
new file mode 100644
index 0000000000..73df6ac90a
--- /dev/null
+++ b/protobuf/DESCR
@@ -0,0 +1,3 @@
+Protocol Buffers are a way of encoding structured data in an efficient yet
+extensible format. Google uses Protocol Buffers for almost all of its internal
+RPC protocols and file formats.
diff --git a/protobuf/Makefile b/protobuf/Makefile
new file mode 100644
index 0000000000..cd6dc41477
--- /dev/null
+++ b/protobuf/Makefile
@@ -0,0 +1,46 @@
+# $NetBSD: Makefile,v 1.66 2023/07/13 13:45:42 nia Exp $
+#
+# When updating this, please also update devel/py-protobuf
+#
+# Please note: this package often changes the major version
+# number of libraries, so please compare binary packages
+# from before and after, and do a recursive PKGREVISION
+# bump if necessary
+
+DISTNAME=	protobuf-cpp-3.21.12
+PKGNAME=	${DISTNAME:S/-cpp//}
+CATEGORIES=	devel
+MASTER_SITES=	${MASTER_SITE_GITHUB:=protocolbuffers/}
+GITHUB_PROJECT=	protobuf
+# attention, does not match version above!
+GITHUB_RELEASE=	v${PKGVERSION_NOREV:S/3.//}
+
+MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE=	https://github.com/protocolbuffers/protobuf
+COMMENT=	Google protocol buffers
+LICENSE=	modified-bsd
+
+WRKSRC=		${WRKDIR}/${DISTNAME:S/-cpp//}
+
+USE_LANGUAGES=		c c++11
+USE_LIBTOOL=		yes
+USE_TOOLS+=		gmake
+GNU_CONFIGURE=		yes
+PKGCONFIG_OVERRIDE+=	protobuf-lite.pc.in
+PKGCONFIG_OVERRIDE+=	protobuf.pc.in
+TEST_TARGET=		check
+
+# false positive: the Makefile generates bash programs
+CHECK_PORTABILITY_SKIP=		benchmarks/Makefile.in
+# the [[ command will skip a test that would otherwise run
+CHECK_PORTABILITY_SKIP+=	src/google/protobuf/compiler/zip_output_unittest.sh
+
+SET_LIBDIR=	yes
+
+# included in third_party
+#.include "../../devel/googletest/buildlink3.mk"
+BUILDLINK_API_DEPENDS.zlib+=	zlib>=1.2.0.4
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
+.include "../../mk/atomic64.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/protobuf/PLIST b/protobuf/PLIST
new file mode 100644
index 0000000000..8a6380f746
--- /dev/null
+++ b/protobuf/PLIST
@@ -0,0 +1,138 @@
+@comment $NetBSD: PLIST,v 1.20 2022/07/18 14:19:52 wiz Exp $
+bin/protoc
+include/google/protobuf/any.h
+include/google/protobuf/any.pb.h
+include/google/protobuf/any.proto
+include/google/protobuf/api.pb.h
+include/google/protobuf/api.proto
+include/google/protobuf/arena.h
+include/google/protobuf/arena_impl.h
+include/google/protobuf/arenastring.h
+include/google/protobuf/arenaz_sampler.h
+include/google/protobuf/compiler/code_generator.h
+include/google/protobuf/compiler/command_line_interface.h
+include/google/protobuf/compiler/cpp/cpp_generator.h
+include/google/protobuf/compiler/cpp/file.h
+include/google/protobuf/compiler/cpp/generator.h
+include/google/protobuf/compiler/cpp/helpers.h
+include/google/protobuf/compiler/cpp/names.h
+include/google/protobuf/compiler/csharp/csharp_doc_comment.h
+include/google/protobuf/compiler/csharp/csharp_generator.h
+include/google/protobuf/compiler/csharp/csharp_names.h
+include/google/protobuf/compiler/csharp/csharp_options.h
+include/google/protobuf/compiler/importer.h
+include/google/protobuf/compiler/java/generator.h
+include/google/protobuf/compiler/java/java_generator.h
+include/google/protobuf/compiler/java/kotlin_generator.h
+include/google/protobuf/compiler/java/names.h
+include/google/protobuf/compiler/objectivec/objectivec_generator.h
+include/google/protobuf/compiler/objectivec/objectivec_helpers.h
+include/google/protobuf/compiler/parser.h
+include/google/protobuf/compiler/php/php_generator.h
+include/google/protobuf/compiler/plugin.h
+include/google/protobuf/compiler/plugin.pb.h
+include/google/protobuf/compiler/plugin.proto
+include/google/protobuf/compiler/python/generator.h
+include/google/protobuf/compiler/python/pyi_generator.h
+include/google/protobuf/compiler/python/python_generator.h
+include/google/protobuf/compiler/ruby/ruby_generator.h
+include/google/protobuf/descriptor.h
+include/google/protobuf/descriptor.pb.h
+include/google/protobuf/descriptor.proto
+include/google/protobuf/descriptor_database.h
+include/google/protobuf/duration.pb.h
+include/google/protobuf/duration.proto
+include/google/protobuf/dynamic_message.h
+include/google/protobuf/empty.pb.h
+include/google/protobuf/empty.proto
+include/google/protobuf/endian.h
+include/google/protobuf/explicitly_constructed.h
+include/google/protobuf/extension_set.h
+include/google/protobuf/extension_set_inl.h
+include/google/protobuf/field_access_listener.h
+include/google/protobuf/field_mask.pb.h
+include/google/protobuf/field_mask.proto
+include/google/protobuf/generated_enum_reflection.h
+include/google/protobuf/generated_enum_util.h
+include/google/protobuf/generated_message_bases.h
+include/google/protobuf/generated_message_reflection.h
+include/google/protobuf/generated_message_tctable_decl.h
+include/google/protobuf/generated_message_tctable_impl.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/io_win32.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
+include/google/protobuf/io/zero_copy_stream_impl_lite.h
+include/google/protobuf/map.h
+include/google/protobuf/map_entry.h
+include/google/protobuf/map_entry_lite.h
+include/google/protobuf/map_field.h
+include/google/protobuf/map_field_inl.h
+include/google/protobuf/map_field_lite.h
+include/google/protobuf/map_type_handler.h
+include/google/protobuf/message.h
+include/google/protobuf/message_lite.h
+include/google/protobuf/metadata.h
+include/google/protobuf/metadata_lite.h
+include/google/protobuf/parse_context.h
+include/google/protobuf/port.h
+include/google/protobuf/port_def.inc
+include/google/protobuf/port_undef.inc
+include/google/protobuf/reflection.h
+include/google/protobuf/reflection_internal.h
+include/google/protobuf/reflection_ops.h
+include/google/protobuf/repeated_field.h
+include/google/protobuf/repeated_ptr_field.h
+include/google/protobuf/service.h
+include/google/protobuf/source_context.pb.h
+include/google/protobuf/source_context.proto
+include/google/protobuf/struct.pb.h
+include/google/protobuf/struct.proto
+include/google/protobuf/stubs/bytestream.h
+include/google/protobuf/stubs/callback.h
+include/google/protobuf/stubs/casts.h
+include/google/protobuf/stubs/common.h
+include/google/protobuf/stubs/hash.h
+include/google/protobuf/stubs/logging.h
+include/google/protobuf/stubs/macros.h
+include/google/protobuf/stubs/map_util.h
+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/status.h
+include/google/protobuf/stubs/stl_util.h
+include/google/protobuf/stubs/stringpiece.h
+include/google/protobuf/stubs/strutil.h
+include/google/protobuf/stubs/template_util.h
+include/google/protobuf/text_format.h
+include/google/protobuf/timestamp.pb.h
+include/google/protobuf/timestamp.proto
+include/google/protobuf/type.pb.h
+include/google/protobuf/type.proto
+include/google/protobuf/unknown_field_set.h
+include/google/protobuf/util/delimited_message_util.h
+include/google/protobuf/util/field_comparator.h
+include/google/protobuf/util/field_mask_util.h
+include/google/protobuf/util/json_util.h
+include/google/protobuf/util/message_differencer.h
+include/google/protobuf/util/time_util.h
+include/google/protobuf/util/type_resolver.h
+include/google/protobuf/util/type_resolver_util.h
+include/google/protobuf/wire_format.h
+include/google/protobuf/wire_format_lite.h
+include/google/protobuf/wrappers.pb.h
+include/google/protobuf/wrappers.proto
+lib/libprotobuf-lite.la
+lib/libprotobuf.la
+lib/libprotoc.la
+lib/pkgconfig/protobuf-lite.pc
+lib/pkgconfig/protobuf.pc
diff --git a/protobuf/buildlink3.mk b/protobuf/buildlink3.mk
new file mode 100644
index 0000000000..e651bd576a
--- /dev/null
+++ b/protobuf/buildlink3.mk
@@ -0,0 +1,15 @@
+# $NetBSD: buildlink3.mk,v 1.12 2023/07/13 13:45:42 nia Exp $
+
+BUILDLINK_TREE+=	protobuf
+
+.if !defined(PROTOBUF_BUILDLINK3_MK)
+PROTOBUF_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.protobuf+=	protobuf>=3.0.0
+BUILDLINK_ABI_DEPENDS.protobuf+=	protobuf>=3.19.0nb1
+BUILDLINK_PKGSRCDIR.protobuf?=		../../devel/protobuf
+
+.include "../../devel/zlib/buildlink3.mk"
+.endif	# PROTOBUF_BUILDLINK3_MK
+
+BUILDLINK_TREE+=	-protobuf
diff --git a/protobuf/distinfo b/protobuf/distinfo
new file mode 100644
index 0000000000..65ece217a8
--- /dev/null
+++ b/protobuf/distinfo
@@ -0,0 +1,7 @@
+$NetBSD: distinfo,v 1.72 2022/12/16 10:22:57 adam Exp $
+
+BLAKE2s (protobuf-cpp-3.21.12.tar.gz) = 4d0f9f8861cbef58480bcf3852604dda335839aae4a41cee0c59b5f95a82609b
+SHA512 (protobuf-cpp-3.21.12.tar.gz) = 2307d405bee7a20fa11a04b27f3345304dae5bbcdadc3ff2099a6d5facd55951c4e158ae99d8d07bbfdfdb3fabc84ddc5b60fec06912d70e5655d6bed04fa873
+Size (protobuf-cpp-3.21.12.tar.gz) = 4842303 bytes
+SHA1 (patch-configure) = e9953648e5b3df015be007c1c424a564d1eb2bef
+SHA1 (patch-third__party_googletest_googlemock_configure) = 9afd8358eef2dffe7639ca70081f60535c116855
diff --git a/protobuf/patches/patch-configure b/protobuf/patches/patch-configure
new file mode 100644
index 0000000000..50e8ba781c
--- /dev/null
+++ b/protobuf/patches/patch-configure
@@ -0,0 +1,15 @@
+$NetBSD: patch-configure,v 1.6 2021/06/09 04:57:10 adam Exp $
+
+Disable Solaris ISA selection.
+
+--- configure.orig	2021-06-08 14:11:47.000000000 +0000
++++ configure
+@@ -7640,7 +7640,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.
diff --git a/protobuf/patches/patch-third__party_googletest_googlemock_configure b/protobuf/patches/patch-third__party_googletest_googlemock_configure
new file mode 100644
index 0000000000..7e72970986
--- /dev/null
+++ b/protobuf/patches/patch-third__party_googletest_googlemock_configure
@@ -0,0 +1,24 @@
+$NetBSD: patch-third__party_googletest_googlemock_configure,v 1.2 2021/10/06 08:09:19 adam Exp $
+
+Fix shell portability issues.
+
+--- third_party/googletest/googlemock/configure.orig	2021-10-05 18:30:06.000000000 +0000
++++ third_party/googletest/googlemock/configure
+@@ -17329,7 +17329,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
+@@ -17361,7 +17361,7 @@ else $as_nop
+   enable_external_gtest=yes
+ fi
+ 
+-if test "x$with_gtest" == "xno"
++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
Prev by Date: go121: update to 1.21rc3
Next by Date: protobuf: add my half-finished, half-baked update
Previous by Thread: go121: update to 1.21rc3
Next by Thread: protobuf: add my half-finished, half-baked update
Indexes:
Home | Main Index | Thread Index | Old Index