[140980] trunk/dports/science/gate/Portfile

mojca at macports.org mojca at macports.org
Wed Oct 7 02:04:50 PDT 2015


Revision: 140980
          https://trac.macports.org/changeset/140980
Author:   mojca at macports.org
Date:     2015-10-07 02:04:50 -0700 (Wed, 07 Oct 2015)
Log Message:
-----------
gate: clean up (or mess up?) the Qt variants and use the PortGroup rather than dependency on qtN-mac

Modified Paths:
--------------
    trunk/dports/science/gate/Portfile

Modified: trunk/dports/science/gate/Portfile
===================================================================
--- trunk/dports/science/gate/Portfile	2015-10-07 04:54:40 UTC (rev 140979)
+++ trunk/dports/science/gate/Portfile	2015-10-07 09:04:50 UTC (rev 140980)
@@ -11,12 +11,15 @@
 set git_sha         e657ed0c
 set git_date        20150512
 
+# set git_sha         096dbc63
+# set git_date        20150812
+
 # Using GitHub just for the sake of downloadable zips
 PortGroup           github 1.0
 github.setup        OpenGATE Gate ${git_sha}
 name                gate
 version             7.1
-revision            3
+revision            4
 # version           7.1-git-${git_date}-${git_sha}
 
 ## official repository
@@ -37,6 +40,9 @@
 checksums           rmd160  ee946cd1a0962660566ad7eb71a60cd2420fac32 \
                     sha256  bde3ab7bd747f11d3ade0149ef2371a6077a0546120fd98a61ca2c044bef7558
 
+# checksums           rmd160  29824142b32b82e7b6096f4148238e7561410d3c \
+#                     sha256  dc09de04356b9c5173f50fb326fd437f5bb914622e4a953fc6859a0be82786d7
+
 # TODO: take this data from a geant4 portgroup
 set geant.data_versions_10.1 {
     G4NDL              4.5   G4NDL                G4NEUTRONHPDATA
@@ -161,24 +167,44 @@
 }
 
 variant qt4 conflicts qt5 description {Use Geant4 with Qt 4} {
-    depends_lib-append      port:qt4-mac
+    PortGroup qt4 1.0
 }
-variant qt5 conflicts qt4 description {Use Geant4 with Qt 5} {
-    depends_lib-append      port:qt5-mac
+variant qt5 conflicts qt4 description {Use Geant4 with Qt 5 (buggy)} {
+    PortGroup qt5 1.0
 }
 
 default_variants-append     +examples
 
 if {![variant_isset geant4101] && ![variant_isset geant4100]} {
-    default_variants-append +geant4101  
+    default_variants-append +geant4101
 }
-if {![variant_isset qt4] && ![variant_isset qt5]} {
-    # TODO: determine this automatically based on what variant is used by Geant4
-    default_variants-append +qt4
+
+# some ugly code to make sure that the variants for Qt version used
+# are consistent between Gate and Geant4; looking for suggestions for improvement
+if {[variant_isset geant4101]} {
+    if {![catch {set result [active_variants geant4.10.1 qt5 qt4]}]} {
+        if {$result} {
+            default_variants-append +qt5
+        } else {
+            default_variants-append +qt4
+        }
+    }
+    if {[variant_isset qt4]} {
+        require_active_variants geant4.10.1 qt
+    } elseif {[variant_isset qt5]} {
+        require_active_variants geant4.10.1 qt5
+    }
+} elseif {[variant_isset geant4100]} {
+    if {![catch {set result [active_variants geant4.10.0 qt5 qt4]}]} {
+        if {$result} {
+            default_variants-append +qt5
+        } else {
+            default_variants-append +qt4
+        }
+    }
+    if {[variant_isset qt4]} {
+        require_active_variants geant4.10.0 qt
+    } elseif {[variant_isset qt5]} {
+        require_active_variants geant4.10.0 qt5
+    }
 }
-if {[variant_isset qt4]} {
-    # TODO: how to implement this properly?
-    # require_active_variants ${geant.port_name} qt
-} elseif {[variant_isset qt5]} {
-    # require_active_variants ${geant.port_name} qt5
-}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20151007/8602c77e/attachment-0001.html>


More information about the macports-changes mailing list