From owner-svn-ports-head@FreeBSD.ORG  Mon Sep 15 07:18:00 2014
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id E020FD1A;
 Mon, 15 Sep 2014 07:18:00 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id CD3736A6;
 Mon, 15 Sep 2014 07:18:00 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s8F7I09Q017421;
 Mon, 15 Sep 2014 07:18:00 GMT (envelope-from ehaupt@FreeBSD.org)
Received: (from ehaupt@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s8F7I02S017420;
 Mon, 15 Sep 2014 07:18:00 GMT (envelope-from ehaupt@FreeBSD.org)
Message-Id: <201409150718.s8F7I02S017420@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: ehaupt set sender to
 ehaupt@FreeBSD.org using -f
From: Emanuel Haupt <ehaupt@FreeBSD.org>
Date: Mon, 15 Sep 2014 07:18:00 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r368247 - head/games/lolcat
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.18-1
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: Mon, 15 Sep 2014 07:18:01 -0000

Author: ehaupt
Date: Mon Sep 15 07:18:00 2014
New Revision: 368247
URL: http://svnweb.freebsd.org/changeset/ports/368247
QAT: https://qat.redports.org/buildarchive/r368247/

Log:
  Remove conflict with games/filters as the conflicting file in filters has been
  renamed upstream.

Modified:
  head/games/lolcat/Makefile

Modified: head/games/lolcat/Makefile
==============================================================================
--- head/games/lolcat/Makefile	Mon Sep 15 07:16:56 2014	(r368246)
+++ head/games/lolcat/Makefile	Mon Sep 15 07:18:00 2014	(r368247)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	lolcat
-PORTREVISION=	1
+PORTREVISION=	2
 PORTVERSION=	42.0.99
 CATEGORIES=	games
 MASTER_SITES=	RG
@@ -9,8 +9,6 @@ MASTER_SITES=	RG
 MAINTAINER=	arved@FreeBSD.org
 COMMENT=	Rainbows and unicorns
 
-CONFLICTS=	filters-[0-9]*
-
 RUN_DEPENDS=	rubygem-trollop>=1.9:${PORTSDIR}/devel/rubygem-trollop \
 		rubygem-paint>=0.8.5:${PORTSDIR}/devel/rubygem-paint