Ticket #30331: Portfile.diff

Portfile

@@ -6 +6 @@
 
 name                pymol
 version             1.4
-revision            4
+revision            5
 categories          science
 maintainers         bromo.med.uc.edu:howarth
 description         Molecular graphics system
@@ -21 +21 @@
 master_sites        sourceforge
 fetch.type          svn
 svn.url             https://pymol.svn.sourceforge.net/svnroot/pymol/trunk/pymol
-svn.revision        3962
+svn.revision        3964
 worksrcdir          pymol
 
 depends_lib         port:freetype port:libpng port:python26 port:py26-pmw port:py26-numpy port:py26-scipy port:mesa port:glew port:py26-tkinter
@@ -37 +37 @@
 
 use_parallel_build yes
 
-platform darwin 11 {
-    python.add_archflags   no
-    build.env CC="/usr/bin/clang" CXX="/usr/bin/clang++"
+if {${configure.compiler} == "llvm-gcc-4.2"} {
+    configure.compiler  clang
 }
 
 variant gcc43 description conflicts gcc44 gcc45 gcc46 description {build using macports-gcc-4.3} {
     depends_lib-append  port:gcc43
     python.add_archflags   no
-    build.env CC="${prefix}/bin/gcc-mp-4.3" CXX="${prefix}/bin/g++-mp-4.3"
+    configure.compiler  macports-gcc-4.3
 }
 
 variant gcc44 description conflicts gcc43 gcc45 gcc46 description {build using macports-gcc-4.4} {
     depends_lib-append  port:gcc44
     python.add_archflags   no
-    build.env CC="${prefix}/bin/gcc-mp-4.4" CXX="${prefix}/bin/g++-mp-4.4"
+    configure.compiler  macports-gcc-4.4
 }
 
 variant gcc45 description conflicts gcc43 gcc44 gcc46 description {build using macports-gcc-4.5} {
     depends_lib-append  port:gcc45
     python.add_archflags   no
-    build.env CC="${prefix}/bin/gcc-mp-4.5" CXX="${prefix}/bin/g++-mp-4.5"
+    configure.compiler  macports-gcc-4.5
 }
 
 variant gcc46 description conflicts gcc43 gcc44 gcc45 description {build using macports-gcc-4.6} {
     depends_lib-append  port:gcc46
     python.add_archflags   no
-    build.env CC="${prefix}/bin/gcc-mp-4.6" CXX="${prefix}/bin/g++-mp-4.6"
+    configure.compiler  macports-gcc-4.6
+}
+
+pre-build {
+    build.env CC="${configure.cc}" CXX="${configure.cxx}"
 }
 
 post-destroot {