cvs commit: ports/www/nginx Makefile

[Andrew Pantyukhin]

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.