Index: Makefile
===================================================================
--- Makefile	(revision 485070)
+++ Makefile	(working copy)
@@ -2,9 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	nextcloudclient
-PORTVERSION=	0.0.0.20180323
-#DISTVERSIONPREFIX=	v
-PORTREVISION=	2
+PORTVERSION=	2.5.0
+DISTVERSIONPREFIX=	v
 CATEGORIES=	deskutils
 
 MAINTAINER=	mr@FreeBSD.org
@@ -17,31 +16,38 @@
 
 USES=		cmake:outsource,noninja compiler:c++11-lib gmake iconv \
 		localbase:ldflags pkgconfig qt:5 sqlite ssl
-USE_QT=		buildtools_build concurrent core dbus gui linguist_build network \
-		qmake_build sql webkit widgets xml
+USE_QT=		buildtools_build concurrent core dbus declarative gui \
+		linguist_build location network printsupport qmake_build \
+		sql webchannel webengine webkit widgets xml
+
 CMAKE_ARGS=	-DBUILD_WITH_QT4:BOOL=OFF \
 		-DCMAKE_INSTALL_MANDIR:STRING=man \
 		-DWITH_STACK_PROTECTOR:BOOL=OFF
 USE_LDCONFIG=	yes
-INSTALLS_ICONS=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	nextcloud
-GH_PROJECT=	client
-GH_TAGNAME=	4c40789dcafe5b193e125620b63dcc95e08ffba5
+GH_PROJECT=	desktop
 
-#OPTIONS_DEFINE=		DEBUG DOCS
-OPTIONS_DEFINE=		DEBUG # DOCS doesn't build currently
+#OPTIONS_DEFINE=	DOCS
 
 #DOCS_BUILD_DEPENDS=	sphinx-build:textproc/py-sphinx \
 #			doxygen:devel/doxygen
 #DOCS_USE=		tex=dvipsk:build,latex:build
-#DOCS_CMAKE_ON=		-DWITH_DOC:BOOL=ON
+#DOCS_CMAKE_ON=	-DWITH_DOC:BOOL=ON
 
-DEBUG_CMAKE_ON=		-DCMAKE_BUILD_TYPE:STRING=Debug
-
 PLIST_SUB=	VERSION=${PORTVERSION}
 
+.include <bsd.port.pre.mk>
+
+.ifdef WITH_DEBUG
+CMAKE_ARGS+=		-DCMAKE_BUILD_TYPE:STRING=Debug
+.endif
+
+.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1200085 && !${SSL_DEFAULT:Mopenssl111}
+BROKEN=	nextcloudclient requires OpenSSL 1.1.0, add DEFAULT_VERSIONS+=ssl=openssl111 to /etc/make.conf
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e \
 		's|.lst |.lst.sample |' ${WRKSRC}/CMakeLists.txt
@@ -49,4 +55,4 @@
 pre-configure:
 	@(cd ${WRKSRC} && ${CP} -f sync-exclude.lst sync-exclude.lst.sample)
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
Index: distinfo
===================================================================
--- distinfo	(revision 485070)
+++ distinfo	(working copy)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1521915864
-SHA256 (nextcloud-client-0.0.0.20180323-4c40789dcafe5b193e125620b63dcc95e08ffba5_GH0.tar.gz) = 311028a8dadc9137699255f9b1d619c45f5ce820f2942697285339bfc6c0e836
-SIZE (nextcloud-client-0.0.0.20180323-4c40789dcafe5b193e125620b63dcc95e08ffba5_GH0.tar.gz) = 18378272
+TIMESTAMP = 1542203394
+SHA256 (nextcloud-desktop-v2.5.0_GH0.tar.gz) = 4d639f43e49fd4367cd1b99bf21aecb2eac3bd89a7b0d96c7d2a0975baad6528
+SIZE (nextcloud-desktop-v2.5.0_GH0.tar.gz) = 18914632
Index: pkg-plist
===================================================================
--- pkg-plist	(revision 485070)
+++ pkg-plist	(working copy)
@@ -86,13 +86,24 @@
 share/nautilus-python/extensions/syncstate-Nextcloud.py
 share/nemo-python/extensions/syncstate-Nextcloud.py
 share/nextcloud/i18n/client_TW.qm
+share/nextcloud/i18n/client_bg.qm
 share/nextcloud/i18n/client_ca.qm
 share/nextcloud/i18n/client_cs.qm
 share/nextcloud/i18n/client_de.qm
 share/nextcloud/i18n/client_el.qm
 share/nextcloud/i18n/client_en.qm
+share/nextcloud/i18n/client_en_GB.qm
 share/nextcloud/i18n/client_es.qm
 share/nextcloud/i18n/client_es_AR.qm
+share/nextcloud/i18n/client_es_CL.qm
+share/nextcloud/i18n/client_es_CO.qm
+share/nextcloud/i18n/client_es_CR.qm
+share/nextcloud/i18n/client_es_DO.qm
+share/nextcloud/i18n/client_es_EC.qm
+share/nextcloud/i18n/client_es_GT.qm
+share/nextcloud/i18n/client_es_HN.qm
+share/nextcloud/i18n/client_es_MX.qm
+share/nextcloud/i18n/client_es_SV.qm
 share/nextcloud/i18n/client_et.qm
 share/nextcloud/i18n/client_eu.qm
 share/nextcloud/i18n/client_fa.qm
@@ -100,8 +111,10 @@
 share/nextcloud/i18n/client_fr.qm
 share/nextcloud/i18n/client_gl.qm
 share/nextcloud/i18n/client_hu.qm
+share/nextcloud/i18n/client_is.qm
 share/nextcloud/i18n/client_it.qm
 share/nextcloud/i18n/client_ja.qm
+share/nextcloud/i18n/client_lt_LT.qm
 share/nextcloud/i18n/client_nb_NO.qm
 share/nextcloud/i18n/client_nl.qm
 share/nextcloud/i18n/client_pl.qm