[81027] trunk/dports/science/pymol

[raimue at macports.org]

Revision: 81027
          http://trac.macports.org/changeset/81027
Author:   raimue at macports.org
Date:     2011-07-23 11:59:20 -0700 (Sat, 23 Jul 2011)
Log Message:
-----------
science/pymol:
Maintainer update, closes #29345

Modified Paths:
--------------
    trunk/dports/science/pymol/Portfile
    trunk/dports/science/pymol/files/pymol_shell.diff
    trunk/dports/science/pymol/files/setup_py.diff

Modified: trunk/dports/science/pymol/Portfile
===================================================================
--- trunk/dports/science/pymol/Portfile	2011-07-23 18:24:23 UTC (rev 81026)
+++ trunk/dports/science/pymol/Portfile	2011-07-23 18:59:20 UTC (rev 81027)
@@ -6,7 +6,7 @@
 
 name                pymol
 version             1.4
-revision            1
+revision            2
 categories          science
 maintainers         bromo.med.uc.edu:howarth
 description         Molecular graphics system
@@ -21,7 +21,7 @@
 master_sites        sourceforge
 fetch.type          svn
 svn.url             https://pymol.svn.sourceforge.net/svnroot/pymol/trunk/pymol
-svn.revision        3945
+svn.revision        3947
 worksrcdir          pymol
 
 depends_lib         port:freetype port:libpng port:python26 port:py26-pmw port:py26-numeric port:mesa port:glew port:py26-tkinter
@@ -37,33 +37,34 @@
 
 use_parallel_build  no
 
-variant gcc43 description conflicts gcc44 gcc45 description {build using macports-gcc-4.3} {
+variant gcc43 description conflicts gcc44 gcc45 gcc46 description {build using macports-gcc-4.3} {
     depends_lib-append  port:gcc43
-    # the current pymol makefile does not honour CC and CXX environment variables
-    build.args-delete   CC="${configure.cc}" CXX="${configure.cxx}"
-    build.args-append   CC="${prefix}/bin/gcc-mp-4.3" CXX="${prefix}/bin/g++-mp-4.3"
-    configure.compiler  macports-gcc-4.3
+    python.add_archflags   no
+    build.env CC="${prefix}/bin/gcc-mp-4.3" CXX="${prefix}/bin/g++-mp-4.3"
 }
 
-variant gcc44 description conflicts gcc43 gcc45 description {build using macports-gcc-4.4} {
+variant gcc44 description conflicts gcc43 gcc45 gcc46 description {build using macports-gcc-4.4} {
     depends_lib-append  port:gcc44
-    # the current pymol makefile does not honour CC and CXX environment variables
-    build.args-delete   CC="${configure.cc}" CXX="${configure.cxx}"
-    build.args-append   CC="${prefix}/bin/gcc-mp-4.4" CXX="${prefix}/bin/g++-mp-4.4"
-    configure.compiler  macports-gcc-4.4
+    python.add_archflags   no
+    build.env CC="${prefix}/bin/gcc-mp-4.4" CXX="${prefix}/bin/g++-mp-4.4"
 }
 
-variant gcc45 description conflicts gcc43 gcc44 description {build using macports-gcc-4.5} {
+variant gcc45 description conflicts gcc43 gcc44 gcc46 description {build using macports-gcc-4.5} {
     depends_lib-append  port:gcc45
-    # the current pymol makefile does not honour CC and CXX environment variables
-    build.args-delete   CC="${configure.cc}" CXX="${configure.cxx}"
-    build.args-append   CC="${prefix}/bin/gcc-mp-4.5" CXX="${prefix}/bin/g++-mp-4.5"
-    configure.compiler  macports-gcc-4.5
+    python.add_archflags   no
+    build.env CC="${prefix}/bin/gcc-mp-4.5" CXX="${prefix}/bin/g++-mp-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"
+}
+
 post-destroot {
      file copy ${worksrcpath}/setup/pymol_macports ${destroot}${prefix}/bin/pymol
      file attributes ${destroot}${prefix}/bin/pymol -permissions a+x
+     ln -s ${python.pkgd}/pymol ${destroot}${python.pkgd}/pymol/pymol_path
      foreach d {data modules examples test scripts} {
         copy ${worksrcpath}/${d} ${destroot}${python.pkgd}/pymol
     }

Modified: trunk/dports/science/pymol/files/pymol_shell.diff
===================================================================
--- trunk/dports/science/pymol/files/pymol_shell.diff	2011-07-23 18:24:23 UTC (rev 81026)
+++ trunk/dports/science/pymol/files/pymol_shell.diff	2011-07-23 18:59:20 UTC (rev 81027)
@@ -1,6 +1,6 @@
 --- /dev/null	2011-04-22 23:16:48.000000000 -0400
 +++ setup/pymol_macports	2011-04-22 23:19:48.000000000 -0400
-@@ -0,0 +1,26 @@
+@@ -0,0 +1,19 @@
 +#!/bin/sh
 +#
 +# PyMOL startup script
@@ -16,13 +16,6 @@
 +#
 +# python modules
 +#
-+if [ "$PYTHONPATH" == "" ]; then
-+PYTHONPATH=${PYMOL_PATH}/modules
-+else
-+PYTHONPATH=${PYMOL_PATH}/modules:${PYTHONPATH}
-+fi
-+export PYTHONPATH
-+#
 +APBS_PSIZE=@PREFIX@/bin/apbs-psize.py
 +export APBS_PSIZE
 +#

Modified: trunk/dports/science/pymol/files/setup_py.diff
===================================================================
--- trunk/dports/science/pymol/files/setup_py.diff	2011-07-23 18:24:23 UTC (rev 81026)
+++ trunk/dports/science/pymol/files/setup_py.diff	2011-07-23 18:59:20 UTC (rev 81027)
@@ -25,7 +25,7 @@
 +                    ("NO_MMLIBS",None),
                      ]
 -        ext_comp_args=[]
-+        ext_comp_args=["-ffast-math","-funroll-loops","-O3"]
++        ext_comp_args=["-ffast-math","-funroll-loops","-O3","-fcommon"]
          ext_link_args=[
 -	               "-L/usr/X11R6/lib", "-lGL", "-lXxf86vm",
 -                   "-L"+EXT+"/lib", "-lpng", "-lglut", "-lfreetype"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110723/5e05528b/attachment-0001.html>