From owner-svn-ports-all@FreeBSD.ORG  Sun May  5 18:23:13 2013
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id EA7D54DB;
 Sun,  5 May 2013 18:23:13 +0000 (UTC)
 (envelope-from utisoft@gmail.com)
Received: from mail-ie0-x234.google.com (mail-ie0-x234.google.com
 [IPv6:2607:f8b0:4001:c03::234])
 by mx1.freebsd.org (Postfix) with ESMTP id A31D48A7;
 Sun,  5 May 2013 18:23:13 +0000 (UTC)
Received: by mail-ie0-f180.google.com with SMTP id ar20so3306134iec.25
 for <multiple recipients>; Sun, 05 May 2013 11:23:13 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
 h=x-received:mime-version:sender:in-reply-to:references:from:date
 :x-google-sender-auth:message-id:subject:to:cc:content-type;
 bh=CBhtnaHUlxF1/rjHr0tX3sV5Dn6smzs6I1qcRxxYN7k=;
 b=wGxP2OptTexSTuCZn0Gbtwo0KEZAyvAasYNpH/v+P4LlRelTcTyjd65uu/jO2l4tQO
 ZAyB6JmD0HwDIULlMEUmwkhDiVqa6ahXk3cuv8SW5X4oalguQSZWfuO0i7P3j7jWg31u
 20ZAD0Sr3fJVcSJLZQO7SxTtLbURLwSZoXH0u6Zc3M1WsWms0zInwFWR2f+rRxDS+FMQ
 E3iBbzn/OOZXfNVBOBaYT8P/ftHPZI8qbqrDu4K4rdYQgz6rhev0uSKtWgeEHl/MFpOi
 1XXJYwADx/27sxss+tctmFWmXP1nDGUqv3mqWjBBBb7fuA1Fp6U0BbUe+OrIKHOv9TRy
 L2kw==
X-Received: by 10.50.108.104 with SMTP id hj8mr1762309igb.62.1367778193409;
 Sun, 05 May 2013 11:23:13 -0700 (PDT)
MIME-Version: 1.0
Sender: utisoft@gmail.com
Received: by 10.64.58.52 with HTTP; Sun, 5 May 2013 11:22:43 -0700 (PDT)
In-Reply-To: <201305051636.r45GaX7H056694@svn.freebsd.org>
References: <201305051636.r45GaX7H056694@svn.freebsd.org>
From: Chris Rees <crees@FreeBSD.org>
Date: Sun, 5 May 2013 19:22:43 +0100
X-Google-Sender-Auth: WhNooXq1b3vj-klL5rT1Qb_RlDE
Message-ID: <CADLo83_-w4Cc40vyPv2y48TXQdbDdSh7_LAT-dZBhEHLUf6i+A@mail.gmail.com>
Subject: Re: svn commit: r317421 - head/x11/fireflies
To: Stefan Walter <stefan@freebsd.org>
Content-Type: text/plain; charset=ISO-8859-1
Cc: "svn-ports-head@freebsd.org" <svn-ports-head@freebsd.org>,
 svn-ports-all@freebsd.org,
 "ports-committers@freebsd.org" <ports-committers@freebsd.org>
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 05 May 2013 18:23:14 -0000

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