Date: Fri, 15 Jun 2007 11:21:33 +0200 From: Pav Lucistnik <pav@FreeBSD.org> To: infofarmer@FreeBSD.org 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 Message-ID: <1181899293.49728.35.camel@pav.hide.vol.cz> In-Reply-To: <cb5206420706150217j4fe70f4cu3e26b6f48bafa9fc@mail.gmail.com> References: <200706150828.l5F8SK4Z011643@repoman.freebsd.org> <20070615082824.F058D16A4D1@hub.freebsd.org> <cb5206420706150217j4fe70f4cu3e26b6f48bafa9fc@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
[-- Attachment #1 --] Andrew Pantyukhin píše v pá 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= 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@oook.cz> <pav@FreeBSD.org> I can't do that, that would make sense. [-- Attachment #2 --] -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.7 (FreeBSD) iD8DBQBGcloantdYP8FOsoIRAucGAJ0XJiZqHdqHtqql/ag2hOspS00o9gCff/05 eteUktdb0cd1PeccC0731Vo= =ahmW -----END PGP SIGNATURE-----
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1181899293.49728.35.camel>