From owner-svn-ports-all@FreeBSD.ORG  Sat Dec 15 08:18:37 2012
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id B3108D64;
 Sat, 15 Dec 2012 08:18:37 +0000 (UTC) (envelope-from jgh@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 97F618FC0C;
 Sat, 15 Dec 2012 08:18:37 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBF8IbGs003323;
 Sat, 15 Dec 2012 08:18:37 GMT (envelope-from jgh@svn.freebsd.org)
Received: (from jgh@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBF8Ibij003322;
 Sat, 15 Dec 2012 08:18:37 GMT (envelope-from jgh@svn.freebsd.org)
Message-Id: <201212150818.qBF8Ibij003322@svn.freebsd.org>
From: Jason Helfman <jgh@FreeBSD.org>
Date: Sat, 15 Dec 2012 08:18:37 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r308937 - head/devel/json-c
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
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: Sat, 15 Dec 2012 08:18:37 -0000

Author: jgh
Date: Sat Dec 15 08:18:36 2012
New Revision: 308937
URL: http://svnweb.freebsd.org/changeset/ports/308937

Log:
  - set CONFLICT on devel/cocaine-core
  
  Spotted by:	makc@

Modified:
  head/devel/json-c/Makefile

Modified: head/devel/json-c/Makefile
==============================================================================
--- head/devel/json-c/Makefile	Sat Dec 15 08:13:10 2012	(r308936)
+++ head/devel/json-c/Makefile	Sat Dec 15 08:18:36 2012	(r308937)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	json-c
-# Date created:				June 23 2006
-# Whom:					gno@yahoo-inc.com
-#
+# Created by: gno@yahoo-inc.com
 # $FreeBSD$
-#
 
 PORTNAME=	json-c
 PORTVERSION=	0.9
@@ -18,4 +14,6 @@ GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_GNOME=	pkgconfig gnomehack
 
+CONFLICTS=	cocaine-core-[0-9]*
+
 .include <bsd.port.mk>