From owner-svn-ports-head@freebsd.org Tue Apr 19 15:33:47 2016 Return-Path: Delivered-To: svn-ports-head@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 62BF2B13EAC; Tue, 19 Apr 2016 15:33:47 +0000 (UTC) (envelope-from marcus@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 304BA1FC7; Tue, 19 Apr 2016 15:33:47 +0000 (UTC) (envelope-from marcus@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3JFXkr7048345; Tue, 19 Apr 2016 15:33:46 GMT (envelope-from marcus@FreeBSD.org) Received: (from marcus@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3JFXkMo048344; Tue, 19 Apr 2016 15:33:46 GMT (envelope-from marcus@FreeBSD.org) Message-Id: <201604191533.u3JFXkMo048344@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: marcus set sender to marcus@FreeBSD.org using -f From: Joe Marcus Clarke Date: Tue, 19 Apr 2016 15:33:46 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r413652 - head/net/wireshark X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 Apr 2016 15:33:47 -0000 Author: marcus Date: Tue Apr 19 15:33:46 2016 New Revision: 413652 URL: https://svnweb.freebsd.org/changeset/ports/413652 Log: Merge the GnuTLS and libgcrypt OPTIONS into one as both are required for decryption support. PR: 208830 Modified: head/net/wireshark/Makefile Modified: head/net/wireshark/Makefile ============================================================================== --- head/net/wireshark/Makefile Tue Apr 19 15:29:51 2016 (r413651) +++ head/net/wireshark/Makefile Tue Apr 19 15:33:46 2016 (r413652) @@ -54,7 +54,7 @@ PLIST_SUB+= ${x:tu}=bin/$x \ .endif .endfor -OPTIONS_DEFINE= RTP SNMP IPV6 GEOIP LUA GCRYPT GNUTLS +OPTIONS_DEFINE= RTP SNMP IPV6 GEOIP LUA DECRYPT OPTIONS_RADIO= ASYNCDNS GUI OPTIONS_SINGLE= KERBEROS @@ -66,8 +66,7 @@ OPTIONS_SINGLE_KERBEROS=KRB_BASE KRB_HEI OPTIONS_DEFAULT?= SNMP ADNS IPV6 GEOIP KRB_BASE GTK3 RTP_DESC= Enable support for playing back RTP streams -GCRYPT_DESC= IPsec decryption support -GNUTLS_DESC= SSL decryption support +DECRYPT_DESC= Decryption support for SSL and IPSec ASYNCDNS_DESC= Asynchronous DNS lookup support ADNS_DESC= Asynchronous DNS resolution via GNU adns KERBEROS_DESC= Kerberos dissection support @@ -90,8 +89,8 @@ SNMP_LIB_DEPENDS= libsmi.so:net-mgmt/lib ADNS_LIB_DEPENDS= libadns.so:dns/adns CARES_LIB_DEPENDS= libcares.so:dns/c-ares GEOIP_LIB_DEPENDS= libGeoIP.so:net/GeoIP -GCRYPT_LIB_DEPENDS= libgcrypt.so:security/libgcrypt -GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls +DECRYPT_LIB_DEPENDS= libgnutls.so:security/gnutls \ + libgcrypt.so:security/libgcrypt IPV6_CONFIGURE_ENABLE= ipv6 @@ -108,8 +107,7 @@ SNMP_CONFIGURE_WITH= libsmi ADNS_CONFIGURE_WITH= adns CARES_CONFIGURE_WITH= c-ares GEOIP_CONFIGURE_WITH= geoip -GCRYPT_CONFIGURE_WITH= gcrypt -GNUTLS_CONFIGURE_WITH= gnutls +DECRYPT_CONFIGURE_WITH= gnutls gcrypt LUA_CPPFLAGS= -I${LUA_INCDIR}