From owner-svn-ports-all@freebsd.org Fri Aug 18 15:09:09 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 D4B49DE7245; Fri, 18 Aug 2017 15:09:09 +0000 (UTC) (envelope-from feld@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 A190B677BD; Fri, 18 Aug 2017 15:09:09 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v7IF98WJ081014; Fri, 18 Aug 2017 15:09:08 GMT (envelope-from feld@FreeBSD.org) Received: (from feld@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v7IF98s9081013; Fri, 18 Aug 2017 15:09:08 GMT (envelope-from feld@FreeBSD.org) Message-Id: <201708181509.v7IF98s9081013@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: feld set sender to feld@FreeBSD.org using -f From: Mark Felder Date: Fri, 18 Aug 2017 15:09:08 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r448239 - branches/2017Q3/net/ostinato/files X-SVN-Group: ports-branches X-SVN-Commit-Author: feld X-SVN-Commit-Paths: branches/2017Q3/net/ostinato/files X-SVN-Commit-Revision: 448239 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: Fri, 18 Aug 2017 15:09:09 -0000 Author: feld Date: Fri Aug 18 15:09:08 2017 New Revision: 448239 URL: https://svnweb.freebsd.org/changeset/ports/448239 Log: MFH: r448238 net/ostinato: Fix building on 11.1-RELEASE and HEAD 11.1-RELEASE and HEAD include libpcap 1.8 which doesn't ensure the experimental remote packet capture feature only available to WIN32 isn't picked up by builds on Unix. This solves the build error of the missing remote-ext.h header file. Approved by: portmgr (with hat) Added: branches/2017Q3/net/ostinato/files/patch-libpcap18fix - copied unchanged from r448238, head/net/ostinato/files/patch-libpcap18fix Modified: Directory Properties: branches/2017Q3/ (props changed) Copied: branches/2017Q3/net/ostinato/files/patch-libpcap18fix (from r448238, head/net/ostinato/files/patch-libpcap18fix) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q3/net/ostinato/files/patch-libpcap18fix Fri Aug 18 15:09:08 2017 (r448239, copy of r448238, head/net/ostinato/files/patch-libpcap18fix) @@ -0,0 +1,24 @@ +Patch to fix building with libpcap 1.8 branch which doesn't properly +ensure HAVE_REMOTE declarations are only for WIN32 systems +--- rpc/pbrpc.pro.orig 2017-08-18 15:00:23 UTC ++++ rpc/pbrpc.pro +@@ -1,7 +1,7 @@ + TEMPLATE = lib + CONFIG += qt staticlib + QT += network +-DEFINES += HAVE_REMOTE ++#DEFINES += HAVE_REMOTE + LIBS += -lprotobuf + HEADERS += rpcserver.h rpcconn.h pbrpccontroller.h pbrpcchannel.h pbqtio.h + SOURCES += rpcserver.cpp rpcconn.cpp pbrpcchannel.cpp +--- server/drone.pro.orig 2017-08-18 15:00:47 UTC ++++ server/drone.pro +@@ -2,7 +2,7 @@ TEMPLATE = app + CONFIG += qt ver_info + QT += network script xml + QT -= gui +-DEFINES += HAVE_REMOTE WPCAP ++#DEFINES += HAVE_REMOTE WPCAP + linux*:system(grep -q IFLA_STATS64 /usr/include/linux/if_link.h): \ + DEFINES += HAVE_IFLA_STATS64 + INCLUDEPATH += "../rpc"