From owner-svn-ports-all@freebsd.org Mon Oct 16 19:28:13 2017 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1247AE42DE6; Mon, 16 Oct 2017 19:28:13 +0000 (UTC) (envelope-from adrian@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E2700698C3; Mon, 16 Oct 2017 19:28:12 +0000 (UTC) (envelope-from adrian@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9GJSBR6078372; Mon, 16 Oct 2017 19:28:11 GMT (envelope-from adrian@FreeBSD.org) Received: (from adrian@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9GJSBQc078369; Mon, 16 Oct 2017 19:28:11 GMT (envelope-from adrian@FreeBSD.org) Message-Id: <201710161928.v9GJSBQc078369@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: adrian set sender to adrian@FreeBSD.org using -f From: Adrian Chadd Date: Mon, 16 Oct 2017 19:28:11 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r452246 - in head/comms/svxlink: . files X-SVN-Group: ports-head X-SVN-Commit-Author: adrian X-SVN-Commit-Paths: in head/comms/svxlink: . files X-SVN-Commit-Revision: 452246 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Oct 2017 19:28:13 -0000 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@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(&addr), sizeof(addr)) ++ if(::bind(sock, reinterpret_cast(&addr), sizeof(addr)) + == -1) + { + perror("bind");