Ticket #44230: root6.00.02.Portfile.v2.diff

File root6.00.02.Portfile.v2.diff, 8.9 KB (added by cjones051073 (Chris Jones), 10 years ago)

Updated patch

  • Portfile

     
    1111
    1212
    1313# don't forget to update both the git tag and the version
    14 github.setup        root-mirror root 6-00-01 v
    15 version             6.00.01
     14github.setup        root-mirror root 6-00-02 v
     15version             6.00.02
    1616# this could be a better way to set the version (unless we use a sha sum for the git tag ;)
    1717# version           [string map {- .} $version]
    1818set version_major   [lindex [split ${version} .] 0]
    19 checksums           rmd160  6ee9fd3c7ea5a11bf67331a5f24d5839f4ba67a0 \
    20                     sha256  ad3b64a44e25b05a666f05a7b12e4b9a4488ede5c68839c1151d13a348b3bf7f
     19checksums           rmd160  5efc28e5d68aaa4274d869c809c4d052d6011fe4 \
     20                    sha256  6e6fa7fbe0fe72828a6a65f758af9e1fcb04b66dec7fae79ecbe06e81692b218
    2121
    2222name                root${version_major}
    2323categories          science
    … …  
    5959select.group        root
    6060select.file         ${filespath}/${name}
    6161
    62 patchfiles          patch-cmake-modules-SearchInstalledSoftware.cmake.diff \
    63                     patch-graf3d-gl-CMakeLists.txt.diff
     62patchfiles          patch-cmake-modules-SearchInstalledSoftware.cmake.diff
    6463
    6564# Force a compatible compiler
    66 # (macports-clang-3.3 works; it's blacklisted only to give the preference to 3.4)
    67 compiler.blacklist-append *gcc* {clang < 500} macports-clang-2.9 macports-clang-3.0 macports-clang-3.1 macports-clang-3.2 macports-clang-3.3
     65compiler.blacklist-append *gcc* {clang < 500} macports-clang-2.9 macports-clang-3.0 macports-clang-3.1 macports-clang-3.2
    6866compiler.fallback-append macports-clang-3.4 macports-clang-3.5
    6967
    7068# port specific location
    … …  
    313311# Setup various python variants
    314312# ========================================================================================
    315313
    316 # List of possible python versions ( 3.x does not seem to work yet )
     314# List of possible python versions ( Versions 3.x do not seem to work yet )
    317315set python_versions { 2.6 2.7 }
     316set default_python_variant +python27
    318317
    319318# Define the available variants
    320319foreach ver ${python_versions} {
    … …  
    327326    }
    328327    append variant_line { { } }
    329328    eval $variant_line
     329    if {[variant_isset python${ver_no_dot}]} {
     330        if {${default_python_variant} != "+python${ver_no_dot}"} {
     331            set default_python_variant ""
     332        }
     333    }
    330334}
    331335
    332 # Is a variant active ?
    333 set active_python_variant ""
     336if {${default_python_variant} != ""} {
     337    default_variants-append "${default_python_variant}"
     338}
     339
     340# If a python variant is enabled, activate it
    334341foreach ver ${python_versions} {
    335342    set ver_no_dot [join [split ${ver} "."] ""]
    336343    if {[variant_isset python${ver_no_dot}]} {
    337         set active_python_variant ${ver}
    338     }
    339 }
    340344
    341 # If so, set it up.
    342 if { ${active_python_variant} != "" } {
    343     set ver_no_dot [join [split ${active_python_variant} "."] ""]
    344     set portname root5
    345     if {![catch {set result [active_variants ${portname} python${ver_no_dot}]}]} {
    346         if {$result} {
    347             ui_error "Cannot install ${name} with +python${ver_no_dot} variant"
    348             return -code error "${portname} port is already installed with +python${ver_no_dot} and both cannot be active at once. Pick a different python variant."
     345        # Check root5 variants
     346        set portname root5
     347        if {![catch {set result [active_variants ${portname} python${ver_no_dot}]}]} {
     348            if {$result} {
     349                ui_error "Cannot install ${name} with +python${ver_no_dot} variant"
     350                return -code error "${portname} port is already installed with +python${ver_no_dot} and both cannot be active at once. Pick a different python variant."
     351            }
    349352        }
     353
     354        # Setup python
     355        set mypydir ${prefix}/Library/Frameworks/Python.framework/Versions/${ver}
     356        configure.args-replace  -Dpython=OFF -Dpython=ON
     357        configure.args-append   -DPYTHON_INCLUDE_DIR="${mypydir}/Headers" \
     358                                -DPYTHON_LIBRARY="${prefix}/lib/libpython${ver}.dylib" \
     359                                -DPYTHON_EXECUTABLE="${prefix}/bin/python${ver}"
     360        depends_lib-append      port:python${ver_no_dot}
     361        post-destroot {
     362            set mypylibdir  ${prefix}/Library/Frameworks/Python.framework/Versions/${ver}/lib/python${ver}
     363            set mypysitedir ${mypylibdir}/site-packages/
     364            file mkdir ${destroot}${mypysitedir}
     365            foreach pyfile [glob ${destroot}${install_prefix}/lib/root/*.py*] { move $pyfile ${destroot}${mypysitedir}/ }
     366            ln -sf ${install_prefix}/lib/root/libPyROOT.so ${destroot}${mypylibdir}/
     367        }
     368
    350369    }
    351     set mypydir ${prefix}/Library/Frameworks/Python.framework/Versions/${active_python_variant}
    352     configure.args-replace  -Dpython=OFF -Dpython=ON
    353     configure.args-append   -DPYTHON_INCLUDE_DIR="${mypydir}/Headers" \
    354                             -DPYTHON_LIBRARY="${prefix}/lib/libpython${active_python_variant}.dylib" \
    355                             -DPYTHON_EXECUTABLE="${prefix}/bin/python${active_python_variant}"
    356     depends_lib-append      port:python${ver_no_dot}
    357     post-destroot {
    358         set mypylibdir  ${prefix}/Library/Frameworks/Python.framework/Versions/${active_python_variant}/lib/python${active_python_variant}
    359         set mypysitedir ${mypylibdir}/site-packages/
    360         file mkdir ${destroot}${mypysitedir}
    361         foreach pyfile [glob ${destroot}${install_prefix}/lib/root/*.py*] { move $pyfile ${destroot}${mypysitedir}/ }
    362         ln -sf ${install_prefix}/lib/root/libPyROOT.so ${destroot}${mypylibdir}/
    363     }
    364370}
    365371
    366372# ========================================================================================
    367373
    368374variant ssl description {Build with ssl support} {
    369     configure.args-replace  -Dssl=OFF -Dssl=ON
    370 #   configure.args-append   -DOPENSSL_INCLUDE_DIR="${prefix}/include" \
    371 #                           -DOPENSSL_SSL_LIBRARY="${prefix}/lib/libssl.dylib" \
    372 #                           -DOPENSSL_CRYPTO_LIBRARY="${prefix}/lib/libcrypto.dylib"
     375    configure.args-replace  -Dssl=OFF -Dssl=ON
    373376    depends_lib-append      port:openssl
    374377}
    375378
    … …  
    381384    depends_lib-append      port:libxml2
    382385}
    383386
     387variant sqlite3 description {Build with sqlite3 support} {
     388    configure.args-replace  -Dsqlite=OFF -Dsqlite=ON
     389    depends_lib-append      port:sqlite3
     390}
     391
    384392variant mysql conflicts mysql51 mysql55 mariadb percona description {Build with mysql5 support} {
    385393    configure.args-replace  -Dmysql=OFF -Dmysql=ON
    386394    configure.args-append   -DMYSQL_CONFIG_EXECUTABLE=${prefix}"/lib/mysql5/bin/mysql_config"
    … …  
    411419    depends_lib-append      port:percona
    412420}
    413421
    414 # TODO - Doesn't seem to work. To be reported upstream..
    415 # variant postgresql90 conflicts postgresql92 description {Build with PostgreSQL 9.0 support} {
    416 #     configure.args-replace -Dpgsql=OFF -Dpgsql=ON
    417 #     configure.args-append  -DPOSTGRESQL_INCLUDE_DIR="${prefix}/include/postgresql90" \
    418 #                            -DPOSTGRESQL_LIBRARIES="${prefix}/lib/postgresql90"
    419 #     depends_lib-append      port:libpqxx port:postgresql90
    420 # }
     422variant postgresql90 conflicts postgresql92 description {Build with PostgreSQL 9.0 support} {
     423    configure.args-replace -Dpgsql=OFF -Dpgsql=ON
     424    configure.args-append  -DPOSTGRESQL_INCLUDE_DIR="${prefix}/include/postgresql90"\
     425                           -DPOSTGRESQL_LIBRARIES="${prefix}/lib/postgresql90/libpq.dylib"
     426    depends_lib-append      port:libpqxx port:postgresql90
     427}
    421428
    422 # TODO - Doesn't seem to work. To be reported upstream..
    423 # variant postgresql92 conflicts postgresql90 description {Build with PostgreSQL 9.2 support} {
    424 #     configure.args-replace -Dpgsql=OFF -Dpgsql=ON
    425 #     configure.args-append  -DPOSTGRESQL_INCLUDE_DIR="${prefix}/include/postgresql92" \
    426 #                            -DPOSTGRESQL_LIBRARIES="${prefix}/lib/postgresql92"
    427 #     depends_lib-append      port:libpqxx port:postgresql92
    428 # }
     429variant postgresql92 conflicts postgresql90 description {Build with PostgreSQL 9.2 support} {
     430    configure.args-replace -Dpgsql=OFF -Dpgsql=ON
     431    configure.args-append  -DPOSTGRESQL_INCLUDE_DIR="${prefix}/include/postgresql92" \
     432                           -DPOSTGRESQL_LIBRARIES="${prefix}/lib/postgresql92/libpq.dylib"
     433    depends_lib-append      port:libpqxx port:postgresql92
     434}
    429435
    430436# variant oracle description {Build with Oracle support} {
    431437#     configure.args-replace --disable-oracle --enable-oracle
    … …  
    451457    # Dependencies on X11 ports
    452458    depends_lib-append      port:xorg-libX11 port:mesa port:Xft2 port:xpm
    453459    # Disable cocoa
    454     configure.args-append   -Dcocoa=OFF \
    455                             -Dx11=ON \
     460    configure.args-append   -Dcocoa=OFF -Dx11=ON \
    456461                            -DOPENGL_INCLUDE_DIR=${prefix}/include \
    457462                            -DOPENGL_gl_LIBRARY=${prefix}/lib/libGL.dylib \
    458463                            -DX11_ICE_INCLUDE_PATH=${prefix}/include \