From owner-svn-doc-all@freebsd.org  Wed Aug 24 11:56:26 2016
Return-Path: <owner-svn-doc-all@freebsd.org>
Delivered-To: svn-doc-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9EFBEBC47A1;
 Wed, 24 Aug 2016 11:56:26 +0000 (UTC) (envelope-from mat@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 6F57E1D78;
 Wed, 24 Aug 2016 11:56:26 +0000 (UTC) (envelope-from mat@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u7OBuPlh006810;
 Wed, 24 Aug 2016 11:56:25 GMT (envelope-from mat@FreeBSD.org)
Received: (from mat@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u7OBuPsm006809;
 Wed, 24 Aug 2016 11:56:25 GMT (envelope-from mat@FreeBSD.org)
Message-Id: <201608241156.u7OBuPsm006809@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: mat set sender to mat@FreeBSD.org
 using -f
From: Mathieu Arnold <mat@FreeBSD.org>
Date: Wed, 24 Aug 2016 11:56:25 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r49332 -
 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-all@freebsd.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all/>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 24 Aug 2016 11:56:26 -0000

Author: mat
Date: Wed Aug 24 11:56:25 2016
New Revision: 49332
URL: https://svnweb.freebsd.org/changeset/doc/49332

Log:
  Fix a logic typo.
  
  PR:		212053
  Reported by:	Harald Schmalzbauer
  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	Wed Aug 24 11:29:54 2016	(r49331)
+++ head/en_US.ISO8859-1/books/porters-handbook/makefiles/chapter.xml	Wed Aug 24 11:56:25 2016	(r49332)
@@ -4511,7 +4511,7 @@ OPT1_PREVENTS_MSG=	OPT1 and OPT2 enable 
 
 .include &lt;bsd.port.options.mk&gt;
 
-.if ${PORT_OPTIONS:MOPT2} || ${PORT_OPTIONS:MOPT1}
+.if ${PORT_OPTIONS:MOPT2} &amp;&amp; ${PORT_OPTIONS:MOPT1}
 BROKEN=	Option OPT1 conflicts with OPT2 (select only one)
 .endif</programlisting>