[117365] trunk/dports/python

rowue at macports.org rowue at macports.org
Mon Feb 24 06:23:00 PST 2014


Revision: 117365
          https://trac.macports.org/changeset/117365
Author:   rowue at macports.org
Date:     2014-02-24 06:23:00 -0800 (Mon, 24 Feb 2014)
Log Message:
-----------
py26-pyphant: moved to portgroup python

Modified Paths:
--------------
    trunk/dports/python/py-pyphant/Portfile
    trunk/dports/python/py-pyphant/files/pyphant
    trunk/dports/python/py-pyphant/files/pyphant.quartz

Added Paths:
-----------
    trunk/dports/python/py-pyphant/

Removed Paths:
-------------
    trunk/dports/python/py26-pyphant/

Modified: trunk/dports/python/py-pyphant/Portfile
===================================================================
--- trunk/dports/python/py26-pyphant/Portfile	2014-02-24 04:57:48 UTC (rev 117361)
+++ trunk/dports/python/py-pyphant/Portfile	2014-02-24 14:23:00 UTC (rev 117365)
@@ -2,11 +2,10 @@
 # $Id$
 
 PortSystem          1.0
-PortGroup           python26 1.0
+PortGroup           python 1.0
 PortGroup           wxWidgets 1.0
-PortGroup           app 1.0
 
-name                py26-pyphant
+name                py-pyphant
 version             1.0b2
 revision            1
 categories-append   science
@@ -25,7 +24,7 @@
                     To implement actual processing steps, Pyphant relies on \
                     third party plug-ins, also referred to as toolboxes, \
                     which extend the basic worker class, e.g. \
-                    py26-pyphant-imageprocessing. \
+                    py-pyphant-imageprocessing. \
                     On top of the core, Pyphant offers a data exchange layer \
                     on basis of numpy arrays which facilitates the \
                     interoperability of the workers and fully supports \
@@ -39,31 +38,9 @@
 license             BSD
 
 platforms           darwin
-depends_lib         port:py26-scipy \
-                    port:py26-setuptools \
-                    port:py26-tables \
-                    port:py26-antlr3 \
-                    port:py26-matplotlib \
-                    port:py26-scientific \
-                    port:py26-wxpython-2.8 \
-                    port:py26-simplejson \
-                    port:py26-paste \
-                    port:py26-mx-base \
-                    port:py26-tornado \
-                    port:py26-configobj \
-                    port:py26-pyphant-fmf \
-                    port:py26-pyphant-imageprocessing \
-                    port:py26-pyphant-osc \
-                    port:py26-pyphant-statistics \
-                    port:py26-pyphant-tools \
-                    port:py26-sogl
 
 # py26-scipy is not universal
 universal_variant   no
-app.name            pyphant
-# app.executable      wxPyphant-2.6
-app.executable      pyphant
-app.icon            ${filespath}/Pyphant.icns
 
 master_sites        sourceforge:pyphant
 # master_sites        http://pyphant.sourceforge.net/nightly-builds/
@@ -76,17 +53,49 @@
 
 use_configure       no
 
+python.versions     26
+
 variant carbon description { Install pyphant with carbon support } {
 
 }
 
