From owner-svn-ports-head@FreeBSD.ORG  Mon Apr 29 10:20:06 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 A8607B5C;
 Mon, 29 Apr 2013 10:20:06 +0000 (UTC)
 (envelope-from ehaupt@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 9BC981668;
 Mon, 29 Apr 2013 10:20:06 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r3TAK6N2052203;
 Mon, 29 Apr 2013 10:20:06 GMT (envelope-from ehaupt@svn.freebsd.org)
Received: (from ehaupt@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r3TAK6gJ052202;
 Mon, 29 Apr 2013 10:20:06 GMT (envelope-from ehaupt@svn.freebsd.org)
Message-Id: <201304291020.r3TAK6gJ052202@svn.freebsd.org>
From: Emanuel Haupt <ehaupt@FreeBSD.org>
Date: Mon, 29 Apr 2013 10:20:06 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r316794 - head/sysutils/sleuthkit
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: Mon, 29 Apr 2013 10:20:06 -0000

Author: ehaupt
Date: Mon Apr 29 10:20:06 2013
New Revision: 316794
URL: http://svnweb.freebsd.org/changeset/ports/316794

Log:
  Register CONFLICTS

Modified:
  head/sysutils/sleuthkit/Makefile

Modified: head/sysutils/sleuthkit/Makefile
==============================================================================
--- head/sysutils/sleuthkit/Makefile	Mon Apr 29 10:19:15 2013	(r316793)
+++ head/sysutils/sleuthkit/Makefile	Mon Apr 29 10:20:06 2013	(r316794)
@@ -12,7 +12,7 @@ COMMENT=	Tools and library for filesyste
 RUN_DEPENDS=	p5-DateTime-TimeZone>=0:${PORTSDIR}/devel/p5-DateTime-TimeZone \
 		exif:${PORTSDIR}/graphics/exif
 
-CONFLICTS=	ja-ls-[0-9]*
+CONFLICTS=	ja-ls-[0-9]* icat-[0-9]*
 
 GNU_CONFIGURE=	yes
 USE_PERL5=	yes