[34774] trunk/dports/mail/mutt-devel/Portfile

jmr at macports.org jmr at macports.org
Tue Mar 4 19:10:45 PST 2008


Revision: 34774
          http://trac.macosforge.org/projects/macports/changeset/34774
Author:   jmr at macports.org
Date:     2008-03-04 19:10:44 -0800 (Tue, 04 Mar 2008)

Log Message:
-----------
mutt-devel: variants cleanup.
Add descriptions, use 'conflicts' metadata (may be incomplete), remove
obsolete 'buffy' variant (see the $check_mbox_size option), disable the
'checkseen' variant until such time as a working patch_site is found for it.

Modified Paths:
--------------
    trunk/dports/mail/mutt-devel/Portfile

Modified: trunk/dports/mail/mutt-devel/Portfile
===================================================================
--- trunk/dports/mail/mutt-devel/Portfile	2008-03-04 22:16:22 UTC (rev 34773)
+++ trunk/dports/mail/mutt-devel/Portfile	2008-03-05 03:10:44 UTC (rev 34774)
@@ -35,24 +35,29 @@
                 --with-docdir=${prefix}/share/doc/mutt \
                 --with-libiconv-prefix=${prefix}
 
-variant idn {
+if {![variant_isset gdbm] && ![variant_isset qdbm]} {
+        variant_set db4
+}
+
+variant idn description {Internationalized Domain Name support} {
     configure.args-append   --with-idn=${prefix}
     depends_lib-append      port:libidn port:zlib
 }
 
-variant pop { configure.args-append --enable-pop }
-variant imap    { configure.args-append --enable-imap }
-variant ssl { configure.args-append --with-ssl
+variant pop description {POP support} { configure.args-append --enable-pop }
+variant imap description {IMAP support} { configure.args-append --enable-imap }
+variant ssl description {Secure Sockets Layer support} {
+                configure.args-append --with-ssl
                 depends_lib-append port:openssl }
-variant sasl { configure.args-append --with-sasl
+variant sasl description {Simple Authentication and Security Layer support} {
+                configure.args-append --with-sasl
                 depends_lib-append port:cyrus-sasl2 }
-variant debug   { configure.args-append --enable-debug }
-# use file size attribute instead of access time
-variant buffy { configure.args-append --enable-buffy-size }
+variant debug description {Debugging support} { configure.args-append --enable-debug }
 
-variant gnuregex { configure.args-append --with-regex }
+variant gnuregex description {Use the GNU regular expression library} {
+        configure.args-append --with-regex }
 
-variant compress {
+variant compress description {Compressed folders} {
     configure.args-append   --enable-compressed
     patch_sites-append      http://www.spinnaker.de/mutt/compressed/
     patchfiles-append       patch-1.5.17.rr.compressed.1.gz
@@ -60,39 +65,29 @@
                                 2673a3d1a7289018b38d490192cc2825
 }
 
-if {[variant_isset gdbm]} {
-        variant_unset db4
-        variant_unset qdbm
-} elseif {[variant_isset qdbm]} {
-        variant_unset db4
-        variant_unset gdbm
-} else {
-        variant_set db4
-}
-
-variant headercache {
+variant headercache description {Enable header caching} {
     configure.args-append   --enable-hcache
     configure.ldflags-append    "-L/usr/lib"
 }
 
-variant qdbm {
+variant qdbm conflicts db4 gdbm description {Use QDBM database} {
         depends_build-append    port:qdbm
         configure.args-append   --enable-qdbm --without-bdb --without-gdbm
 }
 
-variant gdbm {
+variant gdbm conflicts db4 qdbm description {Use GNU dbm database} {
         depends_build-append    port:gdbm
         configure.args-append   --enable-gdbm --without-bdb --without-qdbm
 }
 
-variant db4 {
+variant db4 conflicts qdbm gdbm description {Use Berkeley DB database} {
         depends_lib-append      port:db44
         configure.args-append   --enable-bdb --without-qdbm --without-gdbm
         configure.cppflags-append    "-I${prefix}/include/db44"
 	configure.ldflags-append     "-L${prefix}/lib/db44"
 }
 
-variant nntp {
+variant nntp description {NNTP support} {
     configure.args-append   --enable-nntp
     patch_sites-append      http://www.mutt.org.ua/download/mutt-1.5.17/
     patchfiles-append       patch-1.5.17.rr.compressed.gz
@@ -100,7 +95,7 @@
                     4f8edaa937d308d80f0f585b1c7fe47c
 }
 
-variant deepif {
+variant deepif description {Allow nested if-else sequences in strings} {
     patch_sites-append  http://home.uchicago.edu/~dgc/sw/mutt/
     patchfiles-append   patch-1.5.1.dgc.deepif.1
     checksums-append    patch-1.5.1.dgc.deepif.1 md5 \
@@ -108,14 +103,15 @@
 }
 
 # whoa! messy FAIL
-#variant unbind conflicts {
+#variant unbind description {Undo stroke and macro bindings} {
 #   patch_sites-append http://home.uchicago.edu/~dgc/sw/mutt/
 #   patchfiles-append patch-1.5.1.dgc.unbind.1
 #   checksums-append    patch-1.5.1.dgc.unbind.1 md5 \
 #                   067f4702e17e0a80322b940bf206690d
 #}
 
-variant date_conditional requires deepif {
+variant date_conditional requires deepif description \
+        {Allow the format of dates in the index to vary based on how recent the message is} {
 # original, but now dgc hosts it with -p1
 #   patch_sites-append http://www.schrab.com/aaron/mutt/
     patch_sites-append http://home.uchicago.edu/~dgc/sw/mutt/
@@ -124,26 +120,26 @@
                     83479a011390802b3f9f1c0f95b15199
 }
 
-variant xlabel {
+variant xlabel description {Custom message-tagging - X-Label:} {
     patch_sites-append  http://home.uchicago.edu/~dgc/sw/mutt/
     patchfiles-append   patch-1.5.14.dgc.xlabel_ext.9
     checksums-append    patch-1.5.14.dgc.xlabel_ext.9 md5 \
                         c5badc733020187b6677f31b343195e8
 }
 
-variant checkseen {
-        patch_sites-append  http://www.neuronix.cz/coding/mutt_imap/
-        patchfiles-append   imap_checkseen_1.5.11.patch
-        checksums-append    imap_checkseen_1.5.11.patch md5 \
-            37e49d7203149027e30e28a7bc74c365
-}
+# patch_site appears to be dead, can re-enable the variant if a working one is found
+#variant checkseen {
+#        patch_sites-append  http://www.neuronix.cz/coding/mutt_imap/
+#        patchfiles-append   imap_checkseen_1.5.11.patch
+#        checksums-append    imap_checkseen_1.5.11.patch md5 \
+#            37e49d7203149027e30e28a7bc74c365
+#}
 
-variant smtp {
-# Include internal SMTP relay support
+variant smtp description {Include internal SMTP relay support} {
         configure.args-append --enable-smtp
 }
 
-variant trash {
+variant trash description {Add a Trash folder} {
     patchfiles-append patch-trash-1.5.16.diff \
                       patch-1.5.17.cd.purge_message.bk.1.diff
 }

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20080304/0d3215bf/attachment.html 


More information about the macports-changes mailing list