[56669] branches/release_1_8/base

blb at macports.org blb at macports.org
Mon Aug 31 16:06:07 PDT 2009


Revision: 56669
          http://trac.macports.org/changeset/56669
Author:   blb at macports.org
Date:     2009-08-31 16:06:07 -0700 (Mon, 31 Aug 2009)
Log Message:
-----------
Merge r56666 from trunk: portfile.7 - document conflicts and replaced_by settings

Revision Links:
--------------
    http://trac.macports.org/changeset/56666

Modified Paths:
--------------
    branches/release_1_8/base/doc/portfile.7

Property Changed:
----------------
    branches/release_1_8/base/


Property changes on: branches/release_1_8/base
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/gsoc08-privileges/base:37343-46937
/branches/universal-sanity/base:51872-52323
/branches/variant-descs-14482/base:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
/trunk/base:55268,55279,55281,55285,55317,55385,55417,55591,55594,55679,55767,55793,55825,56147,56435,56448
/users/perry/base-bugs_and_notes:45682-46060
/users/perry/base-select:44044-44692
   + /branches/gsoc08-privileges/base:37343-46937
/branches/universal-sanity/base:51872-52323
/branches/variant-descs-14482/base:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
/trunk/base:55268,55279,55281,55285,55317,55385,55417,55591,55594,55679,55767,55793,55825,56147,56435,56448,56666
/users/perry/base-bugs_and_notes:45682-46060
/users/perry/base-select:44044-44692

Modified: branches/release_1_8/base/doc/portfile.7
===================================================================
--- branches/release_1_8/base/doc/portfile.7	2009-08-31 23:06:01 UTC (rev 56668)
+++ branches/release_1_8/base/doc/portfile.7	2009-08-31 23:06:07 UTC (rev 56669)
@@ -306,6 +306,32 @@
 .br
 .Sy Example:
 .Dl use_configure no
+.It Ic conflicts
+Used to list ports which conflict with the one containing the
+.Cm conflicts
+declaration.
+.br
+.Sy Type:
+.Em optional
+.br
+.Sy Default:
+.Em none (empty)
+.br
+.Sy Example:
+.Dl conflicts cdrtools
+.It Ic replaced_by
+When a particular port is deprecated in favor of another, use
+.Cm replaced_by
+in the deprecated port and list the new one to be used.
+.br
+.Sy Type:
+.Em optional
+.br
+.Sy Default:
+.Em none (empty)
+.br
+.Sy Example:
+.Dl replaced_by xorg-renderproto
 .El
 .Sh TARGET HOOKS
 A number of hooks are available for customizing many of the standard
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090831/a6f9859a/attachment.html>


More information about the macports-changes mailing list