1) Refresh toxcore

1b) Upgrade toxic to 0.7.0
    Changelog at <https://github.com/JFreegman/toxic/releases/tag/v0.7.0>

2) Chase Tox's update and refresh uTox

Submitted by:	thierry (1) and Ivan Klymenko (2)(maintainer)

7 files changed, 29 insertions, 16 deletions

diff --git a/net-im/tox/Makefile b/net-im/tox/Makefile
index 42c96df60bfa..b0b77979e787 100644
--- a/net-im/tox/Makefile
+++ b/net-im/tox/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	toxcore
-PORTVERSION=	0.151028
-PORTREVISION=	1
+PORTVERSION=	0.151112
 CATEGORIES=	net-im net-p2p
 
 MAINTAINER=	thierry@FreeBSD.org
@@ -18,7 +17,7 @@ LIB_DEPENDS=	libvpx.so:${PORTSDIR}/multimedia/libvpx		\
 USE_GITHUB=	yes
 GH_ACCOUNT=	irungentoo
 GH_PROJECT=	${PORTNAME}
-GH_TAGNAME=	a25cc96
+GH_TAGNAME=	22634a4
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-tests
@@ -58,6 +57,13 @@ PID_DIR=	/var/run/tox-bootstrapd
 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
 
diff --git a/net-im/tox/distinfo b/net-im/tox/distinfo
index 83a5fccbc547..ea91c5ad5b17 100644
--- a/net-im/tox/distinfo
+++ b/net-im/tox/distinfo
@@ -1,2 +1,2 @@
-SHA256 (irungentoo-toxcore-0.151028-a25cc96_GH0.tar.gz) = 244572620d4dbb43537756cc64757a9c0e98ecd487c10c392ae26f5c4232e7cd
-SIZE (irungentoo-toxcore-0.151028-a25cc96_GH0.tar.gz) = 373964
+SHA256 (irungentoo-toxcore-0.151112-22634a4_GH0.tar.gz) = c49cc8f579d8a2b63191e6e76db1c386ae05334932a4e2c34587628663b07b77
+SIZE (irungentoo-toxcore-0.151112-22634a4_GH0.tar.gz) = 382326
diff --git a/net-im/toxic/Makefile b/net-im/toxic/Makefile
index 181d1bdb006b..937f68b7c391 100644
--- a/net-im/toxic/Makefile
+++ b/net-im/toxic/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	toxic
-PORTVERSION=	0.6.1.151028
+PORTVERSION=	0.7.0.151113
 CATEGORIES=	net-im
 
 MAINTAINER=	thierry@FreeBSD.org
@@ -11,15 +11,18 @@ COMMENT=	Console client for Tox
 LICENSE=	GPLv3 # or later
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libtoxcore.a:${PORTSDIR}/net-im/tox
+BUILD_DEPENDS=	${LOCALBASE}/lib/libtoxcore.a:${PORTSDIR}/net-im/tox	\
+		${LOCALBASE}/include/linux/videodev2.h:${PORTSDIR}/multimedia/v4l_compat
 LIB_DEPENDS=	libvpx.so:${PORTSDIR}/multimedia/libvpx		\
 		libopus.so:${PORTSDIR}/audio/opus		\
+		libcurl.so:${PORTSDIR}/ftp/curl			\
+		libv4l2.so:${PORTSDIR}/multimedia/libv4l	\
 		libconfig.so:${PORTSDIR}/devel/libconfig
 RUN_DEPENDS=	${LOCALBASE}/lib/libtoxcore.a:${PORTSDIR}/net-im/tox
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	Tox
-GH_TAGNAME=	f7e48d2
+GH_TAGNAME=	9f0feb7
 
 OPTIONS_DEFINE=	X11
 OPTIONS_DEFAULT=X11
