<!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>[137870] branches/gsoc15-portfile</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/137870">137870</a></dd>
<dt>Author</dt> <dd>chunyang@macports.org</dd>
<dt>Date</dt> <dd>2015-06-22 06:02:33 -0700 (Mon, 22 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>port-create: clean up</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchesgsoc15portfileportcreate">branches/gsoc15-portfile/port-create</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#branchesgsoc15portfilePortfilejson">branches/gsoc15-portfile/Portfile.json</a></li>
<li><a href="#branchesgsoc15portfilePortfiletemplate">branches/gsoc15-portfile/Portfile.template</a></li>
<li><a href="#branchesgsoc15portfilegroupsjson">branches/gsoc15-portfile/groups.json</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchesgsoc15portfilePortfilejson"></a>
<div class="delfile"><h4>Deleted: branches/gsoc15-portfile/Portfile.json (137869 => 137870)</h4>
<pre class="diff"><span>
<span class="info">--- branches/gsoc15-portfile/Portfile.json 2015-06-22 12:59:24 UTC (rev 137869)
+++ branches/gsoc15-portfile/Portfile.json 2015-06-22 13:02:33 UTC (rev 137870)
</span><span class="lines">@@ -1,26 +0,0 @@
</span><del>-{
- "name": "tmux",
- "version": "2.0",
- "categories": "sysutils",
- "long_description": "tmux is a terminal multiplexer",
- "platforms": "darwin",
- "license": "BSD",
- "homepage": "https://tmux.github.io",
- "checksums": {
- "sha1": "RMD160",
- "rmd160": "SHA256"
- },
-
- "github": {
- "PortGroup": "github 1.0",
- "setup": "tmux tmux 2.0",
- "tarball_from": "releases"
- },
- "perl5": {
- "PortGroup": "perl5 1.0",
- "branches": "5.8 5.10 5.12 5.14 5.16 5.18 5.20",
- "setup": "perl-ldap 0.65"
- },
-
- "depends_lib": ["libevent", "ncurses"]
-}
</del></span></pre></div>
<a id="branchesgsoc15portfilePortfiletemplate"></a>
<div class="delfile"><h4>Deleted: branches/gsoc15-portfile/Portfile.template (137869 => 137870)</h4>
<pre class="diff"><span>
<span class="info">--- branches/gsoc15-portfile/Portfile.template 2015-06-22 12:59:24 UTC (rev 137869)
+++ branches/gsoc15-portfile/Portfile.template 2015-06-22 13:02:33 UTC (rev 137870)
</span><span class="lines">@@ -1,19 +0,0 @@
</span><del>-# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
-# $Id$
-
-PortSystem 1.0
-
-name PortName
-version PortVersion
-categories Categories
-platforms darwin
-license License
-maintainers MaintainerHandle
-description Description
-long_description LongDescription
-homepage Homepage
-
-master_sites MasterSites
-
-checksums rmd160 RMD160 \
- sha256 SHA256
</del></span></pre></div>
<a id="branchesgsoc15portfilegroupsjson"></a>
<div class="delfile"><h4>Deleted: branches/gsoc15-portfile/groups.json (137869 => 137870)</h4>
<pre class="diff"><span>
<span class="info">--- branches/gsoc15-portfile/groups.json 2015-06-22 12:59:24 UTC (rev 137869)
+++ branches/gsoc15-portfile/groups.json 2015-06-22 13:02:33 UTC (rev 137870)
</span><span class="lines">@@ -1,7 +0,0 @@
</span><del>-{
- "github": {
- "PortGroup": "github 1.0",
- "setup": "author project version [tag_prefix]",
- "tarball_from": "releases"
- }
-}
</del></span></pre></div>
<a id="branchesgsoc15portfileportcreate"></a>
<div class="modfile"><h4>Modified: branches/gsoc15-portfile/port-create (137869 => 137870)</h4>
<pre class="diff"><span>
<span class="info">--- branches/gsoc15-portfile/port-create 2015-06-22 12:59:24 UTC (rev 137869)
+++ branches/gsoc15-portfile/port-create 2015-06-22 13:02:33 UTC (rev 137870)
</span><span class="lines">@@ -1,14 +1,11 @@
</span><span class="cx"> #!/opt/local/libexec/macports/bin/tclsh8.5
</span><span class="cx"> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
</span><span class="cx"> # $Id$
</span><del>-
</del><ins>+#
</ins><span class="cx"> # Create Portfile
</span><del>-#
-# Workflow:
-# 1. Gather metadata
-# 2. Feed template
-# 3. Print result
</del><span class="cx">
</span><ins>+package require cmdline
+
</ins><span class="cx"> # Get tarball filename from tarball URL
</span><span class="cx"> proc get_tarball_filename {url} {
</span><span class="cx"> set length [string length $url]
</span><span class="lines">@@ -55,14 +52,10 @@
</span><span class="cx"> return $template
</span><span class="cx"> }
</span><span class="cx">
</span><del>-proc feed_template {template metadata} {
- return $template
</del><ins>+proc val_or_def {val def} {
+ expr {$val ne "" ? $val : $def}
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-set name ""
-set version ""
-
-package require cmdline
</del><span class="cx"> set options {
</span><span class="cx"> {url.arg "" "set the tarball URL of port"}
</span><span class="cx"> {name.arg "" "set the name of port" }
</span><span class="lines">@@ -89,7 +82,7 @@
</span><span class="cx"> exit 2
</span><span class="cx"> }
</span><span class="cx">
</span><del>-# Question: duplicate code, how to merge the following five code block?
</del><ins>+# Parse search on other sites options
</ins><span class="cx"> set query $params(homebrew)
</span><span class="cx"> if {[expr {[string length $query] > 0}]} {
</span><span class="cx"> exec open "https://github.com/Homebrew/homebrew/search?l=ruby&q=$query"
</span><span class="lines">@@ -132,42 +125,50 @@
</span><span class="cx"> exit 0
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+# Parse -group
</ins><span class="cx"> if {[expr {[string length $params(group)] > 0}]} {
</span><span class="cx"> get_group $params(group) $argv
</span><span class="cx"> exit 0
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+set name "replaceme"
+set version "replaceme"
+set maintainers "replaceme"
+
+# Parse -url
</ins><span class="cx"> if {[expr {[string length $params(url)] > 0}]} {
</span><span class="cx"> set tarball [get_tarball_filename $params(url)]
</span><del>- set name [get_name $tarball]
- set version [get_version $tarball]
</del><ins>+ set name [val_or_def [get_name $tarball] $name]
+ set version [val_or_def [get_version $tarball] $version]
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-if {[expr {[string length $params(name)] > 0}]} {
- set name $params(name)
-}
</del><ins>+# Parse -name and -version
+set name [val_or_def $params(name) $name]
+set version [val_or_def $params(version) $version]
</ins><span class="cx">
</span><del>-if {[expr {[string length $params(version)] > 0}]} {
- set version $params(version)
</del><ins>+if {[info exist env(EMAIL)]} {
+ set maintainers $env(EMAIL)
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-set template [read_template "./Portfile.template"]
-
-if {$name ne""} {
- set template [string map "PortName $name" $template]
-}
-if {$version ne ""} {
- set template [string map "PortVersion $version" $template]
-}
-
-if {[info exist env(EMAIL)] && ![string equal $env(EMAIL) ""]} {
- set template [string map "MaintainerHandle $env(EMAIL)" $template]
-}
-
-if {[expr {[string length $params(outfile)] > 0}]} {
- set outfile [open $params(outfile) w]
- puts -nonewline $outfile $template
- close $outfile
-} else {
- puts -nonewline $template
-}
</del><ins>+##################
+## Print Result ##
+##################
+puts "# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4"
+puts "# \$Id\$"
+puts ""
+puts "PortSystem 1.0"
+puts ""
+puts "name ${name}"
+puts "version ${version}"
+puts "categories replaceme"
+puts "platforms darwin"
+puts "maintainers replaceme"
+puts "license replaceme"
+puts "maintainers ${maintainers}"
+puts ""
+puts "description replaceme"
+puts ""
+puts "long_description replaceme"
+puts ""
+puts "checksums rmd160 12345 \\"
+puts " sha256 6789a"
</ins></span></pre>
</div>
</div>
</body>
</html>