[110546] trunk/dports/gnome/gnumeric/Portfile

[Ryan Schmidt]

On Sep 1, 2013, at 18:08, macsforever2000 at macports.org wrote:

> Revision: 110546
>          https://trac.macports.org/changeset/110546
> Author:   macsforever2000 at macports.org
> Date:     2013-09-01 16:08:29 -0700 (Sun, 01 Sep 2013)
> Log Message:
> -----------
> gnumeric: Update to version 1.12.7. Add maintainer. Remove obsolete python25 variant. Update dependencies. (#40338)
> 
> Modified Paths:
> --------------
>    trunk/dports/gnome/gnumeric/Portfile


> -variant python25 conflicts python26 python27 description {Use python 2.5 - obsolete} {
> -# marked as obsolete on 7/28/2013. Consider removing variant after sufficient time.
> -
> -    pre-fetch {
> -        ui_error "Gnumeric 1.12.x must have at least python26. Please consider upgrading."
> -        return -code error
> -    }
> +variant database description {builds with support for GDA database} {
> +    depends_lib-append        port:libgda5
> +    configure.args-replace    --without-gda --with-gda
> }
> 
> -variant python26 conflicts python25 python27 description {Use python 2.6} {
> +variant python26 conflicts python27 description {Use python 2.6} {
>     configure.python          ${prefix}/bin/python2.6
>     depends_lib-append        port:py26-gobject3
>     set python_framework      ${frameworks_dir}/Python.framework/Versions/2.6
>     configure.pkg_config_path ${python_framework}/lib/pkgconfig
> }
> 
> -variant python27 conflicts python25 python26 description {Use python 2.7} {
> +variant python27 conflicts python26 description {Use python 2.7} {
>     configure.python          ${prefix}/bin/python2.7
>     depends_lib-append        port:py27-gobject3
>     set python_framework      ${frameworks_dir}/Python.framework/Versions/2.7
>     configure.pkg_config_path ${python_framework}/lib/pkgconfig
> }
> 
> -if {![variant_isset python25] && ![variant_isset python26]} {
> +if {![variant_isset python26]} {
>     default_variants +python27
> }
> 
> +if {[variant_isset python25]} {
> +# variant +python25 was declared obsolete on 7/28/2013
> +    ui_error "Gnumeric python needs python 2.6 or 2.7, please consider reinstalling."
> +    return -code error
> +}

Since you removed the python25 variant, there's no point to erroring out if it's set. The port will simply select python27 instead.