Ticket #33963: Portfile.diff

File Portfile.diff, 2.5 KB (added by howarth@…, 13 years ago)

Portfile diff to fix broken compiler variants

  • Portfile

    old new  
    66
    77name                pymol
    88version             1.5
     9revision            1
    910categories          science
    1011maintainers         bromo.med.uc.edu:howarth
    1112description         Molecular graphics system
     
    2021master_sites        sourceforge
    2122fetch.type          svn
    2223svn.url             https://pymol.svn.sourceforge.net/svnroot/pymol/trunk/pymol
    23 svn.revision        3983
     24svn.revision        3996
    2425worksrcdir          pymol
    2526
    2627depends_lib         port:freetype port:libpng port:python26 port:py26-pmw port:py26-numpy port:py26-scipy port:mesa port:glew port:py26-tkinter port:freeglut
     
    3637
    3738use_parallel_build yes
    3839
    39 variant gcc43 description conflicts gcc44 gcc45 gcc46 description {build using macports-gcc-4.3} {
     40variant gcc43 description conflicts gcc44 gcc45 gcc46 gcc47 description {build using macports-gcc-4.3} {
    4041    depends_lib-append  port:gcc43
    4142    python.add_archflags   no
    4243    configure.compiler  macports-gcc-4.3
    4344}
    4445
    45 variant gcc44 description conflicts gcc43 gcc45 gcc46 description {build using macports-gcc-4.4} {
     46variant gcc44 description conflicts gcc43 gcc45 gcc46 gcc47 description {build using macports-gcc-4.4} {
    4647    depends_lib-append  port:gcc44
    4748    python.add_archflags   no
    4849    configure.compiler  macports-gcc-4.4
    4950}
    5051
    51 variant gcc45 description conflicts gcc43 gcc44 gcc46 description {build using macports-gcc-4.5} {
     52variant gcc45 description conflicts gcc43 gcc44 gcc46 gcc47 description {build using macports-gcc-4.5} {
    5253    depends_lib-append  port:gcc45
    5354    python.add_archflags   no
    5455    configure.compiler  macports-gcc-4.5
    5556}
    5657
    57 variant gcc46 description conflicts gcc43 gcc44 gcc45 description {build using macports-gcc-4.6} {
     58variant gcc46 description conflicts gcc43 gcc44 gcc45 gcc47 description {build using macports-gcc-4.6} {
    5859    depends_lib-append  port:gcc46
    5960    python.add_archflags   no
    6061    configure.compiler  macports-gcc-4.6
    6162}
    6263
    63 pre-build {
    64     build.env CC="${configure.cc}" CXX="${configure.cxx}"
     64variant gcc47 description conflicts gcc43 gcc44 gcc45 gcc46 description {build using macports-gcc-4.7} {
     65    depends_lib-append  port:gcc47
     66    python.add_archflags   no
     67    configure.compiler  macports-gcc-4.7
    6568}
    6669
    6770build {
    6871}
    6972
     73pre-destroot {
     74        destroot.env CC="${configure.cc}" CXX="${configure.cxx}"
     75}
     76
    7077post-destroot {
    7178     file copy ${worksrcpath}/setup/pymol_macports ${destroot}${prefix}/bin/pymol
    7279     file attributes ${destroot}${prefix}/bin/pymol -permissions a+x