diff --git a/editors/bee-host/Makefile b/editors/bee-host/Makefile index dc997d8f8954..cf12c5f38a3e 100644 --- a/editors/bee-host/Makefile +++ b/editors/bee-host/Makefile @@ -1,26 +1,26 @@ PORTNAME= bee-host -DISTVERSION= 1.3.7-2 +DISTVERSION= 1.3.7-3 CATEGORIES= editors www MAINTAINER= thierry@FreeBSD.org COMMENT= Host application for Browser's Exernal Editor extension WWW= https://github.com/rosmanov/bee-host LICENSE= MIT LIB_DEPENDS= libcjson.so:devel/libcjson USE_GITHUB= yes GH_ACCOUNT= rosmanov USES= cmake:noninja localbase:ldflags shebangfix SHEBANG_GLOB= *.sh LDFLAGS+= -lcjson -lcjson_utils CMAKE_ARGS= -DCMAKE_DOC_DIR:PATH=${DOCSDIR_REL} OPTIONS_DEFINE= DOCS pre-configure: ${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE:C|/||}|' ${WRKSRC}/vars.sh .include diff --git a/editors/bee-host/distinfo b/editors/bee-host/distinfo index 8bbbbcdf328f..374d080c50a2 100644 --- a/editors/bee-host/distinfo +++ b/editors/bee-host/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1702564012 -SHA256 (rosmanov-bee-host-1.3.7-2_GH0.tar.gz) = 337d575d2bfa618bb3bce41690911442b5fea7a7ee6602584adf7ee0fe0b88fa -SIZE (rosmanov-bee-host-1.3.7-2_GH0.tar.gz) = 31212 +TIMESTAMP = 1746552217 +SHA256 (rosmanov-bee-host-1.3.7-3_GH0.tar.gz) = a9b023f313754716f4ac2ce05615711d3df334e5cbf06ed4de0d94dd17e9a5d1 +SIZE (rosmanov-bee-host-1.3.7-3_GH0.tar.gz) = 31443 diff --git a/editors/bee-host/files/patch-CMakeLists.txt b/editors/bee-host/files/patch-CMakeLists.txt index e5040671000d..cfc68a29e43f 100644 --- a/editors/bee-host/files/patch-CMakeLists.txt +++ b/editors/bee-host/files/patch-CMakeLists.txt @@ -1,78 +1,79 @@ ---- CMakeLists.txt.orig 2023-03-12 06:35:07 UTC +--- CMakeLists.txt.orig 2025-04-21 15:28:54 UTC +++ CMakeLists.txt -@@ -38,27 +38,7 @@ endif() +@@ -39,27 +39,7 @@ set(EXTERNAL_DIR ${CMAKE_CURRENT_BINARY_DIR}/external) set(EXTERNAL_DIR ${CMAKE_CURRENT_BINARY_DIR}/external) -# cJSON and cJSONUtils -ExternalProject_Add(cjson - GIT_REPOSITORY "https://github.com/DaveGamble/cJSON" - GIT_TAG "v1.7.15" - PREFIX "${EXTERNAL_DIR}/cJSON" - BUILD_IN_SOURCE 1 - TEST_COMMAND "" - INSTALL_COMMAND "" - CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH= - -DBUILD_SHARED_AND_STATIC_LIBS=On - -DBUILD_SHARED_LIBS=Off - -DENABLE_CJSON_TEST=Off - -DENABLE_CJSON_UTILS=On - -DENABLE_TARGET_EXPORT=On - ) -ExternalProject_Get_Property(cjson source_dir) -ExternalProject_Get_Property(cjson binary_dir) -ExternalProject_Get_Property(cjson download_dir) -set(CJSON_SOURCE_DIR "${source_dir}") -set(CJSON_BINARY_DIR "${binary_dir}") -set(CJSON_DOWNLOAD_DIR "${download_dir}") +# cJSON and cJSONUtils installed from devel/libcjson # beectl set(BEECTL_SRCS -@@ -69,21 +49,13 @@ set(BEECTL_SRCS +@@ -70,21 +50,13 @@ set(BEECTL_SRCS src/mkstemps.c # This is nasty, but I couldn't find a way to use CMAKE_TOOLCHAIN_FILE # for the external project (see comments below.) - "${CJSON_SOURCE_DIR}/cJSON.c" ) add_executable(beectl ${BEECTL_SRCS}) -# Workaround for CMake versions which require the cJSON.c file to exist before -# downloading the external project. -add_custom_command(TARGET beectl PRE_BUILD - BYPRODUCTS "${CJSON_SOURCE_DIR}/cJSON.c" - COMMAND touch "${CJSON_SOURCE_DIR}/cJSON.c") - target_compile_features(beectl PRIVATE c_variadic_macros) target_include_directories(beectl PRIVATE "${CJSON_DOWNLOAD_DIR}") set_property(TARGET beectl PROPERTY C_STANDARD 11) # C11 -add_dependencies(beectl cjson) # The following would be better approach than including cJSON files in our # source list. But the build fails when cross-compiling, since -@@ -110,13 +82,13 @@ string(TOUPPER "${CMAKE_SYSTEM_NAME}" uppercase_CMAKE_ +@@ -126,14 +98,14 @@ set(BEECTL_MANIFEST_TARGET_PATH "${CMAKE_INSTALL_PREFI message(STATUS "CMAKE_INSTALL_PREFIX: ${CMAKE_INSTALL_PREFIX}") set(BEECTL_MANIFEST_TARGET_PATH "${CMAKE_INSTALL_PREFIX}/bin/beectl") -set(BEECTL_CHROME_MANIFEST_DIR "etc/opt/chrome/native-messaging-hosts") +set(BEECTL_CHROME_MANIFEST_DIR "etc/chrome/native-messaging-hosts") + set(BEECTL_CHROMIUM_MANIFEST_DIR "etc/chromium/native-messaging-hosts") if(uppercase_CMAKE_SYSTEM_NAME MATCHES LINUX AND CMAKE_SYSTEM_PROCESSOR MATCHES "^(amd|x86_)64$") # Fedora 36 amd64 may have a separate /usr/lib64 dir different from /usr/lib. set(BEECTL_FIREFOX_MANIFEST_DIR "usr/lib64/mozilla/native-messaging-hosts") else() - set(BEECTL_FIREFOX_MANIFEST_DIR "usr/lib/mozilla/native-messaging-hosts") + set(BEECTL_FIREFOX_MANIFEST_DIR "lib/mozilla/native-messaging-hosts") endif() # RPM package properties -@@ -238,7 +210,7 @@ elseif(uppercase_CMAKE_SYSTEM_NAME MATCHES DARWIN) +@@ -288,7 +260,7 @@ else(uppercase_CMAKE_SYSTEM_NAME MATCHES WINDOWS) COMPONENT config) else(uppercase_CMAKE_SYSTEM_NAME MATCHES WINDOWS) # Install host app - install(TARGETS beectl RUNTIME DESTINATION usr/local/bin COMPONENT applications) + install(TARGETS beectl RUNTIME DESTINATION bin COMPONENT applications) configure_file( chrome-com.ruslan_osmanov.bee.json.in diff --git a/editors/bee-host/files/patch-vars.sh b/editors/bee-host/files/patch-vars.sh index 12201417b955..d1cb28c9ef22 100644 --- a/editors/bee-host/files/patch-vars.sh +++ b/editors/bee-host/files/patch-vars.sh @@ -1,13 +1,15 @@ ---- vars.sh.orig 2022-04-07 09:03:56 UTC +--- vars.sh.orig 2025-05-06 17:29:25 UTC +++ vars.sh -@@ -45,8 +45,8 @@ case "$kernel" in +@@ -47,9 +47,9 @@ case "$kernel" in *) if [ $EUID == 0 ]; then # If superuser - chrome_target_manifest_dir='/etc/opt/chrome/native-messaging-hosts' +- chromium_target_manifest_dir='/etc/chromium/native-messaging-hosts' - firefox_target_manifest_dir='/usr/lib/mozilla/native-messaging-hosts' + chrome_target_manifest_dir='%%LOCALBASE%%/chrome/native-messaging-hosts' ++ chromium_target_manifest_dir='%%LOCALBASE%%/chromium/native-messaging-hosts' + firefox_target_manifest_dir='%%LOCALBASE%%/lib/mozilla/native-messaging-hosts' else # If normal user chrome_target_manifest_dir="$HOME/.config/google-chrome/NativeMessagingHosts" diff --git a/editors/bee-host/pkg-plist b/editors/bee-host/pkg-plist index cd3eb79eefcb..6ee2e5f2a045 100644 --- a/editors/bee-host/pkg-plist +++ b/editors/bee-host/pkg-plist @@ -1,5 +1,6 @@ bin/beectl etc/chrome/native-messaging-hosts/com.ruslan_osmanov.bee.json +etc/chromium/native-messaging-hosts/com.ruslan_osmanov.bee.json lib/mozilla/native-messaging-hosts/com.ruslan_osmanov.bee.json %%PORTDOCS%%%%DOCSDIR%%/LICENSE %%PORTDOCS%%%%DOCSDIR%%/README.md