[69573] trunk/dports/science/miriad/Portfile

[ryandesign at macports.org]

Revision: 69573
          http://trac.macports.org/changeset/69573
Author:   ryandesign at macports.org
Date:     2010-07-10 02:37:22 -0700 (Sat, 10 Jul 2010)
Log Message:
-----------
miriad: rework the telescope selection, including adding a (default) ata variant; this behavior was the default before anyway. See #25562

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

Modified: trunk/dports/science/miriad/Portfile
===================================================================
--- trunk/dports/science/miriad/Portfile	2010-07-10 09:23:26 UTC (rev 69572)
+++ trunk/dports/science/miriad/Portfile	2010-07-10 09:37:22 UTC (rev 69573)
@@ -35,6 +35,18 @@
 checksums    sha1    5aa26e678efbdb0c893517cf0a9d1f4d20eb66bd \
              rmd160  a53493e4b6b63591208e2efc12cbce7d025b8885
 
+# Telescope/buffer size selection.
+
+variant ata conflicts carma description {use buffer sizes appropriate to ATA data} {}
+variant carma conflicts ata description {use buffer sizes appropriate to CARMA data} {}
+
+if {[variant_isset carma]} {
+    set thescope carma
+} else {
+    set thescope ata
+    default_variants +ata
+}
+
 # We need Fortran support, which the Apple version of GCC doesn't offer.
 # So we force the use of a specified MacPorts-built GCC.
 
@@ -74,17 +86,11 @@
 
 worksrcdir      ${name}-${relver}
 
-# I'm writing the Portfile and I use the ATA, so the default telescope
-# is the ATA too. Privileges of maintainership.
-
-set defaultscope ata
-set thescope ${defaultscope}
-
 # Configure settings. Keep the binaries out of ${prefix}/bin to avoid
 # possible conflicts. The automiriad scripts will deal with this correctly.
 
 configure.args  --bindir=${prefix}/libexec/miriad \
-                --with-telescope=${defaultscope} \
+                --with-telescope=${thescope} \
                 --disable-docs
 configure.compiler ${compilerident}
 
@@ -93,9 +99,9 @@
 
 pre-configure {
     ui_msg "Configuring MIRIAD with telescope parameter of \"${thescope}\"."
-    ui_msg "Consult the port variants to use a different setting. The default"
-    ui_msg "is \"${defaultscope}\". If there's no variant for your desired"
-    ui_msg "telescope, contact the port maintainer and one will be quickly added."
+    ui_msg "Consult the port variants to use a different setting. If there's"
+    ui_msg "no variant for your desired telescope, contact the port maintainer"
+    ui_msg "and one will be quickly added."
 }
 
 # Little helpful message. We could consider adding a patch to install
@@ -110,14 +116,8 @@
       "You can put this command in your .profile or other shell initialization " \
       "files to have your shells automatically set up to use MIRIAD."
 
-# Variants. We can easily add more telescope variants as requested.
+# Miscellaneous variants.
 
-variant carma description {Use buffer sizes appropriate to CARMA data} {
-    set thescope carma
-    configure.args-delete --with-telescope=${defaultscope}
-    configure.args-append --with-telescope=${thescope}
-}
-
 variant debug description {Build with debugging support -- tasks will be very slow} {
     configure.optflags -g -O0
     configure.args-append --enable-warnings
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100710/fb6e282b/attachment.html>