[106084] trunk/dports/python/py-mayavi
macsforever2000 at macports.org
macsforever2000 at macports.org
Tue May 14 09:12:03 PDT 2013
Revision: 106084
https://trac.macports.org/changeset/106084
Author: macsforever2000 at macports.org
Date: 2013-05-14 09:12:03 -0700 (Tue, 14 May 2013)
Log Message:
-----------
py-mayavi: Use active variants portgroup. Rename patch.
Modified Paths:
--------------
trunk/dports/python/py-mayavi/Portfile
Added Paths:
-----------
trunk/dports/python/py-mayavi/files/patch-vtk510_text.diff
Removed Paths:
-------------
trunk/dports/python/py-mayavi/files/vtk510_text.patch
Modified: trunk/dports/python/py-mayavi/Portfile
===================================================================
--- trunk/dports/python/py-mayavi/Portfile 2013-05-14 15:45:47 UTC (rev 106083)
+++ trunk/dports/python/py-mayavi/Portfile 2013-05-14 16:12:03 UTC (rev 106084)
@@ -3,6 +3,7 @@
PortSystem 1.0
PortGroup python 1.0
+PortGroup active_variants 1.1
name py-mayavi
version 4.2.0
@@ -33,7 +34,9 @@
port:py${python.version}-traitsui \
port:vtk5
- patchfiles vtk510_text.patch
+ require_active_variants vtk5 python${python.version}
+
+ patchfiles patch-vtk510_text.diff
patch.pre_args -p1
post-patch {
@@ -42,18 +45,9 @@
${worksrcpath}/docs/MakefileMayavi \
${worksrcpath}/docs/MakefileTVTK
}
-
- # if variant dependencies or checking becomes possible, this can be improved
- pre-configure {
-
- ui_msg \
- "Note that vtk5 must be installed using the same framework (cocoa\
+
+ notes \
+ "Note that vtk5 must be installed using the same framework (cocoa\
OR x11/gtk) as that used for the GUI (wxwidgets/wxpython OR\
qt4/pyqt4)."
-
- if {![catch {glob "${prefix}/Library/Frameworks/Python.framework/Versions/${python.branch}/lib/python${python.branch}/site-packages/VTK-*-py${python.branch}.egg-info/PKG-INFO"}]==0} {
- ui_error "vtk5 must be installed with the +python${python.version} variant"
- return -code error "incompatible vtk5 installation"
- }
- }
}
Copied: trunk/dports/python/py-mayavi/files/patch-vtk510_text.diff (from rev 106031, trunk/dports/python/py-mayavi/files/vtk510_text.patch)
===================================================================
--- trunk/dports/python/py-mayavi/files/patch-vtk510_text.diff (rev 0)
+++ trunk/dports/python/py-mayavi/files/patch-vtk510_text.diff 2013-05-14 16:12:03 UTC (rev 106084)
@@ -0,0 +1,83 @@
+From 15b0774659932596dab27363fa8eefdb855fda8f Mon Sep 17 00:00:00 2001
+From: "mluessi at nmr.mgh.harvard.edu" <mluessi at nmr.mgh.harvard.edu>
+Date: Mon, 9 Jul 2012 17:48:20 -0400
+Subject: [PATCH] FIX: version comp. for VTK 5.10
+
+---
+ mayavi/modules/text.py | 8 +++++---
+ tvtk/tools/mlab.py | 5 +++--
+ 2 files changed, 8 insertions(+), 5 deletions(-)
+
+diff --git a/mayavi/modules/text.py b/mayavi/modules/text.py
+index 1fcc0e0..d1c79c0 100644
+--- a/mayavi/modules/text.py
++++ b/mayavi/modules/text.py
+@@ -5,6 +5,8 @@
+ # Copyright (c) 2005, Enthought, Inc.
+ # License: BSD Style.
+
++from distutils.version import StrictVersion
++
+ # Enthought library imports.
+ from traits.api import Instance, Range, Str, Bool, Property, \
+ Float
+@@ -16,7 +18,7 @@
+ from mayavi.core.module import Module
+ from mayavi.core.pipeline_info import PipelineInfo
+
+-VTK_VER = float(tvtk.Version().vtk_version[:3])
++VTK_VER = StrictVersion(tvtk.Version().vtk_version)
+
+
+ ######################################################################
+@@ -68,7 +70,7 @@ class Text(Module):
+ ########################################
+ # The view of this object.
+
+- if VTK_VER > 5.1:
++ if VTK_VER > '5.1':
+ _text_actor_group = Group(Item(name='visibility'),
+ Item(name='text_scale_mode'),
+ Item(name='alignment_point'),
+@@ -152,7 +154,7 @@ def setup_pipeline(self):
+ set the `actors` attribute up at this point.
+ """
+ actor = self.actor = tvtk.TextActor(input=str(self.text))
+- if VTK_VER > 5.1:
++ if VTK_VER > '5.1':
+ actor.set(text_scale_mode='prop', width=0.4, height=1.0)
+ else:
+ actor.set(scaled_text=True, width=0.4, height=1.0)
+diff --git a/tvtk/tools/mlab.py b/tvtk/tools/mlab.py
+index 8262da0..dfe9230 100644
+--- a/tvtk/tools/mlab.py
++++ b/tvtk/tools/mlab.py
+@@ -92,6 +92,7 @@
+ # Copyright (c) 2005-2007, Enthought, Inc.
+ # License: BSD Style.
+
++from distutils.version import StrictVersion
+
+ import numpy
+
+@@ -107,7 +108,7 @@
+ # Set this to False to not use LOD Actors.
+ USE_LOD_ACTOR = True
+
+-VTK_VER = float(tvtk.Version().vtk_version[:3])
++VTK_VER = StrictVersion(tvtk.Version().vtk_version)
+
+ ######################################################################
+ # Utility functions.
+@@ -639,7 +640,7 @@ def __init__(self, **traits):
+ super(Title, self).__init__(**traits)
+
+ ta = self.text_actor
+- if VTK_VER > 5.1:
++ if VTK_VER > '5.1':
+ ta.set(text_scale_mode='prop', height=0.05, input=self.text)
+ else:
+ ta.set(scaled_text=True, height=0.05, input=self.text)
+--
+1.7.10
+
Deleted: trunk/dports/python/py-mayavi/files/vtk510_text.patch
===================================================================
--- trunk/dports/python/py-mayavi/files/vtk510_text.patch 2013-05-14 15:45:47 UTC (rev 106083)
+++ trunk/dports/python/py-mayavi/files/vtk510_text.patch 2013-05-14 16:12:03 UTC (rev 106084)
@@ -1,83 +0,0 @@
-From 15b0774659932596dab27363fa8eefdb855fda8f Mon Sep 17 00:00:00 2001
-From: "mluessi at nmr.mgh.harvard.edu" <mluessi at nmr.mgh.harvard.edu>
-Date: Mon, 9 Jul 2012 17:48:20 -0400
-Subject: [PATCH] FIX: version comp. for VTK 5.10
-
----
- mayavi/modules/text.py | 8 +++++---
- tvtk/tools/mlab.py | 5 +++--
- 2 files changed, 8 insertions(+), 5 deletions(-)
-
-diff --git a/mayavi/modules/text.py b/mayavi/modules/text.py
-index 1fcc0e0..d1c79c0 100644
---- a/mayavi/modules/text.py
-+++ b/mayavi/modules/text.py
-@@ -5,6 +5,8 @@
- # Copyright (c) 2005, Enthought, Inc.
- # License: BSD Style.
-
-+from distutils.version import StrictVersion
-+
- # Enthought library imports.
- from traits.api import Instance, Range, Str, Bool, Property, \
- Float
-@@ -16,7 +18,7 @@
- from mayavi.core.module import Module
- from mayavi.core.pipeline_info import PipelineInfo
-
--VTK_VER = float(tvtk.Version().vtk_version[:3])
-+VTK_VER = StrictVersion(tvtk.Version().vtk_version)
-
-
- ######################################################################
-@@ -68,7 +70,7 @@ class Text(Module):
- ########################################
- # The view of this object.
-
-- if VTK_VER > 5.1:
-+ if VTK_VER > '5.1':
- _text_actor_group = Group(Item(name='visibility'),
- Item(name='text_scale_mode'),
- Item(name='alignment_point'),
-@@ -152,7 +154,7 @@ def setup_pipeline(self):
- set the `actors` attribute up at this point.
- """
- actor = self.actor = tvtk.TextActor(input=str(self.text))
-- if VTK_VER > 5.1:
-+ if VTK_VER > '5.1':
- actor.set(text_scale_mode='prop', width=0.4, height=1.0)
- else:
- actor.set(scaled_text=True, width=0.4, height=1.0)
-diff --git a/tvtk/tools/mlab.py b/tvtk/tools/mlab.py
-index 8262da0..dfe9230 100644
---- a/tvtk/tools/mlab.py
-+++ b/tvtk/tools/mlab.py
-@@ -92,6 +92,7 @@
- # Copyright (c) 2005-2007, Enthought, Inc.
- # License: BSD Style.
-
-+from distutils.version import StrictVersion
-
- import numpy
-
-@@ -107,7 +108,7 @@
- # Set this to False to not use LOD Actors.
- USE_LOD_ACTOR = True
-
--VTK_VER = float(tvtk.Version().vtk_version[:3])
-+VTK_VER = StrictVersion(tvtk.Version().vtk_version)
-
- ######################################################################
- # Utility functions.
-@@ -639,7 +640,7 @@ def __init__(self, **traits):
- super(Title, self).__init__(**traits)
-
- ta = self.text_actor
-- if VTK_VER > 5.1:
-+ if VTK_VER > '5.1':
- ta.set(text_scale_mode='prop', height=0.05, input=self.text)
- else:
- ta.set(scaled_text=True, height=0.05, input=self.text)
---
-1.7.10
-
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130514/fb9cff3e/attachment.html>
More information about the macports-changes
mailing list