Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 31 Aug 2017 09:55:58 +0000 (UTC)
From:      Emanuel Haupt <ehaupt@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r449020 - head/net-mgmt/tcpreplay
Message-ID:  <201708310955.v7V9tw8H047291@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201708310955.v7V9tw8H047291>