Modified: trunk/dports/science/pymol/files/setup_py.diff (90200 => 90201)

--- trunk/dports/science/pymol/files/setup_py.diff	2012-02-25 23:51:29 UTC (rev 90200)
+++ trunk/dports/science/pymol/files/setup_py.diff	2012-02-26 00:09:53 UTC (rev 90201)
@@ -1,41 +1,11 @@
---- 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 ..."
-         #
--        EXT = os.getcwd()+"/ext"
+--- setup.py.orig	2012-02-17 13:06:52.000000000 -0500
++++ setup.py	2012-02-17 20:20:00.000000000 -0500
+@@ -153,7 +153,7 @@
+         outputheader.close()
+         outputfile.close()
+ 
+-        EXT = "/opt/local"
 +        EXT = "@PREFIX@"
          inc_dirs=["ov/src",
                    "layer0","layer1","layer2",
                    "layer3","layer4","layer5", 
--                  "/usr/X11R6/include",
-                   EXT+"/include",
-                   EXT+"/include/GL",
-                   EXT+"/include/freetype2",
-@@ -118,11 +117,14 @@
-         def_macros=[("_PYMOL_MODULE",None),
-                     ("_PYMOL_LIBPNG",None),
-                     ("_PYMOL_FREETYPE",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/lib64", "-lGL", "-lXxf86vm",
--                   "-L"+EXT+"/lib", "-lpng", "-lglut", "-lfreetype"
-+                   "-L"+EXT+"/lib", "-lpng", "-lGL", "-lglut", "-lGLEW", "-lfreetype"
-                    ]
- #============================================================================
- else: # linux or other unix
-@@ -181,6 +183,7 @@
-                 'pymol/opengl/glu',
-                 'pymol/opengl/glut',
-                 'pymol/wizard',
-+		'pymol2',
- 		'web',
- 		'web/examples',
- 		'web/javascript', ],