Revision: 87345 http://trac.macports.org/changeset/87345 Author: vince@macports.org Date: 2011-11-17 11:41:25 -0800 (Thu, 17 Nov 2011) Log Message: ----------- Bumps to version 1.7; I cannot get a build with spatialite enabled, so I've disabled it until the next version that is due before the end of the year. Modified Paths: -------------- trunk/dports/gis/qgis/Portfile Added Paths: ----------- trunk/dports/gis/qgis/files/patch-CMakeLists_txt.diff Modified: trunk/dports/gis/qgis/Portfile =================================================================== --- trunk/dports/gis/qgis/Portfile 2011-11-17 19:04:34 UTC (rev 87344) +++ trunk/dports/gis/qgis/Portfile 2011-11-17 19:41:25 UTC (rev 87345) @@ -6,8 +6,7 @@ PortGroup qt4 1.0 name qgis -version 1.6.0 -revision 0 +version 1.7.0 categories gis maintainers vince description QGIS is a user-friendly GIS based on Qt 4 @@ -26,14 +25,15 @@ master_sites http://qgis.org/downloads/ use_bzip2 yes -checksums md5 9ea8a784d970f5009b0e6271820248f6 \ - sha1 815e7d7f465f878c37866b0bc38345bbd76541cc \ - rmd160 e98aef1bf5290dc7f4433fc1ec648ad13273604c +checksums md5 d8506990f52563d39c7b916f500f282f \ + sha1 e60f40e72c92f187d3725e6b93c13691d63a7fa7 \ + rmd160 49303eab754f1e7febce388e657253563f65abed worksrcdir ${name}-${version} patchfiles patch-spatialite_c.diff \ - patch-conversions_sip.diff + patch-conversions_sip.diff \ + patch-CMakeLists_txt.diff depends_lib-append port:libiconv \ port:expat \ @@ -49,8 +49,9 @@ pre-extract { # At least one python package must be specified if {[lsearch [split ${portvariants} "+"] "python*"] == -1} { - ui_error "Qgis requires python." - return -code error " Please select a python variant." + set pyver [lindex [split [exec Python -V] " "] 1] + puts pyver + exit 0 } } @@ -58,6 +59,11 @@ system "cd ${worksrcpath} && mkdir build && mkdir Python.framework" } +# Does not compile wirh clang +if {${configure.compiler} == "clang" || ${configure.compiler} == "macports-clang"} { + configure.compiler llvm-gcc-4.2 +} + set Py_own_FRM ${worksrcpath}/Python.framework # Python related stuff @@ -94,17 +100,6 @@ } -variant python30 description use Python 3.0 { - depends_lib-append port:py30-pyqt4 - - configure.args-append "-DPYTHON_EXECUTABLE=${prefix}/bin/python3.0" - configure.args-append "-DPYUIC4_PROGRAM=${prefix}/bin/pyuic4-3.0" - configure.args-append "-DPYRCC4_PROGRAM=${prefix}/bin/pyrcc4-3.0" - configure.args-append \ - "-DSIP_BINARY_PATH=${Py_own_FRM}/Versions/3.0/bin/sip" - -} - variant python31 description use Python 3.1 { depends_lib-append port:py31-pyqt4 @@ -156,13 +151,14 @@ configure.args-append "-DGDAL_INCLUDE_DIR=${prefix}/include" configure.args-append "-DGDAL_LIBRARY=${prefix}/lib/libgdal.dylib" configure.args-append "-DGEOS_CONFIG=${prefix}/bin/geos-config" -configure.args-append "-DGEOS_INCLUDE_DIR=${prefix}/include" +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" configure.args-append "-DPYTHON_INCLUDE_PATH=${Py_own_FRM}/Headers" configure.args-append "-DSIP_INCLUDE_DIR=${Py_own_FRM}/Headers" configure.args-append "-DCMAKE_BUILD_TYPE=Release" Added: trunk/dports/gis/qgis/files/patch-CMakeLists_txt.diff =================================================================== --- trunk/dports/gis/qgis/files/patch-CMakeLists_txt.diff (rev 0) +++ trunk/dports/gis/qgis/files/patch-CMakeLists_txt.diff 2011-11-17 19:41:25 UTC (rev 87345) @@ -0,0 +1,10 @@ +--- CMakeLists.txt.orig 2011-11-17 16:16:10.000000000 +0100 ++++ CMakeLists.txt 2011-11-17 16:09:03.000000000 +0100 +@@ -7,6 +7,7 @@ + PROJECT(qgis${PROJECT_VERSION}) + IF (APPLE) + SET(QGIS_APP_NAME "QGIS") ++ SET(CMAKE_FIND_FRAMEWORK "LAST") + ELSE (APPLE) + SET(QGIS_APP_NAME "qgis") + ENDIF (APPLE)