Date: Tue, 19 Apr 2016 15:33:46 +0000 (UTC) From: Joe Marcus Clarke <marcus@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r413652 - head/net/wireshark Message-ID: <201604191533.u3JFXkMo048344@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201604191533.u3JFXkMo048344>