git: 3f4578d8b612 - main - databases/arrow: Fix 9fb75f4dd422c3fb2a8d03a9e7a1bd7560d06c07

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Po-Chuan Hsieh <sunpoet_at_FreeBSD.org>
Date: Sat, 08 Feb 2025 02:18:28 UTC
The branch main has been updated by sunpoet:

URL: https://cgit.FreeBSD.org/ports/commit/?id=3f4578d8b6129be4d31ecd77ed7f35adec0af620

commit 3f4578d8b6129be4d31ecd77ed7f35adec0af620
Author:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
AuthorDate: 2025-02-08 02:17:39 +0000
Commit:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
CommitDate: 2025-02-08 02:17:39 +0000

    databases/arrow: Fix 9fb75f4dd422c3fb2a8d03a9e7a1bd7560d06c07
    
    It should be a PORTREVISION bump for shlib change of devel/grpc.
    The proposed patch for 19.0.0 update was committed by accident.
    Revert to previous version and bump PORTREVISION.
---
 databases/arrow/Makefile  | 36 +++++++++++++++++-------------------
 databases/arrow/distinfo  | 10 +++++-----
 databases/arrow/pkg-plist | 20 --------------------
 3 files changed, 22 insertions(+), 44 deletions(-)

diff --git a/databases/arrow/Makefile b/databases/arrow/Makefile
index c0e709a1f557..9c59aa0430ac 100644
--- a/databases/arrow/Makefile
+++ b/databases/arrow/Makefile
@@ -1,10 +1,12 @@
 PORTNAME=	arrow
-DISTVERSION=	19.0.0
+DISTVERSION=	18.0.0
+PORTREVISION=	5
 CATEGORIES=	databases
