Revision: 91416 https://trac.macports.org/changeset/91416 Author: vince@macports.org Date: 2012-04-01 01:23:23 -0700 (Sun, 01 Apr 2012) Log Message: ----------- Fixes some issues: 1. Makes default variant conditional (as per #33851); 2. Removes python31 variant which is incompatible with current QGis version (#32713); 3. Add an explicit build dependency to pyXX-sip. Modified Paths: -------------- trunk/dports/gis/qgis/Portfile Modified: trunk/dports/gis/qgis/Portfile =================================================================== --- trunk/dports/gis/qgis/Portfile 2012-04-01 08:18:11 UTC (rev 91415) +++ trunk/dports/gis/qgis/Portfile 2012-04-01 08:23:23 UTC (rev 91416) @@ -55,10 +55,11 @@ # Python related stuff -variant python25 conflicts universal python26 python27 python31 \ +variant python25 conflicts universal python26 python27 \ description use Python 2.5 { - depends_lib-append port:py25-pyqt4 + depends_lib-append port:py25-pyqt4 + depends_build-append port:py25-sip configure.args-append "-DPYTHON_EXECUTABLE=${prefix}/bin/python2.5" configure.args-append "-DPYUIC4_PROGRAM=${prefix}/bin/pyuic4-2.5" @@ -67,10 +68,11 @@ "-DSIP_BINARY_PATH=${Py_own_FRM}/Versions/2.5/bin/sip" } -variant python26 conflicts python25 python27 python31 \ +variant python26 conflicts python25 python27 \ description use Python 2.6 { - depends_lib-append port:py26-pyqt4 + depends_lib-append port:py26-pyqt4 + depends_build-append port:py26-sip configure.args-append "-DPYTHON_EXECUTABLE=${prefix}/bin/python2.6" configure.args-append "-DPYUIC4_PROGRAM=${prefix}/bin/pyuic4-2.6" @@ -80,10 +82,11 @@ } -variant python27 conflicts python25 python26 python31 \ +variant python27 conflicts python25 python26 \ description use Python 2.7 { - depends_lib-append port:py27-pyqt4 + depends_lib-append port:py27-pyqt4 + depends_build-append port:py27-sip configure.args-append "-DPYTHON_EXECUTABLE=${prefix}/bin/python2.7" configure.args-append "-DPYUIC4_PROGRAM=${prefix}/bin/pyuic4-2.7" @@ -93,19 +96,6 @@ } -variant python31 conflicts python25 python26 python27 \ - description use Python 3.1 { - - depends_lib-append port:py31-pyqt4 - - configure.args-append "-DPYTHON_EXECUTABLE=${prefix}/bin/python3.1" - configure.args-append "-DPYUIC4_PROGRAM=${prefix}/bin/pyuic4-3.1" - configure.args-append "-DPYRCC4_PROGRAM=${prefix}/bin/pyrcc4-3.1" - configure.args-append \ - "-DSIP_BINARY_PATH=${Py_own_FRM}/Versions/3.1/bin/sip" - -} - variant postgresql90 conflicts postgresql91 \ description "Use postgresql 9.0" { @@ -140,10 +130,23 @@ # Overrides default -default_variants +python27 +postgis +postgresql91 -configure.dir ${worksrcpath}/build -configure.cmd cmake .. +default_variants +postgis +if {![variant_isset python25] && ![variant_isset python26] && + ![variant_isset python27]} { + + default_variants +python27 +} + +if {[variant_isset postgis] && ![variant_isset postgresql90] && + ![variant_isset postgresql91]} { + + default_variants +postgresql91 +} + +configure.dir ${worksrcpath}/build +configure.cmd cmake .. + configure.args-append "-DCMAKE_CXX_COMPILER=${configure.cxx}" configure.args-append "-DCMAKE_C_COMPILER=${configure.cc}" configure.args-append "-DEXPAT_INCLUDE_DIR=${prefix}/include"