[82138] trunk/dports/science/pymol

macsforever2000 at macports.org macsforever2000 at macports.org
Mon Aug 8 07:52:24 PDT 2011


Revision: 82138
          http://trac.macports.org/changeset/82138
Author:   macsforever2000 at macports.org
Date:     2011-08-08 07:52:23 -0700 (Mon, 08 Aug 2011)
Log Message:
-----------
pymol: Lion build fix. Switch to numpy and scipy dependencies. (#30331)

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

Modified: trunk/dports/science/pymol/Portfile
===================================================================
--- trunk/dports/science/pymol/Portfile	2011-08-08 14:33:12 UTC (rev 82137)
+++ trunk/dports/science/pymol/Portfile	2011-08-08 14:52:23 UTC (rev 82138)
@@ -6,7 +6,7 @@
 
 name                pymol
 version             1.4
-revision            2
+revision            3
 categories          science
 maintainers         bromo.med.uc.edu:howarth
 description         Molecular graphics system
@@ -21,10 +21,10 @@
 master_sites        sourceforge
 fetch.type          svn
 svn.url             https://pymol.svn.sourceforge.net/svnroot/pymol/trunk/pymol
-svn.revision        3947
+svn.revision        3962
 worksrcdir          pymol
 
-depends_lib         port:freetype port:libpng port:python26 port:py26-pmw port:py26-numeric port:mesa port:glew port:py26-tkinter
+depends_lib         port:freetype port:libpng port:python26 port:py26-pmw port:py26-numpy port:py26-scipy port:mesa port:glew port:py26-tkinter
 depends_run         port:xdpyinfo
 
 patchfiles          setup_py.diff pymol_shell.diff
@@ -35,8 +35,13 @@
     reinplace  "s|@@PYTHON_BINARY@@|${python.bin}|g" ${worksrcpath}/setup/pymol_macports
 }
 
-use_parallel_build  no
+use_parallel_build yes
 
+platform darwin 11 {
+    python.add_archflags   no
+    build.env CC="/usr/bin/clang" CXX="/usr/bin/clang++"
+}
+
 variant gcc43 description conflicts gcc44 gcc45 gcc46 description {build using macports-gcc-4.3} {
     depends_lib-append  port:gcc43
     python.add_archflags   no

Modified: trunk/dports/science/pymol/files/setup_py.diff
===================================================================
--- trunk/dports/science/pymol/files/setup_py.diff	2011-08-08 14:33:12 UTC (rev 82137)
+++ trunk/dports/science/pymol/files/setup_py.diff	2011-08-08 14:52:23 UTC (rev 82138)
@@ -1,5 +1,5 @@
---- setup.py.orig	2011-04-22 22:47:12.000000000 -0400
-+++ setup.py	2011-04-22 22:48:24.000000000 -0400
+--- setup.py.orig	2011-07-25 16:38:04.000000000 -0400
++++ setup.py	2011-07-26 00:00:37.000000000 -0400
 @@ -101,11 +101,10 @@
          #
          # REMEMEBER to use "./ext/bin/python ..."
@@ -13,21 +13,19 @@
                    EXT+"/include",
                    EXT+"/include/GL",
                    EXT+"/include/freetype2",
-@@ -116,13 +115,16 @@
-         pyogl_libs = []
-         lib_dirs=[]
+@@ -118,11 +117,14 @@
          def_macros=[("_PYMOL_MODULE",None),
-+                    ("_PYMOL_INLINE",None),
                      ("_PYMOL_LIBPNG",None),
                      ("_PYMOL_FREETYPE",None),
-+                    ("_PYMOL_NUMPY",None),
-+                    ("_PYMOL_OPENGL_SHADERS",None),
-+                    ("NO_MMLIBS",None),
++		    ("_PYMOL_INLINE",None),
++		    ("_PYMOL_NUMPY",None),
++		    ("_PYMOL_OPENGL_SHADERS",None),
++		    ("NO_MMLIBS",None),
                      ]
 -        ext_comp_args=[]
 +        ext_comp_args=["-ffast-math","-funroll-loops","-O3","-fcommon"]
          ext_link_args=[
--	               "-L/usr/X11R6/lib", "-lGL", "-lXxf86vm",
+-	               "-L/usr/X11R6/lib64", "-lGL", "-lXxf86vm",
 -                   "-L"+EXT+"/lib", "-lpng", "-lglut", "-lfreetype"
 +                   "-L"+EXT+"/lib", "-lpng", "-lGL", "-lglut", "-lGLEW", "-lfreetype"
                     ]
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110808/2ce723d3/attachment.html>


More information about the macports-changes mailing list