-MASTER_SITES=	APACHE/arrow/arrow-${DISTVERSION} \
-		https://archive.apache.org/dist/orc/orc-${ARROW_ORC_BUILD_VERSION}/:orc
-DISTFILES=	apache-arrow-${DISTVERSION}${EXTRACT_SUFX}
-EXTRACT_ONLY=	apache-arrow-${DISTVERSION}${EXTRACT_SUFX}
+MASTER_SITES=	APACHE/${PORTNAME}/${PORTNAME}-${DISTVERSION} \
+		https://github.com/apache/orc/archive/rel/:orc
+DISTNAME=	apache-${PORTNAME}-${DISTVERSION}
+DISTFILES=	apache-${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX} release-1.6.6${EXTRACT_SUFX}:orc
+EXTRACT_ONLY=	apache-${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Columnar in-memory analytics layer for big data
@@ -18,19 +20,20 @@ LIB_DEPENDS=	libboost_system.so:devel/boost-libs
 USES=		cmake compiler:c++17-lang localbase pkgconfig python:build
 USE_LDCONFIG=	yes
 
-WRKSRC=		${WRKDIR}/apache-arrow-${DISTVERSION}/cpp
+USE_GITHUB=	nodefault
+GH_ACCOUNT=	apache
 
-PLIST_SUB=	LIBVERSION=${DISTVERSION:R:R}0${DISTVERSION:R:E}
+WRKSRC_SUBDIR=	cpp
+
+PLIST_SUB+=	LIBVERSION=${DISTVERSION:S/.//g}
 
 CMAKE_ARGS=	-DCMAKE_CXX_STANDARD=17 -DARROW_SIMD_LEVEL=NONE -DARROW_RUNTIME_SIMD_LEVEL=NONE \
 		-DPython3_EXECUTABLE=${PYTHON_CMD}
-CMAKE_OFF=	ARROW_BUILD_BENCHMARKS ARROW_BUILD_STATIC ARROW_BUILD_TESTS ARROW_WITH_BACKTRACE
-
-ARROW_ORC_BUILD_VERSION=	2.0.3	# Check ${WRKSRC}/thirdparty/versions.txt
+CMAKE_OFF=	ARROW_BUILD_STATIC ARROW_WITH_BACKTRACE ARROW_BUILD_TESTS ARROW_BUILD_BENCHMARKS
 
-OPTIONS_GROUP=			COMPONENTS COMPRESSION # components are listed in cpp/cmake_modules/DefineOptions.cmake
+OPTIONS_GROUP=			COMPRESSION COMPONENTS # components are listed in cpp/cmake_modules/DefineOptions.cmake
 OPTIONS_GROUP_COMPRESSION=	BROTLI BZ2 LZ4 SNAPPY ZLIB ZSTD
-OPTIONS_GROUP_COMPONENTS=	ACERO COMPUTE CSV DATASET FILESYSTEM FLIGHT FLIGHT_SQL GANDIVA HDFS IPC JSON MIMALLOC PARQUET ORC S3 SKYHOOK SUBSTRAIT BUILD_UTILITIES TENSORFLOW TESTING
+OPTIONS_GROUP_COMPONENTS=	ACERO COMPUTE CSV DATASET FILESYSTEM FLIGHT GANDIVA HDFS IPC JSON MIMALLOC PARQUET ORC S3 SKYHOOK SUBSTRAIT BUILD_UTILITIES TENSORFLOW TESTING
 OPTIONS_SUB=			yes
 
 ## DESCs
@@ -91,10 +94,6 @@ FLIGHT_LIB_DEPENDS=		libgflags.so:devel/gflags \
 				libre2.so:devel/re2
 FLIGHT_IMPLIES=			IPC COMPUTE # see https://github.com/apache/arrow/issues/40766
 
-FLIGHT_SQL_DESC=		Arrow Flight SQL
-FLIGHT_SQL_CMAKE_BOOL=		ARROW_FLIGHT_SQL
-FLIGHT_SQL_IMPLIES=		FLIGHT
-
 GANDIVA_DESC=			Gandiva libraries
 GANDIVA_USES=			llvm:17,lib ssl
 GANDIVA_CMAKE_BOOL=		ARROW_GANDIVA
@@ -126,10 +125,9 @@ PARQUET_LIB_DEPENDS=		libthrift.so:devel/thrift-cpp
 PARQUET_IMPLIES=		IPC
 
 ORC_DESC=			Arrow ORC adapter
-ORC_DISTFILES=			orc-${ARROW_ORC_BUILD_VERSION}${EXTRACT_SUFX}:orc
 ORC_CMAKE_BOOL=			ARROW_ORC
 ORC_LIB_DEPENDS=		libprotobuf.so:devel/protobuf
-ORC_CONFIGURE_ENV=		ARROW_ORC_URL=file://${DISTDIR}/${DIST_SUBDIR}/orc-${ARROW_ORC_BUILD_VERSION}${EXTRACT_SUFX}
+ORC_CONFIGURE_ENV=		ARROW_ORC_URL=file://${DISTDIR}/${DIST_SUBDIR}/release-1.6.6${EXTRACT_SUFX}
 ORC_IMPLIES=			LZ4 SNAPPY ZLIB ZSTD # cpp/CMakeLists.txt
 ORC_BROKEN=			fatal error: 'orc/OrcFile.hh' file not found: https://issues.apache.org/jira/browse/ARROW-12624
 
@@ -183,7 +181,7 @@ TESTING_CMAKE_BOOL=		ARROW_TESTING
 TESTING_LIB_DEPENDS=		libgtest.so:devel/googletest
 
 # form OPTIONS_DEFAULT
-.for opt in ${OPTIONS_GROUP_COMPRESSION} ${OPTIONS_GROUP_COMPONENTS}
+.for opt in ${OPTIONS_GROUP_COMPONENTS}
 .  if "${${opt}_BROKEN}" == ""
 OPTIONS_DEFAULT+=	${opt}
 .  endif
diff --git a/databases/arrow/distinfo b/databases/arrow/distinfo
index 9254f0d78c25..2155ee2495c1 100644
--- a/databases/arrow/distinfo
+++ b/databases/arrow/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1738216295
-SHA256 (apache-arrow-19.0.0.tar.gz) = f89b93f39954740f7184735ff1e1d3b5be2640396febc872c4955274a011f56b
-SIZE (apache-arrow-19.0.0.tar.gz) = 17830405
-SHA256 (orc-2.0.3.tar.gz) = 082cba862b5a8a0d14c225404d0b51cd8d1b64ca81b8f1e500322ce8922cb86d
-SIZE (orc-2.0.3.tar.gz) = 13353259
+TIMESTAMP = 1731955692
+SHA256 (apache-arrow-18.0.0.tar.gz) = abcf1934cd0cdddd33664e9f2d9a251d6c55239d1122ad0ed223b13a583c82a9
+SIZE (apache-arrow-18.0.0.tar.gz) = 19113236
+SHA256 (release-1.6.6.tar.gz) = 9a92b3eaad1d8b88a18cee41058feb34eb43d919df363e0b74a0b857724e4ba0
+SIZE (release-1.6.6.tar.gz) = 13939853
diff --git a/databases/arrow/pkg-plist b/databases/arrow/pkg-plist
index d87cd49b4929..b55f33749995 100644
--- a/databases/arrow/pkg-plist
+++ b/databases/arrow/pkg-plist
@@ -141,14 +141,6 @@ include/arrow/extension_type.h
 %%FLIGHT%%include/arrow/flight/server_auth.h
 %%FLIGHT%%include/arrow/flight/server_middleware.h
 %%FLIGHT%%include/arrow/flight/server_tracing_middleware.h
-%%FLIGHT_SQL%%include/arrow/flight/sql/api.h
-%%FLIGHT_SQL%%include/arrow/flight/sql/client.h
-%%FLIGHT_SQL%%include/arrow/flight/sql/column_metadata.h
-%%FLIGHT_SQL%%include/arrow/flight/sql/server.h
-%%FLIGHT_SQL%%include/arrow/flight/sql/server_session_middleware.h
-%%FLIGHT_SQL%%include/arrow/flight/sql/server_session_middleware_factory.h
-%%FLIGHT_SQL%%include/arrow/flight/sql/types.h
-%%FLIGHT_SQL%%include/arrow/flight/sql/visibility.h
 %%FLIGHT%%include/arrow/flight/test_auth_handlers.h
 %%FLIGHT%%include/arrow/flight/test_definitions.h
 %%FLIGHT%%include/arrow/flight/test_flight_server.h
@@ -223,7 +215,6 @@ include/arrow/testing/generator.h
 include/arrow/testing/gtest_compat.h
 include/arrow/testing/gtest_util.h
 include/arrow/testing/matchers.h
-include/arrow/testing/math.h
 include/arrow/testing/pch.h
 include/arrow/testing/process.h
 include/arrow/testing/random.h
@@ -486,7 +477,6 @@ include/arrow/visitor_generate.h
 %%PARQUET%%include/parquet/printer.h
 %%PARQUET%%include/parquet/properties.h
 %%PARQUET%%include/parquet/schema.h
-%%PARQUET%%include/parquet/size_statistics.h
 %%PARQUET%%include/parquet/statistics.h
 %%PARQUET%%include/parquet/stream_reader.h
 %%PARQUET%%include/parquet/stream_writer.h
@@ -513,12 +503,7 @@ lib/cmake/Arrow/arrow-config.cmake
 %%FLIGHT%%lib/cmake/ArrowFlight/ArrowFlightTargets-%%CMAKE_BUILD_TYPE%%.cmake
 %%FLIGHT%%lib/cmake/ArrowFlight/ArrowFlightTargets.cmake
 %%FLIGHT%%lib/cmake/ArrowFlight/FindProtobufAlt.cmake
-%%FLIGHT%%lib/cmake/ArrowFlight/FindabslAlt.cmake
 %%FLIGHT%%lib/cmake/ArrowFlight/FindgRPCAlt.cmake
-%%FLIGHT_SQL%%lib/cmake/ArrowFlightSql/ArrowFlightSqlConfig.cmake
-%%FLIGHT_SQL%%lib/cmake/ArrowFlightSql/ArrowFlightSqlConfigVersion.cmake
-%%FLIGHT_SQL%%lib/cmake/ArrowFlightSql/ArrowFlightSqlTargets-%%CMAKE_BUILD_TYPE%%.cmake
-%%FLIGHT_SQL%%lib/cmake/ArrowFlightSql/ArrowFlightSqlTargets.cmake
 %%TESTINGFLIGHT%%lib/cmake/ArrowFlightTesting/ArrowFlightTestingConfig.cmake
 %%TESTINGFLIGHT%%lib/cmake/ArrowFlightTesting/ArrowFlightTestingConfigVersion.cmake
 %%TESTINGFLIGHT%%lib/cmake/ArrowFlightTesting/ArrowFlightTestingTargets-%%CMAKE_BUILD_TYPE%%.cmake
@@ -552,7 +537,6 @@ lib/cmake/Arrow/arrow-config.cmake
 %%GANDIVA%%lib/cmake/Gandiva/GandivaTargets-%%CMAKE_BUILD_TYPE%%.cmake
 %%GANDIVA%%lib/cmake/Gandiva/GandivaTargets.cmake
 %%PARQUET%%lib/cmake/Parquet/FindThriftAlt.cmake
-%%GANDIVA%%%%ZSTD%%lib/cmake/Gandiva/FindzstdAlt.cmake
 %%PARQUET%%lib/cmake/Parquet/ParquetConfig.cmake
 %%PARQUET%%lib/cmake/Parquet/ParquetConfigVersion.cmake
 %%PARQUET%%lib/cmake/Parquet/ParquetTargets-%%CMAKE_BUILD_TYPE%%.cmake
@@ -569,9 +553,6 @@ lib/libarrow.so.%%LIBVERSION%%.0.0
 %%FLIGHT%%lib/libarrow_flight.so
 %%FLIGHT%%lib/libarrow_flight.so.%%LIBVERSION%%
 %%FLIGHT%%lib/libarrow_flight.so.%%LIBVERSION%%.0.0
-%%FLIGHT_SQL%%lib/libarrow_flight_sql.so
-%%FLIGHT_SQL%%lib/libarrow_flight_sql.so.%%LIBVERSION%%
-%%FLIGHT_SQL%%lib/libarrow_flight_sql.so.%%LIBVERSION%%.0.0
 %%TESTING%%lib/libarrow_testing.so
 %%TESTING%%lib/libarrow_testing.so.%%LIBVERSION%%
 %%TESTING%%lib/libarrow_testing.so.%%LIBVERSION%%.0.0
@@ -587,7 +568,6 @@ lib/libarrow.so.%%LIBVERSION%%.0.0
 %%DATASET%%libdata/pkgconfig/arrow-dataset.pc
 %%FILESYSTEM%%libdata/pkgconfig/arrow-filesystem.pc
 %%FLIGHT%%libdata/pkgconfig/arrow-flight.pc
-%%FLIGHT_SQL%%libdata/pkgconfig/arrow-flight-sql.pc
 %%JSON%%libdata/pkgconfig/arrow-json.pc
 %%PYTHONFLIGHT%%libdata/pkgconfig/arrow-python%%PYTHON_SUFFIX%%-flight.pc
 %%TESTING%%libdata/pkgconfig/arrow-testing.pc