diff --git a/net-im/toxic/distinfo b/net-im/toxic/distinfo
index f18b3dce5b59..97cde99335ae 100644
--- a/net-im/toxic/distinfo
+++ b/net-im/toxic/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Tox-toxic-0.6.1.151028-f7e48d2_GH0.tar.gz) = 561f503ce150b41172afff4f6d8b31da881f7de52555723cd6094aedac654ece
-SIZE (Tox-toxic-0.6.1.151028-f7e48d2_GH0.tar.gz) = 1110683
+SHA256 (Tox-toxic-0.7.0.151113-9f0feb7_GH0.tar.gz) = c6c796ac6f6f8f4aa7365ecdf612b669db14be5a893b6c07a614325e98db0b57
+SIZE (Tox-toxic-0.7.0.151113-9f0feb7_GH0.tar.gz) = 1122832
diff --git a/net-im/toxic/pkg-plist b/net-im/toxic/pkg-plist
index 2aa893e8b8c0..11591febb1b2 100644
--- a/net-im/toxic/pkg-plist
+++ b/net-im/toxic/pkg-plist
@@ -3,7 +3,7 @@ man/man1/toxic.1.gz
 man/man5/toxic.conf.5.gz
 share/applications/toxic.desktop
 %%DATADIR%%/DHTnodes
-%%DATADIR%%/DNSservers
+%%DATADIR%%/nameservers
 %%DATADIR%%/sounds/ToxicContactOffline.wav
 %%DATADIR%%/sounds/ToxicContactOnline.wav
 %%DATADIR%%/sounds/ToxicError.wav
diff --git a/net-im/uTox/Makefile b/net-im/uTox/Makefile
index d4eb3a0a0b28..8d5989a2d3de 100644
--- a/net-im/uTox/Makefile
+++ b/net-im/uTox/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	uTox
-DISTVERSION=	0.3.2.20150613
+DISTVERSION=	0.4.2.20151107
 CATEGORIES=	net-im net-p2p
 
 MAINTAINER=	fidaj@ukr.net
@@ -20,9 +20,9 @@ LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2 \
 RUN_DEPENDS=	${LOCALBASE}/lib/libtoxcore.a:${PORTSDIR}/net-im/tox
 
 USE_GITHUB=	yes
-GH_ACCOUNT=	notsecure
+GH_ACCOUNT=	GrayHatter
 #GH_PROJECT=	${PORTNAME}
-GH_TAGNAME=	5a5132f
+GH_TAGNAME=	1316542
 
 USES=		compiler:c11 desktop-file-utils gmake openal:al pkgconfig
 USE_XORG=	x11 xext xrender
@@ -34,6 +34,10 @@ OPTIONS_DEFAULT=	DBUS
 DBUS_LIB_DEPENDS=	libdbus-1.so:${PORTSDIR}/devel/dbus
 DBUS_MAKE_ARGS_OFF=	DBUS=0
 
+pre-configure:
+	${REINPLACE_CMD} -e 's|$$(GIT_V)|${DISTVERSION}-${GH_TAGNAME}|'	\
+		${WRKSRC}/${MAKEFILE}
+
 post-install:
 	${MV} ${WRKSRC}/utox.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
 	${RM} -rf ${STAGEDIR}${MAN1PREFIX}/share/man
diff --git a/net-im/uTox/distinfo b/net-im/uTox/distinfo
index 60d1baa0afae..a1d2517c7be0 100644
--- a/net-im/uTox/distinfo
+++ b/net-im/uTox/distinfo
@@ -1,2 +1,2 @@
-SHA256 (notsecure-uTox-0.3.2.20150613-5a5132f_GH0.tar.gz) = 8d52c35dde8148934a4e02db8a0c477e88ac66e1459e06ec806da0363ac1eceb
-SIZE (notsecure-uTox-0.3.2.20150613-5a5132f_GH0.tar.gz) = 942638
+SHA256 (GrayHatter-uTox-0.4.2.20151107-1316542_GH0.tar.gz) = 45bd5a0e2c6a9a66a3b4c474534f567a70c8e297168c6d5409ecfea4b82ce4e1
+SIZE (GrayHatter-uTox-0.4.2.20151107-1316542_GH0.tar.gz) = 958315