cvs commit: ports/www/nginx Makefile

[Pav Lucistnik]

Andrew Pantyukhin píše v pá 15. 06. 2007 v 13:17 +0400:
> On 6/15/07, Sergey A. Osokin <osa at 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.

How exactly CONFLICTS does work both ways?

-- 
Pav Lucistnik <pav at oook.cz>
              <pav at FreeBSD.org>

I can't do that, that would make sense.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 187 bytes
Desc: 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?=
Url : http://lists.freebsd.org/pipermail/cvs-all/attachments/20070615/43407e01/attachment.pgp