From 19a4feda9e3564d78930d768c5796d756c5972a4 Mon Sep 17 00:00:00 2001
From: Thierry Thomas <thierry@FreeBSD.org>
Date: Sun, 26 Oct 2014 14:43:54 +0000
Subject: [PATCH] Refresh.

---
 net-im/tox/Makefile                             |  7 +++----
 net-im/tox/distinfo                             |  4 ++--
 net-im/toxic/Makefile                           |  9 +++++----
 net-im/toxic/distinfo                           |  4 ++--
 net-im/toxic/files/patch-cfg_targets_install.mk | 11 +++++++++++
 net-im/toxic/pkg-plist                          |  3 +--
 6 files changed, 24 insertions(+), 14 deletions(-)
 create mode 100644 net-im/toxic/files/patch-cfg_targets_install.mk

diff --git a/net-im/tox/Makefile b/net-im/tox/Makefile
index d94711274075..d2eecb74bb16 100644
--- a/net-im/tox/Makefile
+++ b/net-im/tox/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	toxcore
-PORTVERSION=	0.141012
-PORTREVISION=	1
+PORTVERSION=	0.141026
 CATEGORIES=	net-im net-p2p
 
 MAINTAINER=	thierry@FreeBSD.org
@@ -21,11 +20,11 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	irungentoo
 GH_PROJECT=	${PORTNAME}
 GH_TAGNAME=	${GH_COMMIT}
-GH_COMMIT=	0444ca1
+GH_COMMIT=	9c480ac
 
 USE_AUTOTOOLS=	libtoolize aclocal autoconf autoheader automake
 AUTOMAKE_ARGS=	-a -c -f
-CONFIGURE_ARGS=	--enable-testing
+CONFIGURE_ARGS=	--enable-tests
 USES=		libtool openal:soft pathfix pkgconfig
 USE_SDL=	yes
 USE_LDCONFIG=	yes
diff --git a/net-im/tox/distinfo b/net-im/tox/distinfo
index 4206fc4a79ac..d59872f2f754 100644
--- a/net-im/tox/distinfo
+++ b/net-im/tox/distinfo
@@ -1,2 +1,2 @@
-SHA256 (toxcore-0.141012.tar.gz) = 6b1ec20bc036ad63ca5633ccde4aa0e15109930d38f2618b4573fcb2a3bcd48e
-SIZE (toxcore-0.141012.tar.gz) = 333266
+SHA256 (toxcore-0.141026.tar.gz) = 169f7517f7c9569a5aeed8bf9976b204905e23e8f0b5292e1c4a60b6c46989ad
+SIZE (toxcore-0.141026.tar.gz) = 338782
diff --git a/net-im/toxic/Makefile b/net-im/toxic/Makefile
index 5fd2cd7a0995..22cae103c2de 100644
--- a/net-im/toxic/Makefile
+++ b/net-im/toxic/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	toxic
-PORTVERSION=	0.5.2.141012
+PORTVERSION=	0.5.2.141025
 CATEGORIES=	net-im
 
 MAINTAINER=	thierry@FreeBSD.org
@@ -19,7 +19,7 @@ RUN_DEPENDS=	${LOCALBASE}/lib/libtoxcore.a:${PORTSDIR}/net-im/tox
 USE_GITHUB=	yes
 GH_ACCOUNT=	tox
 GH_TAGNAME=	${GH_COMMIT}
-GH_COMMIT=	f7d46f1
+GH_COMMIT=	e22b7a3
 
 OPTIONS_DEFINE=	X11
 OPTIONS_DEFAULT=X11
@@ -34,7 +34,7 @@ INSTALL_WRKSRC=	${BUILD_WRKSRC}
 MAKE_ENV=	USER_CFLAGS="${CFLAGS}" USER_LDFLAGS="${LDFLAGS}"
 SUB_FILES=	pkg-message
 
-USES=		ncurses openal:al,alut gmake pkgconfig
+USES=		desktop-file-utils ncurses openal:al,alut gmake pkgconfig
 
 .include <bsd.port.pre.mk>
 
@@ -44,10 +44,11 @@ LDFLAGS+=	-B${LOCALBASE}/bin
 .endif
 
 pre-configure:
-	${REINPLACE_CMD} -e 's|PREFIX =|PREFIX?=|;s|$$(shell git rev-list HEAD --count)|${GH_COMMIT}|'	\
+	${REINPLACE_CMD} -e 's|PREFIX =|PREFIX?=|;s|$$(shell git rev-list HEAD.*$$|${GH_COMMIT}|'	\
 		${WRKSRC}/cfg/global_vars.mk
 
 post-install:
+	${RM} ${STAGEDIR}${MANPREFIX}/man/man1/toxic.1-e ${STAGEDIR}${MANPREFIX}/man/man5/toxic.conf.5-e
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/toxic
 
 .include <bsd.port.post.mk>
diff --git a/net-im/toxic/distinfo b/net-im/toxic/distinfo
index 878a5d48cf26..0af7c88c8f7d 100644
--- a/net-im/toxic/distinfo
+++ b/net-im/toxic/distinfo
@@ -1,2 +1,2 @@
-SHA256 (toxic-0.5.2.141012.tar.gz) = 34f7e541f4eb195b093b7424c10c7b5db2326da1d5c136223368156323cd6a1c
-SIZE (toxic-0.5.2.141012.tar.gz) = 1095642
+SHA256 (toxic-0.5.2.141025.tar.gz) = e69eaa2ec68d31fff942997b13fd8e1e1e7937b6e37d69ca61a31942aa350793
+SIZE (toxic-0.5.2.141025.tar.gz) = 1098702
diff --git a/net-im/toxic/files/patch-cfg_targets_install.mk b/net-im/toxic/files/patch-cfg_targets_install.mk
new file mode 100644
index 000000000000..320aa6e9b08c
--- /dev/null
+++ b/net-im/toxic/files/patch-cfg_targets_install.mk
@@ -0,0 +1,11 @@
+--- cfg/targets/install.mk.orig	2014-10-21 15:20:51.000000000 +0200
++++ cfg/targets/install.mk	2014-10-25 17:27:09.000000000 +0200
+@@ -23,7 +23,7 @@
+ 	@echo "Installing man pages"
+ 	@mkdir -p $(abspath $(DESTDIR)/$(MANDIR))
+ 	@for f in $(MANFILES) ; do \
+-		if [ ! -e "$$f" ]; then \
++		if [ ! -e "$(DOC_DIR)/$$f" ]; then \
+ 			continue ;\
+ 		fi ;\
+ 		section=$(abspath $(DESTDIR)/$(MANDIR))/man`echo $$f | rev | cut -d "." -f 1` ;\
diff --git a/net-im/toxic/pkg-plist b/net-im/toxic/pkg-plist
index 6a9fd024657c..befd4d3214c4 100644
--- a/net-im/toxic/pkg-plist
+++ b/net-im/toxic/pkg-plist
@@ -1,8 +1,7 @@
 bin/toxic
-man/man1/toxic.1-e.gz
 man/man1/toxic.1.gz
-man/man5/toxic.conf.5-e.gz
 man/man5/toxic.conf.5.gz
+share/applications/toxic.desktop
 %%DATADIR%%/DHTnodes
 %%DATADIR%%/DHTnodes-e
 %%DATADIR%%/DNSservers