From owner-svn-ports-head@FreeBSD.ORG  Thu Jun 27 22:22:06 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 0F882516;
 Thu, 27 Jun 2013 22:22:06 +0000 (UTC)
 (envelope-from adrian@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 0078712A5;
 Thu, 27 Jun 2013 22:22:06 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5RMM5Om001997;
 Thu, 27 Jun 2013 22:22:05 GMT (envelope-from adrian@svn.freebsd.org)
Received: (from adrian@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5RMM5Qw001996;
 Thu, 27 Jun 2013 22:22:05 GMT (envelope-from adrian@svn.freebsd.org)
Message-Id: <201306272222.r5RMM5Qw001996@svn.freebsd.org>
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Thu, 27 Jun 2013 22:22:05 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r321910 - head/emulators/gxemul
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 27 Jun 2013 22:22:06 -0000

Author: adrian (src committer)
Date: Thu Jun 27 22:22:05 2013
New Revision: 321910
URL: http://svnweb.freebsd.org/changeset/ports/321910

Log:
  Building gxemul conflicts with svgalib, so mark it as a conflict.
  
  svgalib installs a 'vga.h' file in /usr/local/include, which conflicts with
  the vga.h in gxemul.
  
  Until that gets resolved, mark it as a conflict.

Modified:
  head/emulators/gxemul/Makefile

Modified: head/emulators/gxemul/Makefile
==============================================================================
--- head/emulators/gxemul/Makefile	Thu Jun 27 21:52:53 2013	(r321909)
+++ head/emulators/gxemul/Makefile	Thu Jun 27 22:22:05 2013	(r321910)
@@ -21,6 +21,10 @@ MAN1=		gxemul.1
 PORTDOCS=	*
 PLIST_FILES=	bin/gxemul
 
+# svgalib installs vga.h, which conflicts with gxemul when building with
+# a virtual VGA adaptor.
+CONFLICTS=	svgalib-[0-9]*
+
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MX11}