[133631] trunk/base

[raimue at macports.org]

Revision: 133631
          https://trac.macports.org/changeset/133631
Author:   raimue at macports.org
Date:     2015-03-07 07:10:00 -0800 (Sat, 07 Mar 2015)
Log Message:
-----------
base: expose already implemented 'port info --conflicts' to command line interface

Modified Paths:
--------------
    trunk/base/doc/port-info.1.txt
    trunk/base/src/port/port.tcl

Modified: trunk/base/doc/port-info.1.txt
===================================================================
--- 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)
@@ -11,12 +11,13 @@
 --------
 [cmdsynopsis]
 *port* [*-q*] [*-D* 'portdir'] *info*
-     [--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]
+     [--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]
      [['portname' | 'pseudo-portname' | 'port-expressions' | 'port-url']]
 
 DESCRIPTION
@@ -49,6 +50,9 @@
 *--category*, *--categories*::
     List the categories of a port.
 
+*--conflicts*::
+    List other ports that cannot be active at the same time as the given port.
+
 *--depends*, *--depends_fetch*, *--depends_extract*, *--depends_build*, *--depends_lib*, *--depends_run*::
     List the specified dependencies of a port. *--depends* is a shorthand option
     for all other *--depends_** options.

Modified: trunk/base/src/port/port.tcl
===================================================================
--- 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)
@@ -4361,7 +4361,7 @@
 global cmd_opts_array
 array set cmd_opts_array {
     edit        {{editor 1}}
-    info        {category categories depends_fetch depends_extract
+    info        {category categories conflicts depends_fetch depends_extract
                  depends_build depends_lib depends_run
                  depends description epoch fullname heading homepage index license
                  line long_description
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150307/10f240e2/attachment.html>