From owner-cvs-ports@FreeBSD.ORG  Fri Jun 15 09:21:35 2007
Return-Path: <owner-cvs-ports@FreeBSD.ORG>
X-Original-To: cvs-ports@FreeBSD.org
Delivered-To: cvs-ports@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 6F96716A41F;
	Fri, 15 Jun 2007 09:21:35 +0000 (UTC) (envelope-from pav@FreeBSD.org)
Received: from nat-application.b1.lan.prg.vol.cz
	(nat-application.b1.lan.prg.vol.cz [195.122.204.152])
	by mx1.freebsd.org (Postfix) with ESMTP id CBE7813C44C;
	Fri, 15 Jun 2007 09:21:34 +0000 (UTC) (envelope-from pav@FreeBSD.org)
Received: from pav.hide.vol.cz (localhost [127.0.0.1])
	by nat-application.b1.lan.prg.vol.cz (8.13.8/8.13.8) with ESMTP id
	l5F9LXG3052011; Fri, 15 Jun 2007 11:21:33 +0200 (CEST)
	(envelope-from pav@FreeBSD.org)
Received: (from pav@localhost)
	by pav.hide.vol.cz (8.13.8/8.13.8/Submit) id l5F9LX78052010;
	Fri, 15 Jun 2007 11:21:33 +0200 (CEST)
	(envelope-from pav@FreeBSD.org)
X-Authentication-Warning: pav.hide.vol.cz: pav set sender to pav@FreeBSD.org
	using -f
From: Pav Lucistnik <pav@FreeBSD.org>
To: infofarmer@FreeBSD.org
In-Reply-To: <cb5206420706150217j4fe70f4cu3e26b6f48bafa9fc@mail.gmail.com>
References: <200706150828.l5F8SK4Z011643@repoman.freebsd.org>
	<20070615082824.F058D16A4D1@hub.freebsd.org>
	<cb5206420706150217j4fe70f4cu3e26b6f48bafa9fc@mail.gmail.com>
Content-Type: multipart/signed; micalg=pgp-sha1;
	protocol="application/pgp-signature";
	boundary="=-bPpRIEIALcTUF8+yMVu0"
Date: Fri, 15 Jun 2007 11:21:33 +0200
Message-Id: <1181899293.49728.35.camel@pav.hide.vol.cz>
Mime-Version: 1.0
X-Mailer: Evolution 2.10.2 FreeBSD GNOME Team Port 
Cc: cvs-ports@FreeBSD.org, "Sergey A. Osokin" <osa@FreeBSD.org>,
	cvs-all@FreeBSD.org, ports-committers@FreeBSD.org
Subject: Re: cvs commit: ports/www/nginx Makefile
X-BeenThere: cvs-ports@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: pav@FreeBSD.org
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: Fri, 15 Jun 2007 09:21:35 -0000


--=-bPpRIEIALcTUF8+yMVu0
Content-Type: text/plain; charset=ISO8859-2
Content-Transfer-Encoding: quoted-printable

Andrew Pantyukhin p=ED=B9e v p=E1 15. 06. 2007 v 13:17 +0400:
> 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=3D      nginx
> >  PORTVERSION=3D   0.5.25
> > -PORTREVISION=3D  1
> > +PORTREVISION=3D  2
> >  CATEGORIES=3D    www
> >  MASTER_SITES=3D  http://sysoev.ru/nginx/
> >  MASTER_SITES+=3D ${MASTER_SITE_LOCAL}
> > @@ -26,6 +26,7 @@
> >  USE_PERL5=3D     yes
> >  .endif
> >
> > +CONFLICTS?=3D    nginx-devel-0.*
>=20
> Since conflicts work both ways, this portrevision bump
> was not necessary.

How exactly CONFLICTS does work both ways?

--=20
Pav Lucistnik <pav@oook.cz>
              <pav@FreeBSD.org>

I can't do that, that would make sense.

--=-bPpRIEIALcTUF8+yMVu0
Content-Type: application/pgp-signature; name=signature.asc
Content-Description: Toto je =?UTF-8?Q?digit=C3=A1ln=C4=9B?=
	=?ISO-8859-1?Q?_podepsan=E1?= =?UTF-8?Q?_=C4=8D=C3=A1st?=
	=?ISO-8859-1?Q?_zpr=E1vy?=

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.7 (FreeBSD)

iD8DBQBGcloantdYP8FOsoIRAucGAJ0XJiZqHdqHtqql/ag2hOspS00o9gCff/05
eteUktdb0cd1PeccC0731Vo=
=ahmW
-----END PGP SIGNATURE-----

--=-bPpRIEIALcTUF8+yMVu0--