aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVanilla I. Shu <vanilla@FreeBSD.org>2026-10-03 11:00:51 +0000
committerVanilla I. Shu <vanilla@FreeBSD.org>2026-10-03 11:02:15 +0000
commitbf6afea9d91245966a29ef6cabc6d75910e2acb8 (patch)
tree4eb1f2496a7d9314db4999077032bb88f40b6fd0
parent2220a3f78f1301718b94d8b236bbcadb64557bac (diff)
databases/foundationdb7{1,3}-server: fix with msgpack-cxx updating.
PR: 299054
-rw-r--r--databases/foundationdb71-server/Makefile4
-rw-r--r--databases/foundationdb71-server/files/patch-cmake_GetMsgpack.cmake2
-rw-r--r--databases/foundationdb73-server/Makefile4
-rw-r--r--databases/foundationdb73-server/files/patch-cmake_GetMsgpack.cmake2
4 files changed, 8 insertions, 4 deletions
diff --git a/databases/foundationdb71-server/Makefile b/databases/foundationdb71-server/Makefile
index 9399e77a5f13..6f2482b7631a 100644
--- a/databases/foundationdb71-server/Makefile
+++ b/databases/foundationdb71-server/Makefile
@@ -1,5 +1,6 @@
PORTNAME?= foundationdb
DISTVERSION= 7.1.67
+PORTREVISION= 1
CATEGORIES?= databases
MASTER_SITES= SF/boost/boost/${BOOST_VERSION}:boost
PKGNAMESUFFIX?= ${DISTVERSION:C/([0-9]+)\.([0-9]+).*/\1\2/}-${_COMPONENT}
@@ -49,7 +50,8 @@ CMAKE_OFF= BUILD_DOCUMENTATION BUILD_GO_BINDING BUILD_JAVA_BINDING \
MAKE_ENV= MONO_REGISTRY_PATH=/tmp/registry
-CONFLICTS+= ${PORTNAME}*-${_COMPONENT}*
+CONFLICTS+= ${PORTNAME}*-${_COMPONENT}*
+CONFLICTS_BUILD= boost-libs
SUB_LIST= ${SUB_FDB}
diff --git a/databases/foundationdb71-server/files/patch-cmake_GetMsgpack.cmake b/databases/foundationdb71-server/files/patch-cmake_GetMsgpack.cmake
index adfc467bd72b..fffe8592e35b 100644
--- a/databases/foundationdb71-server/files/patch-cmake_GetMsgpack.cmake
+++ b/databases/foundationdb71-server/files/patch-cmake_GetMsgpack.cmake
@@ -3,7 +3,7 @@
@@ -1,9 +1,13 @@
find_package(msgpack 3.3.0 EXACT QUIET CONFIG)
+find_package(msgpackc-cxx 4.0.0...<6 QUIET CONFIG)
-+find_package(msgpack-cxx 6 QUIET CONFIG)
++find_package(msgpack-cxx QUIET CONFIG)
add_library(msgpack INTERFACE)
diff --git a/databases/foundationdb73-server/Makefile b/databases/foundationdb73-server/Makefile
index bb17e12a1eda..dd1276069664 100644
--- a/databases/foundationdb73-server/Makefile
+++ b/databases/foundationdb73-server/Makefile
@@ -1,5 +1,6 @@
PORTNAME?= foundationdb
DISTVERSION= 7.3.77
+PORTREVISION= 1
CATEGORIES?= databases
MASTER_SITES= SF/boost/boost/${BOOST_VERSION}:boost
PKGNAMESUFFIX?= ${DISTVERSION:C/([0-9]+)\.([0-9]+).*/\1\2/}-${_COMPONENT}
@@ -50,7 +51,8 @@ CMAKE_OFF= BUILD_DOCUMENTATION BUILD_GO_BINDING BUILD_JAVA_BINDING \
MAKE_ENV= MONO_REGISTRY_PATH=/tmp/registry
-CONFLICTS+= ${PORTNAME}*-${_COMPONENT}*
+CONFLICTS+= ${PORTNAME}*-${_COMPONENT}*
+CONFLICTS_BUILD= boost-libs
SUB_LIST= ${SUB_FDB}
diff --git a/databases/foundationdb73-server/files/patch-cmake_GetMsgpack.cmake b/databases/foundationdb73-server/files/patch-cmake_GetMsgpack.cmake
index adfc467bd72b..fffe8592e35b 100644
--- a/databases/foundationdb73-server/files/patch-cmake_GetMsgpack.cmake
+++ b/databases/foundationdb73-server/files/patch-cmake_GetMsgpack.cmake
@@ -3,7 +3,7 @@
@@ -1,9 +1,13 @@
find_package(msgpack 3.3.0 EXACT QUIET CONFIG)
+find_package(msgpackc-cxx 4.0.0...<6 QUIET CONFIG)
-+find_package(msgpack-cxx 6 QUIET CONFIG)
++find_package(msgpack-cxx QUIET CONFIG)
add_library(msgpack INTERFACE)