Index: head/www/davix/Makefile =================================================================== --- head/www/davix/Makefile (revision 474214) +++ head/www/davix/Makefile (revision 474215) @@ -1,25 +1,29 @@ # $FreeBSD$ PORTNAME= davix -DISTVERSION= 0.6.7 +DISTVERSIONPREFIX= R_ +DISTVERSION= 0_6_8 CATEGORIES= www -MASTER_SITES= http://grid-deployment.web.cern.ch/grid-deployment/dms/lcgutil/tar/davix/${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 PORTSCOUT= limit:^.*\.[0-9]+$$ USES= cmake localbase ssl +USE_GITHUB= yes +GH_ACCOUNT= cern-it-sdc-id USE_GNOME= libxml2 USE_LDCONFIG= yes + +PLIST_SUB= PORTVERSION=${PORTVERSION} post-install: @${RM} -r ${STAGEDIR}${DOCSDIR} .include Index: head/www/davix/distinfo =================================================================== --- head/www/davix/distinfo (revision 474214) +++ head/www/davix/distinfo (revision 474215) @@ -1,3 +1,3 @@ -TIMESTAMP = 1529134064 -SHA256 (davix-0.6.7.tar.gz) = bc067aef67d16fd530b45d7718294802dbd5f63c1a6002f50c404055f7755431 -SIZE (davix-0.6.7.tar.gz) = 3346429 +TIMESTAMP = 1531096792 +SHA256 (cern-it-sdc-id-davix-R_0_6_8_GH0.tar.gz) = 722f522f5d6cad15cb6b840967417f870d465fc1a98b04295718a72e5018a0b6 +SIZE (cern-it-sdc-id-davix-R_0_6_8_GH0.tar.gz) = 3033447 Index: head/www/davix/files/patch-deps_libneon_src_ne__socket.c =================================================================== --- head/www/davix/files/patch-deps_libneon_src_ne__socket.c (revision 474214) +++ head/www/davix/files/patch-deps_libneon_src_ne__socket.c (revision 474215) @@ -1,14 +1,14 @@ ---- deps/libneon/src/ne_socket.c.orig 2018-06-16 07:30:42 UTC +--- deps/libneon/src/ne_socket.c.orig 2018-06-15 09:35:23 UTC +++ deps/libneon/src/ne_socket.c -@@ -31,9 +31,9 @@ +@@ -34,9 +34,9 @@ #include #endif #include -#ifdef HAVE_SYS_SOCKET_H +//#ifdef HAVE_SYS_SOCKET_H #include -#endif +//#endif #ifdef __linux__ #include Index: head/www/davix/files/patch-src_tools_CMakeLists.txt =================================================================== --- head/www/davix/files/patch-src_tools_CMakeLists.txt (nonexistent) +++ head/www/davix/files/patch-src_tools_CMakeLists.txt (revision 474215) @@ -0,0 +1,79 @@ +--- src/tools/CMakeLists.txt.orig 2018-06-15 09:35:23 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 + ## davix cmd line + add_executable(davix_tool ${davix_main_src}) + +-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}) + +-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 + ## davix get cmd line + add_executable(davix_get_tool ${davix_get_main_src}) + +-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}) + +-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 + ## davix del cmd line + add_executable(davix_mkdir_tool ${davix_mkcol_main_src}) + +-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}) + +-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}) + +-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) + + add_executable(davix_cp_tool ${davix_copy_main_src}) + +- target_link_libraries(davix_cp_tool davix_copy davix_tool_lib) ++ target_link_libraries(davix_cp_tool davix_copy davix_tool_lib uuid) + set_target_properties(davix_cp_tool PROPERTIES + OUTPUT_NAME "davix-cp") + add_dependencies(davix_cp_tool davix_copy) Property changes on: head/www/davix/files/patch-src_tools_CMakeLists.txt ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/davix/pkg-plist =================================================================== --- head/www/davix/pkg-plist (revision 474214) +++ head/www/davix/pkg-plist (revision 474215) @@ -1,46 +1,47 @@ bin/davix-get bin/davix-http bin/davix-ls bin/davix-mkdir bin/davix-mv bin/davix-put bin/davix-rm 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_types.hpp include/davix/utils/davix_uri.hpp lib/libdavix.so lib/libdavix.so.0 -lib/libdavix.so.0.6.7 +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