From owner-cvs-ports@FreeBSD.ORG  Wed Dec  1 08:32:50 2010
Return-Path: <owner-cvs-ports@FreeBSD.ORG>
Delivered-To: cvs-ports@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 6C776106566B;
	Wed,  1 Dec 2010 08:32:50 +0000 (UTC)
	(envelope-from miwi@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 5C9BE8FC13;
	Wed,  1 Dec 2010 08:32:50 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.4/8.14.4) with ESMTP id oB18WoIk097940;
	Wed, 1 Dec 2010 08:32:50 GMT (envelope-from miwi@repoman.freebsd.org)
Received: (from miwi@localhost)
	by repoman.freebsd.org (8.14.4/8.14.4/Submit) id oB18WoDm097939;
	Wed, 1 Dec 2010 08:32:50 GMT (envelope-from miwi)
Message-Id: <201012010832.oB18WoDm097939@repoman.freebsd.org>
From: Martin Wilke <miwi@FreeBSD.org>
Date: Wed, 1 Dec 2010 08:32:50 +0000 (UTC)
To: ports-committers@FreeBSD.org, cvs-ports@FreeBSD.org, cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Cc: 
Subject: cvs commit: ports/Mk bsd.port.mk
X-BeenThere: cvs-ports@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit messages for the ports tree <cvs-ports.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-ports>,
	<mailto:cvs-ports-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-ports>
List-Post: <mailto:cvs-ports@freebsd.org>
List-Help: <mailto:cvs-ports-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-ports>,
	<mailto:cvs-ports-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 01 Dec 2010 08:32:50 -0000

miwi        2010-12-01 08:32:50 UTC

  FreeBSD ports repository

  Modified files:
    Mk                   bsd.port.mk 
  Log:
  - Remove two checks obviated by the removal of _OPTIONSFILE in revision 1.596 [1]
  - Remove Legacy USE_BISON in bsd.port.mk [2]
  - Remove Legacy 2004 Hack in bsd.port.mk [3]
  
  - CONFLICT handling in has been reworked. There are two new variables in bsd.ports.mk:
    - CONFLICTS_BUILDS: Check for conflicts prior to build
    - CONFLICTS_INSTALL: Check for conflicts prior to installation stage
  
      The existing CONFLICTS checks for conflicts prior to build and installation stage.
      Users could defer the conflict check of CONFLICTS_BUILDS and CONFLICTS to the installation stage by using DEFER_CONFLICTS_CHECK.
      As already possible with CONFLICTS the new conflict checks could be disabled by using DISABLE_CONFLICTS.
      This patch was submitted by beat@
  
  PR:             ports/149670 [1]
                  ports/151806 [2] [3]
  Subitted by:    bf <bf1783@gmail.com> [1]
                  Eitan Adler <lists@eitanadler.com> [2] [3]
  
  Revision  Changes    Path
  1.659     +109 -37   ports/Mk/bsd.port.mk