Revision: 76686 http://trac.macports.org/changeset/76686 Author: vince@macports.org Date: 2011-03-05 12:25:43 -0800 (Sat, 05 Mar 2011) Log Message: ----------- This commit fixes four bugs: 1. Bug when selected python version was not the most recent installed; 2. Bug with the grass plugin option; 3. Add a dependency to FCGI port; 4. Fix a compilation error with new versions of sip (?). Modified Paths: -------------- trunk/dports/gis/qgis/Portfile Added Paths: ----------- trunk/dports/gis/qgis/files/patch-conversions_sip.diff Modified: trunk/dports/gis/qgis/Portfile =================================================================== --- trunk/dports/gis/qgis/Portfile 2011-03-05 20:21:25 UTC (rev 76685) +++ trunk/dports/gis/qgis/Portfile 2011-03-05 20:25:43 UTC (rev 76686) @@ -36,9 +36,8 @@ system "cd ${worksrcpath} && mkdir build" } -patchfiles patch-spatialite_c.diff -# patch-python_configure_py_in.diff -# patch-cmake_Python_cmake.diff +patchfiles patch-spatialite_c.diff \ + patch-conversions_sip.diff depends_lib-append port:libiconv \ port:expat \ @@ -48,7 +47,8 @@ port:gdal \ port:sqlite3 \ port:gsl \ - port:qwt + port:qwt \ + port:fcgi # Python related stuff # Checks if Python framework is not buggy @@ -77,32 +77,12 @@ configure.args-append "-DPOSTGRES_CONFIG=${PGSQL_DIR}/bin/pg_config" } +variant grass description "Build the grass (6.4) plugin" { -variant grass63 description "Build the grass (6.3) plugin" { - depends_lib-append port:grass - - if {[file exists ${applications_dir}/GRASS-6.3.app]} { - configure.args-append \ - "-DGRASS_PREFIX=${applications_dir}/GRASS-6.3.app/Contents/MacOS" - } else { - configure.args-append "-DGRASS_PREFIX=${prefix}" - } + configure.args-append "-DGRASS_PREFIX=${prefix}/share/grass-6.4.0" } - -variant grass64 description "Build the grass (6.4) plugin" { - - depends_lib-append port:grass64 - - if {[file exists ${applications_dir}/GRASS-6.4.app]} { - configure.args-append \ - "-DGRASS_PREFIX=${applications_dir}/GRASS-6.4.app/Contents/MacOS" - } else { - configure.args-append "-DGRASS_PREFIX=${prefix}" - } -} - # LLVM cannot be used (Seg. faults in spatialite.c) #if {[string first llvm ${configure.cc}] != -1 || \ @@ -133,6 +113,7 @@ configure.args-append "-DOPENSSL_INCLUDE_DIR=${prefix}/include" configure.args-append "-DOPENSSL_LIBRARIES=${prefix}/lib/libssl.dylib" configure.args-append "-DPYTHON_INCLUDE_PATH=${Python_FRM}/Headers" +configure.args-append "-DPYTHON_EXECUTABLE=${prefix}/bin/python" configure.args-append "-DPYUIC4_PROGRAM=${prefix}/bin/pyuic4-${Pyverpath}" configure.args-append "-DPYRCC4_PROGRAM=${prefix}/bin/pyrcc4-${Pyverpath}" configure.args-append \ Added: trunk/dports/gis/qgis/files/patch-conversions_sip.diff =================================================================== --- trunk/dports/gis/qgis/files/patch-conversions_sip.diff (rev 0) +++ trunk/dports/gis/qgis/files/patch-conversions_sip.diff 2011-03-05 20:25:43 UTC (rev 76686) @@ -0,0 +1,20 @@ +--- python/core/conversions.sip.orig 2010-10-03 11:11:28.000000000 +0200 ++++ python/core/conversions.sip 2011-03-05 11:03:50.000000000 +0100 +@@ -320,7 +320,7 @@ + }; + %End + +- ++/* + template <TYPE> + %MappedType QSet<TYPE> + { +@@ -395,7 +395,7 @@ + + }; + +- ++*/ + + template<TYPE> + %MappedType QMap<int, QMap<int, TYPE> >