[145074] trunk/dports/science/pymol/Portfile

dstrubbe at macports.org dstrubbe at macports.org
Mon Jan 25 08:02:22 PST 2016


Revision: 145074
          https://trac.macports.org/changeset/145074
Author:   dstrubbe at macports.org
Date:     2016-01-25 08:02:22 -0800 (Mon, 25 Jan 2016)
Log Message:
-----------
pymol: Use compilers portgroup for C/C++ variants. Add openmaintainer since the maintainer is not a committer. Add implicit dependencies on tcl and tk. Patch setup script to use the right C++ compiler (the variants were being ignored for this). (Maintainer timeout, ticket #50370)

Modified Paths:
--------------
    trunk/dports/science/pymol/Portfile

Modified: trunk/dports/science/pymol/Portfile
===================================================================
--- trunk/dports/science/pymol/Portfile	2016-01-25 16:01:01 UTC (rev 145073)
+++ trunk/dports/science/pymol/Portfile	2016-01-25 16:02:22 UTC (rev 145074)
@@ -4,13 +4,14 @@
 PortSystem          1.0
 PortGroup           python 1.0
 PortGroup           active_variants 1.1
+PortGroup           compilers 1.0
 
 name                pymol
 version             1.7.7.2
 revision            1
 categories          science chemistry
 license             PSF
-maintainers         gmail.com:howarth.at.macports
+maintainers         gmail.com:howarth.at.macports openmaintainer
 description         Molecular graphics system
 long_description    PyMOL is a molecular graphics system with an embedded Python interpreter \
                     designed for real-time visualization and rapid generation of high-quality \
@@ -26,6 +27,9 @@
 svn.revision        4141
 worksrcdir          pymol
 
+compilers.choose    cc cxx
+compilers.setup
+
 python.default_version 27
 python.link_binaries no
 
@@ -38,7 +42,9 @@
                     port:py${python.version}-numpy \
                     port:py${python.version}-pmw \
                     port:py${python.version}-scipy \
-                    port:py${python.version}-tkinter
+                    port:py${python.version}-tkinter \
+                    port:tcl \
+                    port:tk
 depends_run         port:xdpyinfo
 
 # py-scipy is not universal
@@ -61,50 +67,11 @@
     reinplace  "s|@@PYTHON_PKGDIR@@|${python.pkgd}|g" ${worksrcpath}/setup/pymol_macports
     reinplace  "s|@@PYTHON_BINARY@@|${python.bin}|g" ${worksrcpath}/setup/pymol_macports
     reinplace  "s|\"-O3\",|\"-O3\", \"-g\",|g" ${worksrcpath}/setup.py
+    reinplace  "s|cxx + \' \' + cxxflags|\'${configure.cxx} \' + cxxflags|g" ${worksrcpath}/monkeypatch_distutils.py
 }
 
 use_parallel_build yes
 
-variant gcc43 description conflicts gcc44 gcc45 gcc46 gcc47 gcc48 gcc49 gcc5 description {build using macports-gcc-4.3} {
-    python.add_archflags    no
-    configure.compiler      macports-gcc-4.3
-}
-
-variant gcc44 description conflicts gcc43 gcc45 gcc46 gcc47 gcc48 gcc49 gcc5 description {build using macports-gcc-4.4} {
-    python.add_archflags    no
-    configure.compiler      macports-gcc-4.4
-}
-
-variant gcc45 description conflicts gcc43 gcc44 gcc46 gcc47 gcc48 gcc49 gcc5 description {build using macports-gcc-4.5} {
-    python.add_archflags    no
-    configure.compiler      macports-gcc-4.5
-}
-
-variant gcc46 description conflicts gcc43 gcc44 gcc45 gcc47 gcc48 gcc49 gcc5 description {build using macports-gcc-4.6} {
-    python.add_archflags    no
-    configure.compiler      macports-gcc-4.6
-}
-
-variant gcc47 description conflicts gcc43 gcc44 gcc45 gcc46 gcc48 gcc49 gcc5 description {build using macports-gcc-4.7} {
-    python.add_archflags    no
-    configure.compiler      macports-gcc-4.7
-}
-
-variant gcc48 description conflicts gcc43 gcc44 gcc45 gcc46 gcc47 gcc49 gcc5 description {build using macports-gcc-4.8} {
-    python.add_archflags    no
-    configure.compiler      macports-gcc-4.8
-}
-
-variant gcc49 description conflicts gcc43 gcc44 gcc45 gcc46 gcc47 gcc48 gcc5 description {build using macports-gcc-4.9} {
-    python.add_archflags    no
-    configure.compiler      macports-gcc-4.9
-}
-
-variant gcc5 description conflicts gcc43 gcc44 gcc45 gcc46 gcc47 gcc48 gcc49 description {build using macports-gcc-5} {
-    python.add_archflags    no
-    configure.compiler      macports-gcc-5
-}
-
 build {}
 
 pre-destroot {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160125/a047923a/attachment.html>


More information about the macports-changes mailing list