Changeset 76686 for trunk/dports/gis


Ignore:
Timestamp:
Mar 5, 2011, 8:25:43 PM (9 years ago)
Author:
vince@…
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 (?).
Location:
trunk/dports/gis/qgis
Files:
1 added
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/gis/qgis/Portfile

    r74170 r76686  
    3737}
    3838
    39 patchfiles                      patch-spatialite_c.diff
    40 #                                       patch-python_configure_py_in.diff
    41 #                                       patch-cmake_Python_cmake.diff
     39patchfiles                      patch-spatialite_c.diff \
     40                                        patch-conversions_sip.diff
    4241
    4342depends_lib-append      port:libiconv \
     
    4948                                        port:sqlite3 \
    5049                                        port:gsl \
    51                                         port:qwt
     50                                        port:qwt \
     51                                        port:fcgi
    5252
    5353# Python related stuff
     
    7878}
    7979
    80 
    81 variant grass63                         description "Build the grass (6.3) plugin" {
     80variant grass                           description "Build the grass (6.4) plugin" {
    8281
    8382        depends_lib-append              port:grass
    84        
    85         if {[file exists ${applications_dir}/GRASS-6.3.app]} {
    86                 configure.args-append \
    87                         "-DGRASS_PREFIX=${applications_dir}/GRASS-6.3.app/Contents/MacOS"
    88         } else {
    89                 configure.args-append   "-DGRASS_PREFIX=${prefix}"
    90         }
    91 }
    92 
    93 
    94 variant grass64                         description "Build the grass (6.4) plugin" {
    95 
    96         depends_lib-append              port:grass64
    97        
    98         if {[file exists ${applications_dir}/GRASS-6.4.app]} {
    99                 configure.args-append \
    100                         "-DGRASS_PREFIX=${applications_dir}/GRASS-6.4.app/Contents/MacOS"
    101         } else {
    102                 configure.args-append   "-DGRASS_PREFIX=${prefix}"
    103         }
     83        configure.args-append   "-DGRASS_PREFIX=${prefix}/share/grass-6.4.0"
    10484}
    10585
     
    134114configure.args-append           "-DOPENSSL_LIBRARIES=${prefix}/lib/libssl.dylib"
    135115configure.args-append           "-DPYTHON_INCLUDE_PATH=${Python_FRM}/Headers"
     116configure.args-append           "-DPYTHON_EXECUTABLE=${prefix}/bin/python"
    136117configure.args-append           "-DPYUIC4_PROGRAM=${prefix}/bin/pyuic4-${Pyverpath}"
    137118configure.args-append           "-DPYRCC4_PROGRAM=${prefix}/bin/pyrcc4-${Pyverpath}"
Note: See TracChangeset for help on using the changeset viewer.