Index: head/devel/opendht/Makefile
===================================================================
--- head/devel/opendht/Makefile	(revision 464956)
+++ head/devel/opendht/Makefile	(revision 464957)
@@ -1,33 +1,47 @@
 # Created by: Yuri Victorovich <yuri@rawbw.com>
 # $FreeBSD$
 
 PORTNAME=	opendht
-PORTVERSION=	0.5.2
-PORTREVISION=	3
+DISTVERSION=	1.6.1
 CATEGORIES=	devel net
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Lightweight Distributed Hash Table implementation
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libmsgpackc.so:devel/msgpack \
+LIB_DEPENDS=	libargon2.so:security/libargon2 \
+		libmsgpackc.so:devel/msgpack \
 		libnettle.so:security/nettle \
 		libgnutls.so:security/gnutls
 
+USES=		cmake:outsource compiler:c++11-lib pathfix pkgconfig readline:port
 USE_GITHUB=	yes
 GH_ACCOUNT=	savoirfairelinux
-
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=--disable-python
 USE_LDCONFIG=	yes
 
-USES=		autoreconf compiler:c++11-lib libtool pathfix pkgconfig readline:port
-CFLAGS+=	-I${LOCALBASE}/include
-CXXFLAGS+=	-I${LOCALBASE}/include
+CMAKE_OFF=	OPENDHT_STATIC
 
-post-install:
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libopendht.so.0.0.0
+OPTIONS_DEFINE=	PROXY_SERVER PROXY_CLIENT PUSH_NOTIFICATIONS DOCS
 
-.include <bsd.port.mk>
+PROXY_SERVER_DESC=		Enable DHT proxy server
+PROXY_CLIENT_DESC=		Enable DHT proxy client
+PUSH_NOTIFICATIONS_DESC=	Enable push notifications support
+
+PROXY_SERVER_CMAKE_BOOL=	OPENDHT_PROXY_SERVER
+PROXY_CLIENT_CMAKE_BOOL=	OPENDHT_PROXY_CLIENT
+PUSH_NOTIFICATIONS_CMAKE_BOOL=	OPENDHT_PUSH_NOTIFICATIONS
+
+PROXY_SERVER_LIB_DEPENDS=	libjsoncpp.so:devel/jsoncpp \
+				librestbed.so:www/restbed
+
+PORTDOCS=	*
+
+.include <bsd.port.pre.mk>
+
+.if ${OPSYS} == FreeBSD && ${OSREL} == 10.3
+BROKEN=	Missing __cxa_thread_atexit
+.endif
+
+.include <bsd.port.post.mk>
Index: head/devel/opendht/distinfo
===================================================================
--- head/devel/opendht/distinfo	(revision 464956)
+++ head/devel/opendht/distinfo	(revision 464957)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1464414803
-SHA256 (savoirfairelinux-opendht-0.5.2_GH0.tar.gz) = 4fb8c80fed8abd4861b16144a0c50853717add59d5491b779590fa81e72784b8
-SIZE (savoirfairelinux-opendht-0.5.2_GH0.tar.gz) = 120460
+TIMESTAMP = 1521093684
+SHA256 (savoirfairelinux-opendht-1.6.1_GH0.tar.gz) = c50d4862d01233be02856affc560dcd6425b5e742c6445d597dc0ceccb7e9d19
+SIZE (savoirfairelinux-opendht-1.6.1_GH0.tar.gz) = 400456
Index: head/devel/opendht/files/patch-doc_CMakeLists.txt
===================================================================
--- head/devel/opendht/files/patch-doc_CMakeLists.txt	(nonexistent)
+++ head/devel/opendht/files/patch-doc_CMakeLists.txt	(revision 464957)
@@ -0,0 +1,9 @@
+--- doc/CMakeLists.txt.orig	2018-03-15 06:08:59 UTC
++++ doc/CMakeLists.txt
+@@ -1,5 +1,5 @@
+ if (OPENDHT_TOOLS)
+-	INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/dhtnode.1 DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man1)
++	INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/dhtnode.1 DESTINATION ${CMAKE_INSTALL_PREFIX}/man/man1)
+ endif ()
+ 
+ if (OPENDHT_DOCUMENTATION)

Property changes on: head/devel/opendht/files/patch-doc_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/devel/opendht/files/patch-include_opendht_value.h
===================================================================
--- head/devel/opendht/files/patch-include_opendht_value.h	(revision 464956)
+++ head/devel/opendht/files/patch-include_opendht_value.h	(revision 464957)
@@ -1,14 +1,14 @@
---- include/opendht/value.h.orig	2016-05-13 00:23:45 UTC
+--- include/opendht/value.h.orig	2016-11-12 22:38:27 UTC
 +++ include/opendht/value.h
 @@ -26,6 +26,11 @@
  
  #include <msgpack.hpp>
  
 +#if defined(__FreeBSD__)
 +#include <sys/socket.h>
 +#include <netinet/in.h>
 +#endif
 +
- #ifndef _WIN32
- #include <netinet/in.h>
- #include <netdb.h>
+ #include <string>
+ #include <sstream>
+ #include <bitset>
Index: head/devel/opendht/pkg-plist
===================================================================
--- head/devel/opendht/pkg-plist	(revision 464956)
+++ head/devel/opendht/pkg-plist	(revision 464957)
@@ -1,18 +1,37 @@
 bin/dhtchat
 bin/dhtnode
 bin/dhtscanner
 include/opendht.h
+include/opendht/callbacks.h
 include/opendht/crypto.h
+include/opendht/def.h
 include/opendht/default_types.h
 include/opendht/dht.h
+include/opendht/dht_interface.h
+include/opendht/dht_proxy_client.h
+include/opendht/dht_proxy_server.h
 include/opendht/dhtrunner.h
+include/opendht/indexation/pht.h
 include/opendht/infohash.h
+include/opendht/log.h
+include/opendht/log_enable.h
+include/opendht/network_engine.h
+include/opendht/node.h
+include/opendht/node_cache.h
+include/opendht/rate_limiter.h
 include/opendht/rng.h
+include/opendht/routing_table.h
+include/opendht/scheduler.h
 include/opendht/securedht.h
+include/opendht/sockaddr.h
 include/opendht/utils.h
 include/opendht/value.h
-lib/libopendht.a
+include/opendht/value.h.orig
+lib/cmake/opendht/opendhtConfig-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/opendht/opendhtConfig.cmake
+lib/cmake/opendht/opendhtConfigVersion.cmake
 lib/libopendht.so
-lib/libopendht.so.0
-lib/libopendht.so.0.0.0
+lib/libopendht.so.1
+lib/libopendht.so.1.6.1
 libdata/pkgconfig/opendht.pc
+man/man1/dhtnode.1.gz