svn commit: r452246 - in head/comms/svxlink: . files

[Adrian Chadd]

Author: adrian (src committer)
Date: Mon Oct 16 19:28:11 2017
New Revision: 452246
URL: https://svnweb.freebsd.org/changeset/ports/452246

Log:
  [svxlink] make this compile / run on FreeBSD-HEAD again.
  
  I've also submitted the patches upstream.
  
  Approved by:	db
  Differential Revision:	https://reviews.freebsd.org/D12680

Added:
  head/comms/svxlink/files/patch-src_async_core_AsyncTcpServer.cpp   (contents, props changed)
  head/comms/svxlink/files/patch-src_async_core_AsyncUdpSocket.cpp   (contents, props changed)
Modified:
  head/comms/svxlink/Makefile

Modified: head/comms/svxlink/Makefile
==============================================================================
--- head/comms/svxlink/Makefile	Mon Oct 16 18:31:20 2017	(r452245)
+++ head/comms/svxlink/Makefile	Mon Oct 16 19:28:11 2017	(r452246)
@@ -3,16 +3,13 @@
 
 PORTNAME?=	svxlink
 PORTVERSION=	15.11
+PORTREVISION=	1
 CATEGORIES=	comms hamradio
 
 MAINTAINER=	hamradio at FreeBSD.org
 COMMENT?=	General purpose ham radio voice services
 
 LICENSE=	GPLv2
-
-BROKEN=		does not build since newer libsigc++20
-DEPRECATED=	Broken for more than 6 months
-EXPIRATION_DATE=	2017-11-09
 
 LIB_DEPENDS?=	libgsm.so:audio/gsm \
 		libspeex.so:audio/speex \

Added: head/comms/svxlink/files/patch-src_async_core_AsyncTcpServer.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/comms/svxlink/files/patch-src_async_core_AsyncTcpServer.cpp	Mon Oct 16 19:28:11 2017	(r452246)
@@ -0,0 +1,11 @@
+--- src/async/core/AsyncTcpServer.cpp.orig	2015-11-22 16:03:59 UTC
++++ src/async/core/AsyncTcpServer.cpp
+@@ -198,7 +198,7 @@ TcpServer::TcpServer(const string& port_str, const Asy
+   {
+     addr.sin_addr = bind_ip.ip4Addr();
+   }
+-  if (bind(sock, (struct sockaddr *)&addr, sizeof(struct sockaddr_in)) != 0)
++  if (::bind(sock, (struct sockaddr *)&addr, sizeof(struct sockaddr_in)) != 0)
+   {
+     perror("bind");
+     cleanup();

Added: head/comms/svxlink/files/patch-src_async_core_AsyncUdpSocket.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/comms/svxlink/files/patch-src_async_core_AsyncUdpSocket.cpp	Mon Oct 16 19:28:11 2017	(r452246)
@@ -0,0 +1,11 @@
+--- src/async/core/AsyncUdpSocket.cpp.orig	2015-11-22 16:03:59 UTC
++++ src/async/core/AsyncUdpSocket.cpp
+@@ -189,7 +189,7 @@ UdpSocket::UdpSocket(uint16_t local_port, const IpAddr
+     {
+       addr.sin_addr = bind_ip.ip4Addr();
+     }
+-    if(bind(sock, reinterpret_cast<struct sockaddr *>(&addr), sizeof(addr))
++    if(::bind(sock, reinterpret_cast<struct sockaddr *>(&addr), sizeof(addr))
+ 	== -1)
+     {
+       perror("bind");