[135644] trunk/dports/cross/openocd/Portfile

[Ryan Schmidt]

> On Apr 28, 2015, at 2:42 PM, snc at macports.org wrote:
> 
> Revision
> 135644
> Author
> snc at macports.org
> Date
> 2015-04-28 12:42:18 -0700 (Tue, 28 Apr 2015)
> Log Message
> 
> openocd: update to 0.8.0, #44855
> Modified Paths
> 
> 	• trunk/dports/cross/openocd/Portfile


> -default_variants +ft2232
> +depends_build-append	port:pkgconfig
>  
> +default_variants +ftdi
> +
>  variant dummy description {Enable building the dummy port driver} {
>      configure.args-append --enable-dummy
>  }
> @@ -37,24 +38,33 @@
>      configure.args-append --enable-parport
>  }
>  
> +variant ftdi conflicts ft2232_ftd2xx description {Enable building OpenOCD's built-in FTDI driver.} {
> +    configure.args-append --enable-ftdi
> +	depends_lib-append port:libusb
> +}
> +
> +# The ft2232 variant is deprecated, the ftdi variant is its replacement
>  variant ft2232 conflicts ft2232_ftd2xx  description {Enable building support for FT2232 based devices using the libftdi driver, opensource alternate of FTD2XX} {
> -    configure.args-append --enable-ft2232_libftdi
> -	depends_lib-append  port:libftdi0 \
> -                        port:libusb-compat
> +    configure.args-append --enable-legacy-ft2232_libftdi
> +	depends_lib-append port:libftdi1
>  }
>  
> +# The ft2232_ftd2xx variant is deprecated, the ftdi variant is its replacement
>  variant ft2232_ftd2xx conflicts ft2232  description {Enable building support for FT2232 based devices using the FTD2XX driver from ftdichip.com
> } {
>      patchfiles-append patch-ftd2xx-path.diff
> -    configure.args-append --enable-ft2232_ftd2xx
> +    use_autoreconf      yes
> +    configure.args-append --enable-legacy-ft2232_ftd2xx
>  	depends_lib-append port:libftd2xx
>  }


Any users who had the port installed with the +ft2232 or +ft2232_ftd2xx variant will encounter an error on upgrade because the new default variant +ftdi conflicts with their selected variants. To fix this, +ftdi should only be a default variant if one of the other two variants is not already selected.