5 files changed, 9 insertions, 91 deletions

diff --git a/net-im/tox/Makefile b/net-im/tox/Makefile
index c7e6213ba3d7..47ed32dd358e 100644
--- a/net-im/tox/Makefile
+++ b/net-im/tox/Makefile
@@ -2,9 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	toxcore
-PORTVERSION=	0.1.11
+PORTVERSION=	0.2.0
 DISTVERSIONPREFIX=	v
-PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	net-im net-p2p
 
@@ -15,13 +14,15 @@ LICENSE=	GPLv3
 
 BUILD_DEPENDS=	checkmk:devel/check
 LIB_DEPENDS=	libvpx.so:multimedia/libvpx		\
+		libmsgpackc.so:devel/msgpack		\
 		libsndfile.so:audio/libsndfile		\
+		libportaudio.so:audio/portaudio		\
 		libsodium.so:security/libsodium		\
 		libopencv_core.so:graphics/opencv-core	\
 		libopus.so:audio/opus			\
 		libconfig.so:devel/libconfig
-TEST_DEPENDS=	${LOCALBASE}/lib/libmsgpackc.so:devel/msgpack	\
-		${LOCALBASE}/lib/libportaudio.so:audio/portaudio
+
+CONFLICTS=	toxcore-legacy-0.1.*
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	TokTok
@@ -29,7 +30,7 @@ GH_PROJECT=	c-toxcore
 
 USES=		cmake compiler:c11 libtool pathfix pkgconfig
 USE_LDCONFIG=	yes
-PLIST_SUB=	VER=${PORTVERSION:C/0.//}.0 SO=1
+PLIST_SUB=	VER=${PORTVERSION:C/0.//}.0 SO=2
 
 OPTIONS_DEFINE=		DAEMON
 OPTIONS_SUB=		yes
diff --git a/net-im/tox/distinfo b/net-im/tox/distinfo
index 14ea3a2af55e..4d8d00162f0e 100644
--- a/net-im/tox/distinfo
+++ b/net-im/tox/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1514391164
-SHA256 (TokTok-c-toxcore-v0.1.11_GH0.tar.gz) = 85b6184a160c343616e3253a0bf728cfe1588e73b6d6f8772aa1e44061e41b10
-SIZE (TokTok-c-toxcore-v0.1.11_GH0.tar.gz) = 458597
+TIMESTAMP = 1519933444
+SHA256 (TokTok-c-toxcore-v0.2.0_GH0.tar.gz) = af1efe3b260963bef6497114d4fc0f217a7c4e4126b7b281aab8c316fddfefa9
+SIZE (TokTok-c-toxcore-v0.2.0_GH0.tar.gz) = 462009
diff --git a/net-im/tox/files/patch-CMakeLists.txt b/net-im/tox/files/patch-CMakeLists.txt
deleted file mode 100644
index 28e07d41f71c..000000000000
--- a/net-im/tox/files/patch-CMakeLists.txt
+++ /dev/null
@@ -1,26 +0,0 @@
---- CMakeLists.txt.orig	2017-12-27 18:43:18 UTC
-+++ CMakeLists.txt
-@@ -349,23 +349,6 @@ if(NOT SPECTEST)
-   endif()
- endif()
- 
--if(MSGPACK_FOUND)
--  add_c_executable(toxcore-sut
--    testing/hstox/binary_decode.c
--    testing/hstox/binary_encode.c
--    testing/hstox/driver.c
--    testing/hstox/methods.c
--    testing/hstox/packet_kinds.c
--    testing/hstox/test_main.c
--    testing/hstox/util.c)
--  target_link_modules(toxcore-sut
--    toxcore
--    ${MSGPACK_LIBRARIES})
--  if(SPECTEST)
--    add_test(NAME spectest COMMAND ${SPECTEST} $<TARGET_FILE:toxcore-sut>)
--  endif()
--endif()
--
- ################################################################################
- #
- # :: Automated regression tests
diff --git a/net-im/tox/files/patch-toxcore_ccompat.h b/net-im/tox/files/patch-toxcore_ccompat.h
deleted file mode 100644
index cf5ec0f15006..000000000000
--- a/net-im/tox/files/patch-toxcore_ccompat.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- toxcore/ccompat.h.orig	2017-04-27 18:20:19 UTC
-+++ toxcore/ccompat.h
-@@ -29,8 +29,6 @@
- // Emulation using alloca.
- #ifdef _WIN32
- #include <malloc.h>
--#else
--#include <alloca.h>
- #endif
- 
- #define VLA(type, name, size)                           \
diff --git a/net-im/tox/pkg-plist b/net-im/tox/pkg-plist
index e295da0bee21..135cfab50fec 100644
--- a/net-im/tox/pkg-plist
+++ b/net-im/tox/pkg-plist
@@ -2,58 +2,12 @@
 %%DAEMON%%@sample etc/tox-bootstrapd.conf.sample
 include/tox/tox.h
 include/tox/toxav.h
-include/tox/toxdns.h
 include/tox/toxencryptsave.h
-lib/libtoxav.a
-lib/libtoxav.so
-lib/libtoxav.so.%%SO%%
-lib/libtoxav.so.%%VER%%
 lib/libtoxcore.a
 lib/libtoxcore.so
 lib/libtoxcore.so.%%SO%%
 lib/libtoxcore.so.%%VER%%
-lib/libtoxcrypto.a
-lib/libtoxcrypto.so
-lib/libtoxcrypto.so.%%SO%%
-lib/libtoxcrypto.so.%%VER%%
-lib/libtoxdht.a
-lib/libtoxdht.so
-lib/libtoxdht.so.%%SO%%
-lib/libtoxdht.so.%%VER%%
-lib/libtoxdns.a
-lib/libtoxdns.so
-lib/libtoxdns.so.%%SO%%
-lib/libtoxdns.so.%%VER%%
-lib/libtoxencryptsave.a
-lib/libtoxencryptsave.so
-lib/libtoxencryptsave.so.%%SO%%
-lib/libtoxencryptsave.so.%%VER%%
-lib/libtoxfriends.a
-lib/libtoxfriends.so
-lib/libtoxfriends.so.%%SO%%
-lib/libtoxfriends.so.%%VER%%
-lib/libtoxgroup.a
-lib/libtoxgroup.so
-lib/libtoxgroup.so.%%SO%%
-lib/libtoxgroup.so.%%VER%%
-lib/libtoxmessenger.a
-lib/libtoxmessenger.so
-lib/libtoxmessenger.so.%%SO%%
-lib/libtoxmessenger.so.%%VER%%
-lib/libtoxnetcrypto.a
-lib/libtoxnetcrypto.so
-lib/libtoxnetcrypto.so.%%SO%%
-lib/libtoxnetcrypto.so.%%VER%%
-lib/libtoxnetwork.a
-lib/libtoxnetwork.so
-lib/libtoxnetwork.so.%%SO%%
-lib/libtoxnetwork.so.%%VER%%
-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