cvs commit: ports/www/nginx Makefile

[Andrew Pantyukhin]

On 6/15/07, Pav Lucistnik <pav at freebsd.org> wrote:
> 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?

I might be mistaken, but to me it seems this is how:
1. If you have a pkg with conflicts installed, you can't
   install its conflicting packages, even if they don't
   have the info about the conflict
2. If you have a pkg without conflicts installed, you
   can't install its conflicting packages, if they
   have the info about the conflict