databases/tiledb: Update to 2.25.0

Changes:	https://github.com/TileDB-Inc/TileDB/releases

5 files changed, 17 insertions, 51 deletions

diff --git a/databases/tiledb/Makefile b/databases/tiledb/Makefile
index 1e97f479ab33..c2b151a539bd 100644
--- a/databases/tiledb/Makefile
+++ b/databases/tiledb/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	tiledb
-PORTVERSION=	2.24.2
+PORTVERSION=	2.25.0
+PORTREVISION=	1
 CATEGORIES=	databases
 
 MAINTAINER=	sunpoet@FreeBSD.org
@@ -58,6 +59,7 @@ CMAKE_ON=	BUILD_SHARED_LIBS \
 		CMAKE_EXPORT_COMPILE_COMMANDS \
 		TILEDB_CCACHE \
 		TILEDB_CPP_API \
+		TILEDB_DISABLE_AUTO_VCPKG \
 		TILEDB_LOG_OUTPUT_ON_FAILURE \
 		TILEDB_REMOVE_DEPRECATIONS \
 		TILEDB_SERIALIZATION \
diff --git a/databases/tiledb/distinfo b/databases/tiledb/distinfo
index c48dd2800f4f..e35dabb3219c 100644
--- a/databases/tiledb/distinfo
+++ b/databases/tiledb/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1720447660
-SHA256 (TileDB-Inc-TileDB-2.24.2_GH0.tar.gz) = 31c04105080bcc43626cfd7c636fc26f2be52e879e0d87dd07d548eb0ffce6a9
-SIZE (TileDB-Inc-TileDB-2.24.2_GH0.tar.gz) = 4474183
+TIMESTAMP = 1721858369
+SHA256 (TileDB-Inc-TileDB-2.25.0_GH0.tar.gz) = edadfc63b419c605d37304236ca6de55a46a9905015e122e597b82075135d39e
+SIZE (TileDB-Inc-TileDB-2.25.0_GH0.tar.gz) = 4222271
diff --git a/databases/tiledb/files/patch-magic b/databases/tiledb/files/patch-magic
index b1a0812ff549..805e79d98495 100644
--- a/databases/tiledb/files/patch-magic
+++ b/databases/tiledb/files/patch-magic
@@ -122,44 +122,3 @@ Obtained from:	https://github.com/TileDB-Inc/TileDB/pull/3270
  
  if (libmagic_FOUND AND NOT TARGET libmagic)
    message(STATUS "Found Magic, adding imported target: ${libmagic_LIBRARIES}")
