svn commit: r308937 - head/devel/json-c

[Jason Helfman]

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 at yahoo-inc.com
-#
+# Created by: gno at 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>