From owner-cvs-all@FreeBSD.ORG  Tue Aug 26 14:14:28 2008
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 04BCC1065697;
	Tue, 26 Aug 2008 14:14:28 +0000 (UTC)
	(envelope-from miwi@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id E1CE28FC33;
	Tue, 26 Aug 2008 14:14:27 +0000 (UTC)
	(envelope-from miwi@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7QEERmf057927;
	Tue, 26 Aug 2008 14:14:27 GMT
	(envelope-from miwi@repoman.freebsd.org)
Received: (from miwi@localhost)
	by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7QEERuQ057926;
	Tue, 26 Aug 2008 14:14:27 GMT (envelope-from miwi)
Message-Id: <200808261414.m7QEERuQ057926@repoman.freebsd.org>
From: Martin Wilke <miwi@FreeBSD.org>
Date: Tue, 26 Aug 2008 14:14:27 +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/devel/imake Makefile
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: 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: Tue, 26 Aug 2008 14:14:28 -0000

miwi        2008-08-26 14:14:27 UTC

  FreeBSD ports repository

  Modified files:
    devel/imake          Makefile 
  Log:
  - Remove CONFLICT with XFree86-4
  
  PR:             125992
  Submitted by:   Carlos Santos <unixmania@gmail.com>
  Approved by:    x11 (flz)
  
  Revision  Changes    Path
  1.19      +1 -3      ports/devel/imake/Makefile