pkgsrc-Changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc/devel



Module Name:    pkgsrc
Committed By:   wiz
Date:           Thu Nov  2 12:17:26 UTC 2023

Modified Files:
        pkgsrc/devel/protobuf: Makefile PLIST buildlink3.mk distinfo
        pkgsrc/devel/py-protobuf: Makefile PLIST distinfo
Removed Files:
        pkgsrc/devel/protobuf/patches: patch-configure
            patch-third__party_googletest_googlemock_configure

Log Message:
{,py-}protobuf: update to 24.4

Based on wip package by bsiegert.

Ten months of heavy development.


To generate a diff of this commit:
cvs rdiff -u -r1.67 -r1.68 pkgsrc/devel/protobuf/Makefile
cvs rdiff -u -r1.20 -r1.21 pkgsrc/devel/protobuf/PLIST
cvs rdiff -u -r1.13 -r1.14 pkgsrc/devel/protobuf/buildlink3.mk
cvs rdiff -u -r1.72 -r1.73 pkgsrc/devel/protobuf/distinfo
cvs rdiff -u -r1.6 -r0 pkgsrc/devel/protobuf/patches/patch-configure
cvs rdiff -u -r1.2 -r0 \
    pkgsrc/devel/protobuf/patches/patch-third__party_googletest_googlemock_configure
cvs rdiff -u -r1.65 -r1.66 pkgsrc/devel/py-protobuf/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/devel/py-protobuf/PLIST
cvs rdiff -u -r1.60 -r1.61 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/Makefile
diff -u pkgsrc/devel/protobuf/Makefile:1.67 pkgsrc/devel/protobuf/Makefile:1.68
--- pkgsrc/devel/protobuf/Makefile:1.67 Tue Jul 18 14:11:17 2023
+++ pkgsrc/devel/protobuf/Makefile      Thu Nov  2 12:17:25 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.67 2023/07/18 14:11:17 nia Exp $
+# $NetBSD: Makefile,v 1.68 2023/11/02 12:17:25 wiz Exp $
 #
 # When updating this, please also update devel/py-protobuf
 #
@@ -7,40 +7,31 @@
 # from before and after, and do a recursive PKGREVISION
 # bump if necessary
 
-DISTNAME=      protobuf-cpp-3.21.12
-PKGNAME=       ${DISTNAME:S/-cpp//}
+DISTNAME=      protobuf-24.4
 CATEGORIES=    devel
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=protocolbuffers/}
 GITHUB_PROJECT=        protobuf
