Index: head/www/davix/Makefile
===================================================================
--- head/www/davix/Makefile	(revision 481120)
+++ head/www/davix/Makefile	(revision 481121)
@@ -1,29 +1,32 @@
 # $FreeBSD$
 
 PORTNAME=	davix
-DISTVERSIONPREFIX=	R_
-DISTVERSION=	0_6_8
+DISTVERSION=	0.6.9
+MASTER_SITES=	http://grid-deployment.web.cern.ch/grid-deployment/dms/lcgutil/tar/davix/${DISTVERSION}/
 CATEGORIES=	www
 
 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 compiler:c++11-lang localbase ssl
-USE_GITHUB=	yes
-GH_ACCOUNT=	cern-it-sdc-id
+USES=		cmake:outsource compiler:c++11-lang gnome localbase:ldflags python:build shebangfix ssl
+SHEBANG_GLOB=	*.py
 USE_GNOME=	libxml2
 USE_LDCONFIG=	yes
 
 PLIST_SUB=	PORTVERSION=${PORTVERSION}
 
 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 <bsd.port.mk>
Index: head/www/davix/distinfo
===================================================================
--- head/www/davix/distinfo	(revision 481120)
+++ head/www/davix/distinfo	(revision 481121)
@@ -1,3 +1,3 @@
-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
+TIMESTAMP = 1538501544
+SHA256 (davix-0.6.9.tar.gz) = fbd97eb5fdf82ca48770d06bf8e2805b35f23255478aa381a9d25a49eb98e348
+SIZE (davix-0.6.9.tar.gz) = 4333197
Index: head/www/davix/files/patch-test_bench_CMakeLists.txt
===================================================================
--- head/www/davix/files/patch-test_bench_CMakeLists.txt	(nonexistent)
+++ head/www/davix/files/patch-test_bench_CMakeLists.txt	(revision 481121)
@@ -0,0 +1,11 @@
+--- test/bench/CMakeLists.txt.orig	2018-10-02 17:06:04 UTC
++++ test/bench/CMakeLists.txt
+@@ -7,7 +7,7 @@ LIST(APPEND src_davix_bench "davix_bench
+ #include_directories(/usr/include/davix)
+ 
+ add_executable(davix-bench ${src_davix_bench})
+-target_link_libraries(davix-bench libdavix ${CMAKE_THREAD_LIBS_INIT})
++target_link_libraries(davix-bench libdavix ${CMAKE_THREAD_LIBS_INIT} uuid)
+ 
+ function(test_read url opt input)
+     add_test(test_bench_read_${url} davix-bench ${opt} ${url} ${input})

Property changes on: head/www/davix/files/patch-test_bench_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/files/patch-test_functional_CMakeLists.txt
===================================================================
--- head/www/davix/files/patch-test_functional_CMakeLists.txt	(nonexistent)
+++ head/www/davix/files/patch-test_functional_CMakeLists.txt	(revision 481121)
@@ -0,0 +1,11 @@
+--- test/functional/CMakeLists.txt.orig	2018-10-02 17:09:41 UTC
++++ test/functional/CMakeLists.txt
+@@ -83,7 +83,7 @@ add_library(test_davix_functional_lib ST
+ #target_link_libraries(test_mv libdavix test_davix_functional_lib)
+ 
+ add_executable(tester ${src_tester})
+-target_link_libraries(tester libdavix test_davix_functional_lib)
++target_link_libraries(tester libdavix test_davix_functional_lib uuid)
+ 
+ function(assert_not_empty var)
+     if("${var}" STREQUAL "")

Property changes on: head/www/davix/files/patch-test_functional_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/files/patch-test_unit_CMakeLists.txt
===================================================================
--- head/www/davix/files/patch-test_unit_CMakeLists.txt	(nonexistent)
+++ head/www/davix/files/patch-test_unit_CMakeLists.txt	(revision 481121)
@@ -0,0 +1,11 @@
+--- test/unit/CMakeLists.txt.orig	2018-10-02 17:02:58 UTC
++++ test/unit/CMakeLists.txt
+@@ -33,7 +33,7 @@ add_executable(g_test_unit_davix_exe ${s
+                 ${src_httprequest} ${src_datetime} ${src_neon} ${src_parser} ${src_auth} ${src_utils} ${src_parser} ${SRC_BASE64}
+                 ${SRC_HMACSHA1} ${src_files} ${src_alibxx})
+ 
+-target_link_libraries(g_test_unit_davix_exe alibxx_core davix_tool_lib libdavix gtest gtest_main ${CMAKE_THREAD_LIBS_INIT} ${LIBSSL_PKG_LIBRARIES})
++target_link_libraries(g_test_unit_davix_exe alibxx_core davix_tool_lib libdavix gtest gtest_main ${CMAKE_THREAD_LIBS_INIT} ${LIBSSL_PKG_LIBRARIES} uuid)
+ add_dependencies(g_test_unit_davix_exe libdavix)
+ 
+ 

Property changes on: head/www/davix/files/patch-test_unit_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