diff options
| author | Adrian Chadd <adrian@FreeBSD.org> | 2017-10-16 19:28:11 +0000 |
|---|---|---|
| committer | Adrian Chadd <adrian@FreeBSD.org> | 2017-10-16 19:28:11 +0000 |
| commit | b632376f4403d5e335d5c9252df3e96cb86556c2 (patch) | |
| tree | 7283aaadd65cbb1f6fe2d340c1389d777db59d35 /comms/svxlink | |
| parent | ac14aac52520ef4f1b51cf3b8fb75b08fc481d4c (diff) | |
| download | ports-b632376f4403d5e335d5c9252df3e96cb86556c2.tar.gz ports-b632376f4403d5e335d5c9252df3e96cb86556c2.zip | |
[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
Notes
Notes:
svn path=/head/; revision=452246
Diffstat (limited to 'comms/svxlink')
| -rw-r--r-- | comms/svxlink/Makefile | 5 | ||||
| -rw-r--r-- | comms/svxlink/files/patch-src_async_core_AsyncTcpServer.cpp | 11 | ||||
| -rw-r--r-- | comms/svxlink/files/patch-src_async_core_AsyncUdpSocket.cpp | 11 |
3 files changed, 23 insertions, 4 deletions
diff --git a/comms/svxlink/Makefile b/comms/svxlink/Makefile index d270a87a4b84..0936bf3a5422 100644 --- a/comms/svxlink/Makefile +++ b/comms/svxlink/Makefile @@ -3,6 +3,7 @@ PORTNAME?= svxlink PORTVERSION= 15.11 +PORTREVISION= 1 CATEGORIES= comms hamradio MAINTAINER= hamradio@FreeBSD.org @@ -10,10 +11,6 @@ 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 \ libgpg-error.so:security/libgpg-error \ diff --git a/comms/svxlink/files/patch-src_async_core_AsyncTcpServer.cpp b/comms/svxlink/files/patch-src_async_core_AsyncTcpServer.cpp new file mode 100644 index 000000000000..cbadd777870d --- /dev/null +++ b/comms/svxlink/files/patch-src_async_core_AsyncTcpServer.cpp @@ -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(); diff --git a/comms/svxlink/files/patch-src_async_core_AsyncUdpSocket.cpp b/comms/svxlink/files/patch-src_async_core_AsyncUdpSocket.cpp new file mode 100644 index 000000000000..71ed6a58356e --- /dev/null +++ b/comms/svxlink/files/patch-src_async_core_AsyncUdpSocket.cpp @@ -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"); |