Ticket #25562: miriad-4.diff

ports/science/miriad/Portfile

@@ -34 +34 @@
 master_sites http://astro.berkeley.edu/~pkwill/miriad-macport/
 checksums    sha1 5aa26e678efbdb0c893517cf0a9d1f4d20eb66bd
 
+# 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
+}
+
 # We need Fortran support, which the Apple version of GCC doesn't offer.
 # So we force the use of a specified MacPorts-built GCC.
 
 variant gcc43 conflicts gcc44 description {build with gcc 4.3} {}
 variant gcc44 conflicts gcc43 description {build with gcc 4.4} {}
 
+default_variants +gcc44 +ata
+
 if {[variant_isset gcc43]} {
     set compilerport  gcc43
     set compilerident macports-gcc-4.3
 } else {
     set compilerport  gcc44
     set compilerident macports-gcc-4.4
-    default_variants +gcc44
 }
 
 universal_variant    no
@@ -73 +85 @@
 
 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}
 
@@ -92 +98 @@
 
 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
@@ -109 +115 @@
       "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.
-
-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}
-}
+# Miscellaneous variants.
 
 variant debug description {Build with debugging support -- tasks will be very slow} {
     configure.optflags -g -O0