<!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>[125639] trunk/dports/_resources/port1.0/group/bitbucket-1.0.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/125639">125639</a></dd>
<dt>Author</dt> <dd>ryandesign@macports.org</dd>
<dt>Date</dt> <dd>2014-09-23 07:02:07 -0700 (Tue, 23 Sep 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>bitbucket-1.0.tcl: set better default distname when tarball_from is downloads; set better default livecheck when version is not a commit; remove unnecessary bitbucket.livecheck_type variable</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdports_resourcesport10groupbitbucket10tcl">trunk/dports/_resources/port1.0/group/bitbucket-1.0.tcl</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdports_resourcesport10groupbitbucket10tcl"></a>
<div class="modfile"><h4>Modified: trunk/dports/_resources/port1.0/group/bitbucket-1.0.tcl (125638 => 125639)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/_resources/port1.0/group/bitbucket-1.0.tcl 2014-09-23 13:58:35 UTC (rev 125638)
+++ trunk/dports/_resources/port1.0/group/bitbucket-1.0.tcl 2014-09-23 14:02:07 UTC (rev 125639)
</span><span class="lines">@@ -37,30 +37,43 @@
</span><span class="cx"> # PortGroup bitbucket 1.0
</span><span class="cx"> # bitbucket.setup author project version [tag_prefix]
</span><span class="cx">
</span><del>-options bitbucket.author bitbucket.project bitbucket.version bitbucket.tag_prefix bitbucket.livecheck_type
</del><ins>+options bitbucket.author bitbucket.project bitbucket.version bitbucket.tag_prefix
</ins><span class="cx"> options bitbucket.homepage bitbucket.master_sites bitbucket.tarball_from
</span><span class="cx">
</span><span class="cx"> default bitbucket.homepage {https://bitbucket.org/${bitbucket.author}/${bitbucket.project}}
</span><span class="cx"> default bitbucket.master_sites {${bitbucket.homepage}/get}
</span><span class="cx"> default bitbucket.tarball_from {tags}
</span><del>-default bitbucket.livecheck_type ""
</del><span class="cx">
</span><span class="cx"> default master_sites {${bitbucket.master_sites}}
</span><span class="cx">
</span><span class="cx"> option_proc bitbucket.tarball_from handle_tarball_from
</span><span class="cx">
</span><span class="cx"> proc handle_tarball_from {option action args} {
</span><del>- global bitbucket.author bitbucket.project bitbucket.master_sites
</del><ins>+ global bitbucket.author bitbucket.project bitbucket.master_sites bitbucket.version
</ins><span class="cx">
</span><span class="cx"> # the port writer can set bitbucket.tarball_from to "downloads" and have the URI path accordingly changed
</span><span class="cx"> if {[string equal ${action} "set"] && ${args} eq "downloads"} {
</span><span class="cx"> bitbucket.tarball_from ${args}
</span><span class="cx"> bitbucket.master_sites https://bitbucket.org/${bitbucket.author}/${bitbucket.project}/downloads
</span><ins>+ default distname {${bitbucket.project}-${bitbucket.version}}
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+proc bitbucket.livecheck_regex {} {
+ global bitbucket.tag_prefix bitbucket.tarball_from distname extract.suffix version
+ switch ${bitbucket.tarball_from} {
+ tags {
+ set dir get
+ }
+ default {
+ set dir ${bitbucket.tarball_from}
+ }
+ }
+ return ${dir}/[regsub -- [quotemeta ${version}] ${distname} {([0-9.]+)}][quotemeta [quotemeta ${extract.suffix}]]
+}
+
</ins><span class="cx"> proc bitbucket.setup {bb_author bb_project bb_version {bb_tag_prefix ""}} {
</span><del>- global bitbucket.author bitbucket.project bitbucket.version bitbucket.tag_prefix bitbucket.homepage bitbucket.master_sites extract.suffix bitbucket.livecheck_type
</del><ins>+ global bitbucket.author bitbucket.homepage bitbucket.master_sites bitbucket.project bitbucket.tag_prefix bitbucket.version extract.suffix
</ins><span class="cx">
</span><span class="cx"> bitbucket.author ${bb_author}
</span><span class="cx"> bitbucket.project ${bb_project}
</span><span class="lines">@@ -72,7 +85,7 @@
</span><span class="cx"> homepage ${bitbucket.homepage}
</span><span class="cx"> hg.url ${bitbucket.homepage}
</span><span class="cx"> hg.tag [join ${bitbucket.tag_prefix}]${bitbucket.version}
</span><del>- distname [join ${bitbucket.tag_prefix}]${bitbucket.version}
</del><ins>+ default distname {${hg.tag}}
</ins><span class="cx"> fetch.ignore_sslcert yes
</span><span class="cx">
</span><span class="cx"> post-extract {
</span><span class="lines">@@ -87,24 +100,15 @@
</span><span class="cx">
</span><span class="cx"> if {[join ${bitbucket.tag_prefix}] eq "" && \
</span><span class="cx"> [regexp "^\[0-9a-f\]{9,}\$" ${bitbucket.version}]} {
</span><del>- bitbucket.livecheck_type commits
</del><ins>+ default livecheck.type regexm
+ default livecheck.url {${bitbucket.homepage}/atom}
+ default livecheck.regex {<id>changeset:(\[0-9a-f\]{[string length ${bitbucket.version}]})\[0-9a-f\]*</id>}
</ins><span class="cx"> } else {
</span><del>- bitbucket.livecheck_type tags
</del><ins>+ default livecheck.type regex
+ default livecheck.url {${bitbucket.homepage}/downloads}
+ default livecheck.regex {[bitbucket.livecheck_regex]}
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- switch {${bitbucket.livecheck_type}} {
- commits {
- livecheck.type regexm
- livecheck.url ${bitbucket.homepage}/atom
- livecheck.version ${bitbucket.version}
- livecheck.regex <id>changeset:(\[0-9a-f\]{[string length ${bitbucket.version}]})\[0-9a-f\]*</id>
- }
- default {
- livecheck.type regex
- livecheck.version ${bitbucket.version}
- livecheck.url ${bitbucket.homepage}/downloads
- livecheck.regex get/[join ${bitbucket.tag_prefix}](\[0-9\.\]+)${extract.suffix}
- }
- }
</del><ins>+ default livecheck.version {${bitbucket.version}}
</ins><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>