diff --git a/www/davix/Makefile b/www/davix/Makefile index 67c6d96a4be3..f85fbfdeb033 100644 --- a/www/davix/Makefile +++ b/www/davix/Makefile @@ -1,33 +1,34 @@ PORTNAME= davix -DISTVERSION= 0.7.6 -PORTREVISION= 2 +DISTVERSION= 0.8.1 CATEGORIES= www -MASTER_SITES= http://grid-deployment.web.cern.ch/grid-deployment/dms/lcgutil/tar/${PORTNAME}/${DISTVERSION}/ MAINTAINER= yuri@FreeBSD.org COMMENT= Make the task of managing files over HTTP-based protocols simple LICENSE= LGPL21 LICENSE_FILE= ${WRKSRC}/LICENSE -LIB_DEPENDS= libuuid.so:misc/e2fsprogs-libuuid +LIB_DEPENDS= libcurl.so:ftp/curl \ + libuuid.so:misc/e2fsprogs-libuuid -USES= cmake compiler:c++11-lang gnome localbase:ldflags python:build shebangfix ssl +USES= cmake:testing compiler:c++11-lang gnome localbase:ldflags python:build shebangfix ssl SHEBANG_GLOB= *.py USE_GNOME= libxml2 USE_LDCONFIG= yes +USE_GITHUB= yes +GH_ACCOUNT= cern-fts +GH_TAGNAME= R_${DISTVERSION:S/./_/g} +GH_TUPLE= google:googletest:f570b27:googletest/deps/googletest + +CMAKE_OFF= EMBEDDED_LIBCURL DAVIX_TESTS +CMAKE_TESTING_ON= DAVIX_TESTS UNIT_TESTS BENCH_TESTS # unclear how to run tests, see https://github.com/cern-fts/davix/issues/96 + PLIST_SUB= PORTVERSION=${PORTVERSION} PORTSCOUT= limit:^[0-9\.]*$$ # prevent versions like N.N.N-el7.x86_64 post-install: @${RM} -r ${STAGEDIR}${DOCSDIR} -do-test: # tests are known to fail: https://github.com/cern-fts/davix/issues/33 - @cd ${BUILD_WRKSRC} && \ - ${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DUNIT_TESTS=ON FUNCTIONAL_TESTS=ON BENCH_TESTS=ON ${CMAKE_SOURCE_PATH} && \ - ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \ - ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test - .include diff --git a/www/davix/distinfo b/www/davix/distinfo index c51b6914ddee..87f32bc29940 100644 --- a/www/davix/distinfo +++ b/www/davix/distinfo @@ -1,3 +1,5 @@ -TIMESTAMP = 1588297549 -SHA256 (davix-0.7.6.tar.gz) = a2e7fdff29f7ba247a3bcdb08ab1db6d6ed745de2d3971b46526986caf360673 -SIZE (davix-0.7.6.tar.gz) = 4338692 +TIMESTAMP = 1653680635 +SHA256 (cern-fts-davix-0.8.1-R_0_8_1_GH0.tar.gz) = b3faf24b94bf7fb40e30e35e0073982e2e52eb86973daa20da56f6ca7e7d1ce6 +SIZE (cern-fts-davix-0.8.1-R_0_8_1_GH0.tar.gz) = 3075181 +SHA256 (google-googletest-f570b27_GH0.tar.gz) = b8e523ec837300ed501b4a7ad35fc5238384667dc7d31879a2f102f9d38742e0 +SIZE (google-googletest-f570b27_GH0.tar.gz) = 1279326 diff --git a/www/davix/files/patch-src_tools_CMakeLists.txt b/www/davix/files/patch-src_tools_CMakeLists.txt index 335038229bba..9416c7b700c8 100644 --- a/www/davix/files/patch-src_tools_CMakeLists.txt +++ b/www/davix/files/patch-src_tools_CMakeLists.txt @@ -1,79 +1,70 @@ ---- src/tools/CMakeLists.txt.orig 2018-06-15 09:35:23 UTC +--- src/tools/CMakeLists.txt.orig 2022-03-30 10:43:22 UTC +++ src/tools/CMakeLists.txt -@@ -22,7 +22,7 @@ LIST(APPEND davix_tool_common_src "${CMA - "${CMAKE_CURRENT_SOURCE_DIR}/davix_config_parser.cpp") - SET(davix_tool_common_src_up "${davix_tool_common_src}" PARENT_SCOPE) - --link_directories(${PROJECT_BINARY_DIR}/src/) -+link_directories(${PROJECT_BINARY_DIR}/src/ ${CMAKE_INSTALL_PREFIX}/lib) - - - ## davix tool lib -@@ -32,14 +32,14 @@ add_library(davix_tool_lib STATIC ${davi +@@ -21,14 +21,14 @@ target_include_directories(davix_tool_lib PUBLIC ## davix cmd line - add_executable(davix_tool ${davix_main_src}) + add_executable(davix_tool davix_tool_main.cpp) -target_link_libraries(davix_tool davix_tool_lib libdavix) +target_link_libraries(davix_tool davix_tool_lib libdavix uuid) set_target_properties(davix_tool PROPERTIES OUTPUT_NAME "davix-http") ## davix ls cmd line - add_executable(davix_ls_tool ${davix_ls_main_src}) + add_executable(davix_ls_tool davix_tool_ls_main.cpp) -target_link_libraries(davix_ls_tool davix_tool_lib libdavix ${CMAKE_THREAD_LIBS_INIT}) +target_link_libraries(davix_ls_tool davix_tool_lib libdavix ${CMAKE_THREAD_LIBS_INIT} uuid) set_target_properties(davix_ls_tool PROPERTIES OUTPUT_NAME "davix-ls") -@@ -47,14 +47,14 @@ set_target_properties(davix_ls_tool PROP +@@ -36,14 +36,14 @@ set_target_properties(davix_ls_tool PROPERTIES ## davix get cmd line - add_executable(davix_get_tool ${davix_get_main_src}) + add_executable(davix_get_tool davix_tool_get_main.cpp) -target_link_libraries(davix_get_tool davix_tool_lib libdavix pthread ${CMAKE_THREAD_LIBS_INIT}) +target_link_libraries(davix_get_tool davix_tool_lib libdavix pthread ${CMAKE_THREAD_LIBS_INIT} uuid) set_target_properties(davix_get_tool PROPERTIES OUTPUT_NAME "davix-get") ## davix put cmd line - add_executable(davix_put_tool ${davix_put_main_src}) + add_executable(davix_put_tool davix_tool_put_main.cpp) -target_link_libraries(davix_put_tool davix_tool_lib libdavix pthread ${CMAKE_THREAD_LIBS_INIT}) +target_link_libraries(davix_put_tool davix_tool_lib libdavix pthread ${CMAKE_THREAD_LIBS_INIT} uuid) set_target_properties(davix_put_tool PROPERTIES OUTPUT_NAME "davix-put") -@@ -62,21 +62,21 @@ set_target_properties(davix_put_tool PRO +@@ -51,21 +51,21 @@ set_target_properties(davix_put_tool PROPERTIES ## davix del cmd line - add_executable(davix_mkdir_tool ${davix_mkcol_main_src}) + add_executable(davix_mkdir_tool davix_tool_mkcol_main.cpp) -target_link_libraries(davix_mkdir_tool davix_tool_lib libdavix) +target_link_libraries(davix_mkdir_tool davix_tool_lib libdavix uuid) set_target_properties(davix_mkdir_tool PROPERTIES OUTPUT_NAME "davix-mkdir") ## davix rm cmd line - add_executable(davix_rm_tool ${davix_rm_main_src}) + add_executable(davix_rm_tool davix_tool_rm_main.cpp) -target_link_libraries(davix_rm_tool davix_tool_lib libdavix ${CMAKE_THREAD_LIBS_INIT}) +target_link_libraries(davix_rm_tool davix_tool_lib libdavix ${CMAKE_THREAD_LIBS_INIT} uuid) set_target_properties(davix_rm_tool PROPERTIES OUTPUT_NAME "davix-rm") ## davix mv cmd line - add_executable(davix_mv_tool ${davix_mv_main_src}) + add_executable(davix_mv_tool davix_tool_mv_main.cpp) -target_link_libraries(davix_mv_tool davix_tool_lib libdavix) +target_link_libraries(davix_mv_tool davix_tool_lib libdavix uuid) set_target_properties(davix_mv_tool PROPERTIES OUTPUT_NAME "davix-mv") -@@ -90,7 +90,7 @@ if (ENABLE_THIRD_PARTY_COPY) +@@ -79,7 +79,7 @@ if (ENABLE_THIRD_PARTY_COPY) - add_executable(davix_cp_tool ${davix_copy_main_src}) + add_executable(davix_cp_tool davix_tool_copy_main.cpp) -- target_link_libraries(davix_cp_tool davix_copy davix_tool_lib) -+ target_link_libraries(davix_cp_tool davix_copy davix_tool_lib uuid) +- target_link_libraries(davix_cp_tool davix_copy davix_tool_lib libdavix) ++ target_link_libraries(davix_cp_tool davix_copy davix_tool_lib libdavix uuid) set_target_properties(davix_cp_tool PROPERTIES OUTPUT_NAME "davix-cp") - add_dependencies(davix_cp_tool davix_copy) + diff --git a/www/davix/pkg-descr b/www/davix/pkg-descr index ceac5c9a81c6..a1228c391646 100644 --- a/www/davix/pkg-descr +++ b/www/davix/pkg-descr @@ -1,7 +1,7 @@ The davix project aims to make file management over HTTP-based protocols simple. The focus is on high-performance remote I/O and data management of large collections of files. Currently, there is support for the WebDav (link is external), Amazon S3 (link is external), Microsoft Azure (link is external), and HTTP (link is external) protocols. -WWW: http://dmc.web.cern.ch/projects/davix/home +WWW: https://dmc-docs.web.cern.ch/dmc-docs/davix.html diff --git a/www/davix/pkg-plist b/www/davix/pkg-plist index 4d9c2ab75d48..317a338221c5 100644 --- a/www/davix/pkg-plist +++ b/www/davix/pkg-plist @@ -1,49 +1,48 @@ bin/davix-get bin/davix-http bin/davix-ls bin/davix-mkdir bin/davix-mv bin/davix-put bin/davix-rm -bin/davix-tester -bin/davix-unit-tests include/davix/auth/davixauth.hpp include/davix/auth/davixx509cred.hpp include/davix/compat/davix_ignored.hpp include/davix/compat/deprecated.hpp include/davix/copy/davixcopy.hpp include/davix/davix.hpp include/davix/davix_file_types.hpp include/davix/davixcontext.hpp include/davix/features.hpp include/davix/file/davfile.hpp include/davix/file/davix_file_info.hpp include/davix/file/davposix.hpp include/davix/hooks/davix_hooks.hpp include/davix/hooks/davix_hooks_fwd.hpp include/davix/hooks/davix_hooks_impl.hpp include/davix/params/davix_request_params_types.hpp include/davix/params/davixrequestparams.hpp include/davix/request/httprequest.hpp include/davix/status/davixstatusrequest.hpp include/davix/utils/davix_azure_utils.hpp include/davix/utils/davix_config.hpp include/davix/utils/davix_gcloud_utils.hpp include/davix/utils/davix_logger.hpp include/davix/utils/davix_misc_utils.hpp include/davix/utils/davix_nocopy.hpp include/davix/utils/davix_s3_utils.hpp +include/davix/utils/davix_swift_utils.hpp include/davix/utils/davix_types.hpp include/davix/utils/davix_uri.hpp lib/libdavix.so lib/libdavix.so.0 lib/libdavix.so.%%PORTVERSION%% libdata/pkgconfig/davix.pc man/man1/davix-get.1.gz man/man1/davix-http.1.gz man/man1/davix-ls.1.gz man/man1/davix-mkdir.1.gz man/man1/davix-mv.1.gz man/man1/davix-put.1.gz man/man1/davix-rm.1.gz man/man3/libdavix.3.gz