<!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>[139862] trunk/base/portmgr/jobs/port_binary_distributable.tcl</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/139862">139862</a></dd>
<dt>Author</dt> <dd>jmr@macports.org</dd>
<dt>Date</dt> <dd>2015-08-30 04:45:34 -0700 (Sun, 30 Aug 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>set conflicts for cc-by and cc-by-sa</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbaseportmgrjobsport_binary_distributabletcl">trunk/base/portmgr/jobs/port_binary_distributable.tcl</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbaseportmgrjobsport_binary_distributabletcl"></a>
<div class="modfile"><h4>Modified: trunk/base/portmgr/jobs/port_binary_distributable.tcl (139861 => 139862)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/portmgr/jobs/port_binary_distributable.tcl 2015-08-30 09:21:23 UTC (rev 139861)
+++ trunk/base/portmgr/jobs/port_binary_distributable.tcl 2015-08-30 11:45:34 UTC (rev 139862)
</span><span class="lines">@@ -58,7 +58,7 @@
</span><span class="cx"> # keep these values sorted
</span><span class="cx"> array set license_conflicts \
</span><span class="cx"> "afl {agpl cecill gpl}
</span><del>- agpl {afl apache-1 apache-1.1 apsl beopen bsd-old cddl cecill cnri cpl epl gd gpl-1 gpl-2 gplconflict ibmpl lppl mpl noncommercial openssl php qpl restrictive/distributable ruby ssleay zpl-1}
</del><ins>+ agpl {afl apache-1 apache-1.1 apsl beopen bsd-old cc-by-1 cc-by-2 cc-by-2.5 cc-by-3 cc-by-sa cddl cecill cnri cpl epl gd gpl-1 gpl-2 gplconflict ibmpl lppl mpl noncommercial openssl php qpl restrictive/distributable ruby ssleay zpl-1}
</ins><span class="cx"> agpl-1 {apache freetype gpl-3 gpl-3+ lgpl-3 lgpl-3+}
</span><span class="cx"> apache {agpl-1 cecill gpl-1 gpl-2}
</span><span class="cx"> apache-1 {agpl gpl}
</span><span class="lines">@@ -66,14 +66,19 @@
</span><span class="cx"> apsl {agpl cecill gpl}
</span><span class="cx"> beopen {agpl cecill gpl}
</span><span class="cx"> bsd-old {agpl cecill gpl}
</span><ins>+ cc-by-1 {agpl cecill gpl}
+ cc-by-2 {agpl cecill gpl}
+ cc-by-2.5 {agpl cecill gpl}
+ cc-by-3 {agpl cecill gpl}
+ cc-by-sa {agpl cecill gpl}
</ins><span class="cx"> cddl {agpl cecill gpl}
</span><del>- cecill {afl agpl apache apsl beopen bsd-old cddl cnri cpl epl gd gplconflict ibmpl lppl mpl noncommercial openssl php qpl restrictive/distributable ruby ssleay zpl-1}
</del><ins>+ cecill {afl agpl apache apsl beopen bsd-old cc-by-1 cc-by-2 cc-by-2.5 cc-by-3 cc-by-sa cddl cnri cpl epl gd gplconflict ibmpl lppl mpl noncommercial openssl php qpl restrictive/distributable ruby ssleay zpl-1}
</ins><span class="cx"> cnri {agpl cecill gpl}
</span><span class="cx"> cpl {agpl cecill gpl}
</span><span class="cx"> epl {agpl cecill gpl}
</span><span class="cx"> freetype {agpl-1 gpl-2}
</span><span class="cx"> gd {agpl cecill gpl}
</span><del>- gpl {afl apache-1 apache-1.1 apsl beopen cddl cnri bsd-old cpl epl gd gplconflict ibmpl lppl mpl noncommercial openssl php qpl restrictive/distributable ruby ssleay zpl-1}
</del><ins>+ gpl {afl apache-1 apache-1.1 apsl beopen bsd-old cc-by-1 cc-by-2 cc-by-2.5 cc-by-3 cc-by-sa cddl cnri cpl epl gd gplconflict ibmpl lppl mpl noncommercial openssl php qpl restrictive/distributable ruby ssleay zpl-1}
</ins><span class="cx"> gpl-1 {agpl apache gpl-3 gpl-3+ lgpl-3 lgpl-3+}
</span><span class="cx"> gpl-2 {agpl apache freetype gpl-3 gpl-3+ lgpl-3 lgpl-3+}
</span><span class="cx"> gpl-3 {agpl-1 gpl-1 gpl-2}
</span></span></pre>
</div>
</div>
</body>
</html>