Revision: 87346 http://trac.macports.org/changeset/87346 Author: vince@macports.org Date: 2011-11-17 13:11:05 -0800 (Thu, 17 Nov 2011) Log Message: ----------- Remove some python ugly stuff and set python27 and postgis variants as default. Modified Paths: -------------- trunk/dports/gis/qgis/Portfile Modified: trunk/dports/gis/qgis/Portfile =================================================================== --- trunk/dports/gis/qgis/Portfile 2011-11-17 19:41:25 UTC (rev 87345) +++ trunk/dports/gis/qgis/Portfile 2011-11-17 21:11:05 UTC (rev 87346) @@ -46,15 +46,6 @@ port:qwt52 \ port:fcgi -pre-extract { - # At least one python package must be specified - if {[lsearch [split ${portvariants} "+"] "python*"] == -1} { - set pyver [lindex [split [exec Python -V] " "] 1] - puts pyver - exit 0 - } -} - post-extract { system "cd ${worksrcpath} && mkdir build && mkdir Python.framework" } @@ -111,9 +102,6 @@ } -# Overrides default -configure.dir ${worksrcpath}/build -configure.cmd cmake .. variant postgis description "Build postgis support" { @@ -142,6 +130,11 @@ # set configure.cxx g++ #} +# Overrides default +default_variants +python27 +postgis +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" @@ -154,8 +147,6 @@ configure.args-append "-DGEOS_INCLUDE_DIR=${prefix}/include/geos" configure.args-append "-DGEOS_LIBRARY=${prefix}/lib/libgeos_c.dylib" configure.args-append "-DGSL_CONFIG=${prefix}/bin/gsl-config" -configure.args-append "-DICONV_INCLUDE_DIR=${prefix}/include" -configure.args-append "-DICONV_LIBRARY=${prefix}/lib/libiconv.dylib" configure.args-append "-DPROJ_INCLUDE_DIR=${prefix}/include" configure.args-append "-DPROJ_LIBRARY=${prefix}/lib/libproj.dylib" configure.args-append "-DWITH_SPATIALITE:BOOL=NO"