<!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>[133631] trunk/base</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/133631">133631</a></dd>
<dt>Author</dt> <dd>raimue@macports.org</dd>
<dt>Date</dt> <dd>2015-03-07 07:10:00 -0800 (Sat, 07 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>base: expose already implemented 'port info --conflicts' to command line interface</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbasedocportinfo1txt">trunk/base/doc/port-info.1.txt</a></li>
<li><a href="#trunkbasesrcportporttcl">trunk/base/src/port/port.tcl</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbasedocportinfo1txt"></a>
<div class="modfile"><h4>Modified: trunk/base/doc/port-info.1.txt (133630 => 133631)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/doc/port-info.1.txt 2015-03-07 15:02:36 UTC (rev 133630)
+++ trunk/base/doc/port-info.1.txt 2015-03-07 15:10:00 UTC (rev 133631)
</span><span class="lines">@@ -11,12 +11,13 @@
</span><span class="cx"> --------
</span><span class="cx"> [cmdsynopsis]
</span><span class="cx"> *port* [*-q*] [*-D* 'portdir'] *info*
</span><del>- [--categories|--category] [--depends] [--depends_fetch] [--depends_extract]
- [--depends_build] [--depends_lib] [--depends_run] [--description] [--epoch]
- [--fullname] [--heading] [--homepage] [--index] [--license] [--line]
- [--long_description] [--maintainer|--maintainers] [--name] [--patchfiles]
- [--platform|--platforms] [--portdir] [--pretty] [--replaced_by]
- [--revision] [--subports] [--variant|--variants] [--version]
</del><ins>+ [--categories|--category] [--conflicts] [--depends] [--depends_fetch]
+ [--depends_extract] [--depends_build] [--depends_lib] [--depends_run]
+ [--description] [--epoch] [--fullname] [--heading] [--homepage] [--index]
+ [--license] [--line] [--long_description] [--maintainer|--maintainers]
+ [--name] [--patchfiles] [--platform|--platforms] [--portdir] [--pretty]
+ [--replaced_by] [--revision] [--subports] [--variant|--variants]
+ [--version]
</ins><span class="cx"> [['portname' | 'pseudo-portname' | 'port-expressions' | 'port-url']]
</span><span class="cx">
</span><span class="cx"> DESCRIPTION
</span><span class="lines">@@ -49,6 +50,9 @@
</span><span class="cx"> *--category*, *--categories*::
</span><span class="cx"> List the categories of a port.
</span><span class="cx">
</span><ins>+*--conflicts*::
+ List other ports that cannot be active at the same time as the given port.
+
</ins><span class="cx"> *--depends*, *--depends_fetch*, *--depends_extract*, *--depends_build*, *--depends_lib*, *--depends_run*::
</span><span class="cx"> List the specified dependencies of a port. *--depends* is a shorthand option
</span><span class="cx"> for all other *--depends_** options.
</span></span></pre></div>
<a id="trunkbasesrcportporttcl"></a>
<div class="modfile"><h4>Modified: trunk/base/src/port/port.tcl (133630 => 133631)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/port/port.tcl 2015-03-07 15:02:36 UTC (rev 133630)
+++ trunk/base/src/port/port.tcl 2015-03-07 15:10:00 UTC (rev 133631)
</span><span class="lines">@@ -4361,7 +4361,7 @@
</span><span class="cx"> global cmd_opts_array
</span><span class="cx"> array set cmd_opts_array {
</span><span class="cx"> edit {{editor 1}}
</span><del>- info {category categories depends_fetch depends_extract
</del><ins>+ info {category categories conflicts depends_fetch depends_extract
</ins><span class="cx"> depends_build depends_lib depends_run
</span><span class="cx"> depends description epoch fullname heading homepage index license
</span><span class="cx"> line long_description
</span></span></pre>
</div>
</div>
</body>
</html>