[63941] trunk/dports/graphics

jeremyhu at macports.org jeremyhu at macports.org
Thu Feb 18 16:37:39 PST 2010 

Revision: 63941
          http://trac.macports.org/changeset/63941
Author:   jeremyhu at macports.org
Date:     2010-02-18 16:37:39 -0800 (Thu, 18 Feb 2010)
Log Message:
-----------
InsightToolkit*: Fixed variant names to be consistent with other ports

Modified Paths:
--------------
    trunk/dports/graphics/InsightToolkit/Portfile
    trunk/dports/graphics/InsightToolkit312/Portfile
    trunk/dports/graphics/InsightToolkit314/Portfile

Modified: trunk/dports/graphics/InsightToolkit/Portfile
===================================================================
--- trunk/dports/graphics/InsightToolkit/Portfile	2010-02-19 00:35:42 UTC (rev 63940)
+++ trunk/dports/graphics/InsightToolkit/Portfile	2010-02-19 00:37:39 UTC (rev 63941)
@@ -95,7 +95,7 @@
     ui_msg "complete.  The -o and -k options may be useful."
     ui_msg "See 'man port' for details."
     ui_msg "A fall-back install is to just install the c++ libs,"
-    ui_msg "port install InsightToolkit -doc -py25 +shared"
+    ui_msg "port install InsightToolkit -doc -python25 +shared"
     ui_msg "***************************************************"
 }
 
@@ -175,8 +175,8 @@
 
 default_variants \
     +doc \
-    +py25
-# Test the py26 variant ASAP.
+    +python25
+# Test the python26 variant ASAP.
 
 # universal variant is failing, so let's disable it
 universal_variant no
@@ -595,7 +595,7 @@
 setPython
 
 proc pyPostDestroot {} {
-    # This procedure applies for py25 and py25 (maybe py26)
+    # This procedure applies for python25 and python25 (maybe python26)
     global  destroot prefix branch \
             itkLibPath itkName distname pySite
     # Reset dynamic library dependency paths (see proc above)
@@ -618,10 +618,10 @@
     ln -s FindWrapITK-${branch}.cmake ${findWrapITK}
 }
 
-variant py24 requires wrap conflicts py25 description "python 2.4 wrapper (includes wrap)" {
+variant python24 requires wrap conflicts python25 description "python 2.4 wrapper (includes wrap)" {
     setPython 2 4
-    # Hereafter py24 and py25 are the same, but how to abstract this?  Maybe
-    # a general pyXY variant that is required by py24 and py25, but not clear on
+    # Hereafter python24 and python25 are the same, but how to abstract this?  Maybe
+    # a general pyXY variant that is required by python24 and python25, but not clear on
     # how the require precedence works with regard to the setPython proc.
     depends_lib-append \
         port:${pyPort}
@@ -637,7 +637,7 @@
     }
 }
 
-variant py25 requires wrap conflicts py24 description "python 2.5 wrapper (includes wrap)" {
+variant python25 requires wrap conflicts python24 description "python 2.5 wrapper (includes wrap)" {
     setPython 2 5
     depends_lib-append \
         port:${pyPort}
@@ -653,13 +653,13 @@
     }
 }
 
-# Regardless of the pyLib setting for py26, cmake or the wrap config sets
+# Regardless of the pyLib setting for python26, cmake or the wrap config sets
 # the string "-framework Python", but this "-framework Python" setting actually
 # gets resolved by the link process into the Apple system /Framework path rather
-# than macports!  I'm not clear about how to control this, so the py26 variant
-# must be disabled for now.  If it's enabled, add the py26 variant to the
-# conflicts of py24 and py25.
-#variant py26 requires wrap conflicts py24 py25 description "python 2.6 wrapper (includes wrap)" {
+# than macports!  I'm not clear about how to control this, so the python26 variant
+# must be disabled for now.  If it's enabled, add the python26 variant to the
+# conflicts of python24 and python25.
+#variant python26 requires wrap conflicts python24 python25 description "python 2.6 wrapper (includes wrap)" {
 #    setPython 2 6
 #    depends_lib-append \
 #        port:${pyPort}

Modified: trunk/dports/graphics/InsightToolkit312/Portfile
===================================================================
--- trunk/dports/graphics/InsightToolkit312/Portfile	2010-02-19 00:35:42 UTC (rev 63940)
+++ trunk/dports/graphics/InsightToolkit312/Portfile	2010-02-19 00:37:39 UTC (rev 63941)
@@ -156,7 +156,7 @@
 
 default_variants \
     +doc \
