[75224] trunk/dports/mail/mutt-devel

[yeled at macports.org]

Revision: 75224
          http://trac.macports.org/changeset/75224
Author:   yeled at macports.org
Date:     2011-01-18 06:03:23 -0800 (Tue, 18 Jan 2011)
Log Message:
-----------
update to latest; fixes #26487 but breaks +sidebar for now

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

Removed Paths:
-------------
    trunk/dports/mail/mutt-devel/files/patch-1.5.20.mutt_ssl.diff
    trunk/dports/mail/mutt-devel/files/patch-1.5.20.unmailboxes.diff

Modified: trunk/dports/mail/mutt-devel/Portfile
===================================================================
--- trunk/dports/mail/mutt-devel/Portfile	2011-01-18 14:02:40 UTC (rev 75223)
+++ trunk/dports/mail/mutt-devel/Portfile	2011-01-18 14:03:23 UTC (rev 75224)
@@ -3,8 +3,7 @@
 PortSystem          1.0
 
 name                mutt-devel
-version             1.5.20
-revision            6
+version             1.5.21
 categories          mail
 platforms           darwin
 maintainers         nomaintainer
@@ -22,9 +21,9 @@
 master_sites        ftp://ftp.mutt.org/mutt/devel/
 distname            mutt-${version}
 checksums           ${distfiles} \
-                    md5     027cdd9959203de0c3c64149a7ee351c \
-                    sha1    d2bec7a33771f128ca49b1723b06b6d248a35d31 \
-                    rmd160  df582f79364b9fd70a0001e76a119d8f78275ebb
+                    md5     a29db8f1d51e2f10c070bf88e8a553fd \
+                    sha1    a8475f2618ce5d5d33bff85c0affdf21ab1d76b9 \
+                    rmd160  b235a42972ae410592253cdc117a90baf279f47a
 
 depends_lib         port:gettext \
                     port:libiconv \
@@ -41,8 +40,6 @@
 default_variants    +pop +imap
 
 
-patchfiles-append   patch-1.5.20.unmailboxes.diff
-
 if {![variant_isset db4] && ![variant_isset qdbm] && ![variant_isset tokyocabinet]} {
         variant_set gdbm
 }
@@ -59,7 +56,6 @@
     configure.args-append   --enable-imap
 }
 variant ssl description {Secure Sockets Layer support} {
-    patchfiles-append       patch-1.5.20.mutt_ssl.diff
     configure.args-append   --with-ssl=${prefix}
     depends_lib-append      port:openssl
 }
@@ -78,12 +74,10 @@
 
 variant compress description {Compressed folders} {
     configure.args-append   --enable-compressed
-    patch_sites-append      http://www.mutt.org.ua/download/mutt-1.5.20/
-    patchfiles-append       patch-1.5.20.rr.compressed.gz
-    checksums-append        patch-1.5.20.rr.compressed.gz md5 \
-                                5e608027bda1fddc2bc38c03a560f0a9
-    # see ticket #21589
-    patchfiles-append       patch-compress-1.5.20.diff
+    patch_sites-append      http://www.mutt.org.ua/download/mutt-1.5.21/
+    patchfiles-append       patch-1.5.21.rr.compressed.gz
+    checksums-append        patch-1.5.21.rr.compressed.gz md5 \
+                                0632fd94c96b3e452144b730e3cf0fd3
 }
 
 variant headercache conflicts db4 description {Enable header caching (requires gdbm, qdbm, or tokyocabinet)} {
@@ -116,10 +110,10 @@
 # The patches for nntp and sidebar conflict, see ticket #15135
 variant nntp conflicts sidebar description {NNTP support} {
     configure.args-append   --enable-nntp
-    patch_sites-append      http://www.mutt.org.ua/download/mutt-1.5.20/
-    patchfiles-append       patch-1.5.20.vvv.nntp.gz
-    checksums-append        patch-1.5.20.vvv.nntp.gz md5 \
-                                80355166f8ae9bff064124f2d2e6870f
+    patch_sites-append      http://www.mutt.org.ua/download/mutt-1.5.21/
+    patchfiles-append       patch-1.5.21.vvv.nntp.gz
+    checksums-append        patch-1.5.21.vvv.nntp.gz md5 \
+                                afcf40f7e53a016b953cbf6af27b3cd8
 }
 
 variant deepif description {Allow nested if-else sequences in strings} {

Deleted: trunk/dports/mail/mutt-devel/files/patch-1.5.20.mutt_ssl.diff
===================================================================
--- trunk/dports/mail/mutt-devel/files/patch-1.5.20.mutt_ssl.diff	2011-01-18 14:02:40 UTC (rev 75223)
+++ trunk/dports/mail/mutt-devel/files/patch-1.5.20.mutt_ssl.diff	2011-01-18 14:03:23 UTC (rev 75224)
@@ -1,19 +0,0 @@
-diff --git a/PATCHES b/PATCHES
-index e69de29..12d07af 100644
---- a/PATCHES
-+++ b/PATCHES
-@@ -0,0 +1 @@
-+patch-1.5.20.mutt_ssl.diff
-diff --git a/mutt_ssl.c b/mutt_ssl.c
-index cb1b0cc..7490200 100644
---- a/mutt_ssl.c
-+++ b/mutt_ssl.c
-@@ -652,7 +652,7 @@ static int check_host (X509 *x509cert, const char *hostname, char *err, size_t e
-   char *buf = NULL;
-   int bufsize;
-   /* needed to get the DNS subjectAltNames: */
--  STACK *subj_alt_names;
-+  STACK_OF(GENERAL_NAME) *subj_alt_names;
-   int subj_alt_names_count;
-   GENERAL_NAME *subj_alt_name;
-   /* did we find a name matching hostname? */

Deleted: trunk/dports/mail/mutt-devel/files/patch-1.5.20.unmailboxes.diff
===================================================================
--- trunk/dports/mail/mutt-devel/files/patch-1.5.20.unmailboxes.diff	2011-01-18 14:02:40 UTC (rev 75223)
+++ trunk/dports/mail/mutt-devel/files/patch-1.5.20.unmailboxes.diff	2011-01-18 14:03:23 UTC (rev 75224)
@@ -1,10 +0,0 @@
---- a/buffy.c
-+++ b/buffy.c
-@@ -236,7 +236,6 @@
-     {
-       if(*tmp)
-       {
--        FREE (&((*tmp)->path));
-         tmp1=(*tmp)->next;
-         FREE (tmp);		/* __FREE_CHECKED__ */
-         *tmp=tmp1;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110118/e610b651/attachment-0001.html>