Changeset 82138

Timestamp:

08/08/11 07:52:23 (4 years ago)

Author:

macsforever2000@…

Message:

pymol: Lion build fix. Switch to numpy and scipy dependencies. (#30331)

Location:

trunk/dports/science/pymol

Files:

• Portfile (modified) (3 diffs)
• files/setup_py.diff (modified) (2 diffs)

trunk/dports/science/pymol/Portfile

@@ -7 +7 @@
 name                pymol
 version             1.4
-revision            2
+revision            3
 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        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
 
@@ -36 +36 @@
 }
 
-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} {

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

@@ -1 @@
---- 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 @@
          #
@@ -14 +14 @@
                    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"