<!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>[123049] branches/gsoc14-pip2port/pypi2port</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/123049">123049</a></dd>
<dt>Author</dt> <dd>gaurav@macports.org</dd>
<dt>Date</dt> <dd>2014-08-04 02:29:56 -0700 (Mon, 04 Aug 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>Updated executable</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#branchesgsoc14pip2portpypi2port">branches/gsoc14-pip2port/pypi2port</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchesgsoc14pip2portpypi2port"></a>
<div class="modfile"><h4>Modified: branches/gsoc14-pip2port/pypi2port (123048 => 123049)</h4>
<pre class="diff"><span>
<span class="info">--- branches/gsoc14-pip2port/pypi2port        2014-08-04 09:29:18 UTC (rev 123048)
+++ branches/gsoc14-pip2port/pypi2port        2014-08-04 09:29:56 UTC (rev 123049)
</span><span class="lines">@@ -235,6 +235,24 @@
</span><span class="cx">         print &quot;Please set a DISTFILE env var before generating the portfile&quot;
</span><span class="cx">         sys.exit(0)
</span><span class="cx"> 
</span><ins>+def search_license(license):
+    license = license.lower()
+    patterns = ['.*mit.*','.*apache.*2','.*apache.*','.*bsd.*','.*agpl.*3',
+               '.*agpl.*2','.*agpl.*','.*affero.*3','.*affero.*2','.*affero.*',
+               '.*lgpl.*3','.*lgpl.*2','.*lgpl.*','.*gpl.*3','.*gpl.*2','.*gpl.*',
+               '.*general.*public.*license.*3','.*general.*public.*license.*2',
+               '.*general.*public.*license.*','.*mpl.*3','.*mpl.*2','.*mpl.*',
+               '.*python.*license.*','^python$','.*']
+    licenses = ['MIT','Apache-2','Apache','BSD','AGPL-3','AGPL-2','AGPL','AGPL-3',
+               'AGPL-2','AGPL','LGPL-3','LGPL-2','LGPL','GPL-3','GPL-2','GPL',
+               'GPL-3','GPL-2','GPL','MPL-3','MPL-2','MPL','Python','Python','NULL']
+    for i in range(len(patterns)):
+        match = re.search(patterns[i],license)
+        if match:
+            return licenses[i]
+    
+
+
</ins><span class="cx"> def create_portfile(dict, file_name, dict2):
</span><span class="cx">     search_distfile(dict['name'],dict['version'])
</span><span class="cx">     print &quot;Creating Portfile for pypi package &quot;+dict['name']+&quot;...&quot;
</span><span class="lines">@@ -251,21 +269,23 @@
</span><span class="cx"> 
</span><span class="cx">         file.write('platforms           darwin\n')
</span><span class="cx">         license = dict['license']
</span><del>-        if license and not license == &quot;UNKNOWN&quot;:
-            license = license.encode('utf-8')
-            license = filter(lambda x: x in string.printable, license)
-            license = license.split('\n')[0]
-            license = re.sub(r'[\[\]\{\}\;\:\$\t\&quot;\'\`\=(--)]+', ' ', license)
-            license = re.sub(r'\s(\s)+', ' ', license)
-            license = re.sub(r'([A-Z]*)([a-z]*)([\s]*v*)([0-9]\.*[0-9]*)',
-                             r'\1\2-\4', license)
-            license = re.sub(r'v(-*)([0-9])', r'\1\2', license)
-            file.write('license             {0}\n'.format(license))
-        else:
-            print &quot;No license found...&quot;
-            print &quot;Looking for license in environment variables...&quot;
-            file.write('license             {0}\n'.format(
-                       os.getenv('license', 'None')))
</del><ins>+#        if license and not license == &quot;UNKNOWN&quot;:
+#            license = license.encode('utf-8')
+#            license = filter(lambda x: x in string.printable, license)
+#            license = license.split('\n')[0]
+#            license = re.sub(r'[\[\]\{\}\;\:\$\t\&quot;\'\`\=(--)]+', ' ', license)
+#            license = re.sub(r'\s(\s)+', ' ', license)
+#            license = re.sub(r'([A-Z]*)([a-z]*)([\s]*v*)([0-9]\.*[0-9]*)',
+#                             r'\1\2-\4', license)
+#            license = re.sub(r'v(-*)([0-9])', r'\1\2', license)
+#            file.write('license             {0}\n'.format(license))
+#        else:
+#            print &quot;No license found...&quot;
+#            print &quot;Looking for license in environment variables...&quot;
+#            file.write('license             {0}\n'.format(
+#                       os.getenv('license', 'None')))
+        license = search_license(license) 
+        file.write('license             {0}\n'.format(license))
</ins><span class="cx"> 
</span><span class="cx">         if dict['maintainer']:
</span><span class="cx">             maintainers = ' '.join(dict['maintainer'])
</span></span></pre>
</div>
</div>

</body>
</html>