From owner-svn-doc-head@FreeBSD.ORG  Mon Mar  3 18:49:52 2014
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id EA10A388;
 Mon,  3 Mar 2014 18:49:52 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id D5A0FCBB;
 Mon,  3 Mar 2014 18:49:52 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s23InqlA063116;
 Mon, 3 Mar 2014 18:49:52 GMT (envelope-from mat@svn.freebsd.org)
Received: (from mat@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s23InqsP063115;
 Mon, 3 Mar 2014 18:49:52 GMT (envelope-from mat@svn.freebsd.org)
Message-Id: <201403031849.s23InqsP063115@svn.freebsd.org>
From: Mathieu Arnold <mat@FreeBSD.org>
Date: Mon, 3 Mar 2014 18:49:52 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r44111 -
 head/en_US.ISO8859-1/books/porters-handbook/makefiles
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head/>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 03 Mar 2014 18:49:53 -0000

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>