From owner-cvs-all@FreeBSD.ORG Mon Dec 13 09:49:31 2010 Return-Path: Delivered-To: cvs-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C659A106564A; Mon, 13 Dec 2010 09:49:31 +0000 (UTC) (envelope-from beat@FreeBSD.org) Received: from marvin.chruetertee.ch (marvin.chruetertee.ch [217.150.245.55]) by mx1.freebsd.org (Postfix) with ESMTP id 5A77E8FC17; Mon, 13 Dec 2010 09:49:30 +0000 (UTC) Received: from daedalus.network.local ([195.141.49.100]) (authenticated bits=0) by marvin.chruetertee.ch (8.14.3/8.14.3) with ESMTP id oBD9T0Dq066172 (version=TLSv1/SSLv3 cipher=DHE-DSS-CAMELLIA256-SHA bits=256 verify=NO); Mon, 13 Dec 2010 09:29:00 GMT (envelope-from beat@FreeBSD.org) Message-ID: <4D05E761.5020409@FreeBSD.org> Date: Mon, 13 Dec 2010 10:29:05 +0100 From: Beat Gaetzi User-Agent: Mozilla/5.0 (X11; U; FreeBSD i386; en-US; rv:1.9.1.16) Gecko/20101210 Lightning/1.0b1 Thunderbird/3.0.11 MIME-Version: 1.0 To: Alexey Dokuchaev References: <201012101451.oBAEpxuL094179@repoman.freebsd.org> <20101213052536.GA84102@FreeBSD.org> In-Reply-To: <20101213052536.GA84102@FreeBSD.org> X-Enigmail-Version: 1.0.1 Content-Type: text/plain; charset=KOI8-R Content-Transfer-Encoding: 7bit Cc: cvs-ports@FreeBSD.org, cvs-all@FreeBSD.org, ports-committers@FreeBSD.org Subject: Re: cvs commit: ports/mail/thunderbird Makefile distinfo ports/mail/thunderbird/files patch-mozilla-xpcom-reflect-xptinfo-src-xptiInterfaceInfoManager.cpp X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: **OBSOLETE** CVS commit messages for the entire tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 Dec 2010 09:49:31 -0000 On 13.12.2010 06:25, Alexey Dokuchaev wrote: > On Fri, Dec 10, 2010 at 02:51:59PM +0000, Beat Gaetzi wrote: >> beat 2010-12-10 14:51:59 UTC >> [...] >> - Replace CONFLICTS with CONFLICTS_INSTALL > > Can you please explain this part? Sure :) Conflict handling has been reworked and this was committed two weeks ago: http://lists.freebsd.org/pipermail/freebsd-ports/2010-December/064761.html Thunderbird 3.1 builds fine if Thunderbird 3.0 is installed and vice versa but they install files into the same place. According to the new conflict handling such ports should only have CONFLICTS_INSTALL instead of CONFLICTS. This allows user to build a port although a conflicting port is installed. Of course a message is shown first that they build a port which conflicts with an installed one. I've submitted a patch which updates the porters handbook with the new conflict handling. This patch is currently under review but I expect that it will be committed soon. Beat