From nobody Sun Oct 09 15:38:47 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4MlmRW5bfYz4dwDv; Sun, 9 Oct 2022 15:38:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MlmRW5B2bz3ZZv; Sun, 9 Oct 2022 15:38:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665329927; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=M67UZ2Mypd06zMB9KmvNfzkF+FFXSQPLuHjX+e6+JHU=; b=dQ/K+NqYs6gf++dk0FzdNmLqSI3lNljOt4uzWCK8gwFNHx57jvQhDPuzkmTueWw/xQNtpv KWf6/65AszbTvQ+M6T56GUjvx/AFjZoIQc/TGZk5bF6IQpluzAF2IIZAsrothdLjGyYAAA m1CCyeCzONyG+BxQOErqwehLLuHAnGmflGE0BGoyfu26zLnAYbEaVrflB9bPxIzH64VNoX 7at7Z9C0sXCogtEWifZhLNCbo1ar/EWDMBUAdXu7vac+fxG53vXJL+fSRLVoIlsyDN/xT6 yUUmaLjQ45HmTd+lVFly3ozS2BawBUz+aXCLzYxJjKjot0NQ3oNcbmPfEgeFnQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4MlmRW4Ds7zKMt; Sun, 9 Oct 2022 15:38:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 299FclYK041455; Sun, 9 Oct 2022 15:38:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 299FcltI041454; Sun, 9 Oct 2022 15:38:47 GMT (envelope-from git) Date: Sun, 9 Oct 2022 15:38:47 GMT Message-Id: <202210091538.299FcltI041454@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: 6ba65f665d5e - main - databases/arrow: Fix b2b1773a8006931f49457a9341f2c6da6119de0e List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6ba65f665d5e1edf4e8867d72952c5515fe9ddce Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665329927; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=M67UZ2Mypd06zMB9KmvNfzkF+FFXSQPLuHjX+e6+JHU=; b=YzU8zsyHTK0+t5toVW8sbyBugeKWHnBmC4PLRurGV/u8SS61As7w/oTV8+4KzMOE2XsLIh 7LrYYAfLd0GguQcWEY2QnubfhE/UA+BYeCExH3sWERi9ivnupQYHm332n9e1O7ZQnpTMTn CGl7O31vEAqMiqiD/YK042Wx2Syp1MumQoP7LFr2ufUd+jBBEaBBmQw1dNMi6vklF0181D K+3eUIS0z4HVpc44EqVceNZhxlBvpsUVYoZ3vqx2sAEDYnAFNO+EZTMVDuRBqWvBVXKSVB TLGk76IdDkr/YHQaOzMNxuW47PWbmfr60h7G9XvwmxEwaPG2rVzavYwvVWKSOg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1665329927; a=rsa-sha256; cv=none; b=ODH0iJ2liuONFAonmTzfal0EUmQYqOmrMRad1CqHJRGWp6tsBB1aoFWJXgZWZWlVt736rU odGDny9cWTWyhWVlAL2CbU0N3yf4oROaNUBZi0EOK+pqlx2gZzVsKfQQSCDIJRqZBNZgYL T+STmyXfhGlSsr9xqSy+vKf//Uwy6Nhj/7oO04kpj/kfHPZ4RKWzgj6dFcZ+VYlMwpHUm0 0cfnd1f8JiFC6q0MtQrh43cssa2ZciuQ5AlDwJrlMbMWyLKj0+Y4TeHjXU51h54TDUGS2S 1AyBI5LKjRKdG6QXYl3y+B/9OyMMcJJwwaMh2Ae1J4g0iOi1vWqnSVqCkqDOyA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=6ba65f665d5e1edf4e8867d72952c5515fe9ddce commit 6ba65f665d5e1edf4e8867d72952c5515fe9ddce Author: Po-Chuan Hsieh AuthorDate: 2022-10-09 15:18:12 +0000 Commit: Po-Chuan Hsieh CommitDate: 2022-10-09 15:37:42 +0000 databases/arrow: Fix b2b1773a8006931f49457a9341f2c6da6119de0e It should be a PORTREVISION bump for shlib change of devel/grpc. Remove accidentally-committed local changes. --- databases/arrow/Makefile | 11 +---------- databases/arrow/pkg-plist | 14 +++----------- 2 files changed, 4 insertions(+), 21 deletions(-) diff --git a/databases/arrow/Makefile b/databases/arrow/Makefile index a5ca93052d42..ff17fdf15a9e 100644 --- a/databases/arrow/Makefile +++ b/databases/arrow/Makefile @@ -80,7 +80,7 @@ FLIGHT_LIB_DEPENDS= libgflags.so:devel/gflags \ libgrpc.so:devel/grpc \ libre2.so:devel/re2 FLIGHT_IMPLIES= IPC -#FLIGHT_BROKEN= configure breaks: Could not find a package configuration file provided by "re2" +FLIGHT_BROKEN= configure breaks: Could not find a package configuration file provided by "re2" GANDIVA_DESC= Gandiva libraries GANDIVA_USES= ssl @@ -90,7 +90,6 @@ GANDIVA_LIB_DEPENDS= libgrpc.so:devel/grpc \ libprotobuf.so:devel/protobuf \ libre2.so:devel/re2 \ libutf8proc.so:textproc/utf8proc -#GANDIVA_BROKEN= llvm12 stage error (ln: /wrkdirs/usr/ports/devel/llvm12/work/stage/usr/local/llvm12/bin/clang: No such file or directory) HDFS_DESC= Arrow HDFS bridge HDFS_CMAKE_BOOL= ARROW_HDFS @@ -137,7 +136,6 @@ PLASMA_LIB_DEPENDS= libaws-c-auth.so:security/aws-c-auth \ libaws-c-sdkutils.so:devel/aws-c-sdkutils \ libaws-crt-cpp.so:devel/aws-crt-cpp \ libgflags.so:devel/gflags -#PLASMA_BROKEN= PLIST issue (Error: Orphaned: bin/ONplasma-store-server, Error: Missing: bin/plasma-store-server) BUILD_UTILITIES_DESC= build Arrow commandline utilities BUILD_UTILITIES_CMAKE_BOOL= ARROW_BUILD_UTILITIES @@ -213,19 +211,12 @@ pre-configure-PYTHON-on: @${MV} ${WRKSRC}/src/arrow/python/arrow-python.pc.in ${WRKSRC}/src/arrow/python/arrow-python${PYTHON_SUFFIX}.pc.in @${MV} ${WRKSRC}/src/arrow/python/arrow-python-flight.pc.in ${WRKSRC}/src/arrow/python/arrow-python${PYTHON_SUFFIX}-flight.pc.in -post-install-PLASMA-on: - -${MV} ${STAGEDIR}${PREFIX}/bin/ONplasma-store-server ${STAGEDIR}${PREFIX}/bin/plasma-store-server - .include .if ${PORT_OPTIONS:MCOMPUTE} || ${PORT_OPTIONS:MFLIGHT} || ${PORT_OPTIONS:MGANDIVA} PLIST_FILES+= lib/cmake/arrow/Findre2Alt.cmake .endif -.if ${PORT_OPTIONS:MFLIGHT} || ${PORT_OPTIONS:MGANDIVA} -PLIST_FILES+= lib/cmake/arrow/FindgRPCAlt.cmake -.endif - .if ${PORT_OPTIONS:MPYTHON} == "PYTHON" && ${PORT_OPTIONS:MFLIGHT} == "FLIGHT" PLIST_SUB+= PYTHONFLIGHT="" .else diff --git a/databases/arrow/pkg-plist b/databases/arrow/pkg-plist index 2ef45cf28eaf..aa0ea34ded4f 100644 --- a/databases/arrow/pkg-plist +++ b/databases/arrow/pkg-plist @@ -106,19 +106,16 @@ include/arrow/extension_type.h %%FLIGHT%%include/arrow/flight/api.h %%FLIGHT%%include/arrow/flight/client.h %%FLIGHT%%include/arrow/flight/client_auth.h -%%FLIGHT%%include/arrow/flight/client_cookie_middleware.h %%FLIGHT%%include/arrow/flight/client_middleware.h +%%FLIGHT%%include/arrow/flight/customize_protobuf.h %%FLIGHT%%include/arrow/flight/middleware.h %%FLIGHT%%include/arrow/flight/pch.h %%FLIGHT%%include/arrow/flight/platform.h %%FLIGHT%%include/arrow/flight/server.h %%FLIGHT%%include/arrow/flight/server_auth.h %%FLIGHT%%include/arrow/flight/server_middleware.h -%%FLIGHT%%include/arrow/flight/test_definitions.h +%%FLIGHT%%include/arrow/flight/test_integration.h %%FLIGHT%%include/arrow/flight/test_util.h -%%FLIGHT%%include/arrow/flight/transport.h -%%FLIGHT%%include/arrow/flight/transport_server.h -%%FLIGHT%%include/arrow/flight/type_fwd.h %%FLIGHT%%include/arrow/flight/types.h %%FLIGHT%%include/arrow/flight/visibility.h include/arrow/io/api.h @@ -514,7 +511,6 @@ lib/cmake/arrow/ArrowTargets.cmake lib/cmake/arrow/FindArrow.cmake %%DATASET%%lib/cmake/arrow/FindArrowDataset.cmake %%FLIGHT%%lib/cmake/arrow/FindArrowFlight.cmake -%%FLIGHT%%lib/cmake/arrow/FindArrowFlightTesting.cmake %%PYTHON%%lib/cmake/arrow/FindArrowPython.cmake %%PYTHONFLIGHT%%lib/cmake/arrow/FindArrowPythonFlight.cmake %%TESTING%%lib/cmake/arrow/FindArrowTesting.cmake @@ -547,10 +543,7 @@ lib/libarrow.so.800.0.0 %%DATASET%%lib/libarrow_dataset.so.800.0.0 %%FLIGHT%%lib/libarrow_flight.so %%FLIGHT%%lib/libarrow_flight.so.800 -%%FLIGHT%%lib/libarrow_flight.so.800.0.0 -%%FLIGHT%%lib/libarrow_flight_testing.so -%%FLIGHT%%lib/libarrow_flight_testing.so.800 -%%FLIGHT%%lib/libarrow_flight_testing.so.800.0.0 +%%FLIGHT%%lib/libarrow_flight.so.800.8.0 %%PYTHON%%lib/libarrow_python%%PYTHON_SUFFIX%%.so %%PYTHON%%lib/libarrow_python%%PYTHON_SUFFIX%%.so.800 %%PYTHON%%lib/libarrow_python%%PYTHON_SUFFIX%%.so.800.0.0 @@ -574,7 +567,6 @@ lib/libarrow.so.800.0.0 %%DATASET%%libdata/pkgconfig/arrow-dataset.pc %%FILESYSTEM%%libdata/pkgconfig/arrow-filesystem.pc %%FLIGHT%%libdata/pkgconfig/arrow-flight.pc -%%FLIGHT%%libdata/pkgconfig/arrow-flight-testing.pc %%JSON%%libdata/pkgconfig/arrow-json.pc %%PYTHONFLIGHT%%libdata/pkgconfig/arrow-python%%PYTHON_SUFFIX%%-flight.pc %%PYTHON%%libdata/pkgconfig/arrow-python%%PYTHON_SUFFIX%%.pc