Date: Fri, 15 Jun 2007 13:17:14 +0400 From: "Andrew Pantyukhin" <sat@FreeBSD.org> To: "Sergey A. Osokin" <osa@freebsd.org>, cvs-all@freebsd.org, cvs-ports@freebsd.org, ports-committers@freebsd.org Subject: Re: cvs commit: ports/www/nginx Makefile Message-ID: <cb5206420706150217j4fe70f4cu3e26b6f48bafa9fc@mail.gmail.com> In-Reply-To: <20070615082824.F058D16A4D1@hub.freebsd.org> References: <200706150828.l5F8SK4Z011643@repoman.freebsd.org> <20070615082824.F058D16A4D1@hub.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
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.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?cb5206420706150217j4fe70f4cu3e26b6f48bafa9fc>