From owner-svn-ports-all@freebsd.org Thu Aug 31 09:55:59 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 90FD7E1AA2F; Thu, 31 Aug 2017 09:55:59 +0000 (UTC) (envelope-from ehaupt@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 4F9AB71450; Thu, 31 Aug 2017 09:55:59 +0000 (UTC) (envelope-from ehaupt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v7V9twFe047293; Thu, 31 Aug 2017 09:55:58 GMT (envelope-from ehaupt@FreeBSD.org) Received: (from ehaupt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v7V9tw8H047291; Thu, 31 Aug 2017 09:55:58 GMT (envelope-from ehaupt@FreeBSD.org) Message-Id: <201708310955.v7V9tw8H047291@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ehaupt set sender to ehaupt@FreeBSD.org using -f From: Emanuel Haupt Date: Thu, 31 Aug 2017 09:55:58 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r449020 - head/net-mgmt/tcpreplay X-SVN-Group: ports-head X-SVN-Commit-Author: ehaupt X-SVN-Commit-Paths: head/net-mgmt/tcpreplay X-SVN-Commit-Revision: 449020 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: Thu, 31 Aug 2017 09:55:59 -0000 Author: ehaupt Date: Thu Aug 31 09:55:58 2017 New Revision: 449020 URL: https://svnweb.freebsd.org/changeset/ports/449020 Log: Fix OPTIONS_SINGLE logic. The two options (LIBPCAP_BASE and LIBPCAP_PORTS) need to be mutually exclusive. If LIBPCAP_BASE is selected, make sure the binary is linked against the libpcap from base, even if net/libpcap is present. Bump PORTREVISION to make sure the OPTIONS change is tracked. Reported by: jbeich Modified: head/net-mgmt/tcpreplay/Makefile Modified: head/net-mgmt/tcpreplay/Makefile ============================================================================== --- head/net-mgmt/tcpreplay/Makefile Thu Aug 31 09:49:36 2017 (r449019) +++ head/net-mgmt/tcpreplay/Makefile Thu Aug 31 09:55:58 2017 (r449020) @@ -4,7 +4,7 @@ PORTNAME= tcpreplay PORTVERSION= 4.2.6 DISTVERSIONPREFIX= v -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net-mgmt MAINTAINER= ehaupt@FreeBSD.org @@ -28,16 +28,15 @@ CONFIGURE_ARGS= --program-transform-name='s|.*\(tcp.*\ # required when using autogen CONFIGURE_ARGS+= --disable-local-libopts --disable-libopts-install -OPTIONS_DEFINE= LIBPCAP_BASE LIBPCAP_PORTS LIBPCAP_BASE_DESC= Build with libpcap from the base OS LIBPCAP_PORTS_DESC= Build with net/libpcap -OPTIONS_SINGLE= SG1 -OPTIONS_SINGLE= LIBPCAP_BASE LIBPCAP_PORTS +OPTIONS_SINGLE= LIBPCAP +OPTIONS_SINGLE_LIBPCAP= LIBPCAP_BASE LIBPCAP_PORTS OPTIONS_DEFAULT= LIBPCAP_BASE -LIBPCAP_PORTS_BUILD_DEPENDS= ${LOCALBASE}/lib/libpcap.a:net/libpcap +LIBPCAP_BASE_CONFIGURE_ON= --with-libpcap=/usr/lib LIBPCAP_PORTS_LIB_DEPENDS= libpcap.so:net/libpcap post-patch: