Index: net-im/tox/Makefile
===================================================================
--- net-im/tox/Makefile	(revision 429107)
+++ net-im/tox/Makefile	(working copy)
@@ -2,8 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	toxcore
-PORTVERSION=	0.160924
-PORTREVISION=	3
+PORTVERSION=	0.1.2
+PORTEPOCH=	1
 CATEGORIES=	net-im net-p2p
 
 MAINTAINER=	thierry@FreeBSD.org
@@ -13,41 +13,32 @@
 
 BUILD_DEPENDS=	checkmk:devel/libcheck
 LIB_DEPENDS=	libvpx.so:multimedia/libvpx		\
+		libmsgpackc.so:devel/msgpack		\
+		libsndfile.so:audio/libsndfile		\
+		libsodium.so:security/libsodium		\
+		libportaudio.so:audio/portaudio		\
+		libopencv_core.so:graphics/opencv2-core	\
 		libopus.so:audio/opus
 
 USE_GITHUB=	yes
-GH_ACCOUNT=	irungentoo
-GH_TAGNAME=	161ab46
+GH_ACCOUNT=	TokTok
+GH_PROJECT=	c-toxcore
+GH_TAGNAME=	v${PORTVERSION}
 
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--enable-tests
-USES=		autoreconf compiler:c11 libtool pathfix pkgconfig
+USES=		cmake compiler:c11 libtool pathfix pkgconfig
 USE_LDCONFIG=	yes
-INSTALL_TARGET=		install-strip
 
 OPTIONS_DEFINE=		DAEMON
-OPTIONS_RADIO=		CRYPTO
-OPTIONS_RADIO_CRYPTO=	SODIUM NACL
-OPTIONS_DEFAULT=	SODIUM
 OPTIONS_SUB=		yes
 
-SODIUM_DESC=		Prefer libsodium
-SODIUM_LIB_DEPENDS=	libsodium.so:security/libsodium
-
-NACL_DESC=		Prefer NaCl
-NACL_CONFIGURE_ENABLE=	nacl
-NACL_CONFIGURE_ON=	--with-nacl-libs=${LOCALBASE}/lib
-NACL_BUILD_DEPENDS=	${LOCALBASE}/lib/libnacl.a:security/nacl
-NACL_RUN_DEPENDS=	${LOCALBASE}/lib/libnacl.a:security/nacl
-
 DAEMON_DESC=		Bootstrap daemon
-DAEMON_CONFIGURE_ENABLE=daemon
+DAEMON_CMAKE_ON=	-DBOOTSTRAP_DAEMON=on
 DAEMON_LIB_DEPENDS=	libconfig.so:devel/libconfig
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDAEMON}
-USERS=	toxdht
+USERS=		toxdht
 USE_RC_SUBR=	tox-bootstrapd
 SUB_LIST=	TOXDHT=${USERS}
 PLIST_SUB+=	TOXDHT=${USERS}
@@ -56,18 +47,9 @@
 PKGMESSAGE=	${PKGDIR}/pkg-message.daemon
 .endif
 
-pre-everything::
-.if ${PORT_OPTIONS:MNACL}
-	@${ECHO_CMD}
-	@${ECHO_CMD} "Warning: building toxcore against NaCl is not supported by some clients (e.g. qTox)!"
-	@${ECHO_CMD}
-.endif
-
-pre-configure:
-	${REINPLACE_CMD} 's|/usr/local|${LOCALBASE}|' ${WRKSRC}/configure.ac
-
 post-install:
 .if ${PORT_OPTIONS:MDAEMON}
+	${INSTALL_PROGRAM} ${WRKSRC}/tox-bootstrapd ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/other/bootstrap_daemon/tox-bootstrapd.conf	\
 		${STAGEDIR}${PREFIX}/etc/tox-bootstrapd.conf.sample
 	${MKDIR} ${STAGEDIR}${KEYS_DIR}
Index: net-im/tox/distinfo
===================================================================
--- net-im/tox/distinfo	(revision 429107)
+++ net-im/tox/distinfo	(working copy)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1474746095
-SHA256 (irungentoo-toxcore-0.160924-161ab46_GH0.tar.gz) = 9c11e2f16b57d3773c9ae3708565837106fa1576a16a1b6ba8c02cf85a53de37
-SIZE (irungentoo-toxcore-0.160924-161ab46_GH0.tar.gz) = 395077
+TIMESTAMP = 1482696004
+SHA256 (TokTok-c-toxcore-0.1.2-v0.1.2_GH0.tar.gz) = 605a462f77b497009217b8dbd01108d112e9a8b018473826379f9f4ffa5c0b66
+SIZE (TokTok-c-toxcore-0.1.2-v0.1.2_GH0.tar.gz) = 417957
Index: net-im/tox/pkg-plist
===================================================================
--- net-im/tox/pkg-plist	(revision 429107)
+++ net-im/tox/pkg-plist	(working copy)
@@ -1,29 +1,37 @@
-bin/DHT_bootstrap
 %%DAEMON%%bin/tox-bootstrapd
 %%DAEMON%%@sample etc/tox-bootstrapd.conf.sample
 include/tox/tox.h
-include/tox/tox_old.h
 include/tox/toxav.h
 include/tox/toxdns.h
 include/tox/toxencryptsave.h
 lib/libtoxav.a
-%%SODIUM%%lib/libtoxav.so
-%%SODIUM%%lib/libtoxav.so.0
-%%SODIUM%%lib/libtoxav.so.0.0.0
+lib/libtoxav.so
 lib/libtoxcore.a
-%%SODIUM%%lib/libtoxcore.so
-%%SODIUM%%lib/libtoxcore.so.0
-%%SODIUM%%lib/libtoxcore.so.0.0.0
+lib/libtoxcore.so
+lib/libtoxcrypto.a
+lib/libtoxcrypto.so
+lib/libtoxdht.a
+lib/libtoxdht.so
 lib/libtoxdns.a
-%%SODIUM%%lib/libtoxdns.so
-%%SODIUM%%lib/libtoxdns.so.0
-%%SODIUM%%lib/libtoxdns.so.0.0.0
+lib/libtoxdns.so
 lib/libtoxencryptsave.a
-%%SODIUM%%lib/libtoxencryptsave.so
-%%SODIUM%%lib/libtoxencryptsave.so.0
-%%SODIUM%%lib/libtoxencryptsave.so.0.0.0
+lib/libtoxencryptsave.so
+lib/libtoxfriends.a
+lib/libtoxfriends.so
+lib/libtoxgroup.a
+lib/libtoxgroup.so
+lib/libtoxmessenger.a
+lib/libtoxmessenger.so
+lib/libtoxnetcrypto.a
+lib/libtoxnetcrypto.so
+lib/libtoxnetwork.a
+lib/libtoxnetwork.so
 libdata/pkgconfig/libtoxav.pc
 libdata/pkgconfig/libtoxcore.pc
+libdata/pkgconfig/toxav.pc
+libdata/pkgconfig/toxcore.pc
+libdata/pkgconfig/toxdns.pc
+libdata/pkgconfig/toxencryptsave.pc
 %%DAEMON%%@dir(%%TOXDHT%%,nobody,755) /var/run/tox-bootstrapd
 %%DAEMON%%@dir(%%TOXDHT%%,nobody,700) /var/lib/tox-bootstrapd
 %%DAEMON%%@dir /var/lib