Revision: 132668 https://trac.macports.org/changeset/132668 Author: cal@macports.org Date: 2015-02-06 15:12:43 -0800 (Fri, 06 Feb 2015) Log Message: ----------- mutt-devel: pre-configure to use MacPorts root CA store, disable silent rules, resolve conflict with signing-party, fix tokyocabinet configure arg Modified Paths: -------------- trunk/dports/mail/mutt-devel/Portfile Added Paths: ----------- trunk/dports/mail/mutt-devel/files/patch-doc__Muttrc.head-preseed-macports-CA-store.diff Modified: trunk/dports/mail/mutt-devel/Portfile =================================================================== --- trunk/dports/mail/mutt-devel/Portfile 2015-02-06 22:52:13 UTC (rev 132667) +++ trunk/dports/mail/mutt-devel/Portfile 2015-02-06 23:12:43 UTC (rev 132668) @@ -6,6 +6,7 @@ name mutt-devel conflicts mutt version 1.5.23 +revision 1 categories mail platforms darwin license GPL-2 @@ -25,6 +26,8 @@ port:libiconv \ port:ncurses +depends_run path:share/curl/curl-ca-bundle.crt:curl-ca-bundle + master_sites https://bitbucket.org/mutt/mutt/downloads/ distname mutt-${version} checksums ${distfiles} \ @@ -40,12 +43,20 @@ patchfiles-append patch-thunderbird-fix.diff # Fix smime_keys patchfiles-append patch-smime_keys.diff +# Set defaults for MacPorts root CA stores +patchfiles-append patch-doc__Muttrc.head-preseed-macports-CA-store.diff +post-patch { + reinplace -E "s,@CA_PATH@,${prefix}/share/curl/curl-ca-bundle-crt,g" \ + ${worksrcpath}/doc/Muttrc.head +} + configure.args --disable-warnings \ --mandir=${prefix}/share/man \ --with-docdir=${prefix}/share/doc/mutt \ --with-libiconv-prefix=${prefix} \ - --with-curses=${prefix} + --with-curses=${prefix} \ + --disable-silent-rules default_variants +pop +imap @@ -58,6 +69,13 @@ use_autoreconf yes } +post-destroot { + # delete pgpring to avoid a conflict with signing-party + delete ${destroot}${prefix}/bin/pgpring ${destroot}${prefix}/share/man/man1/pgpring.1 + # delete horribly outdated ca bundle, I hope people weren't using that! + delete ${destroot}${prefix}/share/doc/mutt/samples/ca-bundle.crt +} + variant idn description {Internationalized Domain Name support} { configure.args-append --with-idn=${prefix} depends_lib-append port:libidn port:zlib @@ -127,7 +145,7 @@ variant tokyocabinet conflicts db4 gdbm qdbm description {Use Tokyo Cabinet database} { depends_lib-append port:tokyocabinet - configure.args-append --enable-tokyocabinet \ + configure.args-append --with-tokyocabinet \ --without-bdb \ --without-gdbm \ --without-qdbm @@ -205,5 +223,7 @@ md5 6faa84e2520dad7c603e8a8b9e0a9b30 } +notes "This port no longer installs the pgpring binary. Please install the signing-party port if you need it." + livecheck.type regex livecheck.regex {Mutt (\d+(?:\.\d+)*) was released} Added: trunk/dports/mail/mutt-devel/files/patch-doc__Muttrc.head-preseed-macports-CA-store.diff =================================================================== --- trunk/dports/mail/mutt-devel/files/patch-doc__Muttrc.head-preseed-macports-CA-store.diff (rev 0) +++ trunk/dports/mail/mutt-devel/files/patch-doc__Muttrc.head-preseed-macports-CA-store.diff 2015-02-06 23:12:43 UTC (rev 132668) @@ -0,0 +1,24 @@ +Set sane defaults for the root certificate stores in MacPorts + +This patch just adds placeholders; the correct paths will be added by the +Portfile, because they are installation-specific and depend on ${prefix}. The +file can either be provided by curl-ca-bundle maintained with curl, or be +generated from the system keychain using certsync. + +Upstream-Status: Inappropriate [configuration] +Signed-off-by: Clemens Lang <cal@macports.org> +--- ./doc/Muttrc.head.orig 2014-03-12 17:03:44.000000000 +0100 ++++ ./doc/Muttrc.head 2014-03-12 17:03:44.000000000 +0100 +@@ -97,6 +97,12 @@ + attachments -I message/external-body + + ## ++## MacPorts-specific configuration to seed the trust store ++## ++set ssl_ca_certificates_file="@CA_PATH@" ++set smime_ca_location="@CA_PATH@" ++ ++## + ## More settings + ## +