From owner-cvs-all@FreeBSD.ORG  Fri Apr  2 11:52:40 2010
Return-Path: <owner-cvs-all@FreeBSD.ORG>
Delivered-To: cvs-all@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 5E4791065677;
	Fri,  2 Apr 2010 11:52:40 +0000 (UTC) (envelope-from pav@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 341A88FC0C;
	Fri,  2 Apr 2010 11:52:40 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o32Bqds8032634;
	Fri, 2 Apr 2010 11:52:39 GMT (envelope-from pav@repoman.freebsd.org)
Received: (from pav@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o32Bqd7W032633;
	Fri, 2 Apr 2010 11:52:39 GMT (envelope-from pav)
Message-Id: <201004021152.o32Bqd7W032633@repoman.freebsd.org>
From: Pav Lucistnik <pav@FreeBSD.org>
Date: Fri, 2 Apr 2010 11:52:39 +0000 (UTC)
To: ports-committers@FreeBSD.org, cvs-ports@FreeBSD.org, cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Cc: 
Subject: cvs commit: ports/graphics/proj Makefile
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: **OBSOLETE** CVS commit messages for the entire tree
	<cvs-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-all>
List-Post: <mailto:cvs-all@freebsd.org>
List-Help: <mailto:cvs-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 02 Apr 2010 11:52:40 -0000

pav         2010-04-02 11:52:39 UTC

  FreeBSD ports repository

  Modified files:
    graphics/proj        Makefile 
  Log:
  - Set CONFLICTS against misc/proj4
  
  PR:             ports/143872
  Submitted by:   Slaven Rezic <slaven@rezic.de>
  
  Revision  Changes    Path
  1.17      +2 -0      ports/graphics/proj/Makefile