Date: Thu, 27 Jun 2013 22:22:05 +0000 (UTC) From: Adrian Chadd <adrian@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r321910 - head/emulators/gxemul Message-ID: <201306272222.r5RMM5Qw001996@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201306272222.r5RMM5Qw001996>