---- tiledb/CMakeLists.txt.orig	2022-08-25 01:25:52 UTC
-+++ tiledb/CMakeLists.txt
-@@ -357,14 +357,18 @@ target_link_libraries(TILEDB_CORE_OBJECTS PRIVATE $<BU
- ############################################################
- # provide actions/target for preparation of magic.mgc data for embedding/build
- 
--set(MGC_GZIPPED_BIN_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/..")
-+set(MGC_GZIPPED_BIN_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/sm/misc")
- set(MGC_GZIPPED_BIN_OUTPUT_FILE "${MGC_GZIPPED_BIN_OUTPUT_DIRECTORY}/magic_mgc_gzipped.bin")
- set(MGC_GZIPPED_BIN_INPUT_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/sm/misc")
- set(MGC_GZIPPED_BIN_INPUT_FILE "${MGC_GZIPPED_BIN_INPUT_DIRECTORY}/magic_mgc_gzipped.bin.tar.bz2")
- 
-+# Create the output directory if it does not exist
-+add_custom_target(create_magic_bin_output_directory ALL
-+        COMMAND ${CMAKE_COMMAND} -E make_directory ${MGC_GZIPPED_BIN_OUTPUT_DIRECTORY})
-+
- add_custom_command(
-   OUTPUT "${MGC_GZIPPED_BIN_OUTPUT_FILE}"
--  DEPENDS "${MGC_GZIPPED_BIN_INPUT_FILE}"
-+  DEPENDS "${MGC_GZIPPED_BIN_INPUT_FILE}" create_magic_bin_output_directory
-   COMMAND ${CMAKE_COMMAND} -E tar x "${MGC_GZIPPED_BIN_INPUT_FILE}"
-   WORKING_DIRECTORY "${MGC_GZIPPED_BIN_OUTPUT_DIRECTORY}"
- )
-@@ -380,7 +384,7 @@ add_custom_target(
-   WORKING_DIRECTORY "${MGC_GZIPPED_BIN_OUTPUT_DIRECTORY}"
-   COMMAND ${CMAKE_COMMAND} -E tar cvj "magic_mgc_gzipped.bin.tar.bz2" "magic_mgc_gzipped.bin"
-   COMMAND ${CMAKE_COMMAND} -E copy "magic_mgc_gzipped.bin.tar.bz2" "${MGC_GZIPPED_BIN_INPUT_FILE}"
--  DEPENDS "${libmagic_DICTIONARY}"
-+  DEPENDS "${libmagic_DICTIONARY}" create_magic_bin_output_directory
-   COMMENT "Re-generate ${MGC_GZIPPED_BIN_INPUT_FILE} for embedded magic.mgc support"
- )
- 
-@@ -394,6 +398,8 @@ target_include_directories(TILEDB_CORE_OBJECTS
-     "${TILEDB_EXTERNALS_INCLUDE_DIRS}"
- 	# to pickup <build_dir>/tiledb for capnp gen'd files
-     "${CMAKE_CURRENT_BINARY_DIR}/.."
-+    # For libmagic binary data include
-+    "${CMAKE_CURRENT_BINARY_DIR}/sm/misc"
- )
- 
- # Build a separate copy of the object library for use with static TileDB
diff --git a/databases/tiledb/files/patch-vcpkg b/databases/tiledb/files/patch-vcpkg
index 4e94fd2d56cb..4708f20deea0 100644
--- a/databases/tiledb/files/patch-vcpkg
+++ b/databases/tiledb/files/patch-vcpkg
@@ -1,13 +1,13 @@
---- cmake/Options/BuildOptions.cmake.orig	2024-05-02 16:58:42 UTC
+--- cmake/Options/BuildOptions.cmake.orig	2024-07-24 15:05:06 UTC
 +++ cmake/Options/BuildOptions.cmake
-@@ -48,10 +48,6 @@ endif()
+@@ -49,10 +49,6 @@ endif()
    endif()
  endif()
  
 -if (NOT TILEDB_VCPKG)
--  message(FATAL_ERROR "Disabling TILEDB_VCPKG is not supported.")
+-  message(FATAL_ERROR "Disabling TILEDB_VCPKG is not supported. To disable automatically downloading vcpkg, enable the TILEDB_DISABLE_AUTO_VCPKG option, or set ENV{TILEDB_DISABLE_AUTO_VCPKG} to any value.")
 -endif()
 -
- # enable assertions by default for debug builds
- if (CMAKE_BUILD_TYPE STREQUAL "Debug")
-   set(TILEDB_ASSERTIONS TRUE)
+ if (TILEDB_HDFS)
+   message(DEPRECATION "The HDFS storage backend is deprecated and receiving build-only official validation. It will be removed in TileDB 2.28.")
+ endif()
diff --git a/databases/tiledb/pkg-plist b/databases/tiledb/pkg-plist
index 2883228c690d..9b5e5f29d13f 100644
--- a/databases/tiledb/pkg-plist
+++ b/databases/tiledb/pkg-plist
@@ -5,6 +5,8 @@ include/tiledb/api/c_api/buffer/buffer_api_external.h
 include/tiledb/api/c_api/buffer_list/buffer_list_api_external.h
 include/tiledb/api/c_api/config/config_api_external.h
 include/tiledb/api/c_api/context/context_api_external.h
+include/tiledb/api/c_api/current_domain/current_domain_api_enum.h
+include/tiledb/api/c_api/current_domain/current_domain_api_external_experimental.h
 include/tiledb/api/c_api/data_order/data_order_api_enum.h
 include/tiledb/api/c_api/data_order/data_order_api_external.h
 include/tiledb/api/c_api/datatype/datatype_api_enum.h
@@ -20,6 +22,7 @@ include/tiledb/api/c_api/filter/filter_api_enum.h
 include/tiledb/api/c_api/filter/filter_api_external.h
 include/tiledb/api/c_api/filter_list/filter_list_api_external.h
 include/tiledb/api/c_api/group/group_api_external.h
+include/tiledb/api/c_api/ndrectangle/ndrectangle_api_external_experimental.h
 include/tiledb/api/c_api/object/object_api_enum.h
 include/tiledb/api/c_api/object/object_api_external.h
 include/tiledb/api/c_api/query/query_api_enum.h
@@ -50,6 +53,7 @@ include/tiledb/config.h
 include/tiledb/consolidation_plan_experimental.h
 include/tiledb/context.h
 include/tiledb/core_interface.h
+include/tiledb/current_domain.h
 include/tiledb/deleter.h
 include/tiledb/dimension.h
 include/tiledb/dimension_label_experimental.h
@@ -62,6 +66,7 @@ include/tiledb/filter_list.h
 include/tiledb/fragment_info.h
 include/tiledb/group.h
 include/tiledb/log.h
+include/tiledb/ndrectangle.h
 include/tiledb/object.h
 include/tiledb/object_iter.h
 include/tiledb/query.h