Ticket #29345: Portfile.diff

File Portfile.diff, 3.2 KB (added by howarth@…, 14 years ago)

fix critical pymol_path issue as well for relax, etc.

  • Portfile

    old new  
    66
    77name                pymol
    88version             1.4
    9 revision            1
     9revision            2
    1010categories          science
    1111maintainers         bromo.med.uc.edu:howarth
    1212description         Molecular graphics system
    … …  
    2121master_sites        sourceforge
    2222fetch.type          svn
    2323svn.url             https://pymol.svn.sourceforge.net/svnroot/pymol/trunk/pymol
    24 svn.revision        3945
     24svn.revision        3947
    2525worksrcdir          pymol
    2626
    2727depends_lib         port:freetype port:libpng port:python26 port:py26-pmw port:py26-numeric port:mesa port:glew port:py26-tkinter
    … …  
    3737
    3838use_parallel_build  no
    3939
    40 variant gcc43 description conflicts gcc44 gcc45 description {build using macports-gcc-4.3} {
     40variant gcc43 description conflicts gcc44 gcc45 gcc46 description {build using macports-gcc-4.3} {
    4141    depends_lib-append  port:gcc43
    42     # the current pymol makefile does not honour CC and CXX environment variables
    43     build.args-delete   CC="${configure.cc}" CXX="${configure.cxx}"
    44     build.args-append   CC="${prefix}/bin/gcc-mp-4.3" CXX="${prefix}/bin/g++-mp-4.3"
    45     configure.compiler  macports-gcc-4.3
     42    python.add_archflags   no
     43    build.env CC="${prefix}/bin/gcc-mp-4.3" CXX="${prefix}/bin/g++-mp-4.3"
    4644}
    4745
    48 variant gcc44 description conflicts gcc43 gcc45 description {build using macports-gcc-4.4} {
     46variant gcc44 description conflicts gcc43 gcc45 gcc46 description {build using macports-gcc-4.4} {
    4947    depends_lib-append  port:gcc44
    50     # the current pymol makefile does not honour CC and CXX environment variables
    51     build.args-delete   CC="${configure.cc}" CXX="${configure.cxx}"
    52     build.args-append   CC="${prefix}/bin/gcc-mp-4.4" CXX="${prefix}/bin/g++-mp-4.4"
    53     configure.compiler  macports-gcc-4.4
     48    python.add_archflags   no
     49    build.env CC="${prefix}/bin/gcc-mp-4.4" CXX="${prefix}/bin/g++-mp-4.4"
    5450}
    5551
    56 variant gcc45 description conflicts gcc43 gcc44 description {build using macports-gcc-4.5} {
     52variant gcc45 description conflicts gcc43 gcc44 gcc46 description {build using macports-gcc-4.5} {
    5753    depends_lib-append  port:gcc45
    58     # the current pymol makefile does not honour CC and CXX environment variables
    59     build.args-delete   CC="${configure.cc}" CXX="${configure.cxx}"
    60     build.args-append   CC="${prefix}/bin/gcc-mp-4.5" CXX="${prefix}/bin/g++-mp-4.5"
    61     configure.compiler  macports-gcc-4.5
     54    python.add_archflags   no
     55    build.env CC="${prefix}/bin/gcc-mp-4.5" CXX="${prefix}/bin/g++-mp-4.5"
     56}
     57
     58variant gcc46 description conflicts gcc43 gcc44 gcc45 description {build using macports-gcc-4.6} {
     59    depends_lib-append  port:gcc46
     60    python.add_archflags   no
     61    build.env CC="${prefix}/bin/gcc-mp-4.6" CXX="${prefix}/bin/g++-mp-4.6"
    6262}
    6363
    6464post-destroot {
    6565     file copy ${worksrcpath}/setup/pymol_macports ${destroot}${prefix}/bin/pymol
    6666     file attributes ${destroot}${prefix}/bin/pymol -permissions a+x
     67     ln -s ${python.pkgd}/pymol ${destroot}${python.pkgd}/pymol/pymol_path
    6768     foreach d {data modules examples test scripts} {
    6869        copy ${worksrcpath}/${d} ${destroot}${python.pkgd}/pymol
    6970    }