-# attention, does not match version above!
-GITHUB_RELEASE=        v${PKGVERSION_NOREV:S/3.//}
+GITHUB_RELEASE=        v${PKGVERSION_NOREV}
 
 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++14
 
-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
+CMAKE_ARGS+=           -Dprotobuf_ABSL_PROVIDER=package
+CMAKE_ARGS+=           -Dprotobuf_BUILD_SHARED_LIBS=ON
+# requires googletest to be checked out in third_party/googletest
+CMAKE_ARGS+=           -Dprotobuf_BUILD_TESTS=OFF
 
-USE_CXX_FEATURES+=     c++11
-
-# 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/cmake/build.mk"
 #.include "../../devel/googletest/buildlink3.mk"
+BUILDLINK_API_DEPENDS.abseil+= abseil>=20230125.3
+.include "../../devel/abseil/buildlink3.mk"
 BUILDLINK_API_DEPENDS.zlib+=   zlib>=1.2.0.4
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"

Index: pkgsrc/devel/protobuf/PLIST
diff -u pkgsrc/devel/protobuf/PLIST:1.20 pkgsrc/devel/protobuf/PLIST:1.21
--- pkgsrc/devel/protobuf/PLIST:1.20    Mon Jul 18 14:19:52 2022
+++ pkgsrc/devel/protobuf/PLIST Thu Nov  2 12:17:25 2023
@@ -1,45 +1,132 @@
-@comment $NetBSD: PLIST,v 1.20 2022/07/18 14:19:52 wiz Exp $
+@comment $NetBSD: PLIST,v 1.21 2023/11/02 12:17:25 wiz Exp $
 bin/protoc
+bin/protoc-${PKGVERSION}.0
 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/arena_align.h
+include/google/protobuf/arena_allocation_policy.h
+include/google/protobuf/arena_cleanup.h
 include/google/protobuf/arenastring.h
 include/google/protobuf/arenaz_sampler.h
+include/google/protobuf/compiler/allowlists/allowlist.h
+include/google/protobuf/compiler/allowlists/allowlists.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/enum.h
+include/google/protobuf/compiler/cpp/extension.h
+include/google/protobuf/compiler/cpp/field.h
+include/google/protobuf/compiler/cpp/field_generators/generators.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/message.h
+include/google/protobuf/compiler/cpp/message_layout_helper.h
 include/google/protobuf/compiler/cpp/names.h
+include/google/protobuf/compiler/cpp/options.h
+include/google/protobuf/compiler/cpp/padding_optimizer.h
+include/google/protobuf/compiler/cpp/parse_function_generator.h
+include/google/protobuf/compiler/cpp/service.h
+include/google/protobuf/compiler/cpp/tracker.h
 include/google/protobuf/compiler/csharp/csharp_doc_comment.h
+include/google/protobuf/compiler/csharp/csharp_enum.h
+include/google/protobuf/compiler/csharp/csharp_enum_field.h
+include/google/protobuf/compiler/csharp/csharp_field_base.h
 include/google/protobuf/compiler/csharp/csharp_generator.h
-include/google/protobuf/compiler/csharp/csharp_names.h
+include/google/protobuf/compiler/csharp/csharp_helpers.h
+include/google/protobuf/compiler/csharp/csharp_map_field.h
+include/google/protobuf/compiler/csharp/csharp_message.h
+include/google/protobuf/compiler/csharp/csharp_message_field.h
 include/google/protobuf/compiler/csharp/csharp_options.h
+include/google/protobuf/compiler/csharp/csharp_primitive_field.h
+include/google/protobuf/compiler/csharp/csharp_reflection_class.h
+include/google/protobuf/compiler/csharp/csharp_repeated_enum_field.h
+include/google/protobuf/compiler/csharp/csharp_repeated_message_field.h
+include/google/protobuf/compiler/csharp/csharp_repeated_primitive_field.h
+include/google/protobuf/compiler/csharp/csharp_source_generator_base.h
+include/google/protobuf/compiler/csharp/csharp_wrapper_field.h
+include/google/protobuf/compiler/csharp/names.h
 include/google/protobuf/compiler/importer.h
+include/google/protobuf/compiler/java/context.h
+include/google/protobuf/compiler/java/doc_comment.h
+include/google/protobuf/compiler/java/enum.h
+include/google/protobuf/compiler/java/enum_field.h
+include/google/protobuf/compiler/java/enum_field_lite.h
+include/google/protobuf/compiler/java/enum_lite.h
+include/google/protobuf/compiler/java/extension.h
+include/google/protobuf/compiler/java/extension_lite.h
+include/google/protobuf/compiler/java/field.h
+include/google/protobuf/compiler/java/file.h
 include/google/protobuf/compiler/java/generator.h
-include/google/protobuf/compiler/java/java_generator.h
+include/google/protobuf/compiler/java/generator_factory.h
+include/google/protobuf/compiler/java/helpers.h
 include/google/protobuf/compiler/java/kotlin_generator.h
+include/google/protobuf/compiler/java/map_field.h
+include/google/protobuf/compiler/java/map_field_lite.h
+include/google/protobuf/compiler/java/message.h
+include/google/protobuf/compiler/java/message_builder.h
+include/google/protobuf/compiler/java/message_builder_lite.h
+include/google/protobuf/compiler/java/message_field.h
+include/google/protobuf/compiler/java/message_field_lite.h
+include/google/protobuf/compiler/java/message_lite.h
+include/google/protobuf/compiler/java/message_serialization.h
+include/google/protobuf/compiler/java/name_resolver.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/java/options.h
+include/google/protobuf/compiler/java/primitive_field.h
+include/google/protobuf/compiler/java/primitive_field_lite.h
+include/google/protobuf/compiler/java/service.h
+include/google/protobuf/compiler/java/shared_code_generator.h
+include/google/protobuf/compiler/java/string_field.h
+include/google/protobuf/compiler/java/string_field_lite.h
+include/google/protobuf/compiler/objectivec/enum.h
+include/google/protobuf/compiler/objectivec/enum_field.h
+include/google/protobuf/compiler/objectivec/extension.h
+include/google/protobuf/compiler/objectivec/field.h
+include/google/protobuf/compiler/objectivec/file.h
+include/google/protobuf/compiler/objectivec/generator.h
+include/google/protobuf/compiler/objectivec/helpers.h
+include/google/protobuf/compiler/objectivec/import_writer.h
+include/google/protobuf/compiler/objectivec/line_consumer.h
+include/google/protobuf/compiler/objectivec/map_field.h
+include/google/protobuf/compiler/objectivec/message.h
+include/google/protobuf/compiler/objectivec/message_field.h
+include/google/protobuf/compiler/objectivec/names.h
+include/google/protobuf/compiler/objectivec/nsobject_methods.h
+include/google/protobuf/compiler/objectivec/oneof.h
+include/google/protobuf/compiler/objectivec/options.h
+include/google/protobuf/compiler/objectivec/primitive_field.h
+include/google/protobuf/compiler/objectivec/text_format_decode_data.h
 include/google/protobuf/compiler/parser.h
+include/google/protobuf/compiler/php/names.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/helpers.h
 include/google/protobuf/compiler/python/pyi_generator.h
-include/google/protobuf/compiler/python/python_generator.h
+include/google/protobuf/compiler/retention.h
 include/google/protobuf/compiler/ruby/ruby_generator.h
+include/google/protobuf/compiler/rust/accessors/accessors.h
+include/google/protobuf/compiler/rust/context.h
+include/google/protobuf/compiler/rust/generator.h
+include/google/protobuf/compiler/rust/message.h
+include/google/protobuf/compiler/rust/naming.h
+include/google/protobuf/compiler/scc.h
+include/google/protobuf/compiler/subprocess.h
+include/google/protobuf/compiler/zip_writer.h
+include/google/protobuf/cpp_features.pb.h
+include/google/protobuf/cpp_features.proto
 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/descriptor_legacy.h
+include/google/protobuf/descriptor_visitor.h
 include/google/protobuf/duration.pb.h
 include/google/protobuf/duration.proto
 include/google/protobuf/dynamic_message.h
@@ -49,6 +136,7 @@ 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/feature_resolver.h
 include/google/protobuf/field_access_listener.h
 include/google/protobuf/field_mask.pb.h
 include/google/protobuf/field_mask.proto
@@ -57,20 +145,35 @@ include/google/protobuf/generated_enum_u
 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_gen.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/internal_message_util.h
+include/google/protobuf/internal_visibility.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_sink.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/json/internal/descriptor_traits.h
+include/google/protobuf/json/internal/lexer.h
+include/google/protobuf/json/internal/message_path.h
+include/google/protobuf/json/internal/parser.h
+include/google/protobuf/json/internal/parser_traits.h
+include/google/protobuf/json/internal/unparser.h
+include/google/protobuf/json/internal/unparser_traits.h
+include/google/protobuf/json/internal/untyped_message.h
+include/google/protobuf/json/internal/writer.h
+include/google/protobuf/json/internal/zero_copy_buffered_stream.h
+include/google/protobuf/json/json.h
 include/google/protobuf/map.h
 include/google/protobuf/map_entry.h
 include/google/protobuf/map_entry_lite.h
@@ -86,34 +189,27 @@ 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/raw_ptr.h
 include/google/protobuf/reflection.h
 include/google/protobuf/reflection_internal.h
+include/google/protobuf/reflection_mode.h
 include/google/protobuf/reflection_ops.h
 include/google/protobuf/repeated_field.h
 include/google/protobuf/repeated_ptr_field.h
+include/google/protobuf/serial_arena.h
 include/google/protobuf/service.h
 include/google/protobuf/source_context.pb.h
 include/google/protobuf/source_context.proto
+include/google/protobuf/string_block.h
 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/stubs/status_macros.h
 include/google/protobuf/text_format.h
+include/google/protobuf/thread_safe_arena.h
 include/google/protobuf/timestamp.pb.h
 include/google/protobuf/timestamp.proto
 include/google/protobuf/type.pb.h
@@ -127,12 +223,31 @@ include/google/protobuf/util/message_dif
 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/varint_shuffle.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
+include/utf8_range.h
+include/utf8_validity.h
+lib/cmake/protobuf/protobuf-config-version.cmake
+lib/cmake/protobuf/protobuf-config.cmake
+lib/cmake/protobuf/protobuf-generate.cmake
+lib/cmake/protobuf/protobuf-module.cmake
+lib/cmake/protobuf/protobuf-options.cmake
+lib/cmake/protobuf/protobuf-targets-noconfig.cmake
+lib/cmake/protobuf/protobuf-targets.cmake
+lib/cmake/utf8_range/utf8_range-config.cmake
+lib/cmake/utf8_range/utf8_range-targets-noconfig.cmake
+lib/cmake/utf8_range/utf8_range-targets.cmake
+lib/libprotobuf-lite.so
+lib/libprotobuf-lite.so.${PKGVERSION}.0
+lib/libprotobuf.so
+lib/libprotobuf.so.${PKGVERSION}.0
+lib/libprotoc.so
+lib/libprotoc.so.${PKGVERSION}.0
+lib/libutf8_range.a
+lib/libutf8_validity.a
 lib/pkgconfig/protobuf-lite.pc
 lib/pkgconfig/protobuf.pc
+lib/pkgconfig/utf8_range.pc

Index: pkgsrc/devel/protobuf/buildlink3.mk
diff -u pkgsrc/devel/protobuf/buildlink3.mk:1.13 pkgsrc/devel/protobuf/buildlink3.mk:1.14
--- pkgsrc/devel/protobuf/buildlink3.mk:1.13    Tue Jul 18 14:11:17 2023
+++ pkgsrc/devel/protobuf/buildlink3.mk Thu Nov  2 12:17:25 2023
@@ -1,14 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.13 2023/07/18 14:11:17 nia Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2023/11/02 12:17:25 wiz Exp $
 
 BUILDLINK_TREE+=       protobuf
 
 .if !defined(PROTOBUF_BUILDLINK3_MK)
 PROTOBUF_BUILDLINK3_MK:=
 
-USE_CXX_FEATURES+=     c++11
-
-BUILDLINK_API_DEPENDS.protobuf+=       protobuf>=3.0.0
-BUILDLINK_ABI_DEPENDS.protobuf+=       protobuf>=3.19.0nb1
+BUILDLINK_API_DEPENDS.protobuf+=       protobuf>=24.4
+BUILDLINK_ABI_DEPENDS.protobuf+=       protobuf>=24.4
 BUILDLINK_PKGSRCDIR.protobuf?=         ../../devel/protobuf
 
 .include "../../devel/zlib/buildlink3.mk"

Index: pkgsrc/devel/protobuf/distinfo
diff -u pkgsrc/devel/protobuf/distinfo:1.72 pkgsrc/devel/protobuf/distinfo:1.73
--- pkgsrc/devel/protobuf/distinfo:1.72 Fri Dec 16 10:22:57 2022
+++ pkgsrc/devel/protobuf/distinfo      Thu Nov  2 12:17:25 2023
@@ -1,7 +1,5 @@
-$NetBSD: distinfo,v 1.72 2022/12/16 10:22:57 adam Exp $
+$NetBSD: distinfo,v 1.73 2023/11/02 12:17:25 wiz 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
+BLAKE2s (protobuf-24.4.tar.gz) = 24c808cbdca22e4d21a9cac1cd68809b8f8800828d4fe99b0517aadf81e55e69
+SHA512 (protobuf-24.4.tar.gz) = 52b6ab5587d03cbd1f35cf3cdc388e1710fa50f3031559ac53cf754965407ded7602cdead56080444ab695588112cc3391a1d7fdd5e565d90d0af7ad08706315
+Size (protobuf-24.4.tar.gz) = 5180235 bytes

Index: pkgsrc/devel/py-protobuf/Makefile
diff -u pkgsrc/devel/py-protobuf/Makefile:1.65 pkgsrc/devel/py-protobuf/Makefile:1.66
--- pkgsrc/devel/py-protobuf/Makefile:1.65      Wed Mar 29 09:34:09 2023
+++ pkgsrc/devel/py-protobuf/Makefile   Thu Nov  2 12:17:25 2023
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.65 2023/03/29 09:34:09 wiz Exp $
+# $NetBSD: Makefile,v 1.66 2023/11/02 12:17:25 wiz Exp $
 
-DISTNAME=      protobuf-4.21.12
+DISTNAME=      protobuf-4.24.4
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=    devel python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=p/protobuf/}
@@ -10,24 +10,14 @@ HOMEPAGE=   https://developers.google.com/
 COMMENT=       Python bindings for protobuf
 LICENSE=       modified-bsd
 
