svn commit: r44111 - head/en_US.ISO8859-1/books/porters-handbook/makefiles

[Mathieu Arnold]

Author: mat (ports committer)
Date: Mon Mar  3 18:49:52 2014
New Revision: 44111
URL: http://svnweb.freebsd.org/changeset/doc/44111

Log:
  Include the latest additions to the options helpers.
  
  Sponsored by:	Absolight

Modified:
  head/en_US.ISO8859-1/books/porters-handbook/makefiles/chapter.xml

Modified: head/en_US.ISO8859-1/books/porters-handbook/makefiles/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/porters-handbook/makefiles/chapter.xml	Mon Mar  3 16:44:01 2014	(r44110)
+++ head/en_US.ISO8859-1/books/porters-handbook/makefiles/chapter.xml	Mon Mar  3 18:49:52 2014	(r44111)
@@ -3905,6 +3905,18 @@ LIB_DEPENDS+=	liba.so:${PORTSDIR}/devel/
 	  </listitem>
 
 	  <listitem>
+	    <para><varname>CONFLICTS</varname></para>
+	  </listitem>
+
+	  <listitem>
+	    <para><varname>CONFLICTS_BUILD</varname></para>
+	  </listitem>
+
+	  <listitem>
+	    <para><varname>CONFLICTS_INSTALL</varname></para>
+	  </listitem>
+
+	  <listitem>
 	    <para><varname>DISTFILES</varname></para>
 	  </listitem>