-pre-destroot {
-    if {[variant_isset carbon]} {
-        file copy ${filespath}/pyphant.quartz ${destroot}${prefix}/bin
-        file rename ${destroot}${prefix}/bin/pyphant.quartz ${destroot}${prefix}/bin/pyphant
-    } else {
-        file copy ${filespath}/pyphant ${destroot}${prefix}/bin
-        reinplace "s|@APPDIR@|${applications_dir}|" ${destroot}${prefix}/bin/pyphant
+if {${name} ne ${subport}} {
+    PortGroup           app 1.0
+    app.name            pyphant-${python.branch}
+    # app.executable      wxPyphant-2.6
+    app.executable      pyphant-${python.branch}
+    app.icon            ${filespath}/Pyphant.icns
+
+    depends_build       port:py${python.version}-setuptools
+    depends_lib         port:py${python.version}-scipy \
+                        port:py${python.version}-setuptools \
+                        port:py${python.version}-tables \
+                        port:py${python.version}-antlr3 \
+                        port:py${python.version}-matplotlib \
+                        port:py${python.version}-scientific \
+                        port:py${python.version}-wxpython-2.8 \
+                        port:py${python.version}-simplejson \
+                        port:py${python.version}-paste \
+                        port:py${python.version}-mx-base \
+                        port:py${python.version}-tornado \
+                        port:py${python.version}-configobj \
+                        port:py${python.version}-pyphant-fmf \
+                        port:py${python.version}-pyphant-imageprocessing \
+                        port:py${python.version}-pyphant-osc \
+                        port:py${python.version}-pyphant-statistics \
+                        port:py${python.version}-pyphant-tools \
+                        port:py${python.version}-sogl
+
+    pre-destroot {
+        if {[variant_isset carbon]} {
+            file copy ${filespath}/pyphant.quartz ${destroot}${prefix}/bin
+            file rename ${destroot}${prefix}/bin/pyphant.quartz ${destroot}${prefix}/bin/pyphant-${python.branch}
+        } else {
+            file copy ${filespath}/pyphant ${destroot}${prefix}/bin
+            file rename ${destroot}${prefix}/bin/pyphant ${destroot}${prefix}/bin/pyphant-${python.branch}
+            reinplace "s|@APPDIR@|${applications_dir}|" ${destroot}${prefix}/bin/pyphant-${python.branch}
+        }
+        reinplace "s|@PREFIX@|${prefix}|" ${destroot}${prefix}/bin/pyphant-${python.branch}
+        reinplace "s|@PYTHONBRANCH@|${python.branch}|" ${destroot}${prefix}/bin/pyphant-${python.branch}
     }
-    reinplace "s|@PREFIX@|${prefix}|" ${destroot}${prefix}/bin/pyphant
 }

Modified: trunk/dports/python/py-pyphant/files/pyphant
===================================================================
--- trunk/dports/python/py26-pyphant/files/pyphant	2014-02-24 04:57:48 UTC (rev 117361)
+++ trunk/dports/python/py-pyphant/files/pyphant	2014-02-24 14:23:00 UTC (rev 117365)
@@ -1,8 +1,8 @@
 #!/bin/bash
 if [ -x @APPDIR@/X11.app/Contents/MacOS/X11 ]; then
-	open -a @APPDIR@/X11.app/Contents/MacOS/X11 @PREFIX@/bin/wxPyphant-2.6
+	open -a @APPDIR@/X11.app/Contents/MacOS/X11 @PREFIX@/bin/wxPyphant- at PYTHONBRANCH@
 elif [ -x /Applications/Utilities/XQuartz.app/Contents/MacOS/X11 ]; then
-	open -a /Applications/Utilities/XQuartz.app/Contents/MacOS/X11 @PREFIX@/bin/wxPyphant-2.6
+	open -a /Applications/Utilities/XQuartz.app/Contents/MacOS/X11 @PREFIX@/bin/wxPyphant- at PYTHONBRANCH@
 else 
-	open -a /Applications/Utilities/X11.app/Contents/MacOS/X11 @PREFIX@/bin/wxPyphant-2.6
+	open -a /Applications/Utilities/X11.app/Contents/MacOS/X11 @PREFIX@/bin/wxPyphant- at PYTHONBRANCH@
 fi

Modified: trunk/dports/python/py-pyphant/files/pyphant.quartz
===================================================================
--- trunk/dports/python/py26-pyphant/files/pyphant.quartz	2014-02-24 04:57:48 UTC (rev 117361)
+++ trunk/dports/python/py-pyphant/files/pyphant.quartz	2014-02-24 14:23:00 UTC (rev 117365)
@@ -2,4 +2,4 @@
 LOGNAME=`logname`
 export LOGNAME
 cd $HOME
-exec @PREFIX@/bin/wxPyphant-2.6
+exec @PREFIX@/bin/wxPyphant- at PYTHONBRANCH@
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140224/ffe21aa8/attachment.html>


More information about the macports-changes mailing list