Date: Sun, 5 May 2013 19:22:43 +0100 From: Chris Rees <crees@FreeBSD.org> To: Stefan Walter <stefan@freebsd.org> Cc: "svn-ports-head@freebsd.org" <svn-ports-head@freebsd.org>, svn-ports-all@freebsd.org, "ports-committers@freebsd.org" <ports-committers@freebsd.org> Subject: Re: svn commit: r317421 - head/x11/fireflies Message-ID: <CADLo83_-w4Cc40vyPv2y48TXQdbDdSh7_LAT-dZBhEHLUf6i%2BA@mail.gmail.com> In-Reply-To: <201305051636.r45GaX7H056694@svn.freebsd.org> References: <201305051636.r45GaX7H056694@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On 5 May 2013 17:36, Stefan Walter <stefan@freebsd.org> wrote: > Author: stefan > Date: Sun May 5 16:36:32 2013 > New Revision: 317421 > URL: http://svnweb.freebsd.org/changeset/ports/317421 > > Log: > - Use CONFLICTS instead of BROKEN. [1] > - While here, convert to new style Makefile header. > > PR: 176666 [1] http://www.FreeBSD.org/cgi/query-pr.cgi?pr=176666 > Submitted by: sbruno [1] > Suggested by: eadler [1] > > Modified: > head/x11/fireflies/Makefile > > Modified: head/x11/fireflies/Makefile > ============================================================================== > --- head/x11/fireflies/Makefile Sun May 5 16:12:13 2013 (r317420) > +++ head/x11/fireflies/Makefile Sun May 5 16:36:32 2013 (r317421) > @@ -1,9 +1,5 @@ > -# New ports collection makefile for: fireflies > -# Date created: 11 Feb 2006 > -# Whom: UMENO Takashi <umeno@rr.iij4u.or.jp> > -# > +# Created by: UMENO Takashi <umeno@rr.iij4u.or.jp> > # $FreeBSD$ > -# > > PORTNAME= fireflies > PORTVERSION= 2.07 > @@ -14,7 +10,7 @@ MASTER_SITES= http://somewhere.fscked.or > MAINTAINER= umeno@rr.iij4u.or.jp > COMMENT= Extension of xscreensaver > > -BROKEN= does not compile when graphics/png is installed (see ports/176666) > +CONFLICTS= png-[0-9]* I know Eitan just suggested that.... but can I suggest CONFLICTS_BUILD instead? That way you can install it and *then* install png. Chris
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CADLo83_-w4Cc40vyPv2y48TXQdbDdSh7_LAT-dZBhEHLUf6i%2BA>