Changeset 76852 for trunk/dports/gis


Ignore:
Timestamp:
Mar 10, 2011, 9:19:12 PM (9 years ago)
Author:
vince@…
Message:

Add several tweaks to make the Portfile more compliant to accepted MacPorts
rules according to suggestions from the [76805] thread on the list.

File:
1 edited

Legend:

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

    r76805 r76852  
    5050        # At least one python package must be specified
    5151        if {[lsearch [split ${portvariants} "+"] "python*"] == -1} {
    52                 ui_error                "Qgis requires python. Please select a variant."
    53                 exit 0
     52                ui_error                "Qgis requires python."
     53                return                  -code error " Please select a python variant."
    5454        }       
    5555}
     
    6363# Python related stuff
    6464
    65 variant python25 {     
     65variant python25 conflicts universal description use Python 2.5 {       
    6666        depends_lib-append      port:py25-pyqt4
    6767       
     
    7373}
    7474
    75 variant python26 {
     75variant python26 description use Python 2.6 {
    7676        depends_lib-append      port:py26-pyqt4
    7777       
     
    8484}
    8585
    86 variant python27 {
     86variant python27 description use Python 2.7 {
    8787        depends_lib-append      port:py27-pyqt4
    8888       
     
    9595}
    9696
    97 variant python30 {
     97variant python30 description use Python 3.0 {
    9898        depends_lib-append      port:py30-pyqt4
    9999       
     
    106106}
    107107
    108 variant python31 {
     108variant python31 description use Python 3.1 {
    109109        depends_lib-append      port:py31-pyqt4
    110110       
     
    187187        set Pyverpath   [join [split ${Pyversion} ""] .]
    188188
    189         if {[variant_isset universal] && ${Pyversion} < 26} {
    190                 ui_error                "Universal build requires Python > 2.5"
    191                 exit 0
    192         }
    193 
    194189        # Set up a fake framework in ${worksrcpath}/Python.framework
    195190        set Py_sys_FRM  "${frameworks_dir}/Python.framework/Versions/${Pyverpath}"
Note: See TracChangeset for help on using the changeset viewer.