Ticket #44230: root6.00.02.Portfile.diff

File root6.00.02.Portfile.diff, 2.6 KB (added by mojca (Mojca Miklavec), 10 years ago)
  • 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
     
    214212
    215213universal_variant   no
    216214
    217 default_variants    +ssl +xml +gsl +minuit2 +tmva +roofit +graphviz +opengl +soversion
     215default_variants    +ssl +xml +gsl +minuit2 +tmva +roofit +graphviz +opengl +python27 +soversion
    218216
    219217# Since ROOT 5.34.15 the cocoa backend is default on OSX 10.8 or newer
    220218# We also make it default on 10.7
  • files/patch-graf3d-gl-CMakeLists.txt.diff

     
    1 https://sft.its.cern.ch/jira/browse/ROOT-6393
    2 
    3 --- graf3d/gl/CMakeLists.txt.orig
    4 +++ graf3d/gl/CMakeLists.txt
    5 @@ -24,7 +24,7 @@ if(WIN32)
    6  elseif(cocoa)
    7    set(gllibs "-framework OpenGL")
    8  else()
    9 -  set(gllibs ${OPENGL_LIBRARIES})
    10 +  set(gllibs ${OPENGL_LIBRARIES} ${X11_LIBRARIES})
    11  endif()
    12  
    13  if(MACOSX_GLU_DEPRECATED)