[51510] trunk/base/src

[jmr at macports.org]

Revision: 51510
          http://trac.macports.org/changeset/51510
Author:   jmr at macports.org
Date:     2009-05-26 22:06:36 -0700 (Tue, 26 May 2009)
Log Message:
-----------
Add 'provides' and 'conflicts' options. Not doing anything clever with them yet, just displaying the conflicts field in 'port info' output.

Modified Paths:
--------------
    trunk/base/src/port/port.tcl
    trunk/base/src/port1.0/portmain.tcl

Modified: trunk/base/src/port/port.tcl
===================================================================
--- trunk/base/src/port/port.tcl	2009-05-27 04:53:46 UTC (rev 51509)
+++ trunk/base/src/port/port.tcl	2009-05-27 05:06:36 UTC (rev 51510)
@@ -1453,6 +1453,7 @@
             maintainers     1
             platforms       1
             variants        1
+            conflicts       1
         "
 
         # Label map for pretty printing
@@ -1469,6 +1470,7 @@
             platforms   Platforms
             maintainers Maintainers
             license     License
+            conflicts   "Conflicts with"
         }
 
         # Wrap-length map for pretty printing
@@ -1483,6 +1485,7 @@
             homepage 22
             platforms 22
             license 22
+            conflicts 22
             maintainers 22
         }
 
@@ -1537,6 +1540,7 @@
                 ports_info_long_description ports_info_homepage 
                 ports_info_skip_line ports_info_depends_build
                 ports_info_depends_lib ports_info_depends_run
+                ports_info_conflicts
                 ports_info_platforms ports_info_license
                 ports_info_maintainers
             }

Modified: trunk/base/src/port1.0/portmain.tcl
===================================================================
--- trunk/base/src/port1.0/portmain.tcl	2009-05-27 04:53:46 UTC (rev 51509)
+++ trunk/base/src/port1.0/portmain.tcl	2009-05-27 05:06:36 UTC (rev 51510)
@@ -45,12 +45,12 @@
 
 # define options
 options prefix macportsuser name version revision epoch categories maintainers
-options long_description description homepage license
+options long_description description homepage license provides conflicts
 options worksrcdir filesdir distname portdbpath libpath distpath sources_conf os.platform os.version os.major os.arch os.endian platforms default_variants install.user install.group macosx_deployment_target
 options universal_variant os.universal_supported
 
 # Export options via PortInfo
-options_export name version revision epoch categories maintainers platforms description long_description homepage license
+options_export name version revision epoch categories maintainers platforms description long_description homepage license provides conflicts
 
 # Assign option procedure to default_variants
 option_proc default_variants handle_default_variants
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090526/d6bbb902/attachment.html>