From owner-cvs-all@FreeBSD.ORG  Fri Jun 15 09:17:15 2007
Return-Path: <owner-cvs-all@FreeBSD.ORG>
X-Original-To: cvs-all@freebsd.org
Delivered-To: cvs-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 8987916A46F
	for <cvs-all@freebsd.org>; Fri, 15 Jun 2007 09:17:15 +0000 (UTC)
	(envelope-from infofarmer@gmail.com)
Received: from wa-out-1112.google.com (wa-out-1112.google.com [209.85.146.180])
	by mx1.freebsd.org (Postfix) with ESMTP id 4887B13C4D1
	for <cvs-all@freebsd.org>; Fri, 15 Jun 2007 09:17:15 +0000 (UTC)
	(envelope-from infofarmer@gmail.com)
Received: by wa-out-1112.google.com with SMTP id j37so1086981waf
	for <cvs-all@freebsd.org>; Fri, 15 Jun 2007 02:17:15 -0700 (PDT)
DKIM-Signature: a=rsa-sha1; c=relaxed/relaxed; d=gmail.com; s=beta;
	h=domainkey-signature:received:received:message-id:date:from:reply-to:sender:to:subject:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references:x-google-sender-auth;
	b=O939C3PcNP+/vEYUfD2X9TI81vx3gdRLNi5V75UI6Bs6PJdN7TAfJkHhA/G93lNL+rb+L6jQJPUATdZLMT9l1vkpLdywE2ZO4A1VmKQ9/nKDjtEYJhwolUVbPIId0hGWme2Gr56auw1Kq/p7w4Fz42PHrLo6llJ1rVkzpw2pjlM=
DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=beta;
	h=received:message-id:date:from:reply-to:sender:to:subject:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references:x-google-sender-auth;
	b=iQtReFiig3DCpT/OJGvExBDchkf3hrrCH/Odd0GHea+8IzIaLUklWL0B8r0MfcdrXXl2LWmAkBJIHvG/QWOzcOFeTT0XEjvyOhnwFUj7wwK9qkpaJYt2uLwNFAkO3VJ5Gv+1Ia1fqhZvshEXjM+fWsmb4JhgZoqQDjfm+4nBmeM=
Received: by 10.115.76.1 with SMTP id d1mr2781543wal.1181899034890;
	Fri, 15 Jun 2007 02:17:14 -0700 (PDT)
Received: by 10.114.194.13 with HTTP; Fri, 15 Jun 2007 02:17:14 -0700 (PDT)
Message-ID: <cb5206420706150217j4fe70f4cu3e26b6f48bafa9fc@mail.gmail.com>
Date: Fri, 15 Jun 2007 13:17:14 +0400
From: "Andrew Pantyukhin" <sat@FreeBSD.org>
Sender: infofarmer@gmail.com
To: "Sergey A. Osokin" <osa@freebsd.org>, cvs-all@freebsd.org, 
	cvs-ports@freebsd.org, ports-committers@freebsd.org
In-Reply-To: <20070615082824.F058D16A4D1@hub.freebsd.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
References: <200706150828.l5F8SK4Z011643@repoman.freebsd.org>
	<20070615082824.F058D16A4D1@hub.freebsd.org>
X-Google-Sender-Auth: ab4d56c609cdd240
Cc: 
Subject: Re: cvs commit: ports/www/nginx Makefile
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: infofarmer@FreeBSD.org
List-Id: CVS commit messages for the entire tree <cvs-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-all>
List-Post: <mailto:cvs-all@freebsd.org>
List-Help: <mailto:cvs-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 15 Jun 2007 09:17:15 -0000

On 6/15/07, Sergey A. Osokin <osa@freebsd.org> wrote:
> osa         2007-06-15 08:28:20 UTC
>
>   FreeBSD ports repository
>
>   Modified files:
>     www/nginx            Makefile
>   Log:
>   Resolve conflict with nginx stable.
>   Bump PORTREVISION.
>
>   Revision  Changes    Path
>   1.118     +2 -1      ports/www/nginx/Makefile
> _______________________________________________
>  PORTNAME=      nginx
>  PORTVERSION=   0.5.25
> -PORTREVISION=  1
> +PORTREVISION=  2
>  CATEGORIES=    www
>  MASTER_SITES=  http://sysoev.ru/nginx/
>  MASTER_SITES+= ${MASTER_SITE_LOCAL}
> @@ -26,6 +26,7 @@
>  USE_PERL5=     yes
>  .endif
>
> +CONFLICTS?=    nginx-devel-0.*

Since conflicts work both ways, this portrevision bump
was not necessary.