From owner-cvs-ports@FreeBSD.ORG  Sun May  9 22:42:12 2004
Return-Path: <owner-cvs-ports@FreeBSD.ORG>
Delivered-To: cvs-ports@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id 5121316A4CE; Sun,  9 May 2004 22:42:12 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 2942A43D41; Sun,  9 May 2004 22:42:12 -0700 (PDT)
	(envelope-from anholt@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i4A5gCGe074346;
	Sun, 9 May 2004 22:42:12 -0700 (PDT)
	(envelope-from anholt@repoman.freebsd.org)
Received: (from anholt@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i4A5gBq7074345;
	Sun, 9 May 2004 22:42:11 -0700 (PDT)
	(envelope-from anholt)
Message-Id: <200405100542.i4A5gBq7074345@repoman.freebsd.org>
From: Eric Anholt <anholt@FreeBSD.org>
Date: Sun, 9 May 2004 22:42:11 -0700 (PDT)
To: ports-committers@FreeBSD.org, cvs-ports@FreeBSD.org,
	cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Subject: cvs commit: ports/x11-servers/XFree86-4-Server Makefile
X-BeenThere: cvs-ports@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: CVS commit messages for the ports tree <cvs-ports.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-ports>,
	<mailto:cvs-ports-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-ports>
List-Post: <mailto:cvs-ports@freebsd.org>
List-Help: <mailto:cvs-ports-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-ports>,
	<mailto:cvs-ports-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 10 May 2004 05:42:12 -0000

anholt      2004/05/09 22:42:11 PDT

  FreeBSD ports repository

  Modified files:
    x11-servers/XFree86-4-Server Makefile 
  Log:
  Register CONFLICTS on xorg-server.
  
  Revision  Changes    Path
  1.156     +2 -0      ports/x11-servers/XFree86-4-Server/Makefile