diff --git a/www/davix/Makefile b/www/davix/Makefile
index dded5460af64..56dc857a7b5d 100644
--- a/www/davix/Makefile
+++ b/www/davix/Makefile
@@ -1,35 +1,36 @@
 PORTNAME=	davix
 DISTVERSIONPREFIX=	R_
 DISTVERSION=	0_8_5
+PORTREVISION=	1
 CATEGORIES=	www
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Make the task of managing files over HTTP-based protocols simple
 WWW=		https://dmc-docs.web.cern.ch/dmc-docs/davix.html
 
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libcurl.so:ftp/curl \
 		libuuid.so:misc/e2fsprogs-libuuid
 
 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_TUPLE=	google:googletest:f570b27:googletest/deps/googletest
 
 CMAKE_OFF=	EMBEDDED_LIBCURL DAVIX_TESTS
 CMAKE_TESTING_ON=	DAVIX_TESTS UNIT_TESTS BENCH_TESTS # 1 test fails, and several tests hang, see https://github.com/cern-fts/davix/issues/108
 
 PLIST_SUB=	PORTVERSION=${PORTVERSION}
 
 PORTSCOUT=	limit:^[0-9\.]*$$ # prevent versions like N.N.N-el7.x86_64
 
 post-install:
 	@${RM} -r ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/www/davix/files/patch-cmake_modules_DefineInstallationPaths.cmake b/www/davix/files/patch-cmake_modules_DefineInstallationPaths.cmake
deleted file mode 100644
index d016831c62f9..000000000000
--- a/www/davix/files/patch-cmake_modules_DefineInstallationPaths.cmake
+++ /dev/null
@@ -1,11 +0,0 @@
---- cmake/modules/DefineInstallationPaths.cmake.orig	2018-06-16 07:54:25 UTC
-+++ cmake/modules/DefineInstallationPaths.cmake
-@@ -114,7 +114,7 @@ ENDIF(EXISTS "/usr/lib64" )
-     CACHE PATH "The ${APPLICATION_NAME} sysconfig install dir (default prefix/etc)"
-   )
-   SET(MAN_INSTALL_DIR
--    "${SHARE_INSTALL_PREFIX}/man"
-+    "${CMAKE_INSTALL_PREFIX}/man"
-     CACHE PATH "The ${APPLICATION_NAME} man install dir (default prefix/man)"
-   )
-   SET(INFO_INSTALL_DIR
diff --git a/www/davix/pkg-plist b/www/davix/pkg-plist
index 317a338221c5..ec59c95a460e 100644
--- a/www/davix/pkg-plist
+++ b/www/davix/pkg-plist
@@ -1,48 +1,48 @@
 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_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
+share/man/man1/davix-get.1.gz
+share/man/man1/davix-http.1.gz
+share/man/man1/davix-ls.1.gz
+share/man/man1/davix-mkdir.1.gz
+share/man/man1/davix-mv.1.gz
+share/man/man1/davix-put.1.gz
+share/man/man1/davix-rm.1.gz
+share/man/man3/libdavix.3.gz