From owner-svn-ports-all@FreeBSD.ORG Sat Dec 15 22:54:26 2012 Return-Path: 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 3FD33DF6; Sat, 15 Dec 2012 22:54:26 +0000 (UTC) (envelope-from baptiste.daroussin@gmail.com) Received: from mail-we0-f182.google.com (mail-we0-f182.google.com [74.125.82.182]) by mx1.freebsd.org (Postfix) with ESMTP id 386408FC1A; Sat, 15 Dec 2012 22:54:24 +0000 (UTC) Received: by mail-we0-f182.google.com with SMTP id u54so2152183wey.13 for ; Sat, 15 Dec 2012 14:54:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:sender:date:from:to:cc:subject:message-id:references :mime-version:content-type:content-disposition:in-reply-to :user-agent; bh=tiKOGTChRGOmsm5TL4yvWKETKREpeC4iHKH0BTI2oXk=; b=ZpKP4CQL6MK0hss2mVEmZ4H51FZRa8dbruj/dr3We7cR+vInebYmQ4+29zedYoM0Uh lX/dTSCTWe9LwdlgyplQ9VSFVulQxda0mZ/J6QuAf/h2y/LeixIj5gTuc1/z+CWR0+bU brxTgmbuEeOP2/tRWbU4grFVo6A4GZI5IxMuSvGzWRe9/Rzp70VvQOZpNOZ96oI5F2yW QkhKvSBAaHUig1PXDs18gTZC5GJauaGQXV9gkMdz/giZ5lUpuqRd9dzZztSTXxLwF4Q7 fAFI6RpfUWv2r1vDKkjgsvPojGLoEG7wAIfBjYUkCx16dZK3v5OuzT6IlXqkOpmW/dvr Pz0A== X-Received: by 10.180.72.232 with SMTP id g8mr8946455wiv.0.1355612064223; Sat, 15 Dec 2012 14:54:24 -0800 (PST) Received: from ithaqua.etoilebsd.net (ithaqua.etoilebsd.net. [37.59.37.188]) by mx.google.com with ESMTPS id p3sm4247691wic.8.2012.12.15.14.54.23 (version=TLSv1/SSLv3 cipher=OTHER); Sat, 15 Dec 2012 14:54:23 -0800 (PST) Sender: Baptiste Daroussin Date: Sat, 15 Dec 2012 23:54:22 +0100 From: Baptiste Daroussin To: Jason Helfman Subject: Re: svn commit: r308937 - head/devel/json-c Message-ID: <20121215225421.GH18884@ithaqua.etoilebsd.net> References: <201212150818.qBF8Ibij003322@svn.freebsd.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="poemUeGtc2GQvHuH" Content-Disposition: inline In-Reply-To: <201212150818.qBF8Ibij003322@svn.freebsd.org> User-Agent: Mutt/1.5.21 (2010-09-15) Cc: svn-ports-head@freebsd.org, svn-ports-all@freebsd.org, ports-committers@freebsd.org X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 15 Dec 2012 22:54:26 -0000 --poemUeGtc2GQvHuH Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sat, Dec 15, 2012 at 08:18:37AM +0000, Jason Helfman wrote: > Author: jgh > Date: Sat Dec 15 08:18:36 2012 > New Revision: 308937 > URL: http://svnweb.freebsd.org/changeset/ports/308937 >=20 > Log: > - set CONFLICT on devel/cocaine-core > =20 > Spotted by: makc@ >=20 > Modified: > head/devel/json-c/Makefile >=20 > Modified: head/devel/json-c/Makefile > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- 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$ > -# > =20 > PORTNAME=3D json-c > PORTVERSION=3D 0.9 > @@ -18,4 +14,6 @@ GNU_CONFIGURE=3D yes > USE_GMAKE=3D yes > USE_GNOME=3D pkgconfig gnomehack > =20 > +CONFLICTS=3D cocaine-core-[0-9]* > + > .include Would have been nice to fix the pkgconfig dep while here :) regards, Bapt --poemUeGtc2GQvHuH Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (FreeBSD) iEYEARECAAYFAlDM/50ACgkQ8kTtMUmk6Ey4jwCeKVCYXv043UV4DTFUlMSn0bzt IpQAniURlqXBCPIDHcm34iWTqG1wfEIC =2R3w -----END PGP SIGNATURE----- --poemUeGtc2GQvHuH--