aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorehaupt <ehaupt@FreeBSD.org>2017-08-31 17:55:58 +0800
committerehaupt <ehaupt@FreeBSD.org>2017-08-31 17:55:58 +0800
commit15112a09c43f3568b5340929b6017c925e865fdd (patch)
treeb0447ecb59ab56962cdf3c422865186fb2ad6724
parent0de554f977396b1d20b3498ff8d5101adb60f435 (diff)
downloadfreebsd-ports-gnome-15112a09c43f3568b5340929b6017c925e865fdd.tar.gz
freebsd-ports-gnome-15112a09c43f3568b5340929b6017c925e865fdd.tar.zst
freebsd-ports-gnome-15112a09c43f3568b5340929b6017c925e865fdd.zip
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
-rw-r--r--net-mgmt/tcpreplay/Makefile9
1 files changed, 4 insertions, 5 deletions
diff --git a/net-mgmt/tcpreplay/Makefile b/net-mgmt/tcpreplay/Makefile
index 4413d905c759..43c436cae3af 100644
--- a/net-mgmt/tcpreplay/Makefile
+++ b/net-mgmt/tcpreplay/Makefile
@@ -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.*\)|\1|' \
# 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: