From owner-cvs-all@FreeBSD.ORG  Sat Jun 14 00:04:34 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 5ED1F1065672;
	Sat, 14 Jun 2008 00:04:34 +0000 (UTC)
	(envelope-from chinsan@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 3A7588FC1B;
	Sat, 14 Jun 2008 00:04:34 +0000 (UTC)
	(envelope-from chinsan@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m5E04Y5p067890;
	Sat, 14 Jun 2008 00:04:34 GMT
	(envelope-from chinsan@repoman.freebsd.org)
Received: (from chinsan@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5E04YvK067889;
	Sat, 14 Jun 2008 00:04:34 GMT (envelope-from chinsan)
Message-Id: <200806140004.m5E04YvK067889@repoman.freebsd.org>
From: Chin-San Huang <chinsan@FreeBSD.org>
Date: Sat, 14 Jun 2008 00:04:34 +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/x11-drivers/xf86-video-sis 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: Sat, 14 Jun 2008 00:04:34 -0000

chinsan     2008-06-14 00:04:34 UTC

  FreeBSD ports repository

  Modified files:
    x11-drivers/xf86-video-sis Makefile 
  Log:
  - Add conflicts with xf86-video-sis-intel.
  
  Revision  Changes    Path
  1.4       +2 -0      ports/x11-drivers/xf86-video-sis/Makefile