<!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>[125400] trunk/dports/mail/imap-uw</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/125400">125400</a></dd>
<dt>Author</dt> <dd>mf2k@macports.org</dd>
<dt>Date</dt> <dd>2014-09-16 14:28:51 -0700 (Tue, 16 Sep 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>imap-uw: Update to version 2007f. Improve subdir variant description. (#44811)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsmailimapuwPortfile">trunk/dports/mail/imap-uw/Portfile</a></li>
<li><a href="#trunkdportsmailimapuwfilespatchenv_unixcdiff">trunk/dports/mail/imap-uw/files/patch-env_unix.c.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsmailimapuwPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/mail/imap-uw/Portfile (125399 => 125400)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/mail/imap-uw/Portfile 2014-09-16 21:25:19 UTC (rev 125399)
+++ trunk/dports/mail/imap-uw/Portfile 2014-09-16 21:28:51 UTC (rev 125400)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx"> PortSystem 1.0
</span><span class="cx">
</span><span class="cx"> name imap-uw
</span><del>-version 2007e
</del><ins>+version 2007f
</ins><span class="cx"> categories mail
</span><span class="cx"> license Apache-2
</span><span class="cx"> maintainers nomaintainer
</span><span class="lines">@@ -21,8 +21,8 @@
</span><span class="cx">
</span><span class="cx"> distname imap-${version}
</span><span class="cx"> extract.suffix .tar.Z
</span><del>-checksums sha1 24c63cad8d0e74aa76e4341fcfa54d24f23a8c70 \
- rmd160 7d6af203419975f763d7ec17b6a4544c94490b50
</del><ins>+checksums rmd160 14f40284e9e164c0ed7677f1e5d8e3309c7c58c1 \
+ sha256 870e95f6bd19265832a88fd89b77c54c841c59022fd21e69254050c8b1005e3c
</ins><span class="cx">
</span><span class="cx"> depends_lib port:openssl port:gss
</span><span class="cx">
</span><span class="lines">@@ -81,7 +81,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> # Variant to set the default mail subdirectory name to "Mail"
</span><del>-variant subdir description { set "Mail" as subdirectory name } {
</del><ins>+variant subdir description { set the contents of ~/.imap/MailboxDir.rc or else "Mail" as subdirectory name } {
</ins><span class="cx"> patchfiles-append patch-env_unix.c.diff
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkdportsmailimapuwfilespatchenv_unixcdiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/mail/imap-uw/files/patch-env_unix.c.diff (125399 => 125400)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/mail/imap-uw/files/patch-env_unix.c.diff 2014-09-16 21:25:19 UTC (rev 125399)
+++ trunk/dports/mail/imap-uw/files/patch-env_unix.c.diff 2014-09-16 21:28:51 UTC (rev 125400)
</span><span class="lines">@@ -1,11 +1,56 @@
</span><del>---- src/osdep/unix/env_unix.c-orig Wed Nov 5 17:09:13 2003
-+++ src/osdep/unix/env_unix.c Wed Nov 5 17:11:16 2003
-@@ -68,7 +68,7 @@
</del><ins>+--- src/osdep/unix/env_unix.c.orig 2011-07-23 02:20:10.000000000 +0200
++++ src/osdep/unix/env_unix.c 2014-08-29 22:53:25.000000000 +0200
+@@ -28,6 +28,10 @@
+ #include <signal.h>
+ #include <sys/wait.h>
+
++#include <stdio.h>
++#include <string.h>
++#include <sys/param.h>
++
+
+ /* in case stat.h is ancient */
+
+@@ -66,7 +70,7 @@
</ins><span class="cx"> static char *myServerName = NIL;/* server name */
</span><span class="cx"> static char *myLocalHost = NIL; /* local host name */
</span><span class="cx"> static char *myNewsrc = NIL; /* newsrc file name */
</span><span class="cx"> -static char *mailsubdir = NIL; /* mailbox subdirectory name */
</span><del>-+static char *mailsubdir = "Mail"; /* mailbox subdirectory name */
</del><ins>++static char *mailsubdir = ((char*)-1); /* mailbox subdirectory name */
</ins><span class="cx"> static char *sysInbox = NIL; /* system inbox name */
</span><span class="cx"> static char *newsActive = NIL; /* news active file */
</span><span class="cx"> static char *newsSpool = NIL; /* news spool */
</span><ins>+@@ -965,7 +969,32 @@
+ char *home = myhomedir ();
+ /* initialize if first time */
+ if (!myMailboxDir && myHomeDir) {
+- if (mailsubdir) {
++ if (mailsubdir == ((char*)-1) ) {
++ char *rcfile = NULL;
++ FILE *fp;
++ asprintf( &rcfile, "%s/.imap/MailboxDir.rc", home );
++ if( rcfile && (fp = fopen( rcfile, "r" )) ){
++ char dirnm[MAXPATHLEN];
++ if( fgets( dirnm, MAXPATHLEN, fp ) > 0 ){
++ if( dirnm[strlen(dirnm)-1] == '\n' ){
++ dirnm[strlen(dirnm)-1] = '\0';
++ }
++ myMailboxDir = cpystr(dirnm);
++ snprintf( dirnm, MAXPATHLEN, "Mailbox dir set to %s", myMailboxDir );
++ MM_LOG( dirnm, WARN );
++ }
++ fclose(fp);
++ }
++ if( rcfile ){
++ free(rcfile);
++ }
++ if( !myMailboxDir ){
++ mailsubdir = "Mail";
++ goto useMail;
++ }
++ }
++ else if (mailsubdir) {
++useMail:;
+ char tmp[MAILTMPLEN];
+ sprintf (tmp,"%s/%s",home,mailsubdir);
+ myMailboxDir = cpystr (tmp);/* use pre-defined subdirectory of home */
</ins></span></pre>
</div>
</div>
</body>
</html>