[119784] trunk/dports/net/wireshark/Portfile

[Ryan Schmidt]

On May 6, 2014, at 15:17, ricci at macports.org wrote:

> Revision
> 119784
> Author
> ricci at macports.org
> Date
> 2014-05-06 13:17:22 -0700 (Tue, 06 May 2014)
> Log Message
> 
> net/wireshark:
> 	invert the no_ variants to comply with new standards
> 	resolves a tiny part of #39383

But you should add legacy compatibility variants so that users who had previously indicated that they want those features disabled will still have them disabled when they upgrade to the next version. e.g.:

variant no_x11 conflicts x11 description {Legacy compatibility variant} {}
if {[variant_isset no_x11]} {
    default_variants -x11
} else {
    default_variants +x11
}

You should keep such compatibility variants in the port for at least one year from the date when you next increase the port’s epoch, version or revision.

I’m also Cc’ing the maintainer of wireshark-devel since these changes will want to be made in wireshark-devel too to keep the two ports as similar as possible.


> Modified Paths
> 
> 	• trunk/dports/net/wireshark/Portfile
> Diff
> 
> Modified: trunk/dports/net/wireshark/Portfile (119783 => 119784)
> 
> --- trunk/dports/net/wireshark/Portfile	2014-05-06 20:11:06 UTC (rev 119783)
> +++ trunk/dports/net/wireshark/Portfile	2014-05-06 20:17:22 UTC (rev 119784)
> 
> @@ -32,41 +32,39 @@
> 
>  depends_build 		\
> 
>  		port:pkgconfig
> 
>  depends_lib 		\
> 
> -		port:adns \
> -		port:libgcrypt \
> -		port:libgeoip \
> 
> +		port:c-ares \
> 
>  		path:lib/pkgconfig/glib-2.0.pc:glib2 \
> 
> -		port:libsmi \
> -		port:lua \
> -		port:gnutls \
> -		port:gtk2 \
> -		port:openssl \
> -		port:portaudio \
> 
>  		port:libpcap \
> 
>  		port:kerberos5 \
> 
>  		port:zlib
> 
>  
> 
>  configure.args	\
> 
> -		--with-libsmi=${prefix} \
> 
> +		--without-libsmi \
> 
>  		--disable-usr-local \
> 
> -		--with-adns=${prefix} \
> -		--without-c-ares \
> -		--with-geoip=${prefix} \
> -		--with-gnutls=yes \
> -		--with-libgcrypt-prefix=${prefix} \
> -		--with-lua=${prefix} \
> -		--enable-ipv6 \
> 
> +		--without-adns \
> +		--with-c-ares=${prefix} \
> +		--without-geoip \
> +		--without-gnutls \
> +		--with-gcrypt=no \
> +		--without-lua \
> +		--disable-ipv6 \
> 
>  		--with-pcap=${prefix} \
> 
>  		--with-ssl=${prefix} \
> 
>  		--with-zlib=${prefix} \
> 
>  		--mandir=\\\${prefix}/share/man \
> 
>  		--infodir=\\\${prefix}/share/info \
> 
> -		--with-portaudio=${prefix} \
> 
> +		--without-portaudio \
> 
>  		--disable-warnings-as-errors \
> 
> -		--with-krb5=${prefix}
> 
> +		--with-krb5=${prefix} \
> +		--without-ssl \
> +		--disable-wireshark
> 
>  
> 
> +
> 
>  configure.ldflags-append "-Wl,-search_paths_first"
> 
>  
> 
> +default_variants +adns +gnutls +libgcrypt +ipv6 +lua +libsmi +geoip +rtp +ssl +x11
> +
> +
> 
>  ## 1.10.0 doesn't include python options in configure
> 
>  ## if {[variant_isset no_python]} {
> 
>  ## } elseif {[variant_isset python25]} {
> 
> @@ -97,48 +95,48 @@
> 
>  	configure.cflags -fno-var-tracking
> 
>  }
> 
>  
> 
> -variant no_adns description {don't use adns library for async. dns resolution instead of the default c-ares library} {
> -	configure.args-append	--without-adns \
> 
> +variant adns description {use adns library for async. dns resolution instead of the default c-ares library} {
> +	configure.args-delete	--without-adns \
> 
>  							--with-c-ares=${prefix}
> 
> -	configure.args-delete	--with-adns=${prefix} \
> 
> +	configure.args-append	--with-adns=${prefix} \
> 
>  							--without-c-ares
> 
> -	depends_lib-delete	port:adns
> -	depends_lib-append	port:c-ares
> 
> +	depends_lib-append	port:adns
> +	depends_lib-delete	port:c-ares
> 
>  }
> 
>  
> 
> -variant no_gnutls {
> -	configure.args-append	--without-gnutls
> -	configure.args-delete	--with-gnutls=yes
> -	depends_lib-delete	port:gnutls
> 
> +variant gnutls {
> +	configure.args-delete	--without-gnutls
> +	configure.args-append	--with-gnutls=yes
> +	depends_lib-append		port:gnutls
> 
>  }
> 
>  
> 
> -variant no_libgcrypt {
> -	configure.args-append	--with-gcrypt=no
> -	configure.args-delete	--with-libgcrypt-prefix=${prefix}
> -	depends_lib-delete	port:libgcrypt
> 
> +variant libgcrypt {
> +	configure.args-delete	--with-gcrypt=no
> +	configure.args-append	--with-libgcrypt-prefix=${prefix}
> +	depends_lib-append		port:libgcrypt
> 
>  }
> 
>  
> 
> -variant no_ipv6 {
> -	configure.args-append	--disable-ipv6
> -	configure.args-delete	--enable-ipv6
> 
> +variant ipv6 {
> +	configure.args-delete	--disable-ipv6
> +	configure.args-append	--enable-ipv6
> 
>  }
> 
>  
> 
> -variant no_lua {
> -	configure.args-append	--without-lua
> -	configure.args-delete	--with-lua=${prefix}
> -	depends_lib-delete	port:lua
> 
> +variant lua {
> +	configure.args-delete	--without-lua
> +	configure.args-append	--with-lua=${prefix}
> +	depends_lib-append		port:lua
> 
>  }
> 
>  
> 
> -variant no_libsmi {
> -	configure.args-append	--without-libsmi
> -	configure.args-delete	--with-libsmi=${prefix}
> -	depends_lib-delete	port:libsmi
> 
> +variant libsmi {
> +	configure.args-delete	--without-libsmi
> +	configure.args-append	--with-libsmi=${prefix}
> +	depends_lib-append		port:libsmi
> 
>  }
> 
>  
> 
> -variant no_geoip {
> -	configure.args-append	--without-geoip
> -	configure.args-delete	--with-geoip=${prefix}
> -	depends_lib-delete	port:libgeoip
> 
> +variant geoip {
> +	configure.args-delete	--without-geoip
> +	configure.args-append	--with-geoip=${prefix}
> +	depends_lib-append		port:libgeoip
> 
>  }
> 
>  
> 
>  ## 1.10.0 doesn't include python options in configure
> 
> @@ -161,21 +159,20 @@
> 
>  ## 	configure.args-append	--without-python
> 
>  ## }
> 
>  
> 
> -variant no_rtp description {remove rtp support} {
> -	configure.args-append   --without-portaudio
> -	configure.args-delete   --with-portaudio=${prefix}
> -	depends_lib-delete      port:portaudio
> 
> +variant rtp description {add rtp support} {
> +	configure.args-delete   --without-portaudio
> +	configure.args-append   --with-portaudio=${prefix}
> +	depends_lib-append      port:portaudio
> 
>  }
> 
>  
> 
> -variant no_ssl {
> -	configure.args-append --without-ssl
> -	depends_lib-delete	port:openssl
> 
> +variant ssl {
> +	configure.args-delete	--without-ssl
> +	depends_lib-append		port:openssl
> 
>  }
> 
>  
> 
> -variant no_x11	{
> -	depends_lib-delete	port:gtk2
> -	configure.args-delete	--disable-gtk2
> -	configure.args-append	--disable-wireshark
> 
> +variant x11	{
> +	depends_lib-append		port:gtk2
> +	configure.args-delete	--disable-wireshark
> 
>  }