Changeset 81027

Timestamp:

07/23/11 11:59:20 (4 years ago)

Author:

raimue@…

Message:

science/pymol:
Maintainer update, closes #29345

Location:

trunk/dports/science/pymol

Files:

• Portfile (modified) (4 diffs)
• files/pymol_shell.diff (modified) (2 diffs)
• files/setup_py.diff (modified) (1 diff)

trunk/dports/science/pymol/Portfile

@@ -7 +7 @@
 name                pymol
 version             1.4
-revision            1
+revision            2
 categories          science
 maintainers         bromo.med.uc.edu:howarth
@@ -22 +22 @@
 fetch.type          svn
 svn.url             https://pymol.svn.sourceforge.net/svnroot/pymol/trunk/pymol
-svn.revision        3945
+svn.revision        3947
 worksrcdir          pymol
 
@@ -38 +38 @@
 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"
 }
 
@@ -65 +65 @@
      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

trunk/dports/science/pymol/files/pymol_shell.diff

@@ -1 +1 @@
 --- /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
 +#
@@ -17 +17 @@
 +# 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

trunk/dports/science/pymol/files/setup_py.diff

@@ -26 +26 @@
                      ]
 -        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",