+TOOL_DEPENDS+= ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools
+TOOL_DEPENDS+= ${PYPKGPREFIX}-wheel-[0-9]*:../../devel/py-wheel
+
 USE_LANGUAGES+=        c c++11
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 
 MAKE_ENV+=     PROTOC=${PREFIX}/bin/protoc
-PLIST_VARS+=   cpp
-
-.include "../../lang/python/pyversion.mk"
-
-.if ${PYTHON_VERSION} < 311
-# As of 4.21.9, the sources do contain outdated code that only supports Python < 3.11
-# https://github.com/protocolbuffers/protobuf/issues/11031#issuecomment-1321390551
-# Do not use C++ implementation for Python 3.11.
-PYSETUPBUILDARGS=      --cpp_implementation
-PYSETUPINSTALLARGS=    --cpp_implementation
-PLIST.cpp=             yes
-.include "../../devel/protobuf/buildlink3.mk"
-.endif
 
-.include "../../lang/python/egg.mk"
+.include "../../lang/python/wheel.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/py-protobuf/PLIST
diff -u pkgsrc/devel/py-protobuf/PLIST:1.19 pkgsrc/devel/py-protobuf/PLIST:1.20
--- pkgsrc/devel/py-protobuf/PLIST:1.19 Sun Dec  4 17:38:45 2022
+++ pkgsrc/devel/py-protobuf/PLIST      Thu Nov  2 12:17:25 2023
@@ -1,10 +1,5 @@
-@comment $NetBSD: PLIST,v 1.19 2022/12/04 17:38:45 adam Exp $
-${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
-${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
-${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
-${PYSITELIB}/${EGG_INFODIR}/namespace_packages.txt
-${PYSITELIB}/${EGG_INFODIR}/top_level.txt
-${PYSITELIB}/${EGG_NAME}-nspkg.pth
+@comment $NetBSD: PLIST,v 1.20 2023/11/02 12:17:25 wiz Exp $
+${PYSITELIB}/google/_upb/_message.so
 ${PYSITELIB}/google/protobuf/__init__.py
 ${PYSITELIB}/google/protobuf/__init__.pyc
 ${PYSITELIB}/google/protobuf/__init__.pyo
@@ -44,7 +39,9 @@ ${PYSITELIB}/google/protobuf/field_mask_
 ${PYSITELIB}/google/protobuf/internal/__init__.py
 ${PYSITELIB}/google/protobuf/internal/__init__.pyc
 ${PYSITELIB}/google/protobuf/internal/__init__.pyo
-${PLIST.cpp}${PYSITELIB}/google/protobuf/internal/_api_implementation.so
+${PYSITELIB}/google/protobuf/internal/_parameterized.py
+${PYSITELIB}/google/protobuf/internal/_parameterized.pyc
+${PYSITELIB}/google/protobuf/internal/_parameterized.pyo
 ${PYSITELIB}/google/protobuf/internal/api_implementation.py
 ${PYSITELIB}/google/protobuf/internal/api_implementation.pyc
 ${PYSITELIB}/google/protobuf/internal/api_implementation.pyo
@@ -66,12 +63,18 @@ ${PYSITELIB}/google/protobuf/internal/en
 ${PYSITELIB}/google/protobuf/internal/extension_dict.py
 ${PYSITELIB}/google/protobuf/internal/extension_dict.pyc
 ${PYSITELIB}/google/protobuf/internal/extension_dict.pyo
+${PYSITELIB}/google/protobuf/internal/field_mask.py
+${PYSITELIB}/google/protobuf/internal/field_mask.pyc
+${PYSITELIB}/google/protobuf/internal/field_mask.pyo
 ${PYSITELIB}/google/protobuf/internal/message_listener.py
 ${PYSITELIB}/google/protobuf/internal/message_listener.pyc
 ${PYSITELIB}/google/protobuf/internal/message_listener.pyo
 ${PYSITELIB}/google/protobuf/internal/python_message.py
 ${PYSITELIB}/google/protobuf/internal/python_message.pyc
 ${PYSITELIB}/google/protobuf/internal/python_message.pyo
+${PYSITELIB}/google/protobuf/internal/testing_refleaks.py
+${PYSITELIB}/google/protobuf/internal/testing_refleaks.pyc
+${PYSITELIB}/google/protobuf/internal/testing_refleaks.pyo
 ${PYSITELIB}/google/protobuf/internal/type_checkers.py
 ${PYSITELIB}/google/protobuf/internal/type_checkers.pyc
 ${PYSITELIB}/google/protobuf/internal/type_checkers.pyo
@@ -96,7 +99,6 @@ ${PYSITELIB}/google/protobuf/proto_build
 ${PYSITELIB}/google/protobuf/pyext/__init__.py
 ${PYSITELIB}/google/protobuf/pyext/__init__.pyc
 ${PYSITELIB}/google/protobuf/pyext/__init__.pyo
-${PLIST.cpp}${PYSITELIB}/google/protobuf/pyext/_message.so
 ${PYSITELIB}/google/protobuf/pyext/cpp_message.py
 ${PYSITELIB}/google/protobuf/pyext/cpp_message.pyc
 ${PYSITELIB}/google/protobuf/pyext/cpp_message.pyo
@@ -136,12 +138,12 @@ ${PYSITELIB}/google/protobuf/unknown_fie
 ${PYSITELIB}/google/protobuf/util/__init__.py
 ${PYSITELIB}/google/protobuf/util/__init__.pyc
 ${PYSITELIB}/google/protobuf/util/__init__.pyo
-${PYSITELIB}/google/protobuf/util/json_format_pb2.py
-${PYSITELIB}/google/protobuf/util/json_format_pb2.pyc
-${PYSITELIB}/google/protobuf/util/json_format_pb2.pyo
-${PYSITELIB}/google/protobuf/util/json_format_proto3_pb2.py
-${PYSITELIB}/google/protobuf/util/json_format_proto3_pb2.pyc
-${PYSITELIB}/google/protobuf/util/json_format_proto3_pb2.pyo
 ${PYSITELIB}/google/protobuf/wrappers_pb2.py
 ${PYSITELIB}/google/protobuf/wrappers_pb2.pyc
 ${PYSITELIB}/google/protobuf/wrappers_pb2.pyo
+${PYSITELIB}/protobuf-${PKGVERSION}-py3.12-nspkg.pth
+${PYSITELIB}/${WHEEL_INFODIR}/METADATA
+${PYSITELIB}/${WHEEL_INFODIR}/RECORD
+${PYSITELIB}/${WHEEL_INFODIR}/WHEEL
+${PYSITELIB}/${WHEEL_INFODIR}/namespace_packages.txt
+${PYSITELIB}/${WHEEL_INFODIR}/top_level.txt

Index: pkgsrc/devel/py-protobuf/distinfo
diff -u pkgsrc/devel/py-protobuf/distinfo:1.60 pkgsrc/devel/py-protobuf/distinfo:1.61
--- pkgsrc/devel/py-protobuf/distinfo:1.60      Fri Dec 16 10:22:57 2022
+++ pkgsrc/devel/py-protobuf/distinfo   Thu Nov  2 12:17:25 2023
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.60 2022/12/16 10:22:57 adam Exp $
+$NetBSD: distinfo,v 1.61 2023/11/02 12:17:25 wiz Exp $
 
-BLAKE2s (protobuf-4.21.12.tar.gz) = feed257cc7349da49ba4a63c1b8e5cbb9cb80aae36cd258ad7694732bf43fd9e
-SHA512 (protobuf-4.21.12.tar.gz) = 9e7a9b126e58b8fa16d6c79450cc1e52740df2ab7253c141b2d8e00f3804ba691ee3be18f15aadcc39d56f40a9b1d167a7183a9cec8e68c1ff7f1c4b14ebf9e0
-Size (protobuf-4.21.12.tar.gz) = 220324 bytes
+BLAKE2s (protobuf-4.24.4.tar.gz) = 92a7afe379f7cefb40bc031db8aeba8403999d25ea5f91ec8c30d569f091dcfc
+SHA512 (protobuf-4.24.4.tar.gz) = cf108957e2387bdd5d9400c8c583ae40a0d958235bc6642443e1e34252bfea97ceb63472099755f4ec3b82317706e1b905302e3b68228f7a826d7f91fae0e797
+Size (protobuf-4.24.4.tar.gz) = 383850 bytes



Home | Main Index | Thread Index | Old Index