Ticket #33289: Portfile.diff

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

updated Portfile.diff to include apbs-psize.py and pmw_tk fixes

  • Portfile

    old new  
    55PortGroup           python26 1.0
    66
    77name                pymol
    8 version             1.4
    9 revision            4
     8version             1.5
    109categories          science
    1110maintainers         bromo.med.uc.edu:howarth
    1211description         Molecular graphics system
     
    2120master_sites        sourceforge
    2221fetch.type          svn
    2322svn.url             https://pymol.svn.sourceforge.net/svnroot/pymol/trunk/pymol
    24 svn.revision        3962
     23svn.revision        3983
    2524worksrcdir          pymol
    2625
    2726depends_lib         port:freetype port:libpng port:python26 port:py26-pmw port:py26-numpy port:py26-scipy port:mesa port:glew port:py26-tkinter
    2827depends_run         port:xdpyinfo
    2928
    30 patchfiles          setup_py.diff pymol_shell.diff
     29patchfiles          setup_py.diff pymol_shell.diff pmg_tk_platform.patch apbs-psize.patch
    3130
    3231post-patch {
    3332    reinplace  "s|@PREFIX@|${prefix}|g" ${worksrcpath}/setup.py
     
    3736
    3837use_parallel_build yes
    3938
    40 platform darwin 11 {
    41     python.add_archflags   no
    42     build.env CC="/usr/bin/clang" CXX="/usr/bin/clang++"
    43 }
    44 
    4539variant gcc43 description conflicts gcc44 gcc45 gcc46 description {build using macports-gcc-4.3} {
    4640    depends_lib-append  port:gcc43
    4741    python.add_archflags   no
    48     build.env CC="${prefix}/bin/gcc-mp-4.3" CXX="${prefix}/bin/g++-mp-4.3"
     42    configure.compiler  macports-gcc-4.3
    4943}
    5044
    5145variant gcc44 description conflicts gcc43 gcc45 gcc46 description {build using macports-gcc-4.4} {
    5246    depends_lib-append  port:gcc44
    5347    python.add_archflags   no
    54     build.env CC="${prefix}/bin/gcc-mp-4.4" CXX="${prefix}/bin/g++-mp-4.4"
     48    configure.compiler  macports-gcc-4.4
    5549}
    5650
    5751variant gcc45 description conflicts gcc43 gcc44 gcc46 description {build using macports-gcc-4.5} {
    5852    depends_lib-append  port:gcc45
    5953    python.add_archflags   no
    60     build.env CC="${prefix}/bin/gcc-mp-4.5" CXX="${prefix}/bin/g++-mp-4.5"
     54    configure.compiler  macports-gcc-4.5
    6155}
    6256
    6357variant gcc46 description conflicts gcc43 gcc44 gcc45 description {build using macports-gcc-4.6} {
    6458    depends_lib-append  port:gcc46
    6559    python.add_archflags   no
    66     build.env CC="${prefix}/bin/gcc-mp-4.6" CXX="${prefix}/bin/g++-mp-4.6"
     60    configure.compiler  macports-gcc-4.6
     61}
     62
     63pre-build {
     64    build.env CC="${configure.cc}" CXX="${configure.cxx}"
     65}
     66
     67build {
    6768}
    6869
    6970post-destroot {