From owner-svn-ports-head@FreeBSD.ORG  Sun May  5 16:36:33 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 81DC4BB2;
 Sun,  5 May 2013 16:36:33 +0000 (UTC)
 (envelope-from stefan@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 743A1321;
 Sun,  5 May 2013 16:36:33 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r45GaX4X056695;
 Sun, 5 May 2013 16:36:33 GMT (envelope-from stefan@svn.freebsd.org)
Received: (from stefan@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r45GaX7H056694;
 Sun, 5 May 2013 16:36:33 GMT (envelope-from stefan@svn.freebsd.org)
Message-Id: <201305051636.r45GaX7H056694@svn.freebsd.org>
From: Stefan Walter <stefan@FreeBSD.org>
Date: Sun, 5 May 2013 16:36:33 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r317421 - head/x11/fireflies
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 05 May 2013 16:36:33 -0000

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]
  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]*
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes