<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[129759] trunk/dports/mail/cyrus-imapd</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/129759">129759</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2014-12-19 15:59:34 -0800 (Fri, 19 Dec 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>cyrus-imapd: update to version 2.4.17, use perl5.16 instead of perl5.12, use add_users, variant descriptions (#44405, #44797).</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsmailcyrusimapdPortfile">trunk/dports/mail/cyrus-imapd/Portfile</a></li>
<li><a href="#trunkdportsmailcyrusimapdfilespatchdepotMakefileindiff">trunk/dports/mail/cyrus-imapd/files/patch-depot-Makefile.in.diff</a></li>
<li><a href="#trunkdportsmailcyrusimapdfilespatchlibcharsetcdiff">trunk/dports/mail/cyrus-imapd/files/patch-lib-charset.c.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsmailcyrusimapdPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/mail/cyrus-imapd/Portfile (129758 => 129759)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/mail/cyrus-imapd/Portfile 2014-12-19 23:31:10 UTC (rev 129758)
+++ trunk/dports/mail/cyrus-imapd/Portfile 2014-12-19 23:59:34 UTC (rev 129759)
</span><span class="lines">@@ -4,9 +4,8 @@
</span><span class="cx"> PortSystem 1.0
</span><span class="cx">
</span><span class="cx"> name cyrus-imapd
</span><del>-version 2.3.18
-revision 3
-set perl_version 5.12
</del><ins>+version 2.4.17
+set perl_version 5.16
</ins><span class="cx"> categories mail
</span><span class="cx"> platforms darwin
</span><span class="cx"> license BSD-old
</span><span class="lines">@@ -19,10 +18,11 @@
</span><span class="cx"> homepage http://cyrusimap.org/
</span><span class="cx"> master_sites ftp://ftp.cyrusimap.org/cyrus-imapd/
</span><span class="cx">
</span><del>-checksums rmd160 b9d351b5c73c4e87019fb8aa0efd0a8a29ac6a40 \
- sha256 7724959d49191b993ef387c31a0ea7d30f1df7d255e73dff0b7887eff679ce5a
</del><ins>+checksums rmd160 c28e971515130eea23067b7015047a120edba86f \
+ sha256 b3e30052c764ee7163947ffde27bdd58bd4dd2e5697ad144491941e46300a583
</ins><span class="cx">
</span><span class="cx"> depends_build port:makedepend
</span><ins>+
</ins><span class="cx"> depends_lib port:perl${perl_version} \
</span><span class="cx"> port:cyrus-sasl2 \
</span><span class="cx"> port:db44 \
</span><span class="lines">@@ -31,9 +31,17 @@
</span><span class="cx"> patchfiles patch-depot-Makefile.in.diff \
</span><span class="cx"> patch-lib-charset.c.diff
</span><span class="cx">
</span><ins>+post-patch {
+ foreach dir {contrib contrib/cyrus-graphtools.1.0/cgi-bin contrib/cyrus-graphtools.1.0/script perl/imap/examples perl/sieve/scripts tools} {
+ eval reinplace "s|^#!.*perl|#!${prefix}/bin/perl${perl_version}|" [glob -d ${worksrcpath}/${dir} *.pl]
+ }
+}
+
</ins><span class="cx"> # wrong number of arguments at (eval 1) line 41, <DATA> line 256.
</span><span class="cx"> configure.ccache no
</span><span class="cx">
</span><ins>+configure.perl ${prefix}/bin/perl${perl_version}
+
</ins><span class="cx"> configure.args --mandir=${prefix}/share/man \
</span><span class="cx"> --sysconfdir=${prefix}/etc/cyrus \
</span><span class="cx"> --with-cyrus-prefix=${prefix} \
</span><span class="lines">@@ -45,8 +53,6 @@
</span><span class="cx"> --with-openssl=${prefix} \
</span><span class="cx"> --with-cyrus-user=cyrus \
</span><span class="cx"> --with-cyrus-group=mail \
</span><del>- --with-auth=unix \
- --enable-listext \
</del><span class="cx"> --enable-cmulocal \
</span><span class="cx"> --enable-netscapehack \
</span><span class="cx"> --with-snmp=no \
</span><span class="lines">@@ -62,12 +68,9 @@
</span><span class="cx"> if \[ -f \${pidfile} \]; then
</span><span class="cx"> kill -TERM \$(cat \${pidfile})
</span><span class="cx"> fi"
</span><ins>+
</ins><span class="cx"> post-destroot {
</span><del>- set uid [nextuid]
- set gid [nextgid]
- adduser cyrus realname=Cyrus\ User uid=${uid} gid=${gid} home=${prefix}/var/imap \
- shell=/usr/bin/false passwd="\*"
- addgroup mail gid=${gid} users=cyrus
</del><ins>+ add_users cyrus group=cyrus home=${prefix}/var/imap shell=/usr/bin/false passwd="\*"
</ins><span class="cx"> xinstall -m 755 -v ${worksrcpath}/tools/mkimap ${destroot}${prefix}/bin
</span><span class="cx"> reinplace "s|/etc/imapd.conf|${prefix}/etc/cyrus/imapd.conf|" ${destroot}${prefix}/bin/mkimap
</span><span class="cx"> xinstall -m 755 -v ${worksrcpath}/tools/mknewsgroups ${destroot}${prefix}/bin
</span><span class="lines">@@ -88,17 +91,22 @@
</span><span class="cx"> eval delete [glob ${destroot}${prefix}/lib/perl5/*/*/perllocal.pod]
</span><span class="cx"> }
</span><span class="cx">
</span><del>-platform powerpc { configure.args-append --build=powerpc }
</del><ins>+platform powerpc {
+ configure.args-append --build=powerpc
+}
</ins><span class="cx">
</span><del>-variant murder { configure.args-append --enable-murder }
</del><ins>+variant murder description {Enable IMAP Murder support} {
+ configure.args-append --enable-murder
+}
</ins><span class="cx">
</span><del>-platform i386 { configure.args-append --build=i386 }
</del><ins>+platform i386 {
+ configure.args-append --build=i386
+}
</ins><span class="cx">
</span><del>-variant snmp {
-# snmp support is currently broken
- depends_lib-append port:net-snmp
- configure.args-delete --with-snmp=no
- configure.args-append --with-snmp=yes
</del><ins>+variant snmp description {Use Net SNMP (currently broken)} {
+ depends_lib-append port:net-snmp
+ configure.args-delete --with-snmp=no
+ configure.args-append --with-snmp=yes
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> livecheck.type regex
</span></span></pre></div>
<a id="trunkdportsmailcyrusimapdfilespatchdepotMakefileindiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/mail/cyrus-imapd/files/patch-depot-Makefile.in.diff (129758 => 129759)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/mail/cyrus-imapd/files/patch-depot-Makefile.in.diff 2014-12-19 23:31:10 UTC (rev 129758)
+++ trunk/dports/mail/cyrus-imapd/files/patch-depot-Makefile.in.diff 2014-12-19 23:59:34 UTC (rev 129759)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><del>---- depot/Makefile.in.orig Wed Jun 29 23:50:51 2005
-+++ depot/Makefile.in Wed Jun 29 23:55:49 2005
-@@ -64,10 +64,10 @@
</del><ins>+--- depot/Makefile.in.orig 2012-12-01 11:57:54.000000000 -0800
++++ depot/Makefile.in 2014-12-19 12:18:17.000000000 -0800
+@@ -68,10 +68,10 @@
</ins><span class="cx"> all:
</span><span class="cx">
</span><span class="cx"> install:
</span></span></pre></div>
<a id="trunkdportsmailcyrusimapdfilespatchlibcharsetcdiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/mail/cyrus-imapd/files/patch-lib-charset.c.diff (129758 => 129759)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/mail/cyrus-imapd/files/patch-lib-charset.c.diff 2014-12-19 23:31:10 UTC (rev 129758)
+++ trunk/dports/mail/cyrus-imapd/files/patch-lib-charset.c.diff 2014-12-19 23:59:34 UTC (rev 129759)
</span><span class="lines">@@ -1,12 +1,11 @@
</span><del>-charset.c:864:13: error: void function 'mimeheader_cat' should not return a value [-Wreturn-type]
---- lib/charset.c.orig 2011-10-04 14:59:14.000000000 -0500
-+++ lib/charset.c 2014-03-30 01:45:25.000000000 -0500
-@@ -861,7 +861,7 @@
- int len;
</del><ins>+--- lib/charset.c.orig 2012-12-01 11:57:54.000000000 -0800
++++ lib/charset.c 2014-12-19 12:18:18.000000000 -0800
+@@ -761,7 +761,7 @@
+ struct convert_rock *input, *tobuffer;
</ins><span class="cx"> char *res;
</span><span class="cx">
</span><span class="cx"> - if (!s) return 0;
</span><del>-+ if (!s) return;
</del><ins>++ if (!s) return (char *) 0;
</ins><span class="cx">
</span><del>- /* set up the conversion path */
- input = table_init(0, target);
</del><ins>+ if (charset < 0 || charset >= chartables_num_charsets)
+ return xstrdup("X");
</ins></span></pre>
</div>
</div>
</body>
</html>