Ticket #50011: root.2.diff

File root.2.diff, 10.4 KB (added by cjones051073 (Chris Jones), 8 years ago)

  • science/root5/Portfile

     
    1010
    1111github.setup        root-mirror root 5-34-34 v
    1212version             5.34.34
    13 revision            1
     13revision            2
    1414
    1515set version_major   [lindex [split ${version} .] 0]
    1616

  • science/root5/files/root5

     
    2828libexec/root5/bin/thisroot.sh
    2929libexec/root5/bin/xpdtest
    3030-
     31-
     32-
     33-
     34-
     35-
     36-
     37-
     38-
    3139libexec/root5/share/man/man1/cint.1.gz
    3240libexec/root5/share/man/man1/g2root.1.gz
    3341libexec/root5/share/man/man1/g2rootold.1.gz

  • science/root6/Portfile

     
    1111
    1212# don't forget to update both the git tag and the version
    1313#github.setup       root-mirror root <sha>
    14 github.setup        root-mirror root 6-04-12 v
    15 version             6.04.12
     14github.setup        root-mirror root 6-06-00 v
     15version             6.06.00
    1616
    1717# this could be a better way to set the version (unless we use a sha sum for the git tag ;)
    1818# version           [string map {- .} $version]
    1919set version_major   [lindex [split ${version} .] 0]
    2020
    21 checksums           rmd160  a607eb11c3e84c8e61c1c7dcdad5de7daa0c998c \
    22                     sha256  140de60f190970453dd0c53aa27b33fa73fe1c8a6e863620a4c6fb9ac9a975a2
     21checksums           rmd160  84ce0e3b637e2cc81cc4d6c598118e50d5f18125 \
     22                    sha256  90416cd4d836b8ca48c2e31cc7774a5e35ee21f0748596487e39fa0af2cf2324
    2323
    2424name                root${version_major}
    2525categories          science
    … …  
    6060select.file         ${filespath}/${name}
    6161
    6262# Force a compatible compiler
    63 compiler.blacklist-append *gcc* {clang < 500} macports-clang-3.3
    64 compiler.fallback-append  macports-clang-3.7 macports-clang-3.6 macports-clang-3.5 \
    65                           macports-clang-3.4
     63compiler.blacklist-append *gcc* {clang < 602}  macports-clang-3.4 macports-clang-3.3
     64compiler.fallback-append  macports-clang-3.7 macports-clang-3.6 macports-clang-3.5
    6665
    6766# port specific location
    6867set install_prefix ${prefix}/libexec/root${version_major}
    … …  
    124123                    -Dvc=OFF \
    125124                    -Dastiff=ON \
    126125                    -Dgeocad=OFF \
     126                    -Dr=OFF \
    127127                    -DPNG_LIBRARY=${prefix}/lib/libpng.dylib \
    128128                    -DPNG_PNG_INCLUDE_DIR=${prefix}/include
    129129
    … …  
    169169}
    170170
    171171post-destroot {
    172     # create versioned symlinks for the content of libexec
    173     # bin dir
     172    # Temporary - Set execute flag on binaries (broken in 6.06.00)
    174173    foreach f [glob -directory ${destroot}${install_prefix}/bin *] {
     174        system "chmod +x $f"
     175    }
     176    # create versioned symlinks for the content of libexec bin dir
     177    foreach f [glob -directory ${destroot}${install_prefix}/bin *] {
    175178        set filename  [file tail $f]
    176179        set extension [file extension $filename]
    177180        set base      [file rootname $filename]
    … …  
    224227
    225228universal_variant   no
    226229
    227 default_variants    +ssl +xml +gsl +minuit2 +tmva +roofit +graphviz +opengl +soversion +http
     230default_variants    +ssl +xml +gsl +minuit2 +tmva +roofit +graphviz +opengl +soversion +http +cxx14
    228231
    229 # Since ROOT 5.34.15 the cocoa backend is default on OSX 10.8 or newer
    230 # We also make it default on 10.7
    231 if {${os.major} > 10} {
     232# Default variant differences by system
     233if { ${os.major} > 10 } {
    232234    set default_gui_variant +cocoa
    233235} else {
    234236    set default_gui_variant +x11
    235237}
    236238
    237 # variant geocad description {Enable CAD Interface} {
    238 #     configure.args-replace  -Dgeocad=OFF -Dgeocad=ON
    239 #     depends_lib-append      port:oce
    240 #     configure.args-append   -DOCC_INCLUDE_DIR="${prefix}/include/oce"
    241 # }
    242 
    243239variant qt4 description {Enable QT4 support} {
    244240    configure.args-replace  -Dqt=OFF -Dqt=ON
    245241    PortGroup qt4 1.0
    … …  
    423419            foreach f [ exec find ${destroot}${install_prefix} -type f -and -name "*.py" ] {
    424420                reinplace "s|${pystringtoreplace}|${prefix}/bin/python${active_python_version}|g" $f
    425421            }
     422            foreach f [ exec find ${destroot}${install_prefix}/bin -type f | xargs grep -Il ${pystringtoreplace} ] {
     423                reinplace "s|${pystringtoreplace}|${prefix}/bin/python${active_python_version}|g" $f
     424            }
    426425        }
    427426
    428427    }
    … …  
    487486variant postgresql90 conflicts postgresql92 description {Build with PostgreSQL 9.0 support} {
    488487    configure.args-replace -Dpgsql=OFF -Dpgsql=ON
    489488    configure.args-append  -DPOSTGRESQL_INCLUDE_DIR="${prefix}/include/postgresql90"\
    490                            -DPOSTGRESQL_LIBRARIES="${prefix}/lib/postgresql90/libpq.dylib"
     489                           -DPOSTGRESQL_LIBRARY="${prefix}/lib/postgresql90/libpq.dylib"
    491490    depends_lib-append      port:libpqxx port:postgresql90
    492491}
    493492
    … …  
    494493variant postgresql92 conflicts postgresql90 description {Build with PostgreSQL 9.2 support} {
    495494    configure.args-replace -Dpgsql=OFF -Dpgsql=ON
    496495    configure.args-append  -DPOSTGRESQL_INCLUDE_DIR="${prefix}/include/postgresql92" \
    497                            -DPOSTGRESQL_LIBRARIES="${prefix}/lib/postgresql92/libpq.dylib"
     496                           -DPOSTGRESQL_LIBRARY="${prefix}/lib/postgresql92/libpq.dylib"
    498497    depends_lib-append      port:libpqxx port:postgresql92
    499498}
    500499
    … …  
    550549# ========================================================================================
    551550
    552551# List of possible clang versions that work
    553 set clang_versions { 3.4 3.5 3.6 3.7 }
     552set clang_versions { 3.5 3.6 3.7 3.8 }
    554553
    555554# Define the available variants
    556555foreach clang_ver ${clang_versions} {
    … …  
    567566
    568567# make sure that the proper variant is automatically selected
    569568# (ROOT crashes if the compiler it was built with doesn't exist)
    570 if { ![variant_isset clang33] && ![variant_isset clang34] &&
    571      ![variant_isset clang35] && ![variant_isset clang36] &&
    572      ![variant_isset clang37] } {
    573     if       { ${configure.compiler} eq "macports-clang-3.3" } {
    574         default_variants-append +clang33
    575     } elseif { ${configure.compiler} eq "macports-clang-3.4" } {
    576         default_variants-append +clang34
    577     } elseif { ${configure.compiler} eq "macports-clang-3.5" } {
     569if { ![variant_isset clang35] &&
     570     ![variant_isset clang36] &&
     571     ![variant_isset clang37] &&
     572     ![variant_isset clang38] } {
     573    if       { ${configure.compiler} eq "macports-clang-3.5" } {
    578574        default_variants-append +clang35
    579575    } elseif { ${configure.compiler} eq "macports-clang-3.6" } {
    580576        default_variants-append +clang36
    581577    } elseif { ${configure.compiler} eq "macports-clang-3.7" } {
    582578        default_variants-append +clang37
     579    } elseif { ${configure.compiler} eq "macports-clang-3.8" } {
     580        default_variants-append +clang38
    583581    }
    584582}
    585583
    … …  
    655653
    656654# ========================================================================================
    657655
    658 # Problems finding includes ...
     656# Various variants etc. with problems. Work in progress...
     657
    659658# variant ruby description {Build with ruby support} {
    660659#     configure.args-replace  -Druby=OFF -Druby=ON
    661660#     depends_lib-append      port:ruby
    … …  
    665664# livecheck.type              regex
    666665# livecheck.url               http://root.cern.ch/svn/root/trunk
    667666# livecheck.regex             ${name}_v(\[0-9a-z.\]+)\\.source
     667
     668# variant geocad description {Enable CAD Interface} {
     669#     configure.args-replace  -Dgeocad=OFF -Dgeocad=ON
     670#     depends_lib-append      port:oce
     671#     configure.args-append   -DOCC_INCLUDE_DIR="${prefix}/include/oce"
     672# }
     673
     674# variant r description {Enable R support} {
     675#     configure.args-replace  -Dr=OFF -Dr=ON
     676#     depends_lib-append  port:R
     677# }

  • science/root6/files/root6

     
    2828libexec/root6/bin/thisroot.sh
    2929-
    3030libexec/root6/bin/rootcling
     31libexec/root6/bin/rootbrowse
     32libexec/root6/bin/rootcp
     33libexec/root6/bin/rooteventselector
     34libexec/root6/bin/rootls
     35libexec/root6/bin/rootmkdir
     36libexec/root6/bin/rootmv
     37libexec/root6/bin/rootprint
     38libexec/root6/bin/rootrm
    3139-
    3240libexec/root6/share/man/man1/g2root.1.gz
    3341libexec/root6/share/man/man1/g2rootold.1.gz
    3442libexec/root6/share/man/man1/genmap.1.gz
    35 libexec/root6/share/man/man1/genreflex-rootcint.1.gz
    36 libexec/root6/share/man/man1/genreflex.1.gz
     43-
     44-
    3745libexec/root6/share/man/man1/h2root.1.gz
    3846libexec/root6/share/man/man1/hadd.1.gz
    3947libexec/root6/share/man/man1/hist2workspace.1.gz
    … …  
    5462libexec/root6/share/man/man1/proofd.1.gz
    5563libexec/root6/share/man/man1/proofserv.1.gz
    5664libexec/root6/share/man/man1/proofserva.1.gz
    57 libexec/root6/share/man/man1/rlibmap.1.gz
     65-
    5866libexec/root6/share/man/man1/rmkdepend.1.gz
    5967libexec/root6/share/man/man1/root-config.1.gz
    6068libexec/root6/share/man/man1/root.1.gz
    … …  
    6977libexec/root6/share/man/man1/system.rootdaemonrc.1.gz
    7078libexec/root6/share/man/man1/xpdtest.1.gz
    7179libexec/root6/share/man/man1/xproofd.1.gz
    72 libexec/root6/share/man/man1/rootcling.1.gz
     80-
    7381libexec/root6/etc/root
    7482libexec/root6/include/root
    7583libexec/root6/share

  • sysutils/root_select/Portfile

     
    55PortGroup           select 1.0
    66
    77name                root_select
    8 version             1.1
     8version             1.2
    99
    1010categories          sysutils science
    1111platforms           darwin

  • sysutils/root_select/files/base

     
    2828bin/thisroot.sh
    2929bin/xpdtest
    3030bin/rootcling
     31bin/rootbrowse
     32bin/rootcp
     33bin/rooteventselector
     34bin/rootls
     35bin/rootmkdir
     36bin/rootmv
     37bin/rootprint
     38bin/rootrm
    3139share/man/man1/cint.1.gz
    3240share/man/man1/g2root.1.gz
    3341share/man/man1/g2rootold.1.gz

  • sysutils/root_select/files/none

     
    7373-
    7474-
    7575-
     76-
     77-
     78-
     79-
     80-
     81-
     82-
     83-