-    +py25
+    +python25
 
 variant doc description "provide doxygen documentation in ${itkDocPath}" {
     distfiles-append    ${itkDocFile}
@@ -572,7 +572,7 @@
 setPython
 
 proc pyPostDestroot {} {
-    # This procedure applies for py25 and py25 (maybe py26)
+    # This procedure applies for python25 and python25 (maybe python26)
     global  destroot prefix branch \
             itkLibPath itkName distname pySite
     # Reset dynamic library dependency paths (see proc above)
@@ -595,10 +595,10 @@
     #ln -s FindWrapITK-${branch}.cmake ${findWrapITK}
 }
 
-variant py24 requires wrap conflicts py25 description "python 2.4 wrapper (includes wrap)" {
+variant python24 requires wrap conflicts python25 description "python 2.4 wrapper (includes wrap)" {
     setPython 2 4
-    # Hereafter py24 and py25 are the same, but how to abstract this?  Maybe
-    # a general pyXY variant that is required by py24 and py25, but not clear on
+    # Hereafter python24 and python25 are the same, but how to abstract this?  Maybe
+    # a general pyXY variant that is required by python24 and python25, but not clear on
     # how the require precedence works with regard to the setPython proc.
     depends_lib-append \
         port:${pyPort}
@@ -614,7 +614,7 @@
     }
 }
 
-variant py25 requires wrap conflicts py24 description "python 2.5 wrapper (includes wrap)" {
+variant python25 requires wrap conflicts python24 description "python 2.5 wrapper (includes wrap)" {
     setPython 2 5
     depends_lib-append \
         port:${pyPort}
@@ -630,13 +630,13 @@
     }
 }
 
-# Regardless of the pyLib setting for py26, cmake or the wrap config sets
+# Regardless of the pyLib setting for python26, cmake or the wrap config sets
 # the string "-framework Python", but this "-framework Python" setting actually
 # gets resolved by the link process into the Apple system /Framework path rather
-# than macports!  I'm not clear about how to control this, so the py26 variant
-# must be disabled for now.  If it's enabled, add the py26 variant to the
-# conflicts of py24 and py25.
-#variant py26 requires wrap conflicts py24 py25 description "python 2.6 wrapper (includes wrap)" {
+# than macports!  I'm not clear about how to control this, so the python26 variant
+# must be disabled for now.  If it's enabled, add the python26 variant to the
+# conflicts of python24 and python25.
+#variant python26 requires wrap conflicts python24 python25 description "python 2.6 wrapper (includes wrap)" {
 #    setPython 2 6
 #    depends_lib-append \
 #        port:${pyPort}

Modified: trunk/dports/graphics/InsightToolkit314/Portfile
===================================================================
--- trunk/dports/graphics/InsightToolkit314/Portfile	2010-02-19 00:35:42 UTC (rev 63940)
+++ trunk/dports/graphics/InsightToolkit314/Portfile	2010-02-19 00:37:39 UTC (rev 63941)
@@ -160,7 +160,7 @@
 
 default_variants \
     +doc \
-    +py25
+    +python25
 
 variant doc description "provide doxygen documentation in ${itkDocPath}" {
     distfiles-append    ${itkDocFile}
@@ -576,7 +576,7 @@
 setPython
 
 proc pyPostDestroot {} {
-    # This procedure applies for py25 and py25 (maybe py26)
+    # This procedure applies for python25 and python25 (maybe python26)
     global  destroot prefix branch \
             itkLibPath itkName distname pySite
     # Reset dynamic library dependency paths (see proc above)
@@ -599,10 +599,10 @@
     ln -s FindWrapITK-${branch}.cmake ${findWrapITK}
 }
 
-variant py24 requires wrap conflicts py25 description "python 2.4 wrapper (includes wrap)" {
+variant python24 requires wrap conflicts python25 description "python 2.4 wrapper (includes wrap)" {
     setPython 2 4
-    # Hereafter py24 and py25 are the same, but how to abstract this?  Maybe
-    # a general pyXY variant that is required by py24 and py25, but not clear on
+    # Hereafter python24 and python25 are the same, but how to abstract this?  Maybe
+    # a general pyXY variant that is required by python24 and python25, but not clear on
     # how the require precedence works with regard to the setPython proc.
     depends_lib-append \
         port:${pyPort}
@@ -618,7 +618,7 @@
     }
 }
 
-variant py25 requires wrap conflicts py24 description "python 2.5 wrapper (includes wrap)" {
+variant python25 requires wrap conflicts python24 description "python 2.5 wrapper (includes wrap)" {
     setPython 2 5
     depends_lib-append \
         port:${pyPort}
@@ -634,13 +634,13 @@
     }
 }
 
-# Regardless of the pyLib setting for py26, cmake or the wrap config sets
+# Regardless of the pyLib setting for python26, cmake or the wrap config sets
 # the string "-framework Python", but this "-framework Python" setting actually
 # gets resolved by the link process into the Apple system /Framework path rather
-# than macports!  I'm not clear about how to control this, so the py26 variant
-# must be disabled for now.  If it's enabled, add the py26 variant to the
-# conflicts of py24 and py25.
-#variant py26 requires wrap conflicts py24 py25 description "python 2.6 wrapper (includes wrap)" {
+# than macports!  I'm not clear about how to control this, so the python26 variant
+# must be disabled for now.  If it's enabled, add the python26 variant to the
+# conflicts of python24 and python25.
+#variant python26 requires wrap conflicts python24 python25 description "python 2.6 wrapper (includes wrap)" {
 #    setPython 2 6
 #    depends_lib-append \
 #        port:${pyPort}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100218/f98279f6/attachment.html>

More information about the macports